Merge pull request #665 from mariroz/dev

[github/wallabag/wallabag.git] / install / index.php
diff --git a/install/index.php b/install/index.php

old mode 100644 (file)

new mode 100755 (executable)

index e63b242..e702891
--- a/install/index.php
+++ b/install/index.php
@@ -24,7 +24,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 <a href="http://wllbg.org/vendor">download it manually<âˆ•a> and unzip it in your wallabag folder.';
+        $errors[] = 'Impossible to download vendor.zip. Please <a href="http://wllbg.org/vendor">download it manually</a> and unzip it in your wallabag folder.';
      }
      else {
          if (extension_loaded('zip')) {
@@ -53,7 +53,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 +101,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 +165,7 @@ else if (isset($_POST['install'])) {
          <!--[if IE]>
          <meta http-equiv="X-UA-Compatible" content="IE=10">
          <![endif]-->
-        <title>wallabag â€” installation</title>
+        <title>wallabag - installation</title>
          <link rel="shortcut icon" type="image/x-icon" href="themes/baggy/img/favicon.ico" />
          <link rel="apple-touch-icon-precomposed" sizes="144x144" href="themes/baggy/img/apple-touch-icon-144x144-precomposed.png">
          <link rel="apple-touch-icon-precomposed" sizes="72x72" href="themes/baggy/img/apple-touch-icon-72x72-precomposed.png">
@@ -176,7 +176,7 @@ else if (isset($_POST['install'])) {
          <link rel="stylesheet" href="themes/baggy/css/main.css" media="all">
          <link rel="stylesheet" href="themes/baggy/css/messages.css" media="all">
          <link rel="stylesheet" href="themes/baggy/css/print.css" media="print">
-        <script src="themes/baggy/js/jquery-2.0.3.min.js"></script>
+        <script src="themes/default/js/jquery-2.0.3.min.js"></script>
          <script src="themes/baggy/js/init.js"></script>
      </head>
      <body>
@@ -262,7 +262,7 @@ php composer.phar install</code></pre></li>
                                  </ul>
                              </li>
                              <li>
-                                <label for="postgresql">PostgreSQL</label> <input name="db_engine" type="radio" id="postgresql" value="postgresql" />
+                                <label for="postgres">PostgreSQL</label> <input name="db_engine" type="radio" id="postgres" value="postgres" />
                                  <ul id="pg_infos">
                                      <li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li>
                                      <li><label for="pg_database">Database</label> <input type="text" placeholder="wallabag" id="pg_database" name="pg_database" /></li>
@@ -316,7 +316,7 @@ php composer.phar install</code></pre></li>
                          $("#install_button").show();
                      }
                      else {
-                        if ( $("#postgresql").prop('checked')) {
+                        if ( $("#postgres").prop('checked')) {
                              $("#mysql_infos").hide();
                              $("#pg_infos").show();
                              $("#pdo_sqlite").hide();