use Perl's function for this. Don't know what I was thinking.

[squirrelmail.git] / src / login.php

diff --git a/src/login.php b/src/login.php
index 3d0f0159fd145164b8fd556755b5dd713d5d1a83..9fd1c6ab5180c5ded562ce0c59edfddd18c7b2f8 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -71,13 +71,18 @@ do_hook('login_top');
 
 $loginname_value = (isset($loginname) ? htmlspecialchars($loginname) : '');
 
-/* 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\"";
-}
-if (isset($org_logo_height) && is_numeric($org_logo_height) && $org_logo_height>0) {
-    $width_and_height .= " height=\"$org_logo_height\"";
+/* If they don't have a logo, don't bother.. */
+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\"";
+    }
+    if (isset($org_logo_height) && is_numeric($org_logo_height) &&
+     $org_logo_height>0) {
+        $width_and_height .= " height=\"$org_logo_height\"";
+    }
 }
 
 echo "\n" . '<form action="redirect.php" method="post">' . "\n" .
@@ -85,8 +90,11 @@ html_tag( 'table',
     html_tag( 'tr',
         html_tag( 'td',
             '<center>'.
-            '<img src="' . $org_logo . '" alt="' . sprintf(_("%s Logo"), $org_name) .'"' .
-            $width_and_height .' /><br />' . "\n".
+            ( isset($org_logo) && $org_logo
+              ? '<img src="' . $org_logo . '" alt="' .
+                sprintf(_("%s Logo"), $org_name) .'"' . $width_and_height .
+                ' /><br />' . "\n"
+              : '' ).
             ( $hide_sm_attributions ? '' :
             '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />' ."\n".
             '  ' . _("By the SquirrelMail Development Team") . '<br /></small>' . "\n" ) .
@@ -128,10 +136,9 @@ html_tag( 'table',
             '', '#ffffff', 'border="0" width="350"' ) . '</center>',
         'center' )
     ) ,
-'', '#ffffff', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) .
-'</form>' . "\n";
-
+'', '#ffffff', 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
 do_hook('login_form');
+echo '</form>' . "\n";
 
 do_hook('login_bottom');
 echo "</body>\n".