diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-04-28 13:16:37 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-04-28 13:17:19 -0300 |
commit | 76d49f20d09d4deb85a68e69362b99ec282684a9 (patch) | |
tree | 683077a52aa2ccba23a73bd48599c702f3423671 | |
parent | ed2e2c476177096145acd0826d70c9e29ed1c619 (diff) | |
download | pfsense-76d49f20d09d4deb85a68e69362b99ec282684a9.zip pfsense-76d49f20d09d4deb85a68e69362b99ec282684a9.tar.gz |
Use array instead of explode for reqdfieldsn to fit it better with gettext() calls
-rw-r--r-- | usr/local/www/system_certmanager.php | 4 | ||||
-rw-r--r-- | usr/local/www/system_groupmanager.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_groupmanager_addprivs.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_usermanager.php | 17 |
4 files changed, 17 insertions, 8 deletions
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 6d89950..683bdeb 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -251,7 +251,9 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "name cert"); - $reqdfieldsn = explode(",", gettext("Descriptive name") . "," . gettext("Final Certificate data")); + $reqdfieldsn = array( + gettext("Descriptive name"), + gettext("Final Certificate data")); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index dba70ca..af69938 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -112,7 +112,7 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "groupname"); - $reqdfieldsn = explode(",", gettext("Group Name")); + $reqdfieldsn = array(gettext("Group Name")); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php index f66bb69..63642b6 100644 --- a/usr/local/www/system_groupmanager_addprivs.php +++ b/usr/local/www/system_groupmanager_addprivs.php @@ -76,7 +76,7 @@ if ($_POST) { /* input validation */ $reqdfields = explode(" ", "sysprivs"); - $reqdfieldsn = explode(",", gettext("Selected priveleges")); + $reqdfieldsn = array(gettext("Selected priveleges")); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index 3dd1880..6f0d293 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -180,15 +180,22 @@ if (isAllowedPage("system_usermanager")) { /* input validation */ if (isset($id) && ($a_user[$id])) { $reqdfields = explode(" ", "usernamefld"); - $reqdfieldsn = explode(",", gettext("Username")); + $reqdfieldsn = array(gettext("Username")); } else { if (empty($_POST['name'])) { $reqdfields = explode(" ", "usernamefld passwordfld1"); - $reqdfieldsn = explode(",", gettext("Username,Password")); + $reqdfieldsn = array( + gettext("Username"), + gettext("Password")); } else { $reqdfields = explode(" ", "usernamefld passwordfld1 name caref keylen lifetime"); - $reqdfieldsn = explode(",", gettext("Username,Password,Descriptive name,Certificate authority,Key length,Lifetime")); - + $reqdfieldsn = array( + gettext("Username"), + gettext("Password"), + gettext("Descriptive name"), + gettext("Certificate authority"), + gettext("Key length"), + gettext("Lifetime")); } } @@ -832,7 +839,7 @@ function sshkeyClicked(obj) { /* input validation */ $reqdfields = explode(" ", "passwordfld1"); - $reqdfieldsn = explode(",", gettext("Password")); + $reqdfieldsn = array(gettext("Password")); do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); |