From 5a5ce6e3a3ef42a92211d8a80dc1d7af5d03e455 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 19 May 2004 16:58:21 +0000 Subject: [PATCH] renamed title to job title, fixed help for employee type --- lam-0.4/HISTORY | 1 + lam-0.4/help/help.inc | 6 +++--- lam-0.4/templates/account/useredit.php | 4 ++-- lam-0.4/templates/masscreate.php | 4 ++-- lam-0.4/templates/massdetail.php | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lam-0.4/HISTORY b/lam-0.4/HISTORY index e1a83691..02c40851 100644 --- a/lam-0.4/HISTORY +++ b/lam-0.4/HISTORY @@ -4,6 +4,7 @@ street was copied to postal code on modify (938502) underscore was not allowed for host names (934445) deleting postal address or facsimile number failed (948616) + smaller fixes on personal settings page 21.03.2004 0.4.5 diff --git a/lam-0.4/help/help.inc b/lam-0.4/help/help.inc index 46274891..d16e7fc6 100644 --- a/lam-0.4/help/help.inc +++ b/lam-0.4/help/help.inc @@ -245,10 +245,10 @@ $helpArray = array ( "447" => array ("ext" => "FALSE", "Headline" => _("Grace inode period"), "Text" => _("Grace inode (files) period. Most filesystems use a fixed maximum value of 7 days."), "SeeAlso" => ''. 'Quota How-To'), - "448" => array ("ext" => "FALSE", "Headline" => _("Title"), - "Text" => _("Title of user, Mr., Ms., ...")), + "448" => array ("ext" => "FALSE", "Headline" => _("Job title"), + "Text" => _("Job title of user, Vice President, ...")), "449" => array ("ext" => "FALSE", "Headline" => _("Employee type"), - "Text" => _("Employee type: worker, student, nurse, ...")), + "Text" => _("Employee type: Contractor, Employee, Intern, Temp, External, ...")), "450" => array ("ext" => "FALSE", "Headline" => _("Street"), "Text" => _("Street")), "451" => array ("ext" => "FALSE", "Headline" => _("Postal code"), diff --git a/lam-0.4/templates/account/useredit.php b/lam-0.4/templates/account/useredit.php index 839f3853..cdb79d94 100644 --- a/lam-0.4/templates/account/useredit.php +++ b/lam-0.4/templates/account/useredit.php @@ -492,7 +492,7 @@ switch ($_POST['select']) { if ( !ereg('^(([0-9]|[A-Z]|[a-z]|[.]|[-]|[_])+[@]([0-9]|[A-Z]|[a-z]|[-])+([.]([0-9]|[A-Z]|[a-z]|[-])+)*)*$', $account_new->personal_mail)) $errors[] = array('ERROR', _('eMail address'), _('Please enter a valid eMail address!')); if ( !ereg('^([0-9]|[A-Z]|[a-z]|[-]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $account_new->personal_street)) $errors[] = array('ERROR', _('Street'), _('Please enter a valid street name!')); if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $account_new->personal_postalAddress)) $errors[] = array('ERROR', _('Postal address'), _('Please enter a valid postal address!')); - if ( !ereg('^([0-9]|[A-Z]|[a-z]|[-]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $account_new->personal_title)) $errors[] = array('ERROR', _('Title'), _('Please enter a valid title!')); + if ( !ereg('^([0-9]|[A-Z]|[a-z]|[-]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $account_new->personal_title)) $errors[] = array('ERROR', _('Job title'), _('Please enter a valid job title!')); if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $account_new->personal_employeeType)) $errors[] = array('ERROR', _('Employee type'), _('Please enter a valid employee type!')); if ( !ereg('^([0-9]|[A-Z]|[a-z])*$', $account_new->personal_postalCode)) $errors[] = array('ERROR', _('Postal code'), _('Please enter a valid postal code!')); break; @@ -1463,7 +1463,7 @@ switch ($select_local) { echo "\n"; echo "
"._('Personal properties')."\n"; echo "'."\n".'\n'."\n".''."\n".''."\n".''."\n".''."\n".'
"; - echo _('Title'); + echo _('Job title'); echo ''. ' '; echo $account_new->general_givenname . ' ' . $account_new->general_surname . ''. diff --git a/lam-0.4/templates/masscreate.php b/lam-0.4/templates/masscreate.php index d91e0fac..c31f03ec 100644 --- a/lam-0.4/templates/masscreate.php +++ b/lam-0.4/templates/masscreate.php @@ -358,7 +358,7 @@ switch ($select) { echo ""; echo _('Primary group').','; echo ''; - echo _('Title').','; + echo _('Job title').','; echo ''; echo _('eMail address').','; echo ''; @@ -571,7 +571,7 @@ function loadfile() { if ( !ereg('^(([0-9]|[A-Z]|[a-z]|[.]|[-]|[_])+[@]([0-9]|[A-Z]|[a-z]|[-])+([.]([0-9]|[A-Z]|[a-z]|[-])+)*)*$', $_SESSION['mass_accounts'][$row2]->personal_mail)) $_SESSION['mass_errors'][$row2][] = array('ERROR', _('eMail address'), _('Please enter a valid eMail address!')); if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])*$', $_SESSION['mass_accounts'][$row2]->personal_street)) $_SESSION['mass_errors'][$row2][] = array('ERROR', _('Street'), _('Please enter a valid street name!')); if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])*$', $_SESSION['mass_accounts'][$row2]->personal_postalAddress)) $_SESSION['mass_errors'][$row2][] = array('ERROR', _('Postal address'), _('Please enter a valid postal address!')); - if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])*$', $_SESSION['mass_accounts'][$row2]->personal_title)) $_SESSION['mass_errors'][$row2][] = array('ERROR', _('Title'), _('Please enter a valid title!')); + if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])*$', $_SESSION['mass_accounts'][$row2]->personal_title)) $_SESSION['mass_errors'][$row2][] = array('ERROR', _('Job title'), _('Please enter a valid job title!')); if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])*$', $_SESSION['mass_accounts'][$row2]->personal_employeeType)) $_SESSION['mass_errors'][$row2][] = array('ERROR', _('Employee type'), _('Please enter a valid employee type!')); if ( !ereg('^([0-9]|[A-Z]|[a-z])*$', $_SESSION['mass_accounts']->personal_postalCode)) $_SESSION['mass_errors'][$row2][] = array('ERROR', _('Postal code'), _('Please enter a valid postal code!')); } diff --git a/lam-0.4/templates/massdetail.php b/lam-0.4/templates/massdetail.php index 6e4bfbfd..29f5de79 100644 --- a/lam-0.4/templates/massdetail.php +++ b/lam-0.4/templates/massdetail.php @@ -137,7 +137,7 @@ if ($_POST['apply']) { } } // Check personal settings - if ( !eregi('^([a-z öüäß\\.-])*$', $_POST['f_personal_title'])) $errors2[] = array('ERROR', _('Title'), _('Please enter a valid title!')); + if ( !eregi('^([a-z öüäß\\.-])*$', $_POST['f_personal_title'])) $errors2[] = array('ERROR', _('Job title'), _('Please enter a valid job title!')); else $_SESSION['mass_accounts'][$row]->personal_title = $_POST['f_personal_title']; if ( !eregi('^([a-z0-9 öüäß\\.-])*$', $_POST['f_personal_employeeType'])) $errors2[] = array('ERROR', _('Employee type'), _('Please enter a valid employee type!')); else $_SESSION['mass_accounts'][$row]->personal_employeeType = $_POST['f_personal_employeeType']; @@ -217,7 +217,7 @@ switch ($select) { ''. ''._('Help').''. '
'; - echo _('Title'); + echo _('Job title'); echo ''. ' '; echo $_SESSION['mass_accounts']->general_surname . ' ' . $_SESSION['mass_accounts']->general_givenname . ''.