openrat-cms

commit ea980c1fdd0d401ae5819f677775ccd13e0957ad
parent 35a26fbd7d1a12ae9f667fc572287b49e50d937a
Author: dankert <devnull@localhost>
Date:   Thu, 14 Jan 2010 23:25:49 +0100

Die Methode 'numRows()' aus dem DB-Result nicht mehr verwenden.

Diffstat:
objectClasses/Object.class.php
 | 
24
++++++++++++++++++------
objectClasses/User.class.php
 | 
19
+++++++++----------

2 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/objectClasses/Object.class.php b/objectClasses/Object.class.php
@@ -740,19 +740,31 @@ SQL
 		global $SESS;
 		$db = db_connection();
 
-		$sql = new Sql('SELECT *'.' FROM {t_name}'.' WHERE objectid={objectid}'.'   AND languageid={languageid}');
+		$sql = new Sql( 
+<<<SQL
+SELECT *
+  FROM {t_name}
+ WHERE objectid={objectid}'.'
+   AND languageid={languageid}
+SQL
+		);
 		$sql->setInt('objectid'  , $this->objectid  );
 		$sql->setInt('languageid', $this->languageid);
-		$res = $db->query($sql);
+		$row = $db->getRow( $sql );
 
-		if ($res->numRows() == 0)
+		if ( empty($row) )
 		{
 			// Wenn Name in dieser Sprache nicht vorhanden, dann irgendeinen Namen lesen
-			$sql->setQuery('SELECT *'.' FROM {t_name}'.' WHERE objectid={objectid}'.'   AND name != {blank}');
+			$sql->setQuery( <<<SQL
+ SELECT *
+   FROM {t_name}
+  WHERE objectid={objectid}
+    AND name != {blank}
+SQL
+			);
 			$sql->setString('blank', '');
-			$res = $db->query($sql);
+			$row = $db->query($sql);
 		}
-		$row = $res->fetchRow();
 
 		$this->name = $row['name'];
 		$this->desc = $row['description'];
diff --git a/objectClasses/User.class.php b/objectClasses/User.class.php
@@ -650,35 +650,34 @@ SQL
 		);
 		$sql->setString('name',$this->name);
 	
-		$res_user = $db->query( $sql );
+		$row_user = $db->getRow( $sql );
 
 		$check = false;
 		$authType = $conf['security']['auth']['type']; // Entweder 'ldap', 'authdb', 'http', oder 'database'
 		
-		if	( $res_user->numRows() == 1 )
+		if	( !empty($row_user) )
 		{
 			// Benutzername ist bereits in der Datenbank.
-			$row_user = $res_user->fetchRow();
 			$this->userid  = $row_user['id'];
 			$this->ldap_dn = $row_user['ldap_dn'];
 			$check   = true;
 			$autoAdd = false; // Darf nicht hinzugef�gt werden, da schon vorhanden.
 		}
-		elseif( $res_user->numRows() == 0 && $authType == 'ldap' && $conf['ldap']['search']['add'] )
+		elseif( $authType == 'ldap' && $conf['ldap']['search']['add'] )
 		{
 			// Benutzer noch nicht in der Datenbank vorhanden.
 			// Falls ein LDAP-Account gefunden wird, wird dieser �bernommen.
 			$check   = true;
 			$autoAdd = true;
 		}
-		elseif( $res_user->numRows() == 0 && $authType == 'authdb' && $conf['security']['authdb']['add'] )
+		elseif( $authType == 'authdb' && $conf['security']['authdb']['add'] )
 		{
-			$check = true;
+			$check   = true;
 			$autoAdd = true;
 		}
-		elseif( $res_user->numRows() == 0 && $authType == 'http' && $conf['security']['http']['add'] )
+		elseif( $authType == 'http' && $conf['security']['http']['add'] )
 		{
-			$check = true;
+			$check   = true;
 			$autoAdd = true;
 		}
 
@@ -822,8 +821,8 @@ SQL
 				$sql = new Sql( $conf['security']['authdb']['sql'] );
 				$sql->setString('username',$this->name);
 				$sql->setString('password',$password);
-				$res = $authdb->query($sql);
-				$ok = ($res->numRows() >= 1);
+				$row = $authdb->getRow( $sql );
+				$ok = !empty($row);
 
 				if	( $ok && $autoAdd )
 				{