From eeb3dcc69b8ca10c82d8646bea1696966f47b060 Mon Sep 17 00:00:00 2001
From: Iglocska <andras.iklody@gmail.com>
Date: Sun, 17 Jan 2016 21:22:50 +0100
Subject: [PATCH] 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)
---
 app/Config/config.default.php |  4 ++--
 app/Model/Organisation.php    |  1 -
 app/Model/Server.php          | 24 ++++++++++++++++++++----
 app/View/Elements/footer.ctp  |  6 +-----
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/Config/config.default.php b/app/Config/config.default.php
index 13029a782..19b83cdd3 100644
--- a/app/Config/config.default.php
+++ b/app/Config/config.default.php
@@ -11,8 +11,8 @@ $config = array (
   'MISP' => 
   array (
     'baseurl' => '',
-    'footerpart1' => 'Powered by MISP',
-    'footerpart2' => '© Belgian Defense CERT & NCIRC',
+    'footermidleft' => '',
+    'footermidright' => '',
     'org' => 'ORGNAME',
     'showorg' => true,
     'background_jobs' => true,
diff --git a/app/Model/Organisation.php b/app/Model/Organisation.php
index 2034c6d0d..a87f70bb2 100644
--- a/app/Model/Organisation.php
+++ b/app/Model/Organisation.php
@@ -90,7 +90,6 @@ class Organisation extends AppModel{
 	}
 	
 	public function captureOrg($org, $user, $force = false) {
-
 		if (is_array($org)) {
 			if (isset($org['uuid']) && !empty($org['uuid'])) {
 				$conditions = array('uuid' => $org['uuid']);
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 0e8d93080..7618f43b0 100755
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -176,17 +176,33 @@ class Server extends AppModel {
 							'test' => 'testForEmpty',
 							'type' => 'string',
 					),
-					'footerpart1' => array(
+					'footermidleft' => array(
 							'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' => '',
 							'errorMessage' => '',
 							'test' => 'testForEmpty',
 							'type' => 'string',
 					),
 					'footerpart2' => array(
-							'level' => 2,
-							'description' => 'Footer text following the version number.',
+							'level' => 3,
+							'description' => 'This setting is deprecated and can be safely removed.',
 							'value' => '',
 							'errorMessage' => '',
 							'test' => 'testForEmpty',
diff --git a/app/View/Elements/footer.ctp b/app/View/Elements/footer.ctp
index 27cded50f..7bfdae709 100644
--- a/app/View/Elements/footer.ctp
+++ b/app/View/Elements/footer.ctp
@@ -12,11 +12,7 @@
 				<?php } ?>
 			</div>
 			<div class = "footerText footerCenterText">
-				<?php 
-					$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>
+				<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>
 			</div>
 			<div class="pull-right" style="position:relative;padding-top:9px;z-index:2;">
 				<?php