Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <xue...@us...> - 2003-06-22 17:53:00
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv5267
Modified Files:
installer.nsi
Log Message:
Add 'Version Information' to the installer and uninstaller EXE files.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** installer.nsi 22 Jun 2003 15:57:21 -0000 1.71
--- installer.nsi 22 Jun 2003 17:52:57 -0000 1.72
***************
*** 25,28 ****
--- 25,48 ----
!include "MUI.nsh"
+ #--------------------------------------------------------------------------
+ # Version Information settings (for the installer EXE and uninstaller EXE)
+ #--------------------------------------------------------------------------
+
+ ; '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 "0.19.0.0"
+
+ VIAddVersionKey "ProductName" "POPFile"
+ VIAddVersionKey "Comments" "POPFile Homepage: http:// popfile.sourceforge.net"
+ VIAddVersionKey "CompanyName" "POPFile Team"
+ # VIAddVersionKey "LegalTrademarks" "POPFile"
+ VIAddVersionKey "LegalCopyright" "© 2001-2003 John Graham-Cumming"
+ VIAddVersionKey "FileDescription" "POPFile Automatic email classification"
+ VIAddVersionKey "FileVersion" "${MUI_VERSION}"
+
+ VIAddVersionKey "Build Type" "CVS Build (Experimental)"
+ VIAddVersionKey "Build Date" "${__DATE__} @ ${__TIME__}"
+
#----------------------------------------------------------------------------------------
# CBP Configuration Data (to override defaults, un-comment the lines below and modify them)
***************
*** 1297,1303 ****
Function ShowReadMe
- !define L_TEMP $R9
- Push ${L_TEMP}
-
StrCmp ${NOTEPAD} "" use_file_association
Exec 'notepad.exe "$INSTDIR\${README}"'
--- 1317,1320 ----
***************
*** 1308,1314 ****
exit:
- Pop ${L_TEMP}
-
- !undef L_TEMP
FunctionEnd
--- 1325,1328 ----
|
|
From: <xue...@us...> - 2003-06-22 15:57:24
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv21305
Modified Files:
installer.nsi
Log Message:
Remove redundant code.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** installer.nsi 22 Jun 2003 15:44:49 -0000 1.70
--- installer.nsi 22 Jun 2003 15:57:21 -0000 1.71
***************
*** 232,239 ****
Function .onInit
- !define L_RESULT $R0
-
- Push ${L_RESULT}
-
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioA.ini"
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioB.ini"
--- 232,235 ----
***************
*** 253,259 ****
exit:
- Pop ${L_RESULT}
-
- !undef L_RESULT
FunctionEnd
--- 249,252 ----
|
|
From: <xue...@us...> - 2003-06-22 15:44:53
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv19600
Modified Files:
installer.nsi
Log Message:
Use a GLOBAL variable to control how the Release Notes are displayed.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** installer.nsi 20 Jun 2003 11:57:40 -0000 1.69
--- installer.nsi 22 Jun 2003 15:44:49 -0000 1.70
***************
*** 156,159 ****
--- 156,160 ----
!define STARTUP $2 ; automatic startup flag (1 = yes, 0 = no)
!define CFG $3 ; general purpose file handle
+ !define NOTEPAD $4 ; path to notepad.exe ("" = not found in search path)
#--------------------------------------------------------------------------
***************
*** 243,248 ****
MessageBox MB_YESNO "Display POPFile Release Notes ?$\r$\n$\r$\n\
'Yes' recommended if you are upgrading." IDNO exit
! SearchPath ${L_RESULT} notepad.exe
! StrCmp ${L_RESULT} "" use_file_association
ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
GoTo exit
--- 244,249 ----
MessageBox MB_YESNO "Display POPFile Release Notes ?$\r$\n$\r$\n\
'Yes' recommended if you are upgrading." IDNO exit
! SearchPath ${NOTEPAD} notepad.exe
! StrCmp ${NOTEPAD} "" use_file_association
ExecWait 'notepad.exe "$PLUGINSDIR\release.txt"'
GoTo exit
***************
*** 286,291 ****
File "..\engine\license"
File "${RELEASE_NOTES}"
! SearchPath ${CFG} notepad.exe
! StrCmp ${CFG} "" 0 readme_ok
File /oname=${README}.txt "${RELEASE_NOTES}"
--- 287,291 ----
File "..\engine\license"
File "${RELEASE_NOTES}"
! StrCmp ${NOTEPAD} "" 0 readme_ok
File /oname=${README}.txt "${RELEASE_NOTES}"
***************
*** 1307,1312 ****
Push ${L_TEMP}
! SearchPath ${L_TEMP} notepad.exe
! StrCmp ${L_TEMP} "" use_file_association
Exec 'notepad.exe "$INSTDIR\${README}"'
goto exit
--- 1307,1311 ----
Push ${L_TEMP}
! StrCmp ${NOTEPAD} "" use_file_association
Exec 'notepad.exe "$INSTDIR\${README}"'
goto exit
|
|
From: <xue...@us...> - 2003-06-20 12:37:27
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1:/tmp/cvs-serv11302 Modified Files: ioC.ini Log Message: Corrected the header comment. Index: ioC.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioC.ini,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ioC.ini 15 Jun 2003 00:37:21 -0000 1.3 --- ioC.ini 20 Jun 2003 12:37:24 -0000 1.4 *************** *** 4,8 **** # used to create the Windows installer for POPFile. # This file defines the layout of the custom page ! # which offers to start POPFile and the POPFile UI. # # Copyright (c) 2001-2003 John Graham-Cumming --- 4,8 ---- # used to create the Windows installer for POPFile. # This file defines the layout of the custom page ! # which offers to start POPFile. # # Copyright (c) 2001-2003 John Graham-Cumming |
|
From: <xue...@us...> - 2003-06-20 11:57:45
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv4916
Modified Files:
installer.nsi
Log Message:
Improved handling of the Release Notes. Now using 'Finish' functions to start the UI and/or display the release notes.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** installer.nsi 16 Jun 2003 12:38:03 -0000 1.68
--- installer.nsi 20 Jun 2003 11:57:40 -0000 1.69
***************
*** 13,24 ****
; WARNING:
! ; This script requires "NSIS Modern User Interface" version 1.65 (or later)
; because it uses the new (simplified) page configuration system.
#--------------------------------------------------------------------------
! !define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.20.0 (CVS)"
! !define RELEASE_NOTES "..\engine\v0.19.0.change"
!include "MUI.nsh"
--- 13,25 ----
; WARNING:
! ; This script requires "NSIS Modern User Interface" version 1.65 (17 June 2003 or later)
; because it uses the new (simplified) page configuration system.
#--------------------------------------------------------------------------
! !define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.20.0 (CVS)"
! !define README "v0.19.0.change"
! !define RELEASE_NOTES "..\engine\${README}"
!include "MUI.nsh"
***************
*** 88,92 ****
; option is only offered if the installer has started POPFile running)
! !define MUI_FINISHPAGE_SHOWREADME "http://127.0.0.1:${GUI}/"
; Allow user to check the log file (by clicking "Show Details" button on the "Install" page)
--- 89,100 ----
; option is only offered if the installer has started POPFile running)
! !define MUI_FINISHPAGE_RUN
! !define MUI_FINISHPAGE_RUN_FUNCTION "RunUI"
!
! ; Display the Release Notes for this version of POPFile
!
! !define MUI_FINISHPAGE_SHOWREADME
! !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
! !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe"
; Allow user to check the log file (by clicking "Show Details" button on the "Install" page)
***************
*** 157,162 ****
It is recommended that you close all other applications before starting Setup.\r\n\r\n"
! !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SHOWREADME \
! "Display the POPFile User Interface"
!insertmacro MUI_LANGUAGE "English"
--- 165,169 ----
It is recommended that you close all other applications before starting Setup.\r\n\r\n"
! !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_RUN "Display POPFile &User Interface"
!insertmacro MUI_LANGUAGE "English"
***************
*** 170,174 ****
OutFile "setup.exe"
! ; Ensure CRC checking cannot be turned off using the command-line switch
CRCcheck Force
--- 177,181 ----
OutFile "setup.exe"
! ; Ensure CRC checking cannot be turned off using the /NCRC command-line switch
CRCcheck Force
***************
*** 216,219 ****
--- 223,227 ----
ReserveFile "ioB.ini"
ReserveFile "ioC.ini"
+ ReserveFile "${RELEASE_NOTES}"
#--------------------------------------------------------------------------
***************
*** 230,235 ****
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioB.ini"
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioC.ini"
!
! File /oname=$PLUGINSDIR\release.txt "${RELEASE_NOTES}"
MessageBox MB_YESNO "Display POPFile Release Notes ?$\r$\n$\r$\n\
'Yes' recommended if you are upgrading." IDNO exit
--- 238,244 ----
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioB.ini"
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioC.ini"
!
! !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${RELEASE_NOTES}" "release.txt"
!
MessageBox MB_YESNO "Display POPFile Release Notes ?$\r$\n$\r$\n\
'Yes' recommended if you are upgrading." IDNO exit
***************
*** 277,280 ****
--- 286,294 ----
File "..\engine\license"
File "${RELEASE_NOTES}"
+ SearchPath ${CFG} notepad.exe
+ StrCmp ${CFG} "" 0 readme_ok
+ File /oname=${README}.txt "${RELEASE_NOTES}"
+
+ readme_ok:
File "..\engine\popfile.pl"
File "..\engine\insert.pl"
***************
*** 1242,1248 ****
# (the "pre" function for the 'Finish' page)
#
! # The 'Finish' page contains a single CheckBox to control whether or not the installer
! # starts the POPFile User Interface. The User Interface only works when POPFile is running,
! # so we must ensure this CheckBox can only be ticked if the installer has started POPFile.
#--------------------------------------------------------------------------
--- 1256,1263 ----
# (the "pre" function for the 'Finish' page)
#
! # The 'Finish' page contains two CheckBoxes: one to control whether or not the installer
! # starts the POPFile User Interface and one to control whether or not the 'ReadMe' file is
! # displayed. The User Interface only works when POPFile is running, so we must ensure its
! # CheckBox can only be ticked if the installer has started POPFile.
#--------------------------------------------------------------------------
***************
*** 1253,1257 ****
Push ${L_TEMP}
! ; Field 4 is the 'ReadMe' CheckBox on the 'Finish' page (assuming there is no 'Run' CheckBox)
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Flags" ""
--- 1268,1272 ----
Push ${L_TEMP}
! ; Field 4 is the 'Run' CheckBox on the 'Finish' page
!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Flags" ""
***************
*** 1275,1278 ****
--- 1290,1325 ----
#--------------------------------------------------------------------------
+ # Installer Function: RunUI
+ # (the "Run" function for the 'Finish' page)
+ #--------------------------------------------------------------------------
+
+ Function RunUI
+ ExecShell "open" "http://127.0.0.1:${GUI}"
+ FunctionEnd
+
+ #--------------------------------------------------------------------------
+ # Installer Function: ShowReadMe
+ # (the "ReadMe" function for the 'Finish' page)
+ #--------------------------------------------------------------------------
+
+ Function ShowReadMe
+ !define L_TEMP $R9
+ Push ${L_TEMP}
+
+ SearchPath ${L_TEMP} notepad.exe
+ StrCmp ${L_TEMP} "" use_file_association
+ Exec 'notepad.exe "$INSTDIR\${README}"'
+ goto exit
+
+ use_file_association:
+ ExecShell "open" "$INSTDIR\${README}.txt"
+
+ exit:
+ Pop ${L_TEMP}
+
+ !undef L_TEMP
+ FunctionEnd
+
+ #--------------------------------------------------------------------------
# Installer Function: GetSeparator
#
***************
*** 1617,1620 ****
--- 1664,1668 ----
Delete $INSTDIR\*.dll
Delete $INSTDIR\*.change
+ Delete $INSTDIR\*.change.txt
Delete $INSTDIR\license
Delete $INSTDIR\popfile.cfg
|
|
From: <ssc...@us...> - 2003-06-19 20:48:11
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv19779
Modified Files:
Tag: v0/18/1
installer.nsi
Log Message:
update variables to package 0.18.3
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -C2 -d -r1.33.2.1 -r1.33.2.2
*** installer.nsi 10 Jun 2003 00:24:43 -0000 1.33.2.1
--- installer.nsi 19 Jun 2003 20:48:08 -0000 1.33.2.2
***************
*** 4,8 ****
; Modified to work with NSIS v2.0b1
!define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.18.2"
!include "MUI.nsh"
;--------------------------------
--- 4,8 ----
; Modified to work with NSIS v2.0b1
!define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.18.3"
!include "MUI.nsh"
;--------------------------------
***************
*** 138,142 ****
SetOutPath $INSTDIR
! File "..\engine\v0.18.2.change"
File "..\engine\*.pl"
File "..\engine\pix.gif"
--- 138,142 ----
SetOutPath $INSTDIR
! File "..\engine\v0.18.3.change"
File "..\engine\*.pl"
File "..\engine\pix.gif"
|
|
From: <ssc...@us...> - 2003-06-19 20:47:30
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv19652
Modified Files:
Tag: v0/18/1
popfile.pl
Log Message:
update variables to package 0.18.3
Index: popfile.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile.pl,v
retrieving revision 1.204.2.1
retrieving revision 1.204.2.2
diff -C2 -d -r1.204.2.1 -r1.204.2.2
*** popfile.pl 3 Mar 2003 22:09:11 -0000 1.204.2.1
--- popfile.pl 19 Jun 2003 20:47:27 -0000 1.204.2.2
***************
*** 285,289 ****
$components{core}{config}->{major_version} = 0;
$components{core}{config}->{minor_version} = 18;
! $components{core}{config}->{build_version} = 2;
print "\nPOPFile Engine v$components{core}{config}->{major_version}.$components{core}{config}->{minor_version}.$components{core}{config}->{build_version} starting";
--- 285,289 ----
$components{core}{config}->{major_version} = 0;
$components{core}{config}->{minor_version} = 18;
! $components{core}{config}->{build_version} = 3;
print "\nPOPFile Engine v$components{core}{config}->{major_version}.$components{core}{config}->{minor_version}.$components{core}{config}->{build_version} starting";
|
|
From: <jgr...@us...> - 2003-06-19 15:03:09
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv25281
Modified Files:
MailParse.pm
Log Message:
There's only one v in received
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** MailParse.pm 19 Jun 2003 13:58:30 -0000 1.136
--- MailParse.pm 19 Jun 2003 15:03:06 -0000 1.137
***************
*** 1409,1413 ****
# Some headers should never be RFC 2047 decoded
! $argument = $self->decode_string($argument) unless ($header =~ /^(Revceived|Content\-Type|Content\-Disposition)$/i);
add_line( $self, $argument, 0, $prefix );
--- 1409,1413 ----
# Some headers should never be RFC 2047 decoded
! $argument = $self->decode_string($argument) unless ($header =~ /^(Received|Content\-Type|Content\-Disposition)$/i);
add_line( $self, $argument, 0, $prefix );
|
|
From: <jgr...@us...> - 2003-06-19 13:58:35
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv14182
Modified Files:
Bayes.pm MailParse.pm
Log Message:
Append -- to final MIME boundary in quarantined message per RFC
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** Bayes.pm 14 Jun 2003 21:10:12 -0000 1.150
--- Bayes.pm 19 Jun 2003 13:58:30 -0000 1.151
***************
*** 1057,1061 ****
if ( $classification ne 'unclassified' ) {
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! print $client "$eol--$temp_file$eol";
}
}
--- 1057,1061 ----
if ( $classification ne 'unclassified' ) {
if ( ( $self->{parameters__}{$classification}{quarantine} == 1 ) && $echo ) {
! print $client "$eol--$temp_file--$eol";
}
}
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** MailParse.pm 18 Jun 2003 20:34:55 -0000 1.135
--- MailParse.pm 19 Jun 2003 13:58:30 -0000 1.136
***************
*** 15,19 ****
use MIME::Base64;
use MIME::QuotedPrint;
- #require Encode::MIME::Header;
# HTML entity mapping to character codes, this maps things like & to their corresponding
--- 15,18 ----
|
|
From: <ssc...@us...> - 2003-06-19 01:36:11
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv11718
Modified Files:
Tag: v0/18/1
Bayes.pm
Log Message:
fix bug retrieving long messages
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.107.2.7
retrieving revision 1.107.2.8
diff -C2 -d -r1.107.2.7 -r1.107.2.8
*** Bayes.pm 3 Jun 2003 08:39:18 -0000 1.107.2.7
--- Bayes.pm 19 Jun 2003 01:36:06 -0000 1.107.2.8
***************
*** 764,767 ****
--- 764,769 ----
$echo = 1 unless (defined $echo);
+
+ Proxy::POP3::debug( $self,"\$dcount: $dcount, \$mcount: $mcount, \$nosave: $nosave, \$class: $class, \$echo: $echo ");
my $msg_subject = ''; # The message subject
***************
*** 885,888 ****
--- 887,892 ----
# an email of that type
$classification = ($class ne '')?$class:$self->classify_file($temp_file);
+
+ Proxy::POP3::debug( $self, "classification: $classification size: $message_size");
# Add the Subject line modification or the original line back again
***************
*** 961,968 ****
print $client $msg_head_before;
print $client $msg_head_after;
! print $client $msg_body;
!
!
! print $client ".$eol";
}
--- 965,969 ----
print $client $msg_head_before;
print $client $msg_head_after;
! print $client $msg_body;
}
***************
*** 973,977 ****
--- 974,981 ----
$self->echo_to_dot( $mail, undef);
}
+ } else {
+ print $client ".$eol" if ( $echo );
}
+
if ( !$nosave ) {
|
|
From: <jgr...@us...> - 2003-06-18 20:34:58
|
Update of /cvsroot/popfile/engine/tests In directory sc8-pr-cvs1:/tmp/cvs-serv28368/tests Modified Files: TestBayes.tst TestHTML.tst Log Message: Restored POPFile test suite to working order, note that many tests are currently failing and need to be udpated, I am on this. Also added code to detect the Camouflage spam trick by using Pythagoras on the two RGB values Index: TestBayes.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestBayes.tst,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestBayes.tst 16 Apr 2003 01:26:45 -0000 1.9 --- TestBayes.tst 18 Jun 2003 20:34:55 -0000 1.10 *************** *** 9,17 **** --- 9,40 ---- use Classifier::Bayes; use POPFile::Configuration; + use POPFile::MQ; + use POPFile::Logger; # Load the test corpus my $c = new POPFile::Configuration; + my $mq = new POPFile::MQ; + my $l = new POPFile::Logger; my $b = new Classifier::Bayes; + + $c->configuration( $c ); + $c->mq( $mq ); + $c->logger( $l ); + + $l->configuration( $c ); + $l->mq( $mq ); + $l->logger( $l ); + + $l->initialize(); + + $mq->configuration( $c ); + $mq->mq( $mq ); + $mq->logger( $l ); + $b->configuration( $c ); + $b->mq( $mq ); + $b->logger( $l ); + + $b->initialize(); $b->config_( 'corpus', 'tests/corpus' ); Index: TestHTML.tst =================================================================== RCS file: /cvsroot/popfile/engine/tests/TestHTML.tst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestHTML.tst 27 Feb 2003 00:55:25 -0000 1.1 --- TestHTML.tst 18 Jun 2003 20:34:55 -0000 1.2 *************** *** 8,17 **** use UI::HTML; ! my $c = new UI::HTML; ! test_assert_equal( $c->url_encode( ']' ), '%5d' ); ! test_assert_equal( $c->url_encode( '[' ), '%5b' ); ! test_assert_equal( $c->url_encode( '[]' ), '%5b%5d' ); ! test_assert_equal( $c->url_encode( '[foo]' ), '%5bfoo%5d' ); --- 8,42 ---- use UI::HTML; + use POPFile::Configuration; + use POPFile::MQ; + use POPFile::Logger; ! my $c = new POPFile::Configuration; ! my $mq = new POPFile::MQ; ! my $l = new POPFile::Logger; ! $c->configuration( $c ); ! $c->mq( $mq ); ! $c->logger( $l ); ! ! $l->configuration( $c ); ! $l->mq( $mq ); ! $l->logger( $l ); ! ! $l->initialize(); ! ! $mq->configuration( $c ); ! $mq->mq( $mq ); ! $mq->logger( $l ); ! ! my $h = new UI::HTML; ! ! $h->configuration( $c ); ! $h->mq( $mq ); ! $h->logger( $l ); ! ! test_assert_equal( $h->url_encode_( ']' ), '%5d' ); ! test_assert_equal( $h->url_encode_( '[' ), '%5b' ); ! test_assert_equal( $h->url_encode_( '[]' ), '%5b%5d' ); ! test_assert_equal( $h->url_encode_( '[foo]' ), '%5bfoo%5d' ); |
|
From: <jgr...@us...> - 2003-06-18 20:34:58
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv28368
Modified Files:
tests.pl
Log Message:
Restored POPFile test suite to working order, note that many tests are currently failing and need to be udpated, I am on this. Also added code to detect the Camouflage spam trick by using Pythagoras on the two RGB values
Index: tests.pl
===================================================================
RCS file: /cvsroot/popfile/engine/tests.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** tests.pl 25 Mar 2003 05:24:52 -0000 1.14
--- tests.pl 18 Jun 2003 20:34:55 -0000 1.15
***************
*** 38,42 ****
$test_count += 1;
!
if ( !$ok ) {
$fail_messages .= "\n $file:$line failed '$test'";
--- 38,42 ----
$test_count += 1;
!
if ( !$ok ) {
$fail_messages .= "\n $file:$line failed '$test'";
***************
*** 46,50 ****
$test_failures += 1;
}
!
flush STDOUT;
}
--- 46,50 ----
$test_failures += 1;
}
!
flush STDOUT;
}
***************
*** 123,128 ****
# This works by reading the entire suite into the $suite variable
! # and then changing calls to test_assert_equal so that they include
! # the line number and the file they are from, then the $suite is
# evaluated
my $current_test_count = $test_count;
--- 123,128 ----
# This works by reading the entire suite into the $suite variable
! # and then changing calls to test_assert_equal so that they include
! # the line number and the file they are from, then the $suite is
# evaluated
my $current_test_count = $test_count;
|
|
From: <jgr...@us...> - 2003-06-18 20:34:58
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv28368/Classifier
Modified Files:
MailParse.pm
Log Message:
Restored POPFile test suite to working order, note that many tests are currently failing and need to be udpated, I am on this. Also added code to detect the Camouflage spam trick by using Pythagoras on the two RGB values
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** MailParse.pm 17 Jun 2003 17:21:38 -0000 1.134
--- MailParse.pm 18 Jun 2003 20:34:55 -0000 1.135
***************
*** 73,76 ****
--- 73,82 ----
$self->{htmlfontcolor__} = map_color( $self, 'black' );
+ # This is the distance betwee the back color and the font color
+ # as computed using compute_rgb_distance
+
+ $self->{htmlcolordistance__} = 0;
+ compute_html_color_distance( $self );
+
# This is a mapping between HTML color names and HTML hexadecimal color values used by the
# map_color value to get canonical color values
***************
*** 115,118 ****
--- 121,170 ----
# ---------------------------------------------------------------------------------------------
#
+ # compute_rgb_distance
+ #
+ # Given two RGB colors compute the distance between them by considering them as points
+ # in 3 dimensions and calculating the distance between them (or equivalently the length
+ # of a vector between them)
+ #
+ # $left One color
+ # $right The other color
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub compute_rgb_distance
+ {
+ my ( $self, $left, $right ) = @_;
+
+ # Figure out where the left color is and then subtract the right
+ # color (point from it) to get the vector
+
+ $left =~ /^(..)(..)(..)$/;
+ my ( $rl, $gl, $bl ) = ( hex($1), hex($2), hex($3) );
+
+ $right =~ /^(..)(..)(..)$/;
+ my ( $r, $g, $b ) = ( $rl - hex($1), $gl - hex($2), $bl - hex($3) );
+
+ # Now apply Pythagoras in 3D to get the distance between them, we return
+ # the int because we don't need decimal level accuracy
+
+ return int( sqrt( $r*$r + $g*$g + $b*$b ) );
+ }
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # compute_html_color_distance
+ #
+ # Calls compute_rgb_distance to set up htmlcolordistance__ from the current HTML back and
+ # font colors
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub compute_html_color_distance
+ {
+ my ( $self ) = @_;
+ $self->{htmlcolordistance__} = compute_rgb_distance( $self->{htmlfontcolor__},
+ $self->{htmlbackcolor__} );
+ }
+
+ # ---------------------------------------------------------------------------------------------
+ #
# map_color
#
***************
*** 174,178 ****
#
# ---------------------------------------------------------------------------------------------
-
sub update_pseudoword
{
--- 226,229 ----
***************
*** 262,265 ****
--- 313,329 ----
if ( $self->{htmlfontcolor__} ne $self->{htmlbackcolor__} ) {
+
+ # If we are adding a line and the colors are different then we will
+ # add a count for the color difference to make sure that we catch
+ # camouflage attacks using similar colors, if the color similarity
+ # is less than 100. I chose 100 somewhat arbitrarily but classic
+ # black text on white background has a distance of 441, red/blue or
+ # green on white has distance 255. 100 seems like a reasonable upper
+ # bound for tracking evil spammer tricks with similar colors
+
+ if ( $self->{htmlcolordistance__} < 100 ) {
+ $self->update_pseudoword( 'html', "colordistance$self->{htmlcolordistance__}", $encoded, '' );
+ }
+
while ( $p < length($bigline) ) {
my $line = substr($bigline, $p, 1024);
***************
*** 388,391 ****
--- 452,456 ----
if ( $tag =~ /^font$/i ) {
$self->{htmlfontcolor__} = map_color( $self, 'black' );
+ $self->compute_html_color_distance();
}
***************
*** 395,398 ****
--- 460,464 ----
$self->{htmlfontcolor__} = map_color( $self, 'black' );
$self->{htmlbackcolor__} = $self->{htmlbodycolor__};
+ $self->compute_html_color_distance();
}
***************
*** 526,529 ****
--- 592,596 ----
$self->update_pseudoword( 'html', "fontcolor$value", $encoded, $original );
$self->{htmlfontcolor__} = map_color($self, $value);
+ $self->compute_html_color_distance();
print "Set html font color to $self->{htmlfontcolor__}\n" if ( $self->{debug} );
}
***************
*** 533,536 ****
--- 600,604 ----
update_word( $self, $value, $encoded, $quote, $end_quote, '' );
$self->{htmlfontcolor__} = map_color($self, $value);
+ $self->compute_html_color_distance();
print "Set html font color to $self->{htmlfontcolor__}\n" if ( $self->{debug} );
}
***************
*** 558,561 ****
--- 626,630 ----
$self->{htmlbodycolor__} = $self->{htmlbackcolor__} if ( $tag =~ /^body$/i );
+ $self->compute_html_color_distance();
}
***************
*** 897,900 ****
--- 966,970 ----
$self->{htmlbackcolor__} = map_color( $self, 'white' );
$self->{htmlfontcolor__} = map_color( $self, 'black' );
+ $self->compute_html_color_distance();
$self->{in_headers__} = 1;
|
|
From: <jgr...@us...> - 2003-06-17 17:26:42
|
Update of /cvsroot/popfile/engine/skins
In directory sc8-pr-cvs1:/tmp/cvs-serv9339
Modified Files:
windows.css
Log Message:
Merged texasfett patch for Windows skin
Index: windows.css
===================================================================
RCS file: /cvsroot/popfile/engine/skins/windows.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** windows.css 22 May 2003 18:20:02 -0000 1.2
--- windows.css 17 Jun 2003 17:26:39 -0000 1.3
***************
*** 8,12 ****
most Mac browsers the "title bar" is not working correctly due to the way
they handle system colors.
!
Original design by Joseph Connors (TexasFett) <wi...@te...>,
but wouldn't look nearly as good without Dan Martin (Kraelen). Thanks Dan.
--- 8,12 ----
most Mac browsers the "title bar" is not working correctly due to the way
they handle system colors.
!
Original design by Joseph Connors (TexasFett) <wi...@te...>,
but wouldn't look nearly as good without Dan Martin (Kraelen). Thanks Dan.
***************
*** 19,23 ****
04-19-03: Fix menu visited color on IE 6 - version accepted into POPFile 0.19
05-03-03: Center footer better and add "icon" in Mozilla, maybe Opera head fix
! 05-05-03: Changed a lot of head stuff, got rid of abs positioning
*/
--- 19,24 ----
04-19-03: Fix menu visited color on IE 6 - version accepted into POPFile 0.19
05-03-03: Center footer better and add "icon" in Mozilla, maybe Opera head fix
! 05-05-03: Changed a lot of head stuff, got rid of absolute positioning
! 05-21-03: Did what I could to fix the changes 0.19 RC3 made to the footer
*/
***************
*** 91,96 ****
td.naked {
! padding: 0;
! margin: 0;
border: 0;
}
--- 92,97 ----
td.naked {
! padding: 0;
! margin: 0;
border: 0;
}
***************
*** 285,294 ****
margin-top: 1em;
text-align: center;
! /* this seems to work in IE */
}
td.footerBody {
text-align: center;
! padding: 2px;
}
--- 286,308 ----
margin-top: 1em;
text-align: center;
! /* this works in IE 6 */
}
td.footerBody {
text-align: center;
! padding-top: 2px;
! padding-bottom: 2px;
! }
!
! table.footer br {
! display: none;
! }
!
! .bottomLink {
! margin: 1em;
! }
!
! .bottomLink img {
! display: none;
}
***************
*** 376,388 ****
/* - uncomment this section if you want On text to be bold
span.bucketsWidgetStateOn {
! font-weight: bold;
}
span.configWidgetStateOn {
! font-weight: bold;
}
span.securityWidgetStateOn {
! font-weight: bold;
}
*/
--- 390,402 ----
/* - uncomment this section if you want On text to be bold
span.bucketsWidgetStateOn {
! font-weight: bold;
}
span.configWidgetStateOn {
! font-weight: bold;
}
span.securityWidgetStateOn {
! font-weight: bold;
}
*/
|
|
From: <jgr...@us...> - 2003-06-17 17:24:47
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv8992 Modified Files: Dansk.msg Log Message: Danish UI now accesses Danish manual Index: Dansk.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Dansk.msg,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Dansk.msg 17 Jun 2003 17:20:20 -0000 1.11 --- Dansk.msg 17 Jun 2003 17:24:44 -0000 1.12 *************** *** 6,10 **** # This is used to get the appropriate subdirectory for the manual ! ManualLanguage en # Common words that are used on their own all over the interface --- 6,10 ---- # This is used to get the appropriate subdirectory for the manual ! ManualLanguage da # Common words that are used on their own all over the interface |
|
From: <jgr...@us...> - 2003-06-17 17:21:45
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv8384/UI
Modified Files:
HTML.pm
Log Message:
Add html:fontcolor pseudoword, fix regular expression in compare_mf so that it's less greedy
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** HTML.pm 14 Jun 2003 21:10:12 -0000 1.169
--- HTML.pm 17 Jun 2003 17:21:38 -0000 1.170
***************
*** 2228,2236 ****
my $bm;
! if ( $a =~ /popfile(.+)=(.+)\.msg/ ) {
$ad = $1;
$am = $2;
! if ( $b =~ /popfile(.+)=(.+)\.msg/ ) {
$bd = $1;
$bm = $2;
--- 2228,2236 ----
my $bm;
! if ( $a =~ /popfile(\d+)=(\d+)\.msg/ ) {
$ad = $1;
$am = $2;
! if ( $b =~ /popfile(\d+)=(\d+)\.msg/ ) {
$bd = $1;
$bm = $2;
|
|
From: <jgr...@us...> - 2003-06-17 17:21:41
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv8384/Classifier
Modified Files:
MailParse.pm
Log Message:
Add html:fontcolor pseudoword, fix regular expression in compare_mf so that it's less greedy
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** MailParse.pm 14 Jun 2003 21:10:12 -0000 1.133
--- MailParse.pm 17 Jun 2003 17:21:38 -0000 1.134
***************
*** 66,70 ****
$self->{quickmagnets__} = {};
! # These store the current HTML background color and font color to
# detect "invisible ink" used by spammers
--- 66,70 ----
$self->{quickmagnets__} = {};
! # These store the current HTML background color2 and font color to
# detect "invisible ink" used by spammers
***************
*** 524,527 ****
--- 524,528 ----
if ( ( $attribute =~ /^color$/i ) && ( $tag =~ /^font$/i ) ) {
update_word( $self, $value, $encoded, $quote, $end_quote, '' );
+ $self->update_pseudoword( 'html', "fontcolor$value", $encoded, $original );
$self->{htmlfontcolor__} = map_color($self, $value);
print "Set html font color to $self->{htmlfontcolor__}\n" if ( $self->{debug} );
***************
*** 529,532 ****
--- 530,534 ----
if ( ( $attribute =~ /^text$/i ) && ( $tag =~ /^body$/i ) ) {
+ $self->update_pseudoword( 'html', "fontcolor$value", $encoded, $original );
update_word( $self, $value, $encoded, $quote, $end_quote, '' );
$self->{htmlfontcolor__} = map_color($self, $value);
***************
*** 551,554 ****
--- 553,557 ----
if ( ( $attribute =~ /^(bgcolor|back)$/i ) && ( $tag =~ /^(td|table|body|tr|th|font)$/i ) ) {
update_word( $self, $value, $encoded, $quote, $end_quote, '' );
+ $self->update_pseudoword( 'html', "backcolor$value" );
$self->{htmlbackcolor__} = map_color($self, $value);
print "Set html back color to $self->{htmlbackcolor__}\n" if ( $self->{debug} );
|
|
From: <jgr...@us...> - 2003-06-17 17:20:23
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv8223 Modified Files: Dansk.msg Deutsch.msg Português.msg Added Files: Nihongo.msg Log Message: Added Japanese translation; updated Portugese, German and Danish --- NEW FILE: Nihongo.msg --- # Copyright (c) 2001-2003 John Graham-Cumming # Identify the language and character set used for the interface LanguageCode jp LanguageCharset EUC-JP # This is used to get the appropriate subdirectory for the manual ManualLanguage en # Common words that are used on their own all over the interface Apply ŬÍÑ On ¥ª¥ó Off ¥ª¥Õ TurnOn ¥ª¥ó¤Ë¤¹¤ë TurnOff ¥ª¥Õ¤Ë¤¹¤ë Add Äɲà Remove ºï½ü Previous Á°¤Ø Next ¼¡¤Ø From º¹½Ð¿Í Subject ·ï̾ Cc Cc Classification ʬÎà Reclassify ºÆʬÎà Probability ²ÄǽÀ Scores ÆÀÅÀ QuickMagnets ¥¯¥¤¥Ã¥¯¥Þ¥°¥Í¥Ã¥È Undo ¤ä¤êľ¤· Close ÊĤ¸¤ë Find ¸¡º÷ Filter ¥Õ¥£¥ë¥¿¡¼ Yes ¤Ï¤¤ No ¤¤¤¤¤¨ ChangeToYes ¡Ö¤Ï¤¤¡×¤ËÊѹ¹ ChangeToNo ¡Ö¤¤¤¤¤¨¡×¤ËÊѹ¹ Bucket ¥Ð¥±¥Ä Magnet ¥Þ¥°¥Í¥Ã¥È Delete ºï½ü Create ºîÀ® To °¸¤ÆÀè Total ¹ç·× Rename ̾Á°Êѹ¹ Frequency ÉÑÅÙ Probability ²ÄǽÀ Score ÆÀÅÀ Lookup ¸¡ºº Word ñ¸ì Count ¥«¥¦¥ó¥È Update ¹¹¿· Refresh ºÇ¿·¤Î¾õÂ֤˹¹¿· # The header and footer that appear on every UI page Header_Title POPFile ¥³¥ó¥È¥í¡¼¥ë¥»¥ó¥¿¡¼ Header_Shutdown POPFile ¤ÎÄä»ß Header_History ÍúÎò Header_Buckets ¥Ð¥±¥Ä Header_Configuration ÀßÄê Header_Advanced ³ÈÄ¥µ¡Ç½ Header_Security ¥»¥¥å¥ê¥Æ¥£ Header_Magnets ¥Þ¥°¥Í¥Ã¥È Footer_HomePage POPFile ¥Û¡¼¥à¥Ú¡¼¥¸ Footer_Manual ¥Þ¥Ë¥å¥¢¥ë Footer_Forums ¥Õ¥©¡¼¥é¥à Footer_FeedMe ´óÉÕ Footer_RequestFeature Í×˾ Footer_MailingList ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È Configuration_Error1 ¶èÀÚ¤êʸ»ú¤Ï1ʸ»ú¤À¤±¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_Error2 ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹Íѥݡ¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_Error3 POP3 ¥Ý¡¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_Error4 ¥Ú¡¼¥¸¥µ¥¤¥º¤Ï1¤«¤é1000¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_Error5 ÍúÎò¤ò»Ä¤¹Æü¿ô¤Ï1¤«¤é366¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_Error6 TCP ¥¿¥¤¥à¥¢¥¦¥È¤Ï10¤«¤é300¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_Error7 XML RPC ¥Ý¡¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Configuration_POP3Port POP3 ¥Ý¡¼¥ÈÈÖ¹æ Configuration_POP3Update POP3 ¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Configuration_XMLRPCUpdate XML-RPC ¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Configuration_XMLRPCPort XML-RPC ¥Ý¡¼¥ÈÈÖ¹æ Configuration_SMTPPort SMTP ¥Ý¡¼¥ÈÈÖ¹æ Configuration_SMTPUpdate SMTP ¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Configuration_NNTPPort NNTP ¥Ý¡¼¥ÈÈÖ¹æ Configuration_NNTPUpdate NNTP ¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Configuration_POP3Separator POP3 host:port:user ¶èÀÚ¤êʸ»ú Configuration_NNTPSeparator NNTP host:port:user ¶èÀÚ¤êʸ»ú Configuration_POP3SepUpdate POP3 ¶èÀÚ¤êʸ»ú¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_NNTPSepUpdate NNTP ¶èÀÚ¤êʸ»ú¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_UI ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹Íѥݡ¼¥ÈÈÖ¹æ Configuration_UIUpdate ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹Íѥݡ¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Configuration_History 1¥Ú¡¼¥¸¤Ëɽ¼¨¤¹¤ë¥á¡¼¥ë¤Î¿ô Configuration_HistoryUpdate 1¥Ú¡¼¥¸¤Ëɽ¼¨¤¹¤ë¥á¡¼¥ë¤Î¿ô¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_Days ÍúÎò¤ò»Ä¤¹Æü¿ô Configuration_DaysUpdate ÍúÎò¤ò»Ä¤¹Æü¿ô¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_UserInterface ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹ Configuration_Skins ¥¹¥¥ó Configuration_SkinsChoose ¥¹¥¥ó¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤ Configuration_Language ¸À¸ì Configuration_LanguageChoose ¸À¸ì¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤ Configuration_ListenPorts ¥Ý¡¼¥ÈÈÖ¹æ Configuration_HistoryView ÍúÎò Configuration_TCPTimeout TCP ¥³¥Í¥¯¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È Configuration_TCPTimeoutSecs TCP ¥³¥Í¥¯¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È¤ÎÉÿô Configuration_TCPTimeoutUpdate TCP ¥³¥Í¥¯¥·¥ç¥ó¥¿¥¤¥à¥¢¥¦¥È¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Configuration_ClassificationInsertion ÅŻҥ᡼¥ë¤Ø¤Î¥Æ¥¥¹¥ÈÁÞÆþµ¡Ç½ Configuration_SubjectLine ·ï̾¤ÎÊѹ¹ Configuration_XTCInsertion X-Text-Classification ¥Ø¥Ã¥À¡¼ Configuration_XPLInsertion X-POPFile-Link ¥Ø¥Ã¥À¡¼ Configuration_Logging ¥í¥° Configuration_None ¤Ê¤· Configuration_ToScreen ¥³¥ó¥½¡¼¥ë Configuration_ToFile ¥Õ¥¡¥¤¥ë Configuration_ToScreenFile ¥³¥ó¥½¡¼¥ë¤È¥Õ¥¡¥¤¥ë Configuration_LoggerOutput ¥í¥°½ÐÎÏ Configuration_GeneralSkins ¥¹¥¥ó Configuration_SmallSkins ¾®¥¹¥¥ó Configuration_TinySkins ºÇ¾®¥¹¥¥ó Configuration_CurrentLogFile <¸½ºß¤Î¥í¥°¥Õ¥¡¥¤¥ë> Advanced_Error1 '%s' ¤Ï´û¤Ë̵»ë¤¹¤ëñ¸ì¤Î¥ê¥¹¥È¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ Advanced_Error2 ̵»ë¤¹¤ëñ¸ì¤Ï¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤«¿ô»ú¡¢.(¥Ô¥ê¥ª¥É)¡¢_(¥¢¥ó¥À¡¼¥¹¥³¥¢)¡¢-(¥Ï¥¤¥Õ¥ó)¡¢¤Þ¤¿¤Ï @ ¤Î¤ß´Þ¤à¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Advanced_Error3 '%s' ¤ò̵»ë¤¹¤ëñ¸ì¤Î¥ê¥¹¥È¤ËÄɲä·¤Þ¤·¤¿¡£ Advanced_Error4 '%s' ¤Ï̵»ë¤¹¤ëñ¸ì¤Î¥ê¥¹¥È¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ Advanced_Error5 '%s' ¤ò̵»ë¤¹¤ëñ¸ì¤Î¥ê¥¹¥È¤«¤éºï½ü¤·¤Þ¤·¤¿¡£ Advanced_StopWords ̵»ë¤¹¤ëñ¸ì Advanced_Message1 POPFile ¤Ï°Ê²¼¤ÎÉÑÈˤ˻Ȥï¤ì¤ëñ¸ì¤ò̵»ë¤·¤Þ¤¹¡£ Advanced_AddWord ñ¸ìÄɲà Advanced_RemoveWord ñ¸ìºï½ü History_Filter (<font color="%s">%s </font>¥Ð¥±¥Ã¥È¤Î¤ß¤òɽ¼¨) History_FilterBy ¥Õ¥£¥ë¥¿¥ê¥ó¥° History_Search (º¹½Ð¿Í/·ï̾ ¤ò¸¡º÷: %s) History_Title ºÇ¶á¤Î¥á¥Ã¥»¡¼¥¸ History_Jump ¼¡¤Î¥á¥Ã¥»¡¼¥¸¤Ë¥¸¥ã¥ó¥× History_ShowAll Á´¤Æɽ¼¨ History_ShouldBe ºÆʬÎàÀè History_NoFrom º¹½Ð¿Í¤Ê¤· History_NoSubject ·ï̾¤Ê¤· History_ClassifyAs ʬÎàÀè History_MagnetUsed ¥Þ¥°¥Í¥Ã¥È»ÈÍÑ History_MagnetBecause <b>¥Þ¥°¥Í¥Ã¥È»ÈÍÑ</b><p><font color="%s">%s</font> ¤ËʬÎव¤ì¤Þ¤·¤¿¡£(¥Þ¥°¥Í¥Ã¥È %s ¤Î¤¿¤á)</p> History_ChangedTo Êѹ¹Àè <font color="%s">%s History_Already <font color="%s">%s</font> ¤È¤·¤Æ´û¤ËʬÎव¤ì¤Þ¤·¤¿ History_RemoveAll Á´¤Æºï½ü History_RemovePage ¤³¤Î¥Ú¡¼¥¸¤òºï½ü History_Remove ÍúÎò¤«¤é¥á¥Ã¥»¡¼¥¸¤òºï½ü History_SearchMessage º¹½Ð¿Í/·ï̾ ¤ò¸¡º÷ History_NoMessages ³ºÅö¥á¥Ã¥»¡¼¥¸¤Ï¤¢¤ê¤Þ¤»¤ó History_ShowMagnet ¥Þ¥°¥Í¥Ã¥È History_ShowNoMagnet Èó¥Þ¥°¥Í¥Ã¥È History_Magnet (¥Þ¥°¥Í¥Ã¥ÈʬÎव¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Î¤ß¤òɽ¼¨) History_NoMagnet (¥Þ¥°¥Í¥Ã¥ÈʬÎव¤ì¤Ê¤«¤Ã¤¿¥á¥Ã¥»¡¼¥¸¤Î¤ß¤òɽ¼¨) History_ResetSearch ¥ê¥»¥Ã¥È Password_Title ¥Ñ¥¹¥ï¡¼¥É Password_Enter ¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ Password_Go ¥í¥°¥¤¥ó Password_Error1 ¥Ñ¥¹¥ï¡¼¥É¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹ Security_Error1 ǧ¾Ú¥Ý¡¼¥ÈÈÖ¹æ¤Ï1¤«¤é65535¤Þ¤Ç¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ Security_Stealth ¥¹¥Æ¥ë¥¹¥â¡¼¥É/¥µ¡¼¥Ð¡¼¥ª¥Ú¥ì¡¼¥·¥ç¥ó Security_NoStealthMode ¤¤¤¤¤¨ (¥¹¥Æ¥ë¥¹¥â¡¼¥É) Security_ExplainStats (POPFile ¤ÏËèÆü°ì²ó¡¢°Ê²¼¤Î»°¤Ä¤Î¥Ç¡¼¥¿¤ò www.usethesource.com ¾å¤Î¥¹¥¯¥ê¥×¥È¤ËÁ÷¤ê¤Þ¤¹¡£: bc (¥Ð¥±¥Ä¤ÎÁí¿ô)¡¢mc (POPFile ¤¬Ê¬Îष¤¿¥á¥Ã¥»¡¼¥¸¤ÎÁí¿ô)¡¢ec (ʬÎ२¥é¡¼¤ÎÁí¿ô)¡£¤³¤ì¤é¤Ï¥Õ¥¡¥¤¥ë¤ËµÏ¿¤µ¤ì¡¢POPFile ¤¬¤É¤Î¤è¤¦¤Ë»ÈÍѤµ¤ì¡¢¤É¤ÎÄøÅ٤θú²Ì¤ò¤¢¤²¤Æ¤¤¤ë¤Î¤«¤ò¼¨¤¹Åý·×¾ðÊó¤È¤·¤Æ¸ø³«¤µ¤»¤Æ¤¤¤¿¤À¤¤Þ¤¹¡£»ÈÍѤ·¤Æ¤¤¤Þ¤¹ Web ¥µ¡¼¥Ð¡¼¤Ï¤³¤ì¤é¤Î¥í¥°¥Õ¥¡¥¤¥ë¤òÌó¸ÞÆü´ÖÊݸ¤·¤¿¤¢¤È¡¢ºï½ü¤·¤Þ¤¹¡£¤³¤ì¤é¤ÎÅý·×Ãͤò IP ¥¢¥É¥ì¥¹¤È´ØÏ¢ÉÕ¤±¤ÆÊݸ¤·¤¿¤ê¤Ï¤¤¤Ã¤µ¤¤¤¤¤¿¤·¤Þ¤»¤ó¡£) Security_ExplainUpdate (POPFile ¤ÏËèÆü°ì²ó¡¢°Ê²¼¤Î»°¤Ä¤Î¥Ç¡¼¥¿¤ò www.usethesource.com ¾å¤Î¥¹¥¯¥ê¥×¥È¤ËÁ÷¤ê¤Þ¤¹¡£: ma (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥óÈÖ¹æ)¡¢mi (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥óÈÖ¹æ)¡¢bn (¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë POPFile ¤Î¥Ó¥ë¥ÉÈÖ¹æ)¡£¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤ë¤È¡¢POPFile ¤Ï¤½¤Î¾ðÊó¤ò¼õ¤±¤Æ¥Ú¡¼¥¸¤Î¾åÉô¤Ë¥°¥é¥Õ¥£¥Ã¥¯¤òɽ¼¨¤·¤Æ¤ªÃΤ餻¤·¤Þ¤¹¡£»ÈÍѤ·¤Æ¤¤¤Þ¤¹ Web ¥µ¡¼¥Ð¡¼¤Ï¤³¤ì¤é¤Î¥í¥°¥Õ¥¡¥¤¥ë¤òÌó¸ÞÆü´ÖÊݸ¤·¤¿¤¢¤È¡¢ºï½ü¤·¤Þ¤¹¡£¤³¤ì¤é¤Î¹¹¿·¥Á¥§¥Ã¥¯¤Ë»ÈÍѤ·¤¿¥Ç¡¼¥¿¤ò IP ¥¢¥É¥ì¥¹¤È´ØÏ¢ÉÕ¤±¤ÆÊݸ¤·¤¿¤ê¤Ï¤¤¤Ã¤µ¤¤¤¤¤¿¤·¤Þ¤»¤ó¡£) Security_PasswordTitle ¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¥Ñ¥¹¥ï¡¼¥É Security_Password ¥Ñ¥¹¥ï¡¼¥É Security_PasswordUpdate ¥Ñ¥¹¥ï¡¼¥É¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿ Security_AUTHTitle ¥ê¥â¡¼¥È¥µ¡¼¥Ð¡¼ Security_SecureServer ¡¡POP3 SPA/AUTH ¥µ¡¼¥Ð¡¼ Security_SecureServerUpdate POP3 SPA/AUTH ¥µ¡¼¥Ð¡¼¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Security_SecurePort POP3 SPA/AUTH ¥Ý¡¼¥ÈÈÖ¹æ Security_SecurePortUpdate POP3 SPA/AUTH ¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Security_SMTPServer SMTP ¥Á¥§¡¼¥ó¥µ¡¼¥Ð¡¼ Security_SMTPServerUpdate SMTP ¥Á¥§¡¼¥ó¥µ¡¼¥Ð¡¼¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Security_SMTPPort SMTP ¥Á¥§¡¼¥ó¥Ý¡¼¥ÈÈÖ¹æ Security_SMTPPortUpdate SMTP ¥Á¥§¡¼¥ó¥Ý¡¼¥ÈÈÖ¹æ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£¤³¤ÎÊѹ¹¤Ï POPFile ¤òºÆµ¯Æ°¤¹¤ë¤Þ¤Ç͸ú¤Ë¤Ê¤ê¤Þ¤»¤ó¡£ Security_POP3 ¥ê¥â¡¼¥È¥Þ¥·¥ó¤«¤é¤Î POP3 Àܳ¤òǧ¤á¤ë (POPFile ¤ÎºÆµ¯Æ°¤¬É¬Í×) Security_SMTP ¥ê¥â¡¼¥È¥Þ¥·¥ó¤«¤é¤Î SMTP Àܳ¤òǧ¤á¤ë (POPFile ¤ÎºÆµ¯Æ°¤¬É¬Í×) Security_NNTP ¥ê¥â¡¼¥È¥Þ¥·¥ó¤«¤é¤Î NNTP Àܳ¤òǧ¤á¤ë (POPFile ¤ÎºÆµ¯Æ°¤¬É¬Í×) Security_UI ¥ê¥â¡¼¥È¥Þ¥·¥ó¤«¤é¤Î HTTP Àܳ(¥æ¡¼¥¶¡¼¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤ÎÍøÍÑ)¤òǧ¤á¤ë (POPFile ¤ÎºÆµ¯Æ°¤¬É¬Í×) Security_XMLRPC ¥ê¥â¡¼¥È¥Þ¥·¥ó¤«¤é¤Î XML-RPC Àܳ¤òǧ¤á¤ë (POPFile ¤ÎºÆµ¯Æ°¤¬É¬Í×) Security_UpdateTitle ¹¹¿·¼«Æ°¥Á¥§¥Ã¥¯ Security_Update POPFile ¤¬¹¹¿·¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«ËèÆü¥Á¥§¥Ã¥¯¤·¤Þ¤¹ Security_StatsTitle Åý·×¾ðÊó¥ì¥Ý¡¼¥È Security_Stats Åý·×¾ðÊó¤òËèÆüÁ÷¤ë Magnet_Error1 ¥Þ¥°¥Í¥Ã¥È '%s' ¤Ë¤Ï´û¤Ë¥Ð¥±¥Ä '%s' ¤ò³ä¤êÅö¤Æ¤Æ¤¤¤Þ¤¹¡£ Magnet_Error2 ¿·µ¬¥Þ¥°¥Í¥Ã¥È '%s' ¤Ï´û¤Ë¤¢¤ë¥Þ¥°¥Í¥Ã¥È '%s' (¥Ð¥±¥Ä '%s' ¤¬³ä¤êÅö¤Æ¤é¤ì¤Æ¤¤¤Þ¤¹) ¤È¾×Æͤ¹¤ë¤¿¤á¡¢Àµ¤·¤¤½èÍý¤ò¤ª¤³¤Ê¤¦¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£¿·µ¬¥Þ¥°¥Í¥Ã¥È¤ÏÄɲä·¤Þ¤»¤ó¤Ç¤·¤¿¡£ Magnet_Error3 ¿·µ¬¥Þ¥°¥Í¥Ã¥È '%s' ¤Ë¥Ð¥±¥Ä '%s' ¤ò³ä¤êÅö¤Æ¤Þ¤·¤¿¡£ Magnet_CurrentMagnets ¸½ºß¤Î¥Þ¥°¥Í¥Ã¥È Magnet_Message1 ¼¡¤Î¥Þ¥°¥Í¥Ã¥È¤Ë¤è¤ê¡¢¥á¡¼¥ë¤ò¾ï¤ËÆÃÄê¤Î¥Ð¥±¥Ä¤ËʬÎष¤Þ¤¹¡£ Magnet_CreateNew ¿·µ¬¥Þ¥°¥Í¥Ã¥ÈºîÀ® Magnet_Explanation ¥Þ¥°¥Í¥Ã¥È¤Ë¤Ï»°¤Ä¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹:</b> <ul><li><b>º¹½Ð¿Í¤Î¥¢¥É¥ì¥¹¤Þ¤¿¤Ï̾Á°:</b> Îã: jo...@co... ¤Î¤è¤¦¤ËÆÃÄê¤Î¥¢¥É¥ì¥¹¤¬¥Þ¥Ã¥Á¤¹¤ë¡¢<br />company.com ¤Î¤è¤¦¤Ë company.com ¤Ë°¤¹¤ëÁ´¤Æ¤Î¿Í¤¿¤Á¤¬¥Þ¥Ã¥Á¤¹¤ë¡¢<br />John Doe ¤Î¤è¤¦¤ËÆÃÄê¤Î¿Í¤¬¥Þ¥Ã¥Á¤¹¤ë¡¢John ¤Î¤è¤¦¤ËJohn ¤È¤¤¤¦Ì¾Á°¤ò»ý¤ÄÁ´¤Æ¤Î¿Í¤¿¤Á¤¬¥Þ¥Ã¥Á¤¹¤ë¡£</li><li><b>°¸Àè¤Î¥¢¥É¥ì¥¹¤Þ¤¿¤Ï̾Á°:</b> From: magnet ¤ÈƱÍͤǤ¹¤¬¥á¡¼¥ë¤Î To: ¥¢¥É¥ì¥¹¤¬ÂоݤǤ¹¡£</li> <li><b>·ï̾¤Ë´Þ¤Þ¤ì¤ëñ¸ì:</b> Îã: hello ¤È¤¹¤ë¤È hello ¤ò·ï̾¤Ë´Þ¤àÁ´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤¬¥Þ¥Ã¥Á¤·¤Þ¤¹¡£</li></ul> Magnet_MagnetType ¥Þ¥°¥Í¥Ã¥È¥¿¥¤¥× Magnet_Value ÃÍ Magnet_Always ʬÎàÀè¤Î¥Ð¥±¥Ä Magnet_Jump ¥Þ¥°¥Í¥Ã¥È¥Ú¡¼¥¸¤Ë¥¸¥ã¥ó¥× Bucket_Error1 ¥Ð¥±¥Ä̾¤Ë¤Ï¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤Î¾®Ê¸»ú(a ¤«¤é z ¤Þ¤Ç)¤« - (¥Ï¥¤¥Õ¥ó)¡¢¤Þ¤¿¤Ï _ (¥¢¥ó¥À¡¼¥¹¥³¥¢)¤·¤«»È¤¨¤Þ¤»¤ó¡£ Bucket_Error2 ¥Ð¥±¥Ä %s ¤Ï´û¤Ë¤¢¤ê¤Þ¤¹¡£ Bucket_Error3 ¥Ð¥±¥Ä %s ¤òºîÀ®¤·¤Þ¤·¤¿¡£ Bucket_Error4 ¥¹¥Ú¡¼¥¹¤ÏÆþÎϤ·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£ Bucket_Error5 ¥Ð¥±¥Ä %s ¤ò %s ¤ËÊѹ¹¤·¤Þ¤·¤¿¡£ Bucket_Error6 ¥Ð¥±¥Ä %s ¤òºï½ü¤·¤Þ¤·¤¿¡£ Bucket_Title ¥µ¥Þ¥ê¡¼ Bucket_BucketName ¥Ð¥±¥Ä̾ Bucket_WordCount ñ¸ì¿ô Bucket_WordCounts ñ¸ì¿ô Bucket_UniqueWords ¸ÇÍñ¸ì¿ô Bucket_SubjectModification ·ï̾¤ÎÊѹ¹ Bucket_ChangeColor ¿§¤ÎÊѹ¹ Bucket_NotEnoughData ¥Ç¡¼¥¿ÉÔ½½Ê¬ Bucket_ClassificationAccuracy ʬÎàÀºÅÙ Bucket_EmailsClassified ʬÎव¤ì¤¿¥á¡¼¥ë¿ô Bucket_EmailsClassifiedUpper ʬÎव¤ì¤¿¥á¡¼¥ë¿ô Bucket_ClassificationErrors ʬÎ२¥é¡¼¤Î¿ô Bucket_Accuracy ÀºÅÙ Bucket_ClassificationCount ʬÎà¿ô Bucket_ClassificationFP False Positives Bucket_ClassificationFN False Negatives Bucket_ResetStatistics ¥ê¥»¥Ã¥È Bucket_LastReset ºÇ¸å¤Î¥ê¥»¥Ã¥È Bucket_CurrentColor %s ¸½ºß¤Î¿§¤Ï %s Bucket_SetColorTo %s ¤Î¿§¤ò %s ¤ËÀßÄê Bucket_Maintenance ´ÉÍý Bucket_CreateBucket ¥Ð¥±¥ÄºîÀ® Bucket_DeleteBucket ¥Ð¥±¥Äºï½ü Bucket_RenameBucket ¥Ð¥±¥Ä¤Î̾Á°Êѹ¹ Bucket_Lookup ¸¡ºº Bucket_LookupMessage ¥Ð¥±¥ÄÆâ¤Çñ¸ì¤ò¸¡ºº Bucket_LookupMessage2 ¸¡ºº·ë²Ì : Bucket_LookupMostLikely <b>%s</b> ¤Ï <font color="%s">%s</font> Æâ¤Ë¤¢¤ë²ÄǽÀ¤¬Â礤¤¤Ç¤¹¡£ Bucket_DoesNotAppear <p><b>%s</b> ¤Ï¤É¤Î¥Ð¥±¥Ä¤ÎÃæ¤Ë¤â¤¢¤ê¤Þ¤»¤ó¡£ Bucket_DisabledGlobally ´°Á´Ìµ¸ú Bucket_To ¤ò Bucket_Quarantine ³ÖÎ¥ SingleBucket_Title %s ¤Î¾ÜºÙ SingleBucket_WordCount ¥Ð¥±¥ÄÆâñ¸ì¿ô SingleBucket_TotalWordCount Áíñ¸ì¿ô SingleBucket_Percentage Áí¿ô¤ËÂФ¹¤ë¥Ñ¡¼¥»¥ó¥Æ¡¼¥¸ SingleBucket_WordTable %s ¤Îñ¸ìɽ SingleBucket_Message1 ¥¢¥¹¥¿¥ê¥¹¥¯ (*) ¤¬ÉÕ¤¤¤¿Ã±¸ì¤Ï¸½ºß¤Î POPFile ¥»¥Ã¥·¥ç¥óÃæ¤ÎʬÎà¤Ë»È¤ï¤ì¤Þ¤·¤¿¡£¤¹¤Ù¤Æ¤Î¥Ð¥±¥Ä¤ËÂФ¹¤ë²ÄǽÀ¤ò¸¡ºº¤¹¤ë¤Ë¤Ïñ¸ì¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£ SingleBucket_Unique ¸ÇÍñ¸ì¿ô %s SingleBucket_ClearBucket Á´¤Æ¤Îñ¸ì¤òºï½ü Session_Title POPFile ¥»¥Ã¥·¥ç¥ó¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£ Session_Error POPFile ¥»¥Ã¥·¥ç¥ó¤Ï½ªÎ»¤·¤Þ¤·¤¿¡£¤³¤ì¤Ï¡¢POPFile ¤òµ¯Æ°¤·¤¿¤ê½ªÎ»¤·¤¿¤Î¤Ë¡¢¥Ö¥é¥¦¥¶¡¼¤ò³«¤¤¤¿¤Þ¤Þ¤Ë¤·¤Æ¤¤¤ë¤Èµ¯¤³¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£POPFile ¤ò°ú¤Â³¤»ÈÍѤ¹¤ë¤Ë¤Ï¡¢¾å¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤ë¥ê¥ó¥¯¤ÎÆâ¤Î°ì¤Ä¤ò¥¯¥ê¥Ã¥¯¤·¤Æ²¼¤µ¤¤¡£ View_Title ¥·¥ó¥°¥ë¥á¥Ã¥»¡¼¥¸¥Ó¥å¡¼ Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control center. History_MainTableSummary This table shows the sender and subject of recently received messages and allows them to be reviewed and reclassified. Clicking on the subject line will show the full message text, along with information about why it was classified as it was. The 'Should be' column allows you to specify which bucket the message belongs in, or to undo that change. The 'Delete' column allows you to delete specific messages from the history if you don't need them anymore. History_OpenMessageSummary This table contains the full text of an email message, with the words that are used for classification highlighted according to the bucket that was most relevant for each. Bucket_MainTableSummary This table provides an overview of the classification buckets. Each row shows the bucket name, the word count total for that bucket, the actual number of individual words in each bucket, whether the email's subject line will be modified when it gets classified to that bucket, whether to quarantine the messages received in that bucket, and a table to pick the color used in displaying anything related to that bucket in the control center. Bucket_StatisticsTableSummary This table provides three sets of statistics on the overall performance of POPFile. The first is how accurate its classification is, the second is how many emails have been classified, and to which buckets, and the third is how many words are in each bucket, and what their relative percentages are. Bucket_MaintenanceTableSummary This table contains forms that allow you to create, delete or rename buckets, and to lookup a word in all of the buckets to see its relative probabilities. Bucket_AccuracyChartSummary This table graphically represents the accuracy of the email classification. Bucket_BarChartSummary This table graphically represents a percentage allocation for each of the different buckets. It is used for both number of emails classified, and total word counts. Bucket_LookupResultsSummary This table shows the probabilities associated with any given word of the corpus. For each bucket, it shows the frequency that that word occurs, the probability that it will occur in that bucket, and the overall effect on the score of the bucket if that word exists in an email. Bucket_WordListTableSummary This table provides a listing of all the words for a particular bucket, organized by common first letter for each row. Magnet_MainTableSummary This table shows the list of magnets that are used to automatically classify email according to fixed rules. Each row shows how the magnet is defined, what bucket it is intended for, and a button to delete the magnet. Configuration_MainTableSummary This table contains a number of forms to allow you to control the configuration of POPFile. Configuration_InsertionTableSummary This table contains buttons that determine whether or not certain modifications are made to the headers or subject line of the email before it is passed on to the email client. Security_MainTableSummary This table provides sets of controls that affect the security of the overall configuration of POPFile, whether it should automatically check for updates to the program, and whether statistics about POPFile's performance should be sent to the central datastore of the program's author for general information. Advanced_MainTableSummary This table provides a list of words that POPFile ignores when classifying email due to their relative frequency in email in general. They are organized per row according to the first letter of the words. Index: Dansk.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Dansk.msg,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Dansk.msg 6 May 2003 23:46:30 -0000 1.10 --- Dansk.msg 17 Jun 2003 17:20:20 -0000 1.11 *************** *** 6,10 **** # This is used to get the appropriate subdirectory for the manual ! ManualLanguage da # Common words that are used on their own all over the interface --- 6,10 ---- # This is used to get the appropriate subdirectory for the manual ! ManualLanguage en # Common words that are used on their own all over the interface Index: Deutsch.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Deutsch.msg,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Deutsch.msg 6 May 2003 22:57:48 -0000 1.15 --- Deutsch.msg 17 Jun 2003 17:20:20 -0000 1.16 *************** *** 48,51 **** --- 48,52 ---- Count Anzahl Update Ändern + Refresh Aktualisieren # The header and footer that appear on every UI page *************** *** 189,198 **** Magnet_Message1 Die folgenden Magnete ordnen neue Post zwingend in eine angegebene Kategorie ein. Magnet_CreateNew Neuen Magnet erstellen ! Magnet_Explanation Drei Typen von Magneten sind verfügbar: <ul><li>Absenderadresse oder -name:</b> z.B.: ha...@fi..., um eine bestimmte Adresse zu erfassen, <br />firma.de, um jeden zu erfassen, der von firma.de sendet, <br />Hans Mustermann, um eine bestimmte Person zu erfassen; Hans erfaßt jeden Hans</li><li><b>Empfängeradresse oder -name:</b> Wie beim Absender-Magnet nur für die Empfängeradresse der Nachricht.</li><li><b>Wörter im Betreff:</b> z.B.: "Hallo", um alle Nachrichten mit "Hallo" im Betreff zu erfassen</li></ul> Magnet_MagnetType Typ des Magnets Magnet_Value Wert Magnet_Always Immer dieser Kategorie zuordnen ! Bucket_Error1 Kategorienamen können nur Kleinbuchstaben von a bis z, - oder _ enthalten Bucket_Error2 Kategoriename %s existiert bereits Bucket_Error3 Kategorie %s erstellt --- 190,200 ---- Magnet_Message1 Die folgenden Magnete ordnen neue Post zwingend in eine angegebene Kategorie ein. Magnet_CreateNew Neuen Magnet erstellen ! Magnet_Explanation Diese Arten von Magneten sind verfügbar: <ul><li>Absenderadresse oder -name:</b> z.B.: ha...@fi..., um eine bestimmte Adresse zu erfassen, <br />firma.de, um jeden zu erfassen, der von firma.de sendet, <br />Hans Mustermann, um eine bestimmte Person zu erfassen; Hans erfaßt jeden Hans</li><li><b>Empfänger/CC-Adresse oder -Name:</b> Wie beim Absender-Magnet nur für die Empfänger/CC-Adresse der Nachricht.</li><li><b>Wörter im Betreff:</b> z.B.: "Hallo", um alle Nachrichten mit "Hallo" im Betreff zu erfassen</li></ul> Magnet_MagnetType Typ des Magnets Magnet_Value Wert Magnet_Always Immer dieser Kategorie zuordnen + Magnet_Jump Gehe zu Magnet Seite ! Bucket_Error1 Kategorienamen können nur Kleinbuchstaben von a bis z, Ziffern von 0 bis 9, - oder _ enthalten Bucket_Error2 Kategoriename %s existiert bereits Bucket_Error3 Kategorie %s erstellt Index: Português.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Português.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Português.msg 11 Jun 2003 14:45:13 -0000 1.1 --- Português.msg 17 Jun 2003 17:20:20 -0000 1.2 *************** *** 20,23 **** --- 20,24 ---- From Originador Subject Assunto + Cc Cc Classification Classificação Reclassify Reclassificar *************** *** 41,44 **** --- 42,54 ---- Score Pontuação Lookup Procurar + Refresh Refrescar + Word Palavra + Update Actualizar + Count Ocorrências + Scores Classificações + QuickMagnets Criar Íman + + + View_Title Detalhes da mensagem # The header and footer that appear on every UI page *************** *** 65,73 **** Configuration_Error5 O número de dias no histórico deve ser um número entre 1 e 366 Configuration_Error6 O tempo limite TCP deve ser um número entre 10 e 300 Configuration_POP3Port Porta de escuta POP3 Configuration_POP3Update Alterada a porta para %s; esta alteração não terá efeito até que você reinicie o POPFile ! Configuration_Separator Caracter separador ! Configuration_SepUpdate Alterado o separador para %s ! Configuration_UI Porta da interface web de usuário Configuration_UIUpdate Alterada a porta da interface web do utilizador para %s; esta alteração não terá efeito até que você reinicie o POPFile Configuration_History Número de emails por página --- 75,92 ---- Configuration_Error5 O número de dias no histórico deve ser um número entre 1 e 366 Configuration_Error6 O tempo limite TCP deve ser um número entre 10 e 300 + Configuration_Error7 A porta de escuta XML RPC deve ser um número entre 1 e 65535 Configuration_POP3Port Porta de escuta POP3 Configuration_POP3Update Alterada a porta para %s; esta alteração não terá efeito até que você reinicie o POPFile ! Configuration_NNTPPort Porta de escuta NNTP ! Configuration_NNTPUpdate Alterada a porta NNTP para %s; esta alteração não terá efeito até que você reinicie o POPFile ! Configuration_SMTPPort Porta de escuta SMTP ! Configuration_SMTPUpdate Alterada a porta SMTP para %s; esta alteração não terá efeito até que você reinicie o POPFile ! Configuration_XMLRPCPort Porta de escuta XML RPC ! Configuration_XMLRPCUpdate Alterada a porta XML RPC para %s; esta alteração não terá efeito até que você reinicie o POPFile ! Configuration_POP3Separator Caracter separador POP3 (host:port:user) ! Configuration_NNTPSeparator Caracter separador NNTP (host:port:user) ! Configuration_POP3SepUpdate Alterado o separador POP3 para %s ! Configuration_NNTPSepUpdate Alterado o separador NNTP para %s ! Configuration_UI Porta da interface do utilizador (web) Configuration_UIUpdate Alterada a porta da interface web do utilizador para %s; esta alteração não terá efeito até que você reinicie o POPFile Configuration_History Número de emails por página *************** *** 98,101 **** --- 117,121 ---- Configuration_SmallSkins Aspecto pequeno Configuration_TinySkins Aspecto minúsculo + Configuration_CurrentLogFile <registo de actividade actual> Advanced_Error1 '%s' já está na lista de palavras ignoradas *************** *** 121,124 **** --- 141,145 ---- History_ClassifyAs Classificar como History_MagnetUsed Íman usado + History_MagnetBecause <b>Íman usado</b><p>Classificado em <font color="%s">%s</font> por causa do íman %s </p> History_ChangedTo Alterado para <font color="%s">%s History_Already Já reclassificado como <font color="%s">%s</font> *************** *** 128,133 **** History_SearchMessage Procurar Assunto History_NoMessages Nenhuma mensagem ! History_ShowMagnet Magnetizado ! History_Magnet (apenas mostrando mensagens classificadas por íman) Password_Title Senha --- 149,156 ---- History_SearchMessage Procurar Assunto History_NoMessages Nenhuma mensagem ! History_ShowMagnet Magnetizadas ! History_ShowNoMagnet Não magnetizadas ! History_Magnet (mensagens classificadas por íman) ! History_NoMagnet (mensagens não classificadas por íman) Password_Title Senha *************** *** 149,153 **** --- 172,183 ---- Security_SecurePort Porta segura Security_SecurePortUpdate Alterada a porta para %s; esta alteração não terá efeito até que você reinicie o POPFile + Security_SMTPServer Servidor SMTP real + Security_SMTPServerUpdate Alterado o servidor SMTP real para %s; esta alteração não terá efeito até que você reinicie o POPFile + Security_SMTPPort Porta do servidor SMTP real + Security_SMTPPortUpdate Alterada a porta do servidor SMTP real para %s; esta alteração não terá efeito até que você reinicie o POPFile Security_POP3 Aceitar conexões POP3 de máquinas remotas + Security_NNTP Aceitar conexões NNTP de máquinas remotas + Security_XMLRPC Aceitar conexões XMLRPC de máquinas remotas + Security_SMTP Aceitar conexões SMTP de máquinas remotas Security_UI Aceitar conexões HTTP (Interface de utilizador) de máquinas remotas Security_UpdateTitle Verificação Automática de Atualizações *************** *** 165,169 **** Magnet_MagnetType Tipo do íman Magnet_Value Valor ! Magnet_Always Coloca sempre no receptáculo Bucket_Error1 Nomes de receptáculos apenas podem conter as letras de a até z minúsculas mais - e _ --- 195,200 ---- Magnet_MagnetType Tipo do íman Magnet_Value Valor ! Magnet_Always Colocar sempre no receptáculo ! Magnet_Jump Detalhes do íman Bucket_Error1 Nomes de receptáculos apenas podem conter as letras de a até z minúsculas mais - e _ *************** *** 187,190 **** --- 218,223 ---- Bucket_Accuracy Exactidão Bucket_ClassificationCount Mensagens + Bucket_ClassificationFP Falsos Positivos + Bucket_ClassificationFN Falsos Negativos Bucket_ResetStatistics Reiniciar contagem Bucket_LastReset Início da contagem *************** *** 211,214 **** --- 244,251 ---- SingleBucket_Message1 Palavras com asterisco (*) foram usadas para classificação durante esta sessão do POPFile. Clique em qualquer palavra para procurar sua probabilidade para todos os receptáculos. SingleBucket_Unique %s únicas + SingleBucket_ClearBucket Apagar todas as palavras do receptáculo + + Session_Title Sessão Expirada + Session_Error A sua sessão POPFile expirou. Isto ocorre quando se reinicia o POPFile com o browser aberto. Por favor clique nos links do topo do ecran para continuar. Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control center. |
|
From: <xue...@us...> - 2003-06-16 12:38:07
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv13351
Modified Files:
installer.nsi
Log Message:
Perform shutdown only if the about to be overwritten/uninstalled version is running.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** installer.nsi 15 Jun 2003 11:48:52 -0000 1.67
--- installer.nsi 16 Jun 2003 12:38:03 -0000 1.68
***************
*** 534,538 ****
--- 534,559 ----
Push ${L_OLD_GUI}
Push ${L_RESULT}
+
+ Push ${CFG} ; a Global variable
+
+ ; If we are about to overwrite an existing version which is still running,
+ ; then one of the EXE files will be 'locked' which means we have to shutdown POPFile
+ IfFileExists "$INSTDIR\wperl.exe" 0 other_perl
+ SetFileAttributes "$INSTDIR\wperl.exe" NORMAL
+ ClearErrors
+ FileOpen ${CFG} "$INSTDIR\wperl.exe" a
+ FileClose ${CFG}
+ IfErrors attempt_shutdown
+
+ other_perl:
+ IfFileExists "$INSTDIR\perl.exe" 0 exit_now
+ SetFileAttributes "$INSTDIR\perl.exe" NORMAL
+ ClearErrors
+ FileOpen ${CFG} "$INSTDIR\perl.exe" a
+ FileClose ${CFG}
+ IfErrors 0 exit_now
+
+ attempt_shutdown:
!insertmacro MUI_INSTALLOPTIONS_READ "${L_NEW_GUI}" "ioA.ini" "UI Port" "NewStyle"
!insertmacro MUI_INSTALLOPTIONS_READ "${L_OLD_GUI}" "ioA.ini" "UI Port" "OldStyle"
***************
*** 559,562 ****
--- 580,585 ----
exit_now:
+ Pop ${CFG} ; a Global variable
+
Pop ${L_RESULT}
Pop ${L_OLD_GUI}
***************
*** 1532,1539 ****
skip_confirmation:
! ; Shutdown POPFile before uninstalling it
ClearErrors
FileOpen ${CFG} $INSTDIR\popfile.cfg r
--- 1555,1578 ----
skip_confirmation:
! ; If the POPFile we are about to uninstall is still running,
! ; then one of the EXE files will be 'locked'
+ IfFileExists "$INSTDIR\wperl.exe" 0 other_perl
+ SetFileAttributes "$INSTDIR\wperl.exe" NORMAL
+ ClearErrors
+ FileOpen ${CFG} "$INSTDIR\wperl.exe" a
+ FileClose ${CFG}
+ IfErrors attempt_shutdown
+
+ other_perl:
+ IfFileExists "$INSTDIR\perl.exe" 0 skip_shutdown
+ SetFileAttributes "$INSTDIR\perl.exe" NORMAL
ClearErrors
+ FileOpen ${CFG} "$INSTDIR\perl.exe" a
+ FileClose ${CFG}
+ IfErrors 0 skip_shutdown
+ attempt_shutdown:
+ ClearErrors
FileOpen ${CFG} $INSTDIR\popfile.cfg r
|
|
From: <xue...@us...> - 2003-06-15 11:48:56
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv16651
Modified Files:
installer.nsi
Log Message:
Further improvements to installer/uninstaller progress reports.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** installer.nsi 14 Jun 2003 23:43:41 -0000 1.66
--- installer.nsi 15 Jun 2003 11:48:52 -0000 1.67
***************
*** 543,547 ****
StrCmp ${L_OLD_GUI} "" try_other_port
! DetailPrint "Shutting down previous version of POPFile..."
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT}
--- 543,547 ----
StrCmp ${L_OLD_GUI} "" try_other_port
! DetailPrint "Shutting down previous version of POPFile using port ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT}
***************
*** 554,558 ****
StrCmp ${L_NEW_GUI} "" exit_now
! DetailPrint "Shutting down previous version of POPFile..."
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Ignore the result
--- 554,558 ----
StrCmp ${L_NEW_GUI} "" exit_now
! DetailPrint "Shutting down previous version of POPFile using port ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Ignore the result
***************
*** 1558,1562 ****
Pop ${GUI}
StrCmp ${GUI} "" skip_shutdown
! DetailPrint "Shutting down POPFile..."
NSISdl::download_quiet http://127.0.0.1:${GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
--- 1558,1562 ----
Pop ${GUI}
StrCmp ${GUI} "" skip_shutdown
! DetailPrint "Shutting down POPFile using port ${GUI}"
NSISdl::download_quiet http://127.0.0.1:${GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
***************
*** 1581,1584 ****
--- 1581,1586 ----
Delete $INSTDIR\popfile.cfg
+ IfFileExists "$INSTDIR\popfile.reg" 0 no_reg_file
+
; Read the registry settings found in popfile.reg and restore them
; it there are any. All are assumed to be in HKCU
***************
*** 1587,1590 ****
--- 1589,1593 ----
FileOpen ${CFG} $INSTDIR\popfile.reg r
IfErrors skip_registry_restore
+ DetailPrint "Opened: popfile.reg"
restore_loop:
***************
*** 1610,1615 ****
--- 1613,1620 ----
skip_registry_restore:
FileClose ${CFG}
+ DetailPrint "Closed: popfile.reg"
Delete $INSTDIR\popfile.reg
+ no_reg_file:
Delete $INSTDIR\Platform\*.pm
Delete $INSTDIR\Platform\*.dll
|
|
From: <xue...@us...> - 2003-06-15 00:37:28
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1:/tmp/cvs-serv20327 Modified Files: ioC.ini Log Message: Restore the "closing" GROUP flag (for the RadioButtons) Index: ioC.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioC.ini,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ioC.ini 14 Jun 2003 17:22:47 -0000 1.2 --- ioC.ini 15 Jun 2003 00:37:21 -0000 1.3 *************** *** 56,59 **** --- 56,60 ---- Top=75 Bottom=135 + Flags=Group [Field 6] |
|
From: <xue...@us...> - 2003-06-14 23:43:44
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv14696
Modified Files:
installer.nsi
Log Message:
Updated to match recent CVS changes (new POPFile\MQ.pm module)
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** installer.nsi 14 Jun 2003 21:37:02 -0000 1.65
--- installer.nsi 14 Jun 2003 23:43:41 -0000 1.66
***************
*** 19,23 ****
!define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.19.0 (CVS)"
!define RELEASE_NOTES "..\engine\v0.19.0.change"
--- 19,23 ----
!define MUI_PRODUCT "POPFile"
! !define MUI_VERSION "0.20.0 (CVS)"
!define RELEASE_NOTES "..\engine\v0.19.0.change"
***************
*** 322,325 ****
--- 322,326 ----
File "..\engine\Classifier\MailParse.pm"
SetOutPath $INSTDIR\POPFile
+ File "..\engine\POPFile\MQ.pm"
File "..\engine\POPFile\Logger.pm"
File "..\engine\POPFile\Module.pm"
|
|
From: <xue...@us...> - 2003-06-14 21:37:05
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv32518
Modified Files:
installer.nsi
Log Message:
Fix the bug that could stop the uninstaller restoring Outlook Express data.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** installer.nsi 14 Jun 2003 19:39:20 -0000 1.64
--- installer.nsi 14 Jun 2003 21:37:02 -0000 1.65
***************
*** 1105,1109 ****
Function StartPOPFilePage
! !insertmacro MUI_HEADER_TEXT "POPFile is now ready for use" \
"The POPFile User Interface only works if POPFile has been started"
--- 1105,1109 ----
Function StartPOPFilePage
! !insertmacro MUI_HEADER_TEXT "POPFile can now be started" \
"The POPFile User Interface only works if POPFile has been started"
***************
*** 1583,1586 ****
--- 1583,1587 ----
; it there are any. All are assumed to be in HKCU
+ ClearErrors
FileOpen ${CFG} $INSTDIR\popfile.reg r
IfErrors skip_registry_restore
|
|
From: <jgr...@us...> - 2003-06-14 21:10:15
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv29263/languages Modified Files: English.msg Log Message: Added new message queuing engine for asynchronous message passing, use it for classification data and UI registrations, remove mcount and ecount global variables, add new access to all configuration options on Advanced page Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** English.msg 20 May 2003 20:18:28 -0000 1.35 --- English.msg 14 Jun 2003 21:10:13 -0000 1.36 *************** *** 126,129 **** --- 126,133 ---- Advanced_AddWord Add word Advanced_RemoveWord Remove word + Advanced_AllParameters All POPFile Parameters + Advanced_Parameter Parameter + Advanced_Value Value + Advanced_Warning This is the complete list of POPFile parameters. Advanced users only: you may change any and click Update; there is no validity checking. History_Filter (just showing bucket <font color="%s">%s</font>) |
|
From: <jgr...@us...> - 2003-06-14 21:10:15
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv29263/Proxy
Modified Files:
NNTP.pm POP3.pm Proxy.pm SMTP.pm
Log Message:
Added new message queuing engine for asynchronous message passing, use it for classification data and UI registrations, remove mcount and ecount global variables, add new access to all configuration options on Advanced page
Index: NNTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/NNTP.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NNTP.pm 28 May 2003 20:33:20 -0000 1.10
--- NNTP.pm 14 Jun 2003 21:10:12 -0000 1.11
***************
*** 73,87 ****
# item that needs a UI component
! $self->{ui__}->register_configuration_item( 'configuration',
! 'nntp_port',
! $self );
! $self->{ui__}->register_configuration_item( 'configuration',
! 'nntp_separator',
! $self );
! $self->{ui__}->register_configuration_item( 'security',
! 'nntp_local',
! $self );
return 1;
--- 73,87 ----
# item that needs a UI component
! $self->register_configuration_item_( 'configuration',
! 'nntp_port',
! $self );
! $self->register_configuration_item_( 'configuration',
! 'nntp_separator',
! $self );
! $self->register_configuration_item_( 'security',
! 'nntp_local',
! $self );
return 1;
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** POP3.pm 14 May 2003 09:12:12 -0000 1.55
--- POP3.pm 14 Jun 2003 21:10:12 -0000 1.56
***************
*** 77,99 ****
# item that needs a UI component
! $self->{ui__}->register_configuration_item( 'configuration',
! 'pop3_port',
! $self );
! $self->{ui__}->register_configuration_item( 'configuration',
! 'pop3_separator',
! $self );
! $self->{ui__}->register_configuration_item( 'security',
! 'pop3_local',
! $self );
! $self->{ui__}->register_configuration_item( 'chain',
! 'pop3_secure_server',
! $self );
! $self->{ui__}->register_configuration_item( 'chain',
! 'pop3_secure_server_port',
! $self );
return 1;
--- 77,99 ----
# item that needs a UI component
! $self->register_configuration_item_( 'configuration',
! 'pop3_port',
! $self );
! $self->register_configuration_item_( 'configuration',
! 'pop3_separator',
! $self );
! $self->register_configuration_item_( 'security',
! 'pop3_local',
! $self );
! $self->register_configuration_item_( 'chain',
! 'pop3_secure_server',
! $self );
! $self->register_configuration_item_( 'chain',
! 'pop3_secure_server_port',
! $self );
return 1;
***************
*** 142,147 ****
# and mail accounts
my $user_command = 'USER (.+)(:(\d+))?' . $self->config_( 'separator' ) . '(.+)';
! if ( $command =~ /$user_command/i ) {
if ( $1 ne '' ) {
if ( $mail = $self->verify_connected_( $mail, $client, $1, $3 || 110 ) ) {
# Pass through the USER command with the actual user name for this server,
--- 142,148 ----
# and mail accounts
my $user_command = 'USER (.+)(:(\d+))?' . $self->config_( 'separator' ) . '(.+)';
! if ( $command =~ /$user_command/i ) {
if ( $1 ne '' ) {
+ print $pipe "LOGIN:$4$eol";
if ( $mail = $self->verify_connected_( $mail, $client, $1, $3 || 110 ) ) {
# Pass through the USER command with the actual user name for this server,
***************
*** 282,286 ****
# Tell the parent that we just handled a mail
! print $pipe "$class$eol";
}
}
--- 283,287 ----
# Tell the parent that we just handled a mail
! print $pipe "CLASS:$class$eol";
}
}
***************
*** 343,347 ****
# Tell the parent that we just handled a mail
! print $pipe "$class$eol";
$self->flush_extra_( $mail, $client, 0 );
--- 344,348 ----
# Tell the parent that we just handled a mail
! print $pipe "CLASS:$class$eol";
$self->flush_extra_( $mail, $client, 0 );
Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Proxy.pm 22 May 2003 23:33:55 -0000 1.16
--- Proxy.pm 14 Jun 2003 21:10:12 -0000 1.17
***************
*** 190,204 ****
while ( &{$self->{pipeready_}}($handle) )
{
! my $class = <$handle>;
! if ( defined( $class ) ) {
! $class =~ s/[\r\n]//g;
! $self->{classifier__}->set_bucket_parameter( $class, 'count',
! $self->{classifier__}->get_bucket_parameter( $class, 'count' ) + 1 );
! $self->global_config_( 'mcount', $self->global_config_( 'mcount' ) + 1 );
! $stats_changed = 1;
! $self->log_( "Incrementing $class" );
} else {
# This is here so that we get in errorneous position where the pipeready
--- 190,210 ----
while ( &{$self->{pipeready_}}($handle) )
{
! my $message = <$handle>;
! if ( defined( $message ) ) {
! $message =~ s/[\r\n]//g;
! if ( $message =~ /CLASS:(.*)/ ) {
! # Post a message to the MQ indicating that we just handled
! # a message with a specific classification
!
! $self->mq_post_( 'CLASS', $1, '' );
! $self->log_( "Incrementing $1" );
! }
!
! if ( $message =~ /LOGIN:(.*)/ ) {
! $self->mq_post_( 'LOGIN', $1, '' );
! }
} else {
# This is here so that we get in errorneous position where the pipeready
***************
*** 210,219 ****
}
}
-
- if ( $stats_changed ) {
- $self->{ui__}->invalidate_history_cache();
- $self->{configuration__}->save_configuration();
- $self->{classifier__}->write_parameters();
- }
}
--- 216,219 ----
***************
*** 584,609 ****
}
! # GETTERS/SETTERS
sub classifier
{
! my ( $self, $value ) = @_;
!
! if ( defined( $value ) ) {
! $self->{classifier__} = $value;
! }
!
! return $self->{classifier__};
! }
!
! sub ui
! {
! my ( $self, $value ) = @_;
!
! if ( defined( $value ) ) {
! $self->{ui__} = $value;
! }
! return $self->{ui__};
}
--- 584,594 ----
}
! # SETTER
sub classifier
{
! my ( $self, $classifier ) = @_;
! $self->{classifier__} = $classifier;
}
Index: SMTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/SMTP.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SMTP.pm 22 May 2003 23:33:55 -0000 1.12
--- SMTP.pm 14 Jun 2003 21:10:12 -0000 1.13
***************
*** 74,92 ****
# item that needs a UI component
! $self->{ui__}->register_configuration_item( 'configuration',
! 'smtp_port',
! $self );
! $self->{ui__}->register_configuration_item( 'security',
! 'smtp_local',
! $self );
! $self->{ui__}->register_configuration_item( 'chain',
! 'smtp_server',
! $self );
! $self->{ui__}->register_configuration_item( 'chain',
! 'smtp_server_port',
! $self );
return 1;
--- 74,92 ----
# item that needs a UI component
! $self->register_configuration_item_( 'configuration',
! 'smtp_port',
! $self );
! $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 1;
***************
*** 218,222 ****
}
}
!
# The mail client wants to stop using the server, so send that message through to the
# real mail server, echo the response back up to the client and exit the while. We will
--- 218,222 ----
}
}
!
# The mail client wants to stop using the server, so send that message through to the
# real mail server, echo the response back up to the client and exit the while. We will
|
11 messages has been excluded from this view by a project administrator.
