From 3602405ec0dbc576fce09ff9e865ba2404622080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 11 Jul 2014 16:03:59 +0200
Subject: WHAT. A. BIG. REFACTOR. + new license (we moved to MIT one)

---
 install/index.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'install/index.php')

diff --git a/install/index.php b/install/index.php
index e702891b..1ae782a2 100755
--- a/install/index.php
+++ b/install/index.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * wallabag, self hostable application allowing you to not miss any content anymore
+ *
+ * @category   wallabag
+ * @author     Nicolas Lœuillet <nicolas@loeuillet.org>
+ * @copyright  2013
+ * @license    http://opensource.org/licenses/MIT see COPYING file
+ */
+
 $errors = array();
 $successes = array();
 
-- 
cgit v1.2.3


From 046b9316244c7a3a19446b2425d2370a26246af0 Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Fri, 25 Jul 2014 08:42:03 +0200
Subject: added email field

---
 install/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'install/index.php')

diff --git a/install/index.php b/install/index.php
index 1ae782a2..9ed62de1 100755
--- a/install/index.php
+++ b/install/index.php
@@ -292,9 +292,11 @@ php composer.phar install</code></pre></li>
                     <p>
                         <label for="password">Password</label>
                         <input type="password" required id="password" name="password" value="wallabag" />
+                        <label for="show">Show password:</label> <input style="margin-left:-80px;" name="show" id="show" type="checkbox" onchange="document.getElementById('password').type = this.checked ? 'text' : 'password'">
                     </p>
                     <p>
-                        <label for="show">Show password:</label> <input name="show" id="show" type="checkbox" onchange="document.getElementById('password').type = this.checked ? 'text' : 'password'">
+                        <label for="email">Email (not required)</label>
+                        <input type="email" id="email" name="email" />
                     </p>
                 </fieldset>
 
-- 
cgit v1.2.3


From 0dc4797a4cbc91467ec2d9816d102942ddc0605f Mon Sep 17 00:00:00 2001
From: Robert Ros <robert@robertros.nl>
Date: Sat, 20 Sep 2014 16:38:41 +0200
Subject: Fix the PostgreSQL install errors

---
 install/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'install/index.php')

diff --git a/install/index.php b/install/index.php
index 1ae782a2..ba7c4b0f 100755
--- a/install/index.php
+++ b/install/index.php
@@ -141,16 +141,16 @@ else if (isset($_POST['install'])) {
                 }
 
                 // create database structure
-                $query = executeQuery($handle, $sql_structure, array());
+                $query = $handle->exec($sql_structure);
 
                 // Create user
                 $handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-                $sql = 'INSERT INTO users (username, password, name) VALUES (?, ?, ?)';
+                $sql = "INSERT INTO users (username, password, name, email) VALUES (?, ?, ?, '')";
                 $params = array($username, $salted_password, $username);
                 $query = executeQuery($handle, $sql, $params);
 
-                $id_user = $handle->lastInsertId();
+                $id_user = (int)$handle->lastInsertId('users_id_seq');
 
                 $sql = 'INSERT INTO users_config ( user_id, name, value ) VALUES (?, ?, ?)';
                 $params = array($id_user, 'pager', '10');
-- 
cgit v1.2.3