head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.4
	OPENPKG_E1_MP:1.4
	OPENPKG_E1_MP_2_STABLE:1.4.2.2
	OPENPKG_E1_FP:1.4.2.2
	OPENPKG_2_STABLE_MP:1.4
	OPENPKG_2_STABLE_20061018:1.4.2.2
	OPENPKG_2_STABLE:1.4.0.2
	OPENPKG_CW_FP:1.2;
locks; strict;
comment	@# @;


1.4
date	2006.10.15.12.00.47;	author rse;	state Exp;
branches
	1.4.2.1;
next	1.3;
commitid	bx9ZE2JrwydF6MQr;

1.3
date	2005.07.30.19.23.45;	author steve;	state Exp;
branches;
next	1.2;

1.2
date	2005.03.20.16.06.38;	author ms;	state Exp;
branches;
next	1.1;

1.1
date	2005.03.16.18.23.45;	author ms;	state Exp;
branches;
next	;

1.4.2.1
date	2006.10.15.12.00.47;	author rse;	state dead;
branches;
next	1.4.2.2;
commitid	iZxwRSmmWscPXUQr;

1.4.2.2
date	2006.10.16.14.56.46;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@package cleanups and addition of 'username' module -- taken over from Michael Schloh's patch set
@
text
@Index: functions/display_messages.php
--- functions/display_messages.php.orig	2005-03-21 23:18:32 +0100
+++ functions/display_messages.php	2005-07-30 21:15:29 +0200
@@@@ -88,8 +88,8 @@@@
              "\"$width_and_height /><br />\n";
     }
     echo ( $hide_sm_attributions ? '' :
-            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />'.
-            _("By the SquirrelMail Project Team") . "<br /></small>\n" ).
+            '<br />'.
+            "<br />\n" ).
          '<table cellspacing="1" cellpadding="0" bgcolor="'.$color[1].'" width="70%">'.
          '<tr><td>'.
          '<table width="100%" border="0" bgcolor="'.$color[4].'" align="center">'.
Index: functions/imap_general.php
--- functions/imap_general.php.orig	2005-05-20 12:37:34 +0200
+++ functions/imap_general.php	2005-07-30 21:14:27 +0200
@@@@ -568,6 +568,7 @@@@
 
                 set_up_language($squirrelmail_language, true);
                 include_once(SM_PATH . 'functions/display_messages.php' );
+                do_hook('invalid_login'); /* used with squirrelmail_logger */
                 sqsession_destroy();
                 /* terminate the session nicely */
                 sqimap_logout($imap_stream);
Index: src/login.php
--- src/login.php.orig	2005-06-22 15:45:35 +0200
+++ src/login.php	2005-07-30 21:15:39 +0200
@@@@ -132,8 +132,8 @@@@
                 ' /><br />' . "\n"
               : '' ).
             ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
-            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />' ."\n".
-            '  ' . _("By the SquirrelMail Project Team") . '<br /></small>' . "\n" ) .
+            '<br />' ."\n".
+            '<br />' . "\n" ) .
             html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
Index: src/right_main.php
--- src/right_main.php.orig	2005-06-15 23:12:05 +0200
+++ src/right_main.php	2005-07-30 21:14:27 +0200
@@@@ -182,6 +182,7 @@@@
                              )
                         ) ,
                     'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
+            echo "<br />\n";
         }
     }
 }
@


1.4.2.1
log
@file squirrelmail.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:56:46 +0000
@
text
@d1 50
@


1.4.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 50
Index: functions/display_messages.php
--- functions/display_messages.php.orig	2005-03-21 23:18:32 +0100
+++ functions/display_messages.php	2005-07-30 21:15:29 +0200
@@@@ -88,8 +88,8 @@@@
              "\"$width_and_height /><br />\n";
     }
     echo ( $hide_sm_attributions ? '' :
-            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />'.
-            _("By the SquirrelMail Project Team") . "<br /></small>\n" ).
+            '<br />'.
+            "<br />\n" ).
          '<table cellspacing="1" cellpadding="0" bgcolor="'.$color[1].'" width="70%">'.
          '<tr><td>'.
          '<table width="100%" border="0" bgcolor="'.$color[4].'" align="center">'.
Index: functions/imap_general.php
--- functions/imap_general.php.orig	2005-05-20 12:37:34 +0200
+++ functions/imap_general.php	2005-07-30 21:14:27 +0200
@@@@ -568,6 +568,7 @@@@
 
                 set_up_language($squirrelmail_language, true);
                 include_once(SM_PATH . 'functions/display_messages.php' );
+                do_hook('invalid_login'); /* used with squirrelmail_logger */
                 sqsession_destroy();
                 /* terminate the session nicely */
                 sqimap_logout($imap_stream);
Index: src/login.php
--- src/login.php.orig	2005-06-22 15:45:35 +0200
+++ src/login.php	2005-07-30 21:15:39 +0200
@@@@ -132,8 +132,8 @@@@
                 ' /><br />' . "\n"
               : '' ).
             ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' :
-            '<small>' . sprintf (_("SquirrelMail version %s"), $version) . '<br />' ."\n".
-            '  ' . _("By the SquirrelMail Project Team") . '<br /></small>' . "\n" ) .
+            '<br />' ."\n".
+            '<br />' . "\n" ) .
             html_tag( 'table',
                 html_tag( 'tr',
                     html_tag( 'td',
Index: src/right_main.php
--- src/right_main.php.orig	2005-06-15 23:12:05 +0200
+++ src/right_main.php	2005-07-30 21:14:27 +0200
@@@@ -182,6 +182,7 @@@@
                              )
                         ) ,
                     'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
+            echo "<br />\n";
         }
     }
 }
@


1.3
log
@upgrading package: squirrelmail 1.4.4 -> 1.4.5
@
text
@d4 1
a4 1
@@@@ -106,8 +106,8 @@@@
d18 1
a18 1
@@@@ -569,6 +569,7 @@@@
d29 1
a29 1
@@@@ -117,8 +117,8 @@@@
d43 1
a43 1
@@@@ -185,6 +185,7 @@@@
@


1.2
log
@make compatibility and logger plugins mandatory, add rc file for log rotation, install better PNG files, and correct GPG plugin paths
@
text
@d2 3
a4 4
diff -Nau functions/display_messages.php.orig functions/display_messages.php
--- functions/display_messages.php.orig	2005-03-16 14:19:09.834557000 +0100
+++ functions/display_messages.php	2005-03-16 14:19:14.176437000 +0100
@@@@ -107,8 +107,8 @@@@
d9 1
a9 1
-            _("By the SquirrelMail Development Team") . "<br /></small>\n" ).
d15 11
d27 3
a29 4
diff -Nau src/login.php.orig src/login.php
--- src/login.php.orig	2005-03-16 14:19:21.207817000 +0100
+++ src/login.php	2005-03-16 14:19:26.038991000 +0100
@@@@ -110,8 +110,8 @@@@
d34 1
a34 1
-            '  ' . _("By the SquirrelMail Development Team") . '<br /></small>' . "\n" ) .
d41 2
a42 3
diff -Nau src/right_main.php.orig src/right_main.php
--- src/right_main.php.orig	2005-03-16 16:41:39.703294000 +0100
+++ src/right_main.php	2005-03-16 16:41:43.220847000 +0100
a50 12
Index: functions/imap_general.php
diff -Nau functions/imap_general.php.orig functions/imap_general.php
--- functions/imap_general.php.orig	2005-03-20 16:42:59.000000000 +0100
+++ functions/imap_general.php	2005-03-20 16:49:00.330978000 +0100
@@@@ -573,6 +573,7 @@@@
 
                 set_up_language($squirrelmail_language, true);
                 include_once(SM_PATH . 'functions/display_messages.php' );
+                do_hook('invalid_login'); /* used with squirrelmail_logger */
                 sqsession_destroy();
                 /* terminate the session nicely */
                 sqimap_logout($imap_stream);
@


1.1
log
@overhaul everything, don't install development 1.5.x trunk, new with_plugins option
@
text
@d2 1
a2 1
diff -Nau functions/display_messages.php functions/display_messages.php
d17 1
a17 1
diff -Nau src/login.php src/login.php
d32 2
a33 2
diff -Nau src/right_main.php src/right_main.php
--- src/right_main.php	2005-03-16 16:41:39.703294000 +0100
d43 12
@