From 334bc7037a749dc09b91f954b51506166991c05b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 28 Jan 2017 10:02:32 +0100 Subject: [PATCH 1/4] don't enfoce non-empty passwords during installation --- mod/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/install.php b/mod/install.php index 106ba684ff..ae3f538a8b 100755 --- a/mod/install.php +++ b/mod/install.php @@ -261,7 +261,7 @@ function install_content(App $a) { '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, '', 'required'), '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, '', 'required', 'autofocus'), - '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, '', 'required'), + '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''), '$dbdata' => array('dbdata', t('Database Name'), $dbdata, '', 'required'), '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'), From 83607ff89445ee3bbc5208f73698b0adbe2738a7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 28 Jan 2017 10:10:35 +0100 Subject: [PATCH 2/4] enforce them, but inform the user about it --- mod/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/install.php b/mod/install.php index ae3f538a8b..ec991e1d81 100755 --- a/mod/install.php +++ b/mod/install.php @@ -261,7 +261,7 @@ function install_content(App $a) { '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, '', 'required'), '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, '', 'required', 'autofocus'), - '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''), + '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, t('For security reasons this cannot be empty'), 'required'), '$dbdata' => array('dbdata', t('Database Name'), $dbdata, '', 'required'), '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'), From 703628cd01863ea688bc859ff4e1258c6eb1918c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 28 Jan 2017 11:12:31 +0100 Subject: [PATCH 3/4] wording --- mod/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/install.php b/mod/install.php index ec991e1d81..4669f4ad19 100755 --- a/mod/install.php +++ b/mod/install.php @@ -261,7 +261,7 @@ function install_content(App $a) { '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, '', 'required'), '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, '', 'required', 'autofocus'), - '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, t('For security reasons this cannot be empty'), 'required'), + '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, t("For security reasons thr password must not be empty"), 'required'), '$dbdata' => array('dbdata', t('Database Name'), $dbdata, '', 'required'), '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'), From af699940d4791281f3b77f849e37a26bac6207e9 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 28 Jan 2017 11:20:39 +0100 Subject: [PATCH 4/4] typo --- mod/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/install.php b/mod/install.php index 4669f4ad19..fa952a79bc 100755 --- a/mod/install.php +++ b/mod/install.php @@ -261,7 +261,7 @@ function install_content(App $a) { '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, '', 'required'), '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, '', 'required', 'autofocus'), - '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, t("For security reasons thr password must not be empty"), 'required'), + '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, t("For security reasons the password must not be empty"), 'required'), '$dbdata' => array('dbdata', t('Database Name'), $dbdata, '', 'required'), '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'),