From: naoki i. <am...@us...> - 2008-04-17 15:13:12
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6287/skins/default Modified Files: administration-page.thtml advanced-page.thtml common-bottom.thtml nntp-configuration.thtml pop3-chain-panel.thtml pop3-configuration-panel.thtml smtp-configuration.thtml socks-widget.thtml users-page.thtml windows-configuration.thtml Log Message: Change Log 1. The session keys are now released when they are expired 2. New global parameter 'GLOBAL_session_timeout' (default : 1800 seconds) 3. Replaced get_administrator_session_key with get_single_user_session_key Classifier/Bayes.pm UI/HTML.pm POPFile/History.pm POPFile/Configuration.pm tests/TestConfiguration.tst The session keys which does not used in GLOBAL_session_timeout seconds will be released. NOTE : The session key for the administrator which got from get_administrator_session_key won't be expired. For this reason, please use get_single_user_session_key instead of get_administrator_session_key in the single user mode. NOTE : The 'last used time' is updated when valid_session_key__ is called with the session key. 4. Added 'Single User Mode Parameters' section in the Advanced tab UI/HTML.pm skins/default/advanced-page.thtml languages/English.msg languages/Nihongo.msg All POPFile parameters now can be changed in the single user mode. 'Single User Mode Parameters' section has been added below the 'Global POPFile Parameters' section. 5. Updated translation file languages/Nihongo.msg 6. The session cache is purged when the session key is released 7. The query is stopped when the session key is released UI/HTML.pm 8. Added escape_html_() function in HTTP.pm UI/HTTP.pm UI/HTML.pm tests/TestHTML.script This function is used for escaping ", <, >, &, ' characters. They are converted to ", <, >, & and ' 9. The matched header is showed/emphasized if the magnets are used UI/HTML.pm POPFile/History.pm Classifier/Bayes.pm tests/TestHTML.script The magnet icon's "title" will be like 'From:te...@ex...' in the history tab. The header information will be showed/emphasized in the single message view. 10. Minor fixes of the skins skins/default/common-bottom.thtml skins/default/users-page.thtml skins/default/administration-page.thtml skins/default/pop3-chain-panel.thtml skins/default/pop3-configuration-panel.thtml skins/default/socks-widget.thtml skins/default/nntp-configuration.thtml skins/default/smtp-configuration.thtml skins/default/windows-configuration.thtml Proxy/POP3.pm Proxy/NNTP.pm Proxy/SMTP.pm Platform/MSWin32.pm tests/TestPOP3.tst tests/TestHTML.tst Current state of the test suite: TestBayesScript PASS TestBayes PASS TestConfiguration PASS * TestHistory PASS TestHTML PASS * TestHTTP PASS TestIMAP PASS TestInsertScript PASS * TestLogger PASS TestMailParse PASS TestModule PASS TestMQ PASS TestMutex PASS TestPipeScript PASS TestPOP3 PASS TestProxy PASS TestWordMangle PASS TestXMLRPC PASS * : TODO : needs to add tests for multi user support Index: pop3-configuration-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-configuration-panel.thtml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pop3-configuration-panel.thtml 30 Mar 2008 05:33:58 -0000 1.11 --- pop3-configuration-panel.thtml 17 Apr 2008 15:13:05 -0000 1.12 *************** *** 5,52 **** <br /> <input name="pop3_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="POP3_Configuration_Port">" /> ! <input type="submit" class="submit" name="update_pop3_port" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> - <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <label class="configurationLabel" for="configPopSeparator"> <TMPL_VAR NAME="Localize_Configuration_POP3Separator">: </label> <br /> ! <input name="pop3_separator" id="configPopSeparator" type="text" value="<TMPL_VAR NAME="POP3_Configuration_Separator">" /> ! <input type="submit" class="submit" name="update_pop3_separator" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> ! ! <label class="configurationLabel" for="pop3forceFork"> ! <TMPL_VAR NAME="Localize_Configuration_POPFork">: ! </label> ! <br /> ! <table border="0" cellpadding="0" cellspacing="0" summary=""> ! <tr> ! <td nowrap="nowrap"> ! ! <TMPL_IF NAME="POP3_Configuration_If_Force_Fork"> ! ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_No"> ! </span> ! <input type="submit" class="submit toggleOn" id="pop3forceFork" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="pop3_force_fork" value="1" /> ! </form> ! ! <TMPL_ELSE> ! ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="submit toggleOff" id="pop3forceFork" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> ! <input type="hidden" name="pop3_force_fork" value="0" /> ! </form> ! </TMPL_IF> ! </td> ! </tr> ! </table> <br /> --- 5,24 ---- <br /> <input name="pop3_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="POP3_Configuration_Port">" /> ! <br /> <label class="configurationLabel" for="configPopSeparator"> <TMPL_VAR NAME="Localize_Configuration_POP3Separator">: </label> <br /> ! <input name="pop3_separator" id="configPopSeparator" type="text" value="<TMPL_VAR NAME="POP3_Configuration_Separator">" maxlength="1" /> ! <br /> ! <input name="pop3_force_fork" id="pop3forceFork" type="checkbox" value="1" <TMPL_IF NAME="POP3_Configuration_If_Force_Fork">checked</TMPL_IF> /> ! <label class="configurationLabel" for="pop3forceFork"> ! <TMPL_VAR NAME="Localize_Configuration_POPFork"> ! </label> ! <br /><br /> ! <input type="submit" class="submit" name="update_pop3_configuration" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> <br /> Index: socks-widget.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/socks-widget.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** socks-widget.thtml 22 May 2005 11:13:50 -0000 1.8 --- socks-widget.thtml 17 Apr 2008 15:13:05 -0000 1.9 *************** *** 5,12 **** <br /> <input type="text" name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_server" id="<TMPL_VAR NAME="Socks_Widget_Name">SOCKSServer" value="<TMPL_VAR NAME="Socks_Server">" /> ! <input type="submit" class="submit" name="update_<TMPL_VAR NAME="Socks_Widget_Name">_socks_server" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> ! ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <label class="configurationLabel" for="<TMPL_VAR NAME="Socks_Widget_Name">configSOCKSPort"> <TMPL_VAR NAME="Localize_Configuration_SOCKSPort">: --- 5,9 ---- <br /> <input type="text" name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_server" id="<TMPL_VAR NAME="Socks_Widget_Name">SOCKSServer" value="<TMPL_VAR NAME="Socks_Server">" /> ! <br /> <label class="configurationLabel" for="<TMPL_VAR NAME="Socks_Widget_Name">configSOCKSPort"> <TMPL_VAR NAME="Localize_Configuration_SOCKSPort">: *************** *** 14,17 **** --- 11,16 ---- <br /> <input name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_port" type="text" id="<TMPL_VAR NAME="Socks_Widget_Name">configSOCKSPort" value="<TMPL_VAR NAME="Socks_Port">" /> + + <br /><br /> <input type="submit" class="submit" name="update_<TMPL_VAR NAME="Socks_Widget_Name">_socks_port" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> Index: nntp-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/nntp-configuration.thtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** nntp-configuration.thtml 30 Mar 2008 05:33:58 -0000 1.2 --- nntp-configuration.thtml 17 Apr 2008 15:13:05 -0000 1.3 *************** *** 1,3 **** ! <form action="/administration" method="post"> <label class="configurationLabel" for="configNNTPPort"> <TMPL_VAR NAME="Localize_Configuration_NNTPPort">: --- 1,3 ---- ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <label class="configurationLabel" for="configNNTPPort"> <TMPL_VAR NAME="Localize_Configuration_NNTPPort">: *************** *** 5,50 **** <br /> <input name="nntp_port" type="text" id="configNNTPPort" value="<TMPL_VAR NAME="nntp_port">" /> ! <input type="submit" class="submit" name="update_nntp_port" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> - <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> <label class="configurationLabel" for="configNntpSeparator"> <TMPL_VAR NAME="Localize_Configuration_NNTPSeparator">: </label> <br /> ! <input name="nntp_separator" id="configNntpSeparator" type="text" value="<TMPL_VAR NAME="nntp_separator">" /> ! <input type="submit" class="submit" name="update_nntp_separator" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> ! ! <label class="configurationLabel" for="nntpForceFork"> ! <TMPL_VAR NAME="Localize_Configuration_NNTPFork">: ! </label> ! <br /> ! <table border="0" cellpadding="0" cellspacing="0" summary=""> ! <tr> ! <td nowrap="nowrap"> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! ! <TMPL_IF NAME="nntp_force_fork_on"> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="toggleOff" id="nntpForceFork" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> ! <input type="hidden" name="nntp_force_fork" value="0" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_No"> ! </span> ! <input type="submit" class="toggleOn" id="nntpForceFork" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="nntp_force_fork" value="1" /> ! </TMPL_IF> ! </form> ! </td> ! </tr> ! </table> <br /> --- 5,24 ---- <br /> <input name="nntp_port" type="text" id="configNNTPPort" value="<TMPL_VAR NAME="nntp_port">" /> ! <br /> <label class="configurationLabel" for="configNntpSeparator"> <TMPL_VAR NAME="Localize_Configuration_NNTPSeparator">: </label> <br /> ! <input name="nntp_separator" id="configNntpSeparator" type="text" value="<TMPL_VAR NAME="nntp_separator">" maxlength="1" /> ! <br /> ! <input name="nntp_force_fork" id="nntpForceFork" type="checkbox" value="1" <TMPL_IF NAME="nntp_force_fork_on">checked</TMPL_IF> /> ! <label class="configurationLabel" for="nntpForceFork"> ! <TMPL_VAR NAME="Localize_Configuration_NNTPFork"> ! </label> ! <br /><br /> ! <input type="submit" class="submit" name="update_nntp_configuration" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> <br /> Index: users-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/users-page.thtml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** users-page.thtml 16 Apr 2008 13:08:05 -0000 1.13 --- users-page.thtml 17 Apr 2008 15:13:05 -0000 1.14 *************** *** 206,214 **** </td> <td> - <TMPL_IF NAME="Users_If_Password"> - <input type="password" name="parameter_<TMPL_VAR NAME="Users_Parameter">" value="<TMPL_VAR NAME="Users_Value">"> - <TMPL_ELSE> <input type="text" name="parameter_<TMPL_VAR NAME="Users_Parameter">" value="<TMPL_VAR NAME="Users_Value">"> - </TMPL_IF> </td> </tr> --- 206,210 ---- Index: pop3-chain-panel.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/pop3-chain-panel.thtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pop3-chain-panel.thtml 13 Apr 2008 03:08:09 -0000 1.10 --- pop3-chain-panel.thtml 17 Apr 2008 15:13:05 -0000 1.11 *************** *** 14,24 **** <br /> ! <label class="securityLabel" for "securitySecurePOP3SSL"> <TMPL_VAR NAME="Localize_Security_SecureServerUseSSL"> </label> - - <input type="checkbox" name="sssl" id="securitySecurePOP3SSL" value="UseSSL" <TMPL_IF NAME="POP3_Chain_Secure_SSL">checked</TMPL_IF> /> - <br /> <input type="submit" class="submit" name="update_server" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> \ No newline at end of file --- 14,23 ---- <br /> ! <input type="checkbox" name="sssl" id="securitySecurePOP3SSL" value="1" <TMPL_IF NAME="POP3_Chain_Secure_SSL">checked</TMPL_IF> /> ! <label class="securityLabel" for="securitySecurePOP3SSL"> <TMPL_VAR NAME="Localize_Security_SecureServerUseSSL"> </label> + <br /><br /> <input type="submit" class="submit" name="update_server" value="<TMPL_VAR NAME="Localize_Apply">" /> </form> \ No newline at end of file Index: advanced-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/advanced-page.thtml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** advanced-page.thtml 30 Mar 2008 10:22:38 -0000 1.17 --- advanced-page.thtml 17 Apr 2008 15:13:05 -0000 1.18 *************** *** 43,47 **** <td class="settingsPanel" width="50%" valign="top"> <h2 class="advanced"><TMPL_VAR NAME="Localize_Advanced_AllParameters"></h2> ! <p><TMPL_VAR NAME="Localize_Advanced_Warning"> <p><TMPL_VAR NAME="Localize_Advanced_ConfigFile"> <TMPL_VAR NAME="Advanced_POPFILE_CFG"> --- 43,48 ---- <td class="settingsPanel" width="50%" valign="top"> <h2 class="advanced"><TMPL_VAR NAME="Localize_Advanced_AllParameters"></h2> ! <p><TMPL_VAR NAME="Localize_Advanced_AllParametersNotes"><br /> ! <TMPL_VAR NAME="Localize_Advanced_Warning"> <p><TMPL_VAR NAME="Localize_Advanced_ConfigFile"> <TMPL_VAR NAME="Advanced_POPFILE_CFG"> *************** *** 93,96 **** --- 94,143 ---- <input type="submit" class="submit" value="<TMPL_VAR NAME="Localize_Update">" name="update_params"> </form> + + <TMPL_IF NAME="Advanced_If_SingleUser"> + <hr /> + <h2 class="advanced"><TMPL_VAR NAME="Localize_Advanced_SingleUserModeParameters"></h2> + <p><TMPL_VAR NAME="Localize_Advanced_SingleUserModeParametersNotes"><br /> + <TMPL_VAR NAME="Localize_Advanced_Warning"> + + <form action="/advanced" method="post"> + <table width="100%"> + <tr> + <th width="50%" align="left"><TMPL_VAR NAME="Localize_Advanced_Parameter"></th> + <th width="50%" align="left"><TMPL_VAR NAME="Localize_Advanced_Value"></th> + </tr> + <TMPL_LOOP NAME="Users_Loop_Parameter"> + + <TMPL_IF NAME="Users_If_New_Module"> + + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> + + </TMPL_IF> + + <tr> + <td> + <TMPL_IF NAME="Users_If_Changed"> + <b> + </TMPL_IF> + <TMPL_VAR NAME="Users_Parameter"> + <TMPL_IF NAME="Users_If_Changed"> + </b> + </TMPL_IF> + </td> + <td> + <input type="text" name="parameter_<TMPL_VAR NAME="Users_Parameter">" value="<TMPL_VAR NAME="Users_Value">"> + </td> + </tr> + + </TMPL_LOOP> + </table> + <br /> + <input type="submit" class="submit" value="<TMPL_VAR NAME="Localize_Update">" name="update_single_user_params"> + </form> + </TMPL_IF> </td> </tr> Index: smtp-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/smtp-configuration.thtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** smtp-configuration.thtml 30 Mar 2008 05:33:58 -0000 1.8 --- smtp-configuration.thtml 17 Apr 2008 15:13:05 -0000 1.9 *************** *** 1,45 **** ! <label class="configurationLabel" for="configSMTPPort"> ! <TMPL_VAR NAME="Localize_Configuration_SMTPPort">: ! </label> ! <table border="0" cellpadding="0" cellspacing="0" summary=""> ! <tr> ! <td> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input name="smtp_port" type="text" id="configSMTPPort" value="<TMPL_VAR NAME="smtp_port">" /> ! <input type="submit" class="submit" name="update_smtp_port" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> ! </td> ! </tr> ! </table> ! ! <label class="configurationLabel" for="smtpForceFork"> ! <TMPL_VAR NAME="Localize_Configuration_SMTPFork">: ! </label> ! <br /> ! <table border="0" cellpadding="0" cellspacing="0" summary=""> ! <tr> ! <td nowrap="nowrap"> ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <TMPL_IF NAME="smtp_force_fork_on"> ! ! <span class="securityWidgetStateOn"> ! <TMPL_VAR NAME="Localize_Yes"> ! </span> ! <input type="submit" class="toggleOff" id="smtpForceFork" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> ! <input type="hidden" name="smtp_force_fork" value="0" /> ! ! <TMPL_ELSE> ! ! <span class="securityWidgetStateOff"> ! <TMPL_VAR NAME="Localize_No"> ! </span> ! <input type="submit" class="toggleOn" id="smtpForceFork" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" /> ! <input type="hidden" name="smtp_force_fork" value="1" /> ! </TMPL_IF> ! </form> ! </td> ! </tr> ! </table> <br /> --- 1,17 ---- ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <label class="configurationLabel" for="configSMTPPort"> ! <TMPL_VAR NAME="Localize_Configuration_SMTPPort">: ! </label> ! <br /> ! <input name="smtp_port" type="text" id="configSMTPPort" value="<TMPL_VAR NAME="smtp_port">" /> ! <br /> ! <input name="smtp_force_fork" id="smtpForceFork" type="checkbox" value="1" <TMPL_IF NAME="smtp_force_fork_on">checked</TMPL_IF> /> ! <label class="configurationLabel" for="smtpForceFork"> ! <TMPL_VAR NAME="Localize_Configuration_SMTPFork"> ! </label> ! <br /><br /> ! <input type="submit" class="submit" name="update_smtp_configuration" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> <br /> Index: common-bottom.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/common-bottom.thtml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** common-bottom.thtml 27 Jan 2008 04:55:21 -0000 1.16 --- common-bottom.thtml 17 Apr 2008 15:13:05 -0000 1.17 *************** *** 17,23 **** <TMPL_VAR NAME="Localize_Footer_HomePage"></a> <br /> - <a class="bottomLink" href="http://getpopfile.org/manual/<TMPL_VAR NAME="Localize_ManualLanguage">/manual.html" title="<TMPL_VAR NAME="Localize_tip_Footer_Manual">"> - <TMPL_VAR NAME="Localize_Footer_Manual"></a> - <br /> <a class="bottomLink" href="http://getpopfile.org/wiki/<TMPL_VAR NAME="Localize_WikiLink">" title="<TMPL_VAR NAME="Localize_tip_Footer_Wiki">"> <TMPL_VAR NAME="Localize_Footer_Wiki"></a> --- 17,20 ---- Index: windows-configuration.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/windows-configuration.thtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** windows-configuration.thtml 2 Mar 2006 11:17:00 -0000 1.7 --- windows-configuration.thtml 17 Apr 2008 15:13:05 -0000 1.8 *************** *** 1,9 **** ! <input id="windows_console" type="checkbox" name="toggle" <TMPL_IF NAME="windows_console_on">checked</TMPL_IF> /> ! <label for="windows_console" class="administrationLabel"> ! <TMPL_VAR NAME="Localize_Windows_Console"> ! </label> ! <br /> ! <input id="windows_trayicon" type="checkbox" name="toggle" <TMPL_IF NAME="windows_icon_on">checked</TMPL_IF> /> ! <label for="windows_trayicon" class="administrationLabel"> ! <TMPL_VAR NAME="Localize_Windows_TrayIcon"> ! </label> --- 1,14 ---- ! <form action="<TMPL_VAR NAME="Configuration_Action">" method="post"> ! <input id="windows_console" type="checkbox" name="windows_console" <TMPL_IF NAME="windows_console_on">checked</TMPL_IF> /> ! <label for="windows_console" class="administrationLabel"> ! <TMPL_VAR NAME="Localize_Windows_Console"> ! </label> ! <br /> ! <input id="windows_trayicon" type="checkbox" name="windows_trayicon" <TMPL_IF NAME="windows_icon_on">checked</TMPL_IF> /> ! <label for="windows_trayicon" class="administrationLabel"> ! <TMPL_VAR NAME="Localize_Windows_TrayIcon"> ! </label> ! ! <br /><br /> ! <input type="submit" class="submit" name="update_windows_configuration" value="<TMPL_VAR NAME="Localize_Apply">" /> ! </form> Index: administration-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/administration-page.thtml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** administration-page.thtml 30 Mar 2008 10:22:38 -0000 1.15 --- administration-page.thtml 17 Apr 2008 15:13:05 -0000 1.16 *************** *** 25,28 **** --- 25,29 ---- </label> <br /> + <br /> <input type="radio" name="servermode" id="StealthMode" value="StealthMode" onClick="serverMode(false)" <TMPL_IF NAME="Security_If_Local">checked="checked"</TMPL_IF> /> <label class="administrationLabel" for="StealthMode"> |