removed duplicate schema parsing

lam/lib/ldap.inc

@@ -64,15 +64,6 @@ class Ldap{
 	/** LDAP password used for bind */
 	private $password;
 
-	/** Array with all objectClass strings from the LDAP server */
-	private $objectClasses;
-	/** Array with all attribute strings from the LDAP server */
-	private $attributes;
-
-	// Capabilities of the LDAP server
-	/** Host attribute in inetOrgPerson */
-	public $supports_unix_hosts = false;
-
 	/** Random number (changes on every page request) */
 	private $rand;
 
@@ -121,16 +112,6 @@ class Ldap{
 			$bind = @ldap_bind($this->server, $user, $passwd);
 			if ($bind) {
 				$return = ldap_errno($this->server);
-				// read objectClasses from server and update capabilities if needed
-				if (! $this->objectClasses) {
-					$this->updateClasses();
-					$this->updateCapabilities();
-					// update schema
-					get_schema_objectclasses();
-					get_schema_attributes();
-					get_schema_matching_rules();
-					get_schema_syntaxes();
-				}
 				// return success number
 				return $return;
 			}
@@ -177,118 +158,6 @@ class Ldap{
 		return $ret;
 	}
 
-	/** Reads the array of objectClasses from the LDAP server */
-	function updateClasses() {
-		// read from default cn
-		$sr = @ldap_read($this->server, 'cn=subschema', '(objectClass=*)', array('objectclasses'));
-		// if default was not correct check different cn
-		if (!$sr) $sr = @ldap_read($this->server, 'cn=schema', '(objectClass=*)', array('objectclasses'));
-		if ($sr) {
-			// get search result and save it
-			$info = @ldap_get_entries($this->server,$sr);
-			if ($info) {
-				$this->objectClasses = $info[0]['objectclasses'];
-				if (is_array($this->objectClasses)) {
-					array_shift($this->objectClasses);
-				}
-				else {
-					$this->objectClasses = array();
-				}
-			}
-		}
-		// if search failed save empty result
-		else $this->objectClasses = array();
-
-		// read from default cn
-		$sr = @ldap_read($this->server, 'cn=subschema', '(objectClass=*)', array('attributetypes'));
-		// if default was not correct check different cn
-		if (!$sr) $sr = @ldap_read($this->server, 'cn=schema', '(objectClass=*)', array('attributetypes'));
-		if ($sr) {
-			// get search result and save it
-			$info = @ldap_get_entries($this->server,$sr);
-			if ($info) {
-				$attributes = $info[0]['attributetypes'];
-				if (is_array($attributes)) {
-					array_shift($attributes);
-				}
-				else {
-					$attributes = array();
-				}
-			}
-		}
-		else {
-			$attributes = array();
-		}
-		// build Attribute list
-		for ($i=0; $i<count($attributes); $i++) {
-			// TODO: is it save to use while in lower code?
-			// find oid of attribute
-			$start = 0;
-			while (!get_preg($attributes[$i][$start], 'digit')) $start++;
-			$end = $start;
-			while ($attributes[$i][$end+1] != ' ') $end++; // find limiter
-			$values['oid'] = substr($attributes[$i], $start, $end-$start);
-			// find DESC of attribute			
-			$start = strpos($attributes[$i], 'DESC');
-			if ($start) {
-				$start = $start + 6;
-				$end = $start;
-				while ($attributes[$i][$end]!='\'') $end++; // find limiter
-				$values['DESC'] = substr($attributes[$i], $start, $end-$start);
-			}
-			// find SYNTAX of attribute			
-			$start = strpos($attributes[$i], 'SYNTAX');
-			if ($start) {
-				$start = $start + 7;
-				$end = $start;
-				while ($attributes[$i][$end]!='{' && $attributes[$i][$end]!=' ') $end++; // find limiter
-				$values['SYNTAX'] = substr($attributes[$i], $start, $end-$start);
-			}
-			// find length of attribute			
-			$start = strpos($attributes[$i], 'SYNTAX');
-			if ($start) {
-				$start = $start + 8;
-				while ($attributes[$i][$start]!='{' && $attributes[$i][$start]!=' ') $start++; // find limiter
-				if ($attributes[$i][$start]=='{') {
-					$end = $start;
-					while ($attributes[$i][$end]!='}') $end++; // find limiter
-					$values['LENGTH'] = substr($attributes[$i], $start, $end-$start);
-				}
-			}
-			$start = strpos($attributes[$i], "NAME") + 6;
-			if ($attributes[$i][$start-1]=='(') {
-				// found multiple possible names
-				$start = $start +2;
-				$count = 1;
-				// repeat until all names are found
-				while ($attributes[$i][$start-1]!=')') {
-					// search for end
-					$end = $start;
-					while ($attributes[$i][$end]!='\'') $end++; // find limiter
-					$count++;
-					$name = substr($attributes[$i], $start, $end-$start);
-					$this->attributes[$name] = $values;
-					$start = $end + 3;
-				}
-			}
-			else {
-				$end = $start;
-				while ($attributes[$i][$end]!='\'') $end++;
-				$name = substr($attributes[$i], $start, $end-$start);
-				$this->attributes[$name] = $values;
-			}
-		}
-	}
-
-	/** Updates the capabilities values (var $supports_*) */
-	function updateCapabilities() {
-		for ($i = 0; $i < sizeof($this->objectClasses); $i++) {
-			$line = $this->objectClasses[$i];
-			// search keywords
-			if (strpos($line, "NAME 'inetOrgPerson'") && strpos($line, " host ")) $this->supports_unix_hosts = true;
-		}
-	}
-
 	/**
 	* Returns the LDAP connection handle
 	*
@@ -307,8 +176,7 @@ class Ldap{
 	function __sleep() {
 		$this->close();
 		// define which attributes to save
-		return array("conf", "username", "password", "objectClasses", "attributes",
+		return array("conf", "username", "password", "rand");
-			"supports_unix_hosts", "rand");
 	}
 
 	/** Reconnects to LDAP server when deserialized */

lam/lib/modules/inetOrgPerson.inc

@@ -37,6 +37,33 @@ $Id$
 */
 class inetOrgPerson extends baseModule {
 	
+	private static $unix_hosts_supported = 'unknown';
+	
+	/**
+	 * Returns if the host attribute is supported by the schema.
+	 *
+	 * @return boolean true if supported
+	 */
+	private function supportUnixHosts() {
+		if (inetOrgPerson::$unix_hosts_supported === 'unknown') {
+			inetOrgPerson::$unix_hosts_supported = 'no';
+			get_schema_objectclasses();
+			$classes = get_cached_schema('objectclasses');
+			if (isset($classes['inetorgperson'])) {
+				$mayAttrs = $classes['inetorgperson']->getMayAttrs();
+				if (is_array($mayAttrs)) {
+					for ($i = 0; $i < sizeof($mayAttrs); $i++) {
+						if ($mayAttrs[$i]->getName() === 'host') {
+							inetOrgPerson::$unix_hosts_supported = 'yes';
+							break;
+						}
+					}
+				}
+			}
+		}
+		return (inetOrgPerson::$unix_hosts_supported === 'yes');
+	}
+
 	/**
 	* This function fills the message array.
 	**/
@@ -271,7 +298,8 @@ class inetOrgPerson extends baseModule {
 			}
 		}
 		// Unix workstations for upload
-		if ($_SESSION['loggedIn'] && $_SESSION['ldap']->supports_unix_hosts) {
+		if ($_SESSION['loggedIn']) {
+			if ($this->supportUnixHosts()) {
 				$return['upload_columns'][] = array(
 					'name' => 'inetOrgPerson_hosts',
 					'description' => _('Unix workstations'),
@@ -279,6 +307,7 @@ class inetOrgPerson extends baseModule {
 					'example' => _('pc01,pc02')
 					);
 			}
+		}
 		// available PDF fields
 		$return['PDF_fields'] = array(
 			'description',
@@ -550,7 +579,7 @@ class inetOrgPerson extends baseModule {
 		}
 
 		// handle host-attribute in on epice because it's not set by default
-		if ($_SESSION['ldap']->supports_unix_hosts) {
+		if ($this->supportUnixHosts()) {
 			$host = $_POST['host'];
 			if (!get_preg($host,'unixhost')) {
 				$errors[] = $this->messages['host'][0];
@@ -760,7 +789,7 @@ class inetOrgPerson extends baseModule {
 			array('kind' => 'input', 'name' => 'businessCategory', 'type' => 'text', 'size' => '30',
 				'maxlength' => '255', 'value' => $businessCategory),
 			array('kind' => 'help', 'value' => 'businessCategory'));
-		if ($_SESSION['ldap']->supports_unix_hosts) {
+		if ($this->supportUnixHosts()) {
 			$hostvalue = "";
 			if (is_array($this->attributes['host'])) {
 				$hostvalue .= implode(",", $this->attributes['host']);