From 17456a2d113486a185a30442c7df451875dc2d9a Mon Sep 17 00:00:00 2001
From: "Bruno P. Kinoshita" <bruno.kinoshita@niwa.co.nz>
Date: Tue, 9 Jan 2018 13:56:03 +1300
Subject: [PATCH] Issue #665 Remove SERVICE_LOGO old constant and related code

---
 config.inc.dist              | 3 ---
 controller/WebController.php | 4 ----
 model/GlobalConfig.php       | 8 --------
 tests/GlobalConfigTest.php   | 9 ---------
 4 files changed, 24 deletions(-)

diff --git a/config.inc.dist b/config.inc.dist
index d792b8ea8..d73532109 100644
--- a/config.inc.dist
+++ b/config.inc.dist
@@ -49,9 +49,6 @@ define ("LOG_FILE_NAME", NULL);
 # customize the service name
 define("SERVICE_NAME", "Skosmos");
 
-// customize the service logo by pointing to your logo here. 
-define("SERVICE_LOGO", "./resource/pics/logo.png");
-
 // customize the css by adding your own stylesheet
 define("CUSTOM_CSS", "resource/css/stylesheet.css");
 
diff --git a/controller/WebController.php b/controller/WebController.php
index 340fd699f..c2f9635eb 100644
--- a/controller/WebController.php
+++ b/controller/WebController.php
@@ -43,10 +43,6 @@ public function __construct($model)
         $this->twig->addGlobal("BaseHref", $this->getBaseHref());
         // setting the service name string from the config.inc
         $this->twig->addGlobal("ServiceName", $this->model->getConfig()->getServiceName());
-        // setting the service logo location from the config.inc
-        if ($this->model->getConfig()->getServiceLogo() !== null) {
-            $this->twig->addGlobal("ServiceLogo", $this->model->getConfig()->getServiceLogo());
-        }
 
         // setting the service custom css file from the config.inc
         if ($this->model->getConfig()->getCustomCss() !== null) {
diff --git a/model/GlobalConfig.php b/model/GlobalConfig.php
index e1bce9d5d..030e95a48 100644
--- a/model/GlobalConfig.php
+++ b/model/GlobalConfig.php
@@ -184,14 +184,6 @@ public function getServiceTagline()
         return $this->getConstant('SERVICE_TAGLINE', null);
     }
     
-    /**
-     * @return string
-     */
-    public function getServiceLogo() 
-    {
-        return $this->getConstant('SERVICE_LOGO', null);
-    }
-    
     /**
      * @return string
      */
diff --git a/tests/GlobalConfigTest.php b/tests/GlobalConfigTest.php
index 6ab8094fa..5987f3539 100644
--- a/tests/GlobalConfigTest.php
+++ b/tests/GlobalConfigTest.php
@@ -118,15 +118,6 @@ public function testgetServiceTaglineDefaultValue() {
     $this->assertEquals(null, $actual);
   }
 
-  /**
-   * @covers GlobalConfig::getServiceLogo
-   * @covers GlobalConfig::getConstant
-   */
-  public function testServiceLogoDefaultValue() {
-    $actual = $this->config->getServiceLogo();
-    $this->assertEquals(null, $actual);
-  }
-
   /**
    * @covers GlobalConfig::getCustomCss
    * @covers GlobalConfig::getConstant