mirror of https://github.com/MISP/MISP
Replaced the footer text
- added link to the github page of MISP - made the text "Powered by MISP vversion_number" fixed - Replaced the surrounding text fields with two new fields (empty by default)pull/865/head
parent
be31148018
commit
eeb3dcc69b
|
@ -11,8 +11,8 @@ $config = array (
|
||||||
'MISP' =>
|
'MISP' =>
|
||||||
array (
|
array (
|
||||||
'baseurl' => '',
|
'baseurl' => '',
|
||||||
'footerpart1' => 'Powered by MISP',
|
'footermidleft' => '',
|
||||||
'footerpart2' => '© Belgian Defense CERT & NCIRC',
|
'footermidright' => '',
|
||||||
'org' => 'ORGNAME',
|
'org' => 'ORGNAME',
|
||||||
'showorg' => true,
|
'showorg' => true,
|
||||||
'background_jobs' => true,
|
'background_jobs' => true,
|
||||||
|
|
|
@ -90,7 +90,6 @@ class Organisation extends AppModel{
|
||||||
}
|
}
|
||||||
|
|
||||||
public function captureOrg($org, $user, $force = false) {
|
public function captureOrg($org, $user, $force = false) {
|
||||||
|
|
||||||
if (is_array($org)) {
|
if (is_array($org)) {
|
||||||
if (isset($org['uuid']) && !empty($org['uuid'])) {
|
if (isset($org['uuid']) && !empty($org['uuid'])) {
|
||||||
$conditions = array('uuid' => $org['uuid']);
|
$conditions = array('uuid' => $org['uuid']);
|
||||||
|
|
|
@ -176,17 +176,33 @@ class Server extends AppModel {
|
||||||
'test' => 'testForEmpty',
|
'test' => 'testForEmpty',
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
),
|
),
|
||||||
'footerpart1' => array(
|
'footermidleft' => array(
|
||||||
'level' => 2,
|
'level' => 2,
|
||||||
'description' => 'Footer text prepending the version number.',
|
'description' => 'Footer text prepending the "Powered by MISP" text.',
|
||||||
|
'value' => '',
|
||||||
|
'errorMessage' => '',
|
||||||
|
'test' => 'testForEmpty',
|
||||||
|
'type' => 'string',
|
||||||
|
),
|
||||||
|
'footermidright' => array(
|
||||||
|
'level' => 2,
|
||||||
|
'description' => 'Footer text following the "Powered by MISP" text.',
|
||||||
|
'value' => '',
|
||||||
|
'errorMessage' => '',
|
||||||
|
'test' => 'testForEmpty',
|
||||||
|
'type' => 'string',
|
||||||
|
),
|
||||||
|
'footerpart1' => array(
|
||||||
|
'level' => 3,
|
||||||
|
'description' => 'This setting is deprecated and can be safely removed.',
|
||||||
'value' => '',
|
'value' => '',
|
||||||
'errorMessage' => '',
|
'errorMessage' => '',
|
||||||
'test' => 'testForEmpty',
|
'test' => 'testForEmpty',
|
||||||
'type' => 'string',
|
'type' => 'string',
|
||||||
),
|
),
|
||||||
'footerpart2' => array(
|
'footerpart2' => array(
|
||||||
'level' => 2,
|
'level' => 3,
|
||||||
'description' => 'Footer text following the version number.',
|
'description' => 'This setting is deprecated and can be safely removed.',
|
||||||
'value' => '',
|
'value' => '',
|
||||||
'errorMessage' => '',
|
'errorMessage' => '',
|
||||||
'test' => 'testForEmpty',
|
'test' => 'testForEmpty',
|
||||||
|
|
|
@ -12,11 +12,7 @@
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</div>
|
</div>
|
||||||
<div class = "footerText footerCenterText">
|
<div class = "footerText footerCenterText">
|
||||||
<?php
|
<span><?php echo h(Configure::read('MISP.footermidleft')); ?> Powered by <a href="https://github.com/MISP/MISP">MISP <?php if (isset($me['id'])) echo h($mispVersionFull);?></a> <?php echo h(Configure::read('MISP.footermidleft')); ?></span>
|
||||||
$footerText = Configure::read('MISP.footerpart1') . ' ' . Configure::read('MISP.footerpart2');
|
|
||||||
if (isset($me['id'])) $footerText = Configure::read('MISP.footerpart1') . ' version ' . $mispVersionFull . ' ' . Configure::read('MISP.footerpart2');
|
|
||||||
?>
|
|
||||||
<span> <?php echo h($footerText); ?> </span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-right" style="position:relative;padding-top:9px;z-index:2;">
|
<div class="pull-right" style="position:relative;padding-top:9px;z-index:2;">
|
||||||
<?php
|
<?php
|
||||||
|
|
Loading…
Reference in New Issue