Add config setting to disable custom logo upload (#14982)

* Add enable_custom_logo config setting to control whether user is permitted to upload logos

* Rename method, add check in setBrandingSettings

* Update Controller.php

* Update expected screenshot

4 files changed, 21 insertions, 4 deletions

diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index 9fd0ffaf25..ee97d75a67 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -109,10 +109,13 @@ class API extends \Piwik\Plugin\API
         Piwik::checkUserHasSuperUserAccess();
 
         $customLogo = new CustomLogo();
-        if ($useCustomLogo) {
-            $customLogo->enable();
-        } else {
-            $customLogo->disable();
+
+        if ($customLogo->isCustomLogoFeatureEnabled()) {
+            if ($useCustomLogo) {
+                $customLogo->enable();
+            } else {
+                $customLogo->disable();
+            }
         }
 
         return true;
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 5e9c6b961d..51c03b89d2 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -105,6 +105,7 @@ class Controller extends ControllerAdmin
         $view->branding              = array('use_custom_logo' => $logo->isEnabled());
         $view->fileUploadEnabled     = $logo->isFileUploadEnabled();
         $view->logosWriteable        = $logo->isCustomLogoWritable();
+        $view->customLogoEnabled     = $logo->isCustomLogoFeatureEnabled();
         $view->hasUserLogo           = CustomLogo::hasUserLogo();
         $view->pathUserLogo          = CustomLogo::getPathUserLogo();
         $view->hasUserFavicon        = CustomLogo::hasUserFavicon();
@@ -233,6 +234,11 @@ class Controller extends ControllerAdmin
         $this->checkTokenInUrl();
 
         $logo = new CustomLogo();
+
+        if (! $logo->isCustomLogoFeatureEnabled()) {
+            return '0';
+        }
+
         $successLogo    = $logo->copyUploadedLogoToFilesystem();
         $successFavicon = $logo->copyUploadedFaviconToFilesystem();
 
diff --git a/plugins/CoreAdminHome/CustomLogo.php b/plugins/CoreAdminHome/CustomLogo.php
index 9c2606cd20..e8dfffe3e6 100644
--- a/plugins/CoreAdminHome/CustomLogo.php
+++ b/plugins/CoreAdminHome/CustomLogo.php
@@ -85,6 +85,11 @@ class CustomLogo
         return ini_get('file_uploads') == 1;
     }
 
+    public function isCustomLogoFeatureEnabled()
+    {
+        return Config::getInstance()->General['enable_custom_logo'] != 0;
+    }
+
     /**
      * @return bool
      */
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index cc7d68c73f..84a47c88e5 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -141,6 +141,8 @@
         </div>
     </div>
 {% endif %}
+
+{% if customLogoEnabled %}
 <div piwik-content-block content-title="{{ 'CoreAdminHome_BrandingSettings'|translate|e('html_attr') }}">
 
     <div piwik-form ng-controller="BrandingController as brandingSettings">
@@ -215,6 +217,7 @@
         <div onconfirm="brandingSettings.save()" saving="brandingSettings.isLoading" piwik-save-button></div>
     </div>
 </div>
+{% endif %}
 
 {% if isDataPurgeSettingsEnabled %}
     <div piwik-content-block content-title="{{ 'PrivacyManager_DeleteDataSettings'|translate|e('html_attr') }}">