Fix undefined index notice messages in mod/install
This commit is contained in:
parent
0cbe3aa8e6
commit
39767fb366
1 changed files with 6 additions and 10 deletions
|
@ -161,13 +161,12 @@ function install_content(App $a) {
|
||||||
|
|
||||||
case 2: { // Database config
|
case 2: { // Database config
|
||||||
|
|
||||||
$dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
$dbhost = notags(trim(defaults($_POST, 'dbhost' , 'localhost')));
|
||||||
$dbuser = notags(trim($_POST['dbuser']));
|
$dbuser = notags(trim(defaults($_POST, 'dbuser' , '' )));
|
||||||
$dbpass = notags(trim($_POST['dbpass']));
|
$dbpass = notags(trim(defaults($_POST, 'dbpass' , '' )));
|
||||||
$dbdata = notags(trim($_POST['dbdata']));
|
$dbdata = notags(trim(defaults($_POST, 'dbdata' , '' )));
|
||||||
$phpath = notags(trim($_POST['phpath']));
|
$phpath = notags(trim(defaults($_POST, 'phpath' , '' )));
|
||||||
|
$adminmail = notags(trim(defaults($_POST, 'adminmail', '' )));
|
||||||
$adminmail = notags(trim($_POST['adminmail']));
|
|
||||||
|
|
||||||
$tpl = get_markup_template('install_db.tpl');
|
$tpl = get_markup_template('install_db.tpl');
|
||||||
$o .= replace_macros($tpl, [
|
$o .= replace_macros($tpl, [
|
||||||
|
@ -185,8 +184,6 @@ function install_content(App $a) {
|
||||||
'$dbdata' => ['dbdata', L10n::t('Database Name'), $dbdata, '', 'required'],
|
'$dbdata' => ['dbdata', L10n::t('Database Name'), $dbdata, '', 'required'],
|
||||||
'$adminmail' => ['adminmail', L10n::t('Site administrator email address'), $adminmail, L10n::t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'],
|
'$adminmail' => ['adminmail', L10n::t('Site administrator email address'), $adminmail, L10n::t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'],
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
'$lbl_10' => L10n::t('Please select a default timezone for your website'),
|
'$lbl_10' => L10n::t('Please select a default timezone for your website'),
|
||||||
|
|
||||||
'$baseurl' => System::baseUrl(),
|
'$baseurl' => System::baseUrl(),
|
||||||
|
@ -194,7 +191,6 @@ function install_content(App $a) {
|
||||||
'$phpath' => $phpath,
|
'$phpath' => $phpath,
|
||||||
|
|
||||||
'$submit' => L10n::t('Submit'),
|
'$submit' => L10n::t('Submit'),
|
||||||
|
|
||||||
]);
|
]);
|
||||||
return $o;
|
return $o;
|
||||||
}; break;
|
}; break;
|
||||||
|
|
Loading…
Reference in a new issue