diff --git a/install/index.php b/install/index.php index 076cb8d..7e21ab1 100755 --- a/install/index.php +++ b/install/index.php @@ -44,10 +44,11 @@ if (extension_loaded('xmlreader')) { } $phpconfig['xml'] = $xml_ok; + /* 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 + * Here in case of .gitignore files to delete */ function delTree($dir) { $files = array_diff(scandir($dir), array('.','..')); @@ -57,6 +58,10 @@ function delTree($dir) { return rmdir($dir); } +/** + * Delete install directory + */ + if (isset($_GET['clean'])) { if (is_dir('install')){ delTree('install'); @@ -64,6 +69,10 @@ if (isset($_GET['clean'])) { } } + +/** + * Download vendor package + */ 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 and unzip it in your wallabag folder.'; @@ -88,6 +97,11 @@ if (isset($_POST['download'])) { } } } + +/** + * Installation + */ + else if (isset($_POST['install'])) { if (!is_dir('vendor')) { $errors[] = 'You must install twig before.'; @@ -247,6 +261,13 @@ else if (isset($_POST['install'])) { .pass{ background-color:#FF9500; } + + .nextstep { + background-color: #52CC5B; + padding: 10px; + border-radius: 5px; + display: inline-block; + } @@ -273,7 +294,7 @@ else if (isset($_POST['install'])) {

-

Please reload this page when you think you resolved these problems.

+ @@ -296,7 +317,7 @@ else if (isset($_POST['install'])) { -
+

: Compatibility Test

@@ -377,9 +398,9 @@ else if (isset($_POST['install'])) {

Status : Next Step

'; + echo 'Your webserver has all it needs for ' . $app_name . ' to work properly.
Next Step

'; } else { - echo 'Your webserver hasn\'t got the perfect configuration for ' . $app_name . ' to work properly, but it should work anyway.
You can try to fix some problems highlighted above.
Next Step

'; + echo 'Your webserver hasn\'t got the perfect configuration for ' . $app_name . ' to work properly, but it should work anyway.
You can try to fix some problems highlighted above.
Next Step

'; } } else { echo $app_name . ' can\'t work on this webserver. Please fix the problems highlighted above.'; @@ -388,7 +409,7 @@ else if (isset($_POST['install'])) { ?>

-
+

Twig installation

@@ -409,10 +430,11 @@ php composer.phar install
Twig is already installed. All good !
- Next Step + Next Step
-
+

Database installation

+ You must choose a database engine.

Database engine: @@ -443,20 +465,20 @@ php composer.phar install

-
You must choose a database system. +
    -
  • SQLite is the simplest of those three database systems. It just writes data into a file. You don't have to configure login informations of any kind.
    - The downfall is that it might be slower than other database systems with very large piece of data.
    +
  • SQLite is the simplest of those three database engines. It just writes data into a file. You don't have to configure login informations of any kind.
    + The downfall is that it might be slower than other database engines with very large piece of data.
    It is therefore recommanded if you begin with wallabag, or you don't want to deal with extra configuration.
  • -
  • MySQL (also known as MariaDB) is a very common database system on most servers.
    +
  • MySQL (also known as MariaDB) is a very common database engine on most servers.
    It should be faster than SQLite in most cases.
    You have to enter credentials to access it. Contact your server administrator if needed.
  • -
  • PostgreSQL is another database system very similar to MySQL, but less frequent on most hosting plans. However, some people prefer it since it may be faster than MySQL in some cases.
  • +
  • PostgreSQL is another database engine very similar to MySQL, but less frequent on most hosting plans. However, some people prefer it since it may be faster than MySQL in some cases.
- + Next step
-
+

User settings

@@ -518,6 +540,27 @@ php composer.phar install } } }); + $("#step2").hide(); + $("#step3").hide(); + $("#step4").hide(); + + $("#nextstep1").click(function() + { + $("#step1").hide(); + $("#step2").show(); + }); + + $("#nextstep2").click(function() + { + $("#step2").hide(); + $("#step3").show(); + }); + + $("#nextstep3").click(function() + { + $("#step3").hide(); + $("#step4").show(); + }); - \ No newline at end of file +