From 104ae753c947516e21dbb08fdfb85010e2c30300 Mon Sep 17 00:00:00 2001
From: Karl Burkhart <burkhart@technikum-wien.at>
Date: Mon, 6 May 2013 10:08:41 +0000
Subject: [PATCH] =?UTF-8?q?getUidFromCardNumber=20schaut=20die=20Kartennum?=
 =?UTF-8?q?mer=20nicht=20mehr=20im=20LDAP=20nach=20sondern=20=C3=BCber=20d?=
 =?UTF-8?q?ie=20DB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Infoterminal wurde überarbeitet damit es in den Kartenverlängerungsautomaten integriert werden kann
---
 include/functions.inc.php | 104 +++-----------------------------------
 1 file changed, 7 insertions(+), 97 deletions(-)

diff --git a/include/functions.inc.php b/include/functions.inc.php
index 3176b4c3b..a55820092 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -20,6 +20,7 @@
  *          Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once('betriebsmittelperson.class.php'); 
 
 // Auth: Benutzer des Webportals
 function get_uid()
@@ -413,103 +414,12 @@ function checkalias($alias)
  */
 function getUidFromCardNumber($number)
 {
-	if($connect=@ldap_connect(LDAP_SERVER))
-	{
-	    // bind to ldap connection
-	    if(($bind=@ldap_bind($connect)) == false)
-	    {
-			//print "bind:__FAILED__<br>\n";
-			return false;
-	    }
+    $betriebsmittel = new betriebsmittelperson(); 
+    if($betriebsmittel->getKartenzuordnung($number))
+        return $betriebsmittel->uid; 
+    else
+        return false; 
 
-	    // search for card id
-	    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
-	    {
-			//print "failure: search in LDAP-tree failed<br>";
-			return false;
-	    }
-
-	    // wurde keiner gefunden, versuche mit 0 davor
-		if (ldap_count_entries($connect, $res_id) == 0)
-	    {
-	    	$number = "0".$number; 
-	    	 // search for card id 0[Number]
-		    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
-		    {
-				//print "failure: search in LDAP-tree failed<br>";
-				return false;
-		    }
-		    if (ldap_count_entries($connect, $res_id) == 0)
-		    {
-			    $number = "0".$number; 
-		    	 // search for card id 00[Number]
-			    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
-			    {
-					//print "failure: search in LDAP-tree failed<br>";
-					return false;
-			    }
-			    if (ldap_count_entries($connect, $res_id) == 0)
-			    {
-				    $number = "0".$number; 
-			    	// search for card id 000[Number]
-				    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
-				    {
-						//print "failure: search in LDAP-tree failed<br>";
-						return false;
-				    }
-				    if (ldap_count_entries($connect, $res_id) == 0)
-			    	{
-			    		$number = "0".$number; 
-
-				    	// search for card id 0000[Number]
-					    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
-					    {
-							//print "failure: search in LDAP-tree failed<br>";
-							return false;
-					    }
-				    	if (ldap_count_entries($connect, $res_id) == 0)
-				    	{
-				    		$number = "0".$number; 
-					    	// search for card id 00000[Number]
-						    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
-						    {
-								//print "failure: search in LDAP-tree failed<br>";
-								return false;
-						    }
-					    	if (ldap_count_entries($connect, $res_id) == 0)
-					    	{
-					    		$number = "0".$number; 
-								// search for card id 000000[Number]
-							    if (($res_id = ldap_search($connect, LDAP_BASE_DN, LDAP_CARD_NUMBER."=$number")) == false)
-							    {
-									//print "failure: search in LDAP-tree failed<br>";
-									return false;
-							    }
-							    if (ldap_count_entries($connect, $res_id) == 0)
-						    	{
-						    		//print "failure: no person found<br>"; 
-						    		return false; 
-						    	}
-					    	}
-				    	}
-			    	}
-			    }
-		    }
-	    }
-		$info = ldap_get_entries($connect, $res_id); 
-		// gibt uid der Person zurück --> [0] für erste Person 
-		return($info[0]['uid'][0]); 
-	    
-	    @ldap_close($connect);
-		return true;
-	}
-	else
-	{
-		// no conection to ldap server
-		echo "no connection to '$ldap_server'<br>\n";
-	}
-	@ldap_close($connect);
-	return(false);
 }
 
 // ****************************************************************
@@ -547,7 +457,7 @@ function checkldapuser($username,$password)
 
 		if (( $user_dn = ldap_get_dn($connect, $entry_id)) == false)
 		{
-			print "failure: user-dn coulnd't be fetched<br>\n";
+			print "failure: user-dn coulnd't be fetched<br>\n";          
 			return false;
 	    }