Fixed error in Auth::authenticate causing phpCAS::client to be called twice.

diff --git a/Auth.php b/Auth.php
index e9714d1..c2d9446 100644 (file)
--- a/Auth.php
+++ b/Auth.php
@@ -28,6 +28,7 @@ class Auth implements \Piwik\Auth
 {
        protected $login = null;
        protected $token_auth = null;
 {
        protected $login = null;
        protected $token_auth = null;

+       private static $phpcas_client_called = false;

 
        public function getName()
        {
 
        public function getName()
        {


@@ -50,8 +51,7 @@ class Auth implements \Piwik\Auth
                // The first authenticate() is from the page, and the second is due to an API call.
                // This checks if there was already a phpcas instance already initialized, otherwize
                // phpCAS::client() would fail.
                // The first authenticate() is from the page, and the second is due to an API call.
                // This checks if there was already a phpcas instance already initialized, otherwize
                // phpCAS::client() would fail.

-               global $PHPCAS_CLIENT;
-               if(!is_object($PHPCAS_CLIENT)) {
+               if (!self::$phpcas_client_called) {

                        \phpCAS::client(
                                constant( Config::getInstance()->caslogin['protocol'] ),
                                Config::getInstance()->caslogin['host'],
                        \phpCAS::client(
                                constant( Config::getInstance()->caslogin['protocol'] ),
                                Config::getInstance()->caslogin['host'],


@@ -59,6 +59,7 @@ class Auth implements \Piwik\Auth
                 '',
                 false
                        );
                 '',
                 false
                        );

+                       self::$phpcas_client_called = true;

                }
 
                // no SSL validation for the CAS server
                }
 
                // no SSL validation for the CAS server

diff --git a/CASLogin.php b/CASLogin.php
index e8df58e..78c62b3 100644 (file)
--- a/CASLogin.php
+++ b/CASLogin.php
@@ -24,7 +24,7 @@ class CASLogin extends \Piwik\Plugin
                        'description' => 'CAS Login plugin. It uses JA-SIG Central Authentication Services to authenticate users and grant them access to piwik.',
                        'author' => 'OW',
                         'homepage' => 'http://dev.piwik.org/trac/ticket/598/',
                        'description' => 'CAS Login plugin. It uses JA-SIG Central Authentication Services to authenticate users and grant them access to piwik.',
                        'author' => 'OW',
                         'homepage' => 'http://dev.piwik.org/trac/ticket/598/',

-                        'version' => '0.7',
+                        'version' => '0.7.1',

                );
        }
 
                );
        }
 

diff --git a/CHANGELOG b/CHANGELOG
index 582c147..238a010 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
 == Changelog ==
 == Changelog ==

+0.7.1
+ * Fixed error in Auth::authenticate causing phpCAS::client to be called twice.
+

 0.7
  * Compatible with Piwik 2.1
  * Removed the "additional root logins" option (Piwik handles multiple superusers natively now)
 0.7
  * Compatible with Piwik 2.1
  * Removed the "additional root logins" option (Piwik handles multiple superusers natively now)