refs #1713 - merge dev branch to trunk (config class refactoring)

git-svn-id: http://dev.piwik.org/svn/trunk@5951 59fd770c-687e-43c8-a1e3-f5a4ff64c105

4 files changed, 38 insertions, 37 deletions

diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php
index bd52367c49..af5bd063ee 100644
--- a/plugins/Login/Auth.php
+++ b/plugins/Login/Auth.php
@@ -36,8 +36,8 @@ class Piwik_Login_Auth implements Piwik_Auth
 	 */
 	public function authenticate()
 	{
-		$rootLogin = Zend_Registry::get('config')->superuser->login;
-		$rootPassword = Zend_Registry::get('config')->superuser->password;
+		$rootLogin = Piwik_Config::getInstance()->superuser['login'];
+		$rootPassword = Piwik_Config::getInstance()->superuser['password'];
 		$rootToken = Piwik_UsersManager_API::getInstance()->getTokenAuth($rootLogin, $rootPassword);
 
 		if(is_null($this->login))
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 84dd044484..a727519779 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -93,16 +93,16 @@ class Piwik_Login_Controller extends Piwik_Controller
 	 */
 	private function configureView($view)
 	{
-	    $this->setBasicVariablesView($view);
-	    
+		$this->setBasicVariablesView($view);
+
 		$view->linkTitle = Piwik::getRandomTitle();
 
-		$view->forceSslLogin = Zend_Registry::get('config')->General->force_ssl_login;
+		$view->forceSslLogin = Piwik_Config::getInstance()->General['force_ssl_login'];
 
 		// crsf token: don't trust the submitted value; generate/fetch it from session data
 		$view->nonce = Piwik_Nonce::getNonce('Piwik_Login.login');
 	}
-	
+
 	/**
 	 * Form-less login
 	 * @see how to use it on http://piwik.org/faq/how-to/#faq_30
@@ -120,18 +120,18 @@ class Piwik_Login_Controller extends Piwik_Controller
 		}
 
 		$login = Piwik_Common::getRequestVar('login', null, 'string');
-		if($login == Zend_Registry::get('config')->superuser->login)
-		{			
+		if($login == Piwik_Config::getInstance()->superuser['login'])
+		{
 			throw new Exception(Piwik_TranslateException('Login_ExceptionInvalidSuperUserAuthenticationMethod', array("logme")));
 		}
 
 		$currentUrl = 'index.php';
-		
+
 		if(($idSite = Piwik_Common::getRequestVar('idSite', false, 'int')) !== false)
-		{			
+		{
 			$currentUrl .= '?idSite='.$idSite;
 		}
-		
+
 		$urlToRedirect = Piwik_Common::getRequestVar('url', $currentUrl, 'string');
 		$urlToRedirect = Piwik_Common::unsanitizeInputValue($urlToRedirect);
 
@@ -196,7 +196,7 @@ class Piwik_Login_Controller extends Piwik_Controller
 	{
 		return Piwik_Translate('Login_InvalidNonceOrHeadersOrReferer', array('<a href="?module=Proxy&action=redirect&url='.urlencode('http://piwik.org/faq/how-to-install/#faq_98').'" target="_blank">', '</a>'));
 	}
-	
+
 	/**
 	 * Validate user (by username or email address).
 	 *
@@ -241,8 +241,8 @@ class Piwik_Login_Controller extends Piwik_Controller
 			$mail->setBodyText($bodyText);
 
 
-			$fromEmailName = Zend_Registry::get('config')->General->login_password_recovery_email_name;
-			$fromEmailAddress = Zend_Registry::get('config')->General->login_password_recovery_email_address;
+			$fromEmailName = Piwik_Config::getInstance()->General['login_password_recovery_email_name'];
+			$fromEmailAddress = Piwik_Config::getInstance()->General['login_password_recovery_email_address'];
 			$mail->setFrom($fromEmailAddress, $fromEmailName);
 			@$mail->send();
 		}
@@ -286,7 +286,7 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 		$view = Piwik_View::factory('resetPassword');
 		$view->AccessErrorString = $messageNoAccess;
-		$view->forceSslLogin = Zend_Registry::get('config')->General->force_ssl_login;
+		$view->forceSslLogin = Piwik_Config::getInstance()->General['force_ssl_login'];
 		$view->addForm( $form );
 		$this->configureView($view);
 		echo $view->render();
@@ -318,12 +318,13 @@ class Piwik_Login_Controller extends Piwik_Controller
 		{
 			if( $user['email'] == Piwik::getSuperUserEmail() )
 			{
-    			if(!Zend_Registry::get('config')->isFileWritable())
-    			{
-    				throw new Exception(Piwik_Translate('General_ConfigFileIsNotWritable', array("(config/config.ini.php)","<br/>")));
-    			}
+				if(!Piwik_Config::getInstance()->isFileWritable())
+				{
+					throw new Exception(Piwik_Translate('General_ConfigFileIsNotWritable', array("(config/config.ini.php)","<br/>")));
+				}
+
 				$user['password'] = md5($password);
-				Zend_Registry::get('config')->superuser = $user;
+				Piwik_Config_Writer::getInstance()->superuser = $user;
 			}
 			else
 			{
@@ -352,12 +353,12 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 		$user = null;
 		if( $loginMail == Piwik::getSuperUserEmail()
-			|| $loginMail == Zend_Registry::get('config')->superuser->login )
+			|| $loginMail == Piwik_Config::getInstance()->superuser['login'] )
 		{
 			$user = array(
-					'login' => Zend_Registry::get('config')->superuser->login,
+					'login' => Piwik_Config::getInstance()->superuser['login'],
 					'email' => Piwik::getSuperUserEmail(),
-					'password' => Zend_Registry::get('config')->superuser->password,
+					'password' => Piwik_Config::getInstance()->superuser['password'],
 			);
 		}
 		else if( Piwik_UsersManager_API::getInstance()->userExists($loginMail) )
@@ -431,7 +432,7 @@ class Piwik_Login_Controller extends Piwik_Controller
 	 */
 	static public function clearSession()
 	{
-		$authCookieName = Zend_Registry::get('config')->General->login_cookie_name;
+		$authCookieName = Piwik_Config::getInstance()->General['login_cookie_name'];
 		$cookie = new Piwik_Cookie($authCookieName);
 		$cookie->delete();
 
@@ -458,7 +459,7 @@ class Piwik_Login_Controller extends Piwik_Controller
 	 */
 	protected function checkForceSslLogin()
 	{
-		$forceSslLogin = Zend_Registry::get('config')->General->force_ssl_login;
+		$forceSslLogin = Piwik_Config::getInstance()->General['force_ssl_login'];
 		if($forceSslLogin
 			&& !Piwik::isHttps())
 		{
diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 92dd6bfb95..1f836e72cb 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -84,9 +84,9 @@ class Piwik_Login extends Piwik_Plugin
 			return;
 		}
 
-		$authCookieName = Zend_Registry::get('config')->General->login_cookie_name;
+		$authCookieName = Piwik_Config::getInstance()->General['login_cookie_name'];
 		$authCookieExpiry = 0;
-		$authCookiePath = Zend_Registry::get('config')->General->login_cookie_path;
+		$authCookiePath = Piwik_Config::getInstance()->General['login_cookie_path'];
 		$authCookie = new Piwik_Cookie($authCookieName, $authCookieExpiry, $authCookiePath);
 		$defaultLogin = 'anonymous';
 		$defaultTokenAuth = 'anonymous';
@@ -119,9 +119,9 @@ class Piwik_Login extends Piwik_Plugin
 		$auth->setTokenAuth($tokenAuth);
 		$authResult = $auth->authenticate();
 
-		$authCookieName = Zend_Registry::get('config')->General->login_cookie_name;
-		$authCookieExpiry = $rememberMe ? time() + Zend_Registry::get('config')->General->login_cookie_expire : 0;
-		$authCookiePath = Zend_Registry::get('config')->General->login_cookie_path;
+		$authCookieName = Piwik_Config::getInstance()->General['login_cookie_name'];
+		$authCookieExpiry = $rememberMe ? time() + Piwik_Config::getInstance()->General['login_cookie_expire'] : 0;
+		$authCookiePath = Piwik_Config::getInstance()->General['login_cookie_path'];
 		$cookie = new Piwik_Cookie($authCookieName, $authCookieExpiry, $authCookiePath);
 		if(!$authResult->isValid())
 
diff --git a/plugins/Login/tests/Login.test.php b/plugins/Login/tests/Login.test.php
index 207bf4124e..ef6815ba15 100644
--- a/plugins/Login/tests/Login.test.php
+++ b/plugins/Login/tests/Login.test.php
@@ -12,12 +12,12 @@ require_once 'Database.test.php';
 
 class Test_Piwik_Login extends Test_Database
 {
-    function setUp()
-    {
-    	parent::setUp();
+	function setUp()
+	{
+		parent::setUp();
     	
 		// setup the access layer
-    	$pseudoMockAccess = new FakeAccess;
+		$pseudoMockAccess = new FakeAccess;
 		FakeAccess::setIdSitesView( array(1,2));
 		FakeAccess::setIdSitesAdmin( array(3,4));
 		
@@ -26,12 +26,12 @@ class Test_Piwik_Login extends Test_Database
 		Zend_Registry::set('access', $pseudoMockAccess);
 		
 		// we make sure the tests don't depend on the config file content
-		Zend_Registry::get('config')->superuser = array(
+		Piwik_Config::getInstance()->superuser = array(
 			'login'=>'superusertest',
 			'password'=>md5('passwordsuperusertest'),
 			'email'=>'superuser@example.com'
 		);
-    }
+	}
 
 	public function test_authenticate()
 	{
@@ -175,7 +175,7 @@ class Test_Piwik_Login extends Test_Database
 		$rc = $auth->authenticate();
 		$this->assertEqual( $rc->getCode(), Piwik_Auth_Result::SUCCESS );
 
-		$user = Zend_Registry::get('config')->superuser->toArray();
+		$user = Piwik_Config::getInstance()->superuser;
 		$password = $user['password'];
 		$tokenAuth = Piwik_UsersManager_API::getInstance()->getTokenAuth($user['login'], $password);