aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-09-28 02:43:50 -0700
committerredmatrix <mike@macgirvin.com>2016-09-28 02:43:50 -0700
commitdb95e6eba597cbe51ba7c328fa921787cab46f6e (patch)
treecf4e2f57d73054714370496d25c627d1d7b76562
parent71632ac2d2024a58456c1ed429890359d3ae5986 (diff)
downloadvolse-hubzilla-db95e6eba597cbe51ba7c328fa921787cab46f6e.tar.gz
volse-hubzilla-db95e6eba597cbe51ba7c328fa921787cab46f6e.tar.bz2
volse-hubzilla-db95e6eba597cbe51ba7c328fa921787cab46f6e.zip
issue #537 - angle bracket characters in DB password not recognised
-rw-r--r--Zotlabs/Module/Setup.php36
1 files changed, 18 insertions, 18 deletions
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 22a7be99e..9945754a9 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -279,15 +279,15 @@ class Setup extends \Zotlabs\Web\Controller {
case 2: { // Database config
- $dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : '127.0.0.1');
- $dbuser = notags(trim($_POST['dbuser']));
- $dbport = intval(notags(trim($_POST['dbport'])));
- $dbpass = notags(trim($_POST['dbpass']));
- $dbdata = notags(trim($_POST['dbdata']));
- $dbtype = intval(notags(trim($_POST['dbtype'])));
- $phpath = notags(trim($_POST['phpath']));
- $adminmail = notags(trim($_POST['adminmail']));
- $siteurl = notags(trim($_POST['siteurl']));
+ $dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
+ $dbuser = trim($_POST['dbuser']);
+ $dbport = intval(trim($_POST['dbport']));
+ $dbpass = trim($_POST['dbpass']);
+ $dbdata = trim($_POST['dbdata']);
+ $dbtype = intval(trim($_POST['dbtype']));
+ $phpath = trim($_POST['phpath']);
+ $adminmail = trim($_POST['adminmail']);
+ $siteurl = trim($_POST['siteurl']);
$tpl = get_markup_template('install_db.tpl');
$o .= replace_macros($tpl, array(
@@ -320,16 +320,16 @@ class Setup extends \Zotlabs\Web\Controller {
}; break;
case 3: { // Site settings
require_once('include/datetime.php');
- $dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : '127.0.0.1');
- $dbport = intval(notags(trim($_POST['dbuser'])));
- $dbuser = notags(trim($_POST['dbuser']));
- $dbpass = notags(trim($_POST['dbpass']));
- $dbdata = notags(trim($_POST['dbdata']));
- $dbtype = intval(notags(trim($_POST['dbtype'])));
- $phpath = notags(trim($_POST['phpath']));
+ $dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
+ $dbport = intval(trim($_POST['dbuser']));
+ $dbuser = trim($_POST['dbuser']);
+ $dbpass = trim($_POST['dbpass']);
+ $dbdata = trim($_POST['dbdata']);
+ $dbtype = intval(trim($_POST['dbtype']));
+ $phpath = trim($_POST['phpath']);
- $adminmail = notags(trim($_POST['adminmail']));
- $siteurl = notags(trim($_POST['siteurl']));
+ $adminmail = trim($_POST['adminmail']);
+ $siteurl = trim($_POST['siteurl']);
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
$server_roles = [