浏览代码

Remove the hard coded colors, and use the default theme and css file (set in conf.pl) for the login screen. Makes customization of the login screen alot easier.

Jimmy Conner 22 年之前
父节点
当前提交
c207b75dc3
共有 2 个文件被更改,包括 12 次插入8 次删除
  1. 2 1
      ChangeLog
  2. 10 7
      src/login.php

+ 2 - 1
ChangeLog

@@ -42,7 +42,8 @@ Version 1.5.0 -- CVS
   - Modified conf.pl: default to force usernames lowercase for servers which
     are case-insensitive
   - Applied bugfixes from stable to htmlfilter code.
-  - Fix bug #722933 where resuming a draft message would lose the reference headers.
+  - Fix bug #722933 where resuming a draft message would lose the reference headers
+  - Removed hard coded colors from login.php and made it use the default theme and css file
 
 **************************************
 *** SquirrelMail Stable Series 1.4 ***

+ 10 - 7
src/login.php

@@ -69,10 +69,13 @@ $header = "<script language=\"JavaScript\" type=\"text/javascript\">\n" .
           "  }\n".
           "// -->\n".
           "</script>\n";
-$custom_css = 'none';          
+
+if (@file_exists($theme[$theme_default]['PATH']))
+   @include ($theme[$theme_default]['PATH']);
+
 displayHtmlHeader( "$org_name - " . _("Login"), $header, FALSE );
 
-echo '<body text="#000000" bgcolor="#FFFFFF" link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="squirrelmail_loginpage_onload();">' .
+echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\" squirrelmail_loginpage_onload();>" .
      "\n" . '<form action="redirect.php" method="post">' . "\n";
 
 $username_form_name = 'login_username';
@@ -116,7 +119,7 @@ echo html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
                         '<b>' . sprintf (_("%s Login"), $org_name) . "</b>\n",
-                    'center', '#DCDCDC' )
+                    'center', $color[0] )
                 ) .
                 html_tag( 'tr',
                     html_tag( 'td',  "\n" .
@@ -140,18 +143,18 @@ echo html_tag( 'table',
                                     '<input type="hidden" name="just_logged_in" value="1" />' . "\n",
                                 'left', '', 'width="*"' )
                             ) ,
-                        'center', '#ffffff', 'border="0" width="100%"' ) ,
-                    'left', '#FFFFFF' )
+                        'center', $color[4], 'border="0" width="100%"' ) ,
+                    'left', $color[4] )
                 ) . 
                 html_tag( 'tr',
                     html_tag( 'td',
                         '<center><input type="submit" value="' . _("Login") . '" /></center>',
                     'left' )
                 ),
-            '', '#ffffff', 'border="0" width="350"' ) . '</center>',
+            '', $color[4], 'border="0" width="350"' ) . '</center>',
         'center' )
     ) ,
-'', '#ffffff', 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
+'', $color[4], 'border="0" cellspacing="0" cellpadding="0" width="100%"' );
 do_hook('login_form');
 echo '</form>' . "\n";