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, 261 insertions, 261 deletions

diff --git a/services/tag2tagservice.php b/services/tag2tagservice.php
index f24ef79..8c97606 100644
--- a/services/tag2tagservice.php
+++ b/services/tag2tagservice.php
@@ -1,297 +1,297 @@
 <?php
 class Tag2TagService {
-    var $db;
-    var $tablename;
-
-    function &getInstance(&$db) {
-        static $instance;
-        if (!isset($instance))
-            $instance =& new Tag2TagService($db);
-        return $instance;
-    }
-
-    function Tag2TagService(&$db) {
-        $this->db =& $db;
-        $this->tablename = $GLOBALS['tableprefix'] .'tags2tags';
-    }
-
-    function addLinkedTags($tag1, $tag2, $relationType, $uId) {
-	if($tag1 == $tag2 || strlen($tag1) == 0 || strlen($tag2) == 0
-		|| ($relationType != ">" && $relationType != "=")
-		|| ($this->existsLinkedTags($tag1, $tag2, $relationType, $uId))) {
-		return false;
-	}
-	$values = array('tag1' => $tag1, 'tag2' => $tag2, 'relationType'=> $relationType, 'uId'=> $uId);
-	$query = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values);
-//die($query);
-        if (!($dbresult =& $this->db->sql_query($query))) {
-        	$this->db->sql_transaction('rollback');
-        	message_die(GENERAL_ERROR, 'Could not attach tag to tag', '', __LINE__, __FILE__, $query, $this->db);
-                return false;
-        }
-	$this->db->sql_transaction('commit');
-
-	// Update stats
-	$tsts =& ServiceFactory::getServiceInstance('TagStatService');
-	$tsts->updateStat($tag1, $relationType, $uId);
-
-	return true;
-    }
-
-    // Return the target linked tags. If inverseRelation is true, return the source linked tags.
-    function getLinkedTags($tag, $relationType, $uId = null, $inverseRelation = false, $stopList = array()) {
-	// Set up the SQL query.
-	if($inverseRelation) {
-	    $queriedTag = "tag1";
-	    $givenTag = "tag2";
-	} else {
-	    $queriedTag = "tag2";
-	    $givenTag = "tag1";	
+	var $db;
+	var $tablename;
+
+	function &getInstance(&$db) {
+		static $instance;
+		if (!isset($instance))
+		$instance =& new Tag2TagService($db);
+		return $instance;
 	}
 
-        $query = "SELECT DISTINCT ". $queriedTag ." as 'tag'";
-	$query.= " FROM `". $this->getTableName() ."`";
-	$query.= " WHERE 1=1";
-	if($tag !=null) {
-	    $query.= " AND ". $givenTag ." = '". $tag ."'";
-	}
-	if($relationType) {
-	    $query.= " AND relationType = '". $relationType ."'";
-	}
-	if($uId != null) {
-	    $query.= " AND uId = '".$uId."'";
-	}
-//die($query);
-        if (! ($dbresult =& $this->db->sql_query($query)) ){
-            message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db);
-            return false;
-        }
-
-        $rowset = $this->db->sql_fetchrowset($dbresult);
-	$output = array();
-	foreach($rowset as $row) {
-	    if(!in_array($row['tag'], $stopList)) {
-
-	        $output[] = $row['tag'];
-	    }
+	function Tag2TagService(&$db) {
+		$this->db =& $db;
+		$this->tablename = $GLOBALS['tableprefix'] .'tags2tags';
 	}
 
-	//bijective case for '='
-	if($relationType == '=' && $inverseRelation == false) {
-	    //$stopList[] = $tag;
-	    $bijectiveOutput = $this->getLinkedTags($tag, $relationType, $uId, true, $stopList);
-	    $output = array_merge($output, $bijectiveOutput);
-	    //$output = array_unique($output); // remove duplication	    
+	function addLinkedTags($tag1, $tag2, $relationType, $uId) {
+		if($tag1 == $tag2 || strlen($tag1) == 0 || strlen($tag2) == 0
+		|| ($relationType != ">" && $relationType != "=")
+		|| ($this->existsLinkedTags($tag1, $tag2, $relationType, $uId))) {
+			return false;
+		}
+		$values = array('tag1' => $tag1, 'tag2' => $tag2, 'relationType'=> $relationType, 'uId'=> $uId);
+		$query = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values);
+		//die($query);
+		if (!($dbresult =& $this->db->sql_query($query))) {
+			$this->db->sql_transaction('rollback');
+			message_die(GENERAL_ERROR, 'Could not attach tag to tag', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+		$this->db->sql_transaction('commit');
+
+		// Update stats
+		$tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$tsts->updateStat($tag1, $relationType, $uId);
+
+		return true;
 	}
 
-	return $output;
-    }
+	// Return the target linked tags. If inverseRelation is true, return the source linked tags.
+	function getLinkedTags($tag, $relationType, $uId = null, $inverseRelation = false, $stopList = array()) {
+		// Set up the SQL query.
+		if($inverseRelation) {
+			$queriedTag = "tag1";
+			$givenTag = "tag2";
+		} else {
+			$queriedTag = "tag2";
+			$givenTag = "tag1";
+		}
+
+		$query = "SELECT DISTINCT ". $queriedTag ." as 'tag'";
+		$query.= " FROM `". $this->getTableName() ."`";
+		$query.= " WHERE 1=1";
+		if($tag !=null) {
+			$query.= " AND ". $givenTag ." = '". $tag ."'";
+		}
+		if($relationType) {
+			$query.= " AND relationType = '". $relationType ."'";
+		}
+		if($uId != null) {
+			$query.= " AND uId = '".$uId."'";
+		}
+		//die($query);
+		if (! ($dbresult =& $this->db->sql_query($query)) ){
+			message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
 
-    /* TODO: clean the outputs to obtain homogenous ones*/
-    function getAllLinkedTags($tag1, $relationType, $uId, $asFlatList=true, $stopList=array()) {
-	$asFlatList = true; //we disable the tree list parameter for the moment
+		$rowset = $this->db->sql_fetchrowset($dbresult);
+		$output = array();
+		foreach($rowset as $row) {
+			if(!in_array($row['tag'], $stopList)) {
 
-	if(in_array($tag1, $stopList)) {
-	    return array();
-	}
+				$output[] = $row['tag'];
+			}
+		}
 
-	$stopList[] = $tag1;
-	$linkedTags = $this->getLinkedTags($tag1, $relationType, $uId, false, $stopList);
+		//bijective case for '='
+		if($relationType == '=' && $inverseRelation == false) {
+			//$stopList[] = $tag;
+			$bijectiveOutput = $this->getLinkedTags($tag, $relationType, $uId, true, $stopList);
+			$output = array_merge($output, $bijectiveOutput);
+			//$output = array_unique($output); // remove duplication
+		}
 
-	if($relationType != '=') {
-	    $linkedTags = array_merge($linkedTags, $this->getLinkedTags($tag1, '=', $uId, false, $stopList));
+		return $output;
 	}
 
-	if(count($linkedTags) == 0) {
-	    return array();
-	} else {
-	    $output = array();
-	    if($asFlatList == true) {
-		//$output[$tag1] = $tag1;
-	    } else {
-		$output = array('node'=>$tag1);
-	    }
-
-	    foreach($linkedTags as $linkedTag) {
-		 $allLinkedTags = $this->getAllLinkedTags($linkedTag, $relationType, $uId, $asFlatList, $stopList);
-
-		if($asFlatList == true) {
-		    $output[] = $linkedTag;
-		    if(is_array($allLinkedTags)) {
-			
-			$output = array_merge($output, $allLinkedTags);
-		    } else {
-		        $output[] = $allLinkedTags;
-		    }
+	/* TODO: clean the outputs to obtain homogenous ones*/
+	function getAllLinkedTags($tag1, $relationType, $uId, $asFlatList=true, $stopList=array()) {
+		$asFlatList = true; //we disable the tree list parameter for the moment
+
+		if(in_array($tag1, $stopList) || $tag1 == '') {
+			return array();
+		}
+
+		$stopList[] = $tag1;
+		$linkedTags = $this->getLinkedTags($tag1, $relationType, $uId, false, $stopList);
+
+		if($relationType != '=') {
+			$linkedTags = array_merge($linkedTags, $this->getLinkedTags($tag1, '=', $uId, false, $stopList));
+		}
+
+		if(count($linkedTags) == 0) {
+			return array();
 		} else {
-		    $output[] = $allLinkedTags;
+			$output = array();
+			if($asFlatList == true) {
+				//$output[$tag1] = $tag1;
+			} else {
+				$output = array('node'=>$tag1);
+			}
+
+			foreach($linkedTags as $linkedTag) {
+				$allLinkedTags = $this->getAllLinkedTags($linkedTag, $relationType, $uId, $asFlatList, $stopList);
+
+				if($asFlatList == true) {
+					$output[] = $linkedTag;
+					if(is_array($allLinkedTags)) {
+							
+						$output = array_merge($output, $allLinkedTags);
+					} else {
+						$output[] = $allLinkedTags;
+					}
+				} else {
+					$output[] = $allLinkedTags;
+				}
+			}
 		}
-	    }
-	}
-	//$output = array_unique($output); // remove duplication
-	return $output;
-    }
-
-    function getOrphewTags($relationType, $uId = 0, $limit = null, $orderBy = null) {
-	$query = "SELECT DISTINCT tts.tag1 as tag";
-	$query.= " FROM `". $this->getTableName() ."` tts";
-	if($orderBy != null) {
-	   $tsts =& ServiceFactory::getServiceInstance('TagStatService');
-	   $query.= ", ".$tsts->getTableName() ." tsts";
-	}
-	$query.= " WHERE tts.tag1 <> ALL";
-	$query.= " (SELECT DISTINCT tag2 FROM `". $this->getTableName() ."`";
-	$query.= " WHERE relationType = '".$relationType."'";
-	if($uId > 0) {
-	    $query.= " AND uId = '".$uId."'";
-	}
-	$query.= ")";
-	if($uId > 0) {
-	    $query.= " AND tts.uId = '".$uId."'";
+		//$output = array_unique($output); // remove duplication
+		return $output;
 	}
 
-	switch($orderBy) {
+	function getOrphewTags($relationType, $uId = 0, $limit = null, $orderBy = null) {
+		$query = "SELECT DISTINCT tts.tag1 as tag";
+		$query.= " FROM `". $this->getTableName() ."` tts";
+		if($orderBy != null) {
+			$tsts =& ServiceFactory::getServiceInstance('TagStatService');
+			$query.= ", ".$tsts->getTableName() ." tsts";
+		}
+		$query.= " WHERE tts.tag1 <> ALL";
+		$query.= " (SELECT DISTINCT tag2 FROM `". $this->getTableName() ."`";
+		$query.= " WHERE relationType = '".$relationType."'";
+		if($uId > 0) {
+			$query.= " AND uId = '".$uId."'";
+		}
+		$query.= ")";
+		if($uId > 0) {
+			$query.= " AND tts.uId = '".$uId."'";
+		}
+
+		switch($orderBy) {
 	  case "nb":
-	    $query.= " AND tts.tag1 = tsts.tag1";
-	    $query.= " AND tsts.relationType = '".$relationType."'";
-	    if($uId > 0) {
-	        $query.= " AND tsts.uId = ".$uId;
-	    }
-	    $query.= " ORDER BY tsts.nb DESC";
-	    break;
+	  	$query.= " AND tts.tag1 = tsts.tag1";
+	  	$query.= " AND tsts.relationType = '".$relationType."'";
+	  	if($uId > 0) {
+	  		$query.= " AND tsts.uId = ".$uId;
+	  	}
+	  	$query.= " ORDER BY tsts.nb DESC";
+	  	break;
 	  case "depth": // by nb of descendants
-	    $query.= " AND tts.tag1 = tsts.tag1";
-	    $query.= " AND tsts.relationType = '".$relationType."'";
-	    if($uId > 0) {
-	        $query.= " AND tsts.uId = ".$uId;
-	    }
-	    $query.= " ORDER BY tsts.depth DESC";
-	    break;
+	  	$query.= " AND tts.tag1 = tsts.tag1";
+	  	$query.= " AND tsts.relationType = '".$relationType."'";
+	  	if($uId > 0) {
+	  		$query.= " AND tsts.uId = ".$uId;
+	  	}
+	  	$query.= " ORDER BY tsts.depth DESC";
+	  	break;
 	  case "nbupdate":
-	    $query.= " AND tts.tag1 = tsts.tag1";
-	    $query.= " AND tsts.relationType = '".$relationType."'";
-	    if($uId > 0) {
-	        $query.= " AND tsts.uId = ".$uId;
-	    }
-	    $query.= " ORDER BY tsts.nbupdate DESC";
-	    break;
+	  	$query.= " AND tts.tag1 = tsts.tag1";
+	  	$query.= " AND tsts.relationType = '".$relationType."'";
+	  	if($uId > 0) {
+	  		$query.= " AND tsts.uId = ".$uId;
+	  	}
+	  	$query.= " ORDER BY tsts.nbupdate DESC";
+	  	break;
+		}
+
+		if($limit != null) {
+			$query.= " LIMIT 0,".$limit;
+		}
+
+		if (! ($dbresult =& $this->db->sql_query($query)) ){
+			message_die(GENERAL_ERROR, 'Could not get linked tags', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+		return $this->db->sql_fetchrowset($dbresult);
+	}
+
+	function getMenuTags($uId) {
+		if(strlen($GLOBALS['menuTag']) < 1) {
+			return array();
+		} else {
+			// we don't use the getAllLinkedTags function in order to improve performance
+			$query = "SELECT tag2 as 'tag', COUNT(tag2) as 'count'";
+			$query.= " FROM `". $this->getTableName() ."`";
+			$query.= " WHERE tag1 = '".$GLOBALS['menuTag']."'";
+			$query.= " AND relationType = '>'";
+			if($uId > 0) {
+				$query.= " AND uId = '".$uId."'";
+			}
+			$query.= " GROUP BY tag2";
+			$query.= " ORDER BY count DESC";
+			$query.= " LIMIT 0, ".$GLOBALS['maxSizeMenuBlock'];
+
+			if (! ($dbresult =& $this->db->sql_query($query)) ){
+				message_die(GENERAL_ERROR, 'Could not get linked tags', '', __LINE__, __FILE__, $query, $this->db);
+				return false;
+			}
+			return $this->db->sql_fetchrowset($dbresult);
+		}
 	}
 
-	if($limit != null) {
-	    $query.= " LIMIT 0,".$limit;
+
+	function existsLinkedTags($tag1, $tag2, $relationType, $uId) {
+		$query = "SELECT tag1, tag2, relationType, uId FROM `". $this->getTableName() ."`";
+		$query.= " WHERE tag1 = '" .$tag1 ."'";
+		$query.= " AND tag2 = '".$tag2."'";
+		$query.= " AND relationType = '". $relationType ."'";
+		$query.= " AND uId = '".$uId."'";
+
+		return $this->db->sql_numrows($this->db->sql_query($query)) > 0;
+	}
+
+	function getLinks($uId) {
+		$query = "SELECT tag1, tag2, relationType, uId FROM `". $this->getTableName() ."`";
+		$query.= " WHERE 1=1";
+		if($uId > 0) {
+			$query.= " AND uId = '".$uId."'";
+		}
+
+		return $this->db->sql_fetchrowset($this->db->sql_query($query));
 	}
 
-        if (! ($dbresult =& $this->db->sql_query($query)) ){
-            message_die(GENERAL_ERROR, 'Could not get linked tags', '', __LINE__, __FILE__, $query, $this->db);
-            return false;
-        }
-        return $this->db->sql_fetchrowset($dbresult);
-    }
-
-    function getMenuTags($uId) {
-	if(strlen($GLOBALS['menuTag']) < 1) {
-	    return array();
-	} else {
-	    // we don't use the getAllLinkedTags function in order to improve performance
-	    $query = "SELECT tag2 as 'tag', COUNT(tag2) as 'count'";
-	    $query.= " FROM `". $this->getTableName() ."`";
-	    $query.= " WHERE tag1 = '".$GLOBALS['menuTag']."'";
-	    $query.= " AND relationType = '>'";
-	    if($uId > 0) {
-	    	$query.= " AND uId = '".$uId."'";
-	    }
-	    $query.= " GROUP BY tag2";
-	    $query.= " ORDER BY count DESC";
-	    $query.= " LIMIT 0, ".$GLOBALS['maxSizeMenuBlock'];
-
-            if (! ($dbresult =& $this->db->sql_query($query)) ){
-            	message_die(GENERAL_ERROR, 'Could not get linked tags', '', __LINE__, __FILE__, $query, $this->db);
-            	return false;
-            }
-        return $this->db->sql_fetchrowset($dbresult);
+	function removeLinkedTags($tag1, $tag2, $relationType, $uId) {
+		if(($tag1 != '' && $tag1 == $tag2) ||
+		($relationType != ">" && $relationType != "=" && $relationType != "") ||
+		($tag1 == '' && $tag2 == '' && $relationType == '' && $uId == '')) {
+			return false;
+		}
+		$query = 'DELETE FROM '. $this->getTableName();
+		$query.= ' WHERE 1=1';
+		$query.= strlen($tag1)>0 ? ' AND tag1 = "'. $tag1 .'"' : '';
+		$query.= strlen($tag2)>0 ? ' AND tag2 = "'. $tag2 .'"' : '';
+		$query.= strlen($relationType)>0 ? ' AND relationType = "'. $relationType .'"' : '';
+		$query.= strlen($uId)>0 ? ' AND uId = "'. $uId .'"' : '';
+
+		if (!($dbresult =& $this->db->sql_query($query))) {
+			message_die(GENERAL_ERROR, 'Could not remove tag relation', '', __LINE__, __FILE__, $query, $this->db);
+			return false;
+		}
+
+		// Update stats
+		$tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$tsts->updateStat($tag1, $relationType, $uId);
+
+		return true;
 	}
-    }
 
+	function renameTag($uId, $oldName, $newName) {
+		$query = 'UPDATE `'. $this->getTableName() .'`';
+		$query.= ' SET tag1="'.$newName.'"';
+		$query.= ' WHERE tag1="'.$oldName.'"';
+		$query.= ' AND uId="'.$uId.'"';
+		$this->db->sql_query($query);
+
+		$query = 'UPDATE `'. $this->getTableName() .'`';
+		$query.= ' SET tag2="'.$newName.'"';
+		$query.= ' WHERE tag2="'.$oldName.'"';
+		$query.= ' AND uId="'.$uId.'"';
+		$this->db->sql_query($query);
 
-    function existsLinkedTags($tag1, $tag2, $relationType, $uId) {
-	$query = "SELECT tag1, tag2, relationType, uId FROM `". $this->getTableName() ."`";
-	$query.= " WHERE tag1 = '" .$tag1 ."'";
-	$query.= " AND tag2 = '".$tag2."'";
-	$query.= " AND relationType = '". $relationType ."'";
-	$query.= " AND uId = '".$uId."'";
+		// Update stats
+		$tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$tsts->updateStat($oldName, '=', $uId);
+		$tsts->updateStat($oldName, '>', $uId);
+		$tsts->updateStat($newName, '=', $uId);
+		$tsts->updateStat($newName, '>', $uId);
 
-        return $this->db->sql_numrows($this->db->sql_query($query)) > 0;
-    }
+		return true;
 
-    function getLinks($uId) {
-	$query = "SELECT tag1, tag2, relationType, uId FROM `". $this->getTableName() ."`";
-	$query.= " WHERE 1=1";
-	if($uId > 0) {
-	    $query.= " AND uId = '".$uId."'";
 	}
 
-        return $this->db->sql_fetchrowset($this->db->sql_query($query));
-    }
+	function deleteAll() {
+		$query = 'TRUNCATE TABLE `'. $this->getTableName() .'`';
+		$this->db->sql_query($query);
 
-    function removeLinkedTags($tag1, $tag2, $relationType, $uId) {
-	if(($tag1 != '' && $tag1 == $tag2) ||
-	    ($relationType != ">" && $relationType != "=" && $relationType != "") ||
-	    ($tag1 == '' && $tag2 == '' && $relationType == '' && $uId == '')) {
-		return false;
+		$tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$tsts->deleteAll();
 	}
-	$query = 'DELETE FROM '. $this->getTableName();
-	$query.= ' WHERE 1=1';
-	$query.= strlen($tag1)>0 ? ' AND tag1 = "'. $tag1 .'"' : '';
-	$query.= strlen($tag2)>0 ? ' AND tag2 = "'. $tag2 .'"' : '';
-	$query.= strlen($relationType)>0 ? ' AND relationType = "'. $relationType .'"' : '';
-	$query.= strlen($uId)>0 ? ' AND uId = "'. $uId .'"' : '';
-
-        if (!($dbresult =& $this->db->sql_query($query))) {
-            message_die(GENERAL_ERROR, 'Could not remove tag relation', '', __LINE__, __FILE__, $query, $this->db);
-            return false;
-        }
-
-	// Update stats
-	$tsts =& ServiceFactory::getServiceInstance('TagStatService');
-	$tsts->updateStat($tag1, $relationType, $uId);
-
-        return true;
-    }
-
-    function renameTag($uId, $oldName, $newName) {
-	$query = 'UPDATE `'. $this->getTableName() .'`';
-	$query.= ' SET tag1="'.$newName.'"';
-	$query.= ' WHERE tag1="'.$oldName.'"';
-	$query.= ' AND uId="'.$uId.'"';
-	$this->db->sql_query($query);
-
-	$query = 'UPDATE `'. $this->getTableName() .'`';
-	$query.= ' SET tag2="'.$newName.'"';
-	$query.= ' WHERE tag2="'.$oldName.'"';
-	$query.= ' AND uId="'.$uId.'"';
-	$this->db->sql_query($query);
-
-	// Update stats
-	$tsts =& ServiceFactory::getServiceInstance('TagStatService');
-	$tsts->updateStat($oldName, '=', $uId);
-	$tsts->updateStat($oldName, '>', $uId);
-	$tsts->updateStat($newName, '=', $uId);
-	$tsts->updateStat($newName, '>', $uId);
-
-	return true;
-
-    }
-
-    function deleteAll() {
-	$query = 'TRUNCATE TABLE `'. $this->getTableName() .'`';
-	$this->db->sql_query($query);
-
-	$tsts =& ServiceFactory::getServiceInstance('TagStatService');
-	$tsts->deleteAll();
-    }
-
-    // Properties
-    function getTableName()       { return $this->tablename; }
-    function setTableName($value) { $this->tablename = $value; }
+
+	// Properties
+	function getTableName()       { return $this->tablename; }
+	function setTableName($value) { $this->tablename = $value; }
 }
 ?>