X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=install%2Findex.php;h=e02952e011f2b032dccb20a58a1b6cdb6eace1cc;hb=03303cd71b61f194d3460898c0544186e4c9b85f;hp=d31bad8922035aae10fb358512b1af34c5bc2e6d;hpb=fb5a9666ed99abe16b8823a98aed1a6dce03bb04;p=github%2Fwallabag%2Fwallabag.git diff --git a/install/index.php b/install/index.php index d31bad89..e02952e0 100644 --- 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,7 +46,7 @@ if ($_POST['download']) { } } } -else if ($_POST['install']) { +else if (isset($_POST['install'])) { if (!is_dir('vendor')) { $errors[] = 'You must install twig before.'; } @@ -64,6 +85,7 @@ else if ($_POST['install']) { else { $db_path = 'sqlite:' . realpath('') . '/db/poche.sqlite'; $handle = new PDO($db_path); + $sql_structure = ""; } } else { @@ -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']) { - wallabag — installation + wallabag - installation @@ -154,7 +176,7 @@ else if ($_POST['install']) { - + @@ -172,7 +194,7 @@ else if ($_POST['install']) {
  • wallabag.org
    • -
    +

    Errors during installation:

    -
    +

      @@ -194,14 +216,22 @@ else if ($_POST['install']) {

    + + +
    +

    + wallabag seems already installed. If you want to update it, you only have to delete install folder, then reload this page. +

    +
    +

    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.

    Technical settings -
    wallabag needs twig, a template engine (?). Two ways to install it: +
    wallabag needs twig, a template engine (?). Two ways to install it:
    • automatically download and extract vendor.zip into your wallabag folder.

      @@ -217,7 +247,11 @@ php composer.phar install

      • Database engine:

        -
        • +
      • +
        +

        You have to enable pdo_sqlite extension.

        +
        +
        • @@ -233,7 +267,7 @@ php composer.phar install
          • - id
          • +
      @@ -255,26 +289,49 @@ php composer.phar install

    - +