Thread: [popfile-commit] engine/skins/default administration-page.thtml, 1.17, 1.18 nntp-security-local.tht

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/engine/skins/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20326/skins/default

Modified Files:
	administration-page.thtml nntp-security-local.thtml 
	pop3-chain-panel.thtml pop3-security-panel.thtml 
	smtp-chain-server.thtml smtp-security-local.thtml 
	xmlrpc-local.thtml 
Log Message:
Change Log

1. UI and POP3 proxy are now able to be connected via SSL
2. New Proxy module 'Proxy::POP3S' (POP3 over SSL)
3. New global options: GLOBAL_cert_file, GLOBAL_key_file, GLOBAL_ca_file
4. New html options: html_https_enabled, html_https_port
5. Secure cookies are used when accessed to the HTTPS server

  Proxy/POP3S.pm
  Proxy/POP3.pm
  Proxy/Proxy.pm
  UI/HTML.pm
  UI/HTTP.pm
  POPFile/Configuration.pm
  Classifier/Bayes.pm
  skins/default/pop3s-configuration-panel.thtml
  skins/default/pop3s-security-panel.thtml
  tests/Configuration.tst

    The new Proxy::POP3S module supports connections via SSL.
    It has following options:
        pop3s_enabled           Enable(=1)/Disable(=0;default) the module
        pop3s_force_fork        Enable(=1)/Disable(=0) forking
        pop3s_local             Allow(=1)/Disallow(=0) connections from remote
        pop3s_port              POP3S proxy port(default:995)
        pop3s_socks_port        SOCKS proxy port
        pop3s_socks_server      SOCKS proxy server
        pop3s_welcome_string    POP3S proxy welcome string
    The other POP3 options (e.g. pop3_separator) are same as the Proxy::POP3 module.

    Here's the new options of the UI::HTML module:
        html_https_enabled      Enable(=1)/Disable(=0;default) the HTTPS server
        html_https_port         HTTPS server port(default:8443)

    The new global options:
        GLOBAL_cert_file        Location of the certification file of the server
        GLOBAL_key_file         Location of the key file of the server
        GLOBAL_ca_file          Location of the CA file

    NOTE: I've implemented POP3S and the HTTPS in the different way.
          I've made a new module Proxy::POP3S for POP3S, but I don't make the
          module for HTTPS. This is because I think making the new module for
          HTTPS ( UI:HTTPS ? ) is very hard.

    BUG:  Concurrent POP3S connections cause an error in some environment:
            SSL3 alert write:fatal:bad record mac
            7664:error:1408F119:SSL routines:SSL3_GET_RECORD:decryption failed or bad record mac:s3_pkt.c:424:

6. AUTH PLAIN support

  Proxy/POP3.pm

7. Supress the verbose status messages on the administration tab
8. Add some status messages (administration tab)

  UI/HTML.pm
  UI/XMLRPC.pm
  Proxy/Proxy.pm
  Proxy/POP3.pm
  Proxy/NNTP.pm
  Proxy/SMTP.pm
  languages/English.msg
  languages/Nihongo.msg
  tests/TestPOP3.tst
  tests/TestHTML.script

9. The message files are no longer cached by the web browser

  UI/HTTP.pm

10. if html_allow_javascript == 0, don't disable the radio buttons

  skins/default/administration-page.thtml
  skins/default/pop3-security-panel.thtml
  skins/default/nntp-security-local.thtml
  skins/default/smtp-security-local.thtml
  skins/default/xmlrpc-local.thtml

11. Minor updates of the skins

  skins/smtp-chain-server.thtml
  skins/smtp-chain-server-port.thtml (merged to the above file)
  skins/pop3-chain-panel.thtml

12. Source code cleanup

  UI/HTML.pm
  UI/HTTP.pm
  UI/XMLRPC.pm
  Proxy/POP3.pm
  Proxy/Proxy.pm
  Proxy/NNTP.pm
  Proxy/SMTP.pm
  Classifier/Bayes.pm
  Classifier/MailParse.pm
  POPFile/Configuration.pm
  POPFile/Database.pm
  POPFile/History.pm
  POPFile/Loader.pm
  POPFile/Logger.pm
  POPFile/Module.pm
  POPFile/MQ.pm
  POPFile/Mutex.pm

    Add some 'PROFILE BLOCK START' and 'PROFILE BLOCK STOP's.
    These are used by Devel::TestCoverage to get the correct coverage.

13. Add some tests

  tests/TestBayes.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: smtp-security-local.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/smtp-security-local.thtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** smtp-security-local.thtml	3 Mar 2006 09:55:49 -0000	1.7
--- smtp-security-local.thtml	25 Apr 2008 16:26:37 -0000	1.8
***************
*** 1,3 ****
!                 <input type="checkbox" name="serveropt_smtp" id="securityAcceptSMTP" <TMPL_IF NAME="smtp_local_on"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> />
                  <label class="administrationLabel" for="securityAcceptSMTP">
                      <TMPL_VAR NAME="Localize_Security_SMTP">
--- 1,3 ----
!                 <input type="checkbox" name="serveropt_smtp" id="securityAcceptSMTP" <TMPL_IF NAME="smtp_local_on"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="If_Javascript_OK"><TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF></TMPL_IF> />
                  <label class="administrationLabel" for="securityAcceptSMTP">
                      <TMPL_VAR NAME="Localize_Security_SMTP">

Index: pop3-security-panel.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pop3-security-panel.thtml	3 Mar 2006 09:55:49 -0000	1.11
--- pop3-security-panel.thtml	25 Apr 2008 16:26:37 -0000	1.12
***************
*** 1,3 ****
!                 <input type="checkbox" name="serveropt_pop3" id="securityAcceptPOP3" <TMPL_IF NAME="POP3_Security_Local"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> />
                  <label class="administrationLabel" for="securityAcceptPOP3">
                      <TMPL_VAR NAME="Localize_Security_POP3">
--- 1,3 ----
!                 <input type="checkbox" name="serveropt_pop3" id="securityAcceptPOP3" <TMPL_IF NAME="POP3_Security_Local"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="If_Javascript_OK"><TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF></TMPL_IF> />
                  <label class="administrationLabel" for="securityAcceptPOP3">
                      <TMPL_VAR NAME="Localize_Security_POP3">

Index: xmlrpc-local.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/xmlrpc-local.thtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** xmlrpc-local.thtml	3 Mar 2006 09:55:49 -0000	1.7
--- xmlrpc-local.thtml	25 Apr 2008 16:26:37 -0000	1.8
***************
*** 1,3 ****
!                 <input type="checkbox" name="serveropt_xmlrpc" id="securityAcceptXMLRPC" <TMPL_IF NAME="XMLRPC_local_on"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> />
                  <label class="administrationLabel" for="securityAcceptXMLRPC">
                      <TMPL_VAR NAME="Localize_Security_XMLRPC">
--- 1,3 ----
!                 <input type="checkbox" name="serveropt_xmlrpc" id="securityAcceptXMLRPC" <TMPL_IF NAME="XMLRPC_local_on"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="If_Javascript_OK"><TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF></TMPL_IF> />
                  <label class="administrationLabel" for="securityAcceptXMLRPC">
                      <TMPL_VAR NAME="Localize_Security_XMLRPC">

Index: pop3-chain-panel.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/pop3-chain-panel.thtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pop3-chain-panel.thtml	17 Apr 2008 15:13:05 -0000	1.11
--- pop3-chain-panel.thtml	25 Apr 2008 16:26:37 -0000	1.12
***************
*** 21,23 ****
      <br /><br />
      <input type="submit" class="submit" name="update_server" value="<TMPL_VAR NAME="Localize_Apply">" />
! </form>
\ No newline at end of file
--- 21,24 ----
      <br /><br />
      <input type="submit" class="submit" name="update_server" value="<TMPL_VAR NAME="Localize_Apply">" />
! </form>
! <br />

Index: nntp-security-local.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/nntp-security-local.thtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** nntp-security-local.thtml	3 Mar 2006 09:55:49 -0000	1.8
--- nntp-security-local.thtml	25 Apr 2008 16:26:37 -0000	1.9
***************
*** 1,3 ****
!                 <input type="checkbox" name="serveropt_nntp" id="securityAcceptNNTP" <TMPL_IF NAME="nntp_if_local"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> />
                  <label class="administrationLabel" for="securityAcceptNNTP">
                      <TMPL_VAR NAME="Localize_Security_NNTP">
--- 1,3 ----
!                 <input type="checkbox" name="serveropt_nntp" id="securityAcceptNNTP" <TMPL_IF NAME="nntp_if_local"><TMPL_ELSE>checked</TMPL_IF> <TMPL_IF NAME="If_Javascript_OK"><TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF></TMPL_IF> />
                  <label class="administrationLabel" for="securityAcceptNNTP">
                      <TMPL_VAR NAME="Localize_Security_NNTP">

Index: smtp-chain-server.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/smtp-chain-server.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** smtp-chain-server.thtml	22 May 2005 11:13:50 -0000	1.5
--- smtp-chain-server.thtml	25 Apr 2008 16:26:37 -0000	1.6
***************
*** 5,8 ****
--- 5,17 ----
      <br />
      <input type="text" name="smtp_chain_server" id="securitySecureSMTPServer" value="<TMPL_VAR NAME="smtp_chain_server">" />
+     <br />
+ 
+     <label class="securityLabel" for="securitySecureSMTPPort">
+         <TMPL_VAR NAME="Localize_Security_SMTPPort">:
+     </label>
+     <br />
+     <input type="text" name="smtp_chain_server_port" id="securitySecureSMTPPort" value="<TMPL_VAR NAME="smtp_chain_port">" />
+ 
+     <br /><br />
      <input type="submit" class="submit" name="update_smtp_server" 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.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** administration-page.thtml	18 Apr 2008 12:41:49 -0000	1.17
--- administration-page.thtml	25 Apr 2008 16:26:37 -0000	1.18
***************
*** 4,7 ****
--- 4,8 ----
  <script type="text/javascript">
  function serverMode(state) {
+ <TMPL_IF NAME="If_Javascript_OK">
      var d = document.forms;
      for (var i=0; i < d.length; i++) {
***************
*** 10,13 ****
--- 11,15 ----
                      d[i].elements[j].disabled = !state;
      }
+ </TMPL_IF>
      return 0;
  }
***************
*** 37,41 ****
                              <br />
                              <div style="margin-left:1em;" class="adminAcceptRemote">
!                                 <input type="checkbox" name="serveropt_html" id="securityAcceptHTTP" name="toggle" <TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF> <TMPL_IF NAME="Security_If_Local_html"><TMPL_ELSE>checked="checked"</TMPL_IF>/>
                                  <label class="administrationLabel" for="securityAcceptHTTP">
                                      <TMPL_VAR NAME="Localize_Security_UI">
--- 39,43 ----
                              <br />
                              <div style="margin-left:1em;" class="adminAcceptRemote">
!                                 <input type="checkbox" name="serveropt_html" id="securityAcceptHTTP" name="toggle" <TMPL_IF NAME="If_Javascript_OK"><TMPL_IF NAME="Security_If_Local">disabled</TMPL_IF></TMPL_IF> <TMPL_IF NAME="Security_If_Local_html"><TMPL_ELSE>checked="checked"</TMPL_IF>/>
                                  <label class="administrationLabel" for="securityAcceptHTTP">
                                      <TMPL_VAR NAME="Localize_Security_UI">
***************
*** 169,172 ****
--- 171,188 ----
                  <br />

+                 <br />
+                 <input type="checkbox" id="configUIHTTPS" name="ui_https" value="1" <TMPL_IF NAME="Configuration_UI_HTTPS">checked</TMPL_IF>>
+                 <label class="configurationLabel" for="configUIHTTPS">
+                     <TMPL_VAR NAME="Localize_Configuration_UIHTTPS">
+                 </label>
+                 <br />
+                 <label class="configurationLabel" for="configUIHTTPSPort">
+                     <TMPL_VAR NAME="Localize_Configuration_UIHTTPSPort">:
+                 </label>
+                 <br />
+                 <input name="ui_https_port" id="configUIHTTPSPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_HTTPS_Port">" />
+                 <br />
+ 
+                 <br />
                  <label class="configurationLabel" for="configTCPTimeout">
                      <TMPL_VAR NAME="Localize_Configuration_TCPTimeoutSecs">: