style upgrade

NenadGajic · Apr 25, 2006 · 7a19861 · 7a19861
1 parent aad17c3
commit 7a19861
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 130 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -13,7 +13,9 @@ $Source$
 
 2006-04-25 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * db_details_qbe.php, db_printview.php, libraries/display_tbl.lib.php,
-      css/phpmyadmin.css.php, js/functions.js, pdf_pages.php:
+      css/phpmyadmin.css.php, js/functions.js, pdf_pages.php, pdf_schema.php,
+      server_binlog.php, server_variables.php, tbl_change.php,
+      transformation_overview.php:
       style upgrade
 
 2006-04-24 Michal Čihař  <michal@cihar.com>

diff --git a/pdf_schema.php b/pdf_schema.php
@@ -1251,7 +1251,6 @@ function PMA_RT_DOC($alltables)
             $pdf->Ln();
         }
 
-        $i = 0;
         $pdf->SetFont('', 'B');
         if (isset($orientation) && $orientation == 'L') {
             $pdf->Cell(25, 8, ucfirst($GLOBALS['strField']), 1, 0, 'C');
@@ -1287,9 +1286,6 @@ function PMA_RT_DOC($alltables)
         $pdf->SetFont('', '');
 
         while ($row = PMA_DBI_fetch_assoc($result)) {
-            $bgcolor = ($i % 2) ?$GLOBALS['cfg']['BgcolorOne'] : $GLOBALS['cfg']['BgcolorTwo'];
-            $i++;
-
             $type = $row['Type'];
             // reformat mysql query output - staybyte - 9. June 2001
             // loic1: set or enum types: slashes single quotes inside options

diff --git a/server_binlog.php b/server_binlog.php
@@ -2,18 +2,18 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-require_once('./libraries/common.lib.php');
+require_once './libraries/common.lib.php';
 
 /**
  * Does the common work
  */
-require_once('./libraries/server_common.inc.php');
+require_once './libraries/server_common.inc.php';
 
 
 /**
  * Displays the links
  */
-require('./libraries/server_links.inc.php');
+require './libraries/server_links.inc.php';
 
 
 /**
@@ -57,14 +57,7 @@
 /**
  * Sends the query and buffers the result
  */
-$serverProcesses = array();
-$res = PMA_DBI_query($sql_query);
-while ($row = PMA_DBI_fetch_assoc($res)) {
-    $serverProcesses[] = $row;
-}
-@PMA_DBI_free_result($res);
-unset($res);
-unset($row);
+$serverProcesses = PMA_DBI_fetch_result($sql_query);
 
 PMA_showMessage($GLOBALS['strSuccess']);
 
@@ -74,45 +67,48 @@
  */
 ?>
 <table border="0" cellpadding="2" cellspacing="1">
-    <tr>
-        <td colspan="6" align="center"><a href="./server_binlog.php?<?php echo $url_query . (!empty($log) ? '&amp;log=' . htmlspecialchars($log) : '' ) . (empty($full) ? '&amp;full=1' : ''); ?>" title="<?php echo empty($full) ? $strShowFullQueries : $strTruncateQueries; ?>"><img src="<?php echo $pmaThemeImage . 's_' . (empty($full) ? 'full' : 'partial'); ?>text.png" width="50" height="20" border="0" alt="<?php echo empty($full) ? $strShowFullQueries : $strTruncateQueries; ?>" /></a></td>
-    </tr>
-    <tr>
-        <th>&nbsp;<?php echo $strBinLogName; ?>&nbsp;</th>
-        <th>&nbsp;<?php echo $strBinLogPosition; ?>&nbsp;</th>
-        <th>&nbsp;<?php echo $strBinLogEventType; ?>&nbsp;</th>
-        <th>&nbsp;<?php echo $strBinLogServerId; ?>&nbsp;</th>
-        <th>&nbsp;<?php echo $strBinLogOriginalPosition; ?>&nbsp;</th>
-        <th>&nbsp;<?php echo $strBinLogInfo; ?>&nbsp;</th>
-    </tr>
+<tr>
+    <td colspan="6" align="center">
+        <a href="./server_binlog.php?<?php echo $url_query . (!empty($log) ? '&amp;log=' . htmlspecialchars($log) : '' ) . (empty($full) ? '&amp;full=1' : ''); ?>"
+            title="<?php echo empty($full) ? $strShowFullQueries : $strTruncateQueries; ?>">
+                <img src="<?php echo $pmaThemeImage . 's_' . (empty($full) ? 'full' : 'partial'); ?>text.png"
+                    width="50" height="20" border="0"
+                    alt="<?php echo empty($full) ? $strShowFullQueries : $strTruncateQueries; ?>" /></a></td>
+</tr>
+<tr>
+    <th><?php echo $strBinLogName; ?></th>
+    <th><?php echo $strBinLogPosition; ?></th>
+    <th><?php echo $strBinLogEventType; ?></th>
+    <th><?php echo $strBinLogServerId; ?></th>
+    <th><?php echo $strBinLogOriginalPosition; ?></th>
+    <th><?php echo $strBinLogInfo; ?></th>
+</tr>
 <?php
-$useBgcolorOne = TRUE;
+$odd_row = true;
 foreach ($serverProcesses as $value) {
     if (empty($full) && PMA_strlen($value['Info']) > $GLOBALS['cfg']['LimitChars']) {
         $value['Info'] = PMA_substr($value['Info'], 0, $GLOBALS['cfg']['LimitChars']) . '...';
     }
-?>
-    <tr>
-        <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<?php echo $value['Log_name']; ?>&nbsp;</td>
-        <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>" align="right">&nbsp;<?php echo $value['Pos']; ?>&nbsp;</td>
-        <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<?php echo $value['Event_type']; ?>&nbsp;</td>
-        <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>" align="right">&nbsp;<?php echo $value['Server_id']; ?>&nbsp;</td>
-        <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>" align="right">&nbsp;<?php echo isset($value['Orig_log_pos']) ? $value['Orig_log_pos'] : $value['End_log_pos']; ?>&nbsp;</td>
-        <td bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>">&nbsp;<?php echo htmlspecialchars($value['Info']); ?>&nbsp;</td>
-    </tr>
-<?php
-    $useBgcolorOne = !$useBgcolorOne;
+    ?>
+<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
+    <td>&nbsp;<?php echo $value['Log_name']; ?>&nbsp;</td>
+    <td align="right">&nbsp;<?php echo $value['Pos']; ?>&nbsp;</td>
+    <td>&nbsp;<?php echo $value['Event_type']; ?>&nbsp;</td>
+    <td align="right">&nbsp;<?php echo $value['Server_id']; ?>&nbsp;</td>
+    <td align="right">&nbsp;<?php echo isset($value['Orig_log_pos']) ? $value['Orig_log_pos'] : $value['End_log_pos']; ?>&nbsp;</td>
+    <td>&nbsp;<?php echo htmlspecialchars($value['Info']); ?>&nbsp;</td>
+</tr>
+    <?php
+    $odd_row = !$odd_row;
 }
 ?>
-<?php
-?>
 </table>
 <?php
 
 
 /**
  * Sends the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 
 ?>
diff --git a/server_variables.php b/server_variables.php
@@ -5,18 +5,18 @@
 if ( ! defined( 'PMA_NO_VARIABLES_IMPORT' ) ) {
     define( 'PMA_NO_VARIABLES_IMPORT', true );
 }
-require_once('./libraries/common.lib.php');
+require_once './libraries/common.lib.php';
 
 /**
  * Does the common work
  */
-require('./libraries/server_common.inc.php');
+require './libraries/server_common.inc.php';
 
 
 /**
  * Displays the links
  */
-require('./libraries/server_links.inc.php');
+require './libraries/server_links.inc.php';
 
 
 /**
@@ -60,20 +60,19 @@
 <tbody>
 <?php
 $odd_row = true;
-$useBgcolorOne = TRUE;
 foreach ($serverVars as $name => $value) {
     ?>
 <tr class="<?php
     echo $odd_row ? 'odd' : 'even';
     if (PMA_MYSQL_INT_VERSION >= 40003
-      && $serverVarsGlobal[$name] !== $value ) {
+     && $serverVarsGlobal[$name] !== $value) {
         echo ' marked';
     }
     ?>">
     <th nowrap="nowrap">
         <?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th>
     <td class="value"><?php
-    if ( is_numeric($value) ) {
+    if (is_numeric($value)) {
         echo PMA_formatNumber($value, 0);
         $is_numeric = true;
     } else {
@@ -83,15 +82,15 @@
     ?></td>
     <?php
     if (PMA_MYSQL_INT_VERSION >= 40003
-      && $serverVarsGlobal[$name] !== $value ) {
+     && $serverVarsGlobal[$name] !== $value) {
         ?>
 </tr>
 <tr class="<?php
     echo $odd_row ? 'odd' : 'even';
     ?> marked">
     <td>(<?php echo $strGlobalValue; ?>)</td>
     <td class="value"><?php
-    if ( $is_numeric ) {
+    if ($is_numeric) {
         echo PMA_formatNumber($serverVarsGlobal[$name], 0);
     } else {
         echo htmlspecialchars($serverVarsGlobal[$name]);
@@ -111,6 +110,6 @@
 /**
  * Sends the footer
  */
-require_once('./libraries/footer.inc.php');
+require_once './libraries/footer.inc.php';
 
 ?>