projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e4a1f09)
Remove the hard coded colors, and use the default theme and css file (set in conf...
authorcigamit <cigamit@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sun, 29 Jun 2003 21:41:06 +0000 (21:41 +0000)
committercigamit <cigamit@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sun, 29 Jun 2003 21:41:06 +0000 (21:41 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5177 7612ce4b-ef26-0410-bec9-ea0150e637f0

ChangeLog patch | blob | blame | history
src/login.php patch | blob | blame | history

diff --git a/ChangeLog b/ChangeLog
index 191bb0ba59162b1f0a3ead3602050d87eae3d355..2765e938777aff7eb5cc6c35b78226425cac5666 100644 (file)
--- a/ChangeLog
+++ b/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 ***
diff --git a/src/login.php b/src/login.php
index 4c4c41c3f0fa3c3115ba34c69f3f97cdc997fea1..6603edea9b485a8b48ed708c91fe321ff4fd365d 100644 (file)
--- a/src/login.php
+++ b/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";
 
Unnamed repository; edit this file 'description' to name the repository.