From 1ac09e7fe4a5408290d06116c6fb8152e018fe26 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Tue, 31 Dec 2013 02:59:07 +0100
Subject: Multi-utilisateur fonctionnel en HTTP Auth
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ Possibilité d'ajout / suppression d'utilisateur (seulement par
l'administrateur)
+ Divers changements pour le mode multi-utilisateur
https://github.com/marienfressinaud/FreshRSS/issues/126
+ Minz : Renomme "sel_application" en "salt'
---
 app/Models/UserDAO.php | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 app/Models/UserDAO.php

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

diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
new file mode 100644
index 000000000..afa049fb9
--- /dev/null
+++ b/app/Models/UserDAO.php
@@ -0,0 +1,33 @@
+<?php
+
+class FreshRSS_UserDAO extends Minz_ModelPdo {
+	public function createUser($username) {
+		require_once(APP_PATH . '/sql.php');
+		$db = Minz_Configuration::dataBase();
+
+		$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_');
+		$stm = $this->bd->prepare($sql, array(PDO::ATTR_EMULATE_PREPARES => true));
+		if ($stm && $stm->execute()) {
+			return true;
+		} else {
+			$info = $stm->errorInfo();
+			Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
+			return false;
+		}
+	}
+
+	public function deleteUser($username) {
+		require_once(APP_PATH . '/sql.php');
+		$db = Minz_Configuration::dataBase();
+
+		$sql = sprintf(SQL_DROP_TABLES, $db['prefix'] . $username . '_');
+		$stm = $this->bd->prepare($sql);
+		if ($stm && $stm->execute()) {
+			return true;
+		} else {
+			$info = $stm->errorInfo();
+			Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
+			return false;
+		}
+	}
+}
-- 
cgit v1.2.3


From a08201c41486815de25c71f5497e939631ea68b4 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 1 Jan 2014 15:08:15 +0100
Subject: SQL : Insère la catégorie par défaut dès la création des tables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/UserDAO.php | 5 ++++-
 app/sql.php            | 2 ++
 p/i/install.php        | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/app/Models/UserDAO.php b/app/Models/UserDAO.php
index afa049fb9..a25b57f89 100644
--- a/app/Models/UserDAO.php
+++ b/app/Models/UserDAO.php
@@ -7,7 +7,10 @@ class FreshRSS_UserDAO extends Minz_ModelPdo {
 
 		$sql = sprintf(SQL_CREATE_TABLES, $db['prefix'] . $username . '_');
 		$stm = $this->bd->prepare($sql, array(PDO::ATTR_EMULATE_PREPARES => true));
-		if ($stm && $stm->execute()) {
+		$values = array(
+			'catName' => Minz_Translate::t('default_category'),
+		);
+		if ($stm && $stm->execute($values)) {
 			return true;
 		} else {
 			$info = $stm->errorInfo();
diff --git a/app/sql.php b/app/sql.php
index 8646b4da5..5a28858a7 100644
--- a/app/sql.php
+++ b/app/sql.php
@@ -52,6 +52,8 @@ CREATE TABLE IF NOT EXISTS `%1$sentry` (
 	INDEX (`is_read`)	-- v0.7
 ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
 ENGINE = INNODB;
+
+INSERT INTO `%1$scategory` (name) VALUES(:catName);
 ');
 
 define('SQL_DROP_TABLES', 'DROP TABLES %1$sentry, %1$sfeed, %1$scategory');
diff --git a/p/i/install.php b/p/i/install.php
index 0cd952fef..3316d222b 100644
--- a/p/i/install.php
+++ b/p/i/install.php
@@ -585,7 +585,10 @@ function checkBD () {
 
 		$sql = sprintf(SQL_CREATE_TABLES, $_SESSION['bd_prefix_user']);
 		$stm = $c->prepare($sql, array(PDO::ATTR_EMULATE_PREPARES => true));
-		$ok = $stm->execute();
+		$values = array(
+			'catName' => _t('default_category'),
+		);
+		$ok = $stm->execute($values);
 	} catch (PDOException $e) {
 		$error = true;
 	}
-- 
cgit v1.2.3