From f1dda8d92453f2ed4312b1262c71d0ff78526405 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 8 Jul 2007 10:51:01 +0000
Subject: [PATCH] use ->server()

---
 lam/lib/account.inc                         | 2 +-
 lam/lib/export.inc                          | 2 +-
 lam/lib/lists.inc                           | 2 +-
 lam/lib/modules/posixAccount.inc            | 4 ++--
 lam/lib/schema.inc                          | 4 ++--
 lam/templates/delete.php                    | 8 ++++----
 lam/templates/initsuff.php                  | 8 ++++----
 lam/templates/lists/userlink.php            | 4 ++--
 lam/templates/main.php                      | 4 ++--
 lam/templates/massDoUpload.php              | 4 ++--
 lam/templates/tree/add_attr.php             | 2 +-
 lam/templates/tree/add_oclass.php           | 2 +-
 lam/templates/tree/add_oclass_form.php      | 2 +-
 lam/templates/tree/add_value.php            | 2 +-
 lam/templates/tree/create.php               | 2 +-
 lam/templates/tree/creation_template.php    | 2 +-
 lam/templates/tree/delete.php               | 2 +-
 lam/templates/tree/delete_attr.php          | 2 +-
 lam/templates/tree/download_binary_attr.php | 2 +-
 lam/templates/tree/rdelete.php              | 4 ++--
 lam/templates/tree/update.php               | 2 +-
 21 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index 3e33223d..e0aa0ff6 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -293,7 +293,7 @@ function search_domains() {
 		"sambaNextUserRid", "sambaAlgorithmicRidBase");
 	$sr = @ldap_search($_SESSION['ldap']->server(), $suffix, "objectClass=sambaDomain", $attr);
 	if ($sr) {
-		$units = ldap_get_entries($_SESSION['ldap']->server, $sr);
+		$units = ldap_get_entries($_SESSION['ldap']->server(), $sr);
 		// delete count entry
 		unset($units['count']);
 		// extract attributes
diff --git a/lam/lib/export.inc b/lam/lib/export.inc
index f3dc1514..81962360 100755
--- a/lam/lib/export.inc
+++ b/lam/lib/export.inc
@@ -277,7 +277,7 @@ class PlaLdapExporter extends PlaAbstractExporter{
 
     $this->attributes = $attributes;
 
-    $this->ds = $_SESSION['ldap']->server;
+    $this->ds = $_SESSION['ldap']->server();
 
     // get the data to be exported
     if( $this->scope == 'base' )
diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index 94958180..4de091ba 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -708,7 +708,7 @@ class lamList {
 			StatusMessage("WARN", _("LDAP sizelimit exceeded, not all entries are shown."), _("See README.openldap.txt to solve this problem."));
 		}
 		if ($sr) {
-			$info = ldap_get_entries($_SESSION["ldap"]->server, $sr);
+			$info = ldap_get_entries($_SESSION["ldap"]->server(), $sr);
 			ldap_free_result($sr);
 			// delete first array entry which is "count"
 			unset($info['count']);
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index bb0b3ed4..a4fa789f 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -1502,13 +1502,13 @@ class posixAccount extends baseModule {
 		// add users to groups
 		elseif ($temp['counter'] < sizeof($temp['groups'])) {
 			if (isset($temp['dn'][$temp['groups'][$temp['counter']]])) {
-				$success = @ldap_mod_add($_SESSION['ldap']->server, $temp['dn'][$temp['groups'][$temp['counter']]], array('memberUID' => $temp['members'][$temp['groups'][$temp['counter']]]));
+				$success = @ldap_mod_add($_SESSION['ldap']->server(), $temp['dn'][$temp['groups'][$temp['counter']]], array('memberUID' => $temp['members'][$temp['groups'][$temp['counter']]]));
 				$errors = array();
 				if (!$success) {
 					$errors[] = array(
 						"ERROR",
 						_("LAM was unable to modify group memberships for group: %s"),
-						ldap_errno($_SESSION[ldap]->server) . ": " . ldap_error($_SESSION[ldap]->server),
+						ldap_errno($_SESSION['ldap']->server()) . ": " . ldap_error($_SESSION['ldap']->server()),
 						array($temp['groups'][$temp['counter']])
 					);
 				}
diff --git a/lam/lib/schema.inc b/lam/lib/schema.inc
index 92c6aeca..05ccfc9f 100644
--- a/lam/lib/schema.inc
+++ b/lam/lib/schema.inc
@@ -1267,7 +1267,7 @@ class MatchingRuleUse extends SchemaItem
 function _get_schema_dn($dn, $debug=false )
 {
 	if( $debug ) echo "<pre>";
-	$ds = $_SESSION['ldap']->server;
+	$ds = $_SESSION['ldap']->server();
 
 	$search = @ldap_read( $ds, $dn, 'objectClass=*', array( 'subschemaSubentry' ) );
 	if( $debug ) { echo "Search result (ldap_read): "; var_dump( $search ); echo "\n"; }
@@ -1337,7 +1337,7 @@ function _get_raw_schema($schema_to_fetch, $dn='' )
 	// Swith to true to enable verbose output of schema fetching progress
 	$debug = false;
 
-	$ds = $_SESSION['ldap']->server;
+	$ds = $_SESSION['ldap']->server();
 
 	// error checking
 	$schema_to_fetch = strtolower( $schema_to_fetch );
diff --git a/lam/templates/delete.php b/lam/templates/delete.php
index efd79732..fe2ed98c 100644
--- a/lam/templates/delete.php
+++ b/lam/templates/delete.php
@@ -248,9 +248,9 @@ if ($_POST['delete']) {
 */
 function getChildCount($dn) {
 	$return = 0;
-	$sr = @ldap_search($_SESSION['ldap']->server, $dn, 'objectClass=*', array('dn'), 0);
+	$sr = @ldap_search($_SESSION['ldap']->server(), $dn, 'objectClass=*', array('dn'), 0);
 	if ($sr) {
-		$entries = ldap_get_entries($_SESSION['ldap']->server, $sr);
+		$entries = ldap_get_entries($_SESSION['ldap']->server(), $sr);
 		$return = $entries['count'] - 1;
 	}
 	return $return;
@@ -264,9 +264,9 @@ function getChildCount($dn) {
 */
 function deleteDN($dn) {
 	$errors = array();
-	$sr = @ldap_list($_SESSION['ldap']->server, $dn, 'objectClass=*', array('dn'), 0);
+	$sr = @ldap_list($_SESSION['ldap']->server(), $dn, 'objectClass=*', array('dn'), 0);
 	if ($sr) {
-		$entries = ldap_get_entries($_SESSION['ldap']->server, $sr);
+		$entries = ldap_get_entries($_SESSION['ldap']->server(), $sr);
 		for ($i = 0; $i < $entries['count']; $i++) {
 			// delete recursively
 			$subErrors = deleteDN($entries[$i]['dn']);
diff --git a/lam/templates/initsuff.php b/lam/templates/initsuff.php
index 3ecc449c..a44037f9 100644
--- a/lam/templates/initsuff.php
+++ b/lam/templates/initsuff.php
@@ -54,8 +54,8 @@ if ($_POST['add_suff'] || $_POST['cancel']) {
 		// add entries
 		for ($i = 0; $i < sizeof($new_suff); $i++) {
 			// check if entry is already present
-			$info = @ldap_search($_SESSION['ldap']->server, $new_suff[$i], "", array());
-			$res = @ldap_get_entries($_SESSION['ldap']->server, $info);
+			$info = @ldap_search($_SESSION['ldap']->server(), $new_suff[$i], "", array());
+			$res = @ldap_get_entries($_SESSION['ldap']->server(), $info);
 			if ($res) continue;
 			$suff = $new_suff[$i];
 			// generate DN and attributes
@@ -96,8 +96,8 @@ if ($_POST['add_suff'] || $_POST['cancel']) {
 						// create missing entries
 						for ($k = sizeof($subsuffs) - 1; $k >= 0; $k--) {
 							// check if subsuffix is present
-							$info = @ldap_search($_SESSION['ldap']->server, $subsuffs[$k], "", array());
-							$res = @ldap_get_entries($_SESSION['ldap']->server, $info);
+							$info = @ldap_search($_SESSION['ldap']->server(), $subsuffs[$k], "", array());
+							$res = @ldap_get_entries($_SESSION['ldap']->server(), $info);
 							if (!$res) {
 								$suffarray = explode(",", $subsuffs[$k]);
 								$headarray = explode("=", $suffarray[0]);
diff --git a/lam/templates/lists/userlink.php b/lam/templates/lists/userlink.php
index 7dbf1e43..944519f9 100644
--- a/lam/templates/lists/userlink.php
+++ b/lam/templates/lists/userlink.php
@@ -77,9 +77,9 @@ else {
 function search_username($name) {
 	$filter = "(uid=$name)";
 	$attrs = array();
-	$sr = @ldap_search($_SESSION['ldap']->server, $_SESSION['config']->get_Suffix('user'), $filter, $attrs);
+	$sr = @ldap_search($_SESSION['ldap']->server(), $_SESSION['config']->get_Suffix('user'), $filter, $attrs);
 	if ($sr) {
-		$info = ldap_get_entries($_SESSION['ldap']->server, $sr);
+		$info = ldap_get_entries($_SESSION['ldap']->server(), $sr);
 		// return only first DN entry
 		$ret = $info[0]["dn"];
 		ldap_free_result($sr);
diff --git a/lam/templates/main.php b/lam/templates/main.php
index 65eae595..820808b9 100644
--- a/lam/templates/main.php
+++ b/lam/templates/main.php
@@ -49,8 +49,8 @@ $new_suffs = array();
 // get list of active types
 $types = $_SESSION['config']->get_ActiveTypes();
 for ($i = 0; $i < sizeof($types); $i++) {
-	$info = @ldap_search($_SESSION['ldap']->server, $conf->get_Suffix($types[$i]), "(objectClass=*)", array('objectClass'));
-	$res = @ldap_get_entries($_SESSION['ldap']->server, $info);
+	$info = @ldap_search($_SESSION['ldap']->server(), $conf->get_Suffix($types[$i]), "(objectClass=*)", array('objectClass'));
+	$res = @ldap_get_entries($_SESSION['ldap']->server(), $info);
 	if (!$res && !in_array($conf->get_Suffix($types[$i]), $new_suffs)) $new_suffs[] = $conf->get_Suffix($types[$i]);
 }
 
diff --git a/lam/templates/massDoUpload.php b/lam/templates/massDoUpload.php
index f1a03a6c..e043eb48 100644
--- a/lam/templates/massDoUpload.php
+++ b/lam/templates/massDoUpload.php
@@ -80,12 +80,12 @@ if (($_SESSION['mass_counter'] < sizeof($accounts)) || !isset($_SESSION['mass_po
 		$attrs = $accounts[$_SESSION['mass_counter']];
 		$dn = $attrs['dn'];
 		unset($attrs['dn']);
-		$success = @ldap_add($_SESSION['ldap']->server, $dn, $attrs);
+		$success = @ldap_add($_SESSION['ldap']->server(), $dn, $attrs);
 		if (!$success) {
 			$errorMessage = array(
 				"ERROR",
 				_("LAM was unable to create account %s! An LDAP error occured."),
-				ldap_errno($_SESSION[ldap]->server) . ": " . ldap_error($_SESSION[ldap]->server),
+				ldap_errno($_SESSION['ldap']->server()) . ": " . ldap_error($_SESSION['ldap']->server()),
 				array($_SESSION['mass_counter']));
 			$_SESSION['mass_errors'][] = $errorMessage;
 			$_SESSION['mass_failed'][] = $_SESSION['mass_counter'];
diff --git a/lam/templates/tree/add_attr.php b/lam/templates/tree/add_attr.php
index 7f43d65f..183bc029 100644
--- a/lam/templates/tree/add_attr.php
+++ b/lam/templates/tree/add_attr.php
@@ -115,7 +115,7 @@ elseif (0 == strcasecmp( $attr , 'sambantpassword' )) {
 	$val = ntPassword($val);
 }
 
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 $new_entry = array( $attr => $val );
 $result = @ldap_mod_add( $ds, $dn, $new_entry );
 
diff --git a/lam/templates/tree/add_oclass.php b/lam/templates/tree/add_oclass.php
index 1f9a9a5a..6bce3b10 100644
--- a/lam/templates/tree/add_oclass.php
+++ b/lam/templates/tree/add_oclass.php
@@ -77,7 +77,7 @@ if( is_array( $new_attrs ) && count( $new_attrs ) > 0 )
 		$new_entry[ $attr ] = $val;
 	}
 
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 $add_res = @ldap_mod_add( $ds, $dn, $new_entry );
 
 if( ! $add_res )
diff --git a/lam/templates/tree/add_oclass_form.php b/lam/templates/tree/add_oclass_form.php
index 44f387a0..1881c314 100644
--- a/lam/templates/tree/add_oclass_form.php
+++ b/lam/templates/tree/add_oclass_form.php
@@ -148,7 +148,7 @@ if( count( $needed_attrs ) > 0 )
 }
 else
 {
-	$ds = $_SESSION['ldap']->server;
+	$ds = $_SESSION['ldap']->server();
 	$add_res = @ldap_mod_add( $ds, $dn, array( 'objectClass' => $new_oclass ) );
 	if( ! $add_res ) {
 		echo $_SESSION['header'];
diff --git a/lam/templates/tree/add_value.php b/lam/templates/tree/add_value.php
index ca3e7956..e1ca3e8b 100644
--- a/lam/templates/tree/add_value.php
+++ b/lam/templates/tree/add_value.php
@@ -68,7 +68,7 @@ $encoded_attr = rawurlencode( $attr );
 $new_value = $_POST['new_value'];
 $is_binary_val = isset( $_POST['binary'] ) ? true : false;
 
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 
 // special case for binary attributes: 
 // we must go read the data from the file.
diff --git a/lam/templates/tree/create.php b/lam/templates/tree/create.php
index e4c7bea4..76c311ea 100644
--- a/lam/templates/tree/create.php
+++ b/lam/templates/tree/create.php
@@ -126,7 +126,7 @@ foreach( $new_entry as $attr => $vals ) {
 
 //echo "<pre>"; var_dump( $new_dn );print_r( $new_entry ); echo "</pre>";
 
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 
 // Check the user-defined custom call back first
 $add_result = @ldap_add( $ds, $new_dn, $new_entry );
diff --git a/lam/templates/tree/creation_template.php b/lam/templates/tree/creation_template.php
index 1ae86065..4ad40ba7 100644
--- a/lam/templates/tree/creation_template.php
+++ b/lam/templates/tree/creation_template.php
@@ -71,7 +71,7 @@ if( $template == 'custom' ) {
 
 $template_id = $template;
 $template = isset( $templates[$template] ) ? $templates[$template_id] : null;
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 
 echo $_SESSION['header'];
 
diff --git a/lam/templates/tree/delete.php b/lam/templates/tree/delete.php
index 1e37259e..ae72a423 100644
--- a/lam/templates/tree/delete.php
+++ b/lam/templates/tree/delete.php
@@ -66,7 +66,7 @@ echo "<body>";
 $dn = $_POST['dn'];
 $encoded_dn = rawurlencode( $dn );
 
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 
 $del_result = @ldap_delete( $ds, $dn );
 
diff --git a/lam/templates/tree/delete_attr.php b/lam/templates/tree/delete_attr.php
index d7319138..9095f5b5 100644
--- a/lam/templates/tree/delete_attr.php
+++ b/lam/templates/tree/delete_attr.php
@@ -62,7 +62,7 @@ $attr = $_POST['attr'];
 
 $update_array = array();
 $update_array[$attr] = array();
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 $res = @ldap_modify( $ds, $dn, $update_array );
 if( $res ) {
 	$redirect_url = "edit.php?dn=$encoded_dn";
diff --git a/lam/templates/tree/download_binary_attr.php b/lam/templates/tree/download_binary_attr.php
index efccd236..be80ba9a 100644
--- a/lam/templates/tree/download_binary_attr.php
+++ b/lam/templates/tree/download_binary_attr.php
@@ -60,7 +60,7 @@ $attr = $_GET['attr'];
 // if there are multiple values in this attribute, which one do you want to see?
 $value_num = isset( $_GET['value_num'] ) ? $_GET['value_num'] : 0;
 
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 
 $search = @ldap_read( $ds, $dn, "(objectClass=*)", array($attr));
 if( ! $search ) {
diff --git a/lam/templates/tree/rdelete.php b/lam/templates/tree/rdelete.php
index 2d5cc397..d68315ca 100644
--- a/lam/templates/tree/rdelete.php
+++ b/lam/templates/tree/rdelete.php
@@ -65,7 +65,7 @@ $dn = $_POST['dn'];
 $encoded_dn = rawurlencode( $dn );
 $rdn = get_rdn( $dn );
 
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 
 echo "<body>\n";
 echo "<h3 class=\"tree_title\">" . sprintf( _('Deleting %s'), htmlspecialchars($rdn) ) . "</h3>\n";
@@ -127,7 +127,7 @@ function pla_rdelete( $dn )
 {
 	$children = get_container_contents( $dn );
 	global $ds;
-	$ds = $_SESSION['ldap']->server;
+	$ds = $_SESSION['ldap']->server();
 
 	if( ! is_array( $children ) || count( $children ) == 0 ) {
 		echo "<nobr>" . sprintf( _('Deleting %s'), htmlspecialchars( $dn ) ) . "...";
diff --git a/lam/templates/tree/update.php b/lam/templates/tree/update.php
index 6b32665c..9be7d656 100644
--- a/lam/templates/tree/update.php
+++ b/lam/templates/tree/update.php
@@ -86,7 +86,7 @@ foreach( $update_array as $attr => $val )
 		}
 	}
 			
-$ds = $_SESSION['ldap']->server;
+$ds = $_SESSION['ldap']->server();
 $res = @ldap_modify( $ds, $dn, $update_array );
 if( $res )
 {