diff options
author | tcit <tcit@tcit.fr> | 2014-04-23 22:39:43 +0200 |
---|---|---|
committer | tcit <tcit@tcit.fr> | 2014-04-23 22:39:43 +0200 |
commit | feecea2806307acc79be1414048ccea11bc946ad (patch) | |
tree | baf72c1611f27f259ca2f10adeff492e90cfebce /install/index.php | |
parent | 07da8611267edca21ae8addd13ae432ac0ce4b68 (diff) | |
download | wallabag-feecea2806307acc79be1414048ccea11bc946ad.tar.gz wallabag-feecea2806307acc79be1414048ccea11bc946ad.tar.zst wallabag-feecea2806307acc79be1414048ccea11bc946ad.zip |
Fix #657 and postgresql problems
Diffstat (limited to 'install/index.php')
-rwxr-xr-x | install/index.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install/index.php b/install/index.php index b6c6abec..e702891b 100755 --- a/install/index.php +++ b/install/index.php | |||
@@ -101,7 +101,7 @@ else if (isset($_POST['install'])) { | |||
101 | 101 | ||
102 | $sql_structure = file_get_contents('install/mysql.sql'); | 102 | $sql_structure = file_get_contents('install/mysql.sql'); |
103 | } | 103 | } |
104 | else if ($_POST['db_engine'] == 'postgresql') { | 104 | else if ($_POST['db_engine'] == 'postgres') { |
105 | $db_path = 'pgsql:host=' . $_POST['pg_server'] . ';dbname=' . $_POST['pg_database']; | 105 | $db_path = 'pgsql:host=' . $_POST['pg_server'] . ';dbname=' . $_POST['pg_database']; |
106 | $content = str_replace("define ('STORAGE_SERVER', 'localhost');", "define ('STORAGE_SERVER', '".$_POST['pg_server']."');", $content); | 106 | $content = str_replace("define ('STORAGE_SERVER', 'localhost');", "define ('STORAGE_SERVER', '".$_POST['pg_server']."');", $content); |
107 | $content = str_replace("define ('STORAGE_DB', 'poche');", "define ('STORAGE_DB', '".$_POST['pg_database']."');", $content); | 107 | $content = str_replace("define ('STORAGE_DB', 'poche');", "define ('STORAGE_DB', '".$_POST['pg_database']."');", $content); |
@@ -262,7 +262,7 @@ php composer.phar install</code></pre></li> | |||
262 | </ul> | 262 | </ul> |
263 | </li> | 263 | </li> |
264 | <li> | 264 | <li> |
265 | <label for="postgresql">PostgreSQL</label> <input name="db_engine" type="radio" id="postgresql" value="postgresql" /> | 265 | <label for="postgres">PostgreSQL</label> <input name="db_engine" type="radio" id="postgres" value="postgres" /> |
266 | <ul id="pg_infos"> | 266 | <ul id="pg_infos"> |
267 | <li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li> | 267 | <li><label for="pg_server">Server</label> <input type="text" placeholder="localhost" id="pg_server" name="pg_server" /></li> |
268 | <li><label for="pg_database">Database</label> <input type="text" placeholder="wallabag" id="pg_database" name="pg_database" /></li> | 268 | <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> | |||
316 | $("#install_button").show(); | 316 | $("#install_button").show(); |
317 | } | 317 | } |
318 | else { | 318 | else { |
319 | if ( $("#postgresql").prop('checked')) { | 319 | if ( $("#postgres").prop('checked')) { |
320 | $("#mysql_infos").hide(); | 320 | $("#mysql_infos").hide(); |
321 | $("#pg_infos").show(); | 321 | $("#pg_infos").show(); |
322 | $("#pdo_sqlite").hide(); | 322 | $("#pdo_sqlite").hide(); |