[evolvis-commits] r14019: db_query_qpa for snippets

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 03:45:35 CET 2011


Author: mirabilos
Date: 2011-02-28 03:45:34 +0100 (Mon, 28 Feb 2011)
New Revision: 14019

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/snippet/browse.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/snippet/index.php
Log:
db_query_qpa for snippets

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/snippet/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/snippet/browse.php	2011-02-28 02:45:25 UTC (rev 14018)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/snippet/browse.php	2011-02-28 02:45:34 UTC (rev 14019)
@@ -35,24 +35,31 @@
 
 $by = getStringFromRequest('by');
 
+$qpa = db_construct_qpa (false, 'SELECT users.realname,users.user_name,snippet.description,snippet.snippet_id,snippet.name FROM snippet,users WHERE users.user_id=snippet.created_by') ;
+$qpa2 = db_construct_qpa (false, 'SELECT users.realname,users.user_name,users.user_id,snippet_package.description,snippet_package.snippet_package_id,snippet_package.name FROM snippet_package,users WHERE users.user_id=snippet_package.created_by') ;
+
 if ($by=='lang') {
 	$lang = getStringFromRequest('lang');
-	$sql=createSnippetQuery("snippet.language='$lang'");
-	$sql2=createPackageQuery("snippet_package.language='$lang'");
+
+	$qpa = db_construct_qpa ($qpa, 'AND language=$1', array ($lang)) ;
+	$qpa2 = db_construct_qpa ($qpa2, 'AND snippet_package.language=$1', array ($lang)) ;
+
 	echo '<h2>' .sprintf(_('Snippets by language: %1$s'), $SCRIPT_LANGUAGE[$lang]).'</h2>';
 } else if ($by=='cat') {
 	$cat = getStringFromRequest('cat');
-	$sql=createSnippetQuery("snippet.category='$cat'");
-	$sql2=createPackageQuery("snippet_package.category='$cat'");
+
+	$qpa = db_construct_qpa ($qpa, 'AND snippet.category=$1', array ($cat)) ;
+	$qpa2 = db_construct_qpa ($qpa2, 'AND snippet_package.category=$1', array ($cat)) ;
+
 	echo '<h2>' .sprintf(_('Snippets by category: %1$s'), $SCRIPT_CATEGORY[$cat]).'</h2>';
 } else {
 	exit_error(_('Error'),_('Error - bad url?'));
 }
 
-$result=db_query($sql);
+$result = db_query_qpa ($qpa) ;
 $rows=db_numrows($result);
 
-$result2=db_query($sql2);
+$result2 = db_query_qpa ($qpa2) ;
 $rows2=db_numrows($result2);
 
 if ((!$result || $rows < 1) && (!$result2 || $rows2 < 1)) {

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/snippet/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/snippet/index.php	2011-02-28 02:45:25 UTC (rev 14018)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/snippet/index.php	2011-02-28 02:45:34 UTC (rev 14019)
@@ -15,12 +15,12 @@
 /**
  * create_snippet_hash() - A little utility function to reduce duplicated code in snippet_mainpage()
  * 
- * @param	sql	String	A SQL query to fetch either snippets or categories from the database
+ * @param	qpa	Array	A query+parameter array
  * @param	field	String	The field name - either 'language' or 'category'
  * @return An associative array filled with the results of the SQL query
  */
-function create_snippet_hash($sql, $field) {
-	$res = db_query($sql);
+function create_snippet_hash($qpa, $field) {
+	$res = db_query_qpa($qpa);
 	$target = array();
 	while ($row = db_fetch_array($res)) {
 		$target[$row[$field]] = $row['count'];
@@ -43,7 +43,8 @@
 	<strong>'._('Browse by Language').':</strong>
 	<ul>';
 
-	$existing_snippets = create_snippet_hash("SELECT language, count(*) as count from snippet group by language", "language");
+	$qpa = db_construct_qpa (false, 'SELECT language, count(*) as count from snippet group by language') ;
+	$existing_snippets = create_snippet_hash($qpa, "language");
 	for ($i=1; $i<count($SCRIPT_LANGUAGE); $i++) {
 		$return .= '<li>'.util_make_link ('/snippet/browse.php?by=lang&lang='.$i,$SCRIPT_LANGUAGE[$i]).' (';
 		// Remove warning
@@ -59,7 +60,8 @@
 	<strong>'._('Browse by Category').':</strong>
 	<ul>';
 	
-	$existing_categories = create_snippet_hash("SELECT category, count(*) as count from snippet group by category", "category");
+	$qpa = db_construct_qpa (false, 'SELECT category, count(*) as count from snippet group by category') ;
+	$existing_categories = create_snippet_hash($qpa, "category");
 	for ($i=1; $i<count($SCRIPT_CATEGORY); $i++) {
 		// Remove warning
 		@$return .= '<li>'.util_make_link ('/snippet/browse.php?by=cat&cat='.$i,$SCRIPT_CATEGORY[$i]).' (';



More information about the evolvis-commits mailing list