diff --git a/lam/help/help.inc b/lam/help/help.inc index 09a06c3d..62e636c3 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -126,13 +126,13 @@ $helpArray = array ( // account.php "400" => array ("ext" => "FALSE", "Headline" => _("Username"), "Text" => _("Username of the user which should be created. Valid characters are: a-z,0-9, .-_. Lam doesn't allow a number as first - character because useradd also doesn't allow it. Lam doesn't allow capital letters A-Z because it + character because useradd also does not allow it. Lam doesn't allow capital letters A-Z because it can cause several problems. If username is allready used username will expanded with a number. The next free number will be used.")), - "401" => array ("ext" => "FALSE", "Headline" => _("UID Number"), - "Text" => _("If empty UID Number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minUID()._(" and ").$_SESSION['config']->get_maxUID()."."), + "401" => array ("ext" => "FALSE", "Headline" => _("UID number"), + "Text" => _("If empty UID number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minUID()._(" and ").$_SESSION['config']->get_maxUID()."."), "402" => array ("ext" => "FALSE", "Headline" => _("Additional Groups"), - "Text" => _("Can be left empty. Hold the CTRL-key to (de)select multiple groups.")), - "403" => array ("ext" => "FALSE", "Headline" => _("Home Directory"), + "Text" => _("Hold the CTRL-key to (de)select multiple groups."). ' '. _("Can be left empty.")), + "403" => array ("ext" => "FALSE", "Headline" => _("Home directory"), "Text" => _("$user and $group are replaced with username or primary groupname.")), "404" => array ("ext" => "FALSE", "Headline" => _("Gecos"), "Text" => _("User descriptopn. If left empty sur- and givename will be used.")), @@ -142,30 +142,30 @@ $helpArray = array ( "Text" => _("The Primary Group the user should be member of.")), "407" => array ("ext" => "FALSE", "Headline" => _("Groupname"), "Text" => _("Groupname of the group which should be created. Valid characters are: a-z,0-9, .-_. Lam doesn't allow a number as first - character because it's impossible to create a homedirectory starting with a number. Lam doesn't allow capital letters A-Z because it + character because groupadd also does not allow it. Lam doesn't allow capital letters A-Z because it can cause several problems. If groupname is allready used username will expanded with a number. The next free number will be used.")), "408" => array ("ext" => "FALSE", "Headline" => _("GID number"), - "Text" => _("If empty GID Number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minGID()._(" and ").$_SESSION['config']->get_maxGID()."."), + "Text" => _("If empty GID number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minGID()._(" and ").$_SESSION['config']->get_maxGID()."."), "409" => array ("ext" => "FALSE", "Headline" => _("Gecos"), "Text" => _("Group description. If left empty group name will be used.")), "410" => array ("ext" => "FALSE", "Headline" => _("Host name"), "Text" => _("Groupname of the group which should be created. Valid characters are: a-z,0-9, .-_$. Lam doesn't allow a number as first - character because it's impossible to create a homedirectory starting with a number. Lam doesn't allow capital letters A-Z because it + character because useradd also does not allow it. Lam doesn't allow capital letters A-Z because it can cause several problems. Hostnames are always ending with $. If last character isn't $ it will be added. If hostname is allready used username will expanded with a number. The next free number will be used.")), "411" => array ("ext" => "FALSE", "Headline" => _("UID number"), - "Text" => _("If empty UID Number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minMachine()._(" and ").$_SESSION['config']->get_maxMachine()."."), + "Text" => _("If empty UID number will be generated automaticly. Valid values are between").' '.$_SESSION['config']->get_minMachine()._(" and ").$_SESSION['config']->get_maxMachine()."."), "412" => array ("ext" => "FALSE", "Headline" => _("Primary group"), - "Text" => _("The Primary Group the host should be member of.")), + "Text" => _("The Primary group the host should be member of.")), "413" => array ("ext" => "FALSE", "Headline" => _("Gecos"), "Text" => _("Host description. If left empty host name will be used.")), "414" => array ("ext" => "FALSE", "Headline" => _("Password warn"), - "Text" => _("Days before password is to expire that user is warned of pending password expiration. If set value must be 0<. Can be left empty.")), + "Text" => _("Days before password is to expire that user is warned of pending password expiration. If set value must be 0<."). ' '. _("Can be left empty.")), "415" => array ("ext" => "FALSE", "Headline" => _("Password expire"), - "Text" => _("Number of days a user can login even his password has expired. -1=always. Can be left empty.")), - "416" => array ("ext" => "FALSE", "Headline" => _("Maximum passwordage"), - "Text" => _("Number of days after a user has to change his password again. If set value must be 0<. Can be left empty.")), - "417" => array ("ext" => "FALSE", "Headline" => _("Minimum passwordage"), - "Text" => _("Number of days a user has to wait until he\'s allowed to change his password again. If set value must be 0<. Can be left empty.")), + "Text" => _("Number of days a user can login even his password has expired. -1=always."). ' '. _("Can be left empty.")), + "416" => array ("ext" => "FALSE", "Headline" => _("Maximum password age"), + "Text" => _("Number of days after a user has to change his password again. If set value must be 0<."). ' '. _("Can be left empty.")), + "417" => array ("ext" => "FALSE", "Headline" => _("Minimum password age"), + "Text" => _("Number of days a user has to wait until he\'s allowed to change his password again. If set value must be 0<."). ' '. _("Can be left empty.")), "418" => array ("ext" => "FALSE", "Headline" => _("Expire date"), "Text" => _("Account expire date. If an account is expired login is only possible if password expire is set. Format: DD-MM-YYYY")), "424" => array ("ext" => "FALSE", "Headline" => _("Surname"), @@ -176,8 +176,10 @@ $helpArray = array ( "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.")), - "429" => array ("ext" => "FALSE", "Headline" => _("Password doesn't expire"), - "Text" => _("If checked password won't expire. (Setting X-Flag)")), + "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"), + "Text" => _("If checked password does not expire. (Setting X-Flag)")), "430" => array ("ext" => "FALSE", "Headline" => _("User can change Password"), "Text" => _("Date after the user is able to change his password. Format: DD-MM-YYYY")), "431" => array ("ext" => "FALSE", "Headline" => _("User must change Password"), @@ -185,57 +187,57 @@ $helpArray = array ( "432" => array ("ext" => "FALSE", "Headline" => _("Account is deactivated"), "Text" => _("If checked account will be deactivated. (Setting D-Flag)")), "433" => array ("ext" => "FALSE", "Headline" => _("Home drive"), - "Text" => _("Driveletter assigned on windows-workstations as homedirectory.")), + "Text" => _("Driveletter assigned on windows workstations as homedirectory.")), "434" => array ("ext" => "FALSE", "Headline" => _("Script path"), - "Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. \$user and \$group are replaced with user- and groupname. Can be left empty.")), + "Text" => _("Filename and -path relative to netlogon-share which should be executed on logon. \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")), "435" => array ("ext" => "FALSE", "Headline" => _("Profile path"), - "Text" => _("Path of the userprofile. Can be a local absolute path or a UNC-path (\\\\server\\share). \$user and \$group are replaced with user- and groupname. Can be left empty.")), + "Text" => _("Path of the userprofile. Can be a local absolute path or a UNC-path (\\\\server\\share). \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")), "436" => array ("ext" => "FALSE", "Headline" => _("Samba workstations"), - "Text" => _("Komma-separated list of samba workstations the user is allowed to login. Empty means every workstation. Can be left empty.")), + "Text" => _("Comma separated list of samba workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")), "437" => array ("ext" => "FALSE", "Headline" => _("smb home"), - "Text" => _("UNC-path (\\\\server\\share) of homedirectory. \$user and \$group are replaced with user- and groupname. Can be left empty.")), + "Text" => _("UNC-path (\\\\server\\share) of homedirectory. \$user and \$group are replaced with user- and groupname."). ' '. _("Can be left empty.")), "438" => array ("ext" => "FALSE", "Headline" => _("Domain"), - "Text" => _("Windows-Domain of user. Can be left empty.")), + "Text" => _("Windows-Domain of user."). ' '. _("Can be left empty.")), "439" => array ("ext" => "FALSE", "Headline" => _("Mountpoint"), "Text" => _("Mointpoint of device with enabled quotas.")), "440" => array ("ext" => "FALSE", "Headline" => _("Used blocks"), - "Text" => _("Blocks used by user. 1000 blocks are usually 1MB")), + "Text" => _("Used blocks. 1000 blocks are usually 1MB")), "441" => array ("ext" => "FALSE", "Headline" => _("Soft block limit"), - "Text" => _("Soft block limit.
See also:").' '. + "Text" => _("Soft block limit."), "SeeAlso" => ''. 'Quota How-To'), "442" => array ("ext" => "FALSE", "Headline" => _("Hard block limit"), - "Text" => _("Hard block limit.
See also:").' '. + "Text" => _("Hard block limit."), "SeeAlso" => ''. 'Quota How-To'), "443" => array ("ext" => "FALSE", "Headline" => _("Grace block period"), - "Text" => _("Grace block period. Most filesystems use a fixed maximum value of 7 days.
See also:").' '. + "Text" => _("Grace block period. Most filesystems use a fixed maximum value of 7 days."), "SeeAlso" => ''. 'Quota How-To'), "444" => array ("ext" => "FALSE", "Headline" => _("Used inodes"), - "Text" => _("Used inodes (files) by user.")), + "Text" => _("Used inodes (files).")), "445" => array ("ext" => "FALSE", "Headline" => _("Soft inode limit"), - "Text" => _("Soft inode (files) limit.
See also:").' '. + "Text" => _("Soft inode (files) limit."), "SeeAlso" => ''. 'Quota How-To'), "446" => array ("ext" => "FALSE", "Headline" => _("Hard inode limit"), - "Text" => _("Hard inode (files) limit.
See also:").' '. + "Text" => _("Hard inode (files) limit."), "SeeAlso" => ''. 'Quota How-To'), "447" => array ("ext" => "FALSE", "Headline" => _("Grace inode period"), - "Text" => _("Grace inode (files) period. Most filesystems use a fixed maximum value of 7 days.
See also:").' '. + "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")), + "Text" => _("Title of user, Mr., Ms., ...")), "449" => array ("ext" => "FALSE", "Headline" => _("Employee type"), - "Text" => _("Employee type")), + "Text" => _("Employee type, worker, ...")), "450" => array ("ext" => "FALSE", "Headline" => _("Street"), "Text" => _("Street")), "451" => array ("ext" => "FALSE", "Headline" => _("Postal code"), "Text" => _("Postal code")), "452" => array ("ext" => "FALSE", "Headline" => _("Postal address"), - "Text" => _("Postal address")), + "Text" => _("Postal address, city")), "453" => array ("ext" => "FALSE", "Headline" => _("Telephone number"), "Text" => _("Telephone number")), - "454" => array ("ext" => "FALSE", "Headline" => _("Mobile phonenumber"), - "Text" => _("Mobile phonenumber")), - "455" => array ("ext" => "FALSE", "Headline" => _("Facsimile number"), - "Text" => _("Facsimile number")), + "454" => array ("ext" => "FALSE", "Headline" => _("Mobile number"), + "Text" => _("Mobile number")), + "455" => array ("ext" => "FALSE", "Headline" => _("Fax number"), + "Text" => _("Fax number")), "456" => array ("ext" => "FALSE", "Headline" => _("eMail address"), "Text" => _("eMail address")), "457" => array ("ext" => "FALSE", "Headline" => _("Save profile"), @@ -245,17 +247,19 @@ $helpArray = array ( "459" => array ("ext" => "FALSE", "Headline" => _("Host must change password"), "Text" => _("Host must change password")), "460" => array ("ext" => "FALSE", "Headline" => _("Windows domain"), - "Text" => _("Windows domain of host. Can be left empty.")), + "Text" => _("Windows domain of host."). ' '. _("Can be left empty.")), "461" => array ("ext" => "FALSE", "Headline" => _("Suffix"), - "Text" => _("Suffix")), + "Text" => _("Position in ldap-tree where the user should be created.")), "462" => array ("ext" => "FALSE", "Headline" => _("Suffix"), - "Text" => _("The position in ldap-tree where the user should be created.")), + "Text" => _("Position in ldap-tree where the group should be created.")), "463" => array ("ext" => "FALSE", "Headline" => _("Suffix"), - "Text" => _("Suffix")), + "Text" => _("Position in ldap-tree where the host should be created.")), "464" => array ("ext" => "FALSE", "Headline" => _("Windows groupname"), "Text" => _("If you want to use a well known RID you can selcet a well known group.")), "466" => array ("ext" => "FALSE", "Headline" => _("Unix workstations"), - "Text" => _("Komma-separated list of unix workstations the user is allowed to login. Empty means every workstation. Can be left empty.")), + "Text" => _("Comma separated list of unix workstations the user is allowed to login. Empty means every workstation."). ' '. _("Can be left empty.")), + "467" => array ("ext" => "FALSE", "Headline" => _("Domain"), + "Text" => _("Windows-Domain of group."). ' '. _("Can be left empty.")), // 600 - 699 // Roland Gruber // OU-editor, domain page diff --git a/lam/lib/account.inc b/lam/lib/account.inc index cba78ecb..f09e09c9 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -179,12 +179,12 @@ function checkglobal($values, $type, $values_old=false) { // This functions chec if ( !ereg('^[/]([a-z]|[A-Z])([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])*([/]([a-z]|[A-Z])([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])*)*$', $return->general_homedir )) $errors[] = array('ERROR', _('Home Directory'), _('Homedirectory contents invalid characters.')); // Check if givenname is valid - if ( !ereg('^([a-z]|[A-Z]|[-]|[ ]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+$', $values->general_givenname)) $errors[] = array('ERROR', _('Given name'), _('Givenname contents invalid characters')); + if ( !ereg('^([a-z]|[A-Z]|[-]|[ ]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+$', $values->general_givenname)) $errors[] = array('ERROR', _('Given name'), _('Given name contents invalid characters')); // Check if surname is valid if ( !ereg('^([a-z]|[A-Z]|[-]|[ ]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+$', $values->general_surname)) $errors[] = array('ERROR', _('Surname'), _('Surname contents invalid characters')); if ( ($values->general_gecos=='') || ($values->general_gecos==' ')) { $return->general_gecos = replace_umlaut($values->general_givenname) . " " . replace_umlaut($values->general_surname) ; - $errors[] = array('INFO', _('Gecos'), _('Inserted sur- and givenname in gecos-field.')); + $errors[] = array('INFO', _('Gecos'), _('Inserted sur- and given name in gecos-field.')); } if ($values->general_group=='') $errors[] = array('ERROR', _('Primary group'), _('No primary group defined!')); // Check if Username contents only valid characters @@ -768,16 +768,16 @@ function loaduser($dn) { // Will load all needed values from an existing account } if (isset($attr['givenName'][0])) $return->general_givenname = utf8_decode($attr['givenName'][0]); if (isset($attr['sn'][0])) $return->general_surname = utf8_decode($attr['sn'][0]); - if (isset($attr['title'][0])) $return->personal_title = $attr['title'][0]; - if (isset($attr['mail'][0])) $return->personal_mail = $attr['mail'][0]; - if (isset($attr['telephoneNumber'][0])) $return->personal_telephoneNumber = $attr['telephoneNumber'][0]; - if (isset($attr['mobilemobileTelephoneNumber'][0])) $return->personal_mobileTelephoneNumber = $attr['mobilemobileTelephoneNumber'][0]; - else if (isset($attr['mobile'][0])) $return->personal_mobileTelephoneNumber = $attr['mobile'][0]; - if (isset($attr['facsimileTelephoneNumber'][0])) $return->personal_facsimileTelephoneNumber = $attr['facsimileTelephoneNumber'][0]; - if (isset($attr['street'][0])) $return->personal_street = $attr['street'][0]; - if (isset($attr['postalCode'][0])) $return->personal_postalCode = $attr['postalCode'][0]; - if (isset($attr['postalAddress'][0])) $return->personal_postalAddress = $attr['postalAddress'][0]; - if (isset($attr['employeeType'][0])) $return->personal_employeeType = $attr['employeeType'][0]; + if (isset($attr['title'][0])) $return->personal_title = utf8_decode($attr['title'][0]); + if (isset($attr['mail'][0])) $return->personal_mail = utf8_decode($attr['mail'][0]); + if (isset($attr['telephoneNumber'][0])) $return->personal_telephoneNumber = utf8_decode($attr['telephoneNumber'][0]); + if (isset($attr['mobilemobileTelephoneNumber'][0])) $return->personal_mobileTelephoneNumber = utf8_decode($attr['mobilemobileTelephoneNumber'][0]); + else if (isset($attr['mobile'][0])) $return->personal_mobileTelephoneNumber = utf8_decode($attr['mobile'][0]); + if (isset($attr['facsimileTelephoneNumber'][0])) $return->personal_facsimileTelephoneNumber = utf8_decode($attr['facsimileTelephoneNumber'][0]); + if (isset($attr['street'][0])) $return->personal_street = utf8_decode($attr['street'][0]); + if (isset($attr['postalCode'][0])) $return->personal_postalCode = utf8_decode($attr['postalCode'][0]); + if (isset($attr['postalAddress'][0])) $return->personal_postalAddress = utf8_decode($attr['postalAddress'][0]); + if (isset($attr['employeeType'][0])) $return->personal_employeeType = utf8_decode($attr['employeeType'][0]); if (substr(str_replace('{CRYPT}', '',$attr['userPassword'][0]),0,1) == '!' ) $return->unix_deactivated=true; if (isset($attr['userPassword'][0])) $return->unix_password = $attr['userPassword'][0]; if ($_SESSION['config']->scriptServer) { @@ -979,15 +979,15 @@ function createuser($values) { // Will create the LDAP-Account $attr['uidNumber'] = $values->general_uidNumber; // posixAccount_req $attr['gidNumber'] = getgid($values->general_group); // posixAccount_req $attr['homeDirectory'] = $values->general_homedir; // posixAccount_req - if ($values->personal_title!='') $attr['title'] = $values->personal_title; - if ($values->personal_mail!='') $attr['mail'] = $values->personal_mail; - if ($values->personal_telephoneNumber!='') $attr['telephoneNumber'] = $values->personal_telephoneNumber; - if ($values->personal_mobileTelephoneNumber!='') $attr['mobilemobileTelephoneNumber'] = $values->personal_mobileTelephoneNumber; - if ($values->personal_facsimileTelephoneNumber!='') $attr['facsimileTelephoneNumber'] = $values->personal_facsimileTelephoneNumber; - if ($values->personal_street!='') $attr['street'] = $values->personal_street; - if ($values->personal_postalCode!='') $attr['postalCode'] = $values->personal_postalCode; - if ($values->personal_postalAddress!='') $attr['postalAddress'] = $values->personal_postalAddress; - if ($values->personal_employeeType!='') $attr['employeeType'] = $values->personal_employeeType; + if ($values->personal_title!='') $attr['title'] = utf8_encode($values->personal_title); + if ($values->personal_mail!='') $attr['mail'] = utf8_encode($values->personal_mail); + if ($values->personal_telephoneNumber!='') $attr['telephoneNumber'] = utf8_encode($values->personal_telephoneNumber); + if ($values->personal_mobileTelephoneNumber!='') $attr['mobilemobileTelephoneNumber'] = utf8_encode($values->personal_mobileTelephoneNumber); + if ($values->personal_facsimileTelephoneNumber!='') $attr['facsimileTelephoneNumber'] = utf8_encode($values->personal_facsimileTelephoneNumber); + if ($values->personal_street!='') $attr['street'] = utf8_encode($values->personal_street); + if ($values->personal_postalCode!='') $attr['postalCode'] = utf8_encode($values->personal_postalCode); + if ($values->personal_postalAddress!='') $attr['postalAddress'] = utf8_encode($values->personal_postalAddress); + if ($values->personal_employeeType!='') $attr['employeeType'] = utf8_encode($values->personal_employeeType); // posixAccount_may shadowAccount_may if ($values->unix_password_no) $values->unix_password = ''; if ($values->unix_deactivated) $attr['userPassword'] = '{CRYPT}!' . crypt($values->unix_password); @@ -1211,41 +1211,41 @@ function modifyuser($values,$values_old) { // Will modify the LDAP-Account if (($date != $date_old) && $date) $attr['shadowExpire'] = $date ; // shadowAccount_may if (($date != $date_old) && !$date) $attr_rem['shadowExpire'] = $date_old ; // shadowAccount_may if (($values->personal_title != $values_old->personal_title) && ($values->personal_title != '')) - $attr['title'] = $values->personal_title; + $attr['title'] = utf8_encode($values->personal_title); if (($values->personal_title != $values_old->personal_title) && ($values->personal_title == '')) - $attr_rem['title'] = $values_old->personal_title; + $attr_rem['title'] = utf8_encode($values_old->personal_title); if (($values->personal_mail != $values_old->personal_mail) && ($values->personal_mail != '')) - $attr['mail'] = $values->personal_mail; + $attr['mail'] = utf8_encode($values->personal_mail); if (($values->personal_mail != $values_old->personal_mail) && ($values->personal_mail == '')) - $attr_rem['mail'] = $values_old->personal_mail; + $attr_rem['mail'] = utf8_encode($values_old->personal_mail); if (($values->personal_telephoneNumber != $values_old->personal_telephoneNumber) && ($values->personal_telephoneNumber !='')) - $attr['telephoneNumber'] = $values->personal_telephoneNumber; + $attr['telephoneNumber'] = utf8_encode($values->personal_telephoneNumber); if (($values->personal_telephoneNumber != $values_old->personal_telephoneNumber) && ($values->personal_telephoneNumber =='')) - $attr_rem['telephoneNumber'] = $values_old->personal_telephoneNumber; + $attr_rem['telephoneNumber'] = utf8_encode($values_old->personal_telephoneNumber); if (($values->personal_mobileTelephoneNumber != $values_old->personal_mobileTelephoneNumber) && ($values->personal_mobileTelephoneNumber!='')) - $attr['mobileTelephoneNumber'] = $values->personal_mobileTelephoneNumber; + $attr['mobileTelephoneNumber'] = utf8_encode($values->personal_mobileTelephoneNumber); if (($values->personal_mobileTelephoneNumber != $values_old->personal_mobileTelephoneNumber) && ($values->personal_mobileTelephoneNumber=='')) - $attr_rem['mobilemobileTelephoneNumber'] = $values_old->personal_mobileTelephoneNumber; + $attr_rem['mobilemobileTelephoneNumber'] = utf8_encode($values_old->personal_mobileTelephoneNumber); if (($values->personal_facsimileTelephoneNumber != $values_old->personal_facsimileTelephoneNumber) && ($values->personal_facsimileTelephoneNumber!='')) - $attr['facsimileTelephoneNumber'] = $values->personal_facsimileTelephoneNumber; + $attr['facsimileTelephoneNumber'] = utf8_encode($values->personal_facsimileTelephoneNumber); if (($values->personal_facsimileTelephoneNumber != $values_old->personal_facsimileTelephoneNumber) && ($values->personal_facsimileTelephoneNumber=='')) - $attr_rem['facsimileTelephoneNumber'] = $values_old->personal_facsimileTelephoneNumber; + $attr_rem['facsimileTelephoneNumber'] = utf8_encode($values_old->personal_facsimileTelephoneNumber); if (($values->personal_street != $values_old->personal_street) && ($values->personal_street!='')) - $attr['street'] = $values->personal_street; + $attr['street'] = utf8_encode($values->personal_street); if (($values->personal_street != $values_old->personal_street) && ($values->personal_street=='')) - $attr_rem['street'] = $values_old->personal_street; + $attr_rem['street'] = utf8_encode($values_old->personal_street); if (($values->personal_street != $values_old->personal_street) && ($values->personal_street!='')) - $attr['postalCode'] = $values->personal_street; + $attr['postalCode'] = utf8_encode($values->personal_street); if (($values->personal_street != $values_old->personal_street) && ($values->personal_street=='')) - $attr_rem['postalCode'] = $values_old->personal_street; + $attr_rem['postalCode'] = utf8_encode($values_old->personal_street); if (($values->personal_postalAddress != $values_old->personal_postalAddress) && ($values->personal_postalAddress!='')) - $attr['postalAddress'] = $values->personal_postalAddress; + $attr['postalAddress'] = utf8_encode($values->personal_postalAddress); if (($values->personal_postalAddress != $values_old->personal_postalAddress) && ($values->personal_postalAddress=='')) - $attr_rem['postalAddress'] = $values_old->personal_postalAddress; + $attr_rem['postalAddress'] = utf8_encode($values_old->personal_postalAddress); if (($values->personal_employeeType != $values_old->personal_employeeType) && ($values->personal_employeeType!='')) - $attr['employeeType'] = $values->personal_employeeType; + $attr['employeeType'] = utf8_encode($values->personal_employeeType); if (($values->personal_employeeType != $values_old->personal_employeeType) && ($values->personal_employeeType=='')) - $attr_rem['employeeType'] = $values_old->personal_employeeType; + $attr_rem['employeeType'] = utf8_encode($values_old->personal_employeeType); if (($values->unix_pwdexpire_day = $date['mday']!=$values_old->unix_pwdexpire_day = $date['mday']) || ($values->unix_pwdexpire_mon = $date['mon'] != $values_old->unix_pwdexpire_mon = $date['mon']) || ($values->unix_pwdexpire_yea = $date['year'] != $values->unix_pwdexpire_yea = $date['year'])) diff --git a/lam/templates/account.php b/lam/templates/account.php index 2a7cda33..e10617fa 100644 --- a/lam/templates/account.php +++ b/lam/templates/account.php @@ -416,7 +416,7 @@ switch ($select_local) { // Select which part of page will be loaded $groups = findgroups(); // Show page info echo ''; - echo _('General Properties'); + echo _('General properties'); echo "\n"; switch ( $_SESSION['type2'] ) { case 'user': @@ -430,7 +430,7 @@ switch ($select_local) { // Select which part of page will be loaded ''. ''._('Help').''. ''."\n".''; - echo _('UID Number'); + echo _('UID number'); echo ''."\n".''. ''. ''."\n".''. @@ -458,7 +458,7 @@ switch ($select_local) { // Select which part of page will be loaded echo ''. ''._('Help').''. ''."\n".''; - echo _('Additional Groups'); + echo _('Additional groups'); echo ''."\n".''."\n".''. ''._('Help').''. ''."\n".''; - echo _('Home Directory').'*'; + echo _('Home directory').'*'; echo ''."\n".''. ''."\n".''. ''._('Help').''. @@ -520,7 +520,7 @@ switch ($select_local) { // Select which part of page will be loaded ''. ''._('Help').''. ''."\n".''; - echo _('GID Number'); + echo _('GID number'); echo ''."\n".''. ''. ''."\n".''. @@ -560,7 +560,7 @@ switch ($select_local) { // Select which part of page will be loaded ''. ''._('Help').''. ''."\n".''; - echo _('UID Number'); + echo _('UID number'); echo ''."\n".''. ''. ''."\n".''. @@ -614,7 +614,7 @@ switch ($select_local) { // Select which part of page will be loaded } $date = getdate ($_SESSION['account']->unix_pwdexpire); echo ''; - echo _('Unix Properties'); + echo _('Unix properties'); echo ''."\n".''; switch ( $_SESSION['type2'] ) { case 'user' : @@ -624,34 +624,34 @@ switch ($select_local) { // Select which part of page will be loaded ''. ''."\n".''. ''; - echo _('Use no Password.'); + echo _('Generate password'); echo '">'; + echo _('Use no password.'); echo ''."\n".'unix_password_no) echo ' checked '; echo '>'."\n".''. ''._('Help').''. ''."\n".''; - echo _('Password Warn'); + echo _('Password warn'); echo ''."\n".''. ''."\n".''. ''._('Help').''. ''."\n".''; - echo _('Password Expire'); + echo _('Password expire'); echo ''."\n".''. ''."\n".''. ''._('Help').''. ''."\n".''; - echo _('Maximum Passwordage'); + echo _('Maximum password age'); echo ''."\n".''. ''."\n".''. ''._('Help').''. ''."\n".''; - echo _('Minimum Passwordage'); + echo _('Minimum password age'); echo ''."\n".''. ''."\n".''. ''._('Help').''. ''."\n".''; - echo _('Expire Date'); + echo _('Expire date'); echo ''."\n".''; echo _('Samba Properties'); echo ''."\n"; + echo ''; echo _('Samba properties'); echo ''."\n"; // decrypt password // decrypt password if ($_SESSION['account']->smb_password != '') { @@ -716,26 +716,28 @@ switch ($select_local) { // Select which part of page will be loaded ''. ''. ''; - echo _('Samba Password'); + echo _('Samba password'); echo ''."\n".''. - ''."\n".''."\n".''; + echo _('Use unix password'); + echo 'smb_useunixpwd) echo ' checked '; - echo '>'; - echo _('Use Unix-Password'); + echo '>'."\n".''. + ''._('Help').''; echo ''."\n".''; - echo _('Use no Password.'); + echo _('Use no password.'); echo ''."\n".'smb_password_no) echo ' checked '; echo '>'."\n".''. ''._('Help').''. ''."\n".''; - echo _('Password doesn\'t expire.'); + echo _('Password does not expire.'); echo ''."\n".'smb_flagsX) echo ' checked '; echo '>'."\n".''. ''._('Help').''. ''."\n".''; - echo _('User can change Password'); + echo _('User can change password'); echo ''."\n".''; - echo _('Quota Properties'); - echo ''."\n".''; echo _('Mointpoint'); echo ''."\n".''; echo _('used blocks'); echo ''."\n".''; - echo _('soft block limit'); echo ''."\n".''; echo _('hard block limit'); echo ''."\n".''; echo _('grace block period'); - echo ''."\n".''; echo _('used inodes'); echo ''."\n".''; echo _('soft inode limit'); echo ''."\n".''; - echo _('hard inode limit'); echo ''."\n".''; echo _('grace inode period'); echo ''."\n"; + echo _('Quota properties'); + echo ''."\n".''; echo _('Mointpoint'); echo ''."\n".''; echo _('Used blocks'); echo ''."\n".''; + echo _('Soft block limit'); echo ''."\n".''; echo _('Hard block limit'); echo ''."\n".''; echo _('Grace block period'); + echo ''."\n".''; echo _('Used inodes'); echo ''."\n".''; echo _('Soft inode limit'); echo ''."\n".''; + echo _('Hard inode limit'); echo ''."\n".''; echo _('Grace inode period'); echo ''."\n"; echo ''._('Help').''."\n".''._('Help').''."\n".''. ''._('Help').''."\n".''._('Help').''."\n".''. ''._('Help').''."\n".''._('Help').''."\n".''. @@ -955,7 +958,7 @@ switch ($select_local) { // Select which part of page will be loaded case 'personal': // Personal Settings echo ''; - echo _('Personal Properties'); + echo _('Personal properties'); echo ''."\n".''; echo _('Title'); echo ''."\n".''. @@ -963,7 +966,7 @@ switch ($select_local) { // Select which part of page will be loaded echo $_SESSION['account']->general_surname . ' ' . $_SESSION['account']->general_givenname . ''. ''._('Help').''. ''."\n".''; - echo _('Employee Type'); + echo _('Employee type'); echo ''."\n".''. ''. ''. @@ -987,25 +990,25 @@ switch ($select_local) { // Select which part of page will be loaded ''. ''._('Help').''. ''."\n".''; - echo _('Telephone Number'); + echo _('Telephone number'); echo ''."\n".''. ''. ''. ''._('Help').''. ''."\n".''; - echo _('Mobile Phonenumber'); + echo _('Mobile number'); echo ''."\n".''. ''. ''. ''._('Help').''. ''."\n".''; - echo _('Facsimile Number'); + echo _('Fax number'); echo ''."\n".''. ''. ''. ''._('Help').''. ''."\n".''; - echo _('eMail Address'); + echo _('eMail address'); echo ''."\n".''. ''. ''.