Major refactoring: transform user into object, define parameters used into each file, ...

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@173 b3834d28-1941-0410-a4f8-b48e95affb8f

1 files changed, 140 insertions, 140 deletions

diff --git a/services/commondescriptionservice.php b/services/commondescriptionservice.php
index 6c591a9..0a96f74 100644
--- a/services/commondescriptionservice.php
+++ b/services/commondescriptionservice.php
@@ -1,153 +1,153 @@
 <?php
 class CommonDescriptionService {
-    var $db;
-    var $tablename;
-
-    function &getInstance(&$db) {
-        static $instance;
-        if (!isset($instance))
-            $instance =& new CommonDescriptionService($db);
-        return $instance;
-    }
-
-    function CommonDescriptionService(&$db) {
-        $this->db =& $db;
-        $this->tablename = $GLOBALS['tableprefix'] .'commondescription';
-    }
-
-    function addTagDescription($tag, $desc, $uId, $time) {
-	// Check if no modification
-	$lastDesc = $this->getLastTagDescription($tag);
-	if($lastDesc['cdDescription'] == $desc) {
-	    return true;
+	var $db;
+	var $tablename;
+
+	function &getInstance(&$db) {
+		static $instance;
+		if (!isset($instance))
+		$instance =& new CommonDescriptionService($db);
+		return $instance;
 	}
 
-	// If modification
-	$datetime = gmdate('Y-m-d H:i:s', $time);
-	$values = array('tag'=>$tag, 'cdDescription'=>$desc, 'uId'=>$uId, 'cdDatetime'=>$datetime);
-	$sql = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values);
+	function CommonDescriptionService(&$db) {
+		$this->db =& $db;
+		$this->tablename = $GLOBALS['tableprefix'] .'commondescription';
+	}
 
-	if (!($dbresult =& $this->db->sql_query($sql))) {
-	    $this->db->sql_transaction('rollback');
-	    message_die(GENERAL_ERROR, 'Could not add tag description', '', __LINE__, __FILE__, $sql, $this->db);
-	    return false;
+	function addTagDescription($tag, $desc, $uId, $time) {
+		// Check if no modification
+		$lastDesc = $this->getLastTagDescription($tag);
+		if($lastDesc['cdDescription'] == $desc) {
+			return true;
+		}
+
+		// If modification
+		$datetime = gmdate('Y-m-d H:i:s', $time);
+		$values = array('tag'=>$tag, 'cdDescription'=>$desc, 'uId'=>$uId, 'cdDatetime'=>$datetime);
+		$sql = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values);
+
+		if (!($dbresult =& $this->db->sql_query($sql))) {
+			$this->db->sql_transaction('rollback');
+			message_die(GENERAL_ERROR, 'Could not add tag description', '', __LINE__, __FILE__, $sql, $this->db);
+			return false;
+		}
+
+		return true;
 	}
 
-	return true;
-    }
-
-    function getLastTagDescription($tag) {
-	$query = "SELECT *";
-	$query.= " FROM `". $this->getTableName() ."`";
-	$query.= " WHERE tag='".$tag."'";
-	$query.= " ORDER BY cdDatetime DESC";
-
-        if (!($dbresult = & $this->db->sql_query_limit($query, 1, 0))) {
-            message_die(GENERAL_ERROR, 'Could not get tag description', '', __LINE__, __FILE__, $query, $this->db);
-            return false;
-        }
-
-        if ($row =& $this->db->sql_fetchrow($dbresult)) {
-            return $row;
-        } else {
-            return false;
-        }
-    }
-
-    function getAllTagsDescription($tag) {
-	$query = "SELECT *";
-	$query.= " FROM `". $this->getTableName() ."`";
-	$query.= " WHERE tag='".$tag."'";
-	$query.= " ORDER BY cdDatetime DESC";
-
-        if (!($dbresult = & $this->db->sql_query($query))) {
-            message_die(GENERAL_ERROR, 'Could not get tag descriptions', '', __LINE__, __FILE__, $query, $this->db);
-            return false;
-        }
-
-        return $this->db->sql_fetchrowset($dbresult);
-
-    }
-
-    function getDescriptionById($cdId) {
-	$query = "SELECT *";
-	$query.= " FROM `". $this->getTableName() ."`";
-	$query.= " WHERE cdId='".$cdId."'";
-
-        if (!($dbresult = & $this->db->sql_query($query))) {
-            message_die(GENERAL_ERROR, 'Could not get tag descriptions', '', __LINE__, __FILE__, $query, $this->db);
-            return false;
-        }
-
-        if ($row =& $this->db->sql_fetchrow($dbresult)) {
-            return $row;
-        } else {
-            return false;
-        }
-
-    }
-
-    function addBookmarkDescription($bHash, $title, $desc, $uId, $time) {
-	// Check if no modification
-	$lastDesc = $this->getLastBookmarkDescription($bHash);
-	if($lastDesc['cdTitle'] == $title && $lastDesc['cdDescription'] == $desc) {
-	    return true;
+	function getLastTagDescription($tag) {
+		$query = "SELECT *";
+		$query.= " FROM `". $this->getTableName() ."`";
+		$query.= " WHERE tag='".$tag."'";
+		$query.= " ORDER BY cdDatetime DESC";
+
+		if (!($dbresult = & $this->db->sql_query_limit($query, 1, 0))) {
+			message_die(GENERAL_ERROR, 'Could not get tag description', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		if ($row =& $this->db->sql_fetchrow($dbresult)) {
+			return $row;
+		} else {
+			return false;
+		}
 	}
 
-	// If modification
-	$datetime = gmdate('Y-m-d H:i:s', $time);
-	$values = array('bHash'=>$bHash, 'cdTitle'=>$title, 'cdDescription'=>$desc, 'uId'=>$uId, 'cdDatetime'=>$datetime);
-	$sql = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values);
+	function getAllTagsDescription($tag) {
+		$query = "SELECT *";
+		$query.= " FROM `". $this->getTableName() ."`";
+		$query.= " WHERE tag='".$tag."'";
+		$query.= " ORDER BY cdDatetime DESC";
+
+		if (!($dbresult = & $this->db->sql_query($query))) {
+			message_die(GENERAL_ERROR, 'Could not get tag descriptions', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		return $this->db->sql_fetchrowset($dbresult);
 
-	if (!($dbresult =& $this->db->sql_query($sql))) {
-	    $this->db->sql_transaction('rollback');
-	    message_die(GENERAL_ERROR, 'Could not add bookmark description', '', __LINE__, __FILE__, $sql, $this->db);
-	    return false;
 	}
-	return true;
-    }
-
-    function getLastBookmarkDescription($bHash) {
-	$query = "SELECT *";
-	$query.= " FROM `". $this->getTableName() ."`";
-	$query.= " WHERE bHash='".$bHash."'";
-	$query.= " ORDER BY cdDatetime DESC";
-
-        if (!($dbresult = & $this->db->sql_query_limit($query, 1, 0))) {
-            message_die(GENERAL_ERROR, 'Could not get bookmark description', '', __LINE__, __FILE__, $query, $this->db);
-            return false;
-        }
-
-        if ($row =& $this->db->sql_fetchrow($dbresult)) {
-            return $row;
-        } else {
-            return false;
-        }
-    }
-
-    function getAllBookmarksDescription($bHash) {
-	$query = "SELECT *";
-	$query.= " FROM `". $this->getTableName() ."`";
-	$query.= " WHERE bHash='".$bHash."'";
-	$query.= " ORDER BY cdDatetime DESC";
-
-        if (!($dbresult = & $this->db->sql_query($query))) {
-            message_die(GENERAL_ERROR, 'Could not get bookmark descriptions', '', __LINE__, __FILE__, $query, $this->db);
-            return false;
-        }
-
-        return $this->db->sql_fetchrowset($dbresult);
-
-    }
-
-
-    function deleteAll() {
-	$query = 'TRUNCATE TABLE `'. $this->getTableName() .'`';
-	$this->db->sql_query($query);
-    }
-
-    // Properties
-    function getTableName()       { return $this->tablename; }
-    function setTableName($value) { $this->tablename = $value; }
+
+	function getDescriptionById($cdId) {
+		$query = "SELECT *";
+		$query.= " FROM `". $this->getTableName() ."`";
+		$query.= " WHERE cdId='".$cdId."'";
+
+		if (!($dbresult = & $this->db->sql_query($query))) {
+			message_die(GENERAL_ERROR, 'Could not get tag descriptions', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		if ($row =& $this->db->sql_fetchrow($dbresult)) {
+			return $row;
+		} else {
+			return false;
+		}
+
+	}
+
+	function addBookmarkDescription($bHash, $title, $desc, $uId, $time) {
+		// Check if no modification
+		$lastDesc = $this->getLastBookmarkDescription($bHash);
+		if($lastDesc['cdTitle'] == $title && $lastDesc['cdDescription'] == $desc) {
+			return true;
+		}
+
+		// If modification
+		$datetime = gmdate('Y-m-d H:i:s', $time);
+		$values = array('bHash'=>$bHash, 'cdTitle'=>$title, 'cdDescription'=>$desc, 'uId'=>$uId, 'cdDatetime'=>$datetime);
+		$sql = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values);
+
+		if (!($dbresult =& $this->db->sql_query($sql))) {
+			$this->db->sql_transaction('rollback');
+			message_die(GENERAL_ERROR, 'Could not add bookmark description', '', __LINE__, __FILE__, $sql, $this->db);
+			return false;
+		}
+		return true;
+	}
+
+	function getLastBookmarkDescription($bHash) {
+		$query = "SELECT *";
+		$query.= " FROM `". $this->getTableName() ."`";
+		$query.= " WHERE bHash='".$bHash."'";
+		$query.= " ORDER BY cdDatetime DESC";
+
+		if (!($dbresult = & $this->db->sql_query_limit($query, 1, 0))) {
+			message_die(GENERAL_ERROR, 'Could not get bookmark description', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		if ($row =& $this->db->sql_fetchrow($dbresult)) {
+			return $row;
+		} else {
+			return false;
+		}
+	}
+
+	function getAllBookmarksDescription($bHash) {
+		$query = "SELECT *";
+		$query.= " FROM `". $this->getTableName() ."`";
+		$query.= " WHERE bHash='".$bHash."'";
+		$query.= " ORDER BY cdDatetime DESC";
+
+		if (!($dbresult = & $this->db->sql_query($query))) {
+			message_die(GENERAL_ERROR, 'Could not get bookmark descriptions', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		return $this->db->sql_fetchrowset($dbresult);
+
+	}
+
+
+	function deleteAll() {
+		$query = 'TRUNCATE TABLE `'. $this->getTableName() .'`';
+		$this->db->sql_query($query);
+	}
+
+	// Properties
+	function getTableName()       { return $this->tablename; }
+	function setTableName($value) { $this->tablename = $value; }
 }
 ?>