diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2013-11-12 08:53:59 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2013-11-12 08:53:59 +0400 |
| commit | 73fcfa6b969ac57b505a72b9c81631f087333be2 (patch) | |
| tree | a32e2a688cb972ffa0c8f2527a2a826e4522e54f /plugins | |
| parent | 10ce59ade2616ae459a8e840fb515231a1466ec1 (diff) | |
fix activate / deactivate DNT did not work
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/PrivacyManager/Controller.php | 7 | ||||
| -rw-r--r-- | plugins/PrivacyManager/templates/privacySettings.twig | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index 742962f394..5f9acc606f 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -136,11 +136,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $view->dntSupport = self::isDntSupported(); $view->canDeleteLogActions = Db::isLockPrivilegeGranted(); $view->dbUser = Config::getInstance()->database['username']; - if($view->anonymizeIP["enabled"]) { - $view->nonce = Nonce::getNonce(\Piwik\Plugins\CorePluginsAdmin\Controller::DEACTIVATE_NONCE); - } else { - $view->nonce = Nonce::getNonce(\Piwik\Plugins\CorePluginsAdmin\Controller::ACTIVATE_NONCE); - } + $view->deactivateNonce = Nonce::getNonce(\Piwik\Plugins\CorePluginsAdmin\Controller::DEACTIVATE_NONCE); + $view->activateNonce = Nonce::getNonce(\Piwik\Plugins\CorePluginsAdmin\Controller::ACTIVATE_NONCE); } $view->language = LanguagesManager::getLanguageCodeForCurrentUser(); $this->displayWarningIfConfigFileNotWritable(); diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index 0aee177d59..f208067abb 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -78,7 +78,7 @@ </table> </div> - <input type="hidden" name="nonce" value="{{ nonce }}"> + <input type="hidden" name="nonce" value="{% if anonymizeIP.enabled %}{{ deactivateNonce }}{% else %}{{ activateNonce }}{% endif %}"> <input type="submit" value="{{ 'General_Save'|translate }}" id="privacySettingsSubmit" class="submit"/> </form> @@ -271,16 +271,18 @@ <p> {% if dntSupport %} {% set action='deactivate' %} + {% set nonce=deactivateNonce %} <strong>{{ 'PrivacyManager_DoNotTrack_Enabled'|translate }}</strong> <br/> {{ 'PrivacyManager_DoNotTrack_EnabledMoreInfo'|translate }} {% else %} {% set action='activate' %} + {% set nonce=activateNonce %} {{ 'PrivacyManager_DoNotTrack_Disabled'|translate }} {{ 'PrivacyManager_DoNotTrack_DisabledMoreInfo'|translate }} {% endif %} </p> <span style="margin-left:20px;"> - <a href='{{ {'module':'CorePluginsAdmin','token_auth':token_auth,'action':action,'pluginName':'DoNotTrack'} | urlRewriteWithParameters }}#DNT'>› + <a href='{{ {'module':'CorePluginsAdmin','nonce':nonce,'action':action,'pluginName':'DoNotTrack'} | urlRewriteWithParameters }}#DNT'>› {% if dntSupport %}{{ 'PrivacyManager_DoNotTrack_Disable'|translate }} {{ 'General_NotRecommended'|translate }} {% else %}{{ 'PrivacyManager_DoNotTrack_Enable'|translate }} {{ 'General_Recommended'|translate }}{% endif %} <br/> |