harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #537 - angle bracket characters in DB password not recognised

Browse Source
This commit is contained in:
redmatrix 2016-09-28 02:43:50 -07:00
parent 71632ac2d2
commit db95e6eba5
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Zotlabs/Module/Setup.php
View File

@ -279,15 +279,15 @@ class Setup extends \Zotlabs\Web\Controller {
case 2: { // Database config case 2: { // Database config
$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : '127.0.0.1'); $dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
$dbuser = notags(trim($_POST['dbuser'])); $dbuser = trim($_POST['dbuser']);
$dbport = intval(notags(trim($_POST['dbport']))); $dbport = intval(trim($_POST['dbport']));
$dbpass = notags(trim($_POST['dbpass'])); $dbpass = trim($_POST['dbpass']);
$dbdata = notags(trim($_POST['dbdata'])); $dbdata = trim($_POST['dbdata']);
$dbtype = intval(notags(trim($_POST['dbtype']))); $dbtype = intval(trim($_POST['dbtype']));
$phpath = notags(trim($_POST['phpath'])); $phpath = trim($_POST['phpath']);
$adminmail = notags(trim($_POST['adminmail'])); $adminmail = trim($_POST['adminmail']);
$siteurl = notags(trim($_POST['siteurl'])); $siteurl = trim($_POST['siteurl']);
$tpl = get_markup_template('install_db.tpl'); $tpl = get_markup_template('install_db.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
@ -320,16 +320,16 @@ class Setup extends \Zotlabs\Web\Controller {
}; break; }; break;
case 3: { // Site settings case 3: { // Site settings
require_once('include/datetime.php'); require_once('include/datetime.php');
$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : '127.0.0.1'); $dbhost = ((x($_POST,'dbhost')) ? trim($_POST['dbhost']) : '127.0.0.1');
$dbport = intval(notags(trim($_POST['dbuser']))); $dbport = intval(trim($_POST['dbuser']));
$dbuser = notags(trim($_POST['dbuser'])); $dbuser = trim($_POST['dbuser']);
$dbpass = notags(trim($_POST['dbpass'])); $dbpass = trim($_POST['dbpass']);
$dbdata = notags(trim($_POST['dbdata'])); $dbdata = trim($_POST['dbdata']);
$dbtype = intval(notags(trim($_POST['dbtype']))); $dbtype = intval(trim($_POST['dbtype']));
$phpath = notags(trim($_POST['phpath'])); $phpath = trim($_POST['phpath']);
$adminmail = notags(trim($_POST['adminmail'])); $adminmail = trim($_POST['adminmail']);
$siteurl = notags(trim($_POST['siteurl'])); $siteurl = trim($_POST['siteurl']);
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
$server_roles = [ $server_roles = [