X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=install%2Findex.php;h=1ae782a2bc8656d68e4e61871e3e0e3075945f53;hb=887b015def3098f1e898e7bf3338fa2d093b6d95;hp=599bbe2bb7612936a9606d7542251128f6ac34cc;hpb=d6d8a045e6a16525807453f0d1229f5bdc307dd0;p=github%2Fwallabag%2Fwallabag.git diff --git a/install/index.php b/install/index.php old mode 100644 new mode 100755 index 599bbe2b..1ae782a2 --- a/install/index.php +++ b/install/index.php @@ -1,9 +1,39 @@ + * @copyright 2013 + * @license http://opensource.org/licenses/MIT see COPYING file + */ + $errors = array(); $successes = array(); + +/* Function taken from at http://php.net/manual/en/function.rmdir.php#110489 + * Idea : nbari at dalmp dot com + * Rights unknown + * Here in case of .gitignore files + */ +function delTree($dir) { + $files = array_diff(scandir($dir), array('.','..')); + foreach ($files as $file) { + (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file"); + } + return rmdir($dir); + } + +if (isset($_GET['clean'])) { + if (is_dir('install')){ + delTree('install'); + header('Location: index.php'); + } +} + 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')) { @@ -32,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; } @@ -64,11 +94,11 @@ else if (isset($_POST['install'])) { else { $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite'; $handle = new PDO($db_path); + $sql_structure = ""; } } else { $content = file_get_contents('inc/poche/config.inc.php'); - $sql_structure = ''; if ($_POST['db_engine'] == 'mysql') { $db_path = 'mysql:host=' . $_POST['mysql_server'] . ';dbname=' . $_POST['mysql_database']; @@ -80,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); @@ -130,7 +160,7 @@ else if (isset($_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 !'; } } } @@ -144,7 +174,7 @@ else if (isset($_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.