From 43c7b978c31bcbf9e8e5202ecbb7b6fccba6a7fa Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Tue, 22 Apr 2014 20:58:40 +0300
Subject: config.inc.php.new renamed in config.inc.default.php

---
 install/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 install/index.php

(limited to 'install/index.php')

diff --git a/install/index.php b/install/index.php
old mode 100644
new mode 100755
index e02952e0..b6c6abec
--- a/install/index.php
+++ b/install/index.php
@@ -53,7 +53,7 @@ else if (isset($_POST['install'])) {
     else {
         $continue = true;
         // Create config.inc.php
-        if (!copy('inc/poche/config.inc.php.new', 'inc/poche/config.inc.php')) {
+        if (!copy('inc/poche/config.inc.default.php', 'inc/poche/config.inc.php')) {
             $errors[] = 'Installation aborted, impossible to create inc/poche/config.inc.php file. Maybe you don\'t have write access to create it.';
             $continue = false;
         }
-- 
cgit v1.2.3


From feecea2806307acc79be1414048ccea11bc946ad Mon Sep 17 00:00:00 2001
From: tcit <tcit@tcit.fr>
Date: Wed, 23 Apr 2014 22:39:43 +0200
Subject: Fix #657 and postgresql problems

---
 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 b6c6abec..e702891b 100755
--- a/install/index.php
+++ b/install/index.php
@@ -101,7 +101,7 @@ else if (isset($_POST['install'])) {
 
                     $sql_structure = file_get_contents('install/mysql.sql');
                 }
-                else if ($_POST['db_engine'] == 'postgresql') {
+                else if ($_POST['db_engine'] == 'postgres') {
                     $db_path = 'pgsql:host=' . $_POST['pg_server'] . ';dbname=' . $_POST['pg_database'];
                     $content = str_replace("define ('STORAGE_SERVER', 'localhost');", "define ('STORAGE_SERVER', '".$_POST['pg_server']."');", $content);
                     $content = str_replace("define ('STORAGE_DB', 'poche');", "define ('STORAGE_DB', '".$_POST['pg_database']."');", $content);
@@ -262,7 +262,7 @@ php composer.phar install</code></pre></li>
                                 </ul>
                             </li>
                             <li>
-                                <label for="postgresql">PostgreSQL</label> <input name="db_engine" type="radio" id="postgresql" value="postgresql" />
+                                <label for="postgres">PostgreSQL</label> <input name="db_engine" type="radio" id="postgres" value="postgres" />
                                 <ul id="pg_infos">
                                     <li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li>
                                     <li><label for="pg_database">Database</label> <input type="text" placeholder="wallabag" id="pg_database" name="pg_database" /></li>
@@ -316,7 +316,7 @@ php composer.phar install</code></pre></li>
                         $("#install_button").show();
                     }
                     else {
-                        if ( $("#postgresql").prop('checked')) {
+                        if ( $("#postgres").prop('checked')) {
                             $("#mysql_infos").hide();
                             $("#pg_infos").show();
                             $("#pdo_sqlite").hide();
-- 
cgit v1.2.3