diff --git a/lam/help/help.inc b/lam/help/help.inc index 2416b345..49359097 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -177,8 +177,6 @@ $helpArray = array ( "Text" => _("Given name of user. Only letters, - and spaces are allowed.")), "426" => array ("ext" => "FALSE", "Headline" => _("Use no password"), "Text" => _("If checked no password will be used.")), - "427" => array ("ext" => "FALSE", "Headline" => _("Account deactivated"), - "Text" => _("If checked account will be deactivated by putting a ! before the encrypted password.")), "428" => array ("ext" => "FALSE", "Headline" => _("Use unix password"), "Text" => _("If checked unix password will also be used as samba password.")), "429" => array ("ext" => "FALSE", "Headline" => _("Password does not expire"), diff --git a/lam/lib/cache.inc b/lam/lib/cache.inc index d50824c6..884828cc 100644 --- a/lam/lib/cache.inc +++ b/lam/lib/cache.inc @@ -42,11 +42,11 @@ class cache { function add_cache($attributes) { // Check input variable $allowed_types = array ( 'user', 'group', 'host', 'domain', '*' ); - if (!is_array($attributes)) trigger_error(_('Argument of add_cache must be : array ( scope => array(attribute1(string), attribute2(string), ..), scope => ... ).'), E_USER_ERROR); + if (!is_array($attributes)) trigger_error('Argument of add_cache must be : array ( scope => array(attribute1(string), attribute2(string), ..), scope => ... ).', E_USER_ERROR); foreach ($attributes as $attribute) { - if (!is_array($attribute)) trigger_error(_('Argument of add_cache must be : array ( scope => array(attribute1(string), attribute2(string), ..), scope => ... ).'), E_USER_ERROR); + if (!is_array($attribute)) trigger_error('Argument of add_cache must be : array ( scope => array(attribute1(string), attribute2(string), ..), scope => ... ).', E_USER_ERROR); foreach ($attribute as $singleattribute) { - if (!is_string($singleattribute)) trigger_error(_('Argument of add_cache must be : array ( scope => array(attribute1(string), attribute2(string), ..), scope => ... ).'), E_USER_ERROR); + if (!is_string($singleattribute)) trigger_error('Argument of add_cache must be : array ( scope => array(attribute1(string), attribute2(string), ..), scope => ... ).', E_USER_ERROR); } } $scopes = array_keys($attributes); diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index 48d47762..692c1d63 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -539,8 +539,8 @@ class accountContainer { */ // Check input variable - if (!is_string($type)) trigger_error(_('Argument of accountContainer must be string.'), E_USER_ERROR); - if (!is_string($base)) trigger_error(_('Argument of accountContainer must be string.'), E_USER_ERROR); + if (!is_string($type)) trigger_error('Argument of accountContainer must be string.', E_USER_ERROR); + if (!is_string($base)) trigger_error('Argument of accountContainer must be string.', E_USER_ERROR); // *** fixme use global variable to determine allowed types if (!in_array($type, getAvailableScopes())) trigger_error(_('Account type not recognized.'), E_USER_ERROR); $this->type = $type; diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index 2ebd8542..925d08b9 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -50,28 +50,28 @@ class inetOrgPerson extends baseModule { function load_Messages() { $this->messages['host'][0] = array('ERROR', _('Unix workstations'), _('Unix workstations is invalid.')); $this->messages['givenName'][0] = array('ERROR', _('Given name'), _('Given name contains invalid characters!')); - $this->messages['givenName'][1] = array('ERROR', _('Account %s: inetOrgPerson_lastName'), _('Given name contains invalid characters!')); + $this->messages['givenName'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_lastName', _('Given name contains invalid characters!')); $this->messages['surname'][0] = array('ERROR', _('Surname'), _('Surname contains invalid characters!')); - $this->messages['surname'][1] = array('ERROR', _('Account %s: inetOrgPerson_firstName'), _('Surname contains invalid characters!')); + $this->messages['surname'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_firstName', _('Surname contains invalid characters!')); $this->messages['telephoneNumber'][0] = array('ERROR', _('Telephone number'), _('Please enter a valid telephone number!')); - $this->messages['telephoneNumber'][1] = array('ERROR', _('Account %s: inetOrgPerson_telephone'), _('Please enter a valid telephone number!')); + $this->messages['telephoneNumber'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_telephone', _('Please enter a valid telephone number!')); $this->messages['mobileTelephone'][0] = array('ERROR', _('Mobile number'), _('Please enter a valid mobile number!')); - $this->messages['mobileTelephone'][1] = array('ERROR', _('Account %s: inetOrgPerson_mobile'), _('Please enter a valid mobile number!')); + $this->messages['mobileTelephone'][1] = array('ERROR', _('Account %s:') . " inetOrgPerson_mobile", _('Please enter a valid mobile number!')); $this->messages['facsimileNumber'][0] = array('ERROR', _('Fax number'), _('Please enter a valid fax number!')); - $this->messages['facsimileNumber'][1] = array('ERROR', _('Account %s: inetOrgPerson_fax'), _('Please enter a valid fax number!')); + $this->messages['facsimileNumber'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_fax', _('Please enter a valid fax number!')); $this->messages['email'][0] = array('ERROR', _('eMail address'), _('Please enter a valid eMail address!')); - $this->messages['email'][1] = array('ERROR', _('Account %s: inetOrgPerson_email'), _('Please enter a valid eMail address!')); + $this->messages['email'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_email', _('Please enter a valid eMail address!')); $this->messages['street'][0] = array('ERROR', _('Street'), _('Please enter a valid street name!')); - $this->messages['street'][1] = array('ERROR', _('Account %s: inetOrgPerson_street'), _('Please enter a valid street name!')); + $this->messages['street'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_street', _('Please enter a valid street name!')); $this->messages['postalAddress'][0] = array('ERROR', _('Postal address'), _('Please enter a valid postal address!')); - $this->messages['postalAddress'][1] = array('ERROR', _('Account %s: inetOrgPerson_address'), _('Please enter a valid postal address!')); + $this->messages['postalAddress'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_address', _('Please enter a valid postal address!')); $this->messages['postalCode'][0] = array('ERROR', _('Postal code'), _('Please enter a valid postal code!')); - $this->messages['postalCode'][1] = array('ERROR', _('Account %s: inetOrgPerson_postalCode'), _('Please enter a valid postal code!')); + $this->messages['postalCode'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_postalCode', _('Please enter a valid postal code!')); $this->messages['title'][0] = array('ERROR', _('Title'), _('Please enter a valid title!')); - $this->messages['title'][1] = array('ERROR', _('Account %s: inetOrgPerson_title'), _('Please enter a valid title!')); + $this->messages['title'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_title', _('Please enter a valid title!')); $this->messages['employeeType'][0] = array('ERROR', _('Employee type'), _('Please enter a valid employee type!')); - $this->messages['employeeType'][1] = array('ERROR', _('Account %s: inetOrgPerson_type'), _('Please enter a valid employee type!')); - $this->messages['cn'][0] = array('ERROR', _('Account %s: inetOrgPerson_cn'), _('Please enter a valid common name!')); + $this->messages['employeeType'][1] = array('ERROR', _('Account %s:') . ' inetOrgPerson_type', _('Please enter a valid employee type!')); + $this->messages['cn'][0] = array('ERROR', _('Account %s:') . ' inetOrgPerson_cn', _('Please enter a valid common name!')); } /** @@ -119,13 +119,13 @@ class inetOrgPerson extends baseModule { ), array( 'name' => 'inetOrgPerson_firstName', - 'description' => _('First Name'), + 'description' => _('First name'), 'help' => 'givenName', 'example' => _('Steve') ), array( 'name' => 'inetOrgPerson_lastName', - 'description' => _('Last Name'), + 'description' => _('Last name'), 'help' => 'sn', 'example' => _('Miller'), 'required' => true diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc index 7685d7e6..612cd6e9 100644 --- a/lam/lib/modules/posixGroup.inc +++ b/lam/lib/modules/posixGroup.inc @@ -404,12 +404,12 @@ class posixGroup extends baseModule { $this->messages['gidNumber'][5] = array('ERROR', _('Minimum GID number'), _('Minimum GID number is invalid or empty!')); $this->messages['gidNumber'][6] = array('ERROR', _('Maximum GID number'), _('Maximum GID number is invalid or empty!')); $this->messages['gidNumber'][7] = array('ERROR', _('Maximum GID number'), _('Maximum GID number must be greater than minimum GID number!')); - $this->messages['gidNumber'][8] = array('ERROR', _('Account %s: posixGroup_gid'), _('GID number has to be a numeric value!')); + $this->messages['gidNumber'][8] = array('ERROR', _('Account %s:') . ' posixGroup_gid', _('GID number has to be a numeric value!')); $this->messages['cn'][0] = array('WARN', _('Groupname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.')); $this->messages['cn'][1] = array('WARN', _('Groupname'), _('Groupname in use. Selected next free groupname.')); $this->messages['cn'][2] = array('ERROR', _('Groupname'), _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); - $this->messages['cn'][3] = array('ERROR', _('Account %s: posixGroup_cn'), _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); - $this->messages['memberUID'][0] = array('ERROR', _('Account %s: posixGroup_members'), _("This value must be a list of user names separated by semicolons.")); + $this->messages['cn'][3] = array('ERROR', _('Account %s:') . ' posixGroup_cn', _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); + $this->messages['memberUID'][0] = array('ERROR', _('Account %s:') . ' posixGroup_members', _("This value must be a list of user names separated by semicolons.")); } diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc index 760a8268..334ff660 100644 --- a/lam/lib/modules/sambaAccount.inc +++ b/lam/lib/modules/sambaAccount.inc @@ -231,7 +231,7 @@ class sambaAccount extends baseModule { switch ($id) { case "description": return array ("ext" => "FALSE", "Headline" => _("Description"), - "Text" => _("Host Description.")); + "Text" => _("Host description.")); break; } return false; diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc index f6cb1cbe..3794a732 100644 --- a/lam/lib/modules/sambaGroupMapping.inc +++ b/lam/lib/modules/sambaGroupMapping.inc @@ -335,8 +335,8 @@ class sambaGroupMapping extends baseModule { **/ function load_Messages() { $this->messages['sambaSID'][0] = array('ERROR', _('Special Group'),sprintf( _('There can be only one group %s.'), $rids[$i]), 'sambaSID'); - $this->messages['sambaSID'][1] = array('ERROR', _("Account %s (sambaGroupMapping_domain): LAM was unable to find a Samba 3 domain with this name!")); // third parameter must be set dynamically - $this->messages['groupType'][0] = array('ERROR', _("Account %s (sambaGroupMapping_type): This is not a valid Samba 3 group type!"), _("Possible values:") . " %s"); + $this->messages['sambaSID'][1] = array('ERROR', _("Account %s") . " (sambaGroupMapping_domain): " . _("LAM was unable to find a Samba 3 domain with this name!")); // third parameter must be set dynamically + $this->messages['groupType'][0] = array('ERROR', _("Account %s") . "(sambaGroupMapping_type): " . _("This is not a valid Samba 3 group type!"), _("Possible values:") . " %s"); } diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc index fa8d4260..00db5f30 100644 --- a/lam/lib/modules/sambaSamAccount.inc +++ b/lam/lib/modules/sambaSamAccount.inc @@ -172,7 +172,7 @@ class sambaSamAccount extends baseModule { switch ($id) { case "description": return array ("ext" => "FALSE", "Headline" => _("Description"), - "Text" => _("Host Description.")); + "Text" => _("Host description.")); break; } return false; diff --git a/lam/templates/massBuildAccounts.php b/lam/templates/massBuildAccounts.php index 03a9aecd..54d9f30c 100644 --- a/lam/templates/massBuildAccounts.php +++ b/lam/templates/massBuildAccounts.php @@ -161,7 +161,7 @@ if ($_FILES['inputfile'] && ($_FILES['inputfile']['size'] > 0)) { if ($accounts != false) { // set DN for ($i = 0; $i < sizeof($accounts); $i++) { - if (!isset($accounts[$i][$data[$i][$ids['dn_rdn']]])) $errors[] = array(_('Account %s: dn_rdn'), _("Data field for RDN is empty!"), array($i)); + if (!isset($accounts[$i][$data[$i][$ids['dn_rdn']]])) $errors[] = array(_('Account %s:') . ' dn_rdn', _("Data field for RDN is empty!"), array($i)); // TODO check against list of possible RDN attributes else { $account_dn = $data[$i][$ids['dn_rdn']] . "=" . $accounts[$i][$data[$i][$ids['dn_rdn']]] . ","; diff --git a/lam/templates/pdfedit/pdfdelete.php b/lam/templates/pdfedit/pdfdelete.php index 9c51160f..010556a9 100644 --- a/lam/templates/pdfedit/pdfdelete.php +++ b/lam/templates/pdfedit/pdfdelete.php @@ -45,7 +45,7 @@ if (!$_SESSION['ldap'] || !$_SESSION['ldap']->server()) { // print standard header echo $_SESSION['header']; -echo ("" . _("Delete PDF Structure") . "\n"); +echo ("" . _("Delete PDF structure") . "\n"); echo "\n"; echo ("\n\n


\n"); diff --git a/lam/templates/profedit/profilemain.php b/lam/templates/profedit/profilemain.php index 0b8910ce..687b0b66 100644 --- a/lam/templates/profedit/profilemain.php +++ b/lam/templates/profedit/profilemain.php @@ -129,7 +129,7 @@ echo $_SESSION['header'];
- + @@ -137,7 +137,7 @@ echo $_SESSION['header']; - + @@ -149,7 +149,7 @@ echo $_SESSION['header']; - + @@ -161,7 +161,7 @@ echo $_SESSION['header']; - +
@@ -172,7 +172,7 @@ echo $_SESSION['header']; echo " "; echo "
"; echo " "; -echo " " . _("Group Profiles") . ""; +echo " " . _("Group profiles") . ""; echo " "; echo " "; echo " "; @@ -180,7 +180,7 @@ echo " "; echo " "; -echo " "; +echo " "; echo " "; echo " "; echo " "; @@ -192,7 +192,7 @@ echo " "; echo " "; -echo " "; +echo " "; echo " "; echo " "; echo " "; @@ -204,7 +204,7 @@ echo " "; echo " "; -echo " "; +echo " "; echo " "; echo "
"; echo " "; echo " " . _("Create a new Group Profile") . "" . _("Create a new profile") . "
" . _("Edit Group Profile") . "" . _("Edit profile") . "
" . _("Delete Group Profile") . "" . _("Delete profile") . "
"; echo "
"; @@ -215,7 +215,7 @@ echo "

";
- + @@ -223,7 +223,7 @@ echo "

"; - + @@ -235,7 +235,7 @@ echo "

"; - + @@ -247,7 +247,7 @@ echo "

"; - +