Remove HTML from provider_uri and name; also fix default provider_uri when on plugin...

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

diff --git a/ChangeLog b/ChangeLog
index b779179be86354b03fb4e7881d8dbf265e70197e..b286b0ac24f43f4d7005f70545d33d2c3cfb330b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -177,6 +177,7 @@ Version 1.5.2 - SVN
     configuring plugin. Thanks to Peter Steiner.
   - Fixed HttpOnly cookies again.
   - Update for switch from CVS to Subversion.
+  - Default provider URI link fixed (was broken when on plugin options pages, etc)
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/page_header.php b/functions/page_header.php
index b21d13d7d74e0aaca2050e2864f815632ce46fcd..1f8b6ccbfbd5e8dddbc9d29ff961a1f26315ea72 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -240,14 +240,12 @@ function displayPageHeader($color, $mailbox, $sHeaderJs='', $sBodyTagJs = '') {
 
     $sm_attributes = '';
     if (!$hide_sm_attributions) {
-        $sm_attributes .= '<td class="sqm_providerInfo">' ."\n";
         if (empty($provider_uri)) {
-            $sm_attributes .= '   <a href="about.php">SquirrelMail</a>';
+            $sm_attributes .= create_hyperlink($base_uri . 'src/about.php', 'SquirrelMail');
         } else {
-            if (empty($provider_name)) $provider_name= 'SquirrelMail';
-            $sm_attributes .= '   <a href="'.$provider_uri.'" target="_blank">'.$provider_name.'</a>'."\n";
+            if (empty($provider_name)) $provider_name = 'SquirrelMail';
+            $sm_attributes .= create_hyperlink($provider_uri, $provider_name, '_blank');
         }
-        $sm_attributes .= "  </td>\n";
     }
 
     $oTemplate->assign('body_tag_js', $sBodyTagJs);

diff --git a/templates/default/page_header.tpl b/templates/default/page_header.tpl
index 4b7687716eaa87bd7e2e303facb94c37e348b6f4..88c6aeb3edb374985d7b352ee5cc37bae77a9840 100644 (file)
--- a/templates/default/page_header.tpl
+++ b/templates/default/page_header.tpl
@@ -83,7 +83,10 @@ $help_link           = makeInternalLink ('src/help.php', $help_str);
    <?php echo $help_link; ?>&nbsp;&nbsp;
    <?php /* FIXME: no hooks in templates!! */ global $null; do_hook('menuline', $null); ?>
   </td>
-  <?php echo $sm_attribute_str."\n"; ?>
+  <?php if (!empty($sm_attribute_str))
+            echo '<td class="sqm_providerInfo">'
+               . $sm_attribute_str
+               . "</td>\n"; ?>
  </tr>
 </table>
 </div>