MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

further cleanup of logo improvement

pull/61/head
Christophe Vandeplas 2012-08-31 10:45:54 +02:00
parent 05efc43f36
commit 35e1a455cd
6 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/bootstrap.php
View File

@ -90,9 +90,8 @@ Configure::write('CyDefSIG.baseurl', 'http://localhost:8888');
Configure::write('CyDefSIG.name', 'CyDefSIG');
Configure::write('CyDefSIG.header', 'CyDefSIG: Cyber Defence Signature Sharing Platform');
Configure::write('CyDefSIG.footer', 'Powered by CyDefSIG © Belgian Defense CERT & NCIRC');
//Configure::write('CyDefSIG.logo', '/img/logo_big.gif');
Configure::write('CyDefSIG.org', 'BE MOD'); // if sync this will be Event.org content on the peer side
Configure::write('CyDefSIG.logo', 'square_defense.jpg'); // used in Events::index for owned events
Configure::write('CyDefSIG.logo', 'orgs/MIL.be.png'); // used in Events::index for owned events
Configure::write('CyDefSIG.showorg', 'true'); // show the name/flag of the organisation that uploaded the data

2
app/Controller/ServersController.php
View File

@ -98,7 +98,7 @@ class ServersController extends AppController {
if ($this->request->is('post') || $this->request->is('put')) {
// say what fields are to be updated
$fieldList=array('url', 'push', 'pull', 'organization','logo');
$fieldList=array('url', 'push', 'pull', 'organization');
if ("" != $this->request->data['Server']['authkey'])
$fieldList[] = 'authkey';
// Save the data

12
app/Model/Server.php
View File

@ -94,16 +94,4 @@ class Server extends AppModel {
return $this->field('id', array('id' => $serverid, 'org' => $org)) === $serverid;
}
public function getLogos() {
$logos = array();
$results = $this->find('all',
array('recursive' => 0,
'fields' => 'Server.organization,Server.logo'
));
foreach ($results as $result ) {
$logos[$result['Server']['organization']] = $result['Server']['logo'];
}
return $logos;
}
}

6
app/View/Servers/add.ctp
View File

@ -11,11 +11,7 @@
'label' => 'Organization',
'before' => $this->Html->div('forminfo', 'The organization having the external server you want to sync with.<br/>Example: <i>BE</i>'),
));
echo $this->Form->input('logo', array(
'label' => 'Logo',
'before' => $this->Html->div('forminfo', 'The logo of the organization having the external server you want to sync with.<br/>Example: <i>jaune.jpg</i>'),
));
echo $this->Form->input('authkey', array(
echo $this->Form->input('authkey', array(
'before' => $this->Html->div('forminfo', 'You can find the authentication key on your profile on the external server.'),
));
echo $this->Form->input('push', array(

4
app/View/Servers/edit.ctp
View File

@ -12,10 +12,6 @@
'label' => 'Organization',
'before' => $this->Html->div('forminfo', 'The organization having the external server you want to sync with.<br/>Example: <i>https://foo.sig.mil.be</i>'),
));
echo $this->Form->input('logo', array(
'label' => 'Logo',
'before' => $this->Html->div('forminfo', 'The logo of the organization having the external server you want to sync with.<br/>Example: <i>jaune.jpg</i>'),
));
echo $this->Form->input('authkey', array(
'before' => $this->Html->div('forminfo', 'You can find the authentication key on your profile on the external server.<br/><i>Leave empty if you don\'t want to change it</i>.'),
));

2
app/View/Servers/index.ctp
View File

@ -6,7 +6,6 @@
<th><?php echo $this->Paginator->sort('pull');?></th>
<th><?php echo $this->Paginator->sort('url');?></th>
<th>From</th>
<th>Logo</th>
<?php if ($isAdmin): ?>
<th><?php echo $this->Paginator->sort('org');?></th>
<?php endif; ?>
@ -21,7 +20,6 @@
<td class="short" style="text-align: center;"><?php echo ($server['Server']['pull'])? 'Yes' : 'No'; ?>&nbsp;</td>
<td><?php echo h($server['Server']['url']); ?>&nbsp;</td>
<td><?php echo h($server['Server']['organization']); ?>&nbsp;</td>
<td><?php echo h($server['Server']['logo']); ?>&nbsp;</td>
<?php if ($isAdmin): ?>
<td class="short"><?php echo h($server['Server']['org']); ?>&nbsp;</td>
<?php endif; ?>