From cd00d5f60083f3486352f9febc02f80081e7a923 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Mon, 3 Jul 2006 14:32:15 +0000
Subject: [PATCH] bug #1477576 with rtl langs, navi links open in wrong frame

---
 ChangeLog                | 12 ++++++++----
 libraries/footer.inc.php | 23 +++++++++++++++--------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34adbf596..fbf15eea4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,16 +5,20 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-07-03 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/footer.inc.php: bug #1477576 with rtl langs, navi links open in
+      wrong frame
+
 2006-07-02 Marc Delisle  <lem9@users.sourceforge.net>
     * db_operations.php: undefined $table when copying a db
 
 2006-06-30 Marc Delisle  <lem9@users.sourceforge.net>
-    * libraries/common.lib.php: escape also single quotes   
-    ### 2.8.2 released from QA_2_8 
+    * libraries/common.lib.php: escape also single quotes
+    ### 2.8.2 released from QA_2_8
 
 2006-06-28 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/Config.class.php: remove debug code
-    * libraries/common.lib.php: escape allowed parameters from non-token 
+    * libraries/common.lib.php: escape allowed parameters from non-token
       requests
 
 2006-06-27 Michal Čihař  <michal@cihar.com>
@@ -43,7 +47,7 @@ $Source$
     * libraries/database_interface.lib.php, /export/sql.php, lang/*:
     export of procedures and functions. Note: this needs improvement
     because currently the DELIMITER for procedures is exported as a
-    comment. Users could remove the comment marker and feed this 
+    comment. Users could remove the comment marker and feed this
     to command-line mysql but it would be better to generate DELIMITER
     not as a comment and parse it while importing.
 
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 3702dac66..0ddbcee0b 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -65,19 +65,26 @@ if (window.parent.refreshLeft) {
 if (parent.querywindow && !parent.querywindow.closed && parent.querywindow.location) {
     self.focus();
 }
-<?php } ?>
+<?php }
 
-if (window.parent.frames[1]) {
+if ($GLOBALS['text_dir'] === 'ltr') {
+    $mainframe_number = 1;
+} else {
+    $mainframe_number = 0;
+}
+?>
+
+if (window.parent.frames[<?php echo $mainframe_number; ?>]) {
     // reset content frame name, as querywindow needs to set a unique name
     // before submitting form data, and navigation frame needs the original name
-    if (window.parent.frames[1].name != 'frame_content') {
-        window.parent.frames[1].name = 'frame_content';
+    if (window.parent.frames[<?php echo $mainframe_number; ?>].name != 'frame_content') {
+        window.parent.frames[<?php echo $mainframe_number; ?>].name = 'frame_content';
     }
-    if (window.parent.frames[1].id != 'frame_content') {
-        window.parent.frames[1].id = 'frame_content';
+    if (window.parent.frames[<?php echo $mainframe_number; ?>].id != 'frame_content') {
+        window.parent.frames[<?php echo $mainframe_number; ?>].id = 'frame_content';
     }
-    //window.parent.frames[1].setAttribute('name', 'frame_content');
-    //window.parent.frames[1].setAttribute('id', 'frame_content');
+    //window.parent.frames[<?php echo $mainframe_number; ?>].setAttribute('name', 'frame_content');
+    //window.parent.frames[<?php echo $mainframe_number; ?>].setAttribute('id', 'frame_content');
 }
 //]]>
 </script>