From 92efd68a3a13e49fe7bbfb8441611c0dcd639415 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 30 Dec 2013 01:03:32 +0100
Subject: Début de mode multi-utilisateur avec http_auth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ Légère optimisation de Minz_View.
+ Encore plus de tests de bibliothèques dans install.php
Contribue à https://github.com/marienfressinaud/FreshRSS/issues/126 et
https://github.com/marienfressinaud/FreshRSS/issues/303
---
 app/Models/Configuration.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'app/Models/Configuration.php')

diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index b0a5d9940..ec7daaa7d 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -59,10 +59,9 @@ class FreshRSS_Configuration extends Minz_ModelArray {
 		'fr' => 'Français',
 	);
 
-	public function __construct ($filename = '') {
-		if (empty($filename)) {
-			$filename = DATA_PATH . '/' . Minz_Configuration::currentUser () . '_user.php';
-		}
+	public function __construct ($user) {
+		$filename = DATA_PATH . '/' . $user . '_user.php';
+
 		parent::__construct($filename);
 		$data = parent::loadArray();
 
@@ -72,6 +71,7 @@ class FreshRSS_Configuration extends Minz_ModelArray {
 				$this->$function($value);
 			}
 		}
+		$this->data['user'] = $user;
 	}
 
 	public function save() {
@@ -151,10 +151,11 @@ class FreshRSS_Configuration extends Minz_ModelArray {
 		}
 	}
 	public function _mail_login ($value) {
-		if (filter_var($value, FILTER_VALIDATE_EMAIL)) {
-			$this->mail_login = $value;
+		$value = filter_var($value, FILTER_VALIDATE_EMAIL);
+		if ($value) {
+			$this->data['mail_login'] = $value;
 		} else {
-			$this->mail_login = '';
+			$this->data['mail_login'] = '';
 		}
 	}
 	public function _anon_access ($value) {
-- 
cgit v1.2.3