POPFile - Automatic Email Classification

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4386

Modified Files:
	msgcapture.nsi 
Log Message:
Remove the annoying flicker seen at the very start of the report generation

Index: msgcapture.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** msgcapture.nsi	24 Jun 2004 17:44:35 -0000	1.1
--- msgcapture.nsi	24 Jun 2004 22:32:54 -0000	1.2
***************
*** 56,60 ****
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION             "0.0.50"
  
    ; The default timeout is 30 seconds
--- 56,60 ----
    ;--------------------------------------------------------------------------
  
!   !define C_VERSION             "0.0.51"
  
    ; The default timeout is 30 seconds
***************
*** 301,313 ****
  Section default
  
!   !define L_CFG           $R9   ; file handle used to access 'popfile.cfg'
!   !define L_LINE          $R8   ; line (or part of line) read from 'popfile.cfg'
!   !define L_PFI_ROOT      $R7   ; path to the POPFile program (popfile.pl, and other files)
!   !define L_PFI_USER      $R6   ; path to user's 'popfile.cfg' file
!   !define L_RESULT        $R5
!   !define L_TEMP          $R4
!   !define L_TEXTEND       $R3   ; helps ensure correct handling of lines over 1023 chars long
!   !define L_TRAYICON      $R2   ; system tray icon enabled ("i" ) or disabled ("") flag
  
    SetDetailsPrint listonly
  
--- 301,312 ----
  Section default
  
!   !define L_PFI_ROOT      $R9   ; path to the POPFile program (popfile.pl, and other files)
!   !define L_PFI_USER      $R8   ; path to user's 'popfile.cfg' file
!   !define L_RESULT        $R7
!   !define L_TEMP          $R6
!   !define L_TRAYICON      $R5   ; system tray icon enabled ("i" ) or disabled ("") flag
  
+   SetDetailsPrint textonly
+   DetailPrint "$(PFI_LANG_MSGCAP_RIGHTCLICK)"
    SetDetailsPrint listonly
  
***************
*** 344,384 ****
  
  fatal_error:
-   SetDetailsPrint textonly
-   DetailPrint "$(PFI_LANG_MSGCAP_RIGHTCLICK)"
-   SetDetailsPrint none
    Abort
  
  found_cfg:
!   StrCpy ${L_TEMP} "1"      ; assume system tray icon is enabled (the default setting)
!   FileOpen ${L_CFG} "${L_PFI_USER}\popfile.cfg" r
! 
! found_eol:
!   StrCpy ${L_TEXTEND} "<eol>"
! 
! loop:
!   FileRead ${L_CFG} ${L_LINE}
!   StrCmp ${L_LINE} "" options_done
!   StrCmp ${L_TEXTEND} "<eol>" 0 check_eol
!   StrCmp ${L_LINE} "$\n" loop
! 
!   StrCpy ${L_TRAYICON} ${L_LINE} 17
!   StrCmp ${L_TRAYICON} "windows_trayicon " got_icon_option
!   Goto check_eol
! 
! got_icon_option:
!   StrCpy ${L_TEMP} ${L_LINE} 1 17
! 
! check_eol:
!   StrCpy ${L_TEXTEND} ${L_LINE} 1 -1
!   StrCmp ${L_TEXTEND} "$\n" found_eol
!   StrCmp ${L_TEXTEND} "$\r" found_eol loop
! 
! options_done:
!   FileClose ${L_CFG}
!   StrCpy ${L_TRAYICON} "i"
!   StrCmp ${L_TEMP} "1" print_env_vars
!   StrCpy ${L_TRAYICON} ""
! 
! print_env_vars:
    DetailPrint "POPFILE_ROOT = ${L_PFI_ROOT}"
    DetailPrint "POPFILE_USER = ${L_PFI_USER}"
--- 343,353 ----
  
  fatal_error:
    Abort
  
  found_cfg:
!   Push ${L_PFI_USER}        ; 'User Data' folder location
!   Push "1"                  ; assume system tray icon is enabled (the current default setting)
!   Call GetTrayIconSetting
!   Pop ${L_TRAYICON}         ; "i" if system tray icon enabled, "" if it is disabled
    DetailPrint "POPFILE_ROOT = ${L_PFI_ROOT}"
    DetailPrint "POPFILE_USER = ${L_PFI_USER}"
***************
*** 424,438 ****
    DetailPrint "(report finished ${L_TEMP})"
    DetailPrint "------------------------------------------------------------"
-   SetDetailsPrint textonly
-   DetailPrint "$(PFI_LANG_MSGCAP_RIGHTCLICK)"
    SetDetailsPrint none
  
-   !undef L_CFG
-   !undef L_LINE
    !undef L_PFI_ROOT
    !undef L_PFI_USER
    !undef L_RESULT
    !undef L_TEMP
-   !undef L_TEXTEND
    !undef L_TRAYICON
  
--- 393,402 ----
***************
*** 440,443 ****
--- 404,483 ----
  
  #--------------------------------------------------------------------------
+ # Installer Function: GetTrayIconSetting
+ #
+ # Returns "i" if the system tray icon is enabled in popfile.cfg or "" if it is disabled.
+ # If the setting is not found in popfile.cfg, use the input parameter to determine the result.
+ #
+ # This function avoids the progress bar flicker seen when similar code was in the "Section" body
+ #--------------------------------------------------------------------------
+ 
+ Function GetTrayIconSetting
+ 
+   !define L_CFG           $R9   ; file handle used to access 'popfile.cfg'
+   !define L_ICONSETTING   $R8   ; 1 (or "i") = system tray icon enabled, 0 (or "") = disabled
+   !define L_LINE          $R7   ; line (or part of line) read from 'popfile.cfg'
+   !define L_TEMP          $R6
+   !define L_TEXTEND       $R5   ; helps ensure correct handling of lines over 1023 chars long
+   !define L_USERDATA      $R4   ; location of 'User Data'
+ 
+   Exch ${L_ICONSETTING}         ; get the setting to be used if value not found in 'popfile.cfg'
+   Exch
+   Exch ${L_USERDATA}            ; get location where 'popfile.cfg' should be found
+   Push ${L_CFG}
+   Push ${L_LINE}
+   Push ${L_TEMP}
+   Push ${L_TEXTEND}
+ 
+   FileOpen ${L_CFG} "${L_USERDATA}\popfile.cfg" r
+ 
+ found_eol:
+   StrCpy ${L_TEXTEND} "<eol>"
+ 
+ loop:
+   FileRead ${L_CFG} ${L_LINE}
+   StrCmp ${L_LINE} "" options_done
+   StrCmp ${L_TEXTEND} "<eol>" 0 check_eol
+   StrCmp ${L_LINE} "$\n" loop
+ 
+   StrCpy ${L_TEMP} ${L_LINE} 17
+   StrCmp ${L_TEMP} "windows_trayicon " got_icon_option
+   Goto check_eol
+ 
+ got_icon_option:
+   StrCpy ${L_ICONSETTING} ${L_LINE} 1 17
+ 
+ check_eol:
+   StrCpy ${L_TEXTEND} ${L_LINE} 1 -1
+   StrCmp ${L_TEXTEND} "$\n" found_eol
+   StrCmp ${L_TEXTEND} "$\r" found_eol loop
+ 
+ options_done:
+   FileClose ${L_CFG}
+ 
+   StrCmp ${L_ICONSETTING} "1" enabled
+   StrCpy ${L_ICONSETTING} ""
+   Goto exit
+ 
+ enabled:
+   StrCpy ${L_ICONSETTING} "i"
+ 
+ exit:
+   Pop ${L_TEXTEND}
+   Pop ${L_TEMP}
+   Pop ${L_LINE}
+   Pop ${L_CFG}
+   Pop ${L_USERDATA}
+   Exch ${L_ICONSETTING}
+ 
+   !undef L_CFG
+   !undef L_ICONSETTING
+   !undef L_LINE
+   !undef L_TEMP
+   !undef L_TEXTEND
+   !undef L_USERDATA
+ 
+ FunctionEnd
+ 
+ #--------------------------------------------------------------------------
  # End of 'msgcapture.nsi'
  #--------------------------------------------------------------------------

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17046/Classifier

Modified Files:
	Bayes.pm 
Log Message:
Fix divide by zero error

Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.300
retrieving revision 1.301
diff -C2 -d -r1.300 -r1.301
*** Bayes.pm	24 Jun 2004 19:11:56 -0000	1.300
--- Bayes.pm	24 Jun 2004 21:06:35 -0000	1.301
***************
*** 2208,2212 ****
              my $max_chart = $chart{$words[0]};
              my $min_chart = $chart{$words[$#words]};
!             my $scale = 400 / ( $max_chart - $min_chart );
              my $width = 400 / $#words;
              my $color = $self->get_bucket_color( $session, $ranking[0] );
--- 2208,2212 ----
              my $max_chart = $chart{$words[0]};
              my $min_chart = $chart{$words[$#words]};
!             my $scale = ( $max_chart > $min_chart )?400 / ( $max_chart - $min_chart ):0;
              my $width = 400 / $#words;
              my $color = $self->get_bucket_color( $session, $ranking[0] );

Update of /cvsroot/popfile/windows/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31840

Added Files:
	pfinfo.ico 
Log Message:
Icon file for "PFI Diagnostic Utility" (see pfidiag.nsi script)

--- NEW FILE: pfinfo.ico ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/popfile/windows/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31375

Added Files:
	pfidiag.nsi 
Log Message:
Simple utility to diagnose installer problems (especially on Win9x systems
and in multi-user configurations).

--- NEW FILE: pfidiag.nsi ---
#--------------------------------------------------------------------------
#
# pfidiag.nsi --- This NSIS script is used to create a simple diagnostic utility
#                 to assist in solving problems with POPFile installations created
#                 by the Windows installer for POPFile v0.21.0 (or later).
#
# Copyright (c) 2004  John Graham-Cumming
#
#   This file is part of POPFile
#
#   POPFile is free software; you can redistribute it and/or modify
#   it under the terms of the GNU General Public License as published by
#   the Free Software Foundation; either version 2 of the License, or
#   (at your option) any later version.
#
#   POPFile is distributed in the hope that it will be useful,
#   but WITHOUT ANY WARRANTY; without even the implied warranty of
#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#   GNU General Public License for more details.
[...981 lines suppressed...]
    Exch 6
    Exch 7
    Exch $1
    Exch 7

  FunctionEnd
!macroend

#--------------------------------------------------------------------------
# Installer Function: GetLocalTime
#
# This function is used during the installation process
#--------------------------------------------------------------------------

!insertmacro GetLocalTime ""


#--------------------------------------------------------------------------
# End of 'pfidiag.nsi'
#--------------------------------------------------------------------------

Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/Proxy

Modified Files:
	NNTP.pm 
Log Message:
*** Change all forms to use the POST method to make the URL displayed
    in the browser cleaner

skins/default/configuration-page.thtml
skins/default/corpus-page.thtml
skins/default/magnet-page.thtml
skins/default/pop3-chain-panel.thtml
skins/default/pop3-configuration-panel.thtml
skins/default/pop3-security-panel.thtml
skins/default/security-page.thtml
skins/default/socks-widget.thtml
skins/default/view-quickmagnets-widget.thtml:

Add method="POST" to all forms.

*** Get TestModule working

tests/TestModule.tst
POPFile/Module.pm:

Fix logger tests and clean up wrapping and whitespace.

*** Get Single Message View working

skins/default/view-page.thtml
UI/HTML.pm:

Remove Previous/Next navigator, make magnet detail work, add To, Cc and Date
fields to header.

*** Merge patch that makes History in database work with Japanese

Classifier/MailParse.pm:

Get the current interface language value if none is passed in.

*** Added "Decision Chart" to Single Message View

skins/default/view-scores-widget.thtml
Classifier/Bayes.pm:

The new Decision Chart shows the contribution each word makes to the top
two buckets sorted in the order biggest positive contribution to biggest
negative contribution.  The intent is that it shows how POPFile makes the
Bayes decision between the top two bucket.  You can see which words
contribute to the decision between the top two buckets and by how much.  
Hover on any bar to see the actual word.

Still some work to do make this look nice (e.g. scale, try to show the 
words themselves on the chart if possible).



Index: NNTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** NNTP.pm	24 Jun 2004 11:50:57 -0000	1.31
--- NNTP.pm	24 Jun 2004 19:12:02 -0000	1.32
***************
*** 36,39 ****
--- 36,40 ----
  
  # A handy variable containing the value of an EOL for networks
+ 
  my $eol = "\015\012";
  
***************
*** 74,77 ****
--- 75,79 ----
  
      # Disabled by default
+ 
      $self->config_( 'enabled', 0);
  
***************
*** 93,97 ****
  
      # The welcome string from the proxy is configurable
!     $self->config_( 'welcome_string', "NNTP POPFile ($self->{version_}) server ready" );
  
      return $self->SUPER::initialize();;
--- 95,101 ----
  
      # The welcome string from the proxy is configurable
! 
!     $self->config_( 'welcome_string',
!         "NNTP POPFile ($self->{version_}) server ready" );
  
      return $self->SUPER::initialize();;
***************
*** 138,143 ****
                                           $self );
  
!     return $self->SUPER::start();;
! }
  
  # ---------------------------------------------------------------------------------------------
--- 142,146 ----
                                           $self );
  
!     return $self->SUPER::start();; }
  
  # ---------------------------------------------------------------------------------------------
***************
*** 156,172 ****
  
      # Number of messages downloaded in this session
      my $count = 0;
  
      # The handle to the real news server gets stored here
      my $news;
  
!     # The state of the connection (username needed, password needed, authenticated/connected)
      my $connection_state = 'username needed';
  
!     # Tell the client that we are ready for commands and identify our version number
!     $self->tee_( $client, "201 " . $self->config_( 'welcome_string' ) . "$eol" );
  
-     # Retrieve commands from the client and process them until the client disconnects or
-     # we get a specific QUIT command
      while  ( <$client> ) {
          my $command;
--- 159,183 ----
  
      # Number of messages downloaded in this session
+ 
      my $count = 0;
  
      # The handle to the real news server gets stored here
+ 
      my $news;
  
!     # The state of the connection (username needed, password needed,
!     # authenticated/connected)
! 
      my $connection_state = 'username needed';
  
!     # Tell the client that we are ready for commands and identify our
!     # version number
! 
!     $self->tee_( $client, "201 " . $self->config_( 'welcome_string' ) .
!         "$eol" );
! 
!     # Retrieve commands from the client and process them until the
!     # client disconnects or we get a specific QUIT command
  
      while  ( <$client> ) {
          my $command;
***************
*** 175,188 ****
  
          # Clean up the command so that it has a nice clean $eol at the end
          $command =~ s/(\015|\012)//g;
  
          $self->log_( 2, "Command: --$command--" );
  
!         # The news client wants to stop using the server, so send that message through to the
!         # real news server, echo the response back up to the client and exit the while.  We will
!         # close the connection immediately
          if ( $command =~ /^ *QUIT/i ) {
              if ( $news )  {
!                 last if ( $self->echo_response_( $news, $client, $command ) == 2 );
                  close $news;
              } else {
--- 186,203 ----
  
          # Clean up the command so that it has a nice clean $eol at the end
+ 
          $command =~ s/(\015|\012)//g;
  
          $self->log_( 2, "Command: --$command--" );
  
!         # The news client wants to stop using the server, so send that
!         # message through to the real news server, echo the response
!         # back up to the client and exit the while.  We will close the
!         # connection immediately
! 
          if ( $command =~ /^ *QUIT/i ) {
              if ( $news )  {
!                 last if ( $self->echo_response_( $news, $client, $command ) ==
!                          2 );
                  close $news;
              } else {
***************
*** 194,216 ****
          if ($connection_state eq 'username needed') {
  
!             # NOTE: This syntax is ambiguous if the NNTP username is a short (under 5 digit) string (eg, 32123).
!             # If this is the case, run "perl popfile.pl -nntp_separator /" and change your kludged username
!             # appropriately (syntax would then be server[:port][/username])
!             my $user_command = '^ *AUTHINFO USER ([^:]+)(:([\d]{1,5}))?(\\' . $self->config_( 'separator' ) . '(.+))?';
  
              if ( $command =~ /$user_command/i ) {
!                 my $server   = $1;
                  # hey, the port has to be in range at least
!                 my $port     = $3 if ( defined($3) && ($3 > 0) && ($3 < 65536) );
                  my $username = $5;
  
                  if ( $server ne '' )  {
!                     if ( $news = $self->verify_connected_( $news, $client, $server, $port || 119 ) )  {
                          if (defined $username) {
  
!                             # Pass through the AUTHINFO command with the actual user name for this server,
!                             # if one is defined, and send the reply straight to the client
  
!                             $self->get_response_($news, $client, 'AUTHINFO USER ' . $username );
                              $connection_state = "password needed";
                          } else {
--- 209,241 ----
          if ($connection_state eq 'username needed') {
  
!             # NOTE: This syntax is ambiguous if the NNTP username is a
!             # short (under 5 digit) string (eg, 32123).  If this is
!             # the case, run "perl popfile.pl -nntp_separator /" and
!             # change your kludged username appropriately (syntax would
!             # then be server[:port][/username])
! 
!             my $user_command = '^ *AUTHINFO USER ([^:]+)(:([\d]{1,5}))?(\\' .
!                 $self->config_( 'separator' ) . '(.+))?';
  
              if ( $command =~ /$user_command/i ) {
!                 my $server = $1;
! 
                  # hey, the port has to be in range at least
! 
!                 my $port = $3 if ( defined($3) && ($3 > 0) && ($3 < 65536) );
                  my $username = $5;
  
                  if ( $server ne '' )  {
!                     if ( $news = $self->verify_connected_( $news, $client,
!                         $server, $port || 119 ) )  {
                          if (defined $username) {
  
!                             # Pass through the AUTHINFO command with
!                             # the actual user name for this server, if
!                             # one is defined, and send the reply
!                             # straight to the client
  
!                             $self->get_response_( $news, $client,
!                                 'AUTHINFO USER ' . $username );
                              $connection_state = "password needed";
                          } else {
***************
*** 225,229 ****
                      }
                  } else {
!                     $self->tee_( $client, "482 Authentication rejected server name not specified in AUTHINFO USER command$eol" );
                      last;
                  }
--- 250,255 ----
                      }
                  } else {
!                     $self->tee_( $client,
!                         "482 Authentication rejected server name not specified in AUTHINFO USER command$eol" );
                      last;
                  }
***************
*** 240,244 ****
          } elsif ( $connection_state eq "password needed" ) {
              if ($command =~ /^ *AUTHINFO PASS (.*)/i) {
!                 my ( $response, $ok ) = $self->get_response_($news, $client, $command);
  
                  if ($response =~ /^281 .*/) {
--- 266,271 ----
          } elsif ( $connection_state eq "password needed" ) {
              if ($command =~ /^ *AUTHINFO PASS (.*)/i) {
!                 my ( $response, $ok ) = $self->get_response_( $news, $client,
!                                             $command);
  
                  if ($response =~ /^281 .*/) {
***************
*** 269,280 ****
              # COMMANDS USED DIRECTLY WITH THE REMOTE NNTP SERVER GO HERE
  
!             # The client wants to retrieve an article. We oblige, and insert classification headers.
  
              if ( $command =~ /^ *ARTICLE (.*)/i ) {
!                 my ( $response, $ok ) = $self->get_response_( $news, $client, $command);
                  if ( $response =~ /^220 (.*) (.*)$/i) {
                      $count += 1;
  
!                     my ( $class, $history_file ) = $self->{classifier__}->classify_and_modify( $session, $news, $client, 0, '' );
                  }
  
--- 296,311 ----
              # COMMANDS USED DIRECTLY WITH THE REMOTE NNTP SERVER GO HERE
  
!             # The client wants to retrieve an article. We oblige, and
!             # insert classification headers.
  
              if ( $command =~ /^ *ARTICLE (.*)/i ) {
!                 my ( $response, $ok ) = $self->get_response_( $news, $client,
!                                             $command);
                  if ( $response =~ /^220 (.*) (.*)$/i) {
                      $count += 1;
  
!                     my ( $class, $history_file ) =
!                         $self->{classifier__}->classify_and_modify( $session,
!                             $news, $client, 0, '' );
                  }
  
***************
*** 284,293 ****
              # Commands expecting a code + text response
  
!             if ( $command =~ /^ *(LIST|HEAD|BODY|NEWGROUPS|NEWNEWS|LISTGROUP|XGTITLE|XINDEX|XHDR|XOVER|XPAT|XROVER|XTHREAD)/i ) {
!                 my ( $response, $ok ) = $self->get_response_( $news, $client, $command);
  
!                 # 2xx (200) series response indicates multi-line text follows to .crlf
  
!                 $self->echo_to_dot_( $news, $client, 0 ) if ( $response =~ /^2\d\d/ );
                  next;
              }
--- 315,329 ----
              # Commands expecting a code + text response
  
!             if ( $command =~ 
!                 /^ *(LIST|HEAD|BODY|NEWGROUPS|NEWNEWS|LISTGROUP|XGTITLE|XINDEX|XHDR|XOVER|XPAT|XROVER|XTHREAD)/i ) {
!                 my ( $response, $ok ) = $self->get_response_( $news,
!                                             $client, $command);
  
!                 # 2xx (200) series response indicates multi-line text
!                 # follows to .crlf
  
!                 if ( $response =~ /^2\d\d/ ) {
!                     $self->echo_to_dot_( $news, $client, 0 );
!                 }
                  next;
              }
***************
*** 296,301 ****
  
              if ( $ command =~ /^ *(HELP)/i ) {
!                 my ( $response, $ok ) = $self->get_response_( $news, $client, $command);
!                 $self->echo_to_dot_( $news, $client, 0 ) if ( $response =~ /^1\d\d/ );
                  next;
              }
--- 332,340 ----
  
              if ( $ command =~ /^ *(HELP)/i ) {
!                 my ( $response, $ok ) = $self->get_response_( $news, $client,
!                                             $command);
!                 if ( $response =~ /^1\d\d/ ) {
!                     $self->echo_to_dot_( $news, $client, 0 );
!                 }
                  next;
              }
***************
*** 303,307 ****
              # Commands expecting a single-line response
  
!             if ( $command =~ /^ *(GROUP|STAT|IHAVE|LAST|NEXT|SLAVE|MODE|XPATH)/i ) {
                  $self->get_response_( $news, $client, $command );
                  next;
--- 342,347 ----
              # Commands expecting a single-line response
  
!             if ( $command =~ 
!                 /^ *(GROUP|STAT|IHAVE|LAST|NEXT|SLAVE|MODE|XPATH)/i ) {
                  $self->get_response_( $news, $client, $command );
                  next;
***************
*** 311,317 ****
  
              if ( $command =~ /^ *(IHAVE|POST|XRELPIC)/i ) {
!                 my ( $response, $ok ) = $self->get_response_( $news, $client, $command);
  
!                 # 3xx (300) series response indicates multi-line text should be sent, up to .crlf
  
                  if ($response =~ /^3\d\d/ ) {
--- 351,359 ----
  
              if ( $command =~ /^ *(IHAVE|POST|XRELPIC)/i ) {
!                 my ( $response, $ok ) = $self->get_response_( $news, $client,
!                                             $command);
  
!                 # 3xx (300) series response indicates multi-line text
!                 # should be sent, up to .crlf
  
                  if ($response =~ /^3\d\d/ ) {
***************
*** 321,325 ****
                      $self->echo_to_dot_( $client, $news, 0 );
  
!                     # Echo to dot doesn't provoke a server response somehow, we add another CRLF
  
                      $self->get_response_( $news, $client, "$eol" );
--- 363,368 ----
                      $self->echo_to_dot_( $client, $news, 0 );
  
!                     # Echo to dot doesn't provoke a server response
!                     # somehow, we add another CRLF
  
                      $self->get_response_( $news, $client, "$eol" );
***************
*** 333,342 ****
          if ( $ command =~ /^ *$/ ) {
              if ( $news && $news->connected ) {
!                 $self->get_response_($news, $client, $command, 1);
                  next;
              }
          }
  
!         # Don't know what this is so let's just pass it through and hope for the best
  
          if ( $news && $news->connected)  {
--- 376,386 ----
          if ( $ command =~ /^ *$/ ) {
              if ( $news && $news->connected ) {
!                 $self->get_response_( $news, $client, $command, 1 );
                  next;
              }
          }
  
!         # Don't know what this is so let's just pass it through and
!         # hope for the best
  
          if ( $news && $news->connected)  {

Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/POPFile

Modified Files:
	Module.pm 
Log Message:
*** Change all forms to use the POST method to make the URL displayed
    in the browser cleaner

skins/default/configuration-page.thtml
skins/default/corpus-page.thtml
skins/default/magnet-page.thtml
skins/default/pop3-chain-panel.thtml
skins/default/pop3-configuration-panel.thtml
skins/default/pop3-security-panel.thtml
skins/default/security-page.thtml
skins/default/socks-widget.thtml
skins/default/view-quickmagnets-widget.thtml:

Add method="POST" to all forms.

*** Get TestModule working

tests/TestModule.tst
POPFile/Module.pm:

Fix logger tests and clean up wrapping and whitespace.

*** Get Single Message View working

skins/default/view-page.thtml
UI/HTML.pm:

Remove Previous/Next navigator, make magnet detail work, add To, Cc and Date
fields to header.

*** Merge patch that makes History in database work with Japanese

Classifier/MailParse.pm:

Get the current interface language value if none is passed in.

*** Added "Decision Chart" to Single Message View

skins/default/view-scores-widget.thtml
Classifier/Bayes.pm:

The new Decision Chart shows the contribution each word makes to the top
two buckets sorted in the order biggest positive contribution to biggest
negative contribution.  The intent is that it shows how POPFile makes the
Bayes decision between the top two bucket.  You can see which words
contribute to the decision between the top two buckets and by how much.  
Hover on any bar to see the actual word.

Still some work to do make this look nice (e.g. scale, try to show the 
words themselves on the chart if possible).



Index: Module.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Module.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Module.pm	23 Jun 2004 14:17:01 -0000	1.35
--- Module.pm	24 Jun 2004 19:11:59 -0000	1.36
***************
*** 30,65 ****
  # ---------------------------------------------------------------------------------------------
  #
! # This module implements the base class for all POPFile Loadable Modules and
! # contains collection of methods that are common to all POPFile modules and only
! # selected ones need be overriden by subclasses
  #
! # POPFile is constructed from a collection of classes which all have special
! # PUBLIC interface functions:
  #
! # initialize() - called after the class is created to set default values for internal
! #                variables and global configuration information
  #
! # start()      - called once all configuration has been read and POPFile is ready to start
! #                operating
  #
  # stop()       - called when POPFile is shutting down
  #
! # service()    - called by the main POPFile process to allow a submodule to do its own
! #                work (this is optional for modules that do not need to perform any service)
  #
! # prefork()    - called when a module has requested a fork, but before the fork happens
  #
! # forked()     - called when a module has forked the process.  This is called within the child
! #                process and should be used to clean up
  #
! # postfork()   - called in the parent process to tell it that the fork has occurred.  This is
! #                like forked but in the parent
  #
! # reaper()     - called when a process has terminated to give a module a chance to do
! #                whatever clean up is needed
  #
! # name()       - returns a simple name for the module by which other modules can get access
! #                through the %components hash.  The name returned here will be the name
! #                used as the key for this module in %components
  #
  # deliver()    - called by the message queue to deliver a message
--- 30,68 ----
  # ---------------------------------------------------------------------------------------------
  #
! # This module implements the base class for all POPFile Loadable
! # Modules and contains collection of methods that are common to all
! # POPFile modules and only selected ones need be overriden by
! # subclasses
  #
! # POPFile is constructed from a collection of classes which all have
! # special PUBLIC interface functions:
  #
! # initialize() - called after the class is created to set default
! # values for internal variables and global configuration information
  #
! # start() - called once all configuration has been read and POPFile is
! # ready to start operating
  #
  # stop()       - called when POPFile is shutting down
  #
! # service() - called by the main POPFile process to allow a submodule
! # to do its own work (this is optional for modules that do not need to
! # perform any service)
  #
! # prefork() - called when a module has requested a fork, but before
! # the fork happens
  #
! # forked() - called when a module has forked the process.  This is
! # called within the child process and should be used to clean up
  #
! # postfork() - called in the parent process to tell it that the fork
! # has occurred.  This is like forked but in the parent
  #
! # reaper() - called when a process has terminated to give a module a
! # chance to do whatever clean up is needed
  #
! # name() - returns a simple name for the module by which other modules
! # can get access through the %components hash.  The name returned here
! # will be the name used as the key for this module in %components
  #
  # deliver()    - called by the message queue to deliver a message
***************
*** 67,108 ****
  # The following methods are PROTECTED and should be accessed by sub classes:
  #
! # log_()       - sends a string to the logger
  #
! # config_()    - gets or sets a configuration parameter for this module
  #
! # mq_post_()   - post a message to the central message queue
  #
! # mq_register_() register for messages from the message queue
  #
! # slurp_()       Reads a line up to CR, CRLF or LF
  #
! # register_configuration_item_() register a UI configuration item
  #
  # A note on the naming
  #
! # A method or variable that ends with an underscore is PROTECTED and should not be accessed
! # from outside the class (or subclass; in C++ its protected), to access a PROTECTED variable
! # you will find an equivalent getter/setter method with no underscore.
  #
! # Truly PRIVATE variables are indicated by a double underscore at the end of the name and
! # should not be accessed outside the class without going through a getter/setter and may
! # not be directly accessed by a subclass.
  #
  # For example
  #
! # $c->foo__() is a private method
! # $c->{foo__} is a private variable
! # $c->foo_() is a protected method
! # $c->{foo_} is a protected variable
! # $c->foo() is a public method that modifies $c->{foo_} it always returns the current
! # value of the variable it is referencing and if passed a value sets that corresponding
! # variable
  #
  # ---------------------------------------------------------------------------------------------
  
! # This variable is CLASS wide, not OBJECT wide and is used as temporary storage
! # for the slurp_ methods below.  It needs to be class wide because different objects
! # may call slurp on the same handle as the handle gets passed from object to
! # object.
  
  my %slurp_data__;
--- 70,111 ----
  # The following methods are PROTECTED and should be accessed by sub classes:
  #
! # log_() - sends a string to the logger
  #
! # config_() - gets or sets a configuration parameter for this module
  #
! # mq_post_() - post a message to the central message queue
  #
! # mq_register_() - register for messages from the message queue
  #
! # slurp_() - Reads a line up to CR, CRLF or LF
  #
! # register_configuration_item_() - register a UI configuration item
  #
  # A note on the naming
  #
! # A method or variable that ends with an underscore is PROTECTED and
! # should not be accessed from outside the class (or subclass; in C++
! # its protected), to access a PROTECTED variable you will find an
! # equivalent getter/setter method with no underscore.
  #
! # Truly PRIVATE variables are indicated by a double underscore at the
! # end of the name and should not be accessed outside the class without
! # going through a getter/setter and may not be directly accessed by a
! # subclass.
  #
  # For example
  #
! # $c->foo__() is a private method $c->{foo__} is a private variable
! # $c->foo_() is a protected method $c->{foo_} is a protected variable
! # $c->foo() is a public method that modifies $c->{foo_} it always
! # returns the current value of the variable it is referencing and if
! # passed a value sets that corresponding variable
  #
  # ---------------------------------------------------------------------------------------------
  
! # This variable is CLASS wide, not OBJECT wide and is used as
! # temporary storage for the slurp_ methods below.  It needs to be
! # class wide because different objects may call slurp on the same
! # handle as the handle gets passed from object to object.
  
  my %slurp_data__;
***************
*** 144,154 ****
      $self->{alive_}          = 1;
  
!     # This is a reference to the pipeready() function in popfile.pl that it used
!     # to determine if a pipe is ready for reading in a cross platform way
  
      $self->{pipeready_}      = 0;
  
!     # This is a reference to a function (forker) in popfile.pl that performs a fork
!     # and informs modules that a fork has occurred
  
      $self->{forker_}         = 0;
--- 147,158 ----
      $self->{alive_}          = 1;
  
!     # This is a reference to the pipeready() function in popfile.pl
!     # that it used to determine if a pipe is ready for reading in a
!     # cross platform way
  
      $self->{pipeready_}      = 0;
  
!     # This is a reference to a function (forker) in popfile.pl that
!     # performs a fork and informs modules that a fork has occurred
  
      $self->{forker_}         = 0;
***************
*** 161,174 ****
  # initialize
  #
! # Called to initialize the module, the main task that this function should perform is
! # setting up the default values of the configuration options for this object.  This is done
! # through the configuration_ hash value that will point the configuration module.
  #
! # Note that the configuration is not loaded from disk until after every module's initialize
! # has been called, so do not use any of these values until start() is called as they may
! # change
  #
! # The method should return 1 to indicate that it initialized correctly, if it returns
! # 0 then POPFile will abort loading immediately
  #
  # ---------------------------------------------------------------------------------------------
--- 165,180 ----
  # initialize
  #
! # Called to initialize the module, the main task that this function
! # should perform is setting up the default values of the configuration
! # options for this object.  This is done through the configuration_
! # hash value that will point the configuration module.
  #
! # Note that the configuration is not loaded from disk until after
! # every module's initialize has been called, so do not use any of
! # these values until start() is called as they may change
  #
! # The method should return 1 to indicate that it initialized
! # correctly, if it returns 0 then POPFile will abort loading
! # immediately
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 186,192 ****
  # Called when all configuration information has been loaded from disk.
  #
! # The method should return 1 to indicate that it started correctly, if it returns
! # 0 then POPFile will abort loading immediately, returns 2 if everything OK but this
! # module does not want to continue to be used.
  #
  # ---------------------------------------------------------------------------------------------
--- 192,199 ----
  # Called when all configuration information has been loaded from disk.
  #
! # The method should return 1 to indicate that it started correctly, if
! # it returns 0 then POPFile will abort loading immediately, returns 2
! # if everything OK but this module does not want to continue to be
! # used.
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 202,207 ****
  # stop
  #
! # Called when POPFile is closing down, this is the last method that will get called before
! # the object is destroyed.  There is not return value from stop().
  #
  # ---------------------------------------------------------------------------------------------
--- 209,215 ----
  # stop
  #
! # Called when POPFile is closing down, this is the last method that
! # will get called before the object is destroyed.  There is not return
! # value from stop().
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 215,221 ****
  # reaper
  #
! # Called when a child process terminates somewhere in POPFile.  The object should check
! # to see if it was one of its children and do any necessary processing by calling waitpid()
! # on any child handles it has
  #
  # There is no return value from this method
--- 223,230 ----
  # reaper
  #
! # Called when a child process terminates somewhere in POPFile.  The
! # object should check to see if it was one of its children and do any
! # necessary processing by calling waitpid() on any child handles it
! # has
  #
  # There is no return value from this method
***************
*** 231,239 ****
  # service
  #
! # service() is a called periodically to give the module a chance to do housekeeping work.
  #
! # If any problem occurs that requires POPFile to shutdown service() should return 0 and
! # the top level process will gracefully terminate POPFile including calling all stop()
! # methods.  In normal operation return 1.
  #
  # ---------------------------------------------------------------------------------------------
--- 240,250 ----
  # service
  #
! # service() is a called periodically to give the module a chance to do
! # housekeeping work.
  #
! # If any problem occurs that requires POPFile to shutdown service()
! # should return 0 and the top level process will gracefully terminate
! # POPFile including calling all stop() methods.  In normal operation
! # return 1.
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 263,271 ****
  # forked
  #
! # This is called when some module forks POPFile and is within the context of the child
! # process so that this module can close any duplicated file handles that are not needed.
  #
! # $writer            The writing end of a pipe that can be used to send up from
! #                    the child
  #
  # There is no return value from this method
--- 274,283 ----
  # forked
  #
! # This is called when some module forks POPFile and is within the
! # context of the child process so that this module can close any
! # duplicated file handles that are not needed.
  #
! # $writer The writing end of a pipe that can be used to send up from
! #         the child
  #
  # There is no return value from this method
***************
*** 281,290 ****
  # postfork
  #
! # This is called when some module has just forked POPFile.  It is called in the parent
! # process.
  #
! # $pid              The process ID of the new child process
! # $reader           The reading end of a pipe that can be used to read messages from
! #                   the child
  #
  # There is no return value from this method
--- 293,301 ----
  # postfork
  #
! # This is called when some module has just forked POPFile.  It is
! # called in the parent process.
  #
! # $pid The process ID of the new child process $reader The reading end
! #      of a pipe that can be used to read messages from the child
  #
  # There is no return value from this method
***************
*** 314,319 ****
  # log_
  #
! # Called by a subclass to send a message to the logger, the logged message will be prefixed
! # by the name of the module in use
  #
  # $level             The log level (see POPFile::Logger for details)
--- 325,330 ----
  # log_
  #
! # Called by a subclass to send a message to the logger, the logged
! # message will be prefixed by the name of the module in use
  #
  # $level             The log level (see POPFile::Logger for details)
***************
*** 328,332 ****
  
      my ( $package, $file, $line ) = caller;
!     $self->{logger__}->debug( $level, $self->{name__} . ": $line: " . $message );
  }
  
--- 339,344 ----
  
      my ( $package, $file, $line ) = caller;
!     $self->{logger__}->debug( $level, $self->{name__} . ": $line: " .
!         $message );
  }
  
***************
*** 389,399 ****
  # global_config_
  #
! # Called by a subclass to get or set a global (i.e. not module specific) configuration parameter
  #
  # $name              The name of the parameter (e.g. 'port')
  # $value             (optional) The value to set
  #
! # If called with just a $name then global_config_() will return the current value
! # of the configuration parameter.
  #
  # ---------------------------------------------------------------------------------------------
--- 401,412 ----
  # global_config_
  #
! # Called by a subclass to get or set a global (i.e. not module
! # specific) configuration parameter
  #
  # $name              The name of the parameter (e.g. 'port')
  # $value             (optional) The value to set
  #
! # If called with just a $name then global_config_() will return the
! # current value of the configuration parameter.
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 411,420 ****
  # Called by a subclass to get or set a module specific configuration parameter
  #
! # $module            The name of the module that owns the parameter (e.g. 'pop3')
! # $name              The name of the parameter (e.g. 'port')
! # $value             (optional) The value to set
  #
! # If called with just a $module and $name then module_config_() will return the current value
! # of the configuration parameter.
  #
  # ---------------------------------------------------------------------------------------------
--- 424,433 ----
  # Called by a subclass to get or set a module specific configuration parameter
  #
! # $module The name of the module that owns the parameter (e.g. 'pop3')
! # $name   The name of the parameter (e.g. 'port') $value (optional) The
! #         value to set
  #
! # If called with just a $module and $name then module_config_() will
! # return the current value of the configuration parameter.
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 432,436 ****
  # Called by a subclass to register a UI element
  #
! # $type, $name, $templ, $object     See register_configuration_item__ in UI::HTML
  #
  # ---------------------------------------------------------------------------------------------
--- 445,450 ----
  # Called by a subclass to register a UI element
  #
! # $type, $name, $templ, $object
! #     See register_configuration_item__ in UI::HTML
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 469,474 ****
  # flush_slurp_data__
  #
! # Helper function for slurp_ that returns an empty string if the slurp buffer doesn't
! # contain a complete line, or returns a complete line.
  #
  # $handle            Handle to read from, which should be in binmode
--- 483,488 ----
  # flush_slurp_data__
  #
! # Helper function for slurp_ that returns an empty string if the slurp
! # buffer doesn't contain a complete line, or returns a complete line.
  #
  # $handle            Handle to read from, which should be in binmode
***************
*** 494,513 ****
      }
  
!     # Look for CR, here we have to be careful because of the fact that the current
!     # total buffer could be ending with CR and there could actually be an LF to
!     # read, so we check for that situation if we find CR
  
      if ( $slurp_data__{"$handle"}{data} =~ s/^([^\015\012]*\015)// ) {
          my $cr = $1;
  
!         # If we have removed everything from the buffer then see if there's
!         # another character available to read, if there is then get it and check
!         # to see if it is LF (in which case this is a line ending CRLF), otherwise
!         # just save it
  
          if ( $slurp_data__{"$handle"}{data} eq '' ) {
  
!             # This unpleasant boolean is to handle the case where we are slurping
!             # a non-socket stream under Win32
  
              if ( ( ( $handle !~ /socket/i ) && ( $^O eq 'MSWin32' ) ) ||        # PROFILE BLOCK START
--- 508,528 ----
      }
  
!     # Look for CR, here we have to be careful because of the fact that
!     # the current total buffer could be ending with CR and there could
!     # actually be an LF to read, so we check for that situation if we
!     # find CR
  
      if ( $slurp_data__{"$handle"}{data} =~ s/^([^\015\012]*\015)// ) {
          my $cr = $1;
  
!         # If we have removed everything from the buffer then see if
!         # there's another character available to read, if there is
!         # then get it and check to see if it is LF (in which case this
!         # is a line ending CRLF), otherwise just save it
  
          if ( $slurp_data__{"$handle"}{data} eq '' ) {
  
!             # This unpleasant boolean is to handle the case where we
!             # are slurping a non-socket stream under Win32
  
              if ( ( ( $handle !~ /socket/i ) && ( $^O eq 'MSWin32' ) ) ||        # PROFILE BLOCK START
***************
*** 582,586 ****
      } else {
          $result = substr( $slurp_data__{"$handle"}{data}, 0, $length );
!         $slurp_data__{"$handle"}{data} = substr( $slurp_data__{"$handle"}{data}, $length );
      }
  
--- 597,602 ----
      } else {
          $result = substr( $slurp_data__{"$handle"}{data}, 0, $length );
!         $slurp_data__{"$handle"}{data} =
!             substr( $slurp_data__{"$handle"}{data}, $length );
      }
  
***************
*** 592,603 ****
  # slurp_
  #
! # A replacement for Perl's <> operator on a handle that reads a line until CR, CRLF or LF
! # is encountered.  Returns the line if read (with the CRs and LFs), or undef if at the EOF,
! # blocks waiting for something to read.
  #
! # IMPORTANT NOTE: If you don't read to the end of the stream using slurp_ then there may be
! #                 a small memory leak caused by slurp_'s buffering of data in the Module's
! #                 hash.   To flush it make a call to slurp_ when you know that the handle is
! #                 at the end of the stream, or call done_slurp_ on the handle.
  #
  # $handle            Handle to read from, which should be in binmode
--- 608,621 ----
  # slurp_
  #
! # A replacement for Perl's <> operator on a handle that reads a line
! # until CR, CRLF or LF is encountered.  Returns the line if read (with
! # the CRs and LFs), or undef if at the EOF, blocks waiting for
! # something to read.
  #
! # IMPORTANT NOTE: If you don't read to the end of the stream using
! # slurp_ then there may be a small memory leak caused by slurp_'s
! # buffering of data in the Module's hash.  To flush it make a call to
! # slurp_ when you know that the handle is at the end of the stream, or
! # call done_slurp_ on the handle.
  #
  # $handle            Handle to read from, which should be in binmode
***************
*** 649,654 ****
  # done_slurp_
  #
! # Call this when have finished calling slurp_ on a handle and need to clean up temporary
! # buffer space used by slurp_
  #
  # ---------------------------------------------------------------------------------------------
--- 667,672 ----
  # done_slurp_
  #
! # Call this when have finished calling slurp_ on a handle and need to
! # clean up temporary buffer space used by slurp_
  #
  # ---------------------------------------------------------------------------------------------
***************
*** 665,673 ****
  # ---------------------------------------------------------------------------------------------
  #
! # flush_extra_ - Read extra data from the mail server and send to client, this is to handle
! #               POP servers that just send data when they shouldn't.  I've seen one that sends
! #               debug messages!
  #
! #               Returns the extra data flushed
  #
  # $mail        The handle of the real mail server
--- 683,691 ----
  # ---------------------------------------------------------------------------------------------
  #
! # flush_extra_ - Read extra data from the mail server and send to
! # client, this is to handle POP servers that just send data when they
! # shouldn't.  I've seen one that sends debug messages!
  #
! # Returns the extra data flushed
  #
  # $mail        The handle of the real mail server
***************
*** 683,686 ****
--- 701,705 ----
  
      # If slurp has any data, we want it
+ 
      if ( $self->slurp_data_size__($mail) ) {
  
***************
*** 695,700 ****
  
      if (($^O eq 'MSWin32') && !($mail =~ /socket/i) ) {
!         # select only works reliably on IO::Sockets in Win32, so we always read files
!         # on MSWin32 (sysread returns 0 for eof)
  
          $always_read = 1; # PROFILE PLATFORM START MSWin32
--- 714,720 ----
  
      if (($^O eq 'MSWin32') && !($mail =~ /socket/i) ) {
! 
!         # select only works reliably on IO::Sockets in Win32, so we
!         # always read files on MSWin32 (sysread returns 0 for eof)
  
          $always_read = 1; # PROFILE PLATFORM START MSWin32
***************
*** 724,728 ****
              if ($n == 0) {
                  last;
! 	    }
          }
      }
--- 744,748 ----
              if ($n == 0) {
                  last;
!             }
          }
      }
***************
*** 731,739 ****
  }
  
! # GETTER/SETTER methods.  Note that I do not expect documentation of these unless they
! # are non-trivial since the documentation would be a waste of space
  #
! # The only thing to note is the idiom used, stick to that and there's no need to
! # document these
  #
  #   sub foo
--- 751,760 ----
  }
  
! # GETTER/SETTER methods.  Note that I do not expect documentation of
! # these unless they are non-trivial since the documentation would be a
! # waste of space
  #
! # The only thing to note is the idiom used, stick to that and there's
! # no need to document these
  #
  #   sub foo
***************
*** 748,753 ****
  #   }
  #
! # This method access the foo_ variable for reading or writing, $c->foo() read foo_ and
! # $c->foo( 'foo' ) writes foo_
  
  sub mq
--- 769,774 ----
  #   }
  #
! # This method access the foo_ variable for reading or writing,
! # $c->foo() read foo_ and $c->foo( 'foo' ) writes foo_
  
  sub mq

Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/UI

Modified Files:
	HTML.pm HTTP.pm 
Log Message:
*** Change all forms to use the POST method to make the URL displayed
    in the browser cleaner

skins/default/configuration-page.thtml
skins/default/corpus-page.thtml
skins/default/magnet-page.thtml
skins/default/pop3-chain-panel.thtml
skins/default/pop3-configuration-panel.thtml
skins/default/pop3-security-panel.thtml
skins/default/security-page.thtml
skins/default/socks-widget.thtml
skins/default/view-quickmagnets-widget.thtml:

Add method="POST" to all forms.

*** Get TestModule working

tests/TestModule.tst
POPFile/Module.pm:

Fix logger tests and clean up wrapping and whitespace.

*** Get Single Message View working

skins/default/view-page.thtml
UI/HTML.pm:

Remove Previous/Next navigator, make magnet detail work, add To, Cc and Date
fields to header.

*** Merge patch that makes History in database work with Japanese

Classifier/MailParse.pm:

Get the current interface language value if none is passed in.

*** Added "Decision Chart" to Single Message View

skins/default/view-scores-widget.thtml
Classifier/Bayes.pm:

The new Decision Chart shows the contribution each word makes to the top
two buckets sorted in the order biggest positive contribution to biggest
negative contribution.  The intent is that it shows how POPFile makes the
Bayes decision between the top two bucket.  You can see which words
contribute to the decision between the top two buckets and by how much.  
Hover on any bar to see the actual word.

Still some work to do make this look nice (e.g. scale, try to show the 
words themselves on the chart if possible).



Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.279
retrieving revision 1.280
diff -C2 -d -r1.279 -r1.280
*** HTML.pm	23 Jun 2004 14:17:03 -0000	1.279
--- HTML.pm	24 Jun 2004 19:12:03 -0000	1.280
***************
*** 82,86 ****
      # The classifier (Classifier::Bayes)
  
!     $self->{classifier__}      = 0;
  
      # Session key to make the UI safer
--- 82,86 ----
      # The classifier (Classifier::Bayes)
  
!     $self->{c__}      = 0;
  
[...1109 lines suppressed...]
  
***************
*** 2901,2908 ****
  
      if ( defined( $value ) ) {
!         $self->{classifier__} = $value;
      }
  
!     return $self->{classifier__};
  }
  
--- 2952,2959 ----
  
      if ( defined( $value ) ) {
!         $self->{c__} = $value;
      }
  
!     return $self->{c__};
  }
  

Index: HTTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** HTTP.pm	23 Jun 2004 14:17:03 -0000	1.19
--- HTTP.pm	24 Jun 2004 19:12:03 -0000	1.20
***************
*** 350,356 ****
          close FILE;
  
!         # To prevent the browser for continuously asking for file handled in this way
!         # we calculate the current date and time plus 1 hour to give the browser
!         # cache 1 hour to keep things like graphics and style sheets in cache.
  
          my @day   = ( 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' );
--- 350,357 ----
          close FILE;
  
!         # To prevent the browser for continuously asking for file
!         # handled in this way we calculate the current date and time
!         # plus 1 hour to give the browser cache 1 hour to keep things
!         # like graphics and style sheets in cache.
  
          my @day   = ( 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' );

Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/Classifier

Modified Files:
	Bayes.pm MailParse.pm 
Log Message:
*** Change all forms to use the POST method to make the URL displayed
    in the browser cleaner

skins/default/configuration-page.thtml
skins/default/corpus-page.thtml
skins/default/magnet-page.thtml
skins/default/pop3-chain-panel.thtml
skins/default/pop3-configuration-panel.thtml
skins/default/pop3-security-panel.thtml
skins/default/security-page.thtml
skins/default/socks-widget.thtml
skins/default/view-quickmagnets-widget.thtml:

Add method="POST" to all forms.

*** Get TestModule working

tests/TestModule.tst
POPFile/Module.pm:

Fix logger tests and clean up wrapping and whitespace.

*** Get Single Message View working

skins/default/view-page.thtml
UI/HTML.pm:

Remove Previous/Next navigator, make magnet detail work, add To, Cc and Date
fields to header.

*** Merge patch that makes History in database work with Japanese

Classifier/MailParse.pm:

Get the current interface language value if none is passed in.

*** Added "Decision Chart" to Single Message View

skins/default/view-scores-widget.thtml
Classifier/Bayes.pm:

The new Decision Chart shows the contribution each word makes to the top
two buckets sorted in the order biggest positive contribution to biggest
negative contribution.  The intent is that it shows how POPFile makes the
Bayes decision between the top two bucket.  You can see which words
contribute to the decision between the top two buckets and by how much.  
Hover on any bar to see the actual word.

Still some work to do make this look nice (e.g. scale, try to show the 
words themselves on the chart if possible).



Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.299
retrieving revision 1.300
diff -C2 -d -r1.299 -r1.300
*** Bayes.pm	23 Jun 2004 14:17:01 -0000	1.299
--- Bayes.pm	24 Jun 2004 19:11:56 -0000	1.300
***************
*** 2125,2128 ****
--- 2125,2129 ----
  
              my @word_data;
+             my %chart;
              foreach my $id (@ranked_ids) {
                  my %row_data;
***************
*** 2150,2153 ****
--- 2151,2155 ----
  
                      my @per_bucket;
+                     my @score;
                      foreach my $ix (0..($#buckets > 7? 7: $#buckets)) {
                          my %bucket_row;
***************
*** 2169,2172 ****
--- 2171,2175 ----
                              if ($self->{wmformat__} eq 'score') {
                                  $wordprobstr  = sprintf("%12.4f", ($probability - $self->{not_likely__}{$userid})/$log10 );
+                                 push ( @score, $wordprobstr );
                              } else {
                                  if ($self->{wmformat__} eq 'prob') {
***************
*** 2182,2189 ****
--- 2185,2246 ----
                      $row_data{View_Score_Loop_Per_Bucket} = \@per_bucket;
  
+                     # If we are doing the word scores then we build up
+                     # a hash that maps the name of a word to a value
+                     # which is the difference between the word scores
+                     # for the top two buckets.  We later use this to
+                     # draw a chart
+ 
+                     if ( $self->{wmformat__} eq 'score' ) {
+                         $chart{$$idmap{$id}} = $score[0] - $score[1];
+                     }
+ 
                      push ( @word_data, \%row_data );
                  }
              }
              $templ->param( 'View_Score_Loop_Words' => \@word_data );
+ 
+             # Draw a chart that shows how the decision between the top
+             # two buckets was made.
+ 
+             my @words = sort { $chart{$b} <=> $chart{$a} } keys %chart;
+ 
+             my @chart_data;
+             my $max_chart = $chart{$words[0]};
+             my $min_chart = $chart{$words[$#words]};
+             my $scale = 400 / ( $max_chart - $min_chart );
+             my $width = 400 / $#words;
+             my $color = $self->get_bucket_color( $session, $ranking[0] );
+             foreach my $word (@words) {
+                 my %row_data;
+ 
+                 next if ( $chart{$word} == 0 );
+ 
+                 $row_data{View_If_Bar} = ( $chart{$word} > 0 );
+                 if ( $chart{$word} > 0 ) {
+                     $row_data{View_Height} = $chart{$word} * $scale;
+                 }
+                 $row_data{View_Chart_Word} = $word;
+                 $row_data{View_Width} = $width;
+                 $row_data{View_Color} = $color;
+                 push ( @chart_data, \%row_data );
+             }
+             $templ->param( 'View_Loop_Chart1' => \@chart_data );
+             my @chart_data2;
+             $color = $self->get_bucket_color( $session, $ranking[1] );
+             foreach my $word (@words) {
+                 my %row_data;
+ 
+                 next if ( $chart{$word} == 0 );
+ 
+                 $row_data{View_If_Bar} = ( $chart{$word} < 0 );
+                 if ( $chart{$word} < 0 ) {
+                     $row_data{View_Height} = -$chart{$word} * $scale;
+                 }
+                 $row_data{View_Chart_Word} = $word;
+                 $row_data{View_Width} = $width;
+                 $row_data{View_Color} = $color;
+                 push ( @chart_data2, \%row_data );
+             }
+             $templ->param( 'View_Loop_Chart2' => \@chart_data2 );
          }
      }

Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.196
retrieving revision 1.197
diff -C2 -d -r1.196 -r1.197
*** MailParse.pm	8 Jun 2004 14:39:56 -0000	1.196
--- MailParse.pm	24 Jun 2004 19:11:59 -0000	1.197
***************
*** 1721,1725 ****
  # ---------------------------------------------------------------------------------------------
  #
! # decode_string - Decode MIME encoded strings used in the header lines in email messages
  #
  # $mystring     - The string that neeeds decode
--- 1721,1726 ----
  # ---------------------------------------------------------------------------------------------
  #
! # decode_string - Decode MIME encoded strings used in the header lines
! # in email messages
  #
  # $mystring     - The string that neeeds decode
***************
*** 1729,1741 ****
  # =?charset?[BQ]?text?=
  #
! # $lang     Pass in the current interface language for language specific encoding conversion
! # A B indicates base64 encoding, a Q indicates quoted printable encoding
  # ---------------------------------------------------------------------------------------------
  sub decode_string
  {
!     # I choose not to use "$mystring = MIME::Base64::decode( $1 );" because some spam mails
!     # have subjects like: "Subject: adjpwpekm =?ISO-8859-1?Q?=B2=E1=A4=D1=AB=C7?= dopdalnfjpw".
!     # Therefore, it will be better to store the decoded text in a temporary variable and substitute
!     # the original string with it later. Thus, this subroutine returns the real decoded result.
  
      my ( $self, $mystring, $lang ) = @_;
--- 1730,1745 ----
  # =?charset?[BQ]?text?=
  #
! # $lang Pass in the current interface language for language specific
! # encoding conversion A B indicates base64 encoding, a Q indicates
! # quoted printable encoding
  # ---------------------------------------------------------------------------------------------
  sub decode_string
  {
!     # I choose not to use "$mystring = MIME::Base64::decode( $1 );"
!     # because some spam mails have subjects like: "Subject: adjpwpekm
!     # =?ISO-8859-1?Q?=B2=E1=A4=D1=AB=C7?= dopdalnfjpw".  Therefore, it
!     # will be better to store the decoded text in a temporary variable
!     # and substitute the original string with it later. Thus, this
!     # subroutine returns the real decoded result.
  
      my ( $self, $mystring, $lang ) = @_;
***************
*** 1744,1747 ****
--- 1748,1753 ----
      my $charset = '';
  
+     $lang = $self->{lang__} if ( !defined( $lang ) || ( $lang eq '' ) );
+ 
      while ( $mystring =~ /=\?([\w-]+)\?(B|Q)\?(.*?)\?=/ig ) {
          if ($2 eq "B" || $2 eq "b") {

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

Modified Files:
	configuration-page.thtml corpus-page.thtml history-page.thtml 
	magnet-page.thtml pop3-chain-panel.thtml 
	pop3-configuration-panel.thtml pop3-security-panel.thtml 
	security-page.thtml socks-widget.thtml view-page.thtml 
	view-quickmagnets-widget.thtml view-scores-widget.thtml 
Log Message:
*** Change all forms to use the POST method to make the URL displayed
    in the browser cleaner

skins/default/configuration-page.thtml
skins/default/corpus-page.thtml
skins/default/magnet-page.thtml
skins/default/pop3-chain-panel.thtml
skins/default/pop3-configuration-panel.thtml
skins/default/pop3-security-panel.thtml
skins/default/security-page.thtml
skins/default/socks-widget.thtml
skins/default/view-quickmagnets-widget.thtml:

Add method="POST" to all forms.

*** Get TestModule working

tests/TestModule.tst
POPFile/Module.pm:

Fix logger tests and clean up wrapping and whitespace.

*** Get Single Message View working

skins/default/view-page.thtml
UI/HTML.pm:

Remove Previous/Next navigator, make magnet detail work, add To, Cc and Date
fields to header.

*** Merge patch that makes History in database work with Japanese

Classifier/MailParse.pm:

Get the current interface language value if none is passed in.

*** Added "Decision Chart" to Single Message View

skins/default/view-scores-widget.thtml
Classifier/Bayes.pm:

The new Decision Chart shows the contribution each word makes to the top
two buckets sorted in the order biggest positive contribution to biggest
negative contribution.  The intent is that it shows how POPFile makes the
Bayes decision between the top two bucket.  You can see which words
contribute to the decision between the top two buckets and by how much.  
Hover on any bar to see the actual word.

Still some work to do make this look nice (e.g. scale, try to show the 
words themselves on the chart if possible).



Index: pop3-security-panel.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pop3-security-panel.thtml	24 Jun 2004 11:50:57 -0000	1.3
--- pop3-security-panel.thtml	24 Jun 2004 19:12:10 -0000	1.4
***************
*** 9,26 ****
                  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
  
!                 <TMPL_IF NAME="POP3_Security_Local">
! 
!                 <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_Security_NoStealthMode"></span>
!                 <input type="submit" class="toggleOn" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
!                 <input type="hidden" name="pop3_local" value="1" />
! 
!                 <TMPL_ELSE>
! 
!                 <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
!                 <input type="submit" class="toggleOff" id="securityAcceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <TMPL_VAR NAME="Localize_Security_StealthMode">
!                 <input type="hidden" name="pop3_local" value="2" />
!                 </TMPL_IF>
  
-             </form>
          </td>
      </tr>
--- 9,26 ----
                  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
  
! <TMPL_IF NAME="POP3_Security_Local">
!     <form class="securitySwitch" action="/security" method="POST">
!     <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_Security_NoStealthMode"></span>
!     <input type="submit" class="toggleOn" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
!     <input type="hidden" name="pop3_local" value="1" />
!     <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
! <TMPL_ELSE>
!     <form class="securitySwitch" action="/security" method="POST">
!     <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
!     <input type="submit" class="toggleOff" id="securityAcceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" />
!     <input type="hidden" name="pop3_local" value="2" />
!     <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
! </TMPL_IF>
  
          </td>
      </tr>

Index: pop3-configuration-panel.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/pop3-configuration-panel.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pop3-configuration-panel.thtml	14 Jun 2004 11:15:36 -0000	1.2
--- pop3-configuration-panel.thtml	24 Jun 2004 19:12:10 -0000	1.3
***************
*** 1,3 ****
! <form action="/configuration">
  <label class="configurationLabel" for="configPopPort"><TMPL_VAR NAME="Localize_Configuration_POP3Port">:</label><br />
  <input name="pop3_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="POP3_Configuration_Port">" />
--- 1,3 ----
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configPopPort"><TMPL_VAR NAME="Localize_Configuration_POP3Port">:</label><br />
  <input name="pop3_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="POP3_Configuration_Port">" />
***************
*** 13,17 ****
  </TMPL_IF>
  
! <form action="/configuration">
  <label class="configurationLabel" for="configSeparator"><TMPL_VAR NAME="Localize_Configuration_POP3Separator">:</label><br />
  <input name="pop3_separator" id="configSeparator" type="text" value="<TMPL_VAR NAME="POP3_Configuration_Separator">" />
--- 13,17 ----
  </TMPL_IF>
  
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configSeparator"><TMPL_VAR NAME="Localize_Configuration_POP3Separator">:</label><br />
  <input name="pop3_separator" id="configSeparator" type="text" value="<TMPL_VAR NAME="POP3_Configuration_Separator">" />
***************
*** 31,35 ****
  
  <TMPL_IF NAME="POP3_Configuration_If_Force_Fork">
!     <form action="/configuration">
      <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span>
      <input type="submit" class="toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
--- 31,35 ----
  
  <TMPL_IF NAME="POP3_Configuration_If_Force_Fork">
!     <form action="/configuration" method="POST">
      <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span>
      <input type="submit" class="toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
***************
*** 37,41 ****
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
  <TMPL_ELSE>
!     <form action="/configuration">
      <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
      <input type="submit" class="toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
--- 37,41 ----
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
  <TMPL_ELSE>
!     <form action="/configuration" method="POST">
      <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
      <input type="submit" class="toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />

Index: security-page.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/security-page.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** security-page.thtml	19 May 2004 13:30:14 -0000	1.1
--- security-page.thtml	24 Jun 2004 19:12:10 -0000	1.2
***************
*** 12,16 ****
  
  <TMPL_IF NAME="Security_If_Local">
!     <form class="securitySwitch" action="/security">
      <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_Security_NoStealthMode"></span>
      <input type="submit" class="toggleOn" id="securityAcceptHTTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
--- 12,16 ----
  
  <TMPL_IF NAME="Security_If_Local">
!     <form class="securitySwitch" action="/security" method="POST">
      <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_Security_NoStealthMode"></span>
      <input type="submit" class="toggleOn" id="securityAcceptHTTPOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
***************
*** 18,22 ****
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
  <TMPL_ELSE>
!     <form class="securitySwitch" action="/security">
      <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
      <input type="submit" class="toggleOff" id="securityAcceptHTTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <TMPL_VAR NAME="Localize_Security_StealthMode"> 
--- 18,22 ----
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
  <TMPL_ELSE>
!     <form class="securitySwitch" action="/security" method="POST">
      <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
      <input type="submit" class="toggleOff" id="securityAcceptHTTPOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <TMPL_VAR NAME="Localize_Security_StealthMode"> 
***************
*** 54,58 ****
  <table border="0" cellpadding="0" cellspacing="0" summary=""><tr><td>
  <TMPL_IF NAME="Security_If_Update_Check">
!     <form class="securitySwitch" action="/security">
      <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
      <input type="submit" class="toggleOff" id="securityUpdateCheckOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
--- 54,58 ----
  <table border="0" cellpadding="0" cellspacing="0" summary=""><tr><td>
  <TMPL_IF NAME="Security_If_Update_Check">
!     <form class="securitySwitch" action="/security" method="POST">
      <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
      <input type="submit" class="toggleOff" id="securityUpdateCheckOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
***************
*** 60,64 ****
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
  <TMPL_ELSE>
!     <form class="securitySwitch" action="/security">
      <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span>
      <input type="submit" class="toggleOn" id="securityUpdateCheckOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
--- 60,64 ----
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
  <TMPL_ELSE>
!     <form class="securitySwitch" action="/security" method="POST">
      <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span>
      <input type="submit" class="toggleOn" id="securityUpdateCheckOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
***************
*** 75,79 ****
  <table border="0" cellpadding="0" cellspacing="0" summary=""><tr><td>
  <TMPL_IF NAME="Security_If_Send_Stats">
!     <form class="securitySwitch" action="/security">
      <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
      <input type="submit" class="toggleOff" id="securitySendStatsOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
--- 75,79 ----
  <table border="0" cellpadding="0" cellspacing="0" summary=""><tr><td>
  <TMPL_IF NAME="Security_If_Send_Stats">
!     <form class="securitySwitch" action="/security" method="POST">
      <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
      <input type="submit" class="toggleOff" id="securitySendStatsOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
***************
*** 81,85 ****
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
  <TMPL_ELSE>
!     <form class="securitySwitch" action="/security">
      <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span>
      <input type="submit" class="toggleOn" id="securitySendStatsOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
--- 81,85 ----
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
  <TMPL_ELSE>
!     <form class="securitySwitch" action="/security" method="POST">
      <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_No"></span>
      <input type="submit" class="toggleOn" id="securitySendStatsOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />

Index: socks-widget.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/socks-widget.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** socks-widget.thtml	19 May 2004 13:30:14 -0000	1.1
--- socks-widget.thtml	24 Jun 2004 19:12:10 -0000	1.2
***************
*** 1,3 ****
! <form action="/configuration">
  <label class="configurationLabel" for="SOCKSServer"><TMPL_VAR NAME="Localize_Configuration_SOCKSServer">:</label><br />
  <input type="text" name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_server" id="SOCKSServer" value="<TMPL_VAR NAME="Socks_Server">" />
--- 1,3 ----
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="SOCKSServer"><TMPL_VAR NAME="Localize_Configuration_SOCKSServer">:</label><br />
  <input type="text" name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_server" id="SOCKSServer" value="<TMPL_VAR NAME="Socks_Server">" />
***************
*** 9,13 ****
  </TMPL_IF>
  
! <form action="/configuration">
  <label class="configurationLabel" for="configSOCKSPort"><TMPL_VAR NAME="Localize_Configuration_SOCKSPort">:</label><br />
  <input name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_port" type="text" id="configSOCKSPort" value="<TMPL_VAR NAME="Socks_Port">" />
--- 9,13 ----
  </TMPL_IF>
  
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configSOCKSPort"><TMPL_VAR NAME="Localize_Configuration_SOCKSPort">:</label><br />
  <input name="<TMPL_VAR NAME="Socks_Widget_Name">_socks_port" type="text" id="configSOCKSPort" value="<TMPL_VAR NAME="Socks_Port">" />

Index: view-quickmagnets-widget.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/view-quickmagnets-widget.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view-quickmagnets-widget.thtml	24 May 2004 17:52:30 -0000	1.2
--- view-quickmagnets-widget.thtml	24 Jun 2004 19:12:10 -0000	1.3
***************
*** 2,6 ****
  <TMPL_IF NAME="View_QuickMagnets_If">
  
! <form action="/magnets" method="get">
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
      <input type="hidden" name="count" value="<TMPL_VAR NAME="View_QuickMagnets_Count">" />
--- 2,6 ----
  <TMPL_IF NAME="View_QuickMagnets_If">
  
! <form action="/magnets" method="post">
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
      <input type="hidden" name="count" value="<TMPL_VAR NAME="View_QuickMagnets_Count">" />

Index: pop3-chain-panel.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/pop3-chain-panel.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pop3-chain-panel.thtml	19 May 2004 13:30:14 -0000	1.1
--- pop3-chain-panel.thtml	24 Jun 2004 19:12:10 -0000	1.2
***************
*** 1,3 ****
! <form action="/security">
  <label class="securityLabel" for="securitySecureServer"><TMPL_VAR NAME="Localize_Security_SecureServer">:</label><br />
  <input type="text" name="server" id="securitySecureServer" value="<TMPL_VAR NAME="POP3_Chain_Secure_Server">" />
--- 1,3 ----
! <form action="/security" method="POST">
  <label class="securityLabel" for="securitySecureServer"><TMPL_VAR NAME="Localize_Security_SecureServer">:</label><br />
  <input type="text" name="server" id="securitySecureServer" value="<TMPL_VAR NAME="POP3_Chain_Secure_Server">" />
***************
*** 9,13 ****
  </TMPL_IF>
  
! <form action="/security">
  <label class="securityLabel" for="securitySecurePort"><TMPL_VAR NAME="Localize_Security_SecurePort">:</label><br />
  <input type="text" name="sport" id="securitySecurePort" value="<TMPL_VAR NAME="POP3_Chain_Secure_Port">" />
--- 9,13 ----
  </TMPL_IF>
  
! <form action="/security" method="POST">
  <label class="securityLabel" for="securitySecurePort"><TMPL_VAR NAME="Localize_Security_SecurePort">:</label><br />
  <input type="text" name="sport" id="securitySecurePort" value="<TMPL_VAR NAME="POP3_Chain_Secure_Port">" />

Index: view-scores-widget.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/view-scores-widget.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view-scores-widget.thtml	24 May 2004 17:52:30 -0000	1.2
--- view-scores-widget.thtml	24 Jun 2004 19:12:10 -0000	1.3
***************
*** 194,198 ****
      </TMPL_LOOP>
  
! </table>
  
  </TMPL_IF>
--- 194,224 ----
      </TMPL_LOOP>
  
!     </table>
!     <hr>
! 
!     <b>
!         <TMPL_VAR NAME="Localize_View_Chart">
!     </b>
!     <p>
!     <table>
!     <tr>
!     <TMPL_LOOP NAME="View_Loop_Chart1">
!         <td valign="bottom">
!         <TMPL_IF NAME="View_If_Bar">
!             <img src="autogen_<TMPL_VAR NAME="View_Color">.bmp" width="<TMPL_VAR NAME="View_Width">" height="<TMPL_VAR NAME="View_Height">" alt="<TMPL_VAR NAME="View_Chart_Word">" title="<TMPL_VAR NAME="View_Chart_Word">">
!         </TMPL_IF>
!         </td>
!     </TMPL_LOOP>
!     </tr>
!     <tr>
!     <TMPL_LOOP NAME="View_Loop_Chart2">
!         <td valign="top">
!         <TMPL_IF NAME="View_If_Bar">
!             <img src="autogen_<TMPL_VAR NAME="View_Color">.bmp" width="<TMPL_VAR NAME="View_Width">" height="<TMPL_VAR NAME="View_Height">" alt="<TMPL_VAR NAME="View_Chart_Word">" title="<TMPL_VAR NAME="View_Chart_Word">"><br>
!         </TMPL_IF>
!         </td>
!     </TMPL_LOOP>
!     </tr>
!     </table>
  
  </TMPL_IF>

Index: magnet-page.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/magnet-page.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** magnet-page.thtml	13 Jun 2004 17:06:48 -0000	1.2
--- magnet-page.thtml	24 Jun 2004 19:12:10 -0000	1.3
***************
*** 101,105 ****
  </table>
  <div class="magnetsNewWidget">
!     <form action="/magnets">
          <label class="magnetsLabel" for="magnetsAddType">
              <TMPL_VAR NAME="Localize_Magnet_MagnetType">:
--- 101,105 ----
  </table>
  <div class="magnetsNewWidget">
!     <form action="/magnets" method="POST">
          <label class="magnetsLabel" for="magnetsAddType">
              <TMPL_VAR NAME="Localize_Magnet_MagnetType">:

Index: history-page.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/history-page.thtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** history-page.thtml	23 Jun 2004 14:17:03 -0000	1.12
--- history-page.thtml	24 Jun 2004 19:12:10 -0000	1.13
***************
*** 6,10 ****
  <form id="HistoryMainForm" action="/history" method="POST">
      <input type="hidden" name="search" value="<TMPL_VAR NAME="History_Field_Search">" />
!     <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" />
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
      <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" />
--- 6,11 ----
  <form id="HistoryMainForm" action="/history" method="POST">
      <input type="hidden" name="search" value="<TMPL_VAR NAME="History_Field_Search">" />
!     <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" />    
!     <input type="hidden" name="negate" value="<TMPL_VAR NAME="History_Field_Negate">" />
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
      <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" />
***************
*** 48,51 ****
--- 49,53 ----
      <input type="hidden" name="search" value="<TMPL_VAR NAME="History_Field_Search">" />
      <input type="hidden" name="sort" value="<TMPL_VAR NAME="History_Field_Sort">" />
+     <input type="hidden" name="negate" value="<TMPL_VAR NAME="History_Field_Negate">" />
      <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
      <input type="hidden" name="start_message" value="<TMPL_VAR NAME="History_Start_Message">" />

Index: configuration-page.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/configuration-page.thtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configuration-page.thtml	10 Jun 2004 14:39:38 -0000	1.3
--- configuration-page.thtml	24 Jun 2004 19:12:09 -0000	1.4
***************
*** 5,9 ****
  <tr><td class="settingsPanel" width="33%" valign="top">
  <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_UserInterface"></h2>
! <form action="/configuration">
  <label class="configurationLabel" for="configSkin"><TMPL_VAR NAME="Localize_Configuration_SkinsChoose">:</label><br />
  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
--- 5,9 ----
  <tr><td class="settingsPanel" width="33%" valign="top">
  <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_UserInterface"></h2>
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configSkin"><TMPL_VAR NAME="Localize_Configuration_SkinsChoose">:</label><br />
  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
***************
*** 37,41 ****
  </form>
  
! <form action="/configuration">
  <label class="configurationLabel" for="configLanguage"><TMPL_VAR NAME="Localize_Configuration_LanguageChoose">:</label><br />
  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
--- 37,41 ----
  </form>
  
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configLanguage"><TMPL_VAR NAME="Localize_Configuration_LanguageChoose">:</label><br />
  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
***************
*** 52,56 ****
  <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_HistoryView"></h2>
  
! <form action="/configuration">
  <label class="configurationLabel" for="configPageSize"><TMPL_VAR NAME="Localize_Configuration_History">:</label><br />
  <input name="page_size" id="configPageSize" type="text" value="<TMPL_VAR NAME="Configuration_Page_Size">" />
--- 52,56 ----
  <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_HistoryView"></h2>
  
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configPageSize"><TMPL_VAR NAME="Localize_Configuration_History">:</label><br />
  <input name="page_size" id="configPageSize" type="text" value="<TMPL_VAR NAME="Configuration_Page_Size">" />
***************
*** 62,66 ****
  <TMPL_VAR NAME="Configuration_Page_Size_Updated">
  
! <form action="/configuration">
  <label class="configurationLabel" for="configHistoryDays"><TMPL_VAR NAME="Localize_Configuration_Days">:</label> <br />
  <input name="history_days" id="configHistoryDays" type="text" value="<TMPL_VAR NAME="Configuration_History_Days">" />
--- 62,66 ----
  <TMPL_VAR NAME="Configuration_Page_Size_Updated">
  
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configHistoryDays"><TMPL_VAR NAME="Localize_Configuration_Days">:</label> <br />
  <input name="history_days" id="configHistoryDays" type="text" value="<TMPL_VAR NAME="Configuration_History_Days">" />
***************
*** 74,78 ****
  <TMPL_VAR NAME="Configuration_History_Days_Updated">
  
! <form action="/configuration">
  <label class="configurationLabel" for="configUIPort"><TMPL_VAR NAME="Localize_Configuration_Fields">:</label><br />
  <TMPL_LOOP NAME="Configuration_Loop_History_Columns">
--- 74,78 ----
  <TMPL_VAR NAME="Configuration_History_Days_Updated">
  
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configUIPort"><TMPL_VAR NAME="Localize_Configuration_Fields">:</label><br />
  <TMPL_LOOP NAME="Configuration_Loop_History_Columns">
***************
*** 85,89 ****
  <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_ListenPorts"></h2>
  
! <form action="/configuration">
  <label class="configurationLabel" for="configUIPort"><TMPL_VAR NAME="Localize_Configuration_UI">:</label><br />
  <input name="ui_port" id="configUIPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_Port">" />
--- 85,89 ----
  <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_ListenPorts"></h2>
  
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configUIPort"><TMPL_VAR NAME="Localize_Configuration_UI">:</label><br />
  <input name="ui_port" id="configUIPort" type="text" value="<TMPL_VAR NAME="Configuration_UI_Port">" />
***************
*** 101,105 ****
  <h3 class="configuration"><TMPL_VAR NAME="Localize_Configuration_TCPTimeout"></h3>
  
! <form action="/configuration">
  <label class="configurationLabel" for="configTCPTimeout"><TMPL_VAR NAME="Localize_Configuration_TCPTimeoutSecs">:</label><br />
  <input name="timeout" type="text" id="configTCPTimeout" value="<TMPL_VAR NAME="Configuration_TCP_Timeout">" />
--- 101,105 ----
  <h3 class="configuration"><TMPL_VAR NAME="Localize_Configuration_TCPTimeout"></h3>
  
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configTCPTimeout"><TMPL_VAR NAME="Localize_Configuration_TCPTimeoutSecs">:</label><br />
  <input name="timeout" type="text" id="configTCPTimeout" value="<TMPL_VAR NAME="Configuration_TCP_Timeout">" />
***************
*** 115,119 ****
  <td class="settingsPanel" width="33%" valign="top">
  <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_Logging"></h2>
! <form action="/configuration">
  <label class="configurationLabel" for="configLogging"><TMPL_VAR NAME="Localize_Configuration_LoggerOutput">:</label>
  <input type="hidden" value="<TMPL_VAR NAME="Session_Key">" name="session" />
--- 115,119 ----
  <td class="settingsPanel" width="33%" valign="top">
  <h2 class="configuration"><TMPL_VAR NAME="Localize_Configuration_Logging"></h2>
! <form action="/configuration" method="POST">
  <label class="configurationLabel" for="configLogging"><TMPL_VAR NAME="Localize_Configuration_LoggerOutput">:</label>
  <input type="hidden" value="<TMPL_VAR NAME="Session_Key">" name="session" />

Index: corpus-page.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/corpus-page.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** corpus-page.thtml	13 Jun 2004 16:49:39 -0000	1.2
--- corpus-page.thtml	24 Jun 2004 19:12:10 -0000	1.3
***************
*** 103,107 ****
  
          <td align="center">
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets">
  
                  <TMPL_IF NAME="Corpus_If_Subject">
--- 103,107 ----
  
          <td align="center">
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets" method="POST">
  
                  <TMPL_IF NAME="Corpus_If_Subject">
***************
*** 131,135 ****
          </td>
          <td align="center">
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets">
  
                  <TMPL_IF NAME="Corpus_If_XTC">
--- 131,135 ----
          </td>
          <td align="center">
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets" method="POST">
  
                  <TMPL_IF NAME="Corpus_If_XTC">
***************
*** 159,163 ****
          </td>
          <td align="center">
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets">
  
                  <TMPL_IF NAME="Corpus_If_XPL">
--- 159,163 ----
          </td>
          <td align="center">
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets" method="POST">
  
                  <TMPL_IF NAME="Corpus_If_XPL">
***************
*** 187,191 ****
          </td>
          <td align="center">
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets">
  
                  <TMPL_IF NAME="Corpus_If_Quarantine">
--- 187,191 ----
          </td>
          <td align="center">
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets" method="POST">
  
                  <TMPL_IF NAME="Corpus_If_Quarantine">
***************
*** 218,222 ****
  
          <td>
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets">
                  <select name="color">
  
--- 218,222 ----
  
          <td>
!             <form class="bucketsSwitch" style="margin: 0" action="/buckets" method="POST">
                  <select name="color">
  
***************
*** 307,311 ****
                  <tr>
                      <td colspan="2" align="center">
!                         <form action="/buckets">
                              <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
                              <input type="submit" class="submit" name="reset_stats" value="<TMPL_VAR NAME="Localize_Bucket_ResetStatistics">" />
--- 307,311 ----
                  <tr>
                      <td colspan="2" align="center">
!                         <form action="/buckets" method="POST">
                              <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
                              <input type="submit" class="submit" name="reset_stats" value="<TMPL_VAR NAME="Localize_Bucket_ResetStatistics">" />
***************
*** 371,375 ****
              <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_Maintenance"></h2>
              <div class="bucketsMaintenanceWidget">
!                 <form action="/buckets">
                      <label class="bucketsLabel" for="bucketsCreateBucket">
                          <TMPL_VAR NAME="Localize_Bucket_CreateBucket">:
--- 371,375 ----
              <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_Maintenance"></h2>
              <div class="bucketsMaintenanceWidget">
!                 <form action="/buckets" method="POST">
                      <label class="bucketsLabel" for="bucketsCreateBucket">
                          <TMPL_VAR NAME="Localize_Bucket_CreateBucket">:
***************
*** 401,405 ****
                  </TMPL_IF>
  
!                 <form action="/buckets">
                      <label class="bucketsLabel" for="bucketsDeleteBucket">
                          <TMPL_VAR NAME="Localize_Bucket_DeleteBucket">:
--- 401,405 ----
                  </TMPL_IF>
  
!                 <form action="/buckets" method="POST">
                      <label class="bucketsLabel" for="bucketsDeleteBucket">
                          <TMPL_VAR NAME="Localize_Bucket_DeleteBucket">:
***************
*** 432,436 ****
                  </TMPL_IF>
  
!                 <form action="/buckets">
                      <label class="bucketsLabel" for="bucketsRenameBucketFrom">
                          <TMPL_VAR NAME="Localize_Bucket_RenameBucket">:
--- 432,436 ----
                  </TMPL_IF>
  
!                 <form action="/buckets" method="POST">
                      <label class="bucketsLabel" for="bucketsRenameBucketFrom">
                          <TMPL_VAR NAME="Localize_Bucket_RenameBucket">:
***************
*** 484,488 ****
              <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_Lookup"></h2>
              <div class="bucketsLookupWidget">
!                 <form action="/buckets#Lookup">
                      <label class="bucketsLabel" for="bucketsLookup">
                          <TMPL_VAR NAME="Localize_Bucket_LookupMessage">:
--- 484,488 ----
              <h2 class="buckets"><TMPL_VAR NAME="Localize_Bucket_Lookup"></h2>
              <div class="bucketsLookupWidget">
!                 <form action="/buckets#Lookup" method="POST">
                      <label class="bucketsLabel" for="bucketsLookup">
                          <TMPL_VAR NAME="Localize_Bucket_LookupMessage">:

Index: view-page.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/view-page.thtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** view-page.thtml	17 Jun 2004 08:21:04 -0000	1.5
--- view-page.thtml	24 Jun 2004 19:12:10 -0000	1.6
***************
*** 8,25 ****
              <h2 class="buckets"><TMPL_VAR NAME="Localize_View_Title"></h2>
          </td>
-         <td class="historyNavigatorTop">
- 
-             <TMPL_IF NAME="View_If_Previous">
- 
-             <a href="/view?view=<TMPL_VAR NAME="View_Previous">&amp;start_message=<TMPL_VAR NAME="View_Previous_Message"><TMPL_VAR NAME="View_Fields">">&lt;<TMPL_VAR NAME="Localize_Previous"></a>
- 
-             </TMPL_IF>
- 
-             <TMPL_IF NAME="View_If_Next">
- 
-             <a href="/view?view=<TMPL_VAR NAME="View_Next">&amp;start_message=<TMPL_VAR NAME="View_Next_Message"><TMPL_VAR NAME="View_Fields">"><TMPL_VAR NAME="Localize_Next">&gt;</a>
- 
-             </TMPL_IF>
-         </td>
  
          <td class="openMessageCloser">
--- 8,11 ----
***************
*** 39,42 ****
--- 25,29 ----
                  <input type="hidden" name="sort" value="<TMPL_VAR NAME="View_Field_Sort">" />
                  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
+                 <input type="hidden" name="negate" value="<TMPL_VAR NAME="View_Field_Negate">" />
                  <input type="hidden" name="start_message" value="<TMPL_VAR NAME="View_This_Page">" />
                  <input type="hidden" name="filter" value="<TMPL_VAR NAME="View_Field_Filter">" />
***************
*** 51,55 ****
                              </font>
                          </td>
!                         <td>
                              <font size="+1">
                                  <TMPL_VAR NAME="View_From" ESCAPE=HTML>
--- 38,42 ----
                              </font>
                          </td>
!                         <td align=left>
                              <font size="+1">
                                  <TMPL_VAR NAME="View_From" ESCAPE=HTML>
***************
*** 61,65 ****
                              <font size="+1">
                                  <b>
!                                     <TMPL_VAR NAME="Localize_Subject">
                                  </b>:
                              </font>
--- 48,52 ----
                              <font size="+1">
                                  <b>
!                                     <TMPL_VAR NAME="Localize_To">
                                  </b>:
                              </font>
***************
*** 67,71 ****
                          <td>
                              <font size="+1">
!                                 <TMPL_VAR NAME="View_Subject" ESCAPE=HTML>
                              </font>
                          </td>
--- 54,58 ----
                          <td>
                              <font size="+1">
!                                 <TMPL_VAR NAME="View_To" ESCAPE=HTML>
                              </font>
                          </td>
***************
*** 75,79 ****
                              <font size="+1">
                                  <b>
!                                     <TMPL_VAR NAME="Localize_Classification">
                                  </b>:
                              </font>
--- 62,66 ----
                              <font size="+1">
                                  <b>
!                                     <TMPL_VAR NAME="Localize_Cc">
                                  </b>:
                              </font>
***************
*** 81,84 ****
--- 68,111 ----
                          <td>
                              <font size="+1">
+                                 <TMPL_VAR NAME="View_Cc" ESCAPE=HTML>
+                             </font>
+                         </td>
+                     </tr>
+                     <tr>
+                         <td>
+                             <font size="+1">
+                                 <b>
+                                     <TMPL_VAR NAME="Localize_Date">
+                                 </b>:
+                             </font>
+                         </td>
+                         <td>
+                             <font size="+1">
+                                 <TMPL_VAR NAME="View_Date" ESCAPE=HTML>
+                             </font>
+                         </td>
+                     </tr>
+                     <tr>
+                         <td>
+                             <font size="+1">
+                                 <b>
+                                     <TMPL_VAR NAME="Localize_Subject">
+                                 </b>:
+                             </font>
+                         </td>
+                         <td>
+                             <font size="+1">
+                                 <TMPL_VAR NAME="View_Subject" ESCAPE=HTML>
+                             </font>
+                         </td>
+                     </tr>
+                 </table>
+                 <table align=left width=100%>
+                     <tr>
+                         <td>
+                             <font size="+1">
+                                 <b>
+                                     <TMPL_VAR NAME="Localize_Classification">
+                                 </b>:
                                  <font color="<TMPL_VAR NAME="View_Bucket_Color">">
                                      <TMPL_VAR NAME="View_Bucket">
***************
*** 96,103 ****
                                      <TMPL_VAR NAME="Localize_History_ChangedClass">
                                  </b>:
-                             </font>
-                         </td>
-                         <td>
-                             <font size="+1">
                                  <font color="<TMPL_VAR NAME="View_Class_Changed_Color">">
                                      <TMPL_VAR NAME="View_Class_Changed">
--- 123,126 ----

Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/tests

Modified Files:
	TestModule.tst 
Log Message:
*** Change all forms to use the POST method to make the URL displayed
    in the browser cleaner

skins/default/configuration-page.thtml
skins/default/corpus-page.thtml
skins/default/magnet-page.thtml
skins/default/pop3-chain-panel.thtml
skins/default/pop3-configuration-panel.thtml
skins/default/pop3-security-panel.thtml
skins/default/security-page.thtml
skins/default/socks-widget.thtml
skins/default/view-quickmagnets-widget.thtml:

Add method="POST" to all forms.

*** Get TestModule working

tests/TestModule.tst
POPFile/Module.pm:

Fix logger tests and clean up wrapping and whitespace.

*** Get Single Message View working

skins/default/view-page.thtml
UI/HTML.pm:

Remove Previous/Next navigator, make magnet detail work, add To, Cc and Date
fields to header.

*** Merge patch that makes History in database work with Japanese

Classifier/MailParse.pm:

Get the current interface language value if none is passed in.

*** Added "Decision Chart" to Single Message View

skins/default/view-scores-widget.thtml
Classifier/Bayes.pm:

The new Decision Chart shows the contribution each word makes to the top
two buckets sorted in the order biggest positive contribution to biggest
negative contribution.  The intent is that it shows how POPFile makes the
Bayes decision between the top two bucket.  You can see which words
contribute to the decision between the top two buckets and by how much.  
Hover on any bar to see the actual word.

Still some work to do make this look nice (e.g. scale, try to show the 
words themselves on the chart if possible).



Index: TestModule.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestModule.tst,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TestModule.tst	8 Jun 2004 14:40:19 -0000	1.13
--- TestModule.tst	24 Jun 2004 19:12:10 -0000	1.14
***************
*** 29,32 ****
--- 29,46 ----
  
  my $m = new POPFile::Module;
+ my $l = new POPFile::Logger;
+ my $mq = new POPFile::MQ;
+ my $c = new POPFile::Configuration;
+ 
+ $m->configuration( $c );
+ $m->mq( $mq );
+ $l->mq( $mq );
+ $m->logger( $l );
+ $l->logger( $l );
+ $c->logger( $l );
+ $mq->logger( $l );
+ $l->configuration( $c );
+ $l->initialize();
+ $l->calculate_today__();
  
  # Check that base functions return good values
***************
*** 43,49 ****
  # Check that the configuration functions work
  
- my $c = new POPFile::Configuration;
- $m->configuration( $c );
- 
  $m->config_( 'parameter', 'value' );
  test_assert_equal( $m->config_( 'parameter' ), 'value' );
--- 57,60 ----
***************
*** 63,69 ****
  # Check that the MQ interface functions work
  
- my $mq = new POPFile::MQ;
- $m->mq( $mq );
- 
  $m->mq_register_( 'NOTYPE', $m );
  $m->mq_post_( 'DUMMY', 'msg', 'param' );
--- 74,77 ----
***************
*** 82,96 ****
  test_assert_equal( $#messages, 0 );
  test_assert_equal( $messages[0][0], 'UIREG' );
! test_assert_equal( $messages[0][1], 'type:name:templ' );
! test_assert_equal( $messages[0][2], $c );
  
  # Check that the logger function works
  
- my $l = new POPFile::Logger;
- $l->mq( $mq );
- $m->logger( $l );
- $l->configuration( $c );
- $l->initialize();
- $l->calculate_today__();
  $m->global_config_( 'debug', 1 );
  
--- 90,100 ----
  test_assert_equal( $#messages, 0 );
  test_assert_equal( $messages[0][0], 'UIREG' );
! test_assert_equal( $messages[0][1][0], 'type' );
! test_assert_equal( $messages[0][1][1], 'name' );
! test_assert_equal( $messages[0][1][2], 'templ' );
! test_assert_equal( $messages[0][1][3], $c );
  
  # Check that the logger function works
  
  $m->global_config_( 'debug', 1 );

Update of /cvsroot/popfile/engine/languages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21513/languages

Modified Files:
	English.msg 
Log Message:
*** Change all forms to use the POST method to make the URL displayed
    in the browser cleaner

skins/default/configuration-page.thtml
skins/default/corpus-page.thtml
skins/default/magnet-page.thtml
skins/default/pop3-chain-panel.thtml
skins/default/pop3-configuration-panel.thtml
skins/default/pop3-security-panel.thtml
skins/default/security-page.thtml
skins/default/socks-widget.thtml
skins/default/view-quickmagnets-widget.thtml:

Add method="POST" to all forms.

*** Get TestModule working

tests/TestModule.tst
POPFile/Module.pm:

Fix logger tests and clean up wrapping and whitespace.

*** Get Single Message View working

skins/default/view-page.thtml
UI/HTML.pm:

Remove Previous/Next navigator, make magnet detail work, add To, Cc and Date
fields to header.

*** Merge patch that makes History in database work with Japanese

Classifier/MailParse.pm:

Get the current interface language value if none is passed in.

*** Added "Decision Chart" to Single Message View

skins/default/view-scores-widget.thtml
Classifier/Bayes.pm:

The new Decision Chart shows the contribution each word makes to the top
two buckets sorted in the order biggest positive contribution to biggest
negative contribution.  The intent is that it shows how POPFile makes the
Bayes decision between the top two bucket.  You can see which words
contribute to the decision between the top two buckets and by how much.  
Hover on any bar to see the actual word.

Still some work to do make this look nice (e.g. scale, try to show the 
words themselves on the chart if possible).



Index: English.msg
===================================================================
RCS file: /cvsroot/popfile/engine/languages/English.msg,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** English.msg	23 Jun 2004 14:17:03 -0000	1.65
--- English.msg	24 Jun 2004 19:12:04 -0000	1.66
***************
*** 312,320 ****
  View_ShowFrequencies                    Show word frequencies
  View_ShowProbabilities                  Show word probabilities
! View_ShowScores                         Show word scores
  View_WordMatrix                         Word matrix
  View_WordProbabilities                  showing word probabilities
  View_WordFrequencies                    showing word frequencies
  View_WordScores                         showing word scores
  
  Windows_TrayIcon                        Show POPFile icon in Windows system tray?
--- 312,321 ----
  View_ShowFrequencies                    Show word frequencies
  View_ShowProbabilities                  Show word probabilities
! View_ShowScores                         Show word scores and decision chart
  View_WordMatrix                         Word matrix
  View_WordProbabilities                  showing word probabilities
  View_WordFrequencies                    showing word frequencies
  View_WordScores                         showing word scores
+ View_Chart                              Decision Chart
  
  Windows_TrayIcon                        Show POPFile icon in Windows system tray?

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3657

Modified Files:
	runpopfile.nsi 
Log Message:
If the POPFile configuration file specifies console mode and a suitable
version of the Message Capture utility is available then use the Message
Capture utility instead of popfile.exe to start POPFile. This makes it
easy to save the console messages in a file.

Index: runpopfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** runpopfile.nsi	9 Jun 2004 16:08:13 -0000	1.8
--- runpopfile.nsi	24 Jun 2004 17:46:43 -0000	1.9
***************
*** 7,10 ****
--- 7,14 ----
  #                    the 'Add POPFile User' wizard is launched (if it can be found).
  #
+ #                    To make debugging easier, the utility will use the POPFile Message
+ #                    Capture utility (if it is available) whenever the 'windows-console'
+ #                    mode is selected in 'popfile.cfg'.
+ #
  # Copyright (c) 2004 John Graham-Cumming
  #
***************
*** 70,74 ****
  #-------------------------------------------------------------------------------------------
  
!   !define C_PFI_VERSION   0.1.7
  
    Name    "Run POPFile"
--- 74,78 ----
  #-------------------------------------------------------------------------------------------
  
!   !define C_PFI_VERSION   0.1.11
  
    Name    "Run POPFile"
***************
*** 134,144 ****
  Section default
  
!   !define L_EXEFILE       $R9   ; where we expect to find popfile.exe and (perhaps) adduser.exe
!   !define L_PARAMS        $R8   ; command-line parameters (everything after 'runpopfile' part)
!   !define L_PFI_ROOT      $R7   ; path to the POPFile program (popfile.pl, and other files)
!   !define L_PFI_USER      $R6   ; path to user's popfile.cfg file
!   !define L_TEMP          $R5
!   !define L_WINOS_FLAG    $R4   ; 1 = modern Windows system, 0 = Win9x system
!   !define L_WINUSERNAME   $R3   ; Windows login name used to confirm validity of HKCU data
  
    !define L_RESERVED      $0    ; used in system.dll calls
--- 138,152 ----
  Section default
  
!   !define L_CFG           $R9   ; file handle used to access 'popfile.cfg'
!   !define L_CONSOLE       $R8   ; 1 = console mode selected, 0 = background mode selected
!   !define L_EXEFILE       $R7   ; where we expect to find popfile.exe and (perhaps) adduser.exe
!   !define L_LINE          $R6   ; a line (or part of line) from 'popfile.cfg'
!   !define L_PARAMS        $R5   ; command-line parameters (everything after 'runpopfile' part)
!   !define L_PFI_ROOT      $R4   ; path to the POPFile program (popfile.pl, and other files)
!   !define L_PFI_USER      $R3   ; path to user's 'popfile.cfg' file
!   !define L_TEMP          $R2
!   !define L_TEXTEND       $R1   ; helps ensure correct handling of lines over 1023 chars long
!   !define L_WINOS_FLAG    $R0   ; 1 = modern Windows system, 0 = Win9x system
!   !define L_WINUSERNAME   $9    ; Windows login name used to confirm validity of HKCU data
  
    !define L_RESERVED      $0    ; used in system.dll calls
***************
*** 341,347 ****
--- 349,390 ----
  
  start_popfile:
+   IfFileExists "${L_EXEFILE}\pfimsgcapture.exe" 0 run_normal_mode
+   IfFileExists "${L_PFI_USER}\popfile.cfg" 0 run_normal_mode
+   StrCpy ${L_CONSOLE} "0"
+   FileOpen ${L_CFG} "${L_PFI_USER}\popfile.cfg" r
+ 
+ found_eol:
+   StrCpy ${L_TEXTEND} "<eol>"
+ 
+ loop:
+   FileRead ${L_CFG} ${L_LINE}
+   StrCmp ${L_LINE} "" options_done
+   StrCmp ${L_TEXTEND} "<eol>" 0 check_eol
+   StrCmp ${L_LINE} "$\n" loop
+ 
+   StrCpy ${L_TEMP} ${L_LINE} 16
+   StrCmp ${L_TEMP} "windows_console " got_console_option
+   Goto check_eol
+ 
+ got_console_option:
+   StrCpy ${L_CONSOLE} ${L_LINE} 1 16
+ 
+ check_eol:
+   StrCpy ${L_TEXTEND} ${L_LINE} 1 -1
+   StrCmp ${L_TEXTEND} "$\n" found_eol
+   StrCmp ${L_TEXTEND} "$\r" found_eol loop
+ 
+ options_done:
+   FileClose ${L_CFG}
+   StrCmp ${L_CONSOLE} "1" run_debug_mode
+ 
+ run_normal_mode:
    Exec '"${L_EXEFILE}\popfile.exe"'
    Goto exit
  
+ run_debug_mode:
+   Exec '"${L_EXEFILE}\pfimsgcapture.exe" /TIMEOUT=0'
+   Goto exit
+ 
  bad_root_error:
    IfFileExists "${L_EXEFILE}\adduser.exe" can_add_root
***************
*** 399,407 ****
--- 442,454 ----
  exit:
  
+   !undef L_CFG
+   !undef L_CONSOLE
    !undef L_EXEFILE
+   !undef L_LINE
    !undef L_PARAMS
    !undef L_PFI_ROOT
    !undef L_PFI_USER
    !undef L_TEMP
+   !undef L_TEXTEND
    !undef L_WINOS_FLAG
    !undef L_WINUSERNAME

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3225

Added Files:
	msgcapture.nsi 
Log Message:
Small utility used to display/capture the POPFile console messages without
displaying the console window (DOS box). Used to display the progress reports
when converting the 0.21.x SQL database to the new format. The utility makes
it easy to save the console messages in a file (to assist in debugging).

--- NEW FILE: msgcapture.nsi ---
#--------------------------------------------------------------------------
#
# msgcapture.nsi --- This NSIS script is used to create a simple utility which displays
#                    the POPFile console messages and makes it easy to copy them to the
#                    clipboard (so they can be saved in a text file). This utility avoids
#                    the need to display the console window (when the console window was
#                    used by earlier installers it caused confusion amongst some users).
#
# Copyright (c) 2004  John Graham-Cumming
#
#   This file is part of POPFile
#
#   POPFile is free software; you can redistribute it and/or modify
#   it under the terms of the GNU General Public License as published by
#   the Free Software Foundation; either version 2 of the License, or
#   (at your option) any later version.
#
#   POPFile is distributed in the hope that it will be useful,
#   but WITHOUT ANY WARRANTY; without even the implied warranty of
#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
#   GNU General Public License for more details.
#
#   You should have received a copy of the GNU General Public License
#   along with POPFile; if not, write to the Free Software
#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#--------------------------------------------------------------------------

; This version of the script has been tested with the "NSIS 2" compiler (final),
; released 7 February 2004, with no "official" NSIS patches/CVS updates applied.

#--------------------------------------------------------------------------
# Optional run-time command-line switch (used by 'msgcapture.exe')
#--------------------------------------------------------------------------
#
# /TIMEOUT=xx
#
# By default the utility waits for POPFile to shutdown or for a period of 30 seconds to pass
# without any new message being generated by POPFile. This command-line switch is used to
# specify a different timeout delay (in seconds).
#
# Valid timeouts are in the range 1 to 99 secs (for this version).
#
# If /TIMEOUT=0 is specified then the utility will wait until POPFile shuts down.
#
# When the main POPFile installer (or the 'Add POPFile User' wizard) calls this utility,
# different header text is required so the installer (and wizard) use /TIMEOUT=PFI to
# inform the utility.
#
# Uppercase or lowercase can be used for the command-line switch.
#
#--------------------------------------------------------------------------

  ;--------------------------------------------------------------------------
  ; POPFile constants have been given names beginning with 'C_' (eg C_README)
  ;--------------------------------------------------------------------------

  !define C_VERSION             "0.0.50"

  ; The default timeout is 30 seconds

  !define C_DEFAULT_TIMEOUT     30

  ; The timeout used when the installer calls this utility to monitor the SQL database upgrade

  !define C_INSTALLER_TIMEOUT   30

  ;--------------------------------------------------------------------------
  ; The default NSIS caption is "$(^Name) Setup" so we override it here
  ;--------------------------------------------------------------------------

  Name    "POPFile Message Capture Utility"
  Caption "$(^Name) v${C_VERSION}"

#--------------------------------------------------------------------------
# Use the "Modern User Interface"
#--------------------------------------------------------------------------

  !include "MUI.nsh"

#--------------------------------------------------------------------------
# Version Information settings (for the utility's EXE file)
#--------------------------------------------------------------------------

  ; 'VIProductVersion' format is X.X.X.X where X is a number in range 0 to 65535
  ; representing the following values: Major.Minor.Release.Build

  VIProductVersion                   "${C_VERSION}.0"

  VIAddVersionKey "ProductName"      "PFI Message Capture Utility"
  VIAddVersionKey "Comments"         "POPFile Homepage: http://popfile.sf.net"
  VIAddVersionKey "CompanyName"      "The POPFile Project"
  VIAddVersionKey "LegalCopyright"   "Copyright (c) 2004  John Graham-Cumming"
  VIAddVersionKey "FileDescription"  "PFI Message Capture Utility (0-99 sec timeout)"
  VIAddVersionKey "FileVersion"      "${C_VERSION}"

  VIAddVersionKey "Build Date/Time"  "${__DATE__} @ ${__TIME__}"
  VIAddVersionKey "Build Script"     "${__FILE__}$\r$\n(${__TIMESTAMP__})"

#--------------------------------------------------------------------------
# Include private library functions and macro definitions
#--------------------------------------------------------------------------

  ; Avoid compiler warnings by disabling the functions and definitions we do not use

  !define MSGCAPTURE

  !include "pfi-library.nsh"

#--------------------------------------------------------------------------
# User Registers (Global)
#--------------------------------------------------------------------------

  ; This script uses 'User Variables' (with names starting with 'G_') to hold GLOBAL data.

  Var G_TIMEOUT           ; timeout value in seconds (can be supplied on command-line)
                          ; (two special cases are supported: 0 and PFI)

#--------------------------------------------------------------------------
# Configure the MUI pages
#--------------------------------------------------------------------------

  ;----------------------------------------------------------------
  ; Interface Settings - General Interface Settings
  ;----------------------------------------------------------------

  ; The icon file for the utility

  !define MUI_ICON                            "POPFileIcon\popfile.ico"

  !define MUI_HEADERIMAGE
  !define MUI_HEADERIMAGE_BITMAP              "hdr-common.bmp"
  !define MUI_HEADERIMAGE_RIGHT

  ;----------------------------------------------------------------
  ;  Interface Settings - Interface Resource Settings
  ;----------------------------------------------------------------

  ; The banner provided by the default 'modern.exe' UI does not provide much room for the
  ; two lines of text, e.g. the German version is truncated, so we use a custom UI which
  ; provides slightly wider text areas. Each area is still limited to a single line of text.

  !define MUI_UI                              "UI\pfi_modern.exe"

  ; The 'hdr-common.bmp' logo is only 90 x 57 pixels, much smaller than the 150 x 57 pixel
  ; space provided by the default 'modern_headerbmpr.exe' UI, so we use a custom UI which
  ; leaves more room for the TITLE and SUBTITLE text.

  !define MUI_UI_HEADERIMAGE_RIGHT            "UI\pfi_headerbmpr.exe"

  ;----------------------------------------------------------------
  ;  Interface Settings - Installer Finish Page Interface Settings
  ;----------------------------------------------------------------

  ; Show the installation log and leave the window open when utility has completed its work

  ShowInstDetails show
  !define MUI_FINISHPAGE_NOAUTOCLOSE

#--------------------------------------------------------------------------
# Define the Page order for the utility
#--------------------------------------------------------------------------

  ;---------------------------------------------------
  ; Installer Page - Install files
  ;---------------------------------------------------

  ; Override the standard "Installation complete..." page header

  !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT     $(PFI_LANG_MSGCAP_END_HDR)
  !define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT  $(PFI_LANG_MSGCAP_END_SUBHDR)

  ; Override the standard "Installation Aborted..." page header

  !define MUI_INSTFILESPAGE_ABORTHEADER_TEXT      $(PFI_LANG_MSGCAP_ABORT_HDR)
  !define MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT   $(PFI_LANG_MSGCAP_ABORT_SUBHDR)

  ; Use a custom "show" function to ensure the page header reflects the current
  ; timeout setting while the utility is capturing the POPFile console messages

  !define MUI_PAGE_CUSTOMFUNCTION_SHOW             UpdateHeader

  !insertmacro MUI_PAGE_INSTFILES

#--------------------------------------------------------------------------
# Language Support for the utility
#--------------------------------------------------------------------------

  !insertmacro MUI_LANGUAGE "English"

  ;--------------------------------------------------------------------------
  ; Current build only supports English and uses local strings
  ; instead of language strings from languages\*-pfi.nsh files
  ;--------------------------------------------------------------------------

  !macro PFI_MSGCAP_TEXT NAME VALUE
    LangString ${NAME} ${LANG_ENGLISH} "${VALUE}"
  !macroend

  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_STD_HDR"        "Capturing messages from POPFile..."
  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_STD_SUBHDR"     "Message capture will stop when POPFile shuts down$\r$\nor if $G_TIMEOUT seconds pass without any messages"

  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_PFI_HDR"        "Capturing database conversion messages..."
  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_PFI_SUBHDR"     "Wait for the Close button to be enabled then click it to continue the installation"

  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_NOTIME_HDR"     "Capturing messages from POPFile..."
  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_NOTIME_SUBHDR"  "Message capture will stop when POPFile shuts down"

  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_END_HDR"        "POPFile Message Capture Completed"
  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_END_SUBHDR"     "To save the messages, use right-click in the message window,$\r$\ncopy to the clipboard then paste the messages into a text file"

  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_ABORT_HDR"      "POPFile Message Capture Failed"
  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_ABORT_SUBHDR"   "Problem detected - see error report in window below"

  !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_RIGHTCLICK"     "Right-click in the window below to copy the report to the clipboard"

#--------------------------------------------------------------------------
# General settings
#--------------------------------------------------------------------------

  ; Specify EXE filename and icon for the utility

  OutFile "msgcapture.exe"

  ; Ensure details are shown

  ShowInstDetails show

#--------------------------------------------------------------------------
# Installer Function: .onInit
#
# Checks if the user has specified a timeout value to override the default setting
# using the /TIMEOUT=xx command-line option (valid values are in range 0 to 99 inclusive)
#
# The special timeout value "PFI" is used to indicate that the utility has been called by the
# installer to monitor the conversion of an old SQL database.
#
# If an invalid option is supplied, the default timeout is used.
#--------------------------------------------------------------------------

Function .onInit

  !define L_TEMP  $R9

  Push ${L_TEMP}

  Call GetParameters
  Pop $G_TIMEOUT
  StrCmp $G_TIMEOUT "" default
  StrCpy ${L_TEMP} $G_TIMEOUT 9
  StrCmp ${L_TEMP} "/timeout=" 0 default
  StrCpy $G_TIMEOUT $G_TIMEOUT "" 9
  StrCmp $G_TIMEOUT "PFI" exit
  Push $G_TIMEOUT
  Call StrCheckDecimal
  Pop $G_TIMEOUT
  StrCmp $G_TIMEOUT "" default
  StrCmp $G_TIMEOUT "0" exit
  IntCmp $G_TIMEOUT 99 exit exit default

default:
  StrCpy $G_TIMEOUT ${C_DEFAULT_TIMEOUT}

exit:
  Pop ${L_TEMP}

  !undef L_TEMP

FunctionEnd

#--------------------------------------------------------------------------
# Installer Function: UpdateHeader
# (the "show" function for the INSTFILES page)
#--------------------------------------------------------------------------

Function UpdateHeader

  ; Override the standard "Installing..." header with text appropriate to the /TIMEOUT value

  StrCmp $G_TIMEOUT "0" no_timeout
  StrCmp $G_TIMEOUT "PFI" installer

  !insertmacro MUI_HEADER_TEXT $(PFI_LANG_MSGCAP_STD_HDR) $(PFI_LANG_MSGCAP_STD_SUBHDR)
  Goto exit

installer:
  StrCpy $G_TIMEOUT ${C_INSTALLER_TIMEOUT}
  !insertmacro MUI_HEADER_TEXT $(PFI_LANG_MSGCAP_PFI_HDR) $(PFI_LANG_MSGCAP_PFI_SUBHDR)
  Goto exit

no_timeout:
  !insertmacro MUI_HEADER_TEXT $(PFI_LANG_MSGCAP_NOTIME_HDR) $(PFI_LANG_MSGCAP_NOTIME_SUBHDR)

exit:
FunctionEnd

;--------------------------------------------------------------------------
; Section: default
;--------------------------------------------------------------------------

Section default

  !define L_CFG           $R9   ; file handle used to access 'popfile.cfg'
  !define L_LINE          $R8   ; line (or part of line) read from 'popfile.cfg'
  !define L_PFI_ROOT      $R7   ; path to the POPFile program (popfile.pl, and other files)
  !define L_PFI_USER      $R6   ; path to user's 'popfile.cfg' file
  !define L_RESULT        $R5
  !define L_TEMP          $R4
  !define L_TEXTEND       $R3   ; helps ensure correct handling of lines over 1023 chars long
  !define L_TRAYICON      $R2   ; system tray icon enabled ("i" ) or disabled ("") flag

  SetDetailsPrint listonly

  DetailPrint "------------------------------------------------------------"
  DetailPrint "$(^Name) v${C_VERSION}"
  DetailPrint "------------------------------------------------------------"

  ReadEnvStr ${L_PFI_ROOT} "POPFILE_ROOT"
  ReadEnvStr ${L_PFI_USER} "POPFILE_USER"

  StrCmp ${L_PFI_ROOT} "" no_root
  StrCmp ${L_PFI_USER} "" no_user

  IfFileExists "${L_PFI_USER}\popfile.cfg" found_cfg
  DetailPrint ""
  DetailPrint "Fatal error: cannot find POPFile configuration data"
  DetailPrint ""
  DetailPrint "(${L_PFI_USER}\popfile.cfg does not exist)"
  Goto fatal_error

no_root:
  DetailPrint ""
  DetailPrint "Fatal error: Environment variable POPFILE_ROOT is not defined"
  Goto fatal_error

no_user:
  DetailPrint ""
  DetailPrint "Fatal error: Environment variable POPFILE_USER is not defined"
  Goto fatal_error

start_failed:
  DetailPrint ""
  DetailPrint "Fatal error: unable to start '${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe' program"

fatal_error:
  SetDetailsPrint textonly
  DetailPrint "$(PFI_LANG_MSGCAP_RIGHTCLICK)"
  SetDetailsPrint none
  Abort

found_cfg:
  StrCpy ${L_TEMP} "1"      ; assume system tray icon is enabled (the default setting)
  FileOpen ${L_CFG} "${L_PFI_USER}\popfile.cfg" r

found_eol:
  StrCpy ${L_TEXTEND} "<eol>"

loop:
  FileRead ${L_CFG} ${L_LINE}
  StrCmp ${L_LINE} "" options_done
  StrCmp ${L_TEXTEND} "<eol>" 0 check_eol
  StrCmp ${L_LINE} "$\n" loop

  StrCpy ${L_TRAYICON} ${L_LINE} 17
  StrCmp ${L_TRAYICON} "windows_trayicon " got_icon_option
  Goto check_eol

got_icon_option:
  StrCpy ${L_TEMP} ${L_LINE} 1 17

check_eol:
  StrCpy ${L_TEXTEND} ${L_LINE} 1 -1
  StrCmp ${L_TEXTEND} "$\n" found_eol
  StrCmp ${L_TEXTEND} "$\r" found_eol loop

options_done:
  FileClose ${L_CFG}
  StrCpy ${L_TRAYICON} "i"
  StrCmp ${L_TEMP} "1" print_env_vars
  StrCpy ${L_TRAYICON} ""

print_env_vars:
  DetailPrint "POPFILE_ROOT = ${L_PFI_ROOT}"
  DetailPrint "POPFILE_USER = ${L_PFI_USER}"
  IfFileExists "${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe" found_exe
  DetailPrint ""
  DetailPrint "Fatal error: cannot find POPFile program"
  DetailPrint ""
  DetailPrint "(${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe does not exist)"
  Goto fatal_error

found_exe:
  DetailPrint "Using 'popfile${L_TRAYICON}f.exe' to run POPFile"
  DetailPrint "------------------------------------------------------------"

  Call GetDateTimeStamp
  Pop ${L_TEMP}
  DetailPrint "(report started ${L_TEMP})"
  DetailPrint "------------------------------------------------------------"

  StrCmp $G_TIMEOUT "0" no_timeout
  StrCpy ${L_TEMP} "/TIMEOUT=$G_TIMEOUT000"
  nsExec::ExecToLog ${L_TEMP} '"${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe"'
  Goto get_result

no_timeout:
  nsExec::ExecToLog '"${L_PFI_ROOT}\popfile${L_TRAYICON}f.exe"'

get_result:
  Pop ${L_RESULT}
  StrCmp ${L_RESULT} "error" start_failed
  StrCpy ${L_TEMP} ""
  StrCmp ${L_RESULT} "timeout" 0 display_status
  StrCpy ${L_TEMP} "($G_TIMEOUT seconds)"

display_status:
  DetailPrint ""
  DetailPrint "------------------------------------------------------------"
  DetailPrint "Status code: ${L_RESULT} ${L_TEMP}"

  Call GetDateTimeStamp
  Pop ${L_TEMP}
  DetailPrint "------------------------------------------------------------"
  DetailPrint "(report finished ${L_TEMP})"
  DetailPrint "------------------------------------------------------------"
  SetDetailsPrint textonly
  DetailPrint "$(PFI_LANG_MSGCAP_RIGHTCLICK)"
  SetDetailsPrint none

  !undef L_CFG
  !undef L_LINE
  !undef L_PFI_ROOT
  !undef L_PFI_USER
  !undef L_RESULT
  !undef L_TEMP
  !undef L_TEXTEND
  !undef L_TRAYICON

SectionEnd

#--------------------------------------------------------------------------
# End of 'msgcapture.nsi'
#--------------------------------------------------------------------------

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2686

Modified Files:
	pfi-library.nsh 
Log Message:
Add conditional compilation switches to allow compilation of the new Message
Capture utility used to display the SQL database conversion progress reports.

Update MinPerlMove to match the variable usage where it will be inserted.

Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** pfi-library.nsh	9 Jun 2004 15:10:47 -0000	1.39
--- pfi-library.nsh	24 Jun 2004 17:42:39 -0000	1.40
***************
*** 33,39 ****
  #
  # (1) ADDUSER          defined in adduser.nsi ('Add POPFile User' wizard)
! # (2) RUNPOPFILE       defined in runpopfile.nsi (simple front-end for popfile.exe)
! # (3) TRANSLATOR       defined in translator.nsi (main installer translations test program)
! # (4) TRANSLATOR_AUW   defined in transAUW.nsi ('Add POPFile User' translations test program)
  #--------------------------------------------------------------------------
  
--- 33,40 ----
  #
  # (1) ADDUSER          defined in adduser.nsi ('Add POPFile User' wizard)
! # (2) MSGCAPTURE       defined in msgcapture.nsi (used to capture POPFile's console messages)
! # (3) RUNPOPFILE       defined in runpopfile.nsi (simple front-end for popfile.exe)
! # (4) TRANSLATOR       defined in translator.nsi (main installer translations test program)
! # (5) TRANSLATOR_AUW   defined in transAUW.nsi ('Add POPFile User' translations test program)
  #--------------------------------------------------------------------------
  
***************
*** 163,168 ****
        !insertmacro PFI_UNIQUE_ID
  
!       IfFileExists "$INSTDIR\${SUBFOLDER}\*.*" 0 skip_${PFI_UNIQUE_ID}
!       Rename "$INSTDIR\${SUBFOLDER}" "$G_MPLIBDIR\${SUBFOLDER}"
  
      skip_${PFI_UNIQUE_ID}:
--- 164,169 ----
        !insertmacro PFI_UNIQUE_ID
  
!       IfFileExists "$G_ROOTDIR\${SUBFOLDER}\*.*" 0 skip_${PFI_UNIQUE_ID}
!       Rename "$G_ROOTDIR\${SUBFOLDER}" "$G_MPLIBDIR\${SUBFOLDER}"
  
      skip_${PFI_UNIQUE_ID}:
***************
*** 222,226 ****
  
  
! !ifndef ADDUSER & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetIEVersion
--- 223,227 ----
  
  
! !ifndef ADDUSER & MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetIEVersion
***************
*** 761,765 ****
  !macroend
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: CheckIfLocked
--- 762,766 ----
  !macroend
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: CheckIfLocked
***************
*** 771,775 ****
  !endif
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.CheckIfLocked
--- 772,776 ----
  !endif
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.CheckIfLocked
***************
*** 875,879 ****
  !macroend
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: FindLockedPFE
--- 876,880 ----
  !macroend
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: FindLockedPFE
***************
*** 885,889 ****
  !endif
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.FindLockedPFE
--- 886,890 ----
  !endif
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.FindLockedPFE
***************
*** 1468,1472 ****
  !macroend
  
! !ifdef ADDUSER | TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetDateTimeStamp
--- 1469,1473 ----
  !macroend
  
! !ifdef ADDUSER | MSGCAPTURE | TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetDateTimeStamp
***************
*** 1556,1560 ****
  !macroend
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetFileSize
--- 1557,1561 ----
  !macroend
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetFileSize
***************
*** 1566,1570 ****
  !endif
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.GetFileSize
--- 1567,1571 ----
  !endif
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.GetFileSize
***************
*** 1665,1669 ****
  !macroend
  
! !ifdef ADDUSER | TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetLocalTime
--- 1666,1670 ----
  !macroend
  
! !ifdef ADDUSER | MSGCAPTURE | TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: GetLocalTime
***************
*** 2003,2007 ****
  !macroend
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
    #--------------------------------------------------------------------------
    # Installer Function: ServiceCall
--- 2004,2008 ----
  !macroend
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
    #--------------------------------------------------------------------------
    # Installer Function: ServiceCall
***************
*** 2078,2082 ****
  !macroend
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
    #--------------------------------------------------------------------------
    # Installer Function: ServiceRunning
--- 2079,2083 ----
  !macroend
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
    #--------------------------------------------------------------------------
    # Installer Function: ServiceRunning
***************
*** 2273,2277 ****
  !macroend
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: ShutdownViaUI
--- 2274,2278 ----
  !macroend
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: ShutdownViaUI
***************
*** 2455,2459 ****
  !endif
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.StrCheckDecimal
--- 2456,2460 ----
  !endif
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.StrCheckDecimal
***************
*** 2528,2532 ****
  !macroend
  
! !ifndef TRANSLATOR
      #--------------------------------------------------------------------------
      # Installer Function: StrStr
--- 2529,2533 ----
  !macroend
  
! !ifndef MSGCAPTURE & TRANSLATOR
      #--------------------------------------------------------------------------
      # Installer Function: StrStr
***************
*** 2538,2542 ****
  !endif
  
! !ifndef ADDUSER & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.StrStr
--- 2539,2543 ----
  !endif
  
! !ifndef ADDUSER & MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.StrStr
***************
*** 2599,2603 ****
  !macroend
  
! !ifndef RUNPOPFILE & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: TrimNewlines
--- 2600,2604 ----
  !macroend
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: TrimNewlines
***************
*** 2609,2613 ****
  !endif
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.TrimNewlines
--- 2610,2614 ----
  !endif
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Uninstaller Function: un.TrimNewlines
***************
*** 2698,2702 ****
  !macroend
  
! !ifndef RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: WaitUntilUnlocked
--- 2699,2703 ----
  !macroend
  
! !ifndef MSGCAPTURE & RUNPOPFILE & TRANSLATOR & TRANSLATOR_AUW
      #--------------------------------------------------------------------------
      # Installer Function: WaitUntilUnlocked

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

Modified Files:
	pop3-security-panel.thtml smtp-force-fork.thtml 
	smtp-security-local.thtml 
Added Files:
	nntp-force-fork.thtml nntp-port.thtml 
	nntp-security-local.thtml nntp-separator.thtml 
Log Message:
Adapted nntp module to new template system.

Eliminated some UI inconsistencies.

--- NEW FILE: nntp-security-local.thtml ---
<table border="0" cellpadding="0" cellspacing="0" summary="">
    <tr>
        <td nowrap="nowrap">
            <span class="securityLabel">
                <TMPL_VAR NAME="Localize_Security_NNTP">:
            </span>
            <br />
            <form class="securitySwitch" action="/security" method="post">
                <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

                <TMPL_IF NAME="nntp_if_local">

                <span class="securityWidgetStateOff">
                    <TMPL_VAR NAME="Localize_Security_NoStealthMode">
                </span>
                <input type="submit" class="toggleOn" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                <input type="hidden" name="nntp_local" value="0" />

                <TMPL_ELSE>

                <span class="securityWidgetStateOn">
                    <TMPL_VAR NAME="Localize_Yes">
                </span>
                <input type="submit" class="toggleOff" id="securitycceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <TMPL_VAR NAME="Localize_Security_StealthMode">
                <input type="hidden" name="nntp_local" value="1" />

                </TMPL_IF>

            </form>
        </td>
    </tr>
</table>

Index: pop3-security-panel.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pop3-security-panel.thtml	24 Jun 2004 10:49:33 -0000	1.2
--- pop3-security-panel.thtml	24 Jun 2004 11:50:57 -0000	1.3
***************
*** 1,10 ****
- <span class="securityLabel">
-     <TMPL_VAR NAME="Localize_Security_POP3">:
- </span>
- <br />
- 
  <table border="0" cellpadding="0" cellspacing="0" summary="">
      <tr>
          <td nowrap="nowrap">
              <form class="securitySwitch" action="/security" method="post">
                  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
--- 1,9 ----
  <table border="0" cellpadding="0" cellspacing="0" summary="">
      <tr>
          <td nowrap="nowrap">
+             <span class="securityLabel">
+                 <TMPL_VAR NAME="Localize_Security_POP3">:
+             </span>
+             <br />
              <form class="securitySwitch" action="/security" method="post">
                  <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

Index: smtp-force-fork.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/smtp-force-fork.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** smtp-force-fork.thtml	24 Jun 2004 10:49:33 -0000	1.1
--- smtp-force-fork.thtml	24 Jun 2004 11:50:57 -0000	1.2
***************
*** 15,19 ****
                      <TMPL_VAR NAME="Localize_Yes">
                  </span>
!                 <input type="submit" class="toggleOn" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
                  <input type="hidden" name="smtp_force_fork" value="0" />
  
--- 15,19 ----
                      <TMPL_VAR NAME="Localize_Yes">
                  </span>
!                 <input type="submit" class="toggleOff" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
                  <input type="hidden" name="smtp_force_fork" value="0" />
  

--- NEW FILE: nntp-port.thtml ---
<form action="/configuration" method="post">
    <label class="configurationLabel" for="configPopPort">
        <TMPL_VAR NAME="Localize_Configuration_NNTPPort">:
    </label>
    <br />
    <input name="nntp_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="nntp_port">" />
    <input type="submit" class="submit" name="update_nntp_port" value="<TMPL_VAR NAME="Localize_Apply">" />
    <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

    <TMPL_IF NAME="nntp_port_feedback">

    <blockquote>
        <TMPL_VAR NAME="nntp_port_feedback">
    </blockquote>

    </TMPL_IF>

</form>

--- NEW FILE: nntp-separator.thtml ---
<form action="/configuration" method="post">
    <label class="configurationLabel" for="configSeparator">
        <TMPL_VAR NAME="Localize_Configuration_NNTPSeparator">:
    </label>
    <br />
    <input name="nntp_separator" id="configSeparator" type="text" value="<TMPL_VAR NAME="nntp_separator">" />
    <input type="submit" class="submit" name="update_nntp_separator" value="<TMPL_VAR NAME="Localize_Apply">" />
    <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

    <TMPL_IF NAME="nntp_separator_feedback">

    <blockquote>
        <TMPL_VAR NAME="nntp_separator_feedback">
    </blockquote>

    </TMPL_IF>

</form>

Index: smtp-security-local.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/smtp-security-local.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** smtp-security-local.thtml	24 Jun 2004 10:49:33 -0000	1.1
--- smtp-security-local.thtml	24 Jun 2004 11:50:57 -0000	1.2
***************
*** 1,14 ****
- <br />
- <span class="securityLabel">
-     <TMPL_VAR NAME="Localize_Security_SMTP">:
- </span>
- <br />
  
  <table border="0" cellpadding="0" cellspacing="0" summary="">
      <tr>
          <td nowrap="nowrap">
!             <form class="securitySwitch" action="/security" method="post">
!                 <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
  
                  <TMPL_IF NAME="smtp_local_on">
  
--- 1,13 ----
  
  <table border="0" cellpadding="0" cellspacing="0" summary="">
      <tr>
          <td nowrap="nowrap">
!             <span class="securityLabel">
!                 <TMPL_VAR NAME="Localize_Security_SMTP">:
!             </span>
!             <br />
  
+             <form class="securitySwitch" action="/security" method="post">
+                 
                  <TMPL_IF NAME="smtp_local_on">
  
***************
*** 29,32 ****
--- 28,32 ----
                  </TMPL_IF>
  
+                 <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
              </form>
          </td>

--- NEW FILE: nntp-force-fork.thtml ---
<br />
<span class="configurationLabel">
    <TMPL_VAR NAME="Localize_Configuration_NNTPFork">:
</span>
<br />
<table border="0" cellpadding="0" cellspacing="0" summary="">
    <tr>
        <td nowrap="nowrap">
            <form action="/configuration" method="post">
                <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

                <TMPL_IF NAME="nntp_force_fork_on">

                <span class="securityWidgetStateOn">
                    <TMPL_VAR NAME="Localize_Yes">
                </span>
                <input type="submit" class="toggleOff" id="windowTrayIconOff" 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="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                <input type="hidden" name="nntp_force_fork" value="1" />

                </TMPL_IF>

            </form>
        </td>
    </tr>
</table>

Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28906/Proxy

Modified Files:
	NNTP.pm 
Log Message:
Adapted nntp module to new template system.

Eliminated some UI inconsistencies.

Index: NNTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** NNTP.pm	23 Jun 2004 14:17:02 -0000	1.30
--- NNTP.pm	24 Jun 2004 11:50:57 -0000	1.31
***************
*** 118,136 ****
      # item that needs a UI component
  
! #    $self->register_configuration_item_( 'configuration',
! #                                         'nntp_port',
! #                                         $self );
  
! #    $self->register_configuration_item_( 'configuration',              # PROFILE BLOCK START
! #                                         'nntp_force_fork',
! #                                         $self );                      # PROFILE BLOCK STOP
  
! #    $self->register_configuration_item_( 'configuration',
! #                                         'nntp_separator',
! #                                         $self );
  
! #    $self->register_configuration_item_( 'security',
! #                                         'nntp_local',
! #                                         $self );
  
      return $self->SUPER::start();;
--- 118,140 ----
      # item that needs a UI component
  
!     $self->register_configuration_item_( 'configuration',
!                                          'nntp_port',
!                                          'nntp-port.thtml',
!                                          $self );
  
!     $self->register_configuration_item_( 'configuration',
!                                          'nntp_force_fork',
!                                          'nntp-force-fork.thtml',
!                                          $self );
  
!     $self->register_configuration_item_( 'configuration',
!                                          'nntp_separator',
!                                          'nntp-separator.thtml',
!                                          $self );
  
!     $self->register_configuration_item_( 'security',
!                                          'nntp_local',
!                                          'nntp-security-local.thtml',
!                                          $self );
  
      return $self->SUPER::start();;
***************
*** 273,277 ****
  
                      my ( $class, $history_file ) = $self->{classifier__}->classify_and_modify( $session, $news, $client, 0, '' );
! 		}
  
                  next;
--- 277,281 ----
  
                      my ( $class, $history_file ) = $self->{classifier__}->classify_and_modify( $session, $news, $client, 0, '' );
!                 }
  
                  next;
***************
*** 358,433 ****
  # configure_item
  #
! #    $name            The name of the item being configured, was passed in by the call
! #                     to register_configuration_item
! #    $language        Reference to the hash holding the current language
! #    $session_key     The current session key
  #
- #  Must return the HTML for this item
  # ---------------------------------------------------------------------------------------------
  
  sub configure_item
  {
!     my ( $self, $name, $language, $session_key ) = @_;
! 
!     my $body = '';
  
      if ( $name eq 'nntp_port' ) {
!         $body .= "<form action=\"/configuration\">\n";
!         $body .= "<label class=\"configurationLabel\" for=\"configPopPort\">$$language{Configuration_NNTPPort}:</label><br />\n";
!         $body .= "<input name=\"nntp_port\" type=\"text\" id=\"configPopPort\" value=\"" . $self->config_( 'port' ) . "\" />\n";
!         $body .= "<input type=\"submit\" class=\"submit\" name=\"update_nntp_port\" value=\"$$language{Apply}\" />\n";
!         $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
      }
  
      # Separator Character widget
      if ( $name eq 'nntp_separator' ) {
!         $body .= "\n<form action=\"/configuration\">\n";
!         $body .= "<label class=\"configurationLabel\" for=\"configSeparator\">$$language{Configuration_NNTPSeparator}:</label><br />\n";
!         $body .= "<input name=\"nntp_separator\" id=\"configSeparator\" type=\"text\" value=\"" . $self->config_( 'separator' ) . "\" />\n";
!         $body .= "<input type=\"submit\" class=\"submit\" name=\"update_nntp_separator\" value=\"$$language{Apply}\" />\n";
!         $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
      }
  
      if ( $name eq 'nntp_local' ) {
!         $body .= "<span class=\"securityLabel\">$$language{Security_NNTP}:</span><br />\n";
! 
!         $body .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\"><tr><td nowrap=\"nowrap\">\n";
!         if ( $self->config_( 'local' ) == 1 ) {
!             $body .= "<form class=\"securitySwitch\" action=\"/security\">\n";
!             $body .= "<span class=\"securityWidgetStateOff\">$$language{Security_NoStealthMode}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"securityAcceptPOP3On\" name=\"toggle\" value=\"$$language{ChangeToYes}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"nntp_local\" value=\"1\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         } else {
!             $body .= "<form class=\"securitySwitch\" action=\"/security\">\n";
!             $body .= "<span class=\"securityWidgetStateOn\">$$language{Yes}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOff\" id=\"securityAcceptPOP3Off\" name=\"toggle\" value=\"$$language{ChangeToNo} $$language{Security_StealthMode}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"nntp_local\" value=\"2\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         }
!         $body .= "</td></tr></table>\n";
       }
  
      if ( $name eq 'nntp_force_fork' ) {
!         $body .= "<span class=\"configurationLabel\">$$language{Configuration_NNTPFork}:</span><br />\n";
!         $body .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\"><tr><td nowrap=\"nowrap\">\n";
! 
!         if ( $self->config_( 'force_fork' ) == 0 ) {
!             $body .= "<form action=\"/configuration\">\n";
!             $body .= "<span class=\"securityWidgetStateOff\">$$language{No}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowTrayIconOn\" name=\"toggle\" value=\"$$language{ChangeToYes}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"nntp_force_fork\" value=\"1\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         } else {
!             $body .= "<form action=\"/configuration\">\n";
!             $body .= "<span class=\"securityWidgetStateOn\">$$language{Yes}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowTrayIconOff\" name=\"toggle\" value=\"$$language{ChangeToNo}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"nntp_force_fork\" value=\"0\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         }
!         $body .= "</td></tr></table>\n";
      }
  
!     return $body . $self->SUPER::configure_item( $name, $language, $session_key );
  }
  
--- 362,394 ----
  # configure_item
  #
! #    $name            Name of this item
! #    $templ           The loaded template that was passed as a parameter
! #                     when registering
! #    $language        Current language
  #
  # ---------------------------------------------------------------------------------------------
  
  sub configure_item
  {
!     my ( $self, $name, $templ, $language ) = @_;
  
      if ( $name eq 'nntp_port' ) {
!         $templ->param( 'nntp_port' => $self->config_( 'port' ) );
      }
  
      # Separator Character widget
      if ( $name eq 'nntp_separator' ) {
!         $templ->param( 'nntp_separator' => $self->config_( 'separator' ) );
      }
  
      if ( $name eq 'nntp_local' ) {
!         $templ->param( 'nntp_if_local' => $self->config_( 'local' ) );
       }
  
      if ( $name eq 'nntp_force_fork' ) {
!         $templ->param( 'nntp_force_fork_on' => $self->config_( 'force_fork' ) );
      }
  
!     #$self->SUPER::configure_item( $name, $language, $session_key );
  }
  
***************
*** 438,458 ****
  #    $name            The name of the item being configured, was passed in by the call
  #                     to register_configuration_item
! #    $language        Reference to the hash holding the current language
  #    $form            Hash containing all form items
  #
- #  Must return the HTML for this item
  # ---------------------------------------------------------------------------------------------
  
  sub validate_item
  {
!     my ( $self, $name, $language, $form ) = @_;
  
      if ( $name eq 'nntp_port' ) {
!         if ( defined($$form{nntp_port}) ) {
              if ( ( $$form{nntp_port} >= 1 ) && ( $$form{nntp_port} < 65536 ) ) {
                  $self->config_( 'port', $$form{nntp_port} );
!                 return '<blockquote>' . sprintf( $$language{Configuration_NNTPUpdate} . '</blockquote>' , $self->config_( 'port' ) );
!              } else {
!                  return "<blockquote><div class=\"error01\">$$language{Configuration_Error3}</div></blockquote>";
               }
          }
--- 399,420 ----
  #    $name            The name of the item being configured, was passed in by the call
  #                     to register_configuration_item
! #    $templ           The loaded template
! #    $language        The language currently in use
  #    $form            Hash containing all form items
  #
  # ---------------------------------------------------------------------------------------------
  
  sub validate_item
  {
!     my ( $self, $name, $templ, $language, $form ) = @_;
  
      if ( $name eq 'nntp_port' ) {
!         if ( defined $$form{nntp_port} ) {
              if ( ( $$form{nntp_port} >= 1 ) && ( $$form{nntp_port} < 65536 ) ) {
                  $self->config_( 'port', $$form{nntp_port} );
!                 $templ->param( 'nntp_port_feedback' => sprintf $$language{Configuration_NNTPUpdate}, $self->config_( 'port' ) );
!              } 
!              else {
!                  $templ->param( 'nntp_port_feedback' => "<div class=\"error01\">$$language{Configuration_Error3}</div>" );
               }
          }
***************
*** 460,469 ****
  
      if ( $name eq 'nntp_separator' ) {
!         if ( defined($$form{nntp_separator}) ) {
              if ( length($$form{nntp_separator}) == 1 ) {
!                 $self->config_( 'separator', $$form{separator} );
!                 return '<blockquote>' . sprintf( $$language{Configuration_NNTPSepUpdate} . '</blockquote>' , $self->config_( 'separator' ) );
!             } else {
!                 return "<blockquote>\n<div class=\"error01\">\n$$language{Configuration_Error1}</div>\n</blockquote>\n";
              }
          }
--- 422,432 ----
  
      if ( $name eq 'nntp_separator' ) {
!         if ( defined $$form{nntp_separator} ) {
              if ( length($$form{nntp_separator}) == 1 ) {
!                 $self->config_( 'separator', $$form{nntp_separator} );
!                 $templ->param( 'nntp_separator_feedback' => sprintf $$language{Configuration_NNTPSepUpdate}, $self->config_( 'separator' ) );
!             } 
!             else {
!                 $templ->param( 'nntp_separator_feedback' => "<div class=\"error01\">\n$$language{Configuration_Error1}</div>\n" );
              }
          }
***************
*** 471,485 ****
  
      if ( $name eq 'nntp_local' ) {
!         $self->config_( 'local', $$form{nntp_local}-1 ) if ( defined($$form{nntp_local}) );
      }
  
  
      if ( $name eq 'nntp_force_fork' ) {
!         if ( defined($$form{nntp_force_fork}) ) {
              $self->config_( 'force_fork', $$form{nntp_force_fork} );
          }
      }
  
!     return $self->SUPER::validate_item( $name, $language, $form );
  }
  
--- 434,450 ----
  
      if ( $name eq 'nntp_local' ) {
!         if ( defined $$form{nntp_local} ) {
!             $self->config_( 'local', $$form{nntp_local} );
!         }
      }
  
  
      if ( $name eq 'nntp_force_fork' ) {
!         if ( defined $$form{nntp_force_fork} ) {
              $self->config_( 'force_fork', $$form{nntp_force_fork} );
          }
      }
  
!     # $self->SUPER::validate_item( $name, $language, $form );
  }

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

Modified Files:
	pop3-security-panel.thtml 
Added Files:
	smtp-chain-server-port.thtml smtp-chain-server.thtml 
	smtp-force-fork.thtml smtp-port.thtml 
	smtp-security-local.thtml 
Log Message:
Adapted smtp module to new template system.

Made the pop3 security panel behave like the other stealth mode toggles.

--- NEW FILE: smtp-security-local.thtml ---
<br />
<span class="securityLabel">
    <TMPL_VAR NAME="Localize_Security_SMTP">:
</span>
<br />

<table border="0" cellpadding="0" cellspacing="0" summary="">
    <tr>
        <td nowrap="nowrap">
            <form class="securitySwitch" action="/security" method="post">
                <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

                <TMPL_IF NAME="smtp_local_on">

                <span class="securityWidgetStateOff">
                    <TMPL_VAR NAME="Localize_Security_NoStealthMode">
                </span>
                <input type="submit" class="toggleOn" id="securityAcceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                <input type="hidden" name="smtp_local" value="0" />

                <TMPL_ELSE>

                <span class="securityWidgetStateOn">
                    <TMPL_VAR NAME="Localize_Yes">
                </span>
                <input type="submit" class="toggleOff" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <TMPL_VAR NAME="Localize_Security_StealthMode">
                <input type="hidden" name="smtp_local" value="1" />

                </TMPL_IF>

            </form>
        </td>
    </tr>
</table>

Index: pop3-security-panel.thtml
===================================================================
RCS file: /cvsroot/popfile/engine/skins/default/pop3-security-panel.thtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pop3-security-panel.thtml	19 May 2004 13:30:14 -0000	1.1
--- pop3-security-panel.thtml	24 Jun 2004 10:49:33 -0000	1.2
***************
*** 1,20 ****
! <span class="securityLabel"><TMPL_VAR NAME="Localize_Security_POP3">:</span><br />
  
! <table border="0" cellpadding="0" cellspacing="0" summary=""><tr><td nowrap="nowrap">
  
! <TMPL_IF NAME="POP3_Security_Local">
!     <form class="securitySwitch" action="/security">
!     <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_Security_NoStealthMode"></span>
!     <input type="submit" class="toggleOn" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
!     <input type="hidden" name="pop3_local" value="1" />
!     <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
! <TMPL_ELSE>
!     <form class="securitySwitch" action="/security">
!     <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
!     <input type="submit" class="toggleOff" id="securityAcceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo"> <TMPL_VAR NAME="Localize_Security_StealthMode">" />
!     <input type="hidden" name="pop3_local" value="2" />
!     <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" /></form>
! </TMPL_IF>
  
! </td></tr></table>
  
--- 1,28 ----
! <span class="securityLabel">
!     <TMPL_VAR NAME="Localize_Security_POP3">:
! </span>
! <br />
  
! <table border="0" cellpadding="0" cellspacing="0" summary="">
!     <tr>
!         <td nowrap="nowrap">
!             <form class="securitySwitch" action="/security" method="post">
!                 <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />
  
!                 <TMPL_IF NAME="POP3_Security_Local">
  
!                 <span class="securityWidgetStateOff"><TMPL_VAR NAME="Localize_Security_NoStealthMode"></span>
!                 <input type="submit" class="toggleOn" id="securityAcceptPOP3On" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
!                 <input type="hidden" name="pop3_local" value="1" />
! 
!                 <TMPL_ELSE>
! 
!                 <span class="securityWidgetStateOn"><TMPL_VAR NAME="Localize_Yes"></span>
!                 <input type="submit" class="toggleOff" id="securityAcceptPOP3Off" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" /> <TMPL_VAR NAME="Localize_Security_StealthMode">
!                 <input type="hidden" name="pop3_local" value="2" />
!                 </TMPL_IF>
  
+             </form>
+         </td>
+     </tr>
+ </table>

--- NEW FILE: smtp-force-fork.thtml ---
<br />
<span class="configurationLabel">
    <TMPL_VAR NAME="Localize_Configuration_SMTPFork">:
</span>
<br />
<table border="0" cellpadding="0" cellspacing="0" summary="">
    <tr>
        <td nowrap="nowrap">
            <form action="/configuration" method="post">
                <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

                <TMPL_IF NAME="smtp_force_fork_on">

                <span class="securityWidgetStateOn">
                    <TMPL_VAR NAME="Localize_Yes">
                </span>
                <input type="submit" class="toggleOn" id="windowTrayIconOff" 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="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                <input type="hidden" name="smtp_force_fork" value="1" />

                </TMPL_IF>

            </form>
        </td>
    </tr>
</table>

--- NEW FILE: smtp-chain-server-port.thtml ---
<form action="/security" method="post">
    <label class="securityLabel" for="securitySecurePort">
        <TMPL_VAR NAME="Localize_Security_SMTPPort">:
    </label>
    <br />
    <input type="text" name="smtp_chain_server_port" id="securitySecurePort" value="<TMPL_VAR NAME="smtp_chain_port">" />
    <input type="submit" class="submit" name="update_smtp_server_port" value="<TMPL_VAR NAME="Localize_Apply">" />
    <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

    <TMPL_IF NAME="smtp_port_feedback">

    <blockquote>
        <TMPL_VAR NAME="smtp_port_feedback">
    </blockquote>

    </TMPL_IF>

</form>

--- NEW FILE: smtp-port.thtml ---
<br />
<label class="configurationLabel" for="configPopPort">
    <TMPL_VAR NAME="Localize_Configuration_SMTPPort">:
</label>
<form action="/configuration" method="post">
    <input name="smtp_port" type="text" id="configPopPort" value="<TMPL_VAR NAME="smtp_port">" />
    <input type="submit" class="submit" name="update_smtp_port" value="<TMPL_VAR NAME="Localize_Apply">" />
    <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

    <TMPL_IF NAME="smtp_port_feedback">

    <blockquote>
        <TMPL_VAR NAME="smtp_port_feedback">
    </blockquote>

    </TMPL_IF>

</form>

--- NEW FILE: smtp-chain-server.thtml ---
<form action="/security" method="post">
    <label class="securityLabel" for="securitySecureServer">
        <TMPL_VAR NAME="Localize_Security_SMTPServer">:
    </label>
    <br />
    <input type="text" name="smtp_chain_server" id="securitySecureServer" value="<TMPL_VAR NAME="smtp_chain_server">" />
    <input type="submit" class="submit" name="update_smtp_server" value="<TMPL_VAR NAME="Localize_Apply">" />
    <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

    <TMPL_IF NAME="smtp_server_feedback">

    <blockquote>
        <TMPL_VAR NAME="smtp_server_feedback">
    </blockquote>

    </TMPL_IF>

</form>

Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17807/Proxy

Modified Files:
	SMTP.pm 
Log Message:
Adapted smtp module to new template system.

Made the pop3 security panel behave like the other stealth mode toggles.

Index: SMTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/SMTP.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** SMTP.pm	23 Jun 2004 14:17:02 -0000	1.31
--- SMTP.pm	24 Jun 2004 10:49:33 -0000	1.32
***************
*** 110,132 ****
      # item that needs a UI component
  
! #    $self->register_configuration_item_( 'configuration',
! #                                         'smtp_port',
! #                                         $self );
  
! #    $self->register_configuration_item_( 'configuration',              # PROFILE BLOCK START
! #                                         'smtp_force_fork',
! #                                         $self );                      # PROFILE BLOCK STOP
  
! #    $self->register_configuration_item_( 'security',
! #                                         'smtp_local',
! #                                         $self );
  
! #    $self->register_configuration_item_( 'chain',
! #                                         'smtp_server',
! #                                         $self );
  
! #    $self->register_configuration_item_( 'chain',
! #                                         'smtp_server_port',
! #                                          $self );
  
      return $self->SUPER::start();;
--- 110,137 ----
      # item that needs a UI component
  
!     $self->register_configuration_item_( 'configuration',
!                                          'smtp_port',
!                                          'smtp-port.thtml',
!                                          $self );
  
!     $self->register_configuration_item_( 'configuration',
!                                          'smtp_force_fork',
!                                          'smtp-force-fork.thtml',
!                                          $self );
  
!     $self->register_configuration_item_( 'security',
!                                          'smtp_local',
!                                          'smtp-security-local.thtml',
!                                          $self );
  
!     $self->register_configuration_item_( 'chain',
!                                          'smtp_server',
!                                          'smtp-chain-server.thtml',
!                                          $self );
  
!     $self->register_configuration_item_( 'chain',
!                                          'smtp_server_port',
!                                          'smtp-chain-server-port.thtml',
!                                          $self );
  
      return $self->SUPER::start();;
***************
*** 311,393 ****
  # configure_item
  #
! #    $name            The name of the item being configured, was passed in by the call
! #                     to register_configuration_item
! #    $language        Reference to the hash holding the current language
! #    $session_key     The current session key
  #
- #  Must return the HTML for this item
  # ---------------------------------------------------------------------------------------------
  
  sub configure_item
  {
!     my ( $self, $name, $language, $session_key ) = @_;
! 
!     my $body = '';
  
      if ( $name eq 'smtp_port' ) {
!         $body .= "<form action=\"/configuration\">\n";
!         $body .= "<label class=\"configurationLabel\" for=\"configPopPort\">$$language{Configuration_SMTPPort}:</label><br />\n";
!         $body .= "<input name=\"smtp_port\" type=\"text\" id=\"configPopPort\" value=\"" . $self->config_( 'port' ) . "\" />\n";
!         $body .= "<input type=\"submit\" class=\"submit\" name=\"update_smtp_port\" value=\"$$language{Apply}\" />\n";
!         $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
      }
  
      if ( $name eq 'smtp_local' ) {
!         $body .= "<span class=\"securityLabel\">$$language{Security_SMTP}:</span><br />\n";
! 
!         $body .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\"><tr><td nowrap=\"nowrap\">\n";
!         if ( $self->config_( 'local' ) == 1 ) {
!             $body .= "<form class=\"securitySwitch\" action=\"/security\">\n";
!             $body .= "<span class=\"securityWidgetStateOff\">$$language{Security_NoStealthMode}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"securityAcceptPOP3On\" name=\"toggle\" value=\"$$language{ChangeToYes}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"smtp_local\" value=\"1\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         } else {
!             $body .= "<form class=\"securitySwitch\" action=\"/security\">\n";
!             $body .= "<span class=\"securityWidgetStateOn\">$$language{Yes}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOff\" id=\"securityAcceptPOP3Off\" name=\"toggle\" value=\"$$language{ChangeToNo} $$language{Security_StealthMode}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"smtp_local\" value=\"2\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         }
!         $body .= "</td></tr></table>\n";
       }
  
      if ( $name eq 'smtp_server' ) {
!         $body .= "<form action=\"/security\">\n";
!         $body .= "<label class=\"securityLabel\" for=\"securitySecureServer\">$$language{Security_SMTPServer}:</label><br />\n";
!         $body .= "<input type=\"text\" name=\"smtp_chain_server\" id=\"securitySecureServer\" value=\"" . $self->config_( 'chain_server' ) . "\" />\n";
!         $body .= "<input type=\"submit\" class=\"submit\" name=\"update_smtp_server\" value=\"$$language{Apply}\" />\n";
!         $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
      }
  
      if ( $name eq 'smtp_server_port' ) {
!         $body .= "<form action=\"/security\">\n";
!         $body .= "<label class=\"securityLabel\" for=\"securitySecurePort\">$$language{Security_SMTPPort}:</label><br />\n";
!         $body .= "<input type=\"text\" name=\"smtp_chain_server_port\" id=\"securitySecurePort\" value=\"" . $self->config_( 'chain_port' ) . "\" />\n";
!         $body .= "<input type=\"submit\" class=\"submit\" name=\"update_smtp_server_port\" value=\"$$language{Apply}\" />\n";
!         $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
      }
  
      if ( $name eq 'smtp_force_fork' ) {
!         $body .= "<span class=\"configurationLabel\">$$language{Configuration_SMTPFork}:</span><br />\n";
!         $body .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\"><tr><td nowrap=\"nowrap\">\n";
! 
!         if ( $self->config_( 'force_fork' ) == 0 ) {
!             $body .= "<form action=\"/configuration\">\n";
!             $body .= "<span class=\"securityWidgetStateOff\">$$language{No}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowTrayIconOn\" name=\"toggle\" value=\"$$language{ChangeToYes}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"smtp_force_fork\" value=\"1\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         } else {
!             $body .= "<form action=\"/configuration\">\n";
!             $body .= "<span class=\"securityWidgetStateOn\">$$language{Yes}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowTrayIconOff\" name=\"toggle\" value=\"$$language{ChangeToNo}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"smtp_force_fork\" value=\"0\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         }
!         $body .= "</td></tr></table>\n";
      }
  
!     return $body . $self->SUPER::configure_item( $name, $language, $session_key );
  }
  
--- 316,352 ----
  # configure_item
  #
! #    $name            Name of this item
! #    $templ           The loaded template that was passed as a parameter
! #                     when registering
! #    $language        Current language
  #
  # ---------------------------------------------------------------------------------------------
  
  sub configure_item
  {
!     my ( $self, $name, $templ, $language ) = @_;
  
      if ( $name eq 'smtp_port' ) {
!         $templ->param( 'smtp_port' => $self->config_( 'port' ) );
      }
  
      if ( $name eq 'smtp_local' ) {
!         $templ->param( 'smtp_local_on' => $self->config_( 'local' ) );
       }
  
      if ( $name eq 'smtp_server' ) {
!         $templ->param( 'smtp_chain_server' => $self->config_( 'chain_server' ) );
      }
  
      if ( $name eq 'smtp_server_port' ) {
!         $templ->param( 'smtp_chain_port' => $self->config_( 'chain_port' ) );
      }
  
      if ( $name eq 'smtp_force_fork' ) {
!         $templ->param( 'smtp_force_fork_on' => $self->config_( 'force_fork' ) );
      }
  
! 
!     #$self->SUPER::configure_item( $name, $templ, $language );
  }
  
***************
*** 398,410 ****
  #    $name            The name of the item being configured, was passed in by the call
  #                     to register_configuration_item
! #    $language        Reference to the hash holding the current language
  #    $form            Hash containing all form items
  #
- #  Must return the HTML for this item
  # ---------------------------------------------------------------------------------------------
  
  sub validate_item
  {
!     my ( $self, $name, $language, $form ) = @_;
  
      if ( $name eq 'smtp_port' ) {
--- 357,369 ----
  #    $name            The name of the item being configured, was passed in by the call
  #                     to register_configuration_item
! #    $templ           The loaded template
! #    $language        The language currently in use
  #    $form            Hash containing all form items
  #
  # ---------------------------------------------------------------------------------------------
  
  sub validate_item
  {
!     my ( $self, $name, $templ, $language, $form ) = @_;
  
      if ( $name eq 'smtp_port' ) {
***************
*** 412,418 ****
              if ( ( $$form{smtp_port} >= 1 ) && ( $$form{smtp_port} < 65536 ) ) {
                  $self->config_( 'port', $$form{smtp_port} );
!                 return '<blockquote>' . sprintf( $$language{Configuration_POP3Update} . '</blockquote>' , $self->config_( 'port' ) );
               } else {
!                  return "<blockquote><div class=\"error01\">$$language{Configuration_Error3}</div></blockquote>";
               }
          }
--- 371,377 ----
              if ( ( $$form{smtp_port} >= 1 ) && ( $$form{smtp_port} < 65536 ) ) {
                  $self->config_( 'port', $$form{smtp_port} );
!                 $templ->param( 'smtp_port_feedback' => sprintf( $$language{Configuration_SMTPUpdate}, $self->config_( 'port' ) ) );
               } else {
!                 $templ->param( 'smtp_port_feedback' => "<div class=\"error01\">$$language{Configuration_Error3}</div>" );
               }
          }
***************
*** 420,438 ****
  
      if ( $name eq 'smtp_local' ) {
!         $self->config_( 'local', $$form{smtp_local}-1 ) if ( defined($$form{smtp_local}) );
      }
  
      if ( $name eq 'smtp_server' ) {
!          $self->config_( 'chain_server', $$form{smtp_chain_server} ) if ( defined($$form{smtp_chain_server}) );
!          return sprintf( "<blockquote>" . $$language{Security_SMTPServerUpdate} . "</blockquote>", $self->config_( 'chain_server' ) ) if ( defined($$form{smtp_chain_server}) );
      }
  
      if ( $name eq 'smtp_server_port' ) {
!         if ( defined($$form{smtp_chain_server_port}) ) {
              if ( ( $$form{smtp_chain_server_port} >= 1 ) && ( $$form{smtp_chain_server_port} < 65536 ) ) {
                  $self->config_( 'chain_port', $$form{smtp_chain_server_port} );
!                 return sprintf( "<blockquote>" . $$language{Security_SMTPPortUpdate} . "</blockquote>", $self->config_( 'chain_port' ) ) if ( defined($$form{smtp_chain_chain_port}) );
!             } else {
!                 return "<blockquote><div class=\"error01\">$$language{Security_Error1}</div></blockquote>";
              }
          }
--- 379,403 ----
  
      if ( $name eq 'smtp_local' ) {
!         if ( defined $$form{smtp_local} ) {
!             $self->config_( 'local', $$form{smtp_local} );
!         }
      }
  
      if ( $name eq 'smtp_server' ) {
!         if ( defined $$form{smtp_chain_server} ) {
!             $self->config_( 'chain_server', $$form{smtp_chain_server} );
!             $templ->param( 'smtp_server_feedback' => sprintf $$language{Security_SMTPServerUpdate}, $self->config_( 'chain_server' ) ) ;
!         }
      }
  
      if ( $name eq 'smtp_server_port' ) {
!         if ( defined $$form{smtp_chain_server_port} ) {
! 
              if ( ( $$form{smtp_chain_server_port} >= 1 ) && ( $$form{smtp_chain_server_port} < 65536 ) ) {
                  $self->config_( 'chain_port', $$form{smtp_chain_server_port} );
!                 $templ->param( 'smtp_port_feedback' => sprintf $$language{Security_SMTPPortUpdate}, $self->config_( 'chain_port' ) );
!             }
!             else {
!                 $templ->param( 'smtp_port_feedback' => "<div class=\"error01\">$$language{Security_Error1}</div>" );
              }
          }
***************
*** 445,449 ****
      }
  
!     return $self->SUPER::validate_item( $name, $language, $form );
  }
  
--- 410,414 ----
      }
  
!     #$self->SUPER::validate_item( $name, $templ, $language, $form );
  }

Update of /cvsroot/popfile/engine/Platform
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20410/Platform

Modified Files:
	MSWin32.pm 
Log Message:
Adapted windows module to new template system.

Index: MSWin32.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Platform/MSWin32.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MSWin32.pm	8 Jun 2004 14:40:03 -0000	1.13
--- MSWin32.pm	24 Jun 2004 08:10:11 -0000	1.14
***************
*** 1,173 ****
! # POPFILE LOADABLE MODULE
! package Platform::MSWin32;
! 
! use POPFile::Module;
! @ISA = ("POPFile::Module");
! 
! #----------------------------------------------------------------------------
! #
! # This module handles POPFile specifics on Windows
! #
! # Copyright (c) 2001-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #----------------------------------------------------------------------------
! 
! use strict;
! use warnings;
! use locale;
! 
! #----------------------------------------------------------------------------
! # new
! #
! #   Class new() function
! #----------------------------------------------------------------------------
! sub new
! {
!     my $type = shift;
!     my $class = ref($type) || $type;
!     my $self = POPFile::Module->new();
! 
!     bless $self, $type;
! 
!     $self->name( 'windows' );
! 
!     return $self;
! }
! 
! # ---------------------------------------------------------------------------------------------
! #
! # initialize
! #
! # Called when we are are being set up but before starting
! #
! # ---------------------------------------------------------------------------------------------
! sub initialize
! {
!     my ( $self ) = @_;
! 
!     $self->config_( 'trayicon', 1 );
!     $self->config_( 'console',  0 );
! 
!     $self->register_configuration_item_( 'configuration',
!                                          'windows_trayicon',
!                                          $self );
! 
!     $self->register_configuration_item_( 'configuration',
!                                          'windows_console',
!                                          $self );
! 
!     return 1;
! }
! 
! # ---------------------------------------------------------------------------------------------
! #
! # configure_item
! #
! #    $name            The name of the item being configured, was passed in by the call
! #                     to register_configuration_item
! #    $language        Reference to the hash holding the current language
! #    $session_key     The current session key
! #
! #  Must return the HTML for this item
! # ---------------------------------------------------------------------------------------------
! 
! sub configure_item
! {
!     my ( $self, $name, $language, $session_key ) = @_;
! 
!     my $body;
! 
!     # Tray icon widget
!     if ( $name eq 'windows_trayicon' ) {
!         $body .= "<span class=\"configurationLabel\">$$language{Windows_TrayIcon}:</span><br />\n";
!         $body .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\"><tr><td nowrap=\"nowrap\">\n";
! 
!         if ( $self->config_( 'trayicon' ) == 0 ) {
!             $body .= "<form action=\"/configuration\">\n";
!             $body .= "<span class=\"securityWidgetStateOff\">$$language{No}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowTrayIconOn\" name=\"toggle\" value=\"$$language{ChangeToYes}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"windows_trayicon\" value=\"1\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         } else {
!             $body .= "<form action=\"/configuration\">\n";
!             $body .= "<span class=\"securityWidgetStateOn\">$$language{Yes}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowTrayIconOff\" name=\"toggle\" value=\"$$language{ChangeToNo}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"windows_trayicon\" value=\"0\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         }
!         $body .= "</td></tr></table>\n";
!     }
! 
!     if ( $name eq 'windows_console' ) {
!         $body .= "<span class=\"configurationLabel\">$$language{Windows_Console}:</span><br />\n";
!         $body .= "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" summary=\"\"><tr><td nowrap=\"nowrap\">\n";
! 
!         if ( $self->config_( 'console' ) == 0 ) {
!             $body .= "<form action=\"/configuration\">\n";
!             $body .= "<span class=\"securityWidgetStateOff\">$$language{No}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowConsoleOn\" name=\"toggle\" value=\"$$language{ChangeToYes}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"windows_console\" value=\"1\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         } else {
!             $body .= "<form action=\"/configuration\">\n";
!             $body .= "<span class=\"securityWidgetStateOn\">$$language{Yes}</span>\n";
!             $body .= "<input type=\"submit\" class=\"toggleOn\" id=\"windowConsoleOff\" name=\"toggle\" value=\"$$language{ChangeToNo}\" />\n";
!             $body .= "<input type=\"hidden\" name=\"windows_console\" value=\"0\" />\n";
!             $body .= "<input type=\"hidden\" name=\"session\" value=\"$session_key\" />\n</form>\n";
!         }
!         $body .= "</td></tr></table>\n";
!     }
! 
!     return $body;
! }
! 
! # ---------------------------------------------------------------------------------------------
! #
! # validate_item
! #
! #    $name            The name of the item being configured, was passed in by the call
! #                     to register_configuration_item
! #    $language        Reference to the hash holding the current language
! #    $form            Hash containing all form items
! #
! #  Must return the HTML for this item
! # ---------------------------------------------------------------------------------------------
! 
! sub validate_item
! {
!     my ( $self, $name, $language, $form ) = @_;
! 
!     if ( $name eq 'windows_trayicon' ) {
!         if ( defined($$form{windows_trayicon}) ) {
!             $self->config_( 'trayicon', $$form{windows_trayicon} );
!             return $$language{Windows_NextTime};
!         }
!     }
! 
!     if ( $name eq 'windows_console' ) {
!         if ( defined($$form{windows_console}) ) {
!             $self->config_( 'console', $$form{windows_console} );
!             return $$language{Windows_NextTime};
!         }
!     }
! 
!    return '';
! }
! 
! 1;
--- 1,137 ----
! # POPFILE LOADABLE MODULE
! package Platform::MSWin32;
! 
! use POPFile::Module;
! @ISA = ("POPFile::Module");
! 
! #----------------------------------------------------------------------------
! #
! # This module handles POPFile specifics on Windows
! #
! # Copyright (c) 2001-2004 John Graham-Cumming
! #
! #   This file is part of POPFile
! #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
! #
! #   POPFile is distributed in the hope that it will be useful,
! #   but WITHOUT ANY WARRANTY; without even the implied warranty of
! #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! #   GNU General Public License for more details.
! #
! #   You should have received a copy of the GNU General Public License
! #   along with POPFile; if not, write to the Free Software
! #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! #
! #----------------------------------------------------------------------------
! 
! use strict;
! use warnings;
! use locale;
! 
! #----------------------------------------------------------------------------
! # new
! #
! #   Class new() function
! #----------------------------------------------------------------------------
! sub new
! {
!     my $type = shift;
!     my $class = ref($type) || $type;
!     my $self = POPFile::Module->new();
! 
!     bless $self, $type;
! 
!     $self->name( 'windows' );
! 
!     return $self;
! }
! 
! # ---------------------------------------------------------------------------------------------
! #
! # initialize
! #
! # Called when we are are being set up but before starting
! #
! # ---------------------------------------------------------------------------------------------
! sub initialize
! {
!     my ( $self ) = @_;
! 
!     $self->config_( 'trayicon', 1 );
!     $self->config_( 'console',  0 );
!     
!     $self->register_configuration_item_( 'configuration',
!                                          'windows_trayicon',
!                                          'windows-trayicon-configuration.thtml',
!                                          $self );
! 
!     $self->register_configuration_item_( 'configuration',
!                                          'windows_console',
!                                          'windows-console-configuration.thtml',
!                                          $self );
! 
!     return 1;
! }
! 
! # ---------------------------------------------------------------------------------------------
! #
! # configure_item
! #
! #    $name            Name of this item
! #    $templ           The loaded template that was passed as a parameter
! #                     when registering
! #    $language        Current language
! #
! # ---------------------------------------------------------------------------------------------
! 
! sub configure_item
! {
!     my ( $self, $name, $templ, $language ) = @_;
! 
!     if ( $name eq 'windows_trayicon' ) {
!         $templ->param( 'windows_icon_on' => $self->config_( 'trayicon' ) );
!     }
! 
!     if ( $name eq 'windows_console' ) {
!         $templ->param( 'windows_console_on' => $self->config_( 'console' ) );
!     }
! }
! 
! # ---------------------------------------------------------------------------------------------
! #
! # validate_item
! #
! #    $name            The name of the item being configured, was passed in by the call
! #                     to register_configuration_item
! #    $templ           The loaded template
! #    $language        The language currently in use
! #    $form            Hash containing all form items
! #
! # ---------------------------------------------------------------------------------------------
! 
! sub validate_item
! {
!     my ( $self, $name, $templ, $language, $form ) = @_;
! 
!     if ( $name eq 'windows_trayicon' ) {
!         if ( defined($$form{windows_trayicon}) ) {
!             $self->config_( 'trayicon', $$form{windows_trayicon} );
!             $templ->param( 'feedback' => 1 );
!         }
!     }
! 
!     if ( $name eq 'windows_console' ) {
!         if ( defined($$form{windows_console}) ) {
!             $self->config_( 'console', $$form{windows_console} );
!             $templ->param( 'feedback' => 1 );
!         }
!     }
! 
!    return '';
! }
! 
! 1;

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

Added Files:
	windows-console-configuration.thtml 
	windows-trayicon-configuration.thtml 
Log Message:
Adapted windows module to new template system.

--- NEW FILE: windows-console-configuration.thtml ---
<br />
<span class="configurationLabel">
    <TMPL_VAR NAME="Localize_Windows_Console">
</span>
<br />
<table border="0" cellpadding="0" cellspacing="0" summary="">
    <tr>
        <td nowrap="nowrap">
            <form action="/configuration" method="post">
                <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

                <TMPL_IF NAME="windows_console_on">

                <span class="securityWidgetStateOn">
                    <TMPL_VAR NAME="Localize_Yes">
                </span>
                <input type="submit" class="toggleOn" id="windowConsoleOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
                <input type="hidden" name="windows_console" value="0" />

                <TMPL_ELSE>

                <span class="securityWidgetStateOff">
                    <TMPL_VAR NAME="Localize_No">
                </span>
                <input type="submit" class="toggleOn" id="windowConsoleOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                <input type="hidden" name="windows_console" value="1" />

                </TMPL_IF>

                <TMPL_IF NAME="feedback">

                <TMPL_VAR NAME="Localize_Windows_NextTime">

                </TMPL_IF>

            </form>
        </td>
    </tr>
</table>

--- NEW FILE: windows-trayicon-configuration.thtml ---
<br />
<span class="configurationLabel">
    <TMPL_VAR NAME="Localize_Windows_TrayIcon">
</span>
<br />
<table border="0" cellpadding="0" cellspacing="0" summary="">
    <tr>
        <td nowrap="nowrap">
            <form action="/configuration" method="post">
                <input type="hidden" name="session" value="<TMPL_VAR NAME="Session_Key">" />

                <TMPL_IF NAME="windows_icon_on">

                <span class="securityWidgetStateOn">
                    <TMPL_VAR NAME="Localize_Yes">
                </span>
                <input type="submit" class="toggleOn" id="windowTrayIconOff" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToNo">" />
                <input type="hidden" name="windows_trayicon" value="0" />

                <TMPL_ELSE>

                <span class="securityWidgetStateOff">
                    <TMPL_VAR NAME="Localize_No">
                </span>
                <input type="submit" class="toggleOn" id="windowTrayIconOn" name="toggle" value="<TMPL_VAR NAME="Localize_ChangeToYes">" />
                <input type="hidden" name="windows_trayicon" value="1" />

                </TMPL_IF>

                <TMPL_IF NAME="feedback">

                <TMPL_VAR NAME="Localize_Windows_NextTime">

                </TMPL_IF>

            </form>
        </td>
    </tr>
</table>