diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php index ca47289429..984f0ab306 100644 --- a/usr/local/www/system_authservers.php +++ b/usr/local/www/system_authservers.php @@ -41,7 +41,7 @@ require("guiconfig.inc"); require_once("auth.inc"); -$pgtitle = array("System", "Authentication Servers"); +$pgtitle = array(gettext("System"), gettext("Authentication Servers")); $id = $_GET['id']; if (isset($_POST['id'])) @@ -141,40 +141,52 @@ if ($_POST) { $reqdfields = explode(" ", "name type ldap_host ldap_port ". "ldap_urltype ldap_protver ldap_scope ldap_basedn ". "ldap_attr_user ldap_attr_group ldap_attr_member ldapauthcontainers"); - $reqdfieldsn = explode(",", "Descriptive name,Type,Hostname or IP,". - "Port value,Transport,Protocol version,Search level,". - "Search Base DN,User naming Attribute,". - "Group naming Attribute,Group member attribute,Authentication container"); + $reqdfieldsn = array( + gettext("Descriptive name"), + gettext("Type"), + gettext("Hostname or IP"), + gettext("Port value"), + gettext("Transport"), + gettext("Protocol version"), + gettext("Search level"), + gettext("Search Base DN"), + gettext("User naming Attribute"), + gettext("Group naming Attribute"), + gettext("Group member attribute"), + gettext("Authentication container")); if (!$pconfig['ldap_anon']) { $reqdfields[] = "ldap_binddn"; $reqdfields[] = "ldap_bindpw"; - $reqdfieldsn[] = "Bind user DN"; - $reqdfieldsn[] = "Bind Password"; + $reqdfieldsn[] = gettext("Bind user DN"); + $reqdfieldsn[] = gettext("Bind Password"); } } if ($pconfig['type'] == "radius") { $reqdfields = explode(" ", "name type radius_host radius_srvcs"); - $reqdfieldsn = explode(",", "Descriptive name,Type,Hostname or IP,". - "Services"); + $reqdfieldsn = array( + gettext("Descriptive name"), + gettext("Type"), + gettext("Hostname or IP"), + gettext("Services")); if ($pconfig['radisu_srvcs'] == "both" || $pconfig['radisu_srvcs'] == "auth") { $reqdfields[] = "radius_auth_port"; - $reqdfieldsn[] = "Authentication port value"; + $reqdfieldsn[] = gettext("Authentication port value"); } if ($pconfig['radisu_srvcs'] == "both" || $pconfig['radisu_srvcs'] == "acct") { $reqdfields[] = "radius_acct_port"; - $reqdfieldsn[] = "Accounting port value"; + $reqdfieldsn[] = gettext("Accounting port value"); } if (!isset($id)) { $reqdfields[] = "radius_secret"; - $reqdfieldsn[] = "Shared Secret"; + $reqdfieldsn[] = gettext("Shared Secret"); } } @@ -184,7 +196,7 @@ if ($_POST) { $input_errors[] = gettext("The host name contains invalid characters."); if (auth_get_authserver($pconfig['name']) && !isset($id)) - $input_errors[] = "A authentication server with the same name already exists."; + $input_errors[] = gettext("An authentication server with the same name already exists."); /* if this is an AJAX caller then handle via JSON */ if (isAjax() && is_array($input_errors)) { @@ -350,13 +362,13 @@ function select_clicked() { document.getElementById("ldap_scope").value == '' || document.getElementById("ldap_basedn").value == '' || document.getElementById("ldapauthcontainers").value == '') { - alert("Please fill the required values."); + alert(""); return; } if (!document.getElementById("ldap_anon").checked) { if (document.getElementById("ldap_binddn").value == '' || document.getElementById("ldap_bindpw").value == '') { - alert("Please fill the bind username/password."); + alert(""); return; } } @@ -373,7 +385,7 @@ function select_clicked() { var oWin = window.open(url,"pfSensePop","width=620,height=400,top=150,left=150"); if (oWin==null || typeof(oWin)=="undefined") - alert('Popup blocker detected. Action aborted.'); + alert(""); } //--> @@ -442,7 +454,7 @@ function select_clicked() { - LDAP Server Settings + @@ -491,7 +503,7 @@ function select_clicked() { - + - + @@ -516,23 +528,22 @@ function select_clicked() { - - - + + +
Level:  :  
Base DN:  :  
- - - - - -
Containers:   - - -
NOTE: Semi-Colon separated. This will be prepended to the search base dn above or you can specify full container path. -
EXAMPLE: CN=Users;DC=example -
EXAMPLE: CN=Users,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com -
- -
+ + + + + +
:   + + "> +
+
+
+
+
@@ -542,7 +553,7 @@ function select_clicked() { onClick="ldap_bindchange()"> - Use anonymous binds to resolve distinguished names +
@@ -551,13 +562,13 @@ function select_clicked() { - User DN:   + :  
- Password:   + :  
@@ -607,7 +618,7 @@ function select_clicked() { - Radius Server Settings + @@ -654,7 +665,7 @@ function select_clicked() {   - + " /> @@ -667,9 +678,9 @@ function select_clicked() { - - - + + + - edit server + " alt="" width="17" height="17" border="0" />   ')"> - delete server + " alt="" width="17" height="17" border="0" /> @@ -702,7 +713,7 @@ function select_clicked() { diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 6d89950f96..683bdebc84 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_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php index 2d4294d7d6..6fc035f606 100755 --- a/usr/local/www/system_gateway_groups_edit.php +++ b/usr/local/www/system_gateway_groups_edit.php @@ -184,7 +184,7 @@ include("head.inc"); } ?>
-
+
@@ -218,7 +218,7 @@ value="">
Server NameTypeHost Name
- add server + " alt="" width="17" height="17" border="0" />
  - " class="formbtn" onclick="history.back()"> + "> " class="formbtn" onclick="history.back()"> diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php index f66bb69ba2..63642b63a1 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 3dd18807d7..9ebecb7ef3 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); @@ -844,7 +851,7 @@ function sshkeyClicked(obj) { $config['system']['user'][$userindex[$HTTP_SERVER_VARS['AUTH_USER']]]['password'] = crypt(trim($_POST['passwordfld1'])); write_config(); - $savemsg = sprintf("Password successfully changed%s", "
"); + $savemsg = gettext("Password successfully changed") . "
"; } }