X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=install%2Findex.php;h=e702891bb711d680830625a48cddd7c4273ef7de;hb=69213014d1fb8f05cffe7bf83467d938a282f29b;hp=975b997f1f5a2ebb026f0f7772891249cff3074d;hpb=6203ef8e51c8b2712e54a01a183f30d282926b0b;p=github%2Fwallabag%2Fwallabag.git diff --git a/install/index.php b/install/index.php old mode 100644 new mode 100755 index 975b997f..e702891b --- a/install/index.php +++ b/install/index.php @@ -1,9 +1,30 @@ 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')) { @@ -25,14 +46,14 @@ if ($_POST['download']) { } } } -else if ($_POST['install']) { +else if (isset($_POST['install'])) { if (!is_dir('vendor')) { $errors[] = 'You must install twig before.'; } 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; } @@ -64,6 +85,7 @@ else if ($_POST['install']) { else { $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite'; $handle = new PDO($db_path); + $sql_structure = ""; } } else { @@ -79,7 +101,7 @@ else if ($_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); @@ -129,7 +151,7 @@ else if ($_POST['install']) { $params = array($id_user, 'language', 'en_EN.UTF8'); $query = executeQuery($handle, $sql, $params); - $successes[] = 'wallabag is now installed. Don\'t forget to delete install folder. Then, reload this page.'; + $successes[] = 'wallabag is now installed. You can now access it !'; } } } @@ -143,7 +165,7 @@ else if ($_POST['install']) { -
To install wallabag, you just have to fill the following fields. That's all.
-Don't forget to check your server compatibility here.
+Don't forget to check your server compatibility here.