From 3412621f5b05810bc51bec4f842e2c19fd027f8d Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 20 Nov 2003 21:50:37 +0000
Subject: [PATCH] Removed some php 3 / MySQL 3.21 compatibility code.

---
 ChangeLog              |  4 ++++
 server_databases.php   | 10 +++++-----
 server_processlist.php |  2 +-
 server_status.php      |  4 ++--
 server_variables.php   |  4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed922997e..1aa2ce01b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-11-20 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * server_databases.php, server_processlist.php, server_status.php,
+      server_variables.php: Removed some php 3 / MySQL 3.21 compatibility code.
+
 2003-11-20 Michal Cihar  <nijel@users.sourceforge.net>
     * read_dump.php: Show message about failing upload in all cases, removed
       some PHP compatibility code.
diff --git a/server_databases.php b/server_databases.php
index 5847a8512..a643fd399 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -100,7 +100,7 @@ echo '<h2>' . "\n"
 /**
  * Checks if the user is allowed to do what he tries to...
  */
-if (!empty($dbstats) && (!$is_superuser || PMA_MYSQL_INT_VERSION < 32303)) {
+if (!empty($dbstats) && !$is_superuser) {
     echo $strNoPrivileges . "\n";
     include('./footer.inc.php');
     exit;
@@ -221,15 +221,15 @@ if (count($statistics) > 0) {
         'idx_sz' => 0,
         'tot_sz' => 0
     );
-    while (list(, $current) = each($statistics)) {
+    foreach ($statistics as $current) {
         list($data_size, $data_unit) = PMA_formatByteDown($current['data_sz'], 3, 1);
         list($idx_size, $idx_unit)   = PMA_formatByteDown($current['idx_sz'], 3, 1);
         list($tot_size, $tot_unit)   = PMA_formatByteDown($current['tot_sz'], 3, 1);
         $total_calc['db_cnt']++;
         $total_calc['tbl_cnt'] += $current['tbl_cnt'];
         $total_calc['data_sz'] += $current['data_sz'];
-        $total_calc['idx_sz'] += $current['idx_sz'];
-        $total_calc['tot_sz'] += $current['tot_sz'];
+        $total_calc['idx_sz']  += $current['idx_sz'];
+        $total_calc['tot_sz']  += $current['tot_sz'];
         echo '        <tr>' . "\n";
         if ($is_superuser || $cfg['AllowUserDropDatabase']) {
             echo '            <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
@@ -336,7 +336,7 @@ if (count($statistics) > 0) {
     if ($is_superuser || $cfg['AllowUserDropDatabase']) {
         echo '    <ul>' . "\n";
     }
-    if ($is_superuser && empty($dbstats) && PMA_MYSQL_INT_VERSION >= 32303) {
+    if ($is_superuser && empty($dbstats)) {
         echo '        <li>' . "\n"
            . '            <b>' . "\n"
            . '                <a href="./server_databases.php?' . $url_query . '&amp;dbstats=1" title="' . $strDatabasesStatsEnable . '">' . "\n"
diff --git a/server_processlist.php b/server_processlist.php
index 2c07c717f..3b50a25e1 100644
--- a/server_processlist.php
+++ b/server_processlist.php
@@ -56,7 +56,7 @@ unset($row);
 ?>
 <table border="0">
     <tr>
-        <th><?php echo PMA_MYSQL_INT_VERSION < 32307 ? '' : '<a href="./server_processlist.php?'. $url_query . (empty($full) ? '&amp;full=1' : '') . '" title="' . (empty($full) ? $strShowFullQueries : $strTruncateQueries) . '"><img src="./images/' . (empty($full) ? 'full' : 'partial') . 'text.png" width="50" height="20" border="0" alt="' . (empty($full) ? $strShowFullQueries : $strTruncateQueries) . '" /></a>';  ?></th>
+        <th><a href="./server_processlist.php?<?php echo $url_query . (empty($full) ? '&amp;full=1' : ''); ?>" title="<?php echo empty($full) ? $strShowFullQueries : $strTruncateQueries; ?>"><img src="./images/<?php echo empty($full) ? 'full' : 'partial'; ?>text.png" width="50" height="20" border="0" alt="<?php echo empty($full) ? $strShowFullQueries : $strTruncateQueries; ?>" /></a></th>
         <th>&nbsp;<?php echo $strId; ?>&nbsp;</th>
         <th>&nbsp;<?php echo $strUser; ?>&nbsp;</th>
         <th>&nbsp;<?php echo $strHost; ?>&nbsp;</th>
diff --git a/server_status.php b/server_status.php
index 7c5de29bc..caeedc2f9 100644
--- a/server_status.php
+++ b/server_status.php
@@ -179,11 +179,11 @@ unset($tmp_array);
 
 $useBgcolorOne = TRUE;
 $countRows = 0;
-while (list($name, $value) = each($queryStats)) {
+foreach ($queryStats as $name => $value) {
 
 // For the percentage column, use Questions - Connections, because
 // the number of connections is not an item of the Query types
-// but is included in Questions. Then the total of the percentages is 100. 
+// but is included in Questions. Then the total of the percentages is 100.
 ?>
                         <tr>
                             <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<?php echo htmlspecialchars($name); ?>&nbsp;</td>
diff --git a/server_variables.php b/server_variables.php
index 30cff3d91..681b4ae92 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -78,7 +78,7 @@ echo '&nbsp;</th>' . "\n";
     </tr>
 <?php
 $useBgcolorOne = TRUE;
-while (list($name, $value) = each($serverVars)) {
+foreach ($serverVars as $name => $value) {
 ?>
     <tr>
         <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">
@@ -110,4 +110,4 @@ while (list($name, $value) = each($serverVars)) {
  */
 require('./footer.inc.php');
 
-?>
\ No newline at end of file
+?>