From d1d3498b62d00a88968378a3244ffd479a852b2e Mon Sep 17 00:00:00 2001
From: Lonnytunes <lonnytunes@gmx.fr>
Date: Mon, 20 Jan 2014 00:44:51 +0100
Subject: [fix] Stops multiplication, in database, of a same user config item
 (error of variable name).

---
 inc/poche/Database.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/poche/Database.class.php')

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 04731821..48ec5abf 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -193,7 +193,7 @@ class Database {
     public function updateUserConfig($userId, $key, $value) {
         $config = $this->getConfigUser($userId);
         
-        if (!isset ($user_config[$key])) {
+        if (! isset($config[$key])) {
             $sql = "INSERT INTO users_config (value, user_id, name) VALUES (?, ?, ?)";
         }
         else {
-- 
cgit v1.2.3


From c95b78a8ceb918f033f3dd6c26aa7da4a8a527dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Tue, 28 Jan 2014 10:36:04 +0100
Subject: poche is dead, welcome wallabag

---
 inc/poche/Database.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'inc/poche/Database.class.php')

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 48ec5abf..3b0f455e 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * poche, a read it later open source system
+ * wallabag, self hostable application allowing you to not miss any content anymore
  *
- * @category   poche
- * @author     Nicolas Lœuillet <support@inthepoche.com>
+ * @category   wallabag
+ * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
  * @copyright  2013
  * @license    http://www.wtfpl.net/ see COPYING file
  */
-- 
cgit v1.2.3


From 6af66b1106e67a8dc467a70e8e57d7963b09936b Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Thu, 30 Jan 2014 16:35:31 +0200
Subject: fix of bug #368 Endless redirects or user doesn't exist with basic
 authentication

---
 inc/poche/Database.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'inc/poche/Database.class.php')

diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 3b0f455e..0457af69 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -165,9 +165,14 @@ class Database {
         }
     }
 
-    public function login($username, $password) {
-        $sql = "SELECT * FROM users WHERE username=? AND password=?";
-        $query = $this->executeQuery($sql, array($username, $password));
+    public function login($username, $password, $isauthenticated=false) {
+        if ($isauthenticated) {
+          $sql = "SELECT * FROM users WHERE username=?";
+          $query = $this->executeQuery($sql, array($username));
+        } else {
+          $sql = "SELECT * FROM users WHERE username=? AND password=?";
+          $query = $this->executeQuery($sql, array($username, $password));
+        }
         $login = $query->fetchAll();
 
         $user = array();
-- 
cgit v1.2.3