Get a little extra room for internal links when attributions are off

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

diff --git a/functions/page_header.php b/functions/page_header.php
index ceea10b213ed773b2ff3a652d0fcbc0bb90f1289..53c5d003e4603a30a125b22c3c586989405495ef 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -254,7 +254,9 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
     echo "</b></td>\n"
         . "   </tr>\n"
         . html_tag( 'tr', '', '', $color[4] ) ."\n"
     echo "</b></td>\n"
         . "   </tr>\n"
         . html_tag( 'tr', '', '', $color[4] ) ."\n"

-        . html_tag( 'td', '', 'left' ) ."\n";
+        . ($hide_sm_attributions ? html_tag( 'td', '', 'left', '', 'colspan="2"' )
+                                 : html_tag( 'td', '', 'left' ) )
+        . "\n";

     $urlMailbox = urlencode($mailbox);
     echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox);
     echo "&nbsp;&nbsp;\n";
     $urlMailbox = urlencode($mailbox);
     echo makeComposeLink('src/compose.php?mailbox='.$urlMailbox);
     echo "&nbsp;&nbsp;\n";


@@ -271,14 +273,17 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
 
     do_hook('menuline');
 
 
     do_hook('menuline');
 

-    echo "      </td>\n"
-        . html_tag( 'td', '', 'right' ) ."\n";
-    if (!isset($provider_uri)) $provider_uri= 'http://www.squirrelmail.org/';
-    if (!isset($provider_name)) $provider_name= 'SquirrelMail';
-    echo ($hide_sm_attributions ? '&nbsp;' :
-            '<a href="'.$provider_uri.'" target="_blank">'.$provider_name.'</a>');
-    echo "</td>\n".
-        "   </tr>\n".
+    echo "      </td>\n";
+
+    if (!$hide_sm_attributions)
+    {
+        echo html_tag( 'td', '', 'right' ) ."\n";
+        if (!isset($provider_uri)) $provider_uri= 'http://www.squirrelmail.org/';
+        if (!isset($provider_name)) $provider_name= 'SquirrelMail';
+        echo '<a href="'.$provider_uri.'" target="_blank">'.$provider_name.'</a>';
+        echo "</td>\n";
+    }
+    echo "   </tr>\n".

         "</table><br>\n\n";
 }
 
         "</table><br>\n\n";
 }