Remove HTML from org_logo on logout error page

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

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 263c85eddc8ee3e1a9da33654b06baa0fc423490..47a55f99fc66d0df5711fa77cf8f9909f010419c 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -77,22 +77,23 @@ function logout_error( $errString, $errTitle = '' ) {
     /* If they don't have a logo, don't bother.. */
     $logo_str = '';
     if (isset($org_logo) && $org_logo) {
-        /* Display width and height like good little people */
-        $width_and_height = '';
+
         if (isset($org_logo_width) && is_numeric($org_logo_width) &&
          $org_logo_width>0) {
-            $width_and_height = " width=\"$org_logo_width\"";
+            $width = $org_logo_width;
+        } else {
+            $width = '';
         }
         if (isset($org_logo_height) && is_numeric($org_logo_height) &&
          $org_logo_height>0) {
-            $width_and_height .= " height=\"$org_logo_height\"";
+            $height = $org_logo_height;
+        } else {
+            $height = '';
         }
-        
-        $logo_str = '<img src="'.$org_logo.'" ' .
-                    'alt="'. sprintf(_("%s Logo"), $org_name).'" ' .
-                    $width_and_height .
-                    'class="sqm_loginImage" ' .
-                    ' /><br />'."\n";
+
+        $logo_str = create_image($org_logo, sprintf(_("%s Logo"), $org_name),
+                                 $width, $height, '', 'sqm_loginImage');
+
     }
     
     $sm_attribute_str = '';

diff --git a/templates/default/error_logout.tpl b/templates/default/error_logout.tpl
index 2f2f558eb402349310ecc15db3385d4d33216e11..a81057fb046533119318cf1e26fbf6134fbcae21 100644 (file)
--- a/templates/default/error_logout.tpl
+++ b/templates/default/error_logout.tpl
@@ -32,7 +32,7 @@ extract ($t);
  <tr>
   <td colspan="2">
    <?php 
-       echo $logo_str;
+       echo $logo_str; if (!empty($logo_str)) echo '<br />'; 
        echo nl2br($sm_attribute_str) . (empty($sm_attribute_str) ? '' : '<br /><br />'); 
    ?>
   </td>