From a2c3b25977a54651608ed003527af638f6e455a5 Mon Sep 17 00:00:00 2001
From: Steve Alberty <alberty@neptunlabs.de>
Date: Fri, 3 Aug 2001 11:13:32 +0000
Subject: [PATCH] remove some warnings in higher errorlevel

---
 ChangeLog    |  6 ++++++
 tbl_qbe.php3 | 36 +++++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e5016e24..c9b954a6e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+
+2001-08-02  Steve Alberty  <alberty@neptunlabs.de>
+	* tbl_properties.php3, db_details.php3: fixed problem with table
+	  size display and MERGE tables
+	* tbl_qbe.php3: remove some warnings in higher errorlevel
+
 2001-08-03  Olivier Müller  <om@omnis.ch>
 	* Generated Documentation.txt based on Documentation.html
 	  (not everybody is having a webbrowser on their servers... :)
diff --git a/tbl_qbe.php3 b/tbl_qbe.php3
index e83984186..52feed5d7 100755
--- a/tbl_qbe.php3
+++ b/tbl_qbe.php3
@@ -326,10 +326,12 @@ for ($x = 0; $x < $col; $x++) {
     if (isset($DelCol[$x]) && $DelCol[$x] == 'on') {
         continue;
     }
-    if (get_magic_quotes_gpc()) {
-        $stripped_Criteria = stripslashes($Criteria[$x]);
-    } else {
-        $stripped_Criteria = $Criteria[$x];
+    if (isset($Criteria[$x])){
+	    if (get_magic_quotes_gpc()) {
+  	      $stripped_Criteria = stripslashes($Criteria[$x]);
+    	} else {
+      	  $stripped_Criteria = $Criteria[$x];
+    	}
     }
     if (!isset($prev_Criteria[$x])
         || urldecode($prev_Criteria[$x]) != htmlspecialchars($stripped_Criteria)) {
@@ -356,7 +358,7 @@ for ($x = 0; $x < $col; $x++) {
 $w = 0;
 for ($y = 0; $y <= $row; $y++) {
     $bgcolor = ($y % 2) ? $cfgBgcolorOne : $cfgBgcolorTwo;
-    if ($InsRow[$y] == 'on') {
+    if (isset ($InsRow[$y]) && $InsRow[$y] == 'on') {
         $chk['or']  = ' checked="checked"';
         $chk['and'] = '';
         ?>
@@ -425,12 +427,13 @@ for ($y = 0; $y <= $row; $y++) {
         <?php
     } // end if
 
-    if ($DelRow[$y] == 'on') {
+    if (isset($DelRow[$y]) && $DelRow[$y] == 'on') {
         continue;
     }
 
-    $curAndOrRow[$w] = $AndOrRow[$y];
-    if($AndOrRow[$y] == 'and') {
+
+    if (isset($AndOrRow[$y])) $curAndOrRow[$w] = $AndOrRow[$y];
+    if (isset($AndOrRow[$y]) && $AndOrRow[$y] == 'and') {
         $chk['and'] =  ' checked="checked"';
         $chk['or']  =  '';
     } else {
@@ -491,17 +494,20 @@ for ($y = 0; $y <= $row; $y++) {
         if (!isset(${$or})) {
             ${$or} = '';
         }
-        if (get_magic_quotes_gpc()) {
-            $stripped_or = stripslashes(${$or}[$x]);
-        } else {
-            $stripped_or = ${$or}[$x];
-	    }
+        if (isset(${$or}[$x])){
+	        if (get_magic_quotes_gpc()) {
+  	          $stripped_or = stripslashes(${$or}[$x]);
+    	    } else {
+      	      $stripped_or = ${$or}[$x];
+      		}
+		    }
+		    else $stripped_or="";
         ?>
         <td align="center" bgcolor="<?php echo $bgcolor; ?>">
             <textarea cols="20" rows="2" style="width: <?php echo $widem; ?>" name="Or<?php echo $w . '[' . $z . ']'; ?>"><?php echo htmlspecialchars($stripped_or); ?></textarea>
         </td>
         <?php
-        ${'cur' . $or}[$z] = ${$or}[$x];
+        if (isset(${$or}[$x])) ${'cur' . $or}[$z] = ${$or}[$x];
         $z++;
     } // end for
     $w++;
@@ -551,7 +557,7 @@ for ($x = 0; $x < $col; $x++) {
         continue;
     }
 
-    $curAndOrCol[$z] = $AndOrCol[$y];
+    if (isset($AndOrCol[$y])) $curAndOrCol[$z] = $AndOrCol[$y];
     if (isset($AndOrCol[$z]) && $AndOrCol[$z] == 'or') {
         $chk['or']  = ' checked="checked"';
         $chk['and'] = '';