From ff1ceeac80cdeee3de3b869148271b97ec39cc64 Mon Sep 17 00:00:00 2001 From: katagia Date: Tue, 30 Dec 2003 15:36:30 +0000 Subject: [PATCH] improved support for config of modules --- lam/lib/account.inc | 24 +- lam/lib/modules/account.inc | 46 ++- lam/lib/modules/inetOrgPerson.inc | 144 ++++---- lam/lib/modules/main.inc | 194 +++++----- lam/lib/modules/posixAccount.inc | 502 ++++++++++++++------------ lam/lib/modules/posixGroup.inc | 396 ++++++++++---------- lam/lib/modules/quota.inc | 115 +++--- lam/lib/modules/sambaAccount.inc | 424 +++++++++++----------- lam/lib/modules/sambaGroupMapping.inc | 108 +++--- lam/lib/modules/sambaSamAccount.inc | 433 +++++++++++----------- lam/lib/modules/shadowAccount.inc | 93 ++--- lam/templates/account/hostedit.php | 458 ++--------------------- 12 files changed, 1321 insertions(+), 1616 deletions(-) diff --git a/lam/lib/account.inc b/lam/lib/account.inc index 5ce3f31c..8c79e3cd 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -381,13 +381,13 @@ class accountContainer { if ($this->order[$i]==$this->order[$this->module['main']->current_page] || !$this->module[$this->order[$i]]->module_ready() ) { // print disabled button echo "order[$i]."\" type=\"submit\" value=\""; - echo $this->module[$this->order[$i]]->alias; + echo $this->module[$this->order[$i]]->get_alias(); echo "\" disabled>\n
"; } else { // print normal button echo "order[$i]."\" type=\"submit\" value=\""; - echo $this->module[$this->order[$i]]->alias; + echo $this->module[$this->order[$i]]->get_alias(); echo "\">\n
"; } } @@ -395,7 +395,7 @@ class accountContainer { echo "\n"; echo "\n"; echo "
type."edit-dark\">type."edit-bright\">"; - echo $this->module[$this->order[$this->module['main']->current_page]]->alias; + echo $this->module[$this->order[$this->module['main']->current_page]]->get_alias(); echo "\n"; // display html-code from mdule $function = '$result = $this->module[$this->order[$this->module[\'main\']->current_page]]->display_html_'.$this->module['main']->subpage.'($post);'; @@ -706,10 +706,10 @@ class accountContainer { while ( (count($module) != count($modulelist)) && ($remain!=0) ) { $remain--; foreach ($module as $moduleitem) { - $required = $this->module[$moduleitem]->dependencies(); + $required = $this->module[$moduleitem]->get_dependencies($this->type); $everything_found = true; - if (is_array($required)) { - foreach ($required as $requireditem) + if (is_array($required['require'])) { + foreach ($required['require'] as $requireditem) if (!in_array($reuquireditem, $modulelist)) $everthing_found = false; } if ($everything_found && !in_array($moduleitem, $order) ) $order[] = $moduleitem; @@ -736,10 +736,10 @@ class accountContainer { while ( (count($module) != count($modulelist)) && ($remain!=0) ) { $remain--; foreach ($module as $moduleitem) { - $required = $this->module[$moduleitem]->dependencies(); + $required = $this->module[$moduleitem]->get_dependencies($this->type); $everything_found = true; - if (is_array($required)) { - foreach ($required as $requireditem) + if (is_array($required['require'])) { + foreach ($required['require'] as $requireditem) if (!in_array($reuquireditem, $modulelist)) $everthing_found = false; } if ($everything_found && !in_array($moduleitem, $order) ) $order[] = $moduleitem; @@ -906,7 +906,7 @@ class accountContainer { } } - +/* // This class keeps all needed values for any account class account { // Type : user | group | host @@ -955,7 +955,7 @@ class account { * mountpoint, used blocks, soft block limit, hard block limit, grace block period, used inodes, * soft inode limit, hard inode limit, grace inode period */ - // Personal Settings +/* // Personal Settings var $personal_title; // string title of user var $personal_mail; // string mailaddress of user var $personal_telephoneNumber; // string telephonenumber of user @@ -966,7 +966,7 @@ class account { var $personal_postalAddress; // string postal Address of user var $personal_employeeType; // string employe type of user } - +*/ /* Return a list of all shells listed in ../config/shells diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc index 926af994..b87dc95b 100644 --- a/lam/lib/modules/account.inc +++ b/lam/lib/modules/account.inc @@ -52,13 +52,9 @@ class account { $this->orig = $this->attributes ; // Add objectClass to attributes $this->attributes['objectClass'][0] = 'account'; - // Set aliasname - $this->alias = _('account'); } // Variables - // Alias Name. This name is shown in the menu instead of 'account' - var $alias; // name of account_container in session so we can read other classes in account_container var $base; // This variable contains all account attributes @@ -68,10 +64,15 @@ class account { */ var $orig; + function get_alias() { + return _('account'); + } + /* This function returns a list with all required modules */ - function dependencies() { - return array('main'); + function get_dependencies($scope) { + if ($scope=='host') return array('require' => array('main'), 'conflict' => array('inetOrgPerson', 'posixGroup', 'sambaDomain') ); + return -1; } /* This function returns true if all required attributes from other @@ -81,7 +82,6 @@ class account { return true; } - /* This function returns a list of all html-pages in module * This is usefull for mass upload and pdf-files * because lam can walk trough all pages itself and do some @@ -91,13 +91,12 @@ class account { return array('attributes'); } - - /* Write variables into object and do some regexp checks + /* This function returns all ldap attributes + * which are part of account and returns + * also their values. */ - function proccess_attributes($post) { - // Load attributes - $this->attributes['description'][0] = $post['form_account_description']; - return 0; + function get_attributes() { + return $this->attributes; } /* This function loads all attributes into the object @@ -141,12 +140,17 @@ class account { return $return; } - /* This function returns all ldap attributes - * which are part of account and returns - * also their values. + function delete_attributes($post) { + $return = array(); + return $return; + } + + /* Write variables into object and do some regexp checks */ - function get_attributes() { - return $this->attributes; + function proccess_attributes($post) { + // Load attributes + $this->attributes['description'][0] = $post['description']; + return 0; } /* This function will create the html-page @@ -157,13 +161,17 @@ class account { echo "\n\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "
" . _('Description') . "attributes['description'][0]."\">attributes['description'][0]."\">" . _('Help') . "
\n"; return 0; } + function display_html_delete($post) { + return 0; + } + } ?> diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc index e2633887..bda4a574 100644 --- a/lam/lib/modules/inetOrgPerson.inc +++ b/lam/lib/modules/inetOrgPerson.inc @@ -51,13 +51,9 @@ class inetOrgPerson { $this->orig = $this->attributes ; // Add objectClass to attributes $this->attributes['objectClass'][0] = 'inetOrgPerson'; - // Set aliasname - $this->alias = _('inetOrgPerson'); } // Variables - // Alias Name. This name is shown in the menu instead of posixAccount - var $alias; // name of account_container in session so we can read other classes in account_container var $base; // This variable contains all inetOrgPerson attributes @@ -67,11 +63,15 @@ class inetOrgPerson { */ var $orig; + function get_alias() { + return _('inetOrgPerson'); + } /* This function returns a list with all required modules */ - function dependencies() { - return array('main'); + function get_dependencies($scope) { + if ($scope=='user') return array('require' => array('main'), 'conflict' => array('account', 'posixGroup', 'sambaDomain') ); + return -1; } /* This function returns true if all required attributes from other @@ -90,50 +90,12 @@ class inetOrgPerson { return array('attributes'); } - - /* Write variables into object and do some regexp checks + /* This function returns all ldap attributes + * which are part of inetOrgPerson and returns + * also their values. */ - function proccess_attributes($post) { - // Load attributes - $this->attributes['description'][0] = $post['form_inetOrgPerson_description']; - $this->attributes['sn'][0] = $post['form_inetOrgPerson_sn']; - $this->attributes['givenName'][0] = $post['form_inetOrgPerson_givenName']; - $this->attributes['title'][0] = $post['form_inetOrgPerson_title']; - $this->attributes['mail'][0] = $post['form_inetOrgPerson_mail']; - $this->attributes['telephoneNumber'][0] = $post['form_inetOrgPerson_telephoneNumber']; - $this->attributes['mobileTelephoneNumber'][0] = $post['form_inetOrgPerson_mobileTelephoneNumber']; - $this->attributes['facsimileTelephoneNumber'][0] = $post['form_inetOrgPerson_facsimileTelephoneNumber']; - $this->attributes['street'][0] = $post['form_inetOrgPerson_street']; - $this->attributes['postalCode'][0] = $post['form_inetOrgPerson_postalCode']; - $this->attributes['postalAddress'][0] = $post['form_inetOrgPerson_postalAddress']; - $this->attributes['employeeType'][0] = $post['form_inetOrgPerson_employeeType']; - - // handle host-attribute in on epice because it's not set by default - if (isset($this->attributes['host'])) { - $host = $post['form_inetOrgPerson_host']; - if ((!$host=='') && !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-])+(([,])+([ ])*([a-z]|[A-Z]|[0-9]|[.]|[-])+)*$', $host)) - $errors[] = array('ERROR', _('Unix workstations'), _('Unix workstations is invalid.'), 'host'); - $hosts = explode(" ", $host); - $this->attributes['host'] = array(); - foreach ($hosts as $host) - if ($host!="") $this->attributes['host'][] = $host; - } - - // Do some regex-checks and return error if attributes are set to wrong values - if ( !ereg('^([a-z]|[A-Z]|[-]|[ ]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+$', $this->attributes['givenName'][0])) $errors[] = array('ERROR', _('Given name'), _('Given name contains invalid characters'), 'givenname'); - if ( !ereg('^([a-z]|[A-Z]|[-]|[ ]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+$', $this->attributes['sn'][0])) $errors[] = array('ERROR', _('Surname'), _('Surname contains invalid characters'), 'sn'); - if ( !ereg('^(\+)*([0-9]|[ ]|[.]|[(]|[)]|[/]|[-])*$', $this->attributes['telephoneNumber'][0])) $errors[] = array('ERROR', _('Telephone number'), _('Please enter a valid telephone number!'), 'telephoneNumber'); - if ( !ereg('^(\+)*([0-9]|[ ]|[.]|[(]|[)]|[/]|[-])*$', $this->attributes['mobileTelephoneNumber'][0])) $errors[] = array('ERROR', _('Mobile number'), _('Please enter a valid mobile number!'), 'mobileTelephoneNumber'); - if ( !ereg('^(\+)*([0-9]|[ ]|[.]|[(]|[)]|[/]|[-])*$', $this->attributes['facsimileTelephoneNumber'][0])) $errors[] = array('ERROR', _('Fax number'), _('Please enter a valid fax number!'), 'facsimileTelephoneNumber'); - if ( !ereg('^(([0-9]|[A-Z]|[a-z]|[.]|[-]|[_])+[@]([0-9]|[A-Z]|[a-z]|[-])+([.]([0-9]|[A-Z]|[a-z]|[-])+)*)*$', $this->attributes['mail'][0])) $errors[] = array('ERROR', _('eMail address'), _('Please enter a valid eMail address!'), 'mail'); - if ( !ereg('^([0-9]|[A-Z]|[a-z]|[-]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $this->attributes['street'][0])) $errors[] = array('ERROR', _('Street'), _('Please enter a valid street name!'), 'street'); - if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $this->attributes['postalAddress'][0])) $errors[] = array('ERROR', _('Postal address'), _('Please enter a valid postal address!'), 'postalAdress'); - if ( !ereg('^([0-9]|[A-Z]|[a-z]|[-]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $this->attributes['title'][0])) $errors[] = array('ERROR', _('Title'), _('Please enter a valid title!'), 'title'); - if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $this->attributes['employeeType'][0])) $errors[] = array('ERROR', _('Employee type'), _('Please enter a valid employee type!'), 'employeeType'); - if ( !ereg('^([0-9]|[A-Z]|[a-z])*$', $this->attributes['personal_postalCode'][0])) $errors[] = array('ERROR', _('Postal code'), _('Please enter a valid postal code!'), 'personal_postalCode'); - // Return error-messages - if (is_array($errors)) return $errors; - return 0; + function get_attributes() { + return $this->attributes; } /* This function loads all attributes into the object @@ -182,13 +144,55 @@ class inetOrgPerson { // Return attributes return $return; } - - /* This function returns all ldap attributes - * which are part of inetOrgPerson and returns - * also their values. + /* Write variables into object and do some regexp checks */ - function get_attributes() { - return $this->attributes; + + function delete_attributes($post) { + $return = array(); + return $return; + } + + function proccess_attributes($post) { + // Load attributes + $this->attributes['description'][0] = $post['description']; + $this->attributes['sn'][0] = $post['sn']; + $this->attributes['givenName'][0] = $post['givenName']; + $this->attributes['title'][0] = $post['title']; + $this->attributes['mail'][0] = $post['mail']; + $this->attributes['telephoneNumber'][0] = $post['telephoneNumber']; + $this->attributes['mobileTelephoneNumber'][0] = $post['mobileTelephoneNumber']; + $this->attributes['facsimileTelephoneNumber'][0] = $post['facsimileTelephoneNumber']; + $this->attributes['street'][0] = $post['street']; + $this->attributes['postalCode'][0] = $post['postalCode']; + $this->attributes['postalAddress'][0] = $post['postalAddress']; + $this->attributes['employeeType'][0] = $post['employeeType']; + + // handle host-attribute in on epice because it's not set by default + if (isset($this->attributes['host'])) { + $host = $post['host']; + if ((!$host=='') && !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-])+(([,])+([ ])*([a-z]|[A-Z]|[0-9]|[.]|[-])+)*$', $host)) + $errors[] = array('ERROR', _('Unix workstations'), _('Unix workstations is invalid.'), 'host'); + $hosts = explode(" ", $host); + $this->attributes['host'] = array(); + foreach ($hosts as $host) + if ($host!="") $this->attributes['host'][] = $host; + } + + // Do some regex-checks and return error if attributes are set to wrong values + if ( !ereg('^([a-z]|[A-Z]|[-]|[ ]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+$', $this->attributes['givenName'][0])) $errors[] = array('ERROR', _('Given name'), _('Given name contains invalid characters'), 'givenName'); + if ( !ereg('^([a-z]|[A-Z]|[-]|[ ]|[ä]|[Ä]|[ö]|[Ö]|[ü]|[Ü]|[ß])+$', $this->attributes['sn'][0])) $errors[] = array('ERROR', _('Surname'), _('Surname contains invalid characters'), 'sn'); + if ( !ereg('^(\+)*([0-9]|[ ]|[.]|[(]|[)]|[/]|[-])*$', $this->attributes['telephoneNumber'][0])) $errors[] = array('ERROR', _('Telephone number'), _('Please enter a valid telephone number!'), 'telephoneNumber'); + if ( !ereg('^(\+)*([0-9]|[ ]|[.]|[(]|[)]|[/]|[-])*$', $this->attributes['mobileTelephoneNumber'][0])) $errors[] = array('ERROR', _('Mobile number'), _('Please enter a valid mobile number!'), 'mobileTelephoneNumber'); + if ( !ereg('^(\+)*([0-9]|[ ]|[.]|[(]|[)]|[/]|[-])*$', $this->attributes['facsimileTelephoneNumber'][0])) $errors[] = array('ERROR', _('Fax number'), _('Please enter a valid fax number!'), 'facsimileTelephoneNumber'); + if ( !ereg('^(([0-9]|[A-Z]|[a-z]|[.]|[-]|[_])+[@]([0-9]|[A-Z]|[a-z]|[-])+([.]([0-9]|[A-Z]|[a-z]|[-])+)*)*$', $this->attributes['mail'][0])) $errors[] = array('ERROR', _('eMail address'), _('Please enter a valid eMail address!'), 'mail'); + if ( !ereg('^([0-9]|[A-Z]|[a-z]|[-]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $this->attributes['street'][0])) $errors[] = array('ERROR', _('Street'), _('Please enter a valid street name!'), 'street'); + if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $this->attributes['postalAddress'][0])) $errors[] = array('ERROR', _('Postal address'), _('Please enter a valid postal address!'), 'postalAdress'); + if ( !ereg('^([0-9]|[A-Z]|[a-z]|[-]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $this->attributes['title'][0])) $errors[] = array('ERROR', _('Title'), _('Please enter a valid title!'), 'title'); + if ( !ereg('^([0-9]|[A-Z]|[a-z]|[ ]|[.]|[Ä]|[ä]|[Ö]|[ö]|[Ü]|[ü]|[ß])*$', $this->attributes['employeeType'][0])) $errors[] = array('ERROR', _('Employee type'), _('Please enter a valid employee type!'), 'employeeType'); + if ( !ereg('^([0-9]|[A-Z]|[a-z])*$', $this->attributes['personal_postalCode'][0])) $errors[] = array('ERROR', _('Postal code'), _('Please enter a valid postal code!'), 'personal_postalCode'); + // Return error-messages + if (is_array($errors)) return $errors; + return 0; } /* This function will create the html-page @@ -196,17 +200,16 @@ class inetOrgPerson { * It will output a complete html-table */ function display_html_attributes($post) { - echo "\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; if (isset($this->attributes['host'])) { echo "\n"; echo "\n"; - echo "\n"; @@ -215,63 +218,66 @@ class inetOrgPerson { } 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 "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "
" . _('Description') . "attributes['description'][0]."\">attributes['description'][0]."\">" . _('Help') . "
" . _('Unix workstations') . "attributes['host'])) foreach ($this->attributes['host'] as $host) echo $host." "; echo "\">
" . _('Title') . "attributes['title'][0]."\">attributes['title'][0]."\">" . _('Help') . "
" . _('First name') . "*attributes['givenName'][0]."\">attributes['givenName'][0]."\">" . _('Help') . "
" . _('Last name') . "*attributes['sn'][0]."\">attributes['sn'][0]."\">" . _('Help') . "
" . _('Employee type') . "attributes['employeeType'][0]."\">attributes['employeeType'][0]."\">" . _('Help') . "
" . _('Street') . "attributes['street'][0]."\">attributes['street'][0]."\">" . _('Help') . "
" . _('Postal code') . "attributes['postalCode'][0]."\">attributes['postalCode'][0]."\">" . _('Help') . "
" . _('Postal address') . "attributes['postalAddress'][0]."\">attributes['postalAddress'][0]."\">" . _('Help') . "
" . _('Telephone number') . "attributes['telephoneNumber'][0]."\">attributes['telephoneNumber'][0]."\">" . _('Help') . "
" . _('Mobile number') . "attributes['mobileTelephoneNumber'][0]."\">attributes['mobileTelephoneNumber'][0]."\">" . _('Help') . "
" . _('Fax number') . "attributes['facsimileTelephoneNumber'][0]."\">attributes['facsimileTelephoneNumber'][0]."\">" . _('Help') . "
" . _('eMail address') . "attributes['mail'][0]."\">attributes['mail'][0]."\">" . _('Help') . "
\n"; return 0; } + function display_html_delete($post) { + return 0; + } } ?> diff --git a/lam/lib/modules/main.inc b/lam/lib/modules/main.inc index c2437cec..7995cc5b 100644 --- a/lam/lib/modules/main.inc +++ b/lam/lib/modules/main.inc @@ -52,32 +52,45 @@ class main { $this->subpage = ''; // Get local copy of name of account_container in session $this->base = $base; - // Set aliasname - $this->alias = _('main'); } // Variables - // This variable stores the number of the current displayed page var $current_page; // This variable os set to the pagename of a subpage if it should be displayed var $subpage; // name of accountContainer so we can read other classes in accuontArray var $base; - // Alias Name. This name is shown in the menu instead of main - var $alias; + + function get_alias() { + return _('main'); + } /* This function returns a list with all required modules */ - function dependencies() { - return array(); + function get_dependencies($scope) { + return array('require' => array(), 'conflict' => array() ); } function module_ready() { return true; } + /* This function returns a list of all html-pages in module + * This is usefull for mass upload and pdf-files + * because lam can walk trough all pages itself and do some + * error checkings + */ + function pages() { + return array('attributes', 'finish'); + } + + // Dummy functions to make module compatible + function get_attributes() { + return array(); + } + // Dummy functions to make module compatible function load_attributes($attr) { return 0; @@ -88,9 +101,79 @@ class main { return array(); } - // Dummy functions to make module compatible - function get_attributes() { - return array(); + function delete_attributes($post) { + $return = array(); + return $return; + } + + /* Write variables into object and do some regexp checks + */ + function proccess_attributes($post) { + // change dn + if ($post['suffix']!='') $_SESSION[$this->base]->dn = $post['suffix']; + // load profile + if ($post['selectLoadProfile'] && $post['loadProfile']) { + // *** fixme load*Profile must return array in the same way ldap_get_attributes does. + $function = '$newattributes = load'.ucfirst($scope).'Profile($post[\'selectLoadProfile\']);'; + eval($function); + // pass newattributes to each module + $modules = array_keys($_SESSION[$this->base]->module); + foreach ($modules as $module) $_SESSION[$this->base]->module[$module]->load_attributes($newattributes); + return 0; + } + // save account + if ($post['create']) { + $success = $_SESSION[$this->base]->save_account(); + if (is_array($success)) return array($success); + // return name of subpage + return 'finish'; + } + // save profile + if ($post['saveProfile']) { + if ($post['selectSaveProfile']=='') $errors[] = array('ERROR', _('Save profile'), _('No profilename given.')); + else { + $function = 'save'.ucfirst($scope).'Profile();'; + eval($function); + if ($function) $errors[] = array('INFO', _('Save profile'), _('New profile created.')); + else $errors[] = array('ERROR', _('Save profile'), _('Wrong profilename given.')); + } + if (is_array($errors)) return $errors; + else return 0; + } + return 0; + } + + /* Write variables into object and do some regexp checks + */ + function proccess_finish($post) { + if ($post['createagain']) { + // Reset objects + $modules = array_keys($_SESSION[$this->base]->module); + foreach ($modules as $module) + if ($module!='main') unset($_SESSION[$this->base]->module[$module]); + // Reset accountContainer + $_SESSION[$this->base]->dn = ''; + $_SESSION[$this->base]->dn_orig = ''; + $_SESSION[$this->base]->attributes = array(); + $_SESSION[$this->base]->order = array(); + $this->current_page = 0; + $this->subpage = ''; + // Add all required objects etc. + $_SESSION[$this->base]->new_account(); + return 0; + } + if ($post['backmain']) { + // Return to *-list + // *** fixme unset accountContainer in session + metaRefresh("../lists/list".$_SESSION[$this->base]->type."s.php"); + exit; + } + if ($post['outputpdf']) { + // Create / display PDf-file + $function = 'create'.ucfirst($_SESSION[$this->base]->type).'PDF(array($_SESSION[$this->base]));'; + eval($function); + exit; + } } function display_html_attributes($post) { @@ -108,7 +191,7 @@ class main { 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"; @@ -151,6 +234,9 @@ class main { return 0; } + function display_html_delete($post) { + return 0; + } /* This page will be shown if an account * has been saved @@ -166,12 +252,12 @@ class main { echo "
" . _('Suffix') . "
" . _("Load profile") . "\n"; - echo "" . _('Help') . "
" . _("Save profile") . "\n"; - echo "\n"; + echo "" . _('Help') . "
base]->dn_orig!='') echo _('Modify Account'); else echo _('Create Account'); echo "\" $disabled >
\n"; echo "\n"; if ($_SESSION[$this->base]->dn_orig=='') { - echo "\n"; } - echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -179,76 +265,6 @@ class main { return 0; } - /* Write variables into object and do some regexp checks - */ - function proccess_finish($post) { - if ($post['form_main_createagain']) { - // Reset objects - $modules = array_keys($_SESSION[$this->base]->module); - foreach ($modules as $module) - if ($module!='main') unset($_SESSION[$this->base]->module[$module]); - // Reset accountContainer - $_SESSION[$this->base]->dn = ''; - $_SESSION[$this->base]->dn_orig = ''; - $_SESSION[$this->base]->attributes = array(); - $_SESSION[$this->base]->order = array(); - $this->current_page = 0; - $this->subpage = ''; - // Add all required objects etc. - $_SESSION[$this->base]->new_account(); - return 0; - } - if ($post['form_main_backmain']) { - // Return to *-list - // *** fixme unset accountContainer in session - metaRefresh("../lists/list".$_SESSION[$this->base]->type."s.php"); - exit; - } - if ($post['form_main_outputpdf']) { - // Create / display PDf-file - $function = 'create'.ucfirst($_SESSION[$this->base]->type).'PDF(array($_SESSION[$this->base]));'; - eval($function); - exit; - } - } - - /* Write variables into object and do some regexp checks - */ - function proccess_attributes($post) { - // change dn - if ($post['form_main_suffix']!='') $_SESSION[$this->base]->dn = $post['form_main_suffix']; - // load profile - if ($post['form_main_selectLoadProfile'] && $post['form_main_loadProfile']) { - // *** fixme load*Profile must return array in the same way ldap_get_attributes does. - $function = '$newattributes = load'.ucfirst($scope).'Profile($post[\'form_main_selectLoadProfile\']);'; - eval($function); - // pass newattributes to each module - $modules = array_keys($_SESSION[$this->base]->module); - foreach ($modules as $module) $_SESSION[$this->base]->module[$module]->load_attributes($newattributes); - return 0; - } - // save account - if ($post['form_main_create']) { - $success = $_SESSION[$this->base]->save_account(); - if (is_array($success)) return array($success); - // return name of subpage - return 'finish'; - } - // save profile - if ($post['form_main_saveProfile']) { - if ($post['form_main_selectSaveProfile']=='') $errors[] = array('ERROR', _('Save profile'), _('No profilename given.')); - else { - $function = 'save'.ucfirst($scope).'Profile();'; - eval($function); - if ($function) $errors[] = array('INFO', _('Save profile'), _('New profile created.')); - else $errors[] = array('ERROR', _('Save profile'), _('Wrong profilename given.')); - } - if (is_array($errors)) return $errors; - else return 0; - } - return 0; - } - } ?> diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index 9244870d..acdc564c 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -89,8 +89,6 @@ class posixAccount { } // Variables - // Alias Name. This name is shown in the menu instead of posixAccount - var $alias; // name of accountContainer so we can read other classes in accuontArray var $base; // Use a unix password? @@ -142,12 +140,15 @@ class posixAccount { } } + function get_alias() { + return _('posixAccount'); + } + /* This function returns a list with all required modules */ - function dependencies() { - if ($_SESSION[$this->base]->type=='user') return array('inetOrgPerson'); - if ($_SESSION[$this->base]->type=='host') return array('account'); - // return error if unsupported type is used + function get_dependencies($scope) { + if ($scope=='host') return array('require' => array('account'), 'conflict' => array() ); + if ($scope=='user') return array('require' => array('inetOrgPerson'), 'conflict' => array() ); return -1; } @@ -155,207 +156,25 @@ class posixAccount { return true; } - /* Write variables into object and do some regexp checks + /* This function returns a list of all html-pages in module + * This is usefull for mass upload and pdf-files + * because lam can walk trough all pages itself and do some + * error checkings */ - function proccess_attributes($post) { - if ($this->orig['uid'][0]!='' && $post['form_posixAccount_uid']!=$this->attributes['uid'][0]) - $errors[] = array('INFO', _('UID'), _('UID has changed. Do you want to change home directory?')); - if ($this->orig['gidNumber'][0]!='' && $_SESSION[$_SESSION[$this->base]->cache]->getgid($post['form_posixAccount_gidNumber'])!=$this->attributes['gidNumber'][0]) - $errors[] = array('INFO', _('GID number'), sprintf(_('GID number has changed. To keep file ownership you have to run the following command as root: \'find / -gid %s -uid %s -exec chgrp %s {} \;\''), $this->orig['gidNumber'][0], $this->orig['uidNumber'][0], $_SESSION[$_SESSION[$this->base]->cache]->getgid($post['form_posixAccount_gidNumber']))); - if ($this->orig['uidNumber'][0]!='' && $post['form_posixAccount_uidNumber']!=$this->attributes['uidNumber'][0]) - $errors[] = array('INFO', _('UID number'), sprintf(_('UID number has changed. To keep file ownership you have to run the following command as root: \'find / -uid %s -exec chown %s {} \;\''), $this->orig['uidNumber'][0], $this->attributes['uidNumber'][0])); - if (isset($post['form_posixAccount_homeDirectory']) && $this->orig['homeDirectory'][0]!='' && $post['form_posixAccount_homeDirectory']!=$this->attributes['homeDirectory'][0]) - $errors[] = array('INFO', _('Home directory'), sprintf(_('Home directory changed. To keep home directory you have to run the following command as root: \'mv %s %s\''), $this->orig['homeDirectory'][0], $this->attributes['homeDirectory'][0])); - - // Load attributes - $this->attributes['uid'][0] = $post['form_posixAccount_uid']; - $this->attributes['cn'][0] = $this->attributes['uid'][0]; - $this->attributes['uidNumber'][0] = $post['form_posixAccount_uidNumber']; - $this->attributes['gidNumber'][0] = $_SESSION[$_SESSION[$this->base]->cache]->getgid($post['form_posixAccount_gidNumber']); - $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; - if ($post['form_posixAccount_userPassword_no']) $this->userPassword_no=true; - else $this->userPassword_no=false; - if ($post['form_posixAccount_userPassword_lock']) $this->userPassword_lock=true; - else $this->userPassword_lock=false; - if (isset($post['form_posixAccount_userPassword'])) { - if ($post['form_posixAccount_userPassword'] != $post['form_posixAccount_userPassword2']) { - $errors[] = array('ERROR', _('Password'), _('Please enter the same password in both password-fields.')); - unset ($post['form_posixAccount_userPassword2']); - } - else $this->userPassword($post['form_posixAccount_userPassword']); - } - if ($post['form_posixAccount_genpass']) $this->userPassword(genpasswd()); - - - // Check if UID is valid. If none value was entered, the next useable value will be inserted - // load min and may uidNumber - if ($_SESSION[$this->base]->type=='user') { - $minID = intval($_SESSION[$_SESSION[$this->base]->config]->get_minUID()); - $maxID = intval($_SESSION[$_SESSION[$this->base]->config]->get_maxUID()); - } - if ($_SESSION[$this->base]->type=='host') { - $minID = intval($_SESSION[$_SESSION[$this->base]->config]->get_minMachine()); - $maxID = intval($_SESSION[$_SESSION[$this->base]->config]->get_maxMachine()); - } - $dn_uids = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('uidNumber', 'posixAccount', '*'); - // get_cache will return an array ( dn1 => array(uidnumber1), dn2 => array(uidnumber2), ... ) - foreach ($dn_uids as $uid) $uids[] = $uid[0]; - if(is_array($uids)) sort ($uids, SORT_NUMERIC); - if ($this->attributes['uidNumber'][0]=='') { - // No id-number given - if ($this->orig['uidNumber'][0]=='') { - // new account -> we have to find a free id-number - if (count($uids)!=0) { - // There are some uids - // Store highest id-number - $id = $uids[count($uids)-1]; - // Return minimum allowed id-number if all found id-numbers are too low - if ($id < $minID) $this->attributes['uidNumber'][0] = $minID; - // Return higesht used id-number + 1 if it's still in valid range - if ($id < $maxID) $this->attributes['uidNumber'][0] = $id+1; - /* If this function is still running we have to fid a free id-number between - * the used id-numbers - */ - $i = intval($minID); - while (in_array($i, $uids)) $i++; - if ($i>$maxID) - $errors[] = array('ERROR', _('ID-Number'), _('No free ID-Number!')); - else { - $this->attributes['uidNumber'][0] = $i; - $errors[] = array('WARN', _('ID-Number'), _('It is possible that this ID-number is reused. This can cause several problems because files with old permissions might still exist. To avoid this warning set maxUID to a higher value.')); - } - } - else $this->attributes['uidNumber'][0] = $minID; - // return minimum allowed id-number if no id-numbers are found - } - else $this->attributes['uidNumber'][0] = $this->orig['uidNumber'][0]; - // old account -> return id-number which has been used - } - else { - // Check manual ID - // id-number is out of valid range - if ( ($this->attributes['uidNumber'][0]!=$post['form_posixAccount_uidNumber']) && ($this->attributes['uidNumber'][0] < $minID || $this->attributes['uidNumber'][0] > $maxID)) $errors[] = array('ERROR', _('ID-Number'), sprintf(_('Please enter a value between %s and %s!'), $minID, $maxID)); - // $uids is allways an array but not if no entries were found - if (is_array($uids)) { - // id-number is in use and account is a new account - if ((in_array($this->attributes['uidNumber'][0], $uids)) && $this->orig['uidNumber'][0]=='') $errors[] = array('ERROR', _('ID-Number'), _('ID is already in use')); - // id-number is in use, account is existing account and id-number is not used by itself - if ((in_array($this->attributes['uidNumber'][0], $uids)) && $this->orig['uidNumber'][0]!='' && ($this->orig['uidNumber'][0] != $this->attributes['uidNumber'][0]) ) { - $errors[] = array('ERROR', _('ID-Number'), _('ID is already in use')); - $this->attributes['uidNumber'][0] = $this->orig['uidNumber'][0]; - } - } - } - - if ($_SESSION[$this->base]->type=='user') { - if (($this->attributes['uid'][0] != $post['form_posixAccount_uid']) && ereg('[A-Z]$', $post['form_posixAccount_uid'])) - $errors[] = array('WARN', _('Username'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.')); - // Check if Homedir is valid - $this->attributes['homeDirectory'][0] = str_replace('$group', $_SESSION[$_SESSION[$this->base]->cache]->getgrnam($this->attributes['gidNumber'][0]), $this->attributes['homeDirectory'][0]); - if ($this->attributes['uid'][0] != '') - $this->attributes['homeDirectory'][0] = str_replace('$user', $this->attributes['uid'][0], $this->attributes['homeDirectory'][0]); - if ($this->attributes['homeDirectory'][0] != $post['form_posixAccount_homeDirectory']) $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]|[.]|[-]|[_])*)*$', $this->attributes['homeDirectory'][0] )) - $errors[] = array('ERROR', _('Home directory'), _('Homedirectory contains invalid characters.')); - // Check if Username contains only valid characters - if ( !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])+$', $this->attributes['uid'][0])) - $errors[] = array('ERROR', _('Username'), _('Username contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); - } - - if ($_SESSION[$this->base]->type=='host') { - if (($this->attributes['uid'][0] != $post['form_account_uid']) && ereg('[A-Z]$', $post['form_account_uid'])) - $errors[] = array('WARN', _('Hostname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.')); - // Check if Username contains only valid characters - if ( !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])+[$]$', $this->attributes['uid'][0])) - $errors[] = array('ERROR', _('Hostname'), _('Hostname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ ! Hostname must end with $ !')); - } - - // Create automatic useraccount with number if original user already exists - // Reset name to original name if new name is in use - // Set username back to original name if new username is in use - if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($this->attributes['uid'][0],'uid', '*')!=false && ($this->orig['uid'][0]!='')) { - $this->attributes['uid'][0] = $this->orig['uid'][0]; - } - // Change uid to a new uid until a free uid is found - else while ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($this->attributes['uid'][0], 'uid', '*')) { - if ($_SESSION[$this->base]->type=='host') $this->attributes['uid'][0] = substr($this->attributes['uid'][0], 0, -1); - // get last character of username - $lastchar = substr($this->attributes['uid'][0], strlen($this->attributes['uid'][0])-1, 1); - // Last character is no number - if ( !ereg('^([0-9])+$', $lastchar)) - /* Last character is no number. Therefore we only have to - * add "2" to it. - */ - if ($_SESSION[$this->base]->type=='host') $this->attributes['uid'][0] = $this->attributes['uid'][0] . '2$'; - else $this->attributes['uid'][0] = $this->attributes['uid'][0] . '2'; - else { - /* Last character is a number -> we have to increase the number until we've - * found a groupname with trailing number which is not in use. - * - * $i will show us were we have to split groupname so we get a part - * with the groupname and a part with the trailing number - */ - $i=strlen($this->attributes['uid'][0])-1; - $mark = false; - // Set $i to the last character which is a number in $account_new->general_username - while (!$mark) { - if (ereg('^([0-9])+$',substr($this->attributes['uid'][0], $i, strlen($this->attributes['uid'][0])-$i))) $i--; - else $mark=true; - } - // increase last number with one - $firstchars = substr($this->attributes['uid'][0], 0, $i+1); - $lastchars = substr($this->attributes['uid'][0], $i+1, strlen($this->attributes['uid'][0])-$i); - // Put username together - if ($_SESSION[$this->base]->type=='host') $this->attributes['uid'][0] = $firstchars . (intval($lastchars)+1)."$"; - else $this->attributes['uid'][0] = $firstchars . (intval($lastchars)+1); - } - } - - // Show warning if lam has changed username - if ($_SESSION[$this->base]->type=='user') - if ($this->attributes['uid'][0] != $post['form_posixAccount_uid']) { - $errors[] = array('WARN', _('Username'), _('Username in use. Selected next free username.')); - } - if ($_SESSION[$this->base]->type=='host') - if ($this->attributes['uid'][0] != $post['form_posixAccount_uid']) { - $errors[] = array('WARN', _('Hostname'), _('Hostname in use. Selected next free hostname.')); - } - - if (!ereg('^([a-z]|[A-Z]|[0-9]|[\|]|[\#]|[\*]|[\,]|[\.]|[\;]|[\:]|[\_]|[\-]|[\+]|[\!]|[\%]|[\&]|[\/]|[\?]|[\{]|[\[]|[\(]|[\)]|[\]]|[\}])*$', $this->userPassword())) - $errors[] = array('ERROR', _('Password'), _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !')); - // Return error-messages - if (is_array($errors)) return $errors; - // Go to additional group page when no error did ocour and button was pressed - if ($post['form_posixAccount_addgroup']) return 'group'; - return 0; + function pages() { + return array('attributes', 'groups'); } - /* Write variables into object and do some regexp checks + /* This function returns all ldap attributes + * which are part of posixAccount and returns + * also their values. */ - function proccess_group($post) { - do { // X-Or, only one if() can be true - if (isset($post['form_posixAccount_addgroups']) && isset($post['form_posixAccount_addgroups_button'])) { // Add groups to list - // Add new group - $this->groups = @array_merge($this->groups, $post['form_posixAccount_addgroups']); - // sort groups - sort($this->groups); - break; - } - if (isset($post['form_posixAccount_removegroups']) && isset($post['form_posixAccount_removegroups_button'])) { // remove groups from list - $this->groups = array_delete($post['form_posixAccount_removegroups'], $this->groups); - break; - } - } while(0); - if (isset($post['form_posixAccount_addgroups_button']) || isset($post['form_posixAccount_removegroups_button'])) return 'group'; - if ($post['form_posixAccount_toattributes']) return 'attributes'; - return 0; + function get_attributes() { + $return = $this->attributes; + $return['userPassword'] = $this->userPassword(); + return $return; } - /* This function loads all attributes into the object * $attr is an array as it's retured from ldap_get_attributes */ @@ -391,8 +210,6 @@ class posixAccount { 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, @@ -469,12 +286,12 @@ class posixAccount { $DNs = array_keys($dn_cns); foreach ($DNs as $DN) { if (is_array($add)) - if (in_array($dn_cns[$DN][0], $add)) $return[$DN]['add']['memberUid'] = $this->attributes['uid']; + if (in_array($dn_cns[$DN][0], $add)) $return[$DN]['add']['memberUid'] = $this->attributes['uid'][0]; if (is_array($remove)) - if (in_array($dn_cns[$DN][0], $remove)) $return[$DN]['remove']['memberUid'] = $this->attributes['uid']; + if (in_array($dn_cns[$DN][0], $remove)) $return[$DN]['remove']['memberUid'] = $this->attributes['uid'][0]; } // primary group mut also be removed if it has changed after setting additional groups - if (in_array($_SESSION[$_SESSION[$this->base]->cache]->getgrnam($this->attributes['gidNumber']), $this->groups_orig)) $return[$DN]['remove']['memberUid'] = $this->attributes['uid']; + if (in_array($_SESSION[$_SESSION[$this->base]->cache]->getgrnam($this->attributes['gidNumber'][0]), $this->groups_orig)) $return[$DN]['remove']['memberUid'] = $this->attributes['uid']; } else { // Add user to every group @@ -482,7 +299,7 @@ class posixAccount { // get_cache will return an array ( dn1 => array(cn1), dn2 => array(cn2), ... ) $DNs = array_keys($dn_cns); foreach ($DNs as $DN) { - if (in_array($dn_cns[$DN][0], $this->groups)) $return[$DN]['add']['memberUid'] = $this->attributes['uid']; + if (in_array($dn_cns[$DN][0], $this->groups)) $return[$DN]['add']['memberUid'] = $this->attributes['uid'][0]; } } } @@ -493,7 +310,7 @@ class posixAccount { // get_cache will return an array ( dn1 => array(cn1), dn2 => array(cn2), ... ) $DNs = array_keys($dn_cns); foreach ($DNs as $DN) { - if (in_array($dn_cns[$DN][0], $this->orig['groups'])) $return[$DN]['remove']['memberUid'] = $this->attributes['uid']; + if (in_array($dn_cns[$DN][0], $this->orig['groups'])) $return[$DN]['remove']['memberUid'] = $this->attributes['uid'][0]; } } } @@ -503,20 +320,214 @@ class posixAccount { return $return; } - - function delete_attributes() { - + function delete_attributes($post) { + $return = array(); + // remove memberUids if set + $groups = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('memberUid', 'posixGroup', 'group'); + $DNs = array_keys($groups); + for ($i=0; $iattributes['uid'][0], $groups[$DNs[$i]])) $return[$DNs[$i]]['remove']['memberUid'] = $this->attributes['uid'][0]; + } + if ($post['deletehomedir']) $return[$_SESSION[$this->base]->dn]['lamdaemon']['command'][] = $this->attributes['uid'][0] . " home rem"; + return $return; } - - /* This function returns all ldap attributes - * which are part of posixAccount and returns - * also their values. + /* Write variables into object and do some regexp checks */ - function get_attributes() { - $return = $this->attributes; - $return['userPassword'] = $this->userPassword(); - return $return; + function proccess_attributes($post) { + if ($this->orig['uid'][0]!='' && $post['uid']!=$this->attributes['uid'][0]) + $errors[] = array('INFO', _('UID'), _('UID has changed. Do you want to change home directory?'), 'uid'); + if ($this->orig['gidNumber'][0]!='' && $_SESSION[$_SESSION[$this->base]->cache]->getgid($post['gidNumber'])!=$this->attributes['gidNumber'][0]) + $errors[] = array('INFO', _('GID number'), sprintf(_('GID number has changed. To keep file ownership you have to run the following command as root: \'find / -gid %s -uid %s -exec chgrp %s {} \;\''), $this->orig['gidNumber'][0], $this->orig['uidNumber'][0], $_SESSION[$_SESSION[$this->base]->cache]->getgid($post['gidNumber'])), 'gidNumber'); + if ($this->orig['uidNumber'][0]!='' && $post['uidNumber']!=$this->attributes['uidNumber'][0]) + $errors[] = array('INFO', _('UID number'), sprintf(_('UID number has changed. To keep file ownership you have to run the following command as root: \'find / -uid %s -exec chown %s {} \;\''), $this->orig['uidNumber'][0], $this->attributes['uidNumber'][0]), 'uidNumber'); + if (isset($post['homeDirectory']) && $this->orig['homeDirectory'][0]!='' && $post['homeDirectory']!=$this->attributes['homeDirectory'][0]) + $errors[] = array('INFO', _('Home directory'), sprintf(_('Home directory changed. To keep home directory you have to run the following command as root: \'mv %s %s\''), $this->orig['homeDirectory'][0], $this->attributes['homeDirectory'][0]), 'homeDirectory'); + + // Load attributes + $this->attributes['uid'][0] = $post['uid']; + $this->attributes['cn'][0] = $this->attributes['uid'][0]; + $this->attributes['uidNumber'][0] = $post['uidNumber']; + $this->attributes['gidNumber'][0] = $_SESSION[$_SESSION[$this->base]->cache]->getgid($post['gidNumber']); + $this->attributes['homeDirectory'][0] = $post['homeDirectory']; + $this->attributes['loginShell'][0] = $post['loginShell']; + $this->attributes['gecos'][0] = $post['gecos']; + if ($post['createhomedir']) $this->createhomedir = true; + else $this->createhomedir = false; + if ($post['userPassword_no']) $this->userPassword_no=true; + else $this->userPassword_no=false; + if ($post['userPassword_lock']) $this->userPassword_lock=true; + else $this->userPassword_lock=false; + if (isset($post['userPassword'])) { + if ($post['userPassword'] != $post['userPassword2']) { + $errors[] = array('ERROR', _('Password'), _('Please enter the same password in both password-fields.'), 'userPassword'); + unset ($post['userPassword2']); + } + else $this->userPassword($post['userPassword']); + } + if ($post['genpass']) $this->userPassword(genpasswd()); + // Check if UID is valid. If none value was entered, the next useable value will be inserted + // load min and may uidNumber + if ($_SESSION[$this->base]->type=='user') { + $minID = intval($_SESSION[$_SESSION[$this->base]->config]->get_minUID()); + $maxID = intval($_SESSION[$_SESSION[$this->base]->config]->get_maxUID()); + } + if ($_SESSION[$this->base]->type=='host') { + $minID = intval($_SESSION[$_SESSION[$this->base]->config]->get_minMachine()); + $maxID = intval($_SESSION[$_SESSION[$this->base]->config]->get_maxMachine()); + } + $dn_uids = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('uidNumber', 'posixAccount', '*'); + // get_cache will return an array ( dn1 => array(uidnumber1), dn2 => array(uidnumber2), ... ) + foreach ($dn_uids as $uid) $uids[] = $uid[0]; + if(is_array($uids)) sort ($uids, SORT_NUMERIC); + if ($this->attributes['uidNumber'][0]=='') { + // No id-number given + if ($this->orig['uidNumber'][0]=='') { + // new account -> we have to find a free id-number + if (count($uids)!=0) { + // There are some uids + // Store highest id-number + $id = $uids[count($uids)-1]; + // Return minimum allowed id-number if all found id-numbers are too low + if ($id < $minID) $this->attributes['uidNumber'][0] = $minID; + // Return higesht used id-number + 1 if it's still in valid range + if ($id < $maxID) $this->attributes['uidNumber'][0] = $id+1; + /* If this function is still running we have to fid a free id-number between + * the used id-numbers + */ + $i = intval($minID); + while (in_array($i, $uids)) $i++; + if ($i>$maxID) + $errors[] = array('ERROR', _('ID-Number'), _('No free ID-Number!'), 'uidNumber'); + else { + $this->attributes['uidNumber'][0] = $i; + $errors[] = array('WARN', _('ID-Number'), _('It is possible that this ID-number is reused. This can cause several problems because files with old permissions might still exist. To avoid this warning set maxUID to a higher value.'), 'uidNumber'); + } + } + else $this->attributes['uidNumber'][0] = $minID; + // return minimum allowed id-number if no id-numbers are found + } + else $this->attributes['uidNumber'][0] = $this->orig['uidNumber'][0]; + // old account -> return id-number which has been used + } + else { + // Check manual ID + // id-number is out of valid range + if ( ($this->attributes['uidNumber'][0]!=$post['uidNumber']) && ($this->attributes['uidNumber'][0] < $minID || $this->attributes['uidNumber'][0] > $maxID)) $errors[] = array('ERROR', _('ID-Number'), sprintf(_('Please enter a value between %s and %s!'), $minID, $maxID), 'uidNumber'); + // $uids is allways an array but not if no entries were found + if (is_array($uids)) { + // id-number is in use and account is a new account + if ((in_array($this->attributes['uidNumber'][0], $uids)) && $this->orig['uidNumber'][0]=='') $errors[] = array('ERROR', _('ID-Number'), _('ID is already in use'), 'uidNumber'); + // id-number is in use, account is existing account and id-number is not used by itself + if ((in_array($this->attributes['uidNumber'][0], $uids)) && $this->orig['uidNumber'][0]!='' && ($this->orig['uidNumber'][0] != $this->attributes['uidNumber'][0]) ) { + $errors[] = array('ERROR', _('ID-Number'), _('ID is already in use'), 'uidNumber'); + $this->attributes['uidNumber'][0] = $this->orig['uidNumber'][0]; + } + } + } + + if ($_SESSION[$this->base]->type=='user') { + if (($this->attributes['uid'][0] != $post['uid']) && ereg('[A-Z]$', $post['uid'])) + $errors[] = array('WARN', _('Username'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'), 'uid'); + // Check if Homedir is valid + $this->attributes['homeDirectory'][0] = str_replace('$group', $_SESSION[$_SESSION[$this->base]->cache]->getgrnam($this->attributes['gidNumber'][0]), $this->attributes['homeDirectory'][0]); + if ($this->attributes['uid'][0] != '') + $this->attributes['homeDirectory'][0] = str_replace('$user', $this->attributes['uid'][0], $this->attributes['homeDirectory'][0]); + if ($this->attributes['homeDirectory'][0] != $post['homeDirectory']) $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]|[.]|[-]|[_])*)*$', $this->attributes['homeDirectory'][0] )) + $errors[] = array('ERROR', _('Home directory'), _('Homedirectory contains invalid characters.'), 'homeDirectory'); + // Check if Username contains only valid characters + if ( !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])+$', $this->attributes['uid'][0])) + $errors[] = array('ERROR', _('Username'), _('Username contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'), 'uid'); + } + + if ($_SESSION[$this->base]->type=='host') { + if (($this->attributes['uid'][0] != $post['form_account_uid']) && ereg('[A-Z]$', $post['form_account_uid'])) + $errors[] = array('WARN', _('Hostname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'), 'uid'); + // Check if Username contains only valid characters + if ( !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])+[$]$', $this->attributes['uid'][0])) + $errors[] = array('ERROR', _('Hostname'), _('Hostname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ ! Hostname must end with $ !'), 'uid'); + } + + // Create automatic useraccount with number if original user already exists + // Reset name to original name if new name is in use + // Set username back to original name if new username is in use + if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($this->attributes['uid'][0],'uid', '*')!=false && ($this->orig['uid'][0]!='')) { + $this->attributes['uid'][0] = $this->orig['uid'][0]; + } + // Change uid to a new uid until a free uid is found + else while ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($this->attributes['uid'][0], 'uid', '*')) { + if ($_SESSION[$this->base]->type=='host') $this->attributes['uid'][0] = substr($this->attributes['uid'][0], 0, -1); + // get last character of username + $lastchar = substr($this->attributes['uid'][0], strlen($this->attributes['uid'][0])-1, 1); + // Last character is no number + if ( !ereg('^([0-9])+$', $lastchar)) + /* Last character is no number. Therefore we only have to + * add "2" to it. + */ + if ($_SESSION[$this->base]->type=='host') $this->attributes['uid'][0] = $this->attributes['uid'][0] . '2$'; + else $this->attributes['uid'][0] = $this->attributes['uid'][0] . '2'; + else { + /* Last character is a number -> we have to increase the number until we've + * found a groupname with trailing number which is not in use. + * + * $i will show us were we have to split groupname so we get a part + * with the groupname and a part with the trailing number + */ + $i=strlen($this->attributes['uid'][0])-1; + $mark = false; + // Set $i to the last character which is a number in $account_new->general_username + while (!$mark) { + if (ereg('^([0-9])+$',substr($this->attributes['uid'][0], $i, strlen($this->attributes['uid'][0])-$i))) $i--; + else $mark=true; + } + // increase last number with one + $firstchars = substr($this->attributes['uid'][0], 0, $i+1); + $lastchars = substr($this->attributes['uid'][0], $i+1, strlen($this->attributes['uid'][0])-$i); + // Put username together + if ($_SESSION[$this->base]->type=='host') $this->attributes['uid'][0] = $firstchars . (intval($lastchars)+1)."$"; + else $this->attributes['uid'][0] = $firstchars . (intval($lastchars)+1); + } + } + + // Show warning if lam has changed username + if ($_SESSION[$this->base]->type=='user') + if ($this->attributes['uid'][0] != $post['uid']) { + $errors[] = array('WARN', _('Username'), _('Username in use. Selected next free username.'), 'uid'); + } + if ($_SESSION[$this->base]->type=='host') + if ($this->attributes['uid'][0] != $post['uid']) { + $errors[] = array('WARN', _('Hostname'), _('Hostname in use. Selected next free hostname.'), 'uid'); + } + + if (!ereg('^([a-z]|[A-Z]|[0-9]|[\|]|[\#]|[\*]|[\,]|[\.]|[\;]|[\:]|[\_]|[\-]|[\+]|[\!]|[\%]|[\&]|[\/]|[\?]|[\{]|[\[]|[\(]|[\)]|[\]]|[\}])*$', $this->userPassword())) + $errors[] = array('ERROR', _('Password'), _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !'), 'userPassword'); + // Return error-messages + if (is_array($errors)) return $errors; + // Go to additional group page when no error did ocour and button was pressed + if ($post['addgroup']) return 'group'; + return 0; + } + + /* Write variables into object and do some regexp checks + */ + function proccess_group($post) { + do { // X-Or, only one if() can be true + if (isset($post['addgroups']) && isset($post['addgroups_button'])) { // Add groups to list + // Add new group + $this->groups = @array_merge($this->groups, $post['addgroups']); + // sort groups + sort($this->groups); + break; + } + if (isset($post['removegroups']) && isset($post['removegroups_button'])) { // remove groups from list + $this->groups = array_delete($post['removegroups'], $this->groups); + break; + } + } while(0); + if (isset($post['addgroups_button']) || isset($post['removegroups_button'])) return 'group'; + if ($post['toattributes']) return 'attributes'; + return 0; } /* This function will create the html-page @@ -524,6 +535,9 @@ class posixAccount { * It will output a complete html-table */ function display_html_attributes($post) { + print_r($this->attributes); + print "
"; + print_r($this->attributes); $groups = $_SESSION[$_SESSION[$this->base]->cache]->findgroups(); // list of all groupnames $shelllist = getshells(); // list of all valid shells if ($this->attributes['userPassword'][0] != $this->orig['userPassword'][0]) $password=$this->userPassword(); @@ -531,22 +545,22 @@ class posixAccount { echo "
base]->type); echo "\">base]->type); 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"; if ($this->orig['homeDirectory']=='' && isset($_SESSION[$_SESSION[$this->base]->config]->scriptPath)) { 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"; @@ -603,7 +617,7 @@ class posixAccount { if (count($shelllist)!=0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + } + return 0; + } + function display_html_group($post) { // load list with all groups $dn_groups = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('gidNumber', 'posixGroup', 'group'); @@ -640,22 +664,22 @@ class posixAccount { echo "base]->type."edit-bright\">" . _("Selected groups") . "\n"; // Show all groups the user is additional member of if (count($this->groups)!=0) { - echo "base]->type."edit-bright\" size=15 multiple>\n"; for ($i=0; $igroups); $i++) echo "\n"; echo "\n"; } echo "\n"; - echo "\n"; echo "\n"; echo "\n"; echo "
' . _('Username') . "*attributes['uid'][0]."\">attributes['uid'][0]."\">" . _('Help') . "
" . _('UID number') ."attributes['uidNumber'][0]."\">attributes['uidNumber'][0]."\">" . _('Help') . "
" . _('Gecos') . "attributes['gecos'][0]."\">attributes['gecos'][0]."\">" . _('Help') . "
" . _('Primary group') . "*
" . _('Additional groups') . "" . _('Help') . "
" . _('Home directory') . "*attributes['homeDirectory'][0]."\">attributes['homeDirectory'][0]."\">" . _('Help') . "
" . _('Create home directory') . "*createhomedir) echo " checked "; echo ">
" . _('Password') . "
" . _('Repeat password') . "
" . _('Use no password') . "userPassword_no) echo " checked "; echo ">" . _('Help') . "
" . _('Lock password') . "userPassword_lock) echo " checked "; echo ">" . _('Help') . "
" . _('Login shell') . "*
" . _('Delete home directory') . "*
"; + echo ""; echo " "; - echo "\">

"; + echo "\">

"; echo ""._('Help')."		\n"; echo "
base]->type."edit-bright\">"; echo "base]->type."edit-bright\">" . _('Available groups') . "\n"; // show all groups expect these the user is member of if (count($groups)!=0) { - echo "base]->type."edit-bright\">\n"; for ($i=0; $i $groups[$i] \n"; echo "\n"; @@ -663,7 +687,7 @@ class posixAccount { echo "
\n"; - echo "\n"; + echo "\n"; echo "
\n"; echo "\n"; return 0; @@ -672,6 +696,4 @@ class posixAccount { } - - ?> diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc index a7a21550..78169c96 100644 --- a/lam/lib/modules/posixGroup.inc +++ b/lam/lib/modules/posixGroup.inc @@ -77,13 +77,10 @@ class posixGroup { $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute]; } $this->orig = $this->attributes ; - $this->attributes['objectClass'][0] = 'posixGroup'; $this->changegids=false; } // Variables - // Alias Name. This name is shown in the menu instead of posixGroup - var $alias; // name of accountContainer so we can read other classes in accuontArray var $base; // Use a unix password? @@ -131,181 +128,40 @@ class posixGroup { } } + function get_alias() { + return _('posixGroup'); + } + /* This function returns a list with all required modules */ - function dependencies() { - return array('main'); + function get_dependencies($scope) { + if ($scope=='group') return array('require' => array('main'), 'conflict' => array('inetOrgPerson', 'account', 'sambaDomain') ); + return -1; } function module_ready() { return true; } - /* Write variables into object and do some regexp checks + /* This function returns a list of all html-pages in module + * This is usefull for mass upload and pdf-files + * because lam can walk trough all pages itself and do some + * error checkings */ - function proccess_attributes($post) { - if ($this->orig['gidNumber'][0]!='' && $post['form_posixGroup_gidNumber']!=$this->attributes['gidNumber'][0]) - $errors[] = array('INFO', _('GID number'), _('GID number has changed. Please select checkbox to change GID number of users and hosts.')); - - // Load attributes - $this->attributes['cn'][0] = $post['form_posixGroup_cn']; - $this->attributes['gidNumber'][0] = $post['form_posixGroup_gidNumber']; - $this->attributes['description'][0] = $post['form_posixGroup_description']; - if ($post['form_posixGroup_userPassword_no']) $this->userPassword_no=true; - else $this->userPassword_no=false; - if ($post['form_posixGroup_userPassword_lock']) $this->userPassword_lock=true; - else $this->userPassword_lock=false; - if ($post['form_posixGroup_changegids']) $this->changegids=true; - else $this->changegids=false; - - if (isset($post['form_posixGroup_userPassword'])) { - if ($post['form_posixGroup_userPassword'] != $post['form_posixGroup_userPassword2']) { - $errors[] = array('ERROR', _('Password'), _('Please enter the same password in both password-fields.')); - unset ($post['form_posixGroup_userPassword2']); - } - else $this->userPassword($post['form_posixGroup_userPassword']); - } - if ($post['form_posixGroup_genpass']) $this->userPassword(genpasswd()); - - // Check if UID is valid. If none value was entered, the next useable value will be inserted - // load min and may uidNumber - $minID = intval($_SESSION[$_SESSION[$this->base]->config]->get_minGID()); - $maxID = intval($_SESSION[$_SESSION[$this->base]->config]->get_maxGID()); - $dn_gids = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('gidNumber', 'posixGroup', '*'); - // get_cache will return an array ( dn1 => array(uidnumber1), dn2 => array(uidnumber2), ... ) - foreach ($dn_gids as $gid) $gids[] = $gid[0]; - if(is_array($gids)) sort ($gids, SORT_NUMERIC); - if ($this->attributes['gidNumber'][0]=='') { - // No id-number given - if ($this->orig['gidNumber'][0]=='') { - // new account -> we have to find a free id-number - if (count($gids)!=0) { - // There are some uids - // Store highest id-number - $id = $gids[count($gids)-1]; - // Return minimum allowed id-number if all found id-numbers are too low - if ($id < $minID) $this->attributes['gidNumber'][0] = $minID; - // Return higesht used id-number + 1 if it's still in valid range - if ($id < $maxID) $this->attributes['gidNumber'][0] = $id+1; - /* If this function is still running we have to fid a free id-number between - * the used id-numbers - */ - $i = intval($minID); - while (in_array($i, $gids)) $i++; - if ($i>$maxID) - $errors[] = array('ERROR', _('ID-Number'), _('No free ID-Number!')); - else { - $this->attributes['gidNumber'][0] = $i; - $errors[] = array('WARN', _('ID-Number'), _('It is possible that this ID-number is reused. This can cause several problems because files with old permissions might still exist. To avoid this warning set maxUID to a higher value.')); - } - } - else $this->attributes['gidNumber'][0] = $minID; - // return minimum allowed id-number if no id-numbers are found - } - else $this->attributes['gidNumber'][0] = $this->orig['gidNumber'][0]; - // old account -> return id-number which has been used - } - else { - // Check manual ID - // id-number is out of valid range - if ( ($this->attributes['gidNumber'][0]!=$post['form_posixGroup_gidNumber']) && ($this->attributes['gidNumber'][0] < $minID || $this->attributes['gidNumber'][0] > $maxID)) $errors[] = array('ERROR', _('ID-Number'), sprintf(_('Please enter a value between %s and %s!'), $minID, $maxID)); - // $uids is allways an array but not if no entries were found - if (is_array($gids)) { - // id-number is in use and account is a new account - if ((in_array($this->attributes['gidNumber'][0], $gids)) && $this->orig['gidNumber'][0]=='') $errors[] = array('ERROR', _('ID-Number'), _('ID is already in use')); - // id-number is in use, account is existing account and id-number is not used by itself - if ((in_array($this->attributes['gidNumber'][0], $gids)) && $this->orig['gidNumber'][0]!='' && ($this->orig['gidNumber'][0] != $this->attributes['gidNumber'][0]) ) { - $errors[] = array('ERROR', _('ID-Number'), _('ID is already in use')); - $this->attributes['gidNumber'][0] = $this->orig['gidNumber'][0]; - } - } - } - - if (($this->attributes['cn'][0] != $post['form_posixGroup_cn']) && ereg('[A-Z]$', $post['form_posixGroup_cn'])) - $errors[] = array('WARN', _('Groupname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.')); - // Check if Username contains only valid characters - if ( !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])+$', $this->attributes['cn'][0])) - $errors[] = array('ERROR', _('Groupname'), _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !')); - - // Create automatic useraccount with number if original user already exists - // Reset name to original name if new name is in use - // Set username back to original name if new username is in use - if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($this->attributes['cn'][0],'cn', '*')!=false && ($this->orig['cn'][0]!='')) { - $this->attributes['cn'][0] = $this->orig['cn'][0]; - } - // Change uid to a new uid until a free uid is found - else while ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($this->attributes['cn'][0], 'cn', '*')) { - // get last character of username - $lastchar = substr($this->attributes['cn'][0], strlen($this->attributes['cn'][0])-1, 1); - // Last character is no number - if ( !ereg('^([0-9])+$', $lastchar)) - /* Last character is no number. Therefore we only have to - * add "2" to it. - */ - $this->attributes['cn'][0] = $this->attributes['cn'][0] . '2'; - else { - /* Last character is a number -> we have to increase the number until we've - * found a groupname with trailing number which is not in use. - * - * $i will show us were we have to split groupname so we get a part - * with the groupname and a part with the trailing number - */ - $i=strlen($this->attributes['cn'][0])-1; - $mark = false; - // Set $i to the last character which is a number in $account_new->general_username - while (!$mark) { - if (ereg('^([0-9])+$',substr($this->attributes['cn'][0], $i, strlen($this->attributes['cn'][0])-$i))) $i--; - else $mark=true; - } - // increase last number with one - $firstchars = substr($this->attributes['cn'][0], 0, $i+1); - $lastchars = substr($this->attributes['cn'][0], $i+1, strlen($this->attributes['cn'][0])-$i); - // Put username together - $this->attributes['cn'][0] = $firstchars . (intval($lastchars)+1); - } - } - - // Show warning if lam has changed username - if ($this->attributes['cn'][0] != $post['form_posixGroup_cn']) { - $errors[] = array('WARN', _('Groupname'), _('Groupname in use. Selected next free groupname.')); - } - - if (!ereg('^([a-z]|[A-Z]|[0-9]|[\|]|[\#]|[\*]|[\,]|[\.]|[\;]|[\:]|[\_]|[\-]|[\+]|[\!]|[\%]|[\&]|[\/]|[\?]|[\{]|[\[]|[\(]|[\)]|[\]]|[\}])*$', $this->userPassword())) - $errors[] = array('ERROR', _('Password'), _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !')); - - // Return error-messages - if (is_array($errors)) return $errors; - // Go to additional group page when no error did ocour and button was pressed - if ($post['form_posixGroup_adduser']) return 'user'; - return 0; + function pages() { + return array('attributes', 'user'); } - /* Write variables into object and do some regexp checks + /* This function returns all ldap attributes + * which are part of posixGroup and returns + * also their values. */ - function proccess_user($post) { - do { // X-Or, only one if() can be true - if (isset($post['form_posixGroup_addusers']) && isset($post['form_posixGroup_addusers_button'])) { // Add groups to list - // Add new user - $this->attributes['memberUid'] = @array_merge($this->attributes['memberUid'], $post['form_posixGroup_addusers']); - // remove doubles - $this->attributes['memberUid'] = @array_flip($this->attributes['memberUid']); - array_unique($this->attributes['memberUid']); - $this->attributes['memberUid'] = @array_flip($this->attributes['memberUid']); - // sort groups - sort($this->attributes['memberUid']); - break; - } - if (isset($post['form_posixGroup_removeusers']) && isset($post['form_posixGroup_removeusers_button'])) { // remove groups from list - $this->attributes['memberUid'] = array_delete($post['form_posixGroup_removeusers'], $this->attributes['memberUid']); - break; - } - } while(0); - if (isset($post['form_posixGroup_adduser_button']) || isset($post['form_posixGroup_removeuser_button'])) return 'user'; - if ($post['form_posixGroup_toattributes']) return 'attributes'; - return 0; + function get_attributes() { + $return = $this->attributes; + $return['userPassword'] = $this->userPassword(); + return $return; } - /* This function loads all attributes into the object * $attr is an array as it's retured from ldap_get_attributes */ @@ -328,12 +184,9 @@ class posixGroup { // Values are kept as copy so we can compare old attributes with new attributes $this->attributes['objectClass'][0] = 'posixGroup'; $this->orig = $this->attributes; - 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, @@ -441,17 +294,174 @@ class posixGroup { return $return; } - - /* This function returns all ldap attributes - * which are part of posixGroup and returns - * also their values. - */ - function get_attributes() { - $return = $this->attributes; - $return['userPassword'] = $this->userPassword(); + function delete_attributes($post) { + $return = array(); return $return; } + /* Write variables into object and do some regexp checks + */ + function proccess_attributes($post) { + if ($this->orig['gidNumber'][0]!='' && $post['gidNumber']!=$this->attributes['gidNumber'][0]) + $errors[] = array('INFO', _('GID number'), _('GID number has changed. Please select checkbox to change GID number of users and hosts.'), 'gidNumber'); + + // Load attributes + $this->attributes['cn'][0] = $post['cn']; + $this->attributes['gidNumber'][0] = $post['gidNumber']; + $this->attributes['description'][0] = $post['description']; + if ($post['userPassword_no']) $this->userPassword_no=true; + else $this->userPassword_no=false; + if ($post['userPassword_lock']) $this->userPassword_lock=true; + else $this->userPassword_lock=false; + if ($post['changegids']) $this->changegids=true; + else $this->changegids=false; + + if (isset($post['userPassword'])) { + if ($post['userPassword'] != $post['userPassword2']) { + $errors[] = array('ERROR', _('Password'), _('Please enter the same password in both password-fields.'), 'userPassword'); + unset ($post['userPassword2']); + } + else $this->userPassword($post['userPassword']); + } + if ($post['genpass']) $this->userPassword(genpasswd()); + + // Check if UID is valid. If none value was entered, the next useable value will be inserted + // load min and may uidNumber + $minID = intval($_SESSION[$_SESSION[$this->base]->config]->get_minGID()); + $maxID = intval($_SESSION[$_SESSION[$this->base]->config]->get_maxGID()); + $dn_gids = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('gidNumber', 'posixGroup', '*'); + // get_cache will return an array ( dn1 => array(uidnumber1), dn2 => array(uidnumber2), ... ) + foreach ($dn_gids as $gid) $gids[] = $gid[0]; + if(is_array($gids)) sort ($gids, SORT_NUMERIC); + if ($this->attributes['gidNumber'][0]=='') { + // No id-number given + if ($this->orig['gidNumber'][0]=='') { + // new account -> we have to find a free id-number + if (count($gids)!=0) { + // There are some uids + // Store highest id-number + $id = $gids[count($gids)-1]; + // Return minimum allowed id-number if all found id-numbers are too low + if ($id < $minID) $this->attributes['gidNumber'][0] = $minID; + // Return higesht used id-number + 1 if it's still in valid range + if ($id < $maxID) $this->attributes['gidNumber'][0] = $id+1; + /* If this function is still running we have to fid a free id-number between + * the used id-numbers + */ + $i = intval($minID); + while (in_array($i, $gids)) $i++; + if ($i>$maxID) + $errors[] = array('ERROR', _('ID-Number'), _('No free ID-Number!'), 'gidNumber'); + else { + $this->attributes['gidNumber'][0] = $i; + $errors[] = array('WARN', _('ID-Number'), _('It is possible that this ID-number is reused. This can cause several problems because files with old permissions might still exist. To avoid this warning set maxUID to a higher value.'), 'gidNumber'); + } + } + else $this->attributes['gidNumber'][0] = $minID; + // return minimum allowed id-number if no id-numbers are found + } + else $this->attributes['gidNumber'][0] = $this->orig['gidNumber'][0]; + // old account -> return id-number which has been used + } + else { + // Check manual ID + // id-number is out of valid range + if ( ($this->attributes['gidNumber'][0]!=$post['gidNumber']) && ($this->attributes['gidNumber'][0] < $minID || $this->attributes['gidNumber'][0] > $maxID)) $errors[] = array('ERROR', _('ID-Number'), sprintf(_('Please enter a value between %s and %s!'), $minID, $maxID), 'gidNumber'); + // $uids is allways an array but not if no entries were found + if (is_array($gids)) { + // id-number is in use and account is a new account + if ((in_array($this->attributes['gidNumber'][0], $gids)) && $this->orig['gidNumber'][0]=='') $errors[] = array('ERROR', _('ID-Number'), _('ID is already in use'), 'gidNumber'); + // id-number is in use, account is existing account and id-number is not used by itself + if ((in_array($this->attributes['gidNumber'][0], $gids)) && $this->orig['gidNumber'][0]!='' && ($this->orig['gidNumber'][0] != $this->attributes['gidNumber'][0]) ) { + $errors[] = array('ERROR', _('ID-Number'), _('ID is already in use'), 'gidNumber'); + $this->attributes['gidNumber'][0] = $this->orig['gidNumber'][0]; + } + } + } + + if (($this->attributes['cn'][0] != $post['cn']) && ereg('[A-Z]$', $post['cn'])) + $errors[] = array('WARN', _('Groupname'), _('You are using a capital letters. This can cause problems because windows isn\'t case-sensitive.'), 'cn'); + // Check if Username contains only valid characters + if ( !ereg('^([a-z]|[A-Z]|[0-9]|[.]|[-]|[_])+$', $this->attributes['cn'][0])) + $errors[] = array('ERROR', _('Groupname'), _('Groupname contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and .-_ !'), 'cn'); + + // Create automatic useraccount with number if original user already exists + // Reset name to original name if new name is in use + // Set username back to original name if new username is in use + if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($this->attributes['cn'][0],'cn', '*')!=false && ($this->orig['cn'][0]!='')) { + $this->attributes['cn'][0] = $this->orig['cn'][0]; + } + // Change uid to a new uid until a free uid is found + else while ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($this->attributes['cn'][0], 'cn', '*')) { + // get last character of username + $lastchar = substr($this->attributes['cn'][0], strlen($this->attributes['cn'][0])-1, 1); + // Last character is no number + if ( !ereg('^([0-9])+$', $lastchar)) + /* Last character is no number. Therefore we only have to + * add "2" to it. + */ + $this->attributes['cn'][0] = $this->attributes['cn'][0] . '2'; + else { + /* Last character is a number -> we have to increase the number until we've + * found a groupname with trailing number which is not in use. + * + * $i will show us were we have to split groupname so we get a part + * with the groupname and a part with the trailing number + */ + $i=strlen($this->attributes['cn'][0])-1; + $mark = false; + // Set $i to the last character which is a number in $account_new->general_username + while (!$mark) { + if (ereg('^([0-9])+$',substr($this->attributes['cn'][0], $i, strlen($this->attributes['cn'][0])-$i))) $i--; + else $mark=true; + } + // increase last number with one + $firstchars = substr($this->attributes['cn'][0], 0, $i+1); + $lastchars = substr($this->attributes['cn'][0], $i+1, strlen($this->attributes['cn'][0])-$i); + // Put username together + $this->attributes['cn'][0] = $firstchars . (intval($lastchars)+1); + } + } + + // Show warning if lam has changed username + if ($this->attributes['cn'][0] != $post['cn']) { + $errors[] = array('WARN', _('Groupname'), _('Groupname in use. Selected next free groupname.'), 'cn'); + } + + if (!ereg('^([a-z]|[A-Z]|[0-9]|[\|]|[\#]|[\*]|[\,]|[\.]|[\;]|[\:]|[\_]|[\-]|[\+]|[\!]|[\%]|[\&]|[\/]|[\?]|[\{]|[\[]|[\(]|[\)]|[\]]|[\}])*$', $this->userPassword())) + $errors[] = array('ERROR', _('Password'), _('Password contains invalid characters. Valid characters are: a-z, A-Z, 0-9 and #*,.;:_-+!$%&/|?{[()]}= !'), 'userPassword'); + // Return error-messages + if (is_array($errors)) return $errors; + // Go to additional group page when no error did ocour and button was pressed + if ($post['adduser']) return 'user'; + return 0; + } + + /* Write variables into object and do some regexp checks + */ + function proccess_user($post) { + do { // X-Or, only one if() can be true + if (isset($post['addusers']) && isset($post['addusers_button'])) { // Add groups to list + // Add new user + $this->attributes['memberUid'] = @array_merge($this->attributes['memberUid'], $post['addusers']); + // remove doubles + $this->attributes['memberUid'] = @array_flip($this->attributes['memberUid']); + array_unique($this->attributes['memberUid']); + $this->attributes['memberUid'] = @array_flip($this->attributes['memberUid']); + // sort groups + sort($this->attributes['memberUid']); + break; + } + if (isset($post['removeusers']) && isset($post['removeusers_button'])) { // remove groups from list + $this->attributes['memberUid'] = array_delete($post['removeusers'], $this->attributes['memberUid']); + break; + } + } while(0); + if (isset($post['adduser_button']) || isset($post['removeuser_button'])) return 'user'; + if ($post['toattributes']) return 'attributes'; + return 0; + } + /* This function will create the html-page * to show a page with all attributes. * It will output a complete html-table @@ -462,47 +472,47 @@ class posixGroup { 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"; @@ -510,7 +520,7 @@ class posixGroup { if ($this->attributes['gidNumber'][0]!=$this->orig['gidNumber'][0] && $this->orig['gidNumber'][0]!='') { echo "\n"; echo "\n"; - echo "\n"; echo "\n"; @@ -520,6 +530,10 @@ class posixGroup { return 0; } + function display_html_delete($post) { + return 0; + } + function display_html_user($post) { // load list with all groups $dn_users = $_SESSION[$_SESSION[$this->base]->cache]->get_cache('uid', 'posixAccount', 'user'); @@ -553,22 +567,22 @@ class posixGroup { echo "base]->type."edit-bright\">" . _("Selected users") . "\n"; // Show all groups the user is additional member of if (count($this->attributes['memberUid'])!=0) { - echo "base]->type."edit-bright\" size=15 multiple>\n"; foreach ($this->attributes['memberUid'] as $member) if ($member!='') echo "\n"; echo "\n"; } echo "\n"; - echo "\n"; echo "\n"; echo "\n"; echo "
' . _('Groupname') . "*attributes['cn'][0]."\">attributes['cn'][0]."\">" . _('Help') . "
" . _('GID number') ."attributes['gidNumber'][0]."\">attributes['gidNumber'][0]."\">" . _('Help') . "
" . _('Description') . "attributes['description'][0]."\">attributes['description'][0]."\">" . _('Help') . "
" . _('Group members') . "" . _('Help') . "
" . _('Password') . "
" . _('Repeat password') . "
" . _('Use no password') . "userPassword_no) echo " checked "; echo ">" . _('Help') . "
" . _('Lock password') . "userPassword_lock) echo " checked "; echo ">" . _('Help') . "
" . _('Change GID number of users and hosts') . "changegids) echo " checked "; echo ">" . _('Help-XX') . ""; + echo ""; echo " "; - echo "\">

"; + echo "\">

"; echo ""._('Help')."		\n"; echo "
base]->type."edit-bright\">"; echo "base]->type."edit-bright\">" . _('Available users') . "\n"; // show all groups expect these the user is member of if (count($users)!=0) { - echo "base]->type."edit-bright\">\n"; for ($i=0; $i $users[$i] \n"; echo "\n"; @@ -576,7 +590,7 @@ class posixGroup { echo "
\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; return 0; diff --git a/lam/lib/modules/quota.inc b/lam/lib/modules/quota.inc index 5083bfb3..c0a4fa41 100644 --- a/lam/lib/modules/quota.inc +++ b/lam/lib/modules/quota.inc @@ -28,14 +28,12 @@ class quota { if (!$base) trigger_error(_('Please create a base object with $var = new accountContainer();'), E_USER_ERROR); if (!is_string($base)) trigger_error(_('Please create a new module object with $accountContainer->add_objectClass(\'quota\');'), E_USER_ERROR); // quota is only a valid objectClass for user and host - if (!($_SESSION[$this->base]->get_type() == 'user') && !($_SESSION[$this->base]->get_type() == 'group')) trigger_error(_('quota can only be used for users or hosts.'), E_USER_WARNING); + if (!($_SESSION[$this->base]->get_type() == 'user') && !($_SESSION[$this->base]->get_type() == 'group')) trigger_error(_('quota can only be used for users or groups.'), 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]->type=='user') $_SESSION[$this->base]->add_objectClass('posixAccount'); if (!isset($_SESSION[$this->base]->module['posixGroup']) && $_SESSION[$this->base]->type=='group') $_SESSION[$this->base]->add_objectClass('posixGroup'); - $this->alias = _('quota'); - // Get basic quotas for new account $output_array = $_SESSION[$this->base]->lamdaemon(array("+ quota get " . $_SESSION[$this->base]->type)); // process quotas @@ -64,19 +62,20 @@ class quota { } // Variables - // Alias Name. This name is shown in the menu instead of quota - var $alias; // name of accountContainer so we can read other classes in accuontArray var $base; var $quota; + function get_alias() { + return _('quota'); + } + /* This function returns a list with all required modules */ - function dependencies() { - if ($_SESSION[$this->base]->type=='user') return array('posixAccount'); - if ($_SESSION[$this->base]->type=='group') return array('posixGroup'); - // return error if unsupported type is used + function get_dependencies($scope) { + if ($scope=='group') return array('require' => array('posixGroup'), 'conflict' => array() ); + if ($scope=='user') return array('require' => array('posixAccount'), 'conflict' => array() ); return -1; } @@ -87,39 +86,22 @@ class quota { return true; } - /* Write variables into object and do some regexp checks + /* This function returns a list of all html-pages in module + * This is usefull for mass upload and pdf-files + * because lam can walk trough all pages itself and do some + * error checkings */ - function proccess_attributes($post) { - // Write all general values into $account_new - $i=0; - // loop for every mointpoint with quotas - while ($this->quota[$i][0]) { - $this->quota[$i][2] = $post['form_quota_' . $i . '_2']; - $this->quota[$i][3] = $post['form_quota_' . $i . '_3']; - $this->quota[$i][6] = $post['form_quota_' . $i . '_6']; - $this->quota[$i][7] = $post['form_quota_' . $i . '_7']; - // Check if values are OK and set automatic values. if not error-variable will be set - if (!ereg('^([0-9])*$', $this->quota[$i][2])) - $errors[] = array('ERROR', _('Block soft quota'), _('Block soft quota contains invalid characters. Only natural numbers are allowed')); - if (!ereg('^([0-9])*$', $this->quota[$i][3])) - $errors[] = array('ERROR', _('Block hard quota'), _('Block hard quota contains invalid characters. Only natural numbers are allowed')); - if (!ereg('^([0-9])*$', $this->quota[$i][6])) - $errors[] = array('ERROR', _('Inode soft quota'), _('Inode soft quota contains invalid characters. Only natural numbers are allowed')); - if (!ereg('^([0-9])*$', $this->quota[$i][7])) - $errors[] = array('ERROR', _('Inode hard quota'), _('Inode hard quota contains invalid characters. Only natural numbers are allowed')); - if (intval($this->quota[$i][2]) > intval($this->quota[$i][3])) - $errors[] = array('ERROR', _('Block quota'), _('Block soft quota must be smaller than block hard quota')); - if (intval($this->quota[$i][6]) > intval($this->quota[$i][7])) - $errors[] = array('ERROR', _('Inode quota'), _('Inode soft quota must be smaller than inode hard quota')); - $i++; - } - - // Return error-messages - if (is_array($errors)) return $errors; - // Go to additional group page when no error did ocour and button was pressed - return 0; + function pages() { + return array('attributes'); } + /* This function returns all ldap attributes + * which are part of quota and returns + * also their values. + */ + function get_attributes() { + return $this->quota; + } /* This function loads all attributes into the object * $attr is an array as it's retured from ldap_get_attributes @@ -156,8 +138,6 @@ class quota { 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, @@ -191,7 +171,7 @@ class quota { return $return; } - function delete_attributes() { + function delete_attributes($post) { $i=0; while ($this->quota[$i][0]) { $quotastring = $quotastring . $this->quota[$i][0] . ',0,0,0,0:'; @@ -203,13 +183,37 @@ class quota { return $return; } - - /* This function returns all ldap attributes - * which are part of quota and returns - * also their values. + /* Write variables into object and do some regexp checks */ - function get_attributes() { - return $this->quota; + function proccess_attributes($post) { + // Write all general values into $account_new + $i=0; + // loop for every mointpoint with quotas + while ($this->quota[$i][0]) { + $this->quota[$i][2] = $post[$i . '_2']; + $this->quota[$i][3] = $post[$i . '_3']; + $this->quota[$i][6] = $post[$i . '_6']; + $this->quota[$i][7] = $post[$i . '_7']; + // Check if values are OK and set automatic values. if not error-variable will be set + if (!ereg('^([0-9])*$', $this->quota[$i][2])) + $errors[] = array('ERROR', _('Block soft quota'), _('Block soft quota contains invalid characters. Only natural numbers are allowed')); + if (!ereg('^([0-9])*$', $this->quota[$i][3])) + $errors[] = array('ERROR', _('Block hard quota'), _('Block hard quota contains invalid characters. Only natural numbers are allowed')); + if (!ereg('^([0-9])*$', $this->quota[$i][6])) + $errors[] = array('ERROR', _('Inode soft quota'), _('Inode soft quota contains invalid characters. Only natural numbers are allowed')); + if (!ereg('^([0-9])*$', $this->quota[$i][7])) + $errors[] = array('ERROR', _('Inode hard quota'), _('Inode hard quota contains invalid characters. Only natural numbers are allowed')); + if (intval($this->quota[$i][2]) > intval($this->quota[$i][3])) + $errors[] = array('ERROR', _('Block quota'), _('Block soft quota must be smaller than block hard quota')); + if (intval($this->quota[$i][6]) > intval($this->quota[$i][7])) + $errors[] = array('ERROR', _('Inode quota'), _('Inode soft quota must be smaller than inode hard quota')); + $i++; + } + + // Return error-messages + if (is_array($errors)) return $errors; + // Go to additional group page when no error did ocour and button was pressed + return 0; } /* This function will create the html-page @@ -247,25 +251,20 @@ class quota { echo "\n"; echo "" . $this->quota[$i][0] . "\n"; echo "" . $this->quota[$i][1] . "\n"; // used blocks - echo "quota[$i][2] . "\">\n"; // blocks soft limit - echo "quota[$i][3] . "\">\n"; // blocks hard limit + echo "quota[$i][2] . "\">\n"; // blocks soft limit + echo "quota[$i][3] . "\">\n"; // blocks hard limit echo "" . $this->quota[$i][4] . "\n"; // block grace period echo "" . $this->quota[$i][5] . "\n"; // used inodes - echo "quota[$i][6] . "\">\n"; // inodes soft limit - echo "quota[$i][7] . "\">\n"; // inodes hard limit + echo "quota[$i][6] . "\">\n"; // inodes soft limit + echo "quota[$i][7] . "\">\n"; // inodes hard limit echo "" . $this->quota[$i][8] . "\n"; echo "\n"; // inodes grace period $i++; } - echo "\n"; return 0; } - - } - - -?> \ No newline at end of file +?> diff --git a/lam/lib/modules/sambaAccount.inc b/lam/lib/modules/sambaAccount.inc index 43235e55..b08d2a3a 100644 --- a/lam/lib/modules/sambaAccount.inc +++ b/lam/lib/modules/sambaAccount.inc @@ -70,7 +70,6 @@ class sambaAccount { // 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); @@ -87,11 +86,8 @@ class sambaAccount { } // 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 @@ -103,19 +99,6 @@ class sambaAccount { // 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 @@ -145,152 +128,41 @@ class sambaAccount { } } - - - /* Write variables into object and do some regexp checks - */ - function proccess_attributes($post) { - $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; - - if ($_SESSION[$this->base]->type=='host') { - $this->attributes['primaryGroupID'][0] = $this->rids[_('Domain Computers')]; - if ($post['form_sambaAccount_ResetSambaPassword']) { - // *** fixme. What is the default password? - $this->lmPassword(''); - $_SESSION[$this->base]->module['posixAccount']->userPassword(''); - } - } - - // Check values - 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; - - if ($post['form_sambaAccount_rid']== _('Administrator')) { - $this->attributes['rid'][0] = "500"; - // Do a check if an administrator already exists - if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache("500", 'rid', 'user')!=$_SESSION[$this->base]->dn_orig) - $errors[] = array('ERROR', _('Special user'), _('There can be only one administrator per domain.')); - } - if ($post['form_sambaAccount_rid']== _('Guest')) { - $this->attributes['rid'][0] = "501"; - // Do a check if an administrator already exists - if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache("501", 'rid', 'user')!=$_SESSION[$this->base]->dn_orig) - $errors[] = array('ERROR', _('Special user'), _('There can be only one guest per domain.')); - } - $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; + function get_alias() { + return _('sambaAccount'); } - /* Write variables into object and do some regexp checks + /* This function returns a list with all required modules */ - 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; + function get_dependencies($scope) { + if ($scope=='host') return array('require' => array('account'), 'conflict' => array() ); + if ($scope=='user') return array('require' => array('inetOrgPerson'), 'conflict' => array() ); + return -1; + } + + 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; + } + + /* This function returns a list of all html-pages in module + * This is usefull for mass upload and pdf-files + * because lam can walk trough all pages itself and do some + * error checkings + */ + function pages() { + return array('attributes', 'userWorkstations'); + } + + /* This function returns all ldap attributes + * which are part of sambaAccount and returns + * also their values. + */ + function get_attributes() { + $return['lmPassword'] = $this->lmPassword(); + return $this->attributes; } /* This function loads all attributes into the object @@ -319,7 +191,6 @@ class sambaAccount { 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, @@ -365,13 +236,155 @@ class sambaAccount { return $return; } + function delete_attributes($post) { + $return = array(); + return $return; + } - /* This function returns all ldap attributes - * which are part of sambaAccount and returns - * also their values. + /* Write variables into object and do some regexp checks */ - function get_attributes() { - return $this->attributes; + function proccess_attributes($post) { + $this->attributes['domain'][0] = $post['domain']; + // Start character + $flag = "["; + if ($post['acctFlagsD']) $flag .= "D"; + if ($post['acctFlagsX']) $flag .= "X"; + if ($post['acctFlagsN']) $flag .= "N"; + if ($post['acctFlagsS']) $flag .= "S"; + if ($post['acctFlagsH']) $flag .= "H"; + if ($post['acctFlagsW']) $flag .= "W"; + if ($post['acctFlagsU']) $flag .= "U"; + // Expand string to fixed length + $flag = str_pad($flag, 12); + // End character + $flag = $flag. "]"; + $this->attributes['acctFlags'][0] = $flag; + + if ($_SESSION[$this->base]->type=='host') { + $this->attributes['primaryGroupID'][0] = $this->rids[_('Domain Computers')]; + if ($post['ResetSambaPassword']) { + // *** fixme. What is the default password? + $this->lmPassword(''); + $_SESSION[$this->base]->module['posixAccount']->userPassword(''); + } + } + + // Check values + if ($_SESSION[$this->base]->type=='user') { + $this->attributes['pwdCanChange'][0] = mktime($post['pwdCanChange_h'], $post['pwdCanChange_m'], $post['pwdCanChange_s'], + $post['pwdCanChange_mon'], $post['pwdCanChange_day'], $post['pwdCanChange_yea']); + $this->attributes['pwdMustChange'][0] = mktime($post['pwdMustChange_h'], $post['pwdMustChange_m'], $post['pwdMustChange_s'], + $post['pwdMustChange_mon'], $post['pwdMustChange_day'], $post['pwdMustChange_yea']); + $this->attributes['smbHome'][0] = stripslashes($post['smbHome']); + $this->attributes['homeDrive'][0] = $post['homeDrive']; + $this->attributes['scriptPath'][0] = stripslashes($post['scriptPath']); + $this->attributes['profilePath'][0] = stripslashes($post['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['lmPassword'])) { + if ($post['lmPassword'] != $post['lmPassword2']) { + $errors[] = array('ERROR', _('Password'), _('Please enter the same password in both password-fields.'), 'lmPassword'); + unset ($post['lmPassword2']); + } + else $this->lmPassword($post['lmPassword']); + } + if ($post['useunixpwd']) $this->useunixpwd = true; + else $this->useunixpwd = false; + + if ($post['rid']== _('Administrator')) { + $this->attributes['rid'][0] = "500"; + // Do a check if an administrator already exists + if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache("500", 'rid', 'user')!=$_SESSION[$this->base]->dn_orig) + $errors[] = array('ERROR', _('Special user'), _('There can be only one administrator per domain.'), 'rid'); + } + if ($post['rid']== _('Guest')) { + $this->attributes['rid'][0] = "501"; + // Do a check if an administrator already exists + if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache("501", 'rid', 'user')!=$_SESSION[$this->base]->dn_orig) + $errors[] = array('ERROR', _('Special user'), _('There can be only one guest per domain.'), 'rid'); + } + $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['smbHome'])) $errors[] = array('INFO', _('Home path'), _('Inserted user- or groupname in HomePath.'), 'smbHome'); + $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['scriptPath'])) $errors[] = array('INFO', _('Script path'), _('Inserted user- or groupname in scriptpath.'), '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['profilePath'])) $errors[] = array('INFO', _('Profile path'), _('Inserted user- or groupname in profilepath.'), '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.'), 'smbHome'); + 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 #*,.;:_-+!$%&/|?{[()]}= !'), 'lmPassword'); + 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!'), 'scriptPath'); + 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!'), 'profilePath'); + } + + 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 -.'), 'domain'); + + if (is_array($errors)) return $errors; + if ($post['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['availableUserWorkstations']) && isset($post['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['userWorkstations']) && isset($post['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['attributes']) return 'attributes'; + return 0; } /* This function will create the html-page @@ -382,22 +395,22 @@ class sambaAccount { if ($_SESSION[$this->base]->type=='user') { $canchangedate = getdate($this->attributes['pwdCanChange'][0]); $mustchangedate = getdate($this->attributes['pwdMustChange'][0]); - echo ''. - ''. - ''. - ''. - ''. - ''. - ''; + echo ''. + ''. + ''. + ''. + ''. + ''. + ''; echo "\n\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; echo "\n"; @@ -405,7 +418,7 @@ class sambaAccount { if ($_SESSION[$this->base]->module['posixAccount']->orig['userPassword'][0] != $_SESSION[$this->base]->module['posixAccount']->attributes['userPassword'][0]) { echo "\n"; echo "\n"; - echo "\n"; echo ""; @@ -413,31 +426,31 @@ class sambaAccount { } 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() . "\">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') . "
" . _('User must change password') . "
" . _('Account is deactivated') . "attributes['acctFlags'][0], "D")) echo " checked "; echo ">" . _('Help') . "
" . _('Home drive') . "
" . _('Home path') . "attributes['smbHome'][0] . "\">attributes['smbHome'][0] . "\">" . _('Help') . "
" . _('Profile path') . "attributes['profilePath'][0] . "\">attributes['profilePath'][0] . "\">" . _('Help') . "
" . _('Script path') . "attributes['scriptPath'][0] . "\">attributes['scriptPath'][0] . "\">" . _('Help') . "
" . _('Samba workstations') . "" . _('Help') . "
" . _('Windows group') . "
" . _('Special user') . "
" . _('Domain') . "attributes['domain'][0] . "\">attributes['domain'][0] . "\">" . _('Help') . "
\n"; } if ($_SESSION[$this->base]->type=='host') { - echo ''; + 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 "
" . _('Reset password') . "
" . _('Domain') . "attributes['domain'][0] . "\">attributes['domain'][0] . "\">" . _('Help') . "
\n"; @@ -563,6 +576,10 @@ class sambaAccount { return 0; } + function display_html_delete($post) { + return 0; + } + /* This function will create the html-page * to show a page with all attributes. * It will output a complete html-table @@ -585,15 +602,15 @@ class sambaAccount { echo "\n"; // display all workstations the user is allowed to login if (count($userWorkstations)!=0) { - echo "base]->type."edit-bright\" size=15 multiple>\n"; for ($i=0; $i".$userWorkstations[$i]."\n"; echo "\n"; } echo "\n"; - echo ""; + echo ""; echo " "; - echo "\">

"; + echo "\">

"; echo ""._('Help')."\n"; echo ""; echo "
base]->type."edit-bright\">base]->type."edit-bright\">"; @@ -601,23 +618,20 @@ class sambaAccount { echo "\n"; // Display all workstations without these the user is allowed to login if (count($availableUserWorkstations)!=0) { - echo "base]->type."edit-bright\">\n"; foreach ($availableUserWorkstations as $temp) echo "\n"; echo "\n"; } echo "
\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; } - } - - ?> diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc index 438a77f0..8a0e6c6e 100644 --- a/lam/lib/modules/sambaGroupMapping.inc +++ b/lam/lib/modules/sambaGroupMapping.inc @@ -76,14 +76,11 @@ class sambaGroupMapping { if (isset($_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute])) $this->attributes[$attribute] =& $_SESSION[$this->base]->module[$module[$i]]->attributes[$attribute]; } $this->orig = $this->attributes ; - $this->attributes['objectClass'][0] = 'sambaGroupMapping'; $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 sambaGroupMapping - var $alias; // name of accountContainer so we can read other classes in accuontArray var $base; @@ -96,10 +93,15 @@ class sambaGroupMapping { // Array of well known rids var $rids; + function get_alias() { + return _('sambaGroupMapping'); + } + /* This function returns a list with all required modules */ - function dependencies() { - return array('posixGroup'); + function get_dependencies($scope) { + if ($scope=='group') return array('require' => array('posixGroup'), 'conflict' => array() ); + return -1; } function module_ready() { @@ -107,42 +109,22 @@ class sambaGroupMapping { return true; } - /* Write variables into object and do some regexp checks + /* This function returns a list of all html-pages in module + * This is usefull for mass upload and pdf-files + * because lam can walk trough all pages itself and do some + * error checkings */ - function proccess_attributes($post) { - // Get Domain SID from name - $sambaDomains = $_SESSION[$_SESSION[$this->base]->ldap]->search_domains($_SESSION[$_SESSION[$this->base]->config]->get_domainSuffix()); - for ($i=0; $iname) { - $SID = $sambaDomains[$i]->SID; - $RIDbase = $sambaDomain[$i]->RIDbase; - } - - // Load attributes - $this->attributes['displayName'][0] = $post['form_sambaGroupMapping_displayName']; - $this->attributes['sambaGroupType'][0] = 2; - - $rids = array_keys($this->rids); - $wrid = false; - for ($i=0; $iattributes['sambaSID'][0] = $SID."-".$this->rids[$rids[$i]]; - // Do a check if special grou pis unique - if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($SID."-".$this->rids[$rids[$i]], 'sambaSID', 'group')) - $errors[] = array('ERROR', _('Special Group'),sprintf( _('There can be only one group %s.'), $rids[$i])); - } - } - if (!$wrid) $this->attributes['sambaSID'][0] = $SID."-".($_SESSION[$this->base]->module['posixGroup']->attributes['gidNumber'][0]*2)+$RIDbase+1; - - - - // Return error-messages - if (is_array($errors)) return $errors; - return 0; + function pages() { + return array('attributes'); } + /* This function returns all ldap attributes + * which are part of sambaGroupMapping and returns + * also their values. + */ + function get_attributes() { + return $this->attributes; + } /* This function loads all attributes into the object * $attr is an array as it's retured from ldap_get_attributes @@ -169,8 +151,6 @@ class sambaGroupMapping { 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, @@ -199,13 +179,42 @@ class sambaGroupMapping { return $return; } + function delete_attributes($post) { + $return = array(); + return $return; + } - /* This function returns all ldap attributes - * which are part of sambaGroupMapping and returns - * also their values. + /* Write variables into object and do some regexp checks */ - function get_attributes() { - return $this->attributes; + function proccess_attributes($post) { + // Get Domain SID from name + $sambaDomains = $_SESSION[$_SESSION[$this->base]->ldap]->search_domains($_SESSION[$_SESSION[$this->base]->config]->get_domainSuffix()); + for ($i=0; $iname) { + $SID = $sambaDomains[$i]->SID; + $RIDbase = $sambaDomain[$i]->RIDbase; + } + + // Load attributes + $this->attributes['displayName'][0] = $post['displayName']; + $this->attributes['sambaGroupType'][0] = 2; + + $rids = array_keys($this->rids); + $wrid = false; + for ($i=0; $iattributes['sambaSID'][0] = $SID."-".$this->rids[$rids[$i]]; + // Do a check if special grou pis unique + if ($_SESSION[$_SESSION[$this->base]->cache]->in_cache($SID."-".$this->rids[$rids[$i]], 'sambaSID', 'group')) + $errors[] = array('ERROR', _('Special Group'),sprintf( _('There can be only one group %s.'), $rids[$i]), 'sambaSID'); + } + } + if (!$wrid) $this->attributes['sambaSID'][0] = $SID."-".($_SESSION[$this->base]->module['posixGroup']->attributes['gidNumber'][0]*2)+$RIDbase+1; + // Return error-messages + if (is_array($errors)) return $errors; + return 0; } /* This function will create the html-page @@ -228,12 +237,12 @@ class sambaGroupMapping { 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 "
" . _("Display name") . "attributes['displayName'][0]."\">attributes['displayName'][0]."\">" . _('Help') . "
" . _('Special group') . "
" . _('Domain') . "'. - ''. - ''. - ''. - ''. - ''. - ''; + echo ''. + ''. + ''. + ''. + ''. + ''. + ''; echo "\n\n"; echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo "\n"; echo "\n"; @@ -430,31 +443,31 @@ class sambaSamAccount { } 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() . "\">sambaLMPassword() . "\">
" . _('Repeat password') . "sambaLMPassword(); echo "\">
" . _('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') . "
" . _('User must change password') . "
" . _('Account is deactivated') . "attributes['sambaAcctFlags'][0], "D")) echo " checked "; echo ">" . _('Help') . "
" . _('Home drive') . "
" . _('Home path') . "attributes['sambaHomePath'][0] . "\">attributes['sambaHomePath'][0] . "\">" . _('Help') . "
" . _('Profile path') . "attributes['sambaProfilePath'][0] . "\">attributes['sambaProfilePath'][0] . "\">" . _('Help') . "
" . _('Logon script') . "attributes['sambaLogonScript'][0] . "\">attributes['sambaLogonScript'][0] . "\">" . _('Help') . "
" . _('Samba workstations') . "" . _('Help') . "
" . _('Windows group') . "
" . _('Special user') . "
" . _('Domain') . "
\n"; } if ($_SESSION[$this->base]->type=='host') { - echo ''; + 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 "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "
" . _('Reset password') . "
" . _('Domain') . "base]->type."edit-bright\" size=15 multiple>\n"; + echo "\n"; } echo ""; + echo ""; echo " "; - echo "\">

"; + echo "\">

"; echo ""._('Help')."		"; echo "
base]->type."edit-bright\">base]->type."edit-bright\">"; @@ -628,24 +645,20 @@ class sambaSamAccount { echo "\n"; // Display all workstations without these the user is allowed to login if (count($availableUserWorkstations)!=0) { - echo "base]->type."edit-bright\">\n"; foreach ($availableUserWorkstations as $temp) echo "\n"; echo "\n"; } echo "
\n"; } - } - - - ?> diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc index c96065f2..d8eafedf 100644 --- a/lam/lib/modules/shadowAccount.inc +++ b/lam/lib/modules/shadowAccount.inc @@ -66,7 +66,6 @@ class shadowAccount { // Add Array with all attributes and type $this->attributes = $_SESSION[$this->base]->get_module_attributes('shadowAccount'); $_SESSION[$this->base]->add_attributes ('shadowAccount'); - $this->alias = _('shadowAccount'); // Make references to attributes which already esists in ldap $newattributes = array_keys($this->attributes); $module = array_keys($_SESSION[$this->base]->module); @@ -79,11 +78,8 @@ class shadowAccount { } // Variables - // Alias Name. This name is shown in the menu instead of shadowAccount - 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 @@ -91,38 +87,37 @@ class shadowAccount { */ var $orig; + function get_alias() { + return _('shadowAccount'); + } + /* This function returns a list with all required modules */ - function dependencies() { - return array('posixAccount'); + function get_dependencies($scope) { + if ($scope=='user') return array('require' => array('inetOrgPerson'), 'conflict' => array() ); + return -1; } function module_ready() { return true; } - /* Write variables into object and do some regexp checks + /* This function returns a list of all html-pages in module + * This is usefull for mass upload and pdf-files + * because lam can walk trough all pages itself and do some + * error checkings */ - function proccess_attributes($post) { - // Load attributes - $this->attributes['shadowMin'][0] = $post['form_shadowAccount_shadowMin']; - $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] = 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.')); - if ( !ereg('^([0-9]*)$', $this->attributes['shadowMax'][0])) $errors[] = array('ERROR', _('Password maxage'), _('Password maxage must be are natural number.')); - if ( !ereg('^(([-][1])|([0-9]*))$', $this->attributes['shadowInactive'][0])) - $errors[] = array('ERROR', _('Password Expire'), _('Password expire must be are natural number or -1.')); - if ( !ereg('^([0-9]*)$', $this->attributes['shadowWarning'][0])) $errors[] = array('ERROR', _('Password warn'), _('Password warn must be are natural number.')); - - if (is_array($errors)) return $errors; - return 0; + function pages() { + return array('attributes'); } + /* This function returns all ldap attributes + * which are part of shadowAccount and returns + * also their values. + */ + function get_attributes() { + return $this->attributes; + } /* This function loads all attributes into the object * $attr is an array as it's retured from ldap_get_attributes @@ -148,7 +143,6 @@ class shadowAccount { $this->orig = $this->attributes; } - /* 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, @@ -163,17 +157,33 @@ class shadowAccount { // Set shadowLastchange manual. if (($_SESSION[$this->base]->module['posixAccount']->orig['userPassword'][0] != $_SESSION[$this->base]->module['posixAccount']->attributes['userPassword'][0] && $_SESSION[$this->base]->module['posixAccount']->userPassword()!='') || $_SESSION[$this->base]->module['posixAccount']->userPassword_no) $return[$_SESSION[$this->base]->dn]['modify']['shadowLastChange'] = array(intval(time()/3600/24)); - return $return; } + function delete_attributes($post) { + $return = array(); + return $return; + } - /* This function returns all ldap attributes - * which are part of shadowAccount and returns - * also their values. + /* Write variables into object and do some regexp checks */ - function get_attributes() { - return $this->attributes; + function proccess_attributes($post) { + // Load attributes + $this->attributes['shadowMin'][0] = $post['shadowMin']; + $this->attributes['shadowMax'][0] = $post['shadowMax']; + $this->attributes['shadowWarning'][0] = $post['shadowWarning']; + $this->attributes['shadowInactive'][0] = $post['shadowInactive']; + $this->attributes['shadowExpire'][0] = intval(mktime(10, 0, 0, $post['shadowExpire_mon'], + $post['shadowExpire_day'], $post['shadowExpire_yea'])/3600/24); + + if ( !ereg('^([0-9])*$', $this->attributes['shadowMin'][0])) $errors[] = array('ERROR', _('Password minage'), _('Password minage must be are natural number.'), 'shadowMin'); + if ( $this->attributes['shadowMin'][0] > $this->attributes['shadowMax'][0] ) $errors[] = array('ERROR', _('Password maxage'), _('Password maxage must bigger as Password Minage.'), 'shadowMin'); + if ( !ereg('^([0-9]*)$', $this->attributes['shadowMax'][0])) $errors[] = array('ERROR', _('Password maxage'), _('Password maxage must be are natural number.'), 'shadowMax'); + if ( !ereg('^(([-][1])|([0-9]*))$', $this->attributes['shadowInactive'][0])) + $errors[] = array('ERROR', _('Password Expire'), _('Password expire must be are natural number or -1.'), 'shadowInactive'); + if ( !ereg('^([0-9]*)$', $this->attributes['shadowWarning'][0])) $errors[] = array('ERROR', _('Password warn'), _('Password warn must be are natural number.'), 'shadowWarning'); + if (is_array($errors)) return $errors; + return 0; } /* This function will create the html-page @@ -185,37 +195,37 @@ class shadowAccount { $date = getdate ($this->attributes['shadowExpire'][0]*3600*24); 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 "\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 "
" . _('Password warn') . "attributes['shadowWarning'][0] . "\">attributes['shadowWarning'][0] . "\">" . _('Help') . "
" . _('Password Expire') . "attributes['shadowInactive'][0] . "\">attributes['shadowInactive'][0] . "\">" . _('Help') . "
" . _('Maximum password age') . "attributes['shadowMax'][0] . "\">attributes['shadowMax'][0] . "\">" . _('Help') . "
" . _('Minimum password age') . "attributes['shadowMin'][0] . "\">attributes['shadowMin'][0] . "\">" . _('Help') . "
" . _('Expire date') . "\n\n\n\n\n"; - -// Display errir-messages -if (is_array($errors)) - for ($i=0; $iis_samba3()) $samba3domains = $ldap_intern->search_domains($config_intern->get_domainSuffix()); - - // Why this ?? fixme - if ($account_new->smb_flags['N']) echo ''; - - - // Show page info - echo ''; - // Show fieldset with list of all host profiles - if (count($profilelist)!=0) { - echo "
"; - echo _("Load profile"); - echo "\n\n\n\n\n
"; - echo "\n". - ""; - echo _('Help')."
\n
\n"; - } - // Show Fieldset with all host settings - echo "
"; - echo _("General properties"); - echo "\n\n\n\n\n\n\n\n\n\n\n\n'."\n".''."\n".''."\n\n\n
"; - echo _('Host name').'*'; - echo "". - ''. - "". - ''._('Help').''. - "
"; - echo _('UID number'); - echo "". - ''. - "". - ''._('Help').''. - "
"; - echo _('Primary group').'*'; - echo "'. - ''._('Help').''. - "
"; - echo _('Gecos'); - echo ''. - "". - ''._('Help').''. - '
'; - echo _('Password'); - echo ''; - if (isset($account_old)) { - echo ''; - } - echo "
"; - echo _('Domain'); - if ($config_intern->is_samba3()) { - // Get Domain-name from domainlist when using samba 3 - echo ''; - } - else { - // Display a textfield for samba 2.2 - echo ''; - } - echo ''._('Help').'
"; - // Display all allowed host suffixes - echo _('Suffix'); echo ''._('Help').''. - "
"; - echo _('Values with * are required'); - echo "
\n"; - // Show fieldset where to save a new profile - echo "
"; - echo _("Save profile"); - echo "\n\n\n\n\n
"; - echo ''; - echo ''._('Help'); - echo "
\n
"; - // Show fieldset with modify, undo and back-button - echo "
"; - if ($account_old) echo _('Modify'); - else echo _('Create'); - echo "\n"; - echo "\n
"; - // display undo-button when editiing a host - if (isset($account_old)) { - echo "\n"; - } - echo ""; - echo '\n"; - echo "
\n"; - break; - - case 'finish': - // Final Settings - echo ''; - echo "
"._('Note')."\n"; - echo "'."\n".''."\n".''."\n".'
"; - echo '
'; - echo _('Host'); - echo ' '.$account_new->general_username.' '; - if ($account_old) echo ' '._('has been modified').'.'; - else echo ' '._('has been created').'.'; - echo '
'; - if (!$account_old) - { echo ''; } - echo ''. - ''. - ''. - ''. - '
'; ?>