diff --git a/lang/en.php b/lang/en.php index 0a9475ff8ba..89c485a12af 100644 --- a/lang/en.php +++ b/lang/en.php @@ -270,6 +270,7 @@ 'General_YearlyReports' => 'Yearly reports', 'General_RangeReports' => 'Custom date ranges', 'General_ConfigFileIsNotWritable' => 'The Piwik configuration file %s is not writable, some of your changes might not be saved. %s Please change permissions of the config file to make it writable.', + 'General_StatisticsAreNotRecorded' => 'Piwik Visitor Tracking is currently disabled! Re-enable tracking by setting record_statistics = 1 in your config/config.ini.php file.', 'General_ExceptionDatabaseVersion' => 'Your %1$s version is %2$s but Piwik requires at least %3$s.', 'General_ExceptionIncompatibleClientServerVersions' => 'Your %1$s client version is %2$s which is incompatible with server version %3$s.', 'General_ExceptionMissingFile' => 'Missing file: %s', diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 7f8e102fe67..64dcb812ded 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -27,7 +27,7 @@ public function generalSettings() { Piwik::checkUserHasSomeAdminAccess(); $view = Piwik_View::factory('generalSettings'); - + if(Piwik::isUserIsSuperUser()) { $enableBrowserTriggerArchiving = Piwik_ArchiveProcessing::isBrowserTriggerArchivingEnabled(); @@ -46,14 +46,19 @@ public function generalSettings() { $view->configFileNotWritable = true; } + + $statsEnabled = Piwik_Config::getInstance()->Tracker['record_statistics']; + if($statsEnabled == "0"){ + $view->statisticsNotRecorded = true; + } $view->mail = Piwik_Config::getInstance()->mail; $view->branding = Piwik_Config::getInstance()->branding; - + $directoryWritable = is_writable(PIWIK_DOCUMENT_ROOT.'/themes/'); $logoFilesWriteable = is_writeable(PIWIK_DOCUMENT_ROOT.'/themes/logo.png') && is_writeable(PIWIK_DOCUMENT_ROOT.'/themes/logo-header.png'); $view->logosWriteable = ($logoFilesWriteable || $directoryWritable) && ini_get('file_uploads') == 1; - + $trustedHosts = array(); if (isset(Piwik_Config::getInstance()->General['trusted_hosts'])) { diff --git a/plugins/CoreAdminHome/templates/header.tpl b/plugins/CoreAdminHome/templates/header.tpl index a6a9fefa233..3c89e65e259 100644 --- a/plugins/CoreAdminHome/templates/header.tpl +++ b/plugins/CoreAdminHome/templates/header.tpl @@ -17,7 +17,6 @@ {include file="CoreHome/templates/iframe_buster_header.tpl"} - {include file="CoreHome/templates/iframe_buster_body.tpl"}
{if !isset($showTopMenu) || $showTopMenu} @@ -52,6 +51,12 @@
{/if} +{if !empty($statisticsNotRecorded)} +
+ {'General_StatisticsAreNotRecorded'|translate} +
+{/if} +