public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00
Code Issues Releases Wiki Activity

More fixes when installer generates config file.

Browse Source 
* Use single quotes in config.php when when defining database values so PHP doesn't interpret `$` as a variable (mostly for the password constant).
* Use `addcslashes` instead of `addslashes` and only escape backslash and single quotes.
* Do not convert DB_PORT to integer if leaving it blank (the default).
This commit is contained in:
JustAMacUser
2020-04-21 21:10:32 -04:00
parent 11a9d3bd9b
commit 9c3cf60592
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/index.php
Executable → Regular
+8 -6
View File
@@ -153,14 +153,16 @@
$rv = file_get_contents("../config.php-dist");
$escape_chars = "\\'";
$settings = [
"%DB_TYPE" => $DB_TYPE == 'pgsql' ? 'pgsql' : 'mysql',
"%DB_HOST" => addslashes($DB_HOST),
"%DB_USER" => addslashes($DB_USER),
"%DB_NAME" => addslashes($DB_NAME),
"%DB_PASS" => addslashes($DB_PASS),
"%DB_PORT" => intval($DB_PORT),
"%SELF_URL_PATH" => addslashes($SELF_URL_PATH)
"%DB_HOST" => addcslashes($DB_HOST, $escape_chars),
"%DB_USER" => addcslashes($DB_USER, $escape_chars),
"%DB_NAME" => addcslashes($DB_NAME, $escape_chars),
"%DB_PASS" => addcslashes($DB_PASS, $escape_chars),
"%DB_PORT" => $DB_PORT ? intval($DB_PORT) : '',
"%SELF_URL_PATH" => addcslashes($SELF_URL_PATH, $escape_chars)
];
$rv = str_replace(array_keys($settings), array_values($settings), $rv);