Index: branches/unlabeled/unlabeled-1.6.32/admin/tools/sql_result.php
===================================================================
diff -u -r2859 -r5264
--- branches/unlabeled/unlabeled-1.6.32/admin/tools/sql_result.php	(.../sql_result.php)	(revision 2859)
+++ branches/unlabeled/unlabeled-1.6.32/admin/tools/sql_result.php	(.../sql_result.php)	(revision 5264)
@@ -65,8 +65,7 @@
    </tr>
 <tr>
 <?php
-  if($SqlErrorNum>0)
-  {
+  if ($SqlErrorNum > 0) {
 ?>
 <?php int_subsection_title(admin_language("la_prompt_sqlquery_error")); ?>
  <tr <?php echo int_table_color(); ?>>
@@ -76,42 +75,48 @@
    </tr>
 <tr>
 <?php
-  }
-  else 
-  {    	  	
-  	$ResultObject = new clsItemCollection();
-  	$ResultObject->classname = "clsItemDB";
-  	echo "<TR><TD colspan=3><table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\">";
-  	while($SqlResult && !$SqlResult->EOF)
-  	{
-  		$ResultObject->AddItemFromArray($SqlResult->fields,TRUE);
-  		$SqlResult->MoveNext();
+	}
+  	else {
+  		$ResultObject = new clsItemCollection();
+  		$ResultObject->classname = "clsItemDB";
+  		echo '<tr><td colspan="3">';
+  		while ($SqlResult && !$SqlResult->EOF) {
+  			$ResultObject->AddItemFromArray($SqlResult->fields,TRUE);
+  			$SqlResult->MoveNext();
+  		}
+
+  		if (method_exists($SqlResult, 'FieldTypesArray')) {
+  			// it was query that has results
+  			$objListView = new clsListView(NULL,$ResultObject);
+  			
+  			echo '<table width="100%" border="0" cellspacing="0" cellpadding="4">';
+  			$fields = $SqlResult->FieldTypesArray();
+  			if ($fields) {
+  				$width = 100 / count($fields);
+  				$width = "width=\"".$width."%\"";
+
+  				foreach ($fields as $f) {
+  					$name = $f->name;
+  					$objListView->ColumnHeaders->Add($name,$name,1,0,"",$width,"", "",$name);
+  				}
+  			}
+  			
+  			$objListView->PrintToolBar = FALSE;
+  			$objListView->nowrap = FALSE;
+  			$objListView->CurrentPageVar = "";
+  			$objListView->PerPageVar = "";
+  			$objListView->checkboxes=false;
+  			echo $objListView->ColumnHeaders->PrintColumns();
+  			if ($ResultObject->NumItems() > 0) {
+  				echo $objListView->PrintItems();
+  			}
+  			echo '</table>';
+  		}
+  		else {
+  			echo language('no_results');
+  		}
+  		echo '</TD></TR>';
   	}
-    $objListView = new clsListView(NULL,$ResultObject);
-    $fields = $SqlResult->FieldTypesArray();
-    if(is_array($fields))
-    {    
-    	$width = 100 / count($fields);
-    	$width = "width=\"".$width."%\"";
-    	
-    	foreach($fields as $f)
-    	{    	
-    		$name = $f->name;    	
-			$objListView->ColumnHeaders->Add($name,$name,1,0,"",$width,"", "",$name);		
-    	}
-    }
-  	$objListView->PrintToolBar = FALSE;
-  	$objListView->nowrap = FALSE;
-  	$objListView->CurrentPageVar = "";
-  	$objListView->PerPageVar = "";
-  	$objListView->checkboxes=false;
-  	echo $objListView->ColumnHeaders->PrintColumns();
-  	if($ResultObject->NumItems()>0)  	
-  	{
-  		echo $objListView->PrintItems();  	
-  	}
-  	echo "</TABLE></TD></TR>";
-  }
 ?>  
 </TABLE>
 <?php int_footer(); ?>
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.120.2/kernel/action.php
===================================================================
diff -u -r4822 -r5264
--- branches/unlabeled/unlabeled-1.120.2/kernel/action.php	(.../action.php)	(revision 4822)
+++ branches/unlabeled/unlabeled-1.120.2/kernel/action.php	(.../action.php)	(revision 5264)
@@ -1742,15 +1742,14 @@
     	break;
 
     case "m_sql_query":
-		if($ro_perm) break;
-    	$SqlQuery = $_POST["sql"];
-		$ado = &GetADODBConnection();
-		if(strlen($sql))
-		{
-		  $SqlResult = $ado->Execute(stripslashes($SqlQuery));
-  	  	  $SqlError = $ado->ErrorMsg();
-		  $SqlErrorNum = $ado->ErrorNo();
-		}
+    	if($ro_perm) break;
+    	$sql_query = $application->GetVar('sql');
+    	$ado =& GetADODBConnection();
+    	if ($sql_query) {
+    		$SqlResult = $ado->Execute($sql_query);
+    		$SqlError = $ado->ErrorMsg();
+    		$SqlErrorNum = $ado->ErrorNo();
+    	}
     break;
     
 	case 'm_purge_email_log':
Index: branches/unlabeled/unlabeled-1.6.32/admin/tools/sql_query.php
===================================================================
diff -u -r2859 -r5264
--- branches/unlabeled/unlabeled-1.6.32/admin/tools/sql_query.php	(.../sql_query.php)	(revision 2859)
+++ branches/unlabeled/unlabeled-1.6.32/admin/tools/sql_query.php	(.../sql_query.php)	(revision 5264)
@@ -48,8 +48,6 @@
 
 $cancelUrl = $admin."/subitems.php?section=in-portal:tools&".$envar;
 
-$action = "m_sql_query";
-
 $sql_query = trim($objSession->GetVariable("LastSQLquery"));
 
 $objCatToolBar = new clsToolBar();
@@ -73,7 +71,7 @@
   </td>
   <td><span class="text">&nbsp;</span></td>
 </tr>
-<input type="hidden" name="Action" value="<?php echo $action; ?>">
+<input type="hidden" name="Action" value="m_sql_query">
 </FORM>
 </TABLE>
 <?php int_footer(); ?>
\ No newline at end of file