From 0fe3354c61827b55708fc79f81d0edd2ca8b4c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 12 Sep 2012 12:47:18 +0200
Subject: add proper error logging in OC_User database queries

---
 lib/user.php | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index 89dab9f9647..7de2a4b7fe6 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -416,9 +416,16 @@ class OC_User {
 	 * @param string $userid the user to disable
 	 */
 	public static function disableUser($userid) {
-		$query = "INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)";
-		$query = OC_DB::prepare($query);
-		$query->execute(array($userid, 'core', 'enabled', 'false'));
+		$sql = "INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)";
+		$stmt = OC_DB::prepare($sql);
+		if ( ! OC_DB::isError($stmt) ) {
+			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+			if ( OC_DB::isError($result) ) {
+				OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+			}
+		} else {
+			OC_Log::write('OC_User', 'could not disable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+		}
 	}
 
 	/**
@@ -426,9 +433,16 @@ class OC_User {
 	 * @param string $userid
 	 */
 	public static function enableUser($userid) {
-		$query = "DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
-		$query = OC_DB::prepare($query);
-		$query->execute(array($userid, 'core', 'enabled', 'false'));
+		$sql = "DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
+		$stmt = OC_DB::prepare($sql);
+		if ( ! OC_DB::isError($stmt) ) {
+			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+			if ( OC_DB::isError($result) ) {
+				OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+			}
+		} else {
+			OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+		}
 	}
 
 	/**
@@ -437,10 +451,19 @@ class OC_User {
 	 * @return bool
 	 */
 	public static function isEnabled($userid) {
-		$query = "SELECT `userid` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
-		$query = OC_DB::prepare($query);
-		$results = $query->execute(array($userid, 'core', 'enabled', 'false'));
-		return $results->numRows() ? false : true;
+		$sql = "SELECT `userid` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
+		$stmt = OC_DB::prepare($sql);
+		if ( ! OC_DB::isError($stmt) ) {
+			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+			if ( ! OC_DB::isError($result) ) {
+				return $result->numRows() ? false : true;
+			} else {
+				OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+			}
+		} else {
+			OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+		}
+		return false;
 	}
 
 	/**
-- 
cgit v1.2.3