Removed right target, which is redundant and problematic when viewing right frame...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6317 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index e3539e0be1c0e09d0bd4fe45607c21e43d15aff8..67dccac59a3021f8ec153f2eef40d1435c31c24c 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -1005,7 +1005,7 @@ function get_paginator_link($box, $start_msg, $use, $text) {
 
     $result = "<A HREF=\"right_main.php?use_mailbox_cache=$use"
             . "&amp;startMessage=$start_msg&amp;mailbox=$box\" "
-            . "TARGET=\"right\">$text</A>";
+            . ">$text</A>";
     return ($result);
 /*
     if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) {
@@ -1016,7 +1016,7 @@ function get_paginator_link($box, $start_msg, $use, $text) {
 
     $result = '<A HREF="'. $source_url . "?use_mailbox_cache=$use"
             . "&amp;startMessage=$start_msg&amp;mailbox=$box\" "
-            . "TARGET=\"right\">$text</A>";
+            . ">$text</A>";
     return ($result);
 */
 }

diff --git a/functions/page_header.php b/functions/page_header.php
index b134b141c95818cbc86670ebc7f74adde5ecf0fa..784e552853ec025fb63de323869a037313f12b22 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -303,15 +303,15 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
     $urlMailbox = urlencode($mailbox);
     echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox.'&startMessage='.$startMessage);
     echo "  \n";
-    displayInternalLink ('src/addressbook.php', _("Addresses"), 'right');
+    displayInternalLink ('src/addressbook.php', _("Addresses"));
     echo "  \n";
-    displayInternalLink ('src/folders.php', _("Folders"), 'right');
+    displayInternalLink ('src/folders.php', _("Folders"));
     echo "  \n";
-    displayInternalLink ('src/options.php', _("Options"), 'right');
+    displayInternalLink ('src/options.php', _("Options"));
     echo "  \n";
-    displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), 'right');
+    displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"));
     echo "  \n";
-    displayInternalLink ('src/help.php', _("Help"), 'right');
+    displayInternalLink ('src/help.php', _("Help"));
     echo "  \n";
 
     do_hook('menuline');

diff --git a/functions/strings.php b/functions/strings.php
index 29def4c6689186cb838cfa43f8f9c8a6149fb186..9c5981a94b0d50fe243ff3f1357ca52b1f6c08df 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -488,7 +488,7 @@ function TrimArray(&$array) {
  * @param string text the link text, default "Compose"
  * @return string a link to the compose page
  */
-function makeComposeLink($url, $text = null)
+function makeComposeLink($url, $text = null, $target='')
 {
     global $compose_new_win,$javascript_on;
 
@@ -500,7 +500,7 @@ function makeComposeLink($url, $text = null)
     // if not using "compose in new window", make 
     // regular link and be done with it
     if($compose_new_win != '1') {
-        return makeInternalLink($url, $text, 'right');
+        return makeInternalLink($url, $text, $target);
     }