From 1ea3ab8ca18020327776f7cb228f708a957bec8b Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 1 Sep 2004 20:48:29 +0000 Subject: [PATCH] added ldap.inc to includes, removed $ldap variable from accountContainer which is always 'ldap' --- lam/lib/modules.inc | 81 +++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index b49aee15..0d12dfa3 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -37,6 +37,8 @@ include_once("cache.inc"); include_once("account.inc"); /** parent class of account modules */ include_once("baseModule.inc"); +/** access to LDAP server */ +include_once("ldap.inc"); /** * This includes all module files. @@ -355,7 +357,7 @@ function getAvailableScopes() { * @param string $scope account type * @return array column list */ -function get_uploadColumns($scope) { +function getUploadColumns($scope) { // create new account container if needed if (! isset($_SESSION["profile_account_$scope"])) { $_SESSION["profile_account_$scope"] = new accountContainer($scope, "profile_account_$scope"); @@ -386,7 +388,6 @@ class accountContainer { $this->type = $type; $this->base = $base; // Name of variables in session - $this->ldap = 'ldap'; $this->config = 'config'; $this->cache = 'cache'; $this->header2 = 'header'; @@ -616,15 +617,15 @@ class accountContainer { function add_attributes($objectClass) { // loop through every existing objectlass and select current objectClass $line=-1; - for ($i=0; $ildap]->objectClasses) || $i==-1; $i++) { - if (strpos($_SESSION[$this->ldap]->objectClasses[$i], "NAME '$objectClass'")) $line = $i; + for ($i=0; $iobjectClasses) || $i==-1; $i++) { + if (strpos($_SESSION['ldap']->objectClasses[$i], "NAME '$objectClass'")) $line = $i; } // Return error if objectClass isn't found if ($line==-1) trigger_error (sprintf(_("objectClass %s required but not defined in ldap."), $objectClass), E_USER_WARNING); // create array with must-attributes // Get startposition in string - if (strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MUST (')) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MUST (')+6); + if (strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')+6); // Now we have a string with all must-attributes $string = substr($string_withtail, 0, strpos($string_withtail, ')')); $string = trim($string); @@ -637,8 +638,8 @@ class accountContainer { } // create array with may-attributes // Get startposition in string - if (strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MAY (')) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MAY (')+5); + if (strpos($_SESSION['ldap']->objectClasses[$line], 'MAY (')) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'MAY (')+5); // Now we have a string with all must-attributes $string = substr($string_withtail, 0, strpos($string_withtail, ')')); $string = trim($string); @@ -650,19 +651,19 @@ class accountContainer { } } // Get attributes of subclasses - while (strpos($_SESSION[$this->ldap]->objectClasses[$line], "SUP ")) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'SUP ')+4); + while (strpos($_SESSION['ldap']->objectClasses[$line], "SUP ")) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'SUP ')+4); $subclass = substr($string_withtail, 0, strpos($string_withtail, ' ')); // Add account type to object - for ($i=0; $ildap]->objectClasses) || $i==-1; $i++) { - if (strpos($_SESSION[$this->ldap]->objectClasses[$i], "NAME '$subclass'")) $line = $i; + for ($i=0; $iobjectClasses) || $i==-1; $i++) { + if (strpos($_SESSION['ldap']->objectClasses[$i], "NAME '$subclass'")) $line = $i; } // Return error if objectClass isn't found if ($line==-1) trigger_error (sprintf(_("objectClass %s required but not defined in ldap."), $objectClass), E_USER_WARNING); // create array with must-attributes // Get startposition in string - if (strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MUST (')) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MUST (')+6); + if (strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')+6); // Now we have a string with all must-attributes $string = substr($string_withtail, 0, strpos($string_withtail, ')')); $string = trim($string); @@ -675,8 +676,8 @@ class accountContainer { } // create array with may-attributes // Get startposition in string - if (strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MAY (')) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MAY (')+5); + if (strpos($_SESSION['ldap']->objectClasses[$line], 'MAY (')) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'MAY (')+5); // Now we have a string with all must-attributes $string = substr($string_withtail, 0, strpos($string_withtail, ')')); $string = trim($string); @@ -715,13 +716,13 @@ class accountContainer { function get_module_attributes($objectClass) { // Add account type to object $line=-1; - for ($i=0; $ildap]->objectClasses) || $i==-1; $i++) { - if (strpos($_SESSION[$this->ldap]->objectClasses[$i], "NAME '$objectClass'")) $line = $i; + for ($i=0; $iobjectClasses); $i++) { + if (strpos($_SESSION['ldap']->objectClasses[$i], "NAME '$objectClass'")) $line = $i; } // Return error if objectClass isn't found if ($line==-1) trigger_error (sprintf(_("ObjectClass %s required but not defined in ldap."), $objectClass), E_USER_WARNING); - if (strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MUST (')) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MUST (')+6); + if (strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')+6); // Now we have a string with all must-attributes $string = substr($string_withtail, 0, strpos($string_withtail, ')')); $string = trim($string); @@ -732,8 +733,8 @@ class accountContainer { } // create array with may-attributes // Get startposition in string - if (strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MAY (')) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MAY (')+5); + if (strpos($_SESSION['ldap']->objectClasses[$line], 'MAY (')) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'MAY (')+5); // Now we have a string with all must-attributes $string = substr($string_withtail, 0, strpos($string_withtail, ')')); $string = trim($string); @@ -743,19 +744,19 @@ class accountContainer { } } // Get attributes of subclasses - while (strpos($_SESSION[$this->ldap]->objectClasses[$line], "SUP ")) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'SUP ')+4); + while (strpos($_SESSION['ldap']->objectClasses[$line], "SUP ")) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'SUP ')+4); $subclass = substr($string_withtail, 0, strpos($string_withtail, ' ')); // Add account type to object - for ($i=0; $ildap]->objectClasses) || $i==-1; $i++) { - if (strpos($_SESSION[$this->ldap]->objectClasses[$i], "NAME '$subclass'")) $line = $i; + for ($i=0; $iobjectClasses) || $i==-1; $i++) { + if (strpos($_SESSION['ldap']->objectClasses[$i], "NAME '$subclass'")) $line = $i; } // Return error if objectClass isn't found if ($line==-1) trigger_error (sprintf(_("ObjectClass %s required but not defined in ldap."), $subclass), E_USER_WARNING); // create array with must-attributes // Get startposition in string - if (strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MUST (')) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MUST (')+6); + if (strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'MUST (')+6); // Now we have a string with all must-attributes $string = substr($string_withtail, 0, strpos($string_withtail, ')')); $string = trim($string); @@ -766,8 +767,8 @@ class accountContainer { } // create array with may-attributes // Get startposition in string - if (strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MAY (')) { - $string_withtail = substr($_SESSION[$this->ldap]->objectClasses[$line], strpos($_SESSION[$this->ldap]->objectClasses[$line], 'MAY (')+5); + if (strpos($_SESSION['ldap']->objectClasses[$line], 'MAY (')) { + $string_withtail = substr($_SESSION['ldap']->objectClasses[$line], strpos($_SESSION['ldap']->objectClasses[$line], 'MAY (')+5); // Now we have a string with all must-attributes $string = substr($string_withtail, 0, strpos($string_withtail, ')')); $string = trim($string); @@ -867,11 +868,11 @@ class accountContainer { $function = '$modules = $_SESSION[$this->config]->get_'.ucfirst($this->type).'Modules();'; eval ($function); $search = substr($dn, 0, strpos($dn, ',')); - $result = ldap_search($_SESSION[$this->ldap]->server(), $dn, $search); - $entry = ldap_first_entry($_SESSION[$this->ldap]->server(), $result); + $result = ldap_search($_SESSION['ldap']->server(), $dn, $search); + $entry = ldap_first_entry($_SESSION['ldap']->server(), $result); $this->dn = substr($dn, strpos($dn, ',')+1); $this->dn_orig = $dn; - $attr = ldap_get_attributes($_SESSION[$this->ldap]->server(), $entry); + $attr = ldap_get_attributes($_SESSION['ldap']->server(), $entry); foreach ($modules as $module) { if (!isset($this->module[$module])) { @@ -1058,10 +1059,10 @@ class accountContainer { if ($this->dn_orig!='') { // merge attributes together $attr = array_merge_recursive($attributes[$this->dn]['add'], $attributes[$this->dn]['notchanged'], $attributes[$this->dn]['modify']); - $success = @ldap_add($_SESSION[$this->ldap]->server(), $this->dn, $attr); + $success = @ldap_add($_SESSION['ldap']->server(), $this->dn, $attr); if ($success) { $_SESSION[$this->cache]->update_cache($this->$dn, 'add', $attr); - $success = @ldap_delete($_SESSION[$this->ldap]->server(), $this->dn_orig); + $success = @ldap_delete($_SESSION['ldap']->server(), $this->dn_orig); if (!$success) { $errors[] = array('ERROR', 'LDAP', sprintf(_('Was unable to delete dn: %s.'), $this->dn_orig)); $stopprocessing = true; @@ -1077,7 +1078,7 @@ class accountContainer { // create complete new dn else { $attr = array_merge_recursive($attributes[$this->dn]['add'], $attributes[$this->dn]['notchanged'], $attributes[$this->dn]['modify']); - $success = @ldap_add($_SESSION[$this->ldap]->server(), $this->dn, $attributes[$this->dn]['add']); + $success = @ldap_add($_SESSION['ldap']->server(), $this->dn, $attributes[$this->dn]['add']); if (!$success) { $errors[] = array('ERROR', 'LDAP', sprintf(_('Was unable to create dn: %s. This is possible a bug. Please check your ldap logs and send a bug report if it is a possible bug.'), $this->dn)); $stopprocessing = true; @@ -1093,7 +1094,7 @@ class accountContainer { if (!$stopprocessing) { // modify attributes if (isset($attributes[$DNs[$i]]['modify']) && !$stopprocessing) { - $success = @ldap_mod_replace($_SESSION[$this->ldap]->server(), $DNs[$i], $attributes[$DNs[$i]]['modify']); + $success = @ldap_mod_replace($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['modify']); if (!$success) { $errors[] = array('ERROR', 'LDAP', sprintf(_('Was unable to modify attribtues from dn: %s. This is possible a bug. Please check your ldap logs and send a bug report if it is a possible bug.'), $DNs[$i])); $stopprocessing = true; @@ -1103,7 +1104,7 @@ class accountContainer { } // add attributes if (isset($attributes[$DNs[$i]]['add']) && !$stopprocessing) { - $success = @ldap_mod_add($_SESSION[$this->ldap]->server(), $DNs[$i], $attributes[$DNs[$i]]['add']); + $success = @ldap_mod_add($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['add']); if (!$success) { $errors[] = array('ERROR', 'LDAP', sprintf(_('Was unable to add attribtues to dn: %s. This is possible a bug. Please check your ldap logs and send a bug report if it is a possible bug.'), $DNs[$i])); $stopprocessing = true; @@ -1113,7 +1114,7 @@ class accountContainer { } // removce attributes if (isset($attributes[$DNs[$i]]['remove']) && !$stopprocessing) { - $success = @ldap_mod_del($_SESSION[$this->ldap]->server(), $DNs[$i], $attributes[$DNs[$i]]['remove']); + $success = @ldap_mod_del($_SESSION['ldap']->server(), $DNs[$i], $attributes[$DNs[$i]]['remove']); if (!$success) { $errors[] = array('ERROR', 'LDAP', sprintf(_('Was unable to remove attribtues from dn: %s. This is possible a bug. Please check your ldap logs and send a bug report if it is a possible bug.'), $DNs[$i])); $stopprocessing = true; @@ -1145,7 +1146,7 @@ class accountContainer { function lamdaemon($commands) { // get username and password of the current lam-admin - $ldap_q = $_SESSION[$this->ldap]->decrypt_login(); + $ldap_q = $_SESSION['ldap']->decrypt_login(); /* $towrite has the following syntax: * admin-username, admin-password, owner of homedir, 'home', operation='add' * use escapeshellarg to make exec() shell-safe