[Fusionforge-commits] r7863 - in trunk/gforge/www/frs: . admin include

Roland Mas lolando at libremir.placard.fr.eu.org
Fri Jun 19 11:55:47 CEST 2009


Author: lolando
Date: 2009-06-19 11:55:47 +0200 (Fri, 19 Jun 2009)
New Revision: 7863

Modified:
   trunk/gforge/www/frs/admin/editrelease.php
   trunk/gforge/www/frs/admin/index.php
   trunk/gforge/www/frs/download.php
   trunk/gforge/www/frs/include/frs_utils.php
   trunk/gforge/www/frs/shownotes.php
Log:
Semi-automated db_query_params() transition for simple cases

Modified: trunk/gforge/www/frs/admin/editrelease.php
===================================================================
--- trunk/gforge/www/frs/admin/editrelease.php	2009-06-19 09:55:38 UTC (rev 7862)
+++ trunk/gforge/www/frs/admin/editrelease.php	2009-06-19 09:55:47 UTC (rev 7863)
@@ -347,7 +347,8 @@
 
 <?php
 	// Get a list of files associated with this release
-	$res=db_query("SELECT * FROM frs_file WHERE release_id='$release_id'");
+	$res=db_query_params ('SELECT * FROM frs_file WHERE release_id=$1',
+			array($release_id));
 	$rows=db_numrows($res);
 	if($rows < 1) {
 		print("<span class=\"error\">"._('No Files In This Release')."</span>\n");

Modified: trunk/gforge/www/frs/admin/index.php
===================================================================
--- trunk/gforge/www/frs/admin/index.php	2009-06-19 09:55:38 UTC (rev 7862)
+++ trunk/gforge/www/frs/admin/index.php	2009-06-19 09:55:47 UTC (rev 7863)
@@ -117,8 +117,9 @@
 
 frs_admin_header(array('title'=>_('Release Edit/File Releases'),'group'=>$group_id));
 
-$res=db_query("SELECT status_id,package_id,name AS package_name 
-	FROM frs_package WHERE group_id='$group_id'");
+$res=db_query_params ('SELECT status_id,package_id,name AS package_name 
+	FROM frs_package WHERE group_id=$1',
+			array($group_id));
 $rows=db_numrows($res);
 if ($res && $rows > 0) {
 	echo '<h3>'._('QRS').'</h3>';

Modified: trunk/gforge/www/frs/download.php
===================================================================
--- trunk/gforge/www/frs/download.php	2009-06-19 09:55:38 UTC (rev 7862)
+++ trunk/gforge/www/frs/download.php	2009-06-19 09:55:47 UTC (rev 7863)
@@ -34,13 +34,14 @@
 $arr=explode('/',getStringFromServer('REQUEST_URI'));
 $file_id=$arr[3];
 
-$res=db_query("SELECT frs_file.filename,frs_package.is_public,frs_package.package_id,
+$res=db_query_params ('SELECT frs_file.filename,frs_package.is_public,frs_package.package_id,
 	frs_file.file_id,groups.unix_group_name,groups.group_id,frs_release.release_id
 	FROM frs_package,frs_release,frs_file,groups
 	WHERE frs_release.release_id=frs_file.release_id
 	AND groups.group_id=frs_package.group_id
 	AND frs_release.package_id=frs_package.package_id
-	AND frs_file.file_id='$file_id'");
+	AND frs_file.file_id=$1',
+			array($file_id));
 
 if (db_numrows($res) < 1) {
 	Header("Status: 404");

Modified: trunk/gforge/www/frs/include/frs_utils.php
===================================================================
--- trunk/gforge/www/frs/include/frs_utils.php	2009-06-19 09:55:38 UTC (rev 7862)
+++ trunk/gforge/www/frs/include/frs_utils.php	2009-06-19 09:55:47 UTC (rev 7863)
@@ -127,7 +127,8 @@
 	*/
 	global $FRS_STATUS_RES;
 	if (!isset($FRS_STATUS_RES)) {
-		$FRS_STATUS_RES=db_query("SELECT * FROM frs_status");
+		$FRS_STATUS_RES=db_query_params ('SELECT * FROM frs_status',
+			array());
 	}
 	return html_build_select_box ($FRS_STATUS_RES,$name,$checked_val,false);
 }
@@ -144,7 +145,8 @@
 	*/
 	global $FRS_FILETYPE_RES;
 	if (!isset($FRS_FILETYPE_RES)) {
-		$FRS_FILETYPE_RES=db_query("SELECT * FROM frs_filetype");
+		$FRS_FILETYPE_RES=db_query_params ('SELECT * FROM frs_filetype',
+			array());
 	}
 	return html_build_select_box ($FRS_FILETYPE_RES,$name,$checked_val,true,_('Must Choose One'));
 }
@@ -161,7 +163,8 @@
 	*/
 	global $FRS_PROCESSOR_RES;
 	if (!isset($FRS_PROCESSOR_RES)) {
-		$FRS_PROCESSOR_RES=db_query("SELECT * FROM frs_processor");
+		$FRS_PROCESSOR_RES=db_query_params ('SELECT * FROM frs_processor',
+			array());
 	}
 	return html_build_select_box ($FRS_PROCESSOR_RES,$name,$checked_val,true,_('Must Choose One'));
 }
@@ -189,9 +192,9 @@
 				$sql = "SELECT frs_release.release_id,(frs_package.name || ' : ' || frs_release.name) ";
 			}
 			$sql .=
-				"FROM frs_release,frs_package ".
-				"WHERE frs_package.group_id='$group_id' ".
-				"AND frs_release.package_id=frs_package.package_id";
+				"FROM frs_release,frs_package 
+WHERE frs_package.group_id='$group_id' 
+AND frs_release.package_id=frs_package.package_id";
 
 			$FRS_RELEASE_RES = db_query($sql);
 			echo db_error();
@@ -215,8 +218,9 @@
 		return 'ERROR - GROUP ID REQUIRED';
 	} else {
 		if (!isset($FRS_PACKAGE_RES)) {
-			$FRS_PACKAGE_RES=db_query("SELECT package_id,name 
-				FROM frs_package WHERE group_id='$group_id'");
+			$FRS_PACKAGE_RES=db_query_params ('SELECT package_id,name 
+				FROM frs_package WHERE group_id=$1',
+			array($group_id));
 			echo db_error();
 		}
 		return html_build_select_box ($FRS_PACKAGE_RES,$name,$checked_val,false);

Modified: trunk/gforge/www/frs/shownotes.php
===================================================================
--- trunk/gforge/www/frs/shownotes.php	2009-06-19 09:55:38 UTC (rev 7862)
+++ trunk/gforge/www/frs/shownotes.php	2009-06-19 09:55:47 UTC (rev 7863)
@@ -29,11 +29,12 @@
 
 $release_id = getIntFromRequest('release_id');
 
-$result=db_query("SELECT frs_release.notes,frs_release.changes,
+$result=db_query_params ('SELECT frs_release.notes,frs_release.changes,
 		frs_release.preformatted,frs_release.name,frs_package.group_id,frs_package.is_public
 		FROM frs_release,frs_package 
 		WHERE frs_release.package_id=frs_package.package_id 
-		AND frs_release.release_id='$release_id'");
+		AND frs_release.release_id=$1',
+			array($release_id));
 
 if (!$result || db_numrows($result) < 1) {
 	exit_error(_('Error'), _('That Release Was Not Found'));




More information about the Fusionforge-commits mailing list