[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16996-g9e566cd

[Marc Delisle]

The branch, master has been updated
       via  9e566cdd350cd2516447f1a453a7e3bbca53f223 (commit)
       via  471e10a458940c4c2fa8453ead75a7178e1a01ee (commit)
      from  0bf475bce1b909dd654255e1265cc767cde51d07 (commit)


- Log -----------------------------------------------------------------
commit 9e566cdd350cd2516447f1a453a7e3bbca53f223
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Aug 23 19:45:17 2011 -0400

    Other XHTML fixes

commit 471e10a458940c4c2fa8453ead75a7178e1a01ee
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Aug 23 19:36:13 2011 -0400

    Fix some of the XHTML problems

-----------------------------------------------------------------------

Summary of changes:
 tbl_zoom_select.php |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 47d9b84..7b11889 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -118,7 +118,7 @@ if (isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) {
 <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
 <input type="hidden" name="back" value="tbl_zoom_select.php" />
-<input type="hidden" name="flag" id="id_flag" value=<?php echo $flag; ?> />
+<input type="hidden" name="flag" id="id_flag" value="<?php echo $flag; ?>" />
 
 <fieldset id="inputSection">
 
@@ -137,15 +137,15 @@ for ($i = 0; $i < 4; $i++) {
     }
 ?>
     <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
-        <th><select name="inputs[]" id=<?php echo 'tableid_' . $i?> >
-        <option value= <?php echo 'pma_null'?>><?php echo __('None');  ?> </option>
+        <th><select name="inputs[]" id="<?php echo 'tableid_' . $i; ?>" >
+        <option value="<?php echo 'pma_null'; ?>"><?php echo __('None');  ?> </option>
     <?php
     for ($j = 0 ; $j < $fields_cnt ; $j++) {
         if (isset($inputs[$i]) && $inputs[$i] == htmlspecialchars($fields_list[$j])) {?>
-                <option value=<?php echo htmlspecialchars($fields_list[$j]);?> Selected>  <?php echo htmlspecialchars($fields_list[$j]);?></option>
+                <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected">  <?php echo htmlspecialchars($fields_list[$j]);?></option>
         <?php
         } else { ?>
-                <option value=<?php echo htmlspecialchars($fields_list[$j]);?> >  <?php echo htmlspecialchars($fields_list[$j]);?></option>
+                <option value="<?php echo htmlspecialchars($fields_list[$j]);?> ">  <?php echo htmlspecialchars($fields_list[$j]);?></option>
         <?php
         }
     } ?>
@@ -162,7 +162,7 @@ for ($i = 0; $i < 4; $i++) {
             foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) {
                 if (isset($zoomFunc[$i]) && $zoomFunc[$i] == htmlspecialchars($fc)) {
                     echo "\n" . '                        '
-                    . '<option value="' . htmlspecialchars($fc) . '" Selected>'
+                    . '<option value="' . htmlspecialchars($fc) . '" selected="selected">'
                     . htmlspecialchars($fc) . '</option>';
                 } else {
                     echo "\n" . '                        '
@@ -174,7 +174,7 @@ for ($i = 0; $i < 4; $i++) {
             foreach ($GLOBALS['cfg']['TextOperators'] as $fc) {
                 if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) {
                     echo "\n" . '                        '
-                    . '<option value="' . htmlspecialchars($fc) . '" Selected>'
+                    . '<option value="' . htmlspecialchars($fc) . '" selected="selected">'
                     . htmlspecialchars($fc) . '</option>';
                 } else {
                     echo "\n" . '                        '
@@ -186,7 +186,7 @@ for ($i = 0; $i < 4; $i++) {
             foreach ($GLOBALS['cfg']['NumOperators'] as $fc) {
                 if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) {
                     echo "\n" . '                        '
-                    . '<option value="' .  htmlspecialchars($fc) . '" Selected>'
+                    . '<option value="' .  htmlspecialchars($fc) . '" selected="selected">'
                     . htmlspecialchars($fc) . '</option>';
                 } else {
                     echo "\n" . '                        '
@@ -200,7 +200,7 @@ for ($i = 0; $i < 4; $i++) {
             foreach ($GLOBALS['cfg']['NullOperators'] as $fc) {
                 if (isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc) {
                     echo "\n" . '                        '
-                    . '<option value="' .  htmlspecialchars($fc) . '" Selected>'
+                    . '<option value="' .  htmlspecialchars($fc) . '" selected="selected">'
                     . htmlspecialchars($fc) . '</option>';
                 } else {
                     echo "\n" . '                        '
@@ -255,36 +255,34 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null')
 }
 ?>
     <table class="data">
-    <tr><td><label for="label"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td>
+    <tr><td><label for="dataLabel"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td>
     <td><select name="dataLabel" id='dataLabel' >
         <option value = ''> <?php echo __('None');  ?> </option>
 <?php
 for ($j = 0; $j < $fields_cnt; $j++) {
     if (isset($dataLabel) && $dataLabel == htmlspecialchars($fields_list[$j])) {
 ?>
-        <option value=<?php echo htmlspecialchars($fields_list[$j]);?> selected="selected">  <?php echo htmlspecialchars($fields_list[$j]);?></option>
+        <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected">  <?php echo htmlspecialchars($fields_list[$j]);?></option>
 <?php
     } else {
 ?>
-        <option value=<?php echo htmlspecialchars($fields_list[$j]);?> >  <?php echo htmlspecialchars($fields_list[$j]);?></option>
+        <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" >  <?php echo htmlspecialchars($fields_list[$j]);?></option>
 <?php
     }
 } 
 ?>
     </select>
     </td></tr>
-    <tr><td><label for="label"><?php echo __("Maximum rows to plot"); ?></label></td>
+    <tr><td><label for="maxRowPlotLimit"><?php echo __("Maximum rows to plot"); ?></label></td>
     <td>
 <?php 
-if (isset($maxPlotLimit)) { 
-?>
-    <input type="text" name="maxPlotLimit" value="<?php echo $maxPlotLimit; ?>" /></td></tr>
-<?php
-} else { 
-?>
-    <input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr>
-<?php
+echo '<input type="text" name="maxPlotLimit" id="maxRowPlotLimit" value="';
+if (! empty($maxPlotLimit)) { 
+    echo $maxPlotLimit;
+} else {
+    echo $GLOBALS['cfg']['maxRowPlotLimit'];
 }
+echo '" /></td></tr>';
 ?>
     </table>
 


hooks/post-receive
-- 
phpMyAdmin