[evolvis-commits] r13484: db_query_params() transition: extratabs plugin

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 02:39:40 CET 2011


Author: mirabilos
Date: 2011-02-28 02:39:40 +0100 (Mon, 28 Feb 2011)
New Revision: 13484

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/extratabs/common/ExtraTabsPlugin.class
   trunk/gforge_base/evolvisforge-5.1/gforge/plugins/extratabs/www/index.php
Log:
db_query_params() transition: extratabs plugin

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/extratabs/common/ExtraTabsPlugin.class
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/extratabs/common/ExtraTabsPlugin.class	2011-02-28 01:39:33 UTC (rev 13483)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/extratabs/common/ExtraTabsPlugin.class	2011-02-28 01:39:40 UTC (rev 13484)
@@ -48,8 +48,8 @@
 				return;
 			if (!$project->isProject())
 				return;
-			$res_tabs = db_query("SELECT tab_name, tab_url FROM plugin_extratabs_main
-					      WHERE group_id='$group_id' ORDER BY index");
+			$res_tabs = db_query_params ('SELECT tab_name, tab_url FROM plugin_extratabsmain WHERE group_id=$1 ORDER BY index',
+						     array ($group_id)) ;
 			while ($row_tab = db_fetch_array($res_tabs)) {
 				$params['DIRS'][] = $row_tab['tab_url'];
 				$params['TITLES'][] = $row_tab['tab_name'];

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/extratabs/www/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/extratabs/www/index.php	2011-02-28 01:39:33 UTC (rev 13483)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/extratabs/www/index.php	2011-02-28 01:39:40 UTC (rev 13484)
@@ -1,8 +1,9 @@
 <?php
 /*
- * Hello world plugin
+ * Extra tabs plugin
  *
- * Roland Mas <lolando at debian.org>
+ * Copyright 2005, Raphaƫl Hertzog
+ * Copyright 2006-2009, Roland Mas
  */
 
 require_once ('../../../www/env.inc.php');
@@ -34,8 +35,8 @@
 }
 
 // Calculate new index field
-$res = db_query("SELECT COUNT(*) as c FROM plugin_extratabs_main 
-		 WHERE group_id = '$group_id'");
+$res = db_query_params ('SELECT COUNT(*) as c FROM plugin_extratabs_main WHERE group_id = $1',
+			array ($group_id)) ;
 $row = db_fetch_array($res);
 $newid = $row['c'] + 1;
 
@@ -46,8 +47,11 @@
 if (getStringFromRequest ('addtab') != '') {
 	$tab_name = addslashes (getStringFromRequest ('tab_name')) ;
 	$tab_url = addslashes (getStringFromRequest ('tab_url')) ;
-	$res = db_query("INSERT INTO plugin_extratabs_main (group_id, index, tab_name, tab_url)
-		  	 VALUES('$group_id','$newid','$tab_name','$tab_url')");
+	$res = db_query_params ('INSERT INTO plugin_extratabs_main (group_id, index, tab_name, tab_url) VALUES ($1,$2,$3,$4)',
+				array ($group_id,
+				       $newid,
+				       $tab_name,
+				       $tab_url)) ;
 
 	if (!$res || db_affected_rows($res) < 1) {
 		$feedback = sprintf (_('Cannot insert new tab entry: %s'),
@@ -56,58 +60,47 @@
 		$feedback = _('Tab added');
 	}
 } elseif (getStringFromRequest ('delete') != '') {
-	$res = db_query("DELETE FROM plugin_extratabs_main
-			 WHERE group_id='$group_id' AND
-			 index='$index'");
+	$res = db_query_params ('DELETE FROM plugin_extratabs_main WHERE group_id=$1 AND index=$2',
+				array ($group_id,
+				       $index)) ;
 	if (!$res || db_affected_rows($res) < 1) {
 		$feedback = sprintf (_('Cannot delete tab entry: %s'),
 				      db_error());
 	} else {
-		$res = db_query("UPDATE plugin_extratabs_main
-			 SET index = index - 1
-			 WHERE group_id = '$group_id' AND
-			 index > $index");
+		$res = db_query_params ('UPDATE plugin_extratabs_main SET index=index-1 WHERE group_id=$1 AND index > $2',
+					array ($group_id,
+					       $index)) ;
 	}
   } elseif (getStringFromRequest ('up') != '') {
 	if ($index > 1) {
 		$previous = $index - 1;
-		$res = db_query("
-		    UPDATE plugin_extratabs_main
-		    SET index = 0 
-		    WHERE group_id = '$group_id' AND index = $index
-		");
-		$res = db_query("
-		    UPDATE plugin_extratabs_main
-		    SET index = $index 
-		    WHERE group_id = '$group_id' AND index = $previous
-		");
-		$res = db_query("
-		    UPDATE plugin_extratabs_main
-		    SET index = $previous
-		    WHERE group_id = '$group_id' AND index = 0
-		");
+		$res = db_query_params('UPDATE plugin_extratabs_main SET index = 0 WHERE group_id=$1 AND index=$2',
+				       array ($group_id,
+					      $index)) ;
+		$res = db_query_params('UPDATE plugin_extratabs_main SET index=$1 WHERE group_id=$2 AND index=$3',
+				       array ($index,
+					      $group_id,
+					      $previous)) ;
+		$res = db_query_params('UPDATE plugin_extratabs_main SET index=$1 WHERE group_id=$2 AND index=0',
+				       array ($previous,
+					      $group_id)) ;
 		$selected = $previous;
 	} else {
 	    $selected = $index;
 	}
-} elseif (getStringFromRequest ('down') != '') {
+    } elseif (getStringFromRequest ('down') != '') {
 	if ($index < $newid - 1) {
 		$next = $index + 1;
-		$res = db_query("
-		    UPDATE plugin_extratabs_main
-		    SET index = 0 
-		    WHERE group_id = '$group_id' AND index = $index
-		");
-		$res = db_query("
-		    UPDATE plugin_extratabs_main
-		    SET index = $index 
-		    WHERE group_id = '$group_id' AND index = $next
-		");
-		$res = db_query("
-		    UPDATE plugin_extratabs_main
-		    SET index = $next
-		    WHERE group_id = '$group_id' AND index = 0
-		");
+		$res = db_query_params('UPDATE plugin_extratabs_main SET index = 0 WHERE group_id=$1 AND index=$2',
+				       array ($group_id,
+					      $index)) ;
+		$res = db_query_params('UPDATE plugin_extratabs_main SET index=$1 WHERE group_id=$2 AND index=$3',
+				       array ($index,
+					      $group_id,
+					      $next)) ;
+		$res = db_query_params('UPDATE plugin_extratabs_main SET index=$1 WHERE group_id=$2 AND index=0',
+				       array ($next,
+					      $group_id)) ;
 		$selected = $next;
 	} else {
 	    $selected = $index;
@@ -140,7 +133,7 @@
 </p>
 
 <?php
-	$res = db_query("SELECT * FROM plugin_extratabs_main WHERE group_id='$group_id' ORDER BY index ASC");
+	$res = db_query_params ('SELECT * FROM plugin_extratabs_main WHERE group_id=$1 ORDER BY index ASC', array ($group_id)) ;
 $nbtabs = db_numrows($res) ;
 if ($nbtabs > 0) {
 	



More information about the evolvis-commits mailing list