X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=install%2Findex.php;h=1ae782a2bc8656d68e4e61871e3e0e3075945f53;hb=657245dcbdbca323621952d2b6f9e991dd94fa03;hp=e02952e011f2b032dccb20a58a1b6cdb6eace1cc;hpb=a4585f7eaa74d5f705c1622ac2419ea1198a7aba;p=github%2Fwallabag%2Fwallabag.git

diff --git a/install/index.php b/install/index.php
old mode 100644
new mode 100755
index e02952e0..1ae782a2
--- 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();
 
@@ -53,7 +62,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;
         }
@@ -101,7 +110,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 +271,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 +325,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();