changed some text

This commit is contained in:
katagia 2003-08-03 13:22:12 +00:00
parent c686c97bfb
commit 2e40eab14b
6 changed files with 125 additions and 124 deletions

View File

@ -182,7 +182,7 @@ $helpArray = array (
character because it's impossible to create a homedirectory starting with a number. 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()."."),
"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 Groupmembership"),
"Text" => _("Can be left empty. Hold the CTRL-key to (de)select multiple groups.")),
"403" => array ("ext" => "FALSE", "Headline" => _("Home Directory"),
@ -191,57 +191,57 @@ $helpArray = array (
"Text" => _("User descriptopn. If left empty sur- and givename will be used.")),
"405" => array ("ext" => "FALSE", "Headline" => _("Login shell"),
"Text" => _("To disable login use /bin/false.")),
"406" => array ("ext" => "FALSE", "Headline" => _("Primary Group"),
"406" => array ("ext" => "FALSE", "Headline" => _("Primary group"),
"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
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()."."),
"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()."."),
"409" => array ("ext" => "FALSE", "Headline" => _("Gecos"),
"Text" => _("Group descriptopn. If left empty groupname will be used.")),
"410" => array ("ext" => "FALSE", "Headline" => _("Hostname"),
"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
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()."."),
"412" => array ("ext" => "FALSE", "Headline" => _("Primary Group"),
"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()."."),
"412" => array ("ext" => "FALSE", "Headline" => _("Primary group"),
"Text" => _("The Prmary Group the host should be member of.")),
"413" => array ("ext" => "FALSE", "Headline" => _("Gecos"),
"Text" => _("Host descriptopn. If left empty hostname will be used.")),
"414" => array ("ext" => "FALSE", "Headline" => _("Password Warn"),
"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. Value must be 0<.")),
"415" => array ("ext" => "FALSE", "Headline" => _("Password Expire"),
"415" => array ("ext" => "FALSE", "Headline" => _("Password expire"),
"Text" => _("Number of days a user can login even his password has expired. -1=always")),
"416" => array ("ext" => "FALSE", "Headline" => _("Maximum Passwordage"),
"416" => array ("ext" => "FALSE", "Headline" => _("Maximum passwordage"),
"Text" => _("Number of days after a user has to change his password again Value must be 0<.")),
"417" => array ("ext" => "FALSE", "Headline" => _("Minimum Passwordage"),
"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. Value must be 0<.")),
"418" => array ("ext" => "FALSE", "Headline" => _("Expire date"),
"Text" => _("Account expire date.")),
"419" => array ("ext" => "FALSE", "Headline" => _("Password Warn"),
"419" => array ("ext" => "FALSE", "Headline" => _("Password warn"),
"Text" => _("Days before password is to expire that host is warned of pending password expiration. Value must be 0<.")),
"420" => array ("ext" => "FALSE", "Headline" => _("Password Expire"),
"420" => array ("ext" => "FALSE", "Headline" => _("Password expire"),
"Text" => _("Number of days a host can login even his password has expired. -1=always")),
"421" => array ("ext" => "FALSE", "Headline" => _("Maximum Passwordage"),
"421" => array ("ext" => "FALSE", "Headline" => _("Maximum passwordage"),
"Text" => _("Number of days after a host has to change his password again Value must be 0< and should be higher as the value on client-side.")),
"422" => array ("ext" => "FALSE", "Headline" => _("Minimum Passwordage"),
"422" => array ("ext" => "FALSE", "Headline" => _("Minimum passwordage"),
"Text" => _("Number of days a host has to wait until he\'s allowed to change his password again. Value must be 0<.")),
"423" => array ("ext" => "FALSE", "Headline" => _("Expire Date"),
"423" => array ("ext" => "FALSE", "Headline" => _("Expire date"),
"Text" => _("Account expire date.")),
"424" => array ("ext" => "FALSE", "Headline" => _("Surname"),
"Text" => _("Surname")),
"425" => array ("ext" => "FALSE", "Headline" => _("Givenname"),
"Text" => _("Givenname")),
"425" => array ("ext" => "FALSE", "Headline" => _("Given name"),
"Text" => _("Given name")),
"426" => array ("ext" => "FALSE", "Headline" => _("Use no password"),
"Text" => _("Use no password")),
"427" => array ("ext" => "FALSE", "Headline" => _("Account deactivated"),
"Text" => _("Account deactivated")),
"428" => array ("ext" => "FALSE", "Headline" => _("Use no Password"),
"Text" => _("Use no Password.")),
"429" => array ("ext" => "FALSE", "Headline" => _("Password doesn't expire"),
"428" => array ("ext" => "FALSE", "Headline" => _("Use no password"),
"Text" => _("Use no password.")),
"429" => array ("ext" => "FALSE", "Headline" => _("Password does not expire"),
"Text" => _("Password doesn't expire.")),
"430" => array ("ext" => "FALSE", "Headline" => _("User can change password"),
"Text" => _("User can change password.")),
@ -249,15 +249,15 @@ $helpArray = array (
"Text" => _("User must change password.")),
"432" => array ("ext" => "FALSE", "Headline" => _("Account is deactivated"),
"Text" => _("Account is deactivated.")),
"433" => array ("ext" => "FALSE", "Headline" => _("Home Drive"),
"Text" => _("Driveletter assigned on Windows-Workstations as Homedirectory.")),
"434" => array ("ext" => "FALSE", "Headline" => _("Script Path"),
"433" => array ("ext" => "FALSE", "Headline" => _("Home drive"),
"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.")),
"435" => array ("ext" => "FALSE", "Headline" => _("Profile Path"),
"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.")),
"436" => array ("ext" => "FALSE", "Headline" => _("User Workstations"),
"436" => array ("ext" => "FALSE", "Headline" => _("User workstations"),
"Text" => _("Komma-separated list of workstations the user is allowed to login. Empty means every workstation. Can be left empty.")),
"437" => array ("ext" => "FALSE", "Headline" => _("smb Home"),
"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.")),
"438" => array ("ext" => "FALSE", "Headline" => _("Domain"),
"Text" => _("Windows-Domain of user. Can be left empty.")),
@ -274,47 +274,47 @@ $helpArray = array (
"444" => array ("ext" => "FALSE", "Headline" => _("used inodes"),
"Text" => _("used inodes")),
"445" => array ("ext" => "FALSE", "Headline" => _("soft inode limit"),
"Text" => _("sofr inode limit")),
"Text" => _("soft inode limit")),
"446" => array ("ext" => "FALSE", "Headline" => _("hard inode limit"),
"Text" => _("hard inode limit")),
"447" => array ("ext" => "FALSE", "Headline" => _("grace inode period"),
"Text" => _("grace inode period")),
"448" => array ("ext" => "FALSE", "Headline" => _("Title"),
"Text" => _("Title")),
"449" => array ("ext" => "FALSE", "Headline" => _("Employee Type"),
"Text" => _("Employee Type")),
"449" => array ("ext" => "FALSE", "Headline" => _("Employee type"),
"Text" => _("Employee type")),
"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")),
"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")),
"456" => array ("ext" => "FALSE", "Headline" => _("eMail Address"),
"Text" => _("eMail Address")),
"457" => array ("ext" => "FALSE", "Headline" => _("Save Profile"),
"Text" => _("Save Profile")),
"458" => array ("ext" => "FALSE", "Headline" => _("Host can change Password"),
"Text" => _("Host can change Password")),
"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.")),
"451" => array ("ext" => "FALSE", "Headline" => _("Postal code"),
"Text" => _("Postal code")),
"452" => array ("ext" => "FALSE", "Headline" => _("Postal address"),
"Text" => _("Postal address")),
"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")),
"456" => array ("ext" => "FALSE", "Headline" => _("eMail address"),
"Text" => _("eMail address")),
"457" => array ("ext" => "FALSE", "Headline" => _("Save profile"),
"Text" => _("Save profile")),
"458" => array ("ext" => "FALSE", "Headline" => _("Host can change password"),
"Text" => _("Host can change password")),
"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.")),
"461" => array ("ext" => "FALSE", "Headline" => _("Suffix"),
"Text" => _("Suffix")),
"462" => array ("ext" => "FALSE", "Headline" => _("Suffix"),
"Text" => _("Suffix")),
"463" => array ("ext" => "FALSE", "Headline" => _("Suffix"),
"Text" => _("Suffix")),
"464" => array ("ext" => "FALSE", "Headline" => _("Windows Well Known Group"),
"Text" => _("Windows Well Known Group")),
"465" => array ("ext" => "FALSE", "Headline" => _("Windows Groupname"),
"Text" => _("Windows Groupname")),
"464" => array ("ext" => "FALSE", "Headline" => _("Windows well known group"),
"Text" => _("Windows well known group")),
"465" => array ("ext" => "FALSE", "Headline" => _("Windows groupname"),
"Text" => _("Windows groupname")),
// 600 - 699
// Roland Gruber
// OU-editor, domain page

View File

@ -173,18 +173,18 @@ function checkglobal($values, $type, $values_old=false) { // This functions chec
$return->general_homedir = str_replace('$group', $values->general_group, $values->general_homedir);
if ($values->general_username != '')
$return->general_homedir = str_replace('$user', $values->general_username, $values->general_homedir);
if ($return->general_homedir != $values->general_homedir) $errors[] = array('INFO', _('Homedir'), _('Replaced $user or $group in homedir.'));
if ($return->general_homedir != $values->general_homedir) $errors[] = array('INFO', _('Home Directory'), _('Replaced $user or $group in homedir.'));
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', _('Homedir'), _('Homedirectory contents invalid characters.'));
$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', _('Givenname'), _('Givenname contents invalid characters'));
if ( !ereg('^([a-z]|[A-Z])+$', $values->general_givenname)) $errors[] = array('ERROR', _('Given name'), _('Givenname 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 = $values->general_givenname . " " . $values->general_surname ;
$errors[] = array('INFO', _('Gecos'), _('Inserted sur- and givenname in gecos-field.'));
}
if ($values->general_group=='') $errors[] = array('ERROR', _('Primary Group'), _('No primary Group defined!'));
if ($values->general_group=='') $errors[] = array('ERROR', _('Primary group'), _('No primary group defined!'));
// Check if Username contents only valid characters
if ( !ereg('^([a-z]|[0-9]|[.]|[-]|[_])*$', $values->general_username))
$errors[] = array('ERROR', _('Username'), _('Username contents invalid characters. Valid characters are: a-z, 0-9 and .-_ !'));
@ -247,12 +247,12 @@ function checkglobal($values, $type, $values_old=false) { // This functions chec
case 'host' :
if ( substr($values->general_username, strlen($values->general_username)-1, strlen($values->general_username)) != '$' ) {
$values->general_username = $values->general_username . '$';
$errors[] = array('WARN', _('Hostname'), _('Added $ to hostname.'));
$errors[] = array('WARN', _('Host name'), _('Added $ to hostname.'));
}
$return->general_username = $values->general_username;
// Check if Hostname contents only valid characters
if ( !ereg('^([a-z]|[0-9]|[.]|[-]|[$])*$', $values->general_username))
$errors[] = array('ERROR', _('Hostname'), _('Hostname contents invalid characters. Valid characters are: a-z, 0-9 and .-_ !'));
$errors[] = array('ERROR', _('Host name'), _('Hostname contents invalid characters. Valid characters are: a-z, 0-9 and .-_ !'));
// Check if Hostname already exists
$return->general_homedir = '/dev/null';
$return->general_shell = '/bin/false';
@ -281,7 +281,7 @@ function checkglobal($values, $type, $values_old=false) { // This functions chec
$return->general_username = $firstchars . (intval($lastchars)+1). '$';
}
}
if ($values->general_username != $return->general_username) $errors[] = array('WARN', _('Hostname'), _('Hostname allready in use. Selected next free hostname.'));
if ($values->general_username != $return->general_username) $errors[] = array('WARN', _('Host name'), _('Hostname allready in use. Selected next free hostname.'));
break;
}
// Check if UID is valid. If none value was entered, the next useable value will be inserted
@ -337,31 +337,31 @@ function checksamba($values, $type) { // This function checks all samba account
switch ($type) {
case 'user' :
$return->smb_scriptPath = str_replace('$user', $values->general_username, $values->smb_scriptPath);
if ($values->smb_scriptPath != $return->smb_scriptPath) $errors[] = array('INFO', _('Scriptpath'), _('Inserted username in scriptpath.'));
if ($values->smb_scriptPath != $return->smb_scriptPath) $errors[] = array('INFO', _('Script path'), _('Inserted username in scriptpath.'));
$return->smb_scriptPath = str_replace('$group', $values->general_group, $return->smb_scriptPath);
if ($values->smb_scriptPath != $return->smb_scriptPath) $errors[] = array('INFO', _('Scriptpath'), _('Inserted groupname in scriptpath.'));
if ($values->smb_scriptPath != $return->smb_scriptPath) $errors[] = array('INFO', _('Script path'), _('Inserted groupname in scriptpath.'));
$return->smb_profilePath = str_replace('$user', $values->general_username, $values->smb_profilePath);
if ($values->smb_profilePath != $return->smb_profilePath) $errors[] = array('INFO', _('Profilepath'), _('Inserted username in profilepath.'));
if ($values->smb_profilePath != $return->smb_profilePath) $errors[] = array('INFO', _('Profile path'), _('Inserted username in profilepath.'));
$return->smb_profilePath = str_replace('$group', $return->general_group, $return->smb_profilePath);
if ($values->smb_profilePath != $return->smb_profilePath) $errors[] = array('INFO', _('Profilepath'), _('Inserted groupname in profilepath.'));
if ($values->smb_profilePath != $return->smb_profilePath) $errors[] = array('INFO', _('Profile path'), _('Inserted groupname in profilepath.'));
$return->smb_smbHome = str_replace('$user', $values->general_username, $values->smb_smbHome);
if ($values->smb_smbHome != $return->smb_smbHome) $errors[] = array('INFO', _('smbHome'), _('Inserted username in smbhome.'));
if ($values->smb_smbHome != $return->smb_smbHome) $errors[] = array('INFO', _('smb home'), _('Inserted username in smbhome.'));
$return->smb_smbHome = str_replace('$group', $return->general_group, $return->smb_smbHome);
if ($values->smb_smbHome != $return->smb_smbHome) $errors[] = array('INFO', _('smbHome'), _('Inserted groupname in smbhome.'));
if ($values->smb_smbHome != $return->smb_smbHome) $errors[] = array('INFO', _('smb home'), _('Inserted groupname in smbhome.'));
if ( !ereg('^([a-z]|[A-Z]|[0-9]|[\|]|[\#]|[\*]|[\,]|[\.]|[\;]|[\:]|[\_]|[\-]|[\+]|[\!]|[\%]|[\&]|[\/]|[\?]|[\{]|[\[]|[\(]|[\)]|[\]]|[\}])*$',
$values->smb_password)) $errors[] = array('ERROR', _('Password'), _('Password contents invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !'));
if ( (!$return->smb_scriptPath=='') && (!ereg('^([/])*[a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*([/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*)*$', $return->smb_scriptPath)))
$errors[] = array('ERROR', _('Scriptpath'), _('Scriptpath is invalid'));
$errors[] = array('ERROR', _('Scriptpath'), _('Script path is invalid.'));
if ( (!$return->smb_profilePath=='') && (!ereg('^[/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*([/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*)*$', $return->smb_profilePath))
&& (!ereg('^[\][\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%])+([\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%])+)+$', $return->smb_profilePath)))
$errors[] = array('ERROR', _('Profilepath'), _('ProfilePath is invalid.'));
$errors[] = array('ERROR', _('Profile path'), _('Profile path is invalid.'));
if ( (!$return->smb_smbHome=='') && !ereg('^[\][\]([a-z]|[A-Z]|[0-9]|[.]|[-])+([\]([a-z]|[A-Z]|[0-9]|[.]|[-])+)+$', $return->smb_smbhome))
$errors[] = array('ERROR', _('smbHome'), _('smbHome is invalid.'));
$errors[] = array('ERROR', _('smb home'), _('smb home is invalid.'));
if ((!$values->smb_smbuserworkstations=='') && !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-])+(([,])+([a-z]|[A-Z]|[0-9]|[.]|[-])+)*$', $values->smb_smbuserworkstations))
$errors[] = array('ERROR', _('User Workstations'), _('User Workstations is invalid.'));
$errors[] = array('ERROR', _('User workstations'), _('User workstations is invalid.'));
$return->smb_flagsW = 0;
if ((!$values->smb_domain=='') && !ereg('^([a-z]|[A-Z]|[0-9]|[-])+$', $values->smb_domain))
$errors[] = array('ERROR', _('Domain Name'), _('Domain Name contents invalid characters. Valid characters are: a-z, A-Z, 0-9 and -.'));
$errors[] = array('ERROR', _('Domain name'), _('Domain name contents invalid characters. Valid characters are: a-z, A-Z, 0-9 and -.'));
if ($values->smb_useunixpwd) $return->smb_useunixpwd = 1; else $return->smb_useunixpwd = 0;
if ($values->smb_password) {
// Encrypt password
@ -494,9 +494,9 @@ function getquotas($type,$user='+') { // Whis function will return the quotas fr
$return->quota[$i][$j] = $vals2[$j];
}
if ($return->quota[$i][4]<$time) $return->quota[$i][4] = '';
else $return->quota[$i][4] = strval(($return->quota[$i][4]-$time)/3600) . _(' hours');
else $return->quota[$i][4] = strval(($return->quota[$i][4]-$time)/3600) .' '. _('hours');
if ($return->quota[$i][8]<$time) $return->quota[$i][8] = '';
else $return->quota[$i][8] = strval(($return->quota[$i][8]-$time)/3600) . _(' hours');
else $return->quota[$i][8] = strval(($return->quota[$i][8]-$time)/3600) .' '. _('hours');
}
return $return;
}
@ -558,8 +558,8 @@ function ldapexists($values, $type, $values_old=false) { // This function will s
$entry = ldap_first_entry($_SESSION['ldap']->server(), $result);
if ($entry) $dn = (ldap_get_dn($_SESSION['ldap']->server(), $entry));
if ($dn) {
if ($values_old->general_username != $values->general_username) return _($type . ' already exists!');
if (!$values_old) return _($type . ' already exists!');
if ($values_old->general_username != $values->general_username) return $type .' '. _('already exists!');
if (!$values_old) return $type .' '. _('already exists!');
}
return 0;
}
@ -645,10 +645,11 @@ function checkid($values, $type, $values_old=false) { // if value is empty will
$entry = ldap_first_entry($_SESSION['ldap']->server(), $result);
if ($entry) { // Entry with same ID found
$dn = (ldap_get_dn($_SESSION['ldap']->server(), $entry));
if (!$values_old) return _('ID is used from ' . $dn . ' !');
else if ($dn!=$values_old->general_dn) return _('ID is used from ' . $dn . ' !');
$string = _('ID is used from') .' '. $dn . ' !';
if (!$values_old) return $string;
else if ($dn!=$values_old->general_dn) return $string;
}
if ( $values->general_uidNumber < $minID || $values->general_uidNumber > $maxID) return _('Please enter a value between '. $minID . ' and ' . $maxID . '!');
if ( $values->general_uidNumber < $minID || $values->general_uidNumber > $maxID) return _('Please enter a value between').' '. $minID .' '. _('and') .' '. $maxID . '!';
return intval($values->general_uidNumber);
}

View File

@ -413,7 +413,7 @@ switch ($select_local) { // Select which part of page will be loaded
$profilelist = getUserProfiles();
// Create HTML-page
echo '<tr><td>';
echo _('Username*');
echo _('Username').'*';
echo "</td>\n<td>".
'<input name="f_general_username" type="text" size="20" maxlength="20" value="' . $_SESSION['account']->general_username . '">'.
'</td><td>'.
@ -425,19 +425,19 @@ switch ($select_local) { // Select which part of page will be loaded
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=401" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Surname*');
echo _('Surname').'*';
echo '</td>'."\n".'<td>'.
'<input name="f_general_surname" type="text" size="20" maxlength="20" value="' . $_SESSION['account']->general_surname . '">'.
'</td><td>'.
'<a href="help.php?HelpNumber=424" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Given name*');
echo _('Given name').'*';
echo '</td>'."\n".'<td>'.
'<input name="f_general_givenname" type="text" size="20" maxlength="20" value="' . $_SESSION['account']->general_givenname . '">'.
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=425" target="lamhelp">'._('Help').'</a>'.
'</td>'."\n".'</tr>'."\n".'<tr><td>';
echo _('Primary Group*');
echo _('Primary group').'*';
echo '</td>'."\n".'<td><select name="f_general_group">';
// loop trough existing groups
foreach ($groups as $group) {
@ -460,7 +460,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo '</select></td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=402" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Home Directory*');
echo _('Home Directory').'*';
echo '</td>'."\n".'<td><input name="f_general_homedir" type="text" size="30" value="' . $_SESSION['account']->general_homedir . '">'.
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=403" target="lamhelp">'._('Help').'</a>'.
@ -470,7 +470,7 @@ switch ($select_local) { // Select which part of page will be loaded
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=404" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Login Shell*');
echo _('Login shell').'*';
echo '</td>'."\n".'<td><select name="f_general_shell" >';
// loop through shells
foreach ($_SESSION['shelllist'] as $shell)
@ -503,7 +503,7 @@ switch ($select_local) { // Select which part of page will be loaded
$profilelist = getGroupProfiles();
// Create HTML-page
echo '<tr><td>';
echo _('Groupname*');
echo _('Groupname').'*';
echo '</td>'."\n".'<td>'.
'<input name="f_general_username" type="text" size="20" maxlength="20" value="' . $_SESSION['account']->general_username . '">'.
'</td><td>'.
@ -543,7 +543,7 @@ switch ($select_local) { // Select which part of page will be loaded
$profilelist = getHostProfiles();
// Create HTML-page
echo '<tr><td>';
echo _('Hostname*');
echo _('Host name').'*';
echo '</td>'."\n".'<td>'.
'<input name="f_general_username" type="text" size="20" maxlength="20" value="' . $_SESSION['account']->general_username . '">'.
'</td><td>'.
@ -555,7 +555,7 @@ switch ($select_local) { // Select which part of page will be loaded
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=411" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Primary Group*');
echo _('Primary group').'*';
echo '</td>'."\n".'<td><select name="f_general_group">';
foreach ($groups as $group) {
if ($_SESSION['account']->general_group == $group) echo '<option selected>' . $group. '</option>';
@ -762,7 +762,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo '</select></td>'."\n".'<td>';
echo '<a href="help.php?HelpNumber=430" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('User must change Password');
echo _('User must change password');
echo '</td>'."\n".'<td><select name="f_smb_pwdmustchange_day">';
for ( $i=1; $i<=31; $i++ ) {
if ($mustchangedate['mday']==$i) echo "<option selected> $i". '</option>';
@ -781,35 +781,35 @@ switch ($select_local) { // Select which part of page will be loaded
echo '</select></td>'."\n".'<td>';
echo '<a href="help.php?HelpNumber=431" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Accout is deactivated');
echo _('Account is deactivated');
echo '</td>'."\n".'<td><input name="f_smb_flagsD" type="checkbox"';
if ($_SESSION['account']->smb_flagsD) echo ' checked ';
echo '></td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=432" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Home Drive');
echo _('Home drive');
echo '</td>'."\n".'<td><select name="f_smb_homedrive" >';
for ($i=68; $i<91; $i++)
if ($_SESSION['account']->smb_homedrive== chr($i).':') echo '<option selected> '.chr($i).':</option>'; else echo '<option> '.chr($i).':</option>';
echo '</select></td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=433" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Script Path');
echo _('Script path');
echo '</td>'."\n".'<td><input name="f_smb_scriptpath" type="text" size="20" maxlength="80" value="' . $_SESSION['account']->smb_scriptPath . '">'.
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=434" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Profile Path');
echo _('Profile path');
echo '</td>'."\n".'<td><input name="f_smb_profilePath" type="text" size="20" maxlength="80" value="' . $_SESSION['account']->smb_profilePath . '">'.
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=435" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('User Workstations');
echo _('User workstations');
echo '</td>'."\n".'<td><input name="f_smb_smbuserworkstations" type="text" size="20" maxlength="80" value="' . $_SESSION['account']->smb_smbuserworkstations . '">'.
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=436" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('smb Home');
echo _('smb home');
echo '</td>'."\n".'<td><input name="f_smb_smbhome" type="text" size="20" maxlength="80" value="' . $_SESSION['account']->smb_smbhome . '">'.
'</td>'."\n".'<td>'.
'<a href="help.php?HelpNumber=437" target="lamhelp">'._('Help').'</a>'.
@ -909,7 +909,7 @@ switch ($select_local) { // Select which part of page will be loaded
echo '</select></td>'."\n".'<td>';
echo '<a href="help.php?HelpNumber=431" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Accout is deactivated');
echo _('Account is deactivated');
echo '</td>'."\n".'<td><input name="f_smb_flagsD" type="checkbox"';
if ($_SESSION['account']->smb_flagsD) echo ' checked ';
echo '></td><td>'.
@ -1090,40 +1090,40 @@ switch ($select_local) { // Select which part of page will be loaded
echo '<tr><td>';
echo _('User ');
echo $_SESSION['account']->general_username;
if ($_SESSION['account_old']) echo _(' has been modified. ');
else echo _(' has been created. ');
if ($_SESSION['account_old']) echo ' '._('has been modified').'.';
else echo ' '._('has been created').'.';
if (!$_SESSION['account_old'])
{ echo '<input name="createagain" type="submit" value="'; echo _('Create another user'); echo '">'; }
echo '</td>'."\n".'<td>'.
'<input name="outputpdf" type="submit" value="'; echo _('Create PDF-file'); echo '">'.
'<input name="outputpdf" type="submit" value="'; echo _('Create PDF file'); echo '">'.
'</td>'."\n".'<td>'.
'<input name="backmain" type="submit" value="'; echo _('Back to userlist'); echo '">'.
'<input name="backmain" type="submit" value="'; echo _('Back to user list'); echo '">'.
'</td></tr>'."\n";
break;
case 'group' :
echo '<tr><td>';
echo _('Group ');
echo $_SESSION['account']->general_username;
if ($_SESSION['account_old']) echo _(' has been modified. ');
else echo _(' has been created. ');
if ($_SESSION['account_old']) echo ' '._('has been modified').'.';
else echo ' '._('has been created').'.';
echo '</td></tr>'."\n".'<tr><td>';
if (!$_SESSION['account_old'])
{ echo' <input name="createagain" type="submit" value="'; echo _('Create another group'); echo '">'; }
echo '</td><td></td><td>'.
'<input name="backmain" type="submit" value="'; echo _('Back to grouplist'); echo '">'.
'<input name="backmain" type="submit" value="'; echo _('Back to group list'); echo '">'.
'</td></tr>'."\n";
break;
case 'host' :
echo '<tr><td>';
echo _('Host ');
echo $_SESSION['account']->general_username;
if ($_SESSION['account_old']) echo _(' has been modified. ');
else echo _(' has been created. ');
echo _('Host');
echo ' '.$_SESSION['account']->general_username.' ';
if ($_SESSION['account_old']) echo ' '._('has been modified').'.';
else echo ' '._('has been created').'.';
echo '</td></tr>'."\n".'<tr><td>';
if (!$_SESSION['account_old'])
{ echo '<input name="createagain" type="submit" value="'; echo _('Create another host'); echo '">'; }
echo '</td><td>'."\n".'</td><td>'.
'<input name="backmain" type="submit" value="'; echo _('Back to hostlist'); echo '">'.
'<input name="backmain" type="submit" value="'; echo _('Back to host list'); echo '">'.
'</td></tr>'."\n";
break;
}

View File

@ -100,11 +100,11 @@ if ($_POST['delete_yes']) {
$entry = ldap_next_entry($_SESSION['ldap']->server(), $entry);
}
$success = ldap_delete($_SESSION['ldap']->server(), $dn);
if (!$success) $error = _('Could not delete user: ').$dn;
if (!$success) $error = _('Could not delete user:').' '.$dn;
break;
case 'host':
$success = ldap_delete($_SESSION['ldap']->server(), $dn);
if (!$success) $error = _('Could not delete host: ').$dn;
if (!$success) $error = _('Could not delete host:').' '.$dn;
break;
case 'group':
$temp=explode(',', $dn);
@ -113,17 +113,17 @@ if ($_POST['delete_yes']) {
$entry = ldap_first_entry($_SESSION['ldap']->server(), $result);
while ($entry) {
$attr2 = ldap_get_attributes($_SESSION['ldap']->server(), $entry);
if ($attr2['gidNumber']==getgid($groupname)) $error = _('Could not delete group. Still users in group: ').$dn;
if ($attr2['gidNumber']==getgid($groupname)) $error = _('Could not delete group. Still users in group:').' '.$dn;
$entry = ldap_next_entry($_SESSION['ldap']->server(), $entry);
}
if (!$error) {
if ($_SESSION['config']->scriptServer) remquotas($groupname, $_POST['type5']);
$success = ldap_delete($_SESSION['ldap']->server(), $dn);
if (!$success) $error = _('Could not delete group: ').$dn;
if (!$success) $error = _('Could not delete group:').' '.$dn;
}
break;
}
if (!$error) echo $dn. _(' deleted.');
if (!$error) echo $dn.' '. _('deleted').'.';
else echo $error;
echo '</td></tr>'."\n".'<tr><td>';
}

View File

@ -189,12 +189,12 @@ switch ($select) {
for ($i=0; $i<sizeof($groups); $i++)
if ($_SESSION['accounts'][$i]->general_group!='')
StatusMessage('INFO', _('Group ').
$_SESSION['accounts'][$i]->general_group._(' not found!'), _('It will be created.'));
$_SESSION['accounts'][$i]->general_group.' '._('not found!'), _('It will be created.'));
if ($_FILES['userfile']['size']>0) {
fclose($handle);
unlink($_FILES['userfile']['tmp_name']);
}
echo '<tr><td>'._('row').'</td><td>'. _('Surname'). '</td><td>'. _('Givenname'). '</td><td>'. _('Username'). '</td><td>'. _('Primary Group'). '</td><td>'.
echo '<tr><td>'._('row').'</td><td>'. _('Surname'). '</td><td>'. _('Given name'). '</td><td>'. _('User name'). '</td><td>'. _('Primary group'). '</td><td>'.
_('Details'). '</td><td>' . _('Warnings'). '</td><td>' . _('Errors') . '</td></tr>';
for ($row=0; $row<sizeof($_SESSION['accounts']); $row++) { // loops for every row
echo '<tr><td>'.$row.'</td><td>'.
@ -267,7 +267,7 @@ switch ($select) {
for ($j=0; $j<sizeof($_SESSION['errors'][$i]); $j++)
if ($_SESSION['errors'][$i][$j][0] == 'INFO') $nowarn=false;
echo '<br>';
if (!$noerrors) { echo '<tr><td>'. _('There are some errors!!') . '</td></tr>'; }
if (!$noerrors) { echo '<tr><td>'. _('There are some errors.') . '</td></tr>'; }
if (!$nowarn) { echo '<tr><td>'. _('There are some warnings.') . '</td></tr>'; }
echo '</table><br><table class="masscreate" width="100%">'.
'<tr><td><input name="back" type="submit" value="'; echo _('Back'); echo '">';
@ -297,7 +297,7 @@ switch ($select) {
if ($error==1) $_SESSION['pointer']++;
else {
$stay = false;
StatusMessage('ERROR', _('Could not create user'), _('Was unable to create ').$_SESSION['accounts'][$row]->general_username);
StatusMessage('ERROR', _('Could not create user'), _('Was unable to create').' '.$_SESSION['accounts'][$row]->general_username);
}
}
else $stay=false;
@ -309,7 +309,7 @@ switch ($select) {
echo _('All Users have been created');
echo '</td></tr><tr><td>';
echo '<tr><td><input name="cancel" type="submit" value="'; echo _('Mainmenu'); echo '">';
echo '</td><td></td><td><input name="pdf" type="submit" value="'; echo _('Create PDF-File'); echo '">';
echo '</td><td></td><td><input name="pdf" type="submit" value="'; echo _('Create PDF file'); echo '">';
echo '</td></tr>';
}
break;

View File

@ -114,7 +114,7 @@ switch ($select) {
'</td><td>'.
'<a href="help.php?HelpNumber=400" target="lamhelp">'._('Help').'</a>'.
'</td></tr>'."\n".'<tr><td>';
echo _('Primary Group*');
echo _('Primary group*');
echo "</td>\n<td>".
'<input name="f_general_group" type="text" size="20" maxlength="20" value="' . $_SESSION['accounts'][$row]->general_group . '">'.
'</td><td>'.
@ -174,8 +174,8 @@ switch ($select) {
'</td><td>'.
'<a href="help.php?HelpNumber=456" target="lamhelp">'._('Help').'</a>'.
'</td></tr><br>';
echo '<tr><td><input name="apply" type="submit" value="'; echo _('Apply Changes'); echo '"></td><td></td><td>';
echo '<input name="undo" type="submit" value="'; echo _('Undo last Changes'); echo '"></td></tr>';
echo '<tr><td><input name="apply" type="submit" value="'; echo _('Apply'); echo '"></td><td></td><td>';
echo '<input name="undo" type="submit" value="'; echo _('Undo'); echo '"></td></tr>';
break;
}