[Fusionforge-commits] r7651 - trunk/gforge/common/search

Roland Mas lolando at libremir.placard.fr.eu.org
Thu May 14 20:25:29 CEST 2009


Author: lolando
Date: 2009-05-14 20:25:29 +0200 (Thu, 14 May 2009)
New Revision: 7651

Modified:
   trunk/gforge/common/search/DocsSearchQuery.class.php
   trunk/gforge/common/search/ForumsSearchQuery.class.php
   trunk/gforge/common/search/FrsSearchQuery.class.php
   trunk/gforge/common/search/SearchQuery.class.php
   trunk/gforge/common/search/TasksSearchQuery.class.php
   trunk/gforge/common/search/TrackersSearchQuery.class.php
Log:
db_query_params transition: started work on common/search

Modified: trunk/gforge/common/search/DocsSearchQuery.class.php
===================================================================
--- trunk/gforge/common/search/DocsSearchQuery.class.php	2009-05-14 18:25:21 UTC (rev 7650)
+++ trunk/gforge/common/search/DocsSearchQuery.class.php	2009-05-14 18:25:29 UTC (rev 7651)
@@ -3,6 +3,7 @@
  * FusionForge search engine
  *
  * Copyright 2004, Dominik Haas
+ * Copyright 2009, Roland Mas
  *
  * This file is part of FusionForge.
  *
@@ -146,7 +147,7 @@
 	 */
 	function getSections($groupId, $showNonPublic=false) {
 		$sql = 'SELECT doc_groups.doc_group, doc_groups.groupname FROM doc_groups, doc_data'
-			.' WHERE doc_groups.doc_group = doc_data.doc_group AND doc_groups.group_id = '.$groupId;
+			.' WHERE doc_groups.doc_group = doc_data.doc_group AND doc_groups.group_id=$1';
 		if ($showNonPublic) {
 			$sql .= ' AND doc_data.stateid IN (1, 4, 5)';
 		} else {
@@ -155,7 +156,8 @@
 		$sql .= ' ORDER BY groupname';
 		
 		$sections = array();
-		$res = db_query($sql);
+		$res = db_query_params ($sql,
+					array ($groupId));
 		while($data = db_fetch_array($res)) {
 			$sections[$data['doc_group']] = $data['groupname'];
 		}

Modified: trunk/gforge/common/search/ForumsSearchQuery.class.php
===================================================================
--- trunk/gforge/common/search/ForumsSearchQuery.class.php	2009-05-14 18:25:21 UTC (rev 7650)
+++ trunk/gforge/common/search/ForumsSearchQuery.class.php	2009-05-14 18:25:29 UTC (rev 7651)
@@ -3,6 +3,7 @@
  * FusionForge search engine
  *
  * Copyright 2004, Dominik Haas
+ * Copyright 2009, Roland Mas
  *
  * This file is part of FusionForge.
  *
@@ -135,14 +136,15 @@
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
 	function getSections($groupId, $showNonPublic=false) {
-		$sql = 'SELECT group_forum_id, forum_name FROM forum_group_list WHERE group_id = '.$groupId.' AND is_public <> 9';
+		$sql = 'SELECT group_forum_id, forum_name FROM forum_group_list WHERE group_id = $1 AND is_public <> 9';
 		if (!$showNonPublic) {
 			$sql .= ' AND is_public = 1';
 		}
 		$sql .= ' ORDER BY forum_name';
 		
 		$sections = array();
-		$res = db_query($sql);
+		$res = db_query_params ($sql,
+					array ($groupId));
 		while($data = db_fetch_array($res)) {
 			$sections[$data['group_forum_id']] = $data['forum_name'];
 		}

Modified: trunk/gforge/common/search/FrsSearchQuery.class.php
===================================================================
--- trunk/gforge/common/search/FrsSearchQuery.class.php	2009-05-14 18:25:21 UTC (rev 7650)
+++ trunk/gforge/common/search/FrsSearchQuery.class.php	2009-05-14 18:25:29 UTC (rev 7651)
@@ -3,6 +3,7 @@
  * FusionForge search engine
  *
  * Copyright 2004, Dominik Haas
+ * Copyright 2009, Roland Mas
  *
  * This file is part of FusionForge.
  *
@@ -137,15 +138,15 @@
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
 	function getSections($groupId, $showNonPublic) {
-		$sql = 'SELECT package_id, name FROM frs_package WHERE group_id = \''.$groupId.'\' ORDER BY name';
-		
+		$sql = 'SELECT package_id, name FROM frs_package WHERE group_id=$1';
 		if(!$showNonPublic) {
 			$sql .= ' AND is_public=1';
 		}
 		$sql .= ' ORDER BY name';
 		
 		$sections = array();
-		$res = db_query($sql);
+		$res = db_query_params ($sql,
+					array ($groupId));
 		while($data = db_fetch_array($res)) {
 			$sections[$data['package_id']] = $data['name'];
 		}

Modified: trunk/gforge/common/search/SearchQuery.class.php
===================================================================
--- trunk/gforge/common/search/SearchQuery.class.php	2009-05-14 18:25:21 UTC (rev 7650)
+++ trunk/gforge/common/search/SearchQuery.class.php	2009-05-14 18:25:29 UTC (rev 7651)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001, VA Linux Systems, Inc
  * Copyright 2004, Guillaume Smet/Open Wide
+ * Copyright 2009, Roland Mas
  *
  * This file is part of FusionForge.
  *
@@ -168,7 +169,8 @@
 		}
 
 		if ($sys_use_fti) {
-			db_query("select set_curcfg('default')");
+			db_query_params ('select set_curcfg($1)',
+					 array ('default'));
 		}
 		$this->result = db_query(
 			$query,

Modified: trunk/gforge/common/search/TasksSearchQuery.class.php
===================================================================
--- trunk/gforge/common/search/TasksSearchQuery.class.php	2009-05-14 18:25:21 UTC (rev 7650)
+++ trunk/gforge/common/search/TasksSearchQuery.class.php	2009-05-14 18:25:29 UTC (rev 7651)
@@ -3,6 +3,7 @@
  * FusionForge search engine
  *
  * Copyright 2004, Dominik Haas
+ * Copyright 2009, Roland Mas
  *
  * This file is part of FusionForge.
  *
@@ -134,14 +135,15 @@
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
 	function getSections($groupId, $showNonPublic=false) {
-		$sql = 'SELECT group_project_id, project_name FROM project_group_list WHERE group_id = '.$groupId.'';
+		$sql = 'SELECT group_project_id, project_name FROM project_group_list WHERE group_id=$1' ;
 		if (!$showNonPublic) {
 			$sql .= ' AND is_public = 1';
 		}
 		$sql .= ' ORDER BY project_name';
 		
 		$sections = array();
-		$res = db_query($sql);
+		$res = db_query_params ($sql,
+					array ($groupId));
 		while($data = db_fetch_array($res)) {
 			$sections[$data['group_project_id']] = $data['project_name'];
 		}

Modified: trunk/gforge/common/search/TrackersSearchQuery.class.php
===================================================================
--- trunk/gforge/common/search/TrackersSearchQuery.class.php	2009-05-14 18:25:21 UTC (rev 7650)
+++ trunk/gforge/common/search/TrackersSearchQuery.class.php	2009-05-14 18:25:29 UTC (rev 7651)
@@ -3,6 +3,7 @@
  * FusionForge search engine
  *
  * Copyright 2004, Dominik Haas
+ * Copyright 2009, Roland Mas
  *
  * This file is part of FusionForge.
  *
@@ -134,14 +135,15 @@
 	 * @param $showNonPublic boolean if we should consider non public sections
 	 */
 	function getSections($groupId, $showNonPublic=false) {
-		$sql = 'SELECT group_artifact_id, name FROM artifact_group_list WHERE group_id = '.$groupId.'';
+		$sql = 'SELECT group_artifact_id, name FROM artifact_group_list WHERE group_id = $1';
 		if (!$showNonPublic) {
 			$sql .= ' AND artifact_group_list.is_public = 1';
 		}
 		$sql .= ' ORDER BY name';
 		
+		$res = db_query_params ($sql,
+					array ($groupId));
 		$sections = array();
-		$res = db_query($sql);
 		while($data = db_fetch_array($res)) {
 			$sections[$data['group_artifact_id']] = $data['name'];
 		}




More information about the Fusionforge-commits mailing list