From fb923f851afa595332e2d6ee6516590bf6f358e4 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Thu, 3 Nov 2005 17:50:09 +0000
Subject: [PATCH] fixed some rtl lang issues

---
 ChangeLog                |  2 ++
 left.php                 | 56 +++++++++++++++++++++++++---------------
 libraries/common.lib.php | 11 +++++---
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3691e1f50..c979d0a4e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ $Source$
       fixed different font sizes
     * footer.inc.php, libraries/dbg/*:
       use $GLOBALS as this scripts can be included from inside a function
+    * left.php, libraries/common.lib.php:
+      fixed some rtl lang issues
     
 2005-11-02 Michal Čihař  <michal@cihar.com>
     * config.default.php: This is not a configuration file.
diff --git a/left.php b/left.php
index 4ddec556e..4ff3e955d 100644
--- a/left.php
+++ b/left.php
@@ -6,18 +6,13 @@
  */
 
 /**
- * Gets the variables sent to this script, retains the db name that may have
- * been defined as startup option and include a core library
+ * Gets a core script and starts output buffering work
  */
-require_once('./libraries/grab_globals.lib.php');
+require_once('./libraries/common.lib.php');
 
 // free the session file, for the other frames to be loaded
 session_write_close();
 
-/**
- * Gets a core script and starts output buffering work
- */
-require_once('./libraries/common.lib.php');
 require_once('./libraries/ob.lib.php');
 if ($GLOBALS['cfg']['OBGzip']) {
     $ob_mode = PMA_outBufferModeGet();
@@ -160,8 +155,7 @@ if ( $num_dbs === 0 ) {
         .'</div>' . "\n";
     unset( $_location );
 }
-?>
-<!-- Databases and tables list -->
+?> 
 <div id="left_tableList">
 <?php
 // Don't display expansible/collapsible database info if:
@@ -288,7 +282,7 @@ function PMA_displayDbList( $ext_dblist ) {
                 echo '</a>';
                 
                 // ... and we need to refresh both frames on db selection
-                ?>
+                ?> 
                 <a class="item"
                     id="<?php echo htmlspecialchars(  $db['name'] ); ?>"
                     href="index.php?<?php echo $common_url_query; ?>"
@@ -300,20 +294,34 @@ function PMA_displayDbList( $ext_dblist ) {
                         window.parent.goTo( './<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] 
                             . '?' . $common_url_query; ?>', 'main' );
                         return false;">
-                    <?php echo htmlspecialchars( $db['disp_name'] ); ?>
-                    (<?php echo $db['num_tables']; ?>)
+                    <?php
+                    if ( $GLOBALS['text_dir'] === 'rtl' ) {
+                        echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> ';
+                    }
+                    echo htmlspecialchars( $db['disp_name'] );
+                    if ( $GLOBALS['text_dir'] === 'ltr' ) {
+                        echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> ';
+                    }
+                    ?> 
                 </a>
                 <?php
             } else {
                 // with only 1 db available we dont need to refresh left frame
                 // on db selection, only phpmain
-                ?>
+                ?> 
                 <a href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] 
                     . '?' . $common_url_query; ?>"
                     id="<?php echo htmlspecialchars( $db['name'] ); ?>"
                     title="<?php echo htmlspecialchars( $db['comment'] ); ?>">
-                    <?php echo htmlspecialchars( $db['disp_name'] ); ?>
-                    (<?php echo $db['num_tables']; ?>)
+                    <?php
+                    if ( $GLOBALS['text_dir'] === 'rtl' ) {
+                        echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> ';
+                    }
+                    echo htmlspecialchars( $db['disp_name'] );
+                    if ( $GLOBALS['text_dir'] === 'ltr' ) {
+                        echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> ';
+                    }
+                    ?> 
                 </a>
                 <?php
             }
@@ -410,8 +418,7 @@ function PMA_displayTableList( $tables, $visible = false,
                 printf( $img_plus, $element_counter );
             }
             echo '</a>';
-            
-            ?>
+            ?> 
             <a href="index.php?<?php echo $common_url_query; ?>"
                 target="_parent" 
                 onclick="
@@ -420,8 +427,15 @@ function PMA_displayTableList( $tables, $visible = false,
                     window.parent.goTo( './<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] 
                         . '?' . $common_url_query; ?>', 'main' );
                     return false;">
-                <?php echo htmlspecialchars( substr( $group, 0, strlen( $group ) - strlen( $sep ) ) ); ?>
-                (<?php echo $table['tab_count']; ?>)
+                <?php
+                if ( $GLOBALS['text_dir'] === 'rtl' ) {
+                    echo ' <bdo dir="ltr">(' . $table['tab_count'] . ')</bdo> ';
+                }
+                echo htmlspecialchars( substr( $group, 0, strlen( $group ) - strlen( $sep ) ) );
+                if ( $GLOBALS['text_dir'] === 'ltr' ) {
+                    echo ' <bdo dir="ltr">(' . $table['tab_count'] . ')</bdo> ';
+                }
+                ?> 
             </a>
             <?php
             
@@ -472,9 +486,9 @@ function PMA_displayTableList( $tables, $visible = false,
             echo '</li>' . "\n";
         }
     }
-    echo '</ul>' . "\n";
+    echo '</ul>';
 }
-?>
+?> 
 </div>
 </body>
 </html>
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 60a4b133c..ebe96841c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -898,9 +898,12 @@ function PMA_getDbList() {
  */
 function PMA_getHtmlSelectDb( $selected = '' ) {
     $dblist = PMA_getDbList();
-    $return = '<select name="db" id="lightm_db"'
+    // TODO: IE can not handle different text directions in select boxes
+    // so, as mostly names will be in english, we set the whole selectbox to LTR
+    // and EN
+    $return = '<select name="db" id="lightm_db" xml:lang="en" dir="ltr"'
         .' onchange="window.parent.openDb( this.value );">' . "\n"
-        .'<option value="">(' . $GLOBALS['strDatabases'] . ') ...</option>'
+        .'<option value="" dir="' . $GLOBALS['text_dir'] . '">(' . $GLOBALS['strDatabases'] . ') ...</option>'
         ."\n";
     foreach( $dblist as $group => $dbs ) {
         if ( count( $dbs ) > 1 ) {
@@ -913,8 +916,8 @@ function PMA_getHtmlSelectDb( $selected = '' ) {
             $cut = false;
         }
         foreach( $dbs as $db ) {
-            $return .= '<option value="' . $db['name'] . '" '
-                .'title="' . $db['comment'] . '"';
+            $return .= '<option value="' . $db['name'] . '"'
+                .' title="' . $db['comment'] . '"';
             if ( $db['name'] == $selected ) {
                 $return .= ' selected="selected"';
             }