From 5a6962ba4064e589c1f120d1f96e0d316f35e7a6 Mon Sep 17 00:00:00 2001 From: katagia Date: Sat, 20 Dec 2003 21:42:52 +0000 Subject: [PATCH] Added samba-Modules and initial support for lamdaemon.pl --- lam/lib/account.inc | 59 ++- lam/lib/modules/inetOrgPerson.inc | 4 +- lam/lib/modules/posixAccount.inc | 13 + lam/lib/modules/sambaAccount.inc | 556 ++++++++++++++++++++++++++ lam/lib/modules/sambaSamAccount.inc | 578 ++++++++++++++++++++++++++++ lam/lib/modules/shadowAccount.inc | 6 +- 6 files changed, 1209 insertions(+), 7 deletions(-) create mode 100644 lam/lib/modules/sambaAccount.inc create mode 100644 lam/lib/modules/sambaSamAccount.inc diff --git a/lam/lib/account.inc b/lam/lib/account.inc index e7306574..ccd0d6af 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -898,7 +898,6 @@ class accountContainer { } } } - print_r($attributes); // Complete dn with uid or cn= if ($this->type=='group') $search = 'cn'; @@ -969,11 +968,67 @@ class accountContainer { if (!$success) return array('ERROR', 'LDAP', sprintf(_('Was unable to remove attribtues from dn: %s. This is possible a bug. Please check your ldap logs and send a bug report if it is a possible bug.'), $DNs[$i])); } } - // *** fixme Add lamdaemon.pl + foreach ($attributes as $DN) + if (is_array($DN['lamdaemon'])) $this->lamdaemon($DN['lamdaemon']); return 0; } + function lamdaemon($commands) { + // get username and password of the current lam-admin + $ldap_q = $_SESSION[$this->ldap]->decrypt(); + /* $towrite has the following syntax: + * admin-username, admin-password, owner of homedir, 'home', operation='add' + * use escapeshellarg to make exec() shell-safe + */ + $towrite = escapeshellarg($_SESSION[$this->config]->scriptServer)." ".escapeshellarg($_SESSION[$this->config]->scriptPath)." ". + escapeshellarg($ldap_q[0]).' '.escapeshellarg($ldap_q[1]); + if (is_array($users)) { + foreach ($users as $user) { + $userstring .= "$user home add\n"; + } + } + $userstring = implode ("\n", $commands); + if (function_exists(proc_open)) { + // New Code, requires PHP 4.3 + $descriptorspec = array( + 0 => array("pipe", "r"), // stdin + 1 => array("pipe", "w"), // stout + 2 => array("file", "/dev/null", "a") // sterr + ); + $process = proc_open(escapeshellarg($_SESSION['lampath']."lib/lamdaemon.pl")." ".$towrite, + $descriptorspec, + $pipes); + if (is_resource($process)) { + /* perl-script is running + * $pipes[0] is writeable handle to child stdin + * $pipes[1] is readable handle to child stdout + * any error is send to /dev/null + */ + // Write to stdin + fwrite($pipes[0], $userstring); + } + fclose($pipes[0]); + while (!feof($pipes[1])) { + $output = fgets($pipes[1], 1024); + if ($output!='') $output_array[] = $output; + } + fclose($pipes[1]); + proc_close($process); + } + else { // PHP 4.3> + $command = escapeshellarg($_SESSION['lampath']."lib/lamdaemon.pl")." ".$towrite; + $pipe = popen("echo \"$userstring\"|$command" , 'r'); + while(!feof($pipe)) { + //$output .= fread($pipe, 1024); + $output = fgets($pipe, 1024); + if ($output!='') $output_array[] = $output; + } + pclose($pipe); + } + return $output_array; + } + } diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index 20d2adaa..43179d4f 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -61,11 +61,9 @@ class inetOrgPerson { $this->orig = $this->attributes ; $this->attributes['objectClass'][0] = 'inetOrgPerson'; // unset userPassword because we handle it separat. - if (isset($this->attributes['userPassword'])) unset($this->attributes['userPassword']); $this->alias = _('inetOrgPerson'); // Add attributes which should be cached $_SESSION[$_SESSION[$this->base]->cache]->add_cache(array ('user' => array('uid'), 'host' => array('uid'))); - } // Variables @@ -266,6 +264,8 @@ class inetOrgPerson { */ function save_attributes() { $return = $_SESSION[$this->base]->save_module_attributes($this->attributes, $this->orig); + if (isset($return[$_SESSION[$this->base]->dn]['modify']['userPassword'])) + unset($return[$_SESSION[$this->base]->dn]['modify']['userPassword']); // Set unix password if (count($this->orig['userPassword'])==0) { // New user or no old password set diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index 54e40f83..74d65449 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -90,6 +90,7 @@ class posixAccount { } $this->orig = $this->attributes ; $this->attributes['objectClass'][0] = 'posixAccount'; + $this->createhomedir=false; } // Variables @@ -109,6 +110,7 @@ class posixAccount { */ var $groups; var $groups_orig; + var $createhomedir; /* This function returns a list with all required modules */ @@ -132,6 +134,8 @@ class posixAccount { $this->attributes['homeDirectory'][0] = $post['form_posixAccount_homeDirectory']; $this->attributes['loginShell'][0] = $post['form_posixAccount_loginShell']; $this->attributes['gecos'][0] = $post['form_posixAccount_gecos']; + if ($post['form_posixAccount_createhomedir']) $this->createhomedir = true; + else $this->createhomedir = false; // Check if UID is valid. If none value was entered, the next useable value will be inserted // load min and may uidNumber @@ -322,6 +326,7 @@ class posixAccount { } } } + if ($this->createhomedir) $return[$_SESSION[$this->base]->dn]['lamdaemon'][] = $this->attributes['uid'][0] . " home add"; return $return; } @@ -367,6 +372,14 @@ class posixAccount { echo "attributes['homeDirectory'][0]."\">\n"; echo "" . _('Help') . "\n"; echo "\n"; + if ($this->orig['homeDirectory']=='' && isset($_SESSION[$_SESSION[$this->base]->config]->scriptPath)) { + echo "\n"; + echo "" . _('Create home directory') . "*\n"; + echo "createhomedir) echo " checked "; + echo ">\n"; + echo "\n"; + } } echo "\n"; echo "" . _('Gecos') . "\n"; diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc new file mode 100644 index 00000000..d99f582d --- /dev/null +++ b/lam/lib/modules/sambaAccount.inc @@ -0,0 +1,556 @@ +add_objectClass(\'sambaAccount\');'), E_USER_ERROR); + $this->base = $base; + // sambaAccount is only a valid objectClass for user and host + if (!($_SESSION[$this->base]->get_type() == 'user') && !($_SESSION[$this->base]->get_type() == 'host')) trigger_error(_('sambaAccount can only be used for users or hosts.'), E_USER_WARNING); + /* Check if ldap conatiner is in array and set type + * users are using inetOrgPerson-, hosts account-container + */ + if (!isset($_SESSION[$this->base]->module['posixAccount'])) $_SESSION[$this->base]->add_objectClass('posixAccount'); + // Add Array with all attributes and type + $this->attributes = $_SESSION[$this->base]->get_module_attributes('sambaAccount'); + $_SESSION[$this->base]->add_attributes ('sambaAccount'); + $this->alias = _('sambaAccount'); + // Make references to attributes which already esists in ldap + $newattributes = array_keys($this->attributes); + $module = array_keys($_SESSION[$this->base]->module); + // fixme *** do we have to unset module sambaAccount itself + for ($i=0; $ibase]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute]; + } + $this->orig = $this->attributes ; + $this->attributes['objectClass'][0] = 'sambaAccount'; + $this->useunixpwd=false; + // List of well known rids + $this->rids = array ( _('Domain Admins') => 512, _('Domain Users') => 513, _('Domain Guests') => 514, _('Domain Computers') => 515, _('Domain Controllers') => 516, + _('Domain Certificate Admins') => 517, _('Domain Schema Admins') => 518, _('Domain Enterprise Admins') => 519, _('Domain Policy Admins') => 520 ); + } + + // Variables + // Alias Name. This name is shown in the menu instead of sambaAccount + var $alias; + // name of accountContainer so we can read other classes in accuontArray + var $base; + + // This variable contains all inetOrgPerson attributes + var $attributes; + /* If an account was loaded all attributes are kept in this array + * to compare it with new changed attributes + */ + var $orig; + // use unix password as samba password? + var $useunixpwd; + // Array of well known rids + var $rids; + + /* This function returns a list with all required modules + */ + function dependencies() { + return array('posixAccount'); + } + + function module_ready() { + if ($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]=='') return false; + if ($_SESSION[$this->base]->module['posixAccount']->attributes['uidNumber'][0]=='') return false; + if ($this->attributes['uid'][0]=='') return false; + return true; + } + + /* $attribute['lmPassword'] and ntPassword can't accessed directly because it's enrcypted + * To read / write password function userPassword is needed + * This function will return the unencrypted password when + * called without a variable + * If it's called with a new password, the + * new password will be stored encrypted + */ + function lmPassword($newpassword=false) { + if (is_string($newpassword)) { + // Write new password + $iv = base64_decode($_COOKIE["IV"]); + $key = base64_decode($_COOKIE["Key"]); + $this->attributes['lmPassword'][0] = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $newpassword, MCRYPT_MODE_ECB, $iv)); + return 0; + } + else { + if ($this->useunixpwd) return $_SESSION[$this->base]->module['inetOrgPerson']->userPassword(); + if ($this->attributes['lmPassword'][0]!='') { + // Read existing password if set + $iv = base64_decode($_COOKIE["IV"]); + $key = base64_decode($_COOKIE["Key"]); + $password = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($this->attributes['lmPassword'][0]), MCRYPT_MODE_ECB, $iv); + $password = str_replace(chr(00), '', $password); + return $password; + } + else return ''; + } + } + + + + /* Write variables into object and do some regexp checks + */ + function proccess_attributes($post) { + // Load attributes + if ($_SESSION[$this->base]->type=='user') { + $this->attributes['pwdCanChange'][0] = mktime($post['form_sambaAccount_pwdCanChange_h'], $post['form_sambaAccount_pwdCanChange_m'], $post['form_sambaAccount_pwdCanChange_s'], + $post['form_sambaAccount_pwdCanChange_mon'], $post['form_sambaAccount_pwdCanChange_day'], $post['form_sambaAccount_pwdCanChange_yea']); + $this->attributes['pwdMustChange'][0] = mktime($post['form_sambaAccount_pwdMustChange_h'], $post['form_sambaAccount_pwdMustChange_m'], $post['form_sambaAccount_pwdMustChange_s'], + $post['form_sambaAccount_pwdMustChange_mon'], $post['form_sambaAccount_pwdMustChange_day'], $post['form_sambaAccount_pwdMustChange_yea']); + $this->attributes['smbHome'][0] = stripslashes($post['form_sambaAccount_smbHome']); + $this->attributes['homeDrive'][0] = $post['form_sambaAccount_homeDrive']; + $this->attributes['scriptPath'][0] = stripslashes($post['form_sambaAccount_scriptPath']); + $this->attributes['profilePath'][0] = stripslashes($post['form_sambaAccount_profilePath']); + $rids = array_keys($this->rids); + $wrid = false; + for ($i=0; $iattributes['primaryGroupID'][0] = $this->rids[$rids[$i]]; + } + } + if (!$wrid) $this->attributes['primaryGroupID'][0] = ($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]*2)+1001; + + if (isset($post['form_sambaAccount_lmPassword'])) { + if ($post['form_sambaAccount_lmPassword'] != $post['form_sambaAccount_lmPassword2']) { + $errors[] = array('ERROR', _('Password'), _('Please enter the same password in both password-fields.')); + unset ($post['form_sambaAccount_lmPassword2']); + } + else $this->lmPassword($post['form_sambaAccount_lmPassword']); + } + if ($post['form_sambaAccount_useunixpwd']) $this->useunixpwd = true; + else $this->useunixpwd = false; + } + + $this->attributes['domain'][0] = $post['form_sambaAccount_domain']; + // Start character + $flag = "["; + if ($post['form_sambaAccount_acctFlagsD']) $flag .= "D"; + if ($post['form_sambaAccount_acctFlagsX']) $flag .= "X"; + if ($post['form_sambaAccount_acctFlagsN']) $flag .= "N"; + if ($post['form_sambaAccount_acctFlagsS']) $flag .= "S"; + if ($post['form_sambaAccount_acctFlagsH']) $flag .= "H"; + if ($post['form_sambaAccount_acctFlagsW']) $flag .= "W"; + if ($post['form_sambaAccount_acctFlagsU']) $flag .= "U"; + // Expand string to fixed length + $flag = str_pad($flag, 12); + // End character + $flag = $flag. "]"; + $this->attributes['acctFlags'][0] = $flag; + + // Check values + if ($_SESSION[$this->base]->type=='user') { + $this->attributes['smbHome'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['smbHome'][0]); + $this->attributes['smbHome'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['smbHome'][0]); + if ($this->attributes['smbHome'][0] != stripslashes($post['form_sambaAccount_smbHome'])) $errors[] = array('INFO', _('Home path'), _('Inserted user- or groupname in HomePath.')); + $this->attributes['scriptPath'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['scriptPath'][0]); + $this->attributes['scriptPath'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['scriptPath'][0]); + if ($this->attributes['scriptPath'][0] != stripslashes($post['form_sambaAccount_scriptPath'])) $errors[] = array('INFO', _('Script path'), _('Inserted user- or groupname in scriptpath.')); + $this->attributes['profilePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['profilePath'][0]); + $this->attributes['profilePath'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['profilePath'][0]); + if ($this->attributes['profiletPath'][0] != stripslashes($post['form_sambaAccount_profilePath'])) $errors[] = array('INFO', _('Profile path'), _('Inserted user- or groupname in profilepath.')); + if ( (!$this->attributes['smbHome'][0]=='') && (!ereg('^[\][\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%])+([\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+)+$', $this->attributes['smbHome'][0]))) + $errors[] = array('ERROR', _('Home path'), _('Home path is invalid.')); + if ( !ereg('^([a-z]|[A-Z]|[0-9]|[\|]|[\#]|[\*]|[\,]|[\.]|[\;]|[\:]|[\_]|[\-]|[\+]|[\!]|[\%]|[\&]|[\/]|[\?]|[\{]|[\[]|[\(]|[\)]|[\]]|[\}])*$', + $this->lmPassword())) $errors[] = array('ERROR', _('Password'), _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !')); + if ( (!$this->attributes['scriptPath'][0]=='') && (!ereg('^([/])*([a-z]|[0-9]|[.]|[-]|[_]|[%]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+([a-z]|[0-9]|[.]|[-]|[_]|[%]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])*'. + '([/]([a-z]|[0-9]|[.]|[-]|[_]|[%]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+([a-z]|[0-9]|[.]|[-]|[_]|[%]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])*)*(([.][b][a][t])|([.][c][m][d]))$', $this->attributes['scriptPath'][0]))) + $errors[] = array('ERROR', _('Script path'), _('Script path is invalid!')); + if ( (!$this->attributes['profilePath'][0]=='') && (!ereg('^[/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*([/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*)*$', $this->attributes['profilePath'][0])) + && (!ereg('^[\][\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%])+([\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%])+)+$', $this->attributes['profilePath'][0]))) + $errors[] = array('ERROR', _('Profile path'), _('Profile path is invalid!')); + } + + if ((!$this->attributes['domain'][0]=='') && !ereg('^([a-z]|[A-Z]|[0-9]|[-])+$', $this->attributes['domain'][0])) + $errors[] = array('ERROR', _('Domain name'), _('Domain name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and -.')); + + if (is_array($errors)) return $errors; + if ($post['form_sambaAccount_userWorkstations']) return 'userWorkstations'; + return 0; + } + + /* Write variables into object and do some regexp checks + */ + function proccess_userWorkstations($post) { + // Load attributes + do { // X-Or, only one if() can be true + if (isset($post['form_sambaAccount_availableUserWorkstations']) && isset($post['form_sambaAccount_userWorkstations_add'])) { // Add workstations to list + $temp = str_replace(' ', '', $this->attributes['userWorkstations'][0]); + $workstations = explode (',', $temp); + for ($i=0; $iattributes['userWorkstations'][0] = $workstations[0]; + for ($i=1; $iattributes['userWorkstations'][0] = $this->attributes['userWorkstations'][0] . "," . $workstations[$i]; + } + break; + } + if (isset($post['form_sambaAccount_userWorkstations']) && isset($post['form_sambaAccount_userWorkstations_remove'])) { // remove // Add workstations from list + // Put all workstations in array + $temp = str_replace(' ', '', $this->attributes['userWorkstations'][0]); + $workstations = explode (',', $temp); + for ($i=0; $iattributes['userWorkstations'][0] = $workstations[0]; + for ($i=1; $iattributes['userWorkstations'][0] = $this->attributes['userWorkstations'][0] . "," . $workstations[$i]; + } + break; + } + } while(0); + if ($post['form_sambaAccount_attributes']) return 'attributes'; + return 0; + } + + /* This function loads all attributes into the object + * $attr is an array as it's retured from ldap_get_attributes + */ + function load_attributes($attr) { + // Load attributes which are displayed + // unset count entries + unset ($attr['count']); + $attributes = array_keys($attr); + foreach ($attributes as $attribute) unset ($attr[$attribute]['count']); + // unset double entries + for ($i=0; $iattributes[$attribute])) { + // decode as unicode + $this->attributes[$attribute] = $attr[$attribute]; + for ($i=0; $iattributes[$attribute]); $i++) $this->attributes[$attribute][$i] = utf8_decode ($this->attributes[$attribute][$i]); + } + } + // Values are kept as copy so we can compare old attributes with new attributes + $this->attributes['objectClass'][0] = 'sambaAccount'; + $this->orig = $this->attributes; + $this->lmPassword(''); // Remove old password so it won't displayed as hash + return 0; + } + + + /* This function returns an array with 3 entries: + * array( DN1 ('add' => array($attr), 'remove' => array($attr), 'modify' => array($attr)), DN2 .... ) + * DN is the DN to change. It may be possible to change several DNs, + * e.g. create a new user and add him to some groups via attribute memberUid + * add are attributes which have to be added to ldap entry + * remove are attributes which have to be removed from ldap entry + * modify are attributes which have to been modified in ldap entry + */ + function save_attributes() { + $return = $_SESSION[$this->base]->save_module_attributes($this->attributes, $this->orig); + // Set password + if (isset($return[$_SESSION[$this->base]->dn]['modify']['lmPassword'])) + unset($return[$_SESSION[$this->base]->dn]['modify']['lmPassword']); + if (isset($return[$_SESSION[$this->base]->dn]['modify']['ntPassword'])) + unset($return[$_SESSION[$this->base]->dn]['modify']['ntPassword']); + if (!isset($this->orig['lmPassword'][0])) { + $return[$_SESSION[$this->base]->dn]['modify']['lmPassword'][0] = exec(escapeshellarg($_SESSION['lampath'].'lib/createntlm.pl')." lm ".escapeshellarg($this->lmPassword())); + $return[$_SESSION[$this->base]->dn]['modify']['ntPassword'][0] = exec(escapeshellarg($_SESSION['lampath'].'lib/createntlm.pl')." nt ".escapeshellarg($this->lmPassword())); + $return[$_SESSION[$this->base]->dn]['modify']['pwdLastSet'][0] = time(); + } + if ($this->lmPassword()!='') { + $return[$_SESSION[$this->base]->dn]['modify']['lmPassword'][0] = exec(escapeshellarg($_SESSION['lampath'].'lib/createntlm.pl')." lm ".escapeshellarg($this->lmPassword())); + $return[$_SESSION[$this->base]->dn]['modify']['ntPassword'][0] = exec(escapeshellarg($_SESSION['lampath'].'lib/createntlm.pl')." nt ".escapeshellarg($this->lmPassword())); + $return[$_SESSION[$this->base]->dn]['modify']['pwdLastSet'][0] = time(); + } + return $return; + } + + + /* This function returns all ldap attributes + * which are part of sambaAccount and returns + * also their values. + */ + function get_attributes() { + return $this->attributes; + } + + /* This function will create the html-page + * to show a page with all attributes. + * It will output a complete html-table + */ + function display_html_attributes($post) { + if ($_SESSION[$this->base]->type=='user') { + $canchangedate = getdate($this->attributes['pwdCanChange'][0]); + $mustchangedate = getdate($this->attributes['pwdMustChange'][0]); + echo ''. + ''. + ''. + ''. + ''. + ''. + ''; + echo "\n\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
" . _('Samba password') . "lmPassword() . "\">
" . _('Repeat password') . "lmPassword(); + echo "\">
" . _('Use unix password') . "useunixpwd) echo " checked "; + echo ">" . _('Help') . "
" . _('Use no password') . "attributes['acctFlags'][0], "N")) echo " checked "; + echo ">" . _('Help' ) ."
" . _('Password does not expire') . "attributes['acctFlags'][0], "X")) echo " checked "; + echo ">" . _('Help') . "
" . _('User can change password') . "" . _('Help') . "
" . _('User must change password') . "" . _('Help') . "
" . _('Account is deactivated') . "attributes['acctFlags'][0], "D")) echo " checked "; + echo ">" . _('Help') . "
" . _('Home drive') . "" . _('Help') . "
" . _('Home path') . "attributes['smbHome'][0] . "\">" . _('Help') . "
" . _('Profile path') . "attributes['profilePath'][0] . "\">" . _('Help') . "
" . _('Script path') . "attributes['scriptPath'][0] . "\">" . _('Help') . "
" . _('Samba workstations') . "" . _('Help') . "
" . _('Windows group') . "" . _('Help') . "
" . _('Domain') . "attributes['domain'][0] . "\">" . _('Help') . "
\n"; + } + else { + + } + return 0; + } + + /* This function will create the html-page + * to show a page with all attributes. + * It will output a complete html-table + */ + function display_html_userWorkstations($post) { + // Get list of all hosts. + $result = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('uid', 'sambaAccount', 'host'); + if (is_array($result)) { + foreach ($result as $host) $availableUserWorkstations[] = str_replace("$", '', $host[0]); + sort($availableUserWorkstations, SORT_STRING); + $result = str_replace(' ', '', $this->attributes['userWorkstations'][0]); + $userWorkstations = explode (',', $result); + $availableUserWorkstations = array_delete($userWorkstations, $availableUserWorkstations); + } + echo "\n\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
"; + echo "
base]->type."edit-bright\">base]->type."edit-bright\">"; + echo _("Allowed workstations"); + echo "\n"; + // display all workstations the user is allowed to login + if (count($userWorkstations)!=0) { + echo "\n"; + } + echo "
"; + echo " "; + echo "\">

"; + echo ""._('Help')."		"; + echo "
base]->type."edit-bright\">base]->type."edit-bright\">"; + echo _('Available workstations'); + echo "\n"; + // Display all workstations without these the user is allowed to login + if (count($availableUserWorkstations)!=0) { + echo "\n"; + } + echo "
\n"; + } + + + } + + + +?> diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc new file mode 100644 index 00000000..9e347d29 --- /dev/null +++ b/lam/lib/modules/sambaSamAccount.inc @@ -0,0 +1,578 @@ +add_objectClass(\'sambaSamAccount\');'), E_USER_ERROR); + $this->base = $base; + // sambaSamAccount is only a valid objectClass for user and host + if (!($_SESSION[$this->base]->get_type() == 'user') && !($_SESSION[$this->base]->get_type() == 'host')) trigger_error(_('sambaSamAccount can only be used for users or hosts.'), E_USER_WARNING); + /* Check if ldap conatiner is in array and set type + * users are using inetOrgPerson-, hosts account-container + */ + if (!isset($_SESSION[$this->base]->module['posixAccount'])) $_SESSION[$this->base]->add_objectClass('posixAccount'); + // Add Array with all attributes and type + $this->attributes = $_SESSION[$this->base]->get_module_attributes('sambaSamAccount'); + $_SESSION[$this->base]->add_attributes ('sambaSamAccount'); + $this->alias = _('sambaSamAccount'); + // Make references to attributes which already esists in ldap + $newattributes = array_keys($this->attributes); + $module = array_keys($_SESSION[$this->base]->module); + // fixme *** do we have to unset module sambaSamAccount itself + for ($i=0; $ibase]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute]; + } + $this->orig = $this->attributes ; + $this->attributes['objectClass'][0] = 'sambaSamAccount'; + $this->useunixpwd=false; + // List of well known rids + $this->rids = array ( _('Domain Admins') => 512, _('Domain Users') => 513, _('Domain Guests') => 514, _('Domain Computers') => 515, _('Domain Controllers') => 516, + _('Domain Certificate Admins') => 517, _('Domain Schema Admins') => 518, _('Domain Enterprise Admins') => 519, _('Domain Policy Admins') => 520 ); + } + + // Variables + // Alias Name. This name is shown in the menu instead of sambaSamAccount + var $alias; + // name of accountContainer so we can read other classes in accuontArray + var $base; + + // This variable contains all inetOrgPerson attributes + var $attributes; + /* If an account was loaded all attributes are kept in this array + * to compare it with new changed attributes + */ + var $orig; + // use unix password as samba password? + var $useunixpwd; + // Array of well known rids + var $rids; + + /* This function returns a list with all required modules + */ + function dependencies() { + return array('posixAccount'); + } + + function module_ready() { + if ($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]=='') return false; + if ($_SESSION[$this->base]->module['posixAccount']->attributes['uidNumber'][0]=='') return false; + if ($this->attributes['uid'][0]=='') return false; + return true; + } + + /* $attribute['sambaLMPassword'] and sambaNTPassword can't accessed directly because it's enrcypted + * To read / write password function userPassword is needed + * This function will return the unencrypted password when + * called without a variable + * If it's called with a new password, the + * new password will be stored encrypted + */ + function sambaLMPassword($newpassword=false) { + if (is_string($newpassword)) { + // Write new password + $iv = base64_decode($_COOKIE["IV"]); + $key = base64_decode($_COOKIE["Key"]); + $this->attributes['sambaLMPassword'][0] = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $newpassword, MCRYPT_MODE_ECB, $iv)); + return 0; + } + else { + if ($this->useunixpwd) return $_SESSION[$this->base]->module['inetOrgPerson']->userPassword(); + if ($this->attributes['sambaLMPassword'][0]!='') { + // Read existing password if set + $iv = base64_decode($_COOKIE["IV"]); + $key = base64_decode($_COOKIE["Key"]); + $password = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, base64_decode($this->attributes['sambaLMPassword'][0]), MCRYPT_MODE_ECB, $iv); + $password = str_replace(chr(00), '', $password); + return $password; + } + else return ''; + } + } + + + + /* Write variables into object and do some regexp checks + */ + function proccess_attributes($post) { + // Load attributes + $this->attributes['sambaDomainName'][0] = $post['form_sambaSamAccount_sambaDomainName']; + // Get Domain SID from name + $sambaDomains = $_SESSION[$_SESSION[$this->base]->ldap]->search_domains($_SESSION[$_SESSION[$this->base]->config]->get_domainSuffix()); + for ($i=0; $iattributes['sambaDomainName'][0] == $sambaDomains[$i]->name) { + $SID = $sambaDomains[$i]->SID; + $RIDbase = $sambaDomain[$i]->RIDbase; + } + + $flag = "["; + if ($post['form_sambaSamAccount_sambaAcctFlagsD']) $flag .= "D"; + if ($post['form_sambaSamAccount_sambaAcctFlagsX']) $flag .= "X"; + if ($post['form_sambaSamAccount_sambaAcctFlagsN']) $flag .= "N"; + if ($post['form_sambaSamAccount_sambaAcctFlagsS']) $flag .= "S"; + if ($post['form_sambaSamAccount_sambaAcctFlagsH']) $flag .= "H"; + if ($post['form_sambaSamAccount_sambaAcctFlagsW']) $flag .= "W"; + if ($post['form_sambaSamAccount_sambaAcctFlagsU']) $flag .= "U"; + // Expand string to fixed length + $flag = str_pad($flag, 12); + // End character + $flag = $flag. "]"; + $this->attributes['sambaAcctFlags'][0] = $flag; + + if ($_SESSION[$this->base]->type=='user') { + $this->attributes['sambaPwdCanChange'][0] = mktime($post['form_sambaSamAccount_sambaPwdCanChange_h'], $post['form_sambaSamAccount_sambaPwdCanChange_m'], $post['form_sambaSamAccount_sambaPwdCanChange_s'], + $post['form_sambaSamAccount_sambaPwdCanChange_mon'], $post['form_sambaSamAccount_sambaPwdCanChange_day'], $post['form_sambaSamAccount_sambaPwdCanChange_yea']); + $this->attributes['sambaPwdMustChange'][0] = mktime($post['form_sambaSamAccount_sambaPwdMustChange_h'], $post['form_sambaSamAccount_sambaPwdMustChange_m'], $post['form_sambaSamAccount_sambaPwdMustChange_s'], + $post['form_sambaSamAccount_sambaPwdMustChange_mon'], $post['form_sambaSamAccount_sambaPwdMustChange_day'], $post['form_sambaSamAccount_sambaPwdMustChange_yea']); + $this->attributes['sambaHomePath'][0] = stripslashes($post['form_sambaSamAccount_sambaHomePath']); + $this->attributes['sambaHomeDrive'][0] = $post['form_sambaSamAccount_sambaHomeDrive']; + $this->attributes['sambaLogonScript'][0] = stripslashes($post['form_sambaSamAccount_sambaLogonScript']); + $this->attributes['sambaProfilePath'][0] = stripslashes($post['form_sambaSamAccount_sambaProfilePath']); + $rids = array_keys($this->rids); + $wrid = false; + for ($i=0; $iattributes['sambaPrimaryGroupSID'][0] = $SID."-".$this->rids[$rids[$i]]; + } + } + if (!$wrid) $this->attributes['sambaPrimaryGroupSID'][0] = $SID."-".($_SESSION[$this->base]->module['posixAccount']->attributes['gidNumber'][0]*2)+$RIDbase+1; + + if (isset($post['form_sambaSamAccount_sambaLMPassword'])) { + if ($post['form_sambaSamAccount_sambaLMPassword'] != $post['form_sambaSamAccount_sambaLMPassword2']) { + $errors[] = array('ERROR', _('Password'), _('Please enter the same password in both password-fields.')); + unset ($post['form_sambaSamAccount_sambaLMPassword2']); + } + else $this->sambaLMPassword($post['form_sambaSamAccount_sambaLMPassword']); + } + if ($post['form_sambaSamAccount_useunixpwd']) $this->useunixpwd = true; + else $this->useunixpwd = false; + } + + + // Check values + if ($_SESSION[$this->base]->type=='user') { + $this->attributes['sambaHomePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['sambaHomePath'][0]); + $this->attributes['sambaHomePath'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['sambaHomePath'][0]); + if ($this->attributes['sambaHomePath'][0] != stripslashes($post['form_sambaSamAccount_sambaHomePath'])) $errors[] = array('INFO', _('Home path'), _('Inserted user- or groupname in HomePath.')); + $this->attributes['sambaLogonScript'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['sambaLogonScript'][0]); + $this->attributes['sambaLogonScript'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['sambaLogonScript'][0]); + if ($this->attributes['sambaLogonScript'][0] != stripslashes($post['form_sambaSamAccount_sambaLogonScript'])) $errors[] = array('INFO', _('Logon script'), _('Inserted user- or groupname in logon script.')); + $this->attributes['sambaProfilePath'][0] = str_replace('$user', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['uid'][0], $this->attributes['sambaProfilePath'][0]); + $this->attributes['sambaProfilePath'][0] = str_replace('$group', $_SESSION[$this->base]->module['inetOrgPerson']->attributes['gid'][0], $this->attributes['sambaProfilePath'][0]); + if ($this->attributes['sambaProfiletPath'][0] != stripslashes($post['form_sambaSamAccount_sambaProfilePath'])) $errors[] = array('INFO', _('Profile path'), _('Inserted user- or groupname in profilepath.')); + if ( (!$this->attributes['sambaHomePath'][0]=='') && (!ereg('^[\][\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%])+([\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%]|[?]|[?]|[?]|[?]|[?]|[?]|[?])+)+$', $this->attributes['sambaHomePath'][0]))) + $errors[] = array('ERROR', _('Home path'), _('Home path is invalid.')); + if ( !ereg('^([a-z]|[A-Z]|[0-9]|[\|]|[\#]|[\*]|[\,]|[\.]|[\;]|[\:]|[\_]|[\-]|[\+]|[\!]|[\%]|[\&]|[\/]|[\?]|[\{]|[\[]|[\(]|[\)]|[\]]|[\}])*$', + $this->sambaLMPassword())) $errors[] = array('ERROR', _('Password'), _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !')); + if ( (!$this->attributes['sambaLogonScript'][0]=='') && (!ereg('^([/])*([a-z]|[0-9]|[.]|[-]|[_]|[%]|[?]|[?]|[?]|[?]|[?]|[?]|[?])+([a-z]|[0-9]|[.]|[-]|[_]|[%]|[?]|[?]|[?]|[?]|[?]|[?]|[?])*'. + '([/]([a-z]|[0-9]|[.]|[-]|[_]|[%]|[?]|[?]|[?]|[?]|[?]|[?]|[?])+([a-z]|[0-9]|[.]|[-]|[_]|[%]|[?]|[?]|[?]|[?]|[?]|[?]|[?])*)*(([.][b][a][t])|([.][c][m][d]))$', $this->attributes['sambaLogonScript'][0]))) + $errors[] = array('ERROR', _('Script path'), _('Script path is invalid!')); + if ( (!$this->attributes['sambaProfilePath'][0]=='') && (!ereg('^[/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*([/][a-z]([a-z]|[0-9]|[.]|[-]|[_]|[%])*)*$', $this->attributes['sambaProfilePath'][0])) + && (!ereg('^[\][\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%])+([\]([a-z]|[A-Z]|[0-9]|[.]|[-]|[%])+)+$', $this->attributes['sambaProfilePath'][0]))) + $errors[] = array('ERROR', _('Profile path'), _('Profile path is invalid!')); + } + + if ((!$this->attributes['sambaDomainName'][0]=='') && !ereg('^([a-z]|[A-Z]|[0-9]|[-])+$', $this->attributes['sambaDomainName'][0])) + $errors[] = array('ERROR', _('Domain name'), _('Domain name contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and -.')); + + + if (is_array($errors)) return $errors; + if ($post['form_sambaSamAccount_sambaUserWorkstations']) return 'sambaUserWorkstations'; + return 0; + } + + /* Write variables into object and do some regexp checks + */ + function proccess_sambaUserWorkstations($post) { + // Load attributes + do { // X-Or, only one if() can be true + if (isset($post['form_sambaSamAccount_availableSambaUserWorkstations']) && isset($post['form_sambaSamAccount_sambaUserWorkstations_add'])) { // Add workstations to list + $temp = str_replace(' ', '', $this->attributes['sambaUserWorkstations'][0]); + $workstations = explode (',', $temp); + for ($i=0; $iattributes['sambaUserWorkstations'][0] = $workstations[0]; + for ($i=1; $iattributes['sambaUserWorkstations'][0] = $this->attributes['sambaUserWorkstations'][0] . "," . $workstations[$i]; + } + break; + } + if (isset($post['form_sambaSamAccount_sambaUserWorkstations']) && isset($post['form_sambaSamAccount_sambaUserWorkstations_remove'])) { // remove // Add workstations from list + // Put all workstations in array + $temp = str_replace(' ', '', $this->attributes['sambaUserWorkstations'][0]); + $workstations = explode (',', $temp); + for ($i=0; $iattributes['sambaUserWorkstations'][0] = $workstations[0]; + for ($i=1; $iattributes['sambaUserWorkstations'][0] = $this->attributes['sambaUserWorkstations'][0] . "," . $workstations[$i]; + } + break; + } + } while(0); + if ($post['form_sambaSamAccount_attributes']) return 'attributes'; + return 0; + } + + /* This function loads all attributes into the object + * $attr is an array as it's retured from ldap_get_attributes + */ + function load_attributes($attr) { + // Load attributes which are displayed + // unset count entries + unset ($attr['count']); + $attributes = array_keys($attr); + foreach ($attributes as $attribute) unset ($attr[$attribute]['count']); + // unset double entries + for ($i=0; $iattributes[$attribute])) { + // decode as unicode + $this->attributes[$attribute] = $attr[$attribute]; + for ($i=0; $iattributes[$attribute]); $i++) $this->attributes[$attribute][$i] = utf8_decode ($this->attributes[$attribute][$i]); + } + } + // Values are kept as copy so we can compare old attributes with new attributes + $this->attributes['objectClass'][0] = 'sambaSamAccount'; + $this->orig = $this->attributes; + $this->sambaLMPassword(''); // Remove old password so it won't displayed as hash + return 0; + } + + + /* This function returns an array with 3 entries: + * array( DN1 ('add' => array($attr), 'remove' => array($attr), 'modify' => array($attr)), DN2 .... ) + * DN is the DN to change. It may be possible to change several DNs, + * e.g. create a new user and add him to some groups via attribute memberUid + * add are attributes which have to be added to ldap entry + * remove are attributes which have to be removed from ldap entry + * modify are attributes which have to been modified in ldap entry + */ + function save_attributes() { + $return = $_SESSION[$this->base]->save_module_attributes($this->attributes, $this->orig); + // Set password + if (isset($return[$_SESSION[$this->base]->dn]['modify']['sambaLMPassword'])) + unset($return[$_SESSION[$this->base]->dn]['modify']['sambaLMPassword']); + if (isset($return[$_SESSION[$this->base]->dn]['modify']['sambaNTPassword'])) + unset($return[$_SESSION[$this->base]->dn]['modify']['sambaNTPassword']); + if (!isset($this->orig['sambaLMPassword'][0])) { + $return[$_SESSION[$this->base]->dn]['modify']['sambaLMPassword'][0] = exec(escapeshellarg($_SESSION['lampath'].'lib/createntlm.pl')." lm ".escapeshellarg($this->sambaLMPassword())); + $return[$_SESSION[$this->base]->dn]['modify']['sambaNTPassword'][0] = exec(escapeshellarg($_SESSION['lampath'].'lib/createntlm.pl')." nt ".escapeshellarg($this->sambaLMPassword())); + $return[$_SESSION[$this->base]->dn]['modify']['sambaPwdLastSet'][0] = time(); + } + if ($this->sambaLMPassword()!='') { + $return[$_SESSION[$this->base]->dn]['modify']['sambaLMPassword'][0] = exec(escapeshellarg($_SESSION['lampath'].'lib/createntlm.pl')." lm ".escapeshellarg($this->sambaLMPassword())); + $return[$_SESSION[$this->base]->dn]['modify']['sambaNTPassword'][0] = exec(escapeshellarg($_SESSION['lampath'].'lib/createntlm.pl')." nt ".escapeshellarg($this->sambaLMPassword())); + $return[$_SESSION[$this->base]->dn]['modify']['sambaPwdLastSet'][0] = time(); + } + return $return; + } + + + /* This function returns all ldap attributes + * which are part of sambaSamAccount and returns + * also their values. + */ + function get_attributes() { + return $this->attributes; + } + + /* This function will create the html-page + * to show a page with all attributes. + * It will output a complete html-table + */ + function display_html_attributes($post) { + if ($_SESSION[$this->base]->type=='user') { + $canchangedate = getdate($this->attributes['sambaPwdCanChange'][0]); + $mustchangedate = getdate($this->attributes['sambaPwdMustChange'][0]); + // Get Domain SID from name + $sambaDomains = $_SESSION[$_SESSION[$this->base]->ldap]->search_domains($_SESSION[$_SESSION[$this->base]->config]->get_domainSuffix()); + for ($i=0; $iname; + if ($this->attributes['sambaDomainName'][0] == $sambaDomains[$i]->name) + $SID = $sambaDomains[$i]->SID; + } + echo ''. + ''. + ''. + ''. + ''. + ''. + ''; + echo "\n\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
" . _('Samba password') . "sambaLMPassword() . "\">
" . _('Repeat password') . "sambaLMPassword(); + echo "\">
" . _('Use unix password') . "useunixpwd) echo " checked "; + echo ">" . _('Help') . "
" . _('Use no password') . "attributes['sambaAcctFlags'][0], "N")) echo " checked "; + echo ">" . _('Help' ) ."
" . _('Password does not expire') . "attributes['sambaAcctFlags'][0], "X")) echo " checked "; + echo ">" . _('Help') . "
" . _('User can change password') . "" . _('Help') . "
" . _('User must change password') . "" . _('Help') . "
" . _('Account is deactivated') . "attributes['sambaAcctFlags'][0], "D")) echo " checked "; + echo ">" . _('Help') . "
" . _('Home drive') . "" . _('Help') . "
" . _('Home path') . "attributes['sambaHomePath'][0] . "\">" . _('Help') . "
" . _('Profile path') . "attributes['sambaProfilePath'][0] . "\">" . _('Help') . "
" . _('Logon script') . "attributes['sambaLogonScript'][0] . "\">" . _('Help') . "
" . _('Samba workstations') . "" . _('Help') . "
" . _('Windows group') . "" . _('Help') . "
" . _('Domain') . "" . _('Help') . "
\n"; + } + else { + + } + return 0; + } + + /* This function will create the html-page + * to show a page with all attributes. + * It will output a complete html-table + */ + function display_html_sambaUserWorkstations($post) { + // Get list of all hosts. + $result = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('uid', 'sambaSamAccount', 'host'); + if (is_array($result)) { + foreach ($result as $host) $availableUserWorkstations[] = str_replace("$", '', $host[0]); + sort($availableUserWorkstations, SORT_STRING); + $result = str_replace(' ', '', $this->attributes['sambaUserWorkstations'][0]); + $userWorkstations = explode (',', $result); + $availableUserWorkstations = array_delete($userWorkstations, $availableUserWorkstations); + } + echo "\n\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
"; + echo "
base]->type."edit-bright\">base]->type."edit-bright\">"; + echo _("Allowed workstations"); + echo "\n"; + // display all workstations the user is allowed to login + if (count($userWorkstations)!=0) { + echo "\n"; + } + echo "
"; + echo " "; + echo "\">

"; + echo ""._('Help')."		"; + echo "
base]->type."edit-bright\">base]->type."edit-bright\">"; + echo _('Available workstations'); + echo "\n"; + // Display all workstations without these the user is allowed to login + if (count($availableUserWorkstations)!=0) { + echo "\n"; + } + echo "
\n"; + } + + + } + + + +?> diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc index 2bd2f590..616637ce 100644 --- a/lam/lib/modules/shadowAccount.inc +++ b/lam/lib/modules/shadowAccount.inc @@ -110,8 +110,8 @@ class shadowAccount { $this->attributes['shadowMax'][0] = $post['form_shadowAccount_shadowMax']; $this->attributes['shadowWarning'][0] = $post['form_shadowAccount_shadowWarning']; $this->attributes['shadowInactive'][0] = $post['form_shadowAccount_shadowInactive']; - $this->attributes['shadowExpire'][0] = mktime(10, 0, 0, $post['form_shadowAccount_shadowExpire_mon'], - $post['form_shadowAccount_shadowExpire_day'], $post['form_shadowAccount_shadowExpire_yea'])/3600/24; + $this->attributes['shadowExpire'][0] = intval(mktime(10, 0, 0, $post['form_shadowAccount_shadowExpire_mon'], + $post['form_shadowAccount_shadowExpire_day'], $post['form_shadowAccount_shadowExpire_yea'])/3600/24); if ( !ereg('^([0-9])*$', $this->attributes['shadowMin'][0])) $errors[] = array('ERROR', _('Password minage'), _('Password minage must be are natural number.')); if ( $this->attributes['shadowMin'][0] > $this->attributes['shadowMax'][0] ) $errors[] = array('ERROR', _('Password maxage'), _('Password maxage must bigger as Password Minage.')); @@ -163,7 +163,7 @@ class shadowAccount { // Set shadowLastchange manual. if ($_SESSION[$this->base]->module['inetOrgPerson']->userPassword()!='' || $_SESSION[$this->base]->module['inetOrgPerson']->userPassword_no) - $return[$_SESSION[$this->base]->dn]['modify']['shadowLastChange'] = array(time()/3600/24); + $return[$_SESSION[$this->base]->dn]['modify']['shadowLastChange'] = array(intval(time()/3600/24)); return $return; }