fix bug logout was probably never working, compatibility with Piwik 3

Author: tsteur

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## Changelog
 
-* 3.0.0 Compatibility with Piwik 3.0
+* 3.0.0 
+    - Compatibility with Piwik 3.0
+    - Fix logout feature
 * 1.0.4 - Support for LemonLDAP::ng and `HTTP_AUTH_USER`
 * 1.0.3 - Fixing regression w/ Piwik 2.15 when authenticating by token auth or by username/password (w/o an HTTP server).
 * 1.0 - First public release [compatible with Piwik 2](http://piwik.org/blog/2013/12/piwik-2-0-release-announced-biggest-best-release-yet/)

Controller.php

@@ -8,15 +8,14 @@
  */
 namespace Piwik\Plugins\LoginHttpAuth;
 
-use Piwik\Session;
 use Piwik\View;
 
 class Controller extends \Piwik\Plugins\Login\Controller
 {
     public function logmeout()
     {
         // Effectively log out of Http auth
-        $settings = new Settings('LoginHttpAuthPlugin');
+        $settings = new SystemSettings('LoginHttpAuth');
         header('WWW-Authenticate: Basic realm="'. $settings->authName->getValue() .'"');
         header('HTTP/1.0 401 Unauthorized');
         self::clearSession();

LoginHttpAuth.php

@@ -15,7 +15,7 @@
 
 class LoginHttpAuth extends \Piwik\Plugin
 {
-    public function getListHooksRegistered()
+    public function registerEvents()
     {
         return array(
             'Request.initAuthenticationObject' => 'initAuthenticationObject',

Settings.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\LoginHttpAuth;
+
+use Piwik\Settings\Setting;
+use Piwik\Settings\FieldConfig;
+
+/**
+ * Defines Settings for LoginHttpAuth.
+ *
+ * Usage like this:
+ * $settings = new SystemSettings();
+ * $settings->metric->getValue();
+ * $settings->description->getValue();
+ */
+class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings
+{
+    /** @var Setting */
+    public $authName;
+
+    protected function init()
+    {
+        $this->authName = $this->createAuthNameSetting();
+    }
+
+    private function createAuthNameSetting()
+    {
+        return $this->makeSetting('authName', $default = 'Piwik', FieldConfig::TYPE_STRING, function (FieldConfig $field) {
+            $field->title = 'Authentication realm';
+            $field->uiControl = FieldConfig::UI_CONTROL_TEXT;
+            $field->uiControlAttributes = array('size' => 15);
+            $field->description = 'Use this value for the AuthName directive in .htaccess.';
+        });
+    }
+}