diff --git a/lam/config/shells b/lam/config/shells index 7105372f..590d9c89 100644 --- a/lam/config/shells +++ b/lam/config/shells @@ -15,3 +15,4 @@ /usr/bin/rbash /usr/bin/tcsh /usr/bin/zsh +# test diff --git a/lam/lib/account.inc b/lam/lib/account.inc index cf308040..701ba86f 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -88,11 +88,13 @@ class account { // This class keeps all needed values for any account function getshells() { // Return a list of all shells listed in ../config/shells $shells = file($_SESSION['lampath'].'config/shells'); $i=0; - while ($shells[$i]) { - chop($shells[$i]); + while (count($shells) > $i) { + // remove whitespaces trim($shells[$i]); - $shells[$i] = substr($shells[$i], 0, strpos($shells[$i], '#')); - if ($shells[$i]=='') unset ($shells[$i]); + // remove lineend + $shells[$i] = substr($shells[$i], 0, strpos($shells[$i], "\n")); + // unset comments + if ($shells[$i]{0}=='#') unset ($shells[$i]); else $i++; } return $shells; @@ -370,7 +372,6 @@ function findgroups() { // Will return an array with all Groupnames found in LDA function getgid($groupname) { // Will return the the gid to an existing Groupname ldapreload('group'); - $search = 'cn='.$groupname; $keys = $_SESSION['groupDN']; unset ($keys[0]); foreach ($keys as $key) { @@ -385,12 +386,16 @@ function checkid($values, $type, $values_old=false) { // if value is empty will switch ($type) { case 'user': ldapreload('user'); + ldapreload('host'); $minID = intval($_SESSION['config']->get_minUID()); $maxID = intval($_SESSION['config']->get_maxUID()); $suffix = $_SESSION['config']->get_UserSuffix(); $keys = $_SESSION['userDN']; unset ($keys[0]); $keys = array_values($keys); + $keys2 = $_SESSION['hostDN']; + unset ($keys2[0]); + $keys2 = array_values($keys2); break; case 'group': ldapreload('group'); @@ -402,6 +407,7 @@ function checkid($values, $type, $values_old=false) { // if value is empty will $keys = array_values($keys); break; case 'host': + ldapreload('user'); ldapreload('host'); $minID = intval($_SESSION['config']->get_MinMachine()); $maxID = intval($_SESSION['config']->get_MaxMachine()); @@ -409,27 +415,44 @@ function checkid($values, $type, $values_old=false) { // if value is empty will $keys = $_SESSION['hostDN']; unset ($keys[0]); $keys = array_values($keys); + $keys2 = $_SESSION['userDN']; + unset ($keys2[0]); + $keys2 = array_values($keys2); break; } + // Store all used UIDs in Array + if (isset($keys2)) foreach ($keys2 as $key) $keys3[] = $key['uidNumber']; + foreach ($keys as $key) $keys3[] = $key['uidNumber']; + sort ($keys3, SORT_NUMERIC); if ($values->general_uidNumber=='') { if (!isset($values_old->general_uidNumber)) { if ($keys) { - $id = 0; foreach ($keys as $key) if ($key['uidNumber'] > $id) $id = $key['uidNumber']; - if ($key['uidNumber'] < $maxID) return intval($id+1); - if ($key['uidNumber'] < $minID) return intval($minID); - if ($values->general_uidNumber='') { // Have to search free uid - foreach ($keys as $key) - $ids[] = $key['uidNumber']; - sort ($ids, SORT_NUMERIC); - $id=0; - while ($values->general_uidNumber=='') { - if ($ids[$id]>$maxID) return _('No free ID-Number!'); - if ($ids[$id+1]-$ids[$id]!=1) return intval($ids[$id]+1); + if ($id < $maxID) { // Check if Id is not used by host<->user + if (!isset($keys2)) return intval($id+1); // keys2 is not set 4 groups + else { $id++; + while (!in_array($id, $keys3)) $id++; + if ($id < $maxID) return intval($id); } } + if ($id < $minID) { // Check if id is not used by host<->user + if (!isset($keys2)) return intval($minID); // keys2 is not set 4 groups + else { + $id = $minID; + while (!in_array($id, $keys3)) $id++; + if ($id < $maxID) return intval($id); + } + } + + $id=$minID; + while ($values->general_uidNumber=='') { + if ($keys3[$id]>$maxID) return _('No free ID-Number!'); + // if !=1, we've found an unused id + if ($keys3[$id+1]-$keys3[$id]!=1) return intval($keys3[$id]+1); + $id++; + } } else $useID = $minID; return intval($useID); @@ -440,12 +463,9 @@ function checkid($values, $type, $values_old=false) { // if value is empty will } // Check manual ID if ( $values->general_uidNumber < $minID || $values->general_uidNumber > $maxID) return sprintf(_('Please enter a value between %s and %s!'), $minID, $maxID); - foreach ($keys as $key) - if ($key['uidNumber']==$values->general_uidNumber) { - if (!$values_old) return _('ID is already in use'); - if (($key['uidNumber']==$values->general_uidNumber) && - ($key['uidNumber']!=$values_old->general_uidNumber)) return _('ID is already in use'); - } + if ((in_array($values->general_uidNumber, $keys3)) && !$values_old) return _('ID is already in use'); + if ((in_array($values->general_uidNumber, $keys3)) && $values_old && ($values_old->general_uidNumber != $values->general_uidNumber) ) + return _('ID is already in use'); return intval($values->general_uidNumber); } @@ -558,8 +578,14 @@ function loaduser($dn) { // Will load all needed values from an existing account if (isset($attr['sambaDomainName'][0])) { if ($_SESSION['config']->samba3=='yes') { $samba3domains = $_SESSION['ldap']->search_domains($_SESSION[config]->get_domainSuffix()); - for ($i=0; $iname) $return->smb_domain = $samba3domains[$i]; + $i=0; + while ($i!=-1) { + if ($attr['sambaDomainName'][0] == $samba3domains[$i]->name) { + $return->smb_domain = $samba3domains[$i]; + $i = -1; + } + else $i++; + } } else { $return->smb_domain = $attr['sambaDomainName']; @@ -769,7 +795,7 @@ function createuser($values) { // Will create the LDAP-Account else $attr['sambaPwdCanChange'] = time(); // sambaAccount_may if ($values->smb_pwdmustchange!='') $attr['sambaPwdMustChange'] = $values->smb_pwdmustchange; // sambaAccount_may else $attr['sambaPwdMustChange'] = time() + 1000000000; // sambaAccount_may - $attr['sambaAcctFlags'] = smbflag(values); // sambaAccount_may + $attr['sambaAcctFlags'] = smbflag($values); // sambaAccount_may $attr['displayName'] = $values->general_gecos; // sambaAccount_may if ($values->smb_smbhome!='') $attr['sambaHomePath'] = utf8_encode($values->smb_smbhome); // sambaAccount_may if ($values->smb_homedrive!='') $attr['sambaHomeDrive'] = $values->smb_homedrive; // sambaAccount_may @@ -825,7 +851,7 @@ function createuser($values) { // Will create the LDAP-Account // posixAccount_may shadowAccount_may if ($values->unix_password_no) $values->unix_password = ''; if ($values->unix_deactivated) $attr['userPassword'] = pwd_hash($values->unix_password, false); - else $attr['userPassword'] = pwd_hash($values->unix_password, false); + else $attr['userPassword'] = pwd_hash($values->unix_password); $attr['shadowLastChange'] = getdays(); // shadowAccount_may $attr['loginShell'] = $values->general_shell; // posixAccount_may $attr['gecos'] = utf8_encode(replace_umlaut($values->general_gecos)); // posixAccount_may @@ -1607,16 +1633,14 @@ function creategroup($values) { // Will create the LDAP-Group foreach ($values->unix_memberUid as $user) $attr['memberUid'][] = $user; $success = ldap_add($_SESSION['ldap']->server(),$values->general_dn, $attr); + if (!$success) return 4; if ($_SESSION['config']->scriptServer) setquotas($values,'group'); - if ($success) { - // Add entry to cache-array - if ((isset($_SESSION['groupDN']))) { - $_SESSION['groupDN'][$values->general_dn]['cn'] = $values->general_username; - $_SESSION['groupDN'][$values->general_dn]['uidNumber'] = $values->general_uidNumber; - } - return 1; + // Add entry to cache-array + if ((isset($_SESSION['groupDN']))) { + $_SESSION['groupDN'][$values->general_dn]['cn'] = $values->general_username; + $_SESSION['groupDN'][$values->general_dn]['uidNumber'] = $values->general_uidNumber; } - else return 4; + return 1; } function modifygroup($values,$values_old) { // Will modify the LDAP-Group diff --git a/lam/templates/account/groupedit.php b/lam/templates/account/groupedit.php index 2ec53142..e1780927 100644 --- a/lam/templates/account/groupedit.php +++ b/lam/templates/account/groupedit.php @@ -47,7 +47,6 @@ if (is_object($_SESSION['account_'.$varkey.'_account_old'])) $account_old =& $_S $ldap_intern =& $_SESSION['ldap']; $config_intern =& $_SESSION['config']; -$lamurl_intern =& $_SESSION['lamurl']; $header_intern =& $_SESSION['header']; $userDN_intern =& $_SESSION['userDN']; @@ -179,8 +178,9 @@ switch ($select) { // Select which part of page should be loaded and check value $account_new->general_uidNumber = checkid($account_new, 'group', $account_old); if (is_string($account_new->general_uidNumber)) { // true if checkid has returned an error $errors[] = array('ERROR', _('ID-Number'), $account_new->general_uidNumber); - unset($return->general_uidNumber); - } + if (isset($account_old)) $account_new->general_uidNumber = $account_old->general_uidNumber; + else unset($account_new->general_uidNumber); + } // Check if Name-length is OK. minLength=3, maxLength=20 if ( !ereg('.{3,20}', $account_new->general_username)) $errors[] = array('ERROR', _('Name'), _('Name must contain between 3 and 20 characters.')); @@ -306,7 +306,10 @@ do { // X-Or, only one if() can be true break; } if ($_POST['backmain']) { - metaRefresh($lamurl_intern."templates/lists/listgroups.php"); + metaRefresh("../lists/listgroups.php"); + if (isset($_SESSION['account_'.$varkey.'_account_new'])) unset($_SESSION['account_'.$varkey.'_account_new']); + if (isset($_SESSION['account_'.$varkey.'_account_old'])) unset($_SESSION['account_'.$varkey.'_account_old']); + if (isset($_SESSION['account_'.$varkey.'_final_changegids'])) unset($_SESSION['account_'.$varkey.'_final_changegids']); die; break; } @@ -374,7 +377,7 @@ echo $header_intern; echo ""; echo _("Create new Account"); echo "\n". - "\n". + "\n". "\n". "\n". "\n". @@ -441,7 +444,7 @@ switch ($select_local) { // Select which part of page will be loaded echo ""; echo " "; echo "\">

"; - echo ""._('Help')."\n"; + echo ""._('Help')."\n"; echo "
"; echo _('Available users'); echo "\n"; @@ -488,14 +491,14 @@ switch ($select_local) { // Select which part of page will be loaded echo _("Groupname")."*"; echo "\n". "general_username."\">". - "\n"._('Help')."\n\n\n"; + "\n"._('Help')."\n\n\n"; echo _('GID number'); echo "\ngeneral_uidNumber."\">". - "\n"._('Help'). + "\n"._('Help'). "\n\n\n"; echo _('Description'); echo "\ngeneral_gecos."\">\n". - ""._('Help')."\n\n\n"; + ""._('Help')."\n\n\n"; echo _('Suffix'); echo "\n\n"._('Help'). + echo "\n"._('Help'). "\n\n"; echo _('Values with * are required'); echo "
\n"; @@ -518,7 +521,7 @@ switch ($select_local) { // Select which part of page will be loaded foreach ($profilelist as $profile) echo " \n"; echo "\n". ""; + echo "\">"; echo _('Help')."\n\n\n\n"; } echo "\n\n\n"; @@ -552,7 +555,7 @@ switch ($select_local) { // Select which part of page will be loaded echo _("Display name"); echo "\n". "smb_displayName."\">". - "\n"._('Help')."\n\n\n"; + "\n"._('Help')."\n\n\n"; echo _('Windows groupname'); echo "\n\n". - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Domain'); echo ''."\n".''._('Help').''."\n"; + echo ''."\n".''._('Help').''."\n"; echo "\n\n\n\n"; break; @@ -691,11 +694,11 @@ switch ($select_local) { // Select which part of page will be loaded 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".''. - ''._('Help').''."\n".''._('Help').''."\n".''. - ''._('Help').''."\n"; + echo ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n"; $i=0; while ($account_new->quota[$i][0]) { echo ''.$account_new->quota[$i][0].''.$account_new->quota[$i][1].''; // used blocks @@ -750,7 +753,7 @@ switch ($select_local) { // Select which part of page will be loaded echo ''; echo "'._('Help'); + echo '">'._('Help'); echo "\n\n\n\n\n\n"; echo "
"; if ($account_old) echo _('Modify'); @@ -813,15 +816,6 @@ switch ($select_local) { // Select which part of page will be loaded ''; - echo _('Please press here if meta-refresh didn\'t work.'); - echo "\n"; - if (isset($_SESSION['account_'.$varkey.'_account_new'])) unset($_SESSION['account_'.$varkey.'_account_new']); - if (isset($_SESSION['account_'.$varkey.'_account_old'])) unset($_SESSION['account_'.$varkey.'_account_old']); - if (isset($_SESSION['account_'.$varkey.'_final_changegids'])) unset($_SESSION['account_'.$varkey.'_final_changegids']); - break; } // Print end of HTML-Page diff --git a/lam/templates/account/hostedit.php b/lam/templates/account/hostedit.php index be658c56..fd81fde8 100644 --- a/lam/templates/account/hostedit.php +++ b/lam/templates/account/hostedit.php @@ -44,7 +44,6 @@ if (is_object($_SESSION['account_'.$varkey.'_account_old'])) $account_old =& $_S $ldap_intern =& $_SESSION['ldap']; $config_intern =& $_SESSION['config']; -$lamurl_intern =& $_SESSION['lamurl']; $header_intern =& $_SESSION['header']; @@ -142,7 +141,8 @@ switch ($_POST['select']) { // Select which part of page should be loaded and ch $account_new->general_uidNumber = checkid($account_new, 'host', $account_old); if (is_string($account_new->general_uidNumber)) { // true if checkid has returned an error $errors[] = array('ERROR', _('ID-Number'), $account_new->general_uidNumber); - unset($account_new->general_uidNumber); + if (isset($account_old)) $account_new->general_uidNumber = $account_old->general_uidNumber; + else unset($account_new->general_uidNumber); } // Check if Name-length is OK. minLength=3, maxLength=20 if ( !ereg('.{3,20}', $account_new->general_username)) $errors[] = array('ERROR', _('Name'), _('Name must contain between 3 and 20 characters.')); @@ -255,7 +255,9 @@ do { // X-Or, only one if() can be true break; } if ($_POST['backmain']) { - metaRefresh($lamurl_intern."templates/lists/listhosts.php"); + metaRefresh("../lists/listhosts.php"); + if (isset($_SESSION['account_'.$varkey.'_account_new'])) unset($_SESSION['account_'.$varkey.'_account_new']); + if (isset($_SESSION['account_'.$varkey.'_account_old'])) unset($_SESSION['account_'.$varkey.'_account_old']); die; break; } @@ -267,7 +269,7 @@ echo $header_intern; echo ""; echo _("Create new Account"); echo "\n". - "\n". + "\n". "\n". "\n". "\n". @@ -325,13 +327,13 @@ switch ($select_local) { // Select which part of page will be loaded echo ''."\n".''. ''. ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('UID number'); echo ''."\n".''. ''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Primary group').'*'; echo ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Gecos'); echo ''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''; echo _('Suffix'); echo ''._('Help').''. + echo ''._('Help').''. "\n\n"; echo _('Values with * are required'); echo "
\n"; @@ -368,7 +370,7 @@ switch ($select_local) { // Select which part of page will be loaded foreach ($profilelist as $profile) echo " \n"; echo "\n". ""; + echo "\">"; echo _('Help')."\n\n\n\n"; } echo "\n\n\n"; @@ -400,7 +402,7 @@ switch ($select_local) { // Select which part of page will be loaded echo _("Display name"); echo "\n". "smb_displayName."\">". - "\n"._('Help')."\n\n\n"; + "\n"._('Help')."\n\n\n"; echo _('Password'); echo ''; if (isset($account_old)) { @@ -412,7 +414,7 @@ switch ($select_local) { // Select which part of page will be loaded echo ''."\n".'smb_flagsD) echo ' checked '; echo '>'. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo ''."\n".''; echo _('Domain'); @@ -431,7 +433,7 @@ switch ($select_local) { // Select which part of page will be loaded else { echo ''."\n".''; } - echo ''."\n".''._('Help').''."\n"; + echo ''."\n".''._('Help').''."\n"; echo "\n\n\n\n"; break; @@ -461,7 +463,7 @@ switch ($select_local) { // Select which part of page will be loaded echo ''; echo ''._('Help'); + echo '">'._('Help'); echo "\n\n\n\n\n\n"; echo "
"; if ($account_old) echo _('Modify'); @@ -515,14 +517,6 @@ switch ($select_local) { // Select which part of page will be loaded ''. ''; - echo _('Please press here if meta-refresh didn\'t work.'); - echo "\n"; - if (isset($_SESSION['account_'.$varkey.'_account_new'])) unset($_SESSION['account_'.$varkey.'_account_new']); - if (isset($_SESSION['account_'.$varkey.'_account_old'])) unset($_SESSION['account_'.$varkey.'_account_old']); - break; } // Print end of HTML-Page diff --git a/lam/templates/account/useredit.php b/lam/templates/account/useredit.php index d8fc5bb2..6f522bc8 100644 --- a/lam/templates/account/useredit.php +++ b/lam/templates/account/useredit.php @@ -37,6 +37,7 @@ setlanguage(); if (!isset($_POST['varkey'])) $varkey = session_id().time(); else $varkey = $_POST['varkey']; +// Register Session Vars if (!isset($_SESSION['account_'.$varkey.'_account_new'])) $_SESSION['account_'.$varkey.'_account_new'] = new account(); if (!isset($_SESSION['account_'.$varkey.'_final_changegids'])) $_SESSION['account_'.$varkey.'_final_changegids'] = ''; if (!isset($_SESSION['account_'.$varkey.'_shelllist'])) $_SESSION['account_'.$varkey.'_shelllist'] = getshells(); @@ -49,7 +50,6 @@ if (is_object($_SESSION['account_'.$varkey.'_account_old'])) $account_old =& $_S $ldap_intern =& $_SESSION['ldap']; $config_intern =& $_SESSION['config']; -$lamurl_intern =& $_SESSION['lamurl']; $header_intern =& $_SESSION['header']; $hostDN_intern =& $_SESSION['hostDN']; @@ -234,7 +234,8 @@ switch ($_POST['select']) { // Select which part of page should be loaded and ch $account_new->general_uidNumber = checkid($account_new, 'user', $account_old); if (is_string($account_new->general_uidNumber)) { // true if checkid has returned an error $errors[] = array('ERROR', _('ID-Number'), $account_new->general_uidNumber); - unset($account_new->general_uidNumber); + if (isset($account_old)) $account_new->general_uidNumber = $account_old->general_uidNumber; + else unset($account_new->general_uidNumber); } // Check if Name-length is OK. minLength=3, maxLength=20 if ( !ereg('.{3,20}', $account_new->general_username)) $errors[] = array('ERROR', _('Name'), _('Name must contain between 3 and 20 characters.')); @@ -301,7 +302,7 @@ switch ($_POST['select']) { // Select which part of page should be loaded and ch $_POST['f_smb_pwdmustchange_mon'], $_POST['f_smb_pwdmustchange_day'], $_POST['f_smb_pwdmustchange_yea']); if ($_POST['f_smb_password_no']) $account_new->smb_password_no = true; else $account_new->smb_password_no = false; - if ($_POST['f_smb_useunixpwd']) $account_new->smb_useunixpwd = $_POST['f_smb_useunixpwd']; + if ($_POST['f_smb_useunixpwd']) $account_new->smb_useunixpwd = true; else $account_new->smb_useunixpwd = false; $account_new->smb_homedrive = $_POST['f_smb_homedrive']; $account_new->smb_scriptPath = $_POST['f_smb_scriptpath']; @@ -353,7 +354,7 @@ switch ($_POST['select']) { // Select which part of page should be loaded and ch // Decrypt unix-password if needed password $iv = base64_decode($_COOKIE["IV"]); $key = base64_decode($_COOKIE["Key"]); - if (($values->smb_useunixpwd) &&($values->unix_password != '')) { + if ( ($account_new->smb_useunixpwd && !$account_old) || ($account_new->smb_useunixpwd && $account_new->unix_password!='') ) { $smb_password = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($account_new->unix_password), MCRYPT_MODE_ECB, $iv); $smb_password = str_replace(chr(00), '', $smb_password); } @@ -394,7 +395,7 @@ switch ($_POST['select']) { // Select which part of page should be loaded and ch $account_new->smb_password = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $smb_password, MCRYPT_MODE_ECB, $iv)); } - + else $account_new->smb_password = ''; break; case 'quota': // Write all general values into $account_new @@ -461,7 +462,7 @@ switch ($_POST['select']) { // Select which part of page should be loaded and ch } } createUserPDF(array($account_new)); - $select_local = 'pdf'; + die; } break; } @@ -603,7 +604,11 @@ do { // X-Or, only one if() can be true break; } if ($_POST['backmain']) { - metaRefresh($lamurl_intern."templates/lists/listusers.php"); + if (isset($_SESSION['account_'.$varkey.'_account_new'])) unset($_SESSION['account_'.$varkey.'_account_new']); + if (isset($_SESSION['account_'.$varkey.'_account_old'])) unset($_SESSION['account_'.$varkey.'_account_old']); + if (isset($_SESSION['account_'.$varkey.'_final_changegids'])) unset($_SESSION['account_'.$varkey.'_final_changegids']); + if (isset($_SESSION['account_'.$varkey.'_shelllist'])) unset($_SESSION['account_'.$varkey.'_shelllist']); + metaRefresh("../lists/listusers.php"); die; break; } @@ -611,24 +616,22 @@ do { // X-Or, only one if() can be true } while(0); -if ($select_local != 'pdf') { - // Write HTML-Header - echo $header_intern; - echo ""; - echo _("Create new Account"); - echo "\n". - "\n". - "\n". - "\n". - "\n". - "
\n". - "\n"; +// Write HTML-Header +echo $header_intern; +echo ""; +echo _("Create new Account"); +echo "\n". + "\n". + "\n". + "\n". + "\n". + "\n". + "\n"; - if (is_array($errors)) { - echo "\n"; - for ($i=0; $i"; - } +if (is_array($errors)) { + echo "
\n"; + for ($i=0; $i"; } // print_r($account_new); @@ -691,7 +694,7 @@ switch ($select_local) { // Select which part of page will be loaded echo "\n"; + echo ""._('Help-XX')."\n"; echo "\n'."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".''."\n".'\n\n
"; echo " "; echo "\">

"; - echo ""._('Help-XX')."
"; echo _('Available workstations'); echo "\n"; @@ -745,25 +748,25 @@ switch ($select_local) { // Select which part of page will be loaded echo "
". ''. ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('UID number'); echo ''. ''. ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('Given name').'*'; echo ''. ''. ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('Surname').'*'; echo ''. ''. ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('Primary group').'*'; echo ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('Additional groups'); echo ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('Home directory').'*'; echo ''. ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('Gecos'); echo ''. ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('Login shell').'*'; echo ''. - ''._('Help').''. + ''._('Help').''. '
'; echo _('Suffix'); echo ''._('Help'). + echo ''._('Help'). "
"; echo _('Values with * are required'); echo "
\n"; @@ -828,7 +831,7 @@ switch ($select_local) { // Select which part of page will be loaded foreach ($profilelist as $profile) echo " \n"; echo "\n". ""; + echo "\">"; echo _('Help')."\n\n\n\n"; } echo "\n\n\n"; @@ -878,27 +881,27 @@ switch ($select_local) { // Select which part of page will be loaded echo ''."\n".'unix_password_no) echo ' checked '; echo '>'."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Password warn'); echo ''."\n".''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Password expire'); echo ''."\n".''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Maximum password age'); echo ''."\n".''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Minimum password age'); echo ''."\n".''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Expire date'); echo ''."\n".''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Account deactivated'); echo ''."\n".'unix_deactivated) echo ' checked '; echo '>'."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Unix workstations'); echo ''."\n".''. ''."\n".''. - ''._('Help'). + ''._('Help'). "\n\n"; echo _('Values with * are required'); echo "\n\n\n"; @@ -944,6 +947,7 @@ switch ($select_local) { // Select which part of page will be loaded $password = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($account_new->smb_password), MCRYPT_MODE_ECB, $iv); $password = str_replace(chr(00), '', $password); } + else $password = ""; if ($config_intern->is_samba3()) $samba3domains = $ldap_intern->search_domains($config_intern->get_domainSuffix()); $canchangedate = getdate($account_new->smb_pwdcanchange); $mustchangedate = getdate($account_new->smb_pwdmustchange); @@ -982,7 +986,7 @@ switch ($select_local) { // Select which part of page will be loaded echo _("Display name"); echo "\n". "smb_displayName."\">". - "\n"._('Help')."\n\n\n"; + "\n"._('Help')."\n\n\n"; echo _('Samba password'); echo ''."\n".''. ''."\n".''; @@ -990,19 +994,19 @@ switch ($select_local) { // Select which part of page will be loaded echo 'smb_useunixpwd) echo ' checked '; echo '>'."\n".''. - ''._('Help').''; + ''._('Help').''; echo ''."\n".''; echo _('Use no password'); echo ''."\n".'smb_password_no) echo ' checked '; echo '>'."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Password does not expire'); echo ''."\n".'smb_flagsX) echo ' checked '; echo '>'."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('User can change password'); echo ''."\n".''."\n".''; - echo ''._('Help').''. + echo ''._('Help').''. ''."\n".''; echo _('User must change password'); echo ''."\n".''."\n".''; - echo ''._('Help').''. + echo ''._('Help').''. ''."\n".''; echo _('Account is deactivated'); echo ''."\n".'smb_flagsD) echo ' checked '; echo '>'."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Home drive'); echo ''."\n".''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Home path'); echo ''."\n".''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Profile path'); echo ''."\n".''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Script path'); echo ''."\n".''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Samba workstations'); echo ''."\n".''. ''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Windows groupname'); echo ''."\n".''."\n".''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Domain'); if ($config_intern->is_samba3()) { @@ -1173,7 +1177,7 @@ switch ($select_local) { // Select which part of page will be loaded else { echo ''."\n".''; } - echo ''."\n".''._('Help').''."\n"; + echo ''."\n".''._('Help').''."\n"; echo "\n\n\n\n"; break; case 'quota': @@ -1215,11 +1219,11 @@ switch ($select_local) { // Select which part of page will be loaded 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".''. - ''._('Help').''."\n".''._('Help').''."\n".''. - ''._('Help').''."\n"; + echo ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n".''._('Help').''."\n".''. + ''._('Help').''."\n"; $i=0; while ($account_new->quota[$i][0]) { echo ''.$account_new->quota[$i][0].''.$account_new->quota[$i][1].''; // used blocks @@ -1264,55 +1268,55 @@ switch ($select_local) { // Select which part of page will be loaded echo ''."\n".''. ' '; echo $account_new->general_surname . ' ' . $account_new->general_givenname . ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Employee type'); echo ''."\n".''. ''. ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Street'); echo ''."\n".''. ''. ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Postal code'); echo ''."\n".''. ''. ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Postal address'); echo ''."\n".''. ''. ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Telephone number'); echo ''."\n".''. ''. ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Mobile number'); echo ''."\n".''. ''. ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('Fax number'); echo ''."\n".''. ''. ''. - ''._('Help').''. + ''._('Help').''. ''."\n".''; echo _('eMail address'); echo ''."\n".''. ''. ''. - ''._('Help').''."\n"; + ''._('Help').''."\n"; echo "\n\n\n\n"; break; case 'final': @@ -1351,7 +1355,7 @@ switch ($select_local) { // Select which part of page will be loaded echo ''; echo "'._('Help'); + echo '">'._('Help'); echo "\n\n\n\n\n\n"; echo "
"; if ($account_old) echo _('Modify'); @@ -1452,19 +1456,8 @@ switch ($select_local) { // Select which part of page will be loaded ''. ''; - echo _('Please press here if meta-refresh didn\'t work.'); - echo "\n"; - if (isset($_SESSION['account_'.$varkey.'_account_new'])) unset($_SESSION['account_'.$varkey.'_account_new']); - if (isset($_SESSION['account_'.$varkey.'_account_old'])) unset($_SESSION['account_'.$varkey.'_account_old']); - if (isset($_SESSION['account_'.$varkey.'_final_changegids'])) unset($_SESSION['account_'.$varkey.'_final_changegids']); - if (isset($_SESSION['account_'.$varkey.'_shelllist'])) unset($_SESSION['account_'.$varkey.'_shelllist']); - break; } // Print end of HTML-Page -if ($select_local != 'pdf') - echo ''; +echo ''; ?> diff --git a/lam/templates/delete.php b/lam/templates/delete.php index ea632ace..67468d61 100644 --- a/lam/templates/delete.php +++ b/lam/templates/delete.php @@ -67,13 +67,13 @@ if ($_GET['type']) { echo "
"; echo _('Delete host(s)'); echo "\n"; - echo ''._('Do you really want to delete host(s):').''); + echo ''._('Do you really want to delete host(s):').''; break; case 'group': echo "
"; echo _('Delete group(s)'); echo "\n"; - echo ''._('Do you really want to delete group(s):').''); + echo ''._('Do you really want to delete group(s):').''; break; } echo "
\n";