X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=install%2Findex.php;h=1ae782a2bc8656d68e4e61871e3e0e3075945f53;hb=887b015def3098f1e898e7bf3338fa2d093b6d95;hp=e63b24239bab2a7c640d6f63fbd040368d2c39aa;hpb=1be13ba1fc6466f94ae4416dcd9eece9b5b4f9a0;p=github%2Fwallabag%2Fwallabag.git diff --git a/install/index.php b/install/index.php old mode 100644 new mode 100755 index e63b2423..1ae782a2 --- a/install/index.php +++ b/install/index.php @@ -1,4 +1,13 @@ + * @copyright 2013 + * @license http://opensource.org/licenses/MIT see COPYING file + */ + $errors = array(); $successes = array(); @@ -24,7 +33,7 @@ if (isset($_GET['clean'])) { if (isset($_POST['download'])) { if (!file_put_contents("cache/vendor.zip", fopen("http://static.wallabag.org/files/vendor.zip", 'r'))) { - $errors[] = 'Impossible to download vendor.zip. Please download it manually<∕a> and unzip it in your wallabag folder.'; + $errors[] = 'Impossible to download vendor.zip. Please download it manually and unzip it in your wallabag folder.'; } else { if (extension_loaded('zip')) { @@ -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); @@ -165,7 +174,7 @@ else if (isset($_POST['install'])) { - wallabag — installation + wallabag - installation @@ -176,7 +185,7 @@ else if (isset($_POST['install'])) { - + @@ -262,7 +271,7 @@ php composer.phar install
  • - +