Skip to content
Extraits de code Groupes Projets
Valider 84a2e9e9 rédigé par Fabian Becker's avatar Fabian Becker
Parcourir les fichiers

Warning is now shown on General Settings page to warn user

when tracking is disabled via record_statistics = 0.

fixes #3551
parent 7a75ea31
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -270,6 +270,7 @@ $translations = array(
'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',
......
......@@ -27,7 +27,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
{
Piwik::checkUserHasSomeAdminAccess();
$view = Piwik_View::factory('generalSettings');
if(Piwik::isUserIsSuperUser())
{
$enableBrowserTriggerArchiving = Piwik_ArchiveProcessing::isBrowserTriggerArchivingEnabled();
......@@ -46,14 +46,19 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
{
$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']))
{
......
......@@ -17,7 +17,6 @@
{include file="CoreHome/templates/iframe_buster_header.tpl"}
</head>
<body>
{include file="CoreHome/templates/iframe_buster_body.tpl"}
<div id="root">
{if !isset($showTopMenu) || $showTopMenu}
......@@ -52,6 +51,12 @@
</div>
{/if}
{if !empty($statisticsNotRecorded)}
<div class="ajaxSuccess" style="display:inline-block">
{'General_StatisticsAreNotRecorded'|translate}
</div>
{/if}
<div class="ui-confirm" id="alert">
<h2></h2>
<input role="no" type="button" value="{'General_Ok'|translate}" />
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter