[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/plugins/newmail newmail.php,1.10,1.11 setup.php,1.17,1.18
From:       Thijs Kinkhorst <kink () users ! sourceforge ! net>
Date:       2003-09-27 14:42:20
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/plugins/newmail
In directory sc8-pr-cvs1:/tmp/cvs-serv19563

Modified Files:
	newmail.php setup.php 
Log Message:
Display the total of new messages in the newmail popup.
This may go into stable after 1.4.2 because it changes strings.


Index: newmail.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/plugins/newmail/newmail.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- newmail.php	31 Dec 2002 12:49:37 -0000	1.10
+++ newmail.php	27 Sep 2003 14:42:18 -0000	1.11
@@ -18,6 +18,8 @@
 require_once(SM_PATH . 'include/load_prefs.php');
 require_once(SM_PATH . 'functions/page_header.php');
 
+sqGetGlobalVar('numnew', $numnew, SQ_GET);
+
    displayHtmlHeader( _("New Mail"), '', FALSE );
 
    echo "<body bgcolor=\"$color[4]\" topmargin=0 leftmargin=0 rightmargin=0 \
marginwidth=0 marginheight=0>\n". @@ -28,10 +30,14 @@
             ) .
             html_tag( 'tr', "\n" .
                 html_tag( 'td',
-                    '<br><big><font color="' . $color[2] . '">' .
-                    _("You have new mail!") . '</font><br></big><br>' . "\n" .
+                    '<br><big><font color="' . $color[2] . '">' . _("You have").' '.
+		    sprintf( ( $numnew == 1 ?
+		        _("%s new message") :
+			_("%s new messages") ), $numnew ) .
+                    '</font><br></big><br>' . "\n" .
                     '<form name="nm">' . "\n".
-                    '<input type=button name=bt value="' . _("Close Window") .'" \
onClick="javascript:window.close();">'."\n". +                    '<input type=button \
name=bt value="' . _("Close Window") . +                    '" \
onClick="javascript:window.close();">'."\n".  '</form>',
                 'center' )
             ) ,

Index: setup.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/plugins/newmail/setup.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- setup.php	31 Mar 2003 04:18:20 -0000	1.17
+++ setup.php	27 Sep 2003 14:42:18 -0000	1.18
@@ -217,7 +217,8 @@
                 echo "<SCRIPT LANGUAGE=\"JavaScript\">\n".
                     "<!--\n".
                     "function PopupScriptLoad() {\n".
-                        'window.open("'.sqm_baseuri().'plugins/newmail/newmail.php", \
"SMPopup",'. +                        \
'window.open("'.sqm_baseuri().'plugins/newmail/newmail.php?numnew='.$totalNew. +			   \
                '", "SMPopup",'.
                                      "\"width=200,height=130,scrollbars=no\");\n".
                         "if (BeforePopupScript != null)\n".
                             "BeforePopupScript();\n".



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic