From 21608260d1b8a7bab9f8bab60bdc506af25985e6 Mon Sep 17 00:00:00 2001
From: jhunkeler <jhunkeler@c5b2fb0a-d05d-0410-98c8-828840a80ff6>
Date: Fri, 8 Jan 2010 00:54:15 +0000
Subject: Fixed GetBlocks() passing a bad result to mysqli fetch.

git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@455 c5b2fb0a-d05d-0410-98c8-828840a80ff6
---
 includes/functions.php | 34 +++++++++++++++++++++++++++++-----
 includes/sql.class.php | 23 +++++++++++------------
 2 files changed, 40 insertions(+), 17 deletions(-)

(limited to 'includes')

diff --git a/includes/functions.php b/includes/functions.php
index 30997c6..5d3dc7d 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -420,9 +420,9 @@ function ReportError($message)
 function ReportHack($message)
 {
   //WriteLog($message,BAYONET_LOG_HACK);
-  OpenTable();
-  echo "<tr><th>Hack Attempt</th></tr><tr><td style=\"text-align:center;\">{$message}</td></tr>";
-  CloseTable();
+  OpenContent();
+  echo "<div class=\"contentHeading\">Hacking Attempt</div><div class=\"content\">{$message}</div>";
+  CloseContent();
 }
 
 /**
@@ -584,6 +584,23 @@ function UnderConstruction($message = NULL, $flag = BAYONET_SITE)
   echo "<br>";
 }
 
+/**
+ * valid_result()
+ * 
+ * Determine if a mysqli result is valid.  
+ * Can be used on normal objects to check if they are empty.
+ * 
+ * @param mixed $p_result
+ * @return 
+ */
+function valid_result($p_result)
+{
+	if(is_object($p_result) && count($p_result) <= 1)
+  		return false;
+	else
+		return true;
+}
+
 /**
  * GetBlocks()
  * 
@@ -600,10 +617,17 @@ function GetBlocks($position = BLOCK_LEFT)
 {
   global $config;  
   global $db;
+  	
+  $query = sprintf("SELECT block_id, active, weight, position, dir_name, title FROM bayonet_blocks WHERE active = 1 AND position = %d ORDER BY weight", (int)$position);
+  $result = $db->Query($query);
   
-  $result = $db->Query("SELECT block_id, active, weight, position, dir_name, title FROM `bayonet_blocks` WHERE `position` = $position AND `active` = 1 ORDER BY weight");
-  $blocks = $db->Fetch($result);
+  /* Is the result valid? */
+  if($db->Rows($result) < 1) 
+  	return false;
 
+  $blocks = $db->Fetch($result);
+  if(empty($blocks)) return;
+  
   foreach($blocks as $block)
   {
       $load = 'blocks/'.$block['dir_name'].'/index.php';
diff --git a/includes/sql.class.php b/includes/sql.class.php
index 30b87e4..6bda00f 100644
--- a/includes/sql.class.php
+++ b/includes/sql.class.php
@@ -73,20 +73,19 @@ class Bayonet_SQL
   }
   
   public function FetchArray($p_result)
-	{
-		global $db_fetches;
- 		$db_fetches++;
+  {
+  	global $db_fetches;
+	$db_fetches++;
+	decho('Fetching result');
 	
-		decho('Fetching result');
-
-    while ($row = mysqli_fetch_array($p_result, MYSQLI_ASSOC)) {
-      $result[] = $row;
-    }
-
-		$this->Free($p_result);
-		
-		return is_array($result) ? $result : array();
+	while ($row = mysqli_fetch_array($p_result, MYSQLI_ASSOC)) 
+	{
+		$result[] = $row;
 	}
+	$this->Free($p_result);
+	
+	return is_array($result) ? $result : array();
+  }
     
   public function FetchObject($p_result, $class, $no_array = false)
   {
-- 
cgit