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: <jgr...@us...> - 2003-06-26 14:09:04
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv17829/Classifier
Modified Files:
MailParse.pm
Log Message:
Restored test suite to working order and fix bug where wrong Date header was being picked up in quarantined headers; all tests now pass
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** MailParse.pm 25 Jun 2003 15:37:45 -0000 1.139
--- MailParse.pm 26 Jun 2003 14:09:00 -0000 1.140
***************
*** 1374,1378 ****
}
! $self->{date__} = $argument if ( $header =~ /^Date/i );
# Look for MIME
--- 1374,1378 ----
}
! $self->{date__} = $argument if ( $header =~ /^Date$/i );
# Look for MIME
|
|
From: <jgr...@us...> - 2003-06-25 21:06:38
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv18370 Modified Files: Español.msg Log Message: Another Spanish update Index: Español.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Español.msg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Español.msg 23 Jun 2003 22:33:44 -0000 1.2 --- Español.msg 25 Jun 2003 21:06:35 -0000 1.3 *************** *** 78,83 **** Configuration_UI Puerto de la interfaz de usuario Configuration_UIUpdate Puerto de la interfaz de usuario actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Configuration_History Número de correos por página ! Configuration_HistoryUpdate Número de correos por página actualizado a %s Configuration_Days Número de días a guardar en la historia Configuration_DaysUpdate Número de días a guardar en la historia actualizado a %s --- 78,83 ---- Configuration_UI Puerto de la interfaz de usuario Configuration_UIUpdate Puerto de la interfaz de usuario actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Configuration_History Número de mensajes por página ! Configuration_HistoryUpdate Número de mensajes por página actualizado a %s Configuration_Days Número de días a guardar en la historia Configuration_DaysUpdate Número de días a guardar en la historia actualizado a %s *************** *** 87,95 **** Configuration_Language Languaje Configuration_LanguageChoose Escoger languaje ! Configuration_ListenPorts Puertos de escucha Configuration_HistoryView Vista de la Historia ! Configuration_TCPTimeout Tiempo límite de la conexión TCP ! Configuration_TCPTimeoutSecs Tiempo límite de la conexión TCP en segundos ! Configuration_TCPTimeoutUpdate Tiempo límite de la conexión TCP actualizado a %s Configuration_ClassificationInsertion Inserción de la Clasificación Configuration_SubjectLine Modificación del Asunto --- 87,95 ---- Configuration_Language Languaje Configuration_LanguageChoose Escoger languaje ! Configuration_ListenPorts Opciones del módulo Configuration_HistoryView Vista de la Historia ! Configuration_TCPTimeout Tiempo límite de la conexión ! Configuration_TCPTimeoutSecs Tiempo límite de la conexión en segundos ! Configuration_TCPTimeoutUpdate Tiempo límite de la conexión actualizado a %s Configuration_ClassificationInsertion Inserción de la Clasificación Configuration_SubjectLine Modificación del Asunto *************** *** 157,161 **** Password_Error1 Contraseña Incorrecta ! Security_Error1 El puerto seguro debe ser un número entre 1 and 65535 Security_Stealth Modo Invisible/Operación del Servidor Security_NoStealthMode No (Modo invisible) --- 157,161 ---- Password_Error1 Contraseña Incorrecta ! Security_Error1 El puerto debe ser un número entre 1 and 65535 Security_Stealth Modo Invisible/Operación del Servidor Security_NoStealthMode No (Modo invisible) *************** *** 165,169 **** Security_Password Contraseña Security_PasswordUpdate Contraseña actualizada a %s ! Security_AUTHTitle Autentificación segura de Contraseña/AUTH Security_SecureServer Sevidor POP3 SPA/AUTH seguro Security_SecureServerUpdate Sevidor POP3 SPA/AUTH seguro actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado --- 165,169 ---- Security_Password Contraseña Security_PasswordUpdate Contraseña actualizada a %s ! Security_AUTHTitle Servidores Remotos Security_SecureServer Sevidor POP3 SPA/AUTH seguro Security_SecureServerUpdate Sevidor POP3 SPA/AUTH seguro actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado *************** *** 204,209 **** Bucket_Title Resumen Bucket_BucketName Nombre de Categoría ! Bucket_WordCount Conteo de Palabras ! Bucket_WordCounts Conteos de Palabras Bucket_UniqueWords Palabras Únicas Bucket_SubjectModification Modificación del Asunto --- 204,209 ---- Bucket_Title Resumen Bucket_BucketName Nombre de Categoría ! Bucket_WordCount Total (Palabras) ! Bucket_WordCounts Total (Palabras) Bucket_UniqueWords Palabras Únicas Bucket_SubjectModification Modificación del Asunto *************** *** 211,219 **** Bucket_NotEnoughData Faltan datos Bucket_ClassificationAccuracy Precisión de la Clasificación ! Bucket_EmailsClassified Correos Clasificados ! Bucket_EmailsClassifiedUpper Correos Clasificados Bucket_ClassificationErrors Errores de Clasificación Bucket_Accuracy Precisión ! Bucket_ClassificationCount Conteo de Clasificación Bucket_ResetStatistics Reiniciar Estadísticas Bucket_LastReset Último reinicio --- 211,219 ---- Bucket_NotEnoughData Faltan datos Bucket_ClassificationAccuracy Precisión de la Clasificación ! Bucket_EmailsClassified Mensajes Clasificados ! Bucket_EmailsClassifiedUpper Mensajes Clasificados Bucket_ClassificationErrors Errores de Clasificación Bucket_Accuracy Precisión ! Bucket_ClassificationCount Total Clasificados Bucket_ResetStatistics Reiniciar Estadísticas Bucket_LastReset Último reinicio *************** *** 236,244 **** SingleBucket_Title Detalles para %s ! SingleBucket_WordCount Conteo de palabras de la Categoría ! SingleBucket_TotalWordCount Conteo de palabras total SingleBucket_Percentage Porcentaje del total SingleBucket_WordTable Tabla de palabras para %s ! SingleBucket_Message1 Las palabras marcadas con (*) han sido usadas para la Categoría en esta sesión de POPFile. "Pincha" en cualquier palabra para conocer su probabilidad en todas las Categorías. SingleBucket_Unique %s únicas SingleBucket_ClearBucket Borrar todas las Palabras --- 236,244 ---- SingleBucket_Title Detalles para %s ! SingleBucket_WordCount Total palabras en Categoría ! SingleBucket_TotalWordCount Total de Palabras SingleBucket_Percentage Porcentaje del total SingleBucket_WordTable Tabla de palabras para %s ! SingleBucket_Message1 "Pincha" una letra en el indice para ver las palabras que empiezan por ella. "Pincha" en cualquier palabra para conocer su probabilidad en todas las Categorías. SingleBucket_Unique %s únicas SingleBucket_ClearBucket Borrar todas las Palabras |
|
From: <jgr...@us...> - 2003-06-25 15:37:48
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv21462/Classifier
Modified Files:
MailParse.pm
Log Message:
Fix bug in calculation of htmlcolordistance (just another reason why I need to finish the test suite)
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** MailParse.pm 23 Jun 2003 20:35:05 -0000 1.138
--- MailParse.pm 25 Jun 2003 15:37:45 -0000 1.139
***************
*** 97,101 ****
$self->{htmlcolordistance__} = 0;
- compute_html_color_distance( $self );
# This is a mapping between HTML color names and HTML hexadecimal color values used by the
--- 97,100 ----
***************
*** 181,185 ****
{
my ( $self ) = @_;
! $self->{htmlcolordistance__} = compute_rgb_distance( $self->{htmlfontcolor__},
$self->{htmlbackcolor__} );
}
--- 180,184 ----
{
my ( $self ) = @_;
! $self->{htmlcolordistance__} = $self->compute_rgb_distance( $self->{htmlfontcolor__},
$self->{htmlbackcolor__} );
}
***************
*** 342,345 ****
--- 341,345 ----
# bound for tracking evil spammer tricks with similar colors
+ $self->compute_html_color_distance();
if ( $self->{htmlcolordistance__} < 100 ) {
$self->update_pseudoword( 'html', "colordistance$self->{htmlcolordistance__}", $encoded, '' );
|
|
From: <ssc...@us...> - 2003-06-25 04:20:55
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv30723
Modified Files:
Bayes.pm
Log Message:
complete API use for class files in Bayes.pm
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** Bayes.pm 24 Jun 2003 13:38:26 -0000 1.154
--- Bayes.pm 25 Jun 2003 04:20:53 -0000 1.155
***************
*** 578,582 ****
$self->{magnet_used__} = 0;
! $self->{magnet_detail__} = 0;
$self->{parser__}->parse_stream($file);
--- 578,582 ----
$self->{magnet_used__} = 0;
! $self->{magnet_detail__} = '';
$self->{parser__}->parse_stream($file);
***************
*** 1165,1175 ****
if ( !$nosave ) {
! open CLASS, ">$class_file";
! if ( $self->{magnet_used__} == 0 ) {
! print CLASS "$classification\n";
! } else {
! print CLASS "$classification MAGNET $self->{magnet_detail__}\n";
! }
! close CLASS;
}
--- 1165,1170 ----
if ( !$nosave ) {
! $class_file =~ s/^([^\/])*\///;
! $self->history_write_class($class_file, undef, $classification, undef, ($self->{magnet_used__}?$self->{magnet_detail__}:undef))
}
|
|
From: <ssc...@us...> - 2003-06-25 04:10:58
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv29379
Modified Files:
HTML.pm
Log Message:
fix single-message deletion to track change in parse_form__ behaviour
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -d -r1.172 -r1.173
*** HTML.pm 25 Jun 2003 03:52:38 -0000 1.172
--- HTML.pm 25 Jun 2003 04:10:55 -0000 1.173
***************
*** 2875,2880 ****
$self->history_undo();
! # Handle removal of one or more items from the history page, the remove_array form will contain
! # all the indexes into history_keys that need to be deleted. We pass each file that needs
# deleting into the history_delete_file helper
--- 2875,2881 ----
$self->history_undo();
! # Handle removal of one or more items from the history page, the remove_array form, if defined,
! # will contain all the indexes into history_keys that need to be deleted. If undefined, the remove
! # form element will contain the single index to be deleted. We pass each file that needs
# deleting into the history_delete_file helper
***************
*** 2887,2892 ****
# we are in control of deleting messages
! for my $i ( 0 .. $#{$self->{form_}{remove_array}} ) {
! $self->history_delete_file( $self->{history_keys__}[$self->{form_}{remove_array}[$i] - 1], 0);
}
}
--- 2888,2897 ----
# we are in control of deleting messages
! if ( defined($self->{form_}{remove_array}) ) {
! for my $i ( 0 .. $#{$self->{form_}{remove_array}} ) {
! $self->history_delete_file( $self->{history_keys__}[$self->{form_}{remove_array}[$i] - 1], 0);
! }
! } elsif ( defined($self->{form_}{remove}) ) {
! $self->history_delete_file( $self->{history_keys__}[$self->{form_}{remove} - 1], 0);
}
}
|
|
From: <ssc...@us...> - 2003-06-25 03:52:41
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv26943
Modified Files:
HTML.pm
Log Message:
Woops! Restore class file writing
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** HTML.pm 24 Jun 2003 03:28:33 -0000 1.171
--- HTML.pm 25 Jun 2003 03:52:38 -0000 1.172
***************
*** 2683,2687 ****
# Update the class file
! $self->{classifier__}->history_load_class( $mail_file, 1, $newbucket, ( $bucket || "unclassified" ) , '');
# Since we have just changed the classification of this file and it has
--- 2683,2687 ----
# Update the class file
! $self->{classifier__}->history_write_class( $mail_file, 1, $newbucket, ( $bucket || "unclassified" ) , '');
# Since we have just changed the classification of this file and it has
***************
*** 2757,2761 ****
# Update the class file
! $self->{classifier__}->history_load_class( $mail_file, 0, ( $usedtobe || "unclassified" ), '', '');
# Add message feedback
--- 2757,2761 ----
# Update the class file
! $self->{classifier__}->history_write_class( $mail_file, 0, ( $usedtobe || "unclassified" ), '', '');
# Add message feedback
|
|
From: <ssc...@us...> - 2003-06-25 01:08:59
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv8923
Modified Files:
Tag: v0/18/1
HTML.pm
Log Message:
backport jgrahamc bugfix:
Handle the case where Norton Internet Security sends through an invalid HTTP header
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.98.2.7
retrieving revision 1.98.2.8
diff -C2 -d -r1.98.2.7 -r1.98.2.8
*** HTML.pm 25 May 2003 03:10:42 -0000 1.98.2.7
--- HTML.pm 25 Jun 2003 01:08:56 -0000 1.98.2.8
***************
*** 296,300 ****
while ( <$client> ) {
$content_length = $1 if ( /Content-Length: (\d+)/i );
! last if ( !/[A-Z]/i );
}
--- 296,311 ----
while ( <$client> ) {
$content_length = $1 if ( /Content-Length: (\d+)/i );
!
! # Discovered that Norton Internet Security was adding
! # HTTP headers of the form
! #
! # ~~~~~~~~~~~~~~: ~~~~~~~~~~~~~
! #
! # which we were not recognizing as valid (surprise,
! # surprise) and this was messing about our handling
! # of POST data. Changed the end of header identification
! # to any line that does not contain a :
!
! last if ( !/:/ );
}
|
|
From: <xue...@us...> - 2003-06-24 19:52:56
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv28733
Modified Files:
installer.nsi
Log Message:
Made it easier for users to keep the 'stopwords' file up to date when upgrading POPFile.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** installer.nsi 24 Jun 2003 12:42:23 -0000 1.75
--- installer.nsi 24 Jun 2003 19:52:49 -0000 1.76
***************
*** 283,287 ****
SetDetailsPrint textonly
! DetailPrint "Checking for existing version of POPFile..."
SetDetailsPrint listonly
--- 283,287 ----
SetDetailsPrint textonly
! DetailPrint "Checking if this is an upgrade installation..."
SetDetailsPrint listonly
***************
*** 319,337 ****
File "..\engine\otto.gif"
! IfFileExists "$INSTDIR\stopwords" stopwords_found
File "..\engine\stopwords"
! Goto stopwords_done
!
! stopwords_found:
! IfFileExists "$INSTDIR\stopwords.default" 0 use_other_name
! MessageBox MB_YESNO "Copy of default 'stopwords' already exists ('stopwords.default').$\r$\n\
! $\r$\nOK to overwrite this file?$\r$\n$\r$\n\
! Click 'Yes' to overwrite, click 'No' to skip updating this file" IDNO stopwords_done
! SetFileAttributes "$INSTDIR\stopwords.default" NORMAL
!
! use_other_name:
File /oname=stopwords.default "..\engine\stopwords"
-
- stopwords_done:
FileOpen ${CFG} $PLUGINSDIR\popfile.cfg a
FileSeek ${CFG} 0 END
--- 319,339 ----
File "..\engine\otto.gif"
! IfFileExists "$INSTDIR\stopwords" 0 copy_stopwords
! MessageBox MB_YESNO "POPFile 'stopwords' file from previous installation found.$\r$\n$\r$\n\
! OK to update this 'stopwords' file ?$\r$\n$\r$\n\
! Click 'Yes' to update it (old file will be saved as 'stopwords.bak')$\r$\n$\r$\n\
! Click 'No' to keep the old file (new file will saved as 'stopwords.default')" \
! IDNO copy_default_stopwords
! IfFileExists "$INSTDIR\stopwords.bak" 0 make_backup
! SetFileAttributes "$INSTDIR\stopwords.bak" NORMAL
!
! make_backup:
! CopyFiles /SILENT /FILESONLY "$INSTDIR\stopwords" "$INSTDIR\stopwords.bak"
!
! copy_stopwords:
File "..\engine\stopwords"
!
! copy_default_stopwords:
File /oname=stopwords.default "..\engine\stopwords"
FileOpen ${CFG} $PLUGINSDIR\popfile.cfg a
FileSeek ${CFG} 0 END
***************
*** 348,355 ****
make_cfg_backup:
! CopyFiles $INSTDIR\popfile.cfg $INSTDIR\popfile.cfg.bak
update_config:
! CopyFiles $PLUGINSDIR\popfile.cfg $INSTDIR\
SetOutPath $INSTDIR\Classifier
--- 350,357 ----
make_cfg_backup:
! CopyFiles /SILENT /FILESONLY $INSTDIR\popfile.cfg $INSTDIR\popfile.cfg.bak
update_config:
! CopyFiles /SILENT /FILESONLY $PLUGINSDIR\popfile.cfg $INSTDIR\
SetOutPath $INSTDIR\Classifier
***************
*** 1797,1800 ****
--- 1799,1804 ----
RMDir /r $INSTDIR\corpus
Delete $INSTDIR\stopwords
+ Delete $INSTDIR\stopwords.bak
+ Delete $INSTDIR\stopwords.default
RMDir /r $INSTDIR\messages
|
|
From: <ssc...@us...> - 2003-06-24 16:07:24
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv26651
Modified Files:
POP3.pm
Log Message:
cleanup toptoo comments, remove some dead code
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** POP3.pm 24 Jun 2003 13:38:27 -0000 1.58
--- POP3.pm 24 Jun 2003 16:07:20 -0000 1.59
***************
*** 248,259 ****
#
# 2. The toptoo configuration controls whether email downloaded using the
! # TOP command is classified or not (note that it is *never* placed in
! # the history; with the expection of (1) above). There are two cases:
#
# 2a If toptoo is 0 then POPFile will pass a TOP from the client through
# as a TOP and do no classification on the message.
#
! # 2b If toptoo is 1 then POPFile first does a RETR on the message without
! # saving it in the history so that it can get the classification on the
# message which is stores in $class. Then it gets the message again
# by sending the TOP command and passing the result through
--- 248,260 ----
#
# 2. The toptoo configuration controls whether email downloaded using the
! # TOP command is classified or not (It may be downloaded and cached for
! # bandwidth efficiency, and thus appear in the history).
! # There are two cases:
#
# 2a If toptoo is 0 then POPFile will pass a TOP from the client through
# as a TOP and do no classification on the message.
#
! # 2b If toptoo is 1 then POPFile first does a RETR on the message and
! # saves it in the history so that it can get the classification on the
# message which is stores in $class. Then it gets the message again
# by sending the TOP command and passing the result through
***************
*** 265,271 ****
# we are guaranteed to be able to do our header modifications.
#
! # NOTE using toptoo=1 on a slow link could cause performance problems,
! # it is only intended for use where there is high bandwidth between
! # POPFile and the POP3 server.
if ( $command =~ /TOP (.*) (.*)/i ) {
--- 266,278 ----
# we are guaranteed to be able to do our header modifications.
#
! # NOTE messages retrieved using TOPTOO are visible in the history as they
! # are "cached" to avoid requiring repeated downloads if the client issues
! # a RETR for the message in the same session
! #
! # NOTE using toptoo=1 on a slow link could cause performance problems, in
! # cases where only the headers, but not classification, is required.
! # toptoo=1 is, however, appropriate for normal use via a mail client and
! # won't significantly increase bandwidth unless the mail client is selectively
! # downloading messages based on non-classification data in the TOP headers.
if ( $command =~ /TOP (.*) (.*)/i ) {
***************
*** 345,348 ****
--- 352,356 ----
my $count = $1;
my $class;
+
my $file = $self->{classifier__}->history_filename($download_count, $count);
***************
*** 355,367 ****
$self->log_( "Printing message from cache" );
- if (0) {
- # Ensure a .CRLF is on the end of the file (may be neccessary)
- open APPEND, ">>$file";
- binmode APPEND;
- print APPEND ".$eol";
- close APPEND;
- }
-
# Give the client an +OK:
print $client "+OK file data cached by POPFile$eol";
--- 363,368 ----
$self->log_( "Printing message from cache" );
# Give the client an +OK:
+
print $client "+OK file data cached by POPFile$eol";
***************
*** 380,385 ****
print $pipe "CLASS:$class$eol";
-
}
close RETRFILE;
print $client ".$eol";
--- 381,386 ----
print $pipe "CLASS:$class$eol";
}
+
close RETRFILE;
print $client ".$eol";
|
|
From: <jgr...@us...> - 2003-06-24 13:38:32
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv4895/Classifier
Modified Files:
Bayes.pm
Log Message:
Tiny bit of cleanup (mostly whitespace) on Sam's cool TOP caching fix
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** Bayes.pm 24 Jun 2003 03:30:41 -0000 1.153
--- Bayes.pm 24 Jun 2003 13:38:26 -0000 1.154
***************
*** 836,841 ****
{
my ( $self, $dcount, $mcount, $ext) = @_;
!
! return $self->global_config_( 'msgdir' ) . "popfile$dcount" . "=$mcount" . (defined $ext?$ext:".msg");
}
--- 836,841 ----
{
my ( $self, $dcount, $mcount, $ext) = @_;
!
! return $self->global_config_( 'msgdir' ) . "popfile$dcount" . "=$mcount" . (defined $ext?$ext:'.msg');
}
***************
*** 1572,1578 ****
{
my ( $self, $mail, $client, $file ) = @_;
!
# These if statements are repetitive to keep the inner loops efficient
!
if ( defined($file) && defined($client) ) {
# echo to file and stream
--- 1572,1578 ----
{
my ( $self, $mail, $client, $file ) = @_;
!
# These if statements are repetitive to keep the inner loops efficient
!
if ( defined($file) && defined($client) ) {
# echo to file and stream
***************
*** 1582,1589 ****
# Check for an abort
last if ( $self->{alive_} == 0 );
!
print $client $_;
print FILE $_;
!
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
--- 1582,1589 ----
# Check for an abort
last if ( $self->{alive_} == 0 );
!
print $client $_;
print FILE $_;
!
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
***************
*** 1598,1604 ****
# Check for an abort
last if ( $self->{alive_} == 0 );
!
! print $client $_;
!
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
--- 1598,1604 ----
# Check for an abort
last if ( $self->{alive_} == 0 );
!
! print $client $_;
!
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
***************
*** 1613,1619 ****
# Check for an abort
last if ( $self->{alive_} == 0 );
!
print FILE $_;
!
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
--- 1613,1619 ----
# Check for an abort
last if ( $self->{alive_} == 0 );
!
print FILE $_;
!
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
***************
*** 1625,1632 ****
# consume without echoing
! while ( <$mail> ) {
# Check for an abort
last if ( $self->{alive_} == 0 );
!
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
--- 1625,1632 ----
# consume without echoing
! while ( <$mail> ) {
# Check for an abort
last if ( $self->{alive_} == 0 );
!
# The termination has to be a single line with exactly a dot on it and nothing
# else other than line termination characters. This is vital so that we do
***************
*** 1634,1638 ****
last if ( /^\.(\r\n|\r|\n)$/ );
}
! }
}
--- 1634,1638 ----
last if ( /^\.(\r\n|\r|\n)$/ );
}
! }
}
|
|
From: <jgr...@us...> - 2003-06-24 13:38:31
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv4895/Proxy
Modified Files:
POP3.pm
Log Message:
Tiny bit of cleanup (mostly whitespace) on Sam's cool TOP caching fix
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** POP3.pm 24 Jun 2003 03:31:02 -0000 1.57
--- POP3.pm 24 Jun 2003 13:38:27 -0000 1.58
***************
*** 113,118 ****
{
my ( $self, $client, $download_count, $pipe ) = @_;
!
! # Hash of indexes of downloaded messages
my %downloaded;
--- 113,118 ----
{
my ( $self, $client, $download_count, $pipe ) = @_;
!
! # Hash of indexes of downloaded messages
my %downloaded;
***************
*** 272,278 ****
if ( $2 ne '99999999' ) {
if ( $self->config_( 'toptoo' ) ) {
-
my $count = $1;
!
if ( $self->echo_response_($mail, $client, "RETR $1" ) ) {
--- 272,277 ----
if ( $2 ne '99999999' ) {
if ( $self->config_( 'toptoo' ) ) {
my $count = $1;
!
if ( $self->echo_response_($mail, $client, "RETR $1" ) ) {
***************
*** 344,360 ****
# is done so that fetchmail can be used with POPFile.
if ( ( $command =~ /RETR (.*)/i ) || ( $command =~ /TOP (.*) 99999999/i ) ) {
-
my $count = $1;
my $class;
-
my $file = $self->{classifier__}->history_filename($download_count, $count);
my $short_file = $file;
$short_file =~ s/^[^\/]*\///;
!
if (defined($downloaded{$count}) && open( RETRFILE, "<$file" ) ) {
# File has been fetched and classified already
!
$self->log_( "Printing message from cache" );
!
if (0) {
# Ensure a .CRLF is on the end of the file (may be neccessary)
--- 343,358 ----
# is done so that fetchmail can be used with POPFile.
if ( ( $command =~ /RETR (.*)/i ) || ( $command =~ /TOP (.*) 99999999/i ) ) {
my $count = $1;
my $class;
my $file = $self->{classifier__}->history_filename($download_count, $count);
+
my $short_file = $file;
$short_file =~ s/^[^\/]*\///;
!
if (defined($downloaded{$count}) && open( RETRFILE, "<$file" ) ) {
# File has been fetched and classified already
!
$self->log_( "Printing message from cache" );
!
if (0) {
# Ensure a .CRLF is on the end of the file (may be neccessary)
***************
*** 380,387 ****
$class = $self->{classifier__}->classify_and_modify( \*RETRFILE, $client, $download_count, 0, 1, '' );
!
print $pipe "CLASS:$class$eol";
! }
close RETRFILE;
print $client ".$eol";
--- 378,385 ----
$class = $self->{classifier__}->classify_and_modify( \*RETRFILE, $client, $download_count, 0, 1, '' );
!
print $pipe "CLASS:$class$eol";
! }
close RETRFILE;
print $client ".$eol";
***************
*** 397,401 ****
# Tell the parent that we just handled a mail
print $pipe "CLASS:$class$eol";
!
# Note locally that file has been retrieved
$downloaded{$count} = 1;
--- 395,399 ----
# Tell the parent that we just handled a mail
print $pipe "CLASS:$class$eol";
!
# Note locally that file has been retrieved
$downloaded{$count} = 1;
|
|
From: <xue...@us...> - 2003-06-24 12:42:26
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv28548
Modified Files:
installer.nsi
Log Message:
Display a more meaningful message when user is allowed to use the 'Details' button.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** installer.nsi 24 Jun 2003 00:41:20 -0000 1.74
--- installer.nsi 24 Jun 2003 12:42:23 -0000 1.75
***************
*** 524,528 ****
SetDetailsPrint textonly
! DetailPrint ""
SetDetailsPrint listonly
--- 524,528 ----
SetDetailsPrint textonly
! DetailPrint "Click Next to continue"
SetDetailsPrint listonly
***************
*** 548,552 ****
SetDetailsPrint textonly
! DetailPrint ""
SetDetailsPrint listonly
--- 548,552 ----
SetDetailsPrint textonly
! DetailPrint "Click Next to continue"
SetDetailsPrint listonly
***************
*** 567,571 ****
SetDetailsPrint textonly
! DetailPrint ""
SetDetailsPrint listonly
--- 567,571 ----
SetDetailsPrint textonly
! DetailPrint "Click Next to continue"
SetDetailsPrint listonly
|
|
From: <ssc...@us...> - 2003-06-24 03:31:05
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv25859
Modified Files:
POP3.pm
Log Message:
make message downloading more efficient
by indexing files based on POP3 parameter
moved .cls file handling to Bayes.pm
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** POP3.pm 14 Jun 2003 21:10:12 -0000 1.56
--- POP3.pm 24 Jun 2003 03:31:02 -0000 1.57
***************
*** 113,119 ****
{
my ( $self, $client, $download_count, $pipe ) = @_;
# Number of messages downloaded in this session
! my $count = 0;
# The handle to the real mail server gets stored here
--- 113,122 ----
{
my ( $self, $client, $download_count, $pipe ) = @_;
+
+ # Hash of indexes of downloaded messages
+ my %downloaded;
# Number of messages downloaded in this session
! #my $count = 0;
# The handle to the real mail server gets stored here
***************
*** 269,278 ****
if ( $2 ne '99999999' ) {
if ( $self->config_( 'toptoo' ) ) {
if ( $self->echo_response_($mail, $client, "RETR $1" ) ) {
! # Classify without echoing to client, without saving
! # and without over-writing any files ($mcount overriden to 0)
! my $class = $self->{classifier__}->classify_and_modify( $mail, undef, $download_count, 0, 1, '', 0 );
if ( $self->echo_response_($mail, $client, $command ) ) {
--- 272,285 ----
if ( $2 ne '99999999' ) {
if ( $self->config_( 'toptoo' ) ) {
+
+ my $count = $1;
+
if ( $self->echo_response_($mail, $client, "RETR $1" ) ) {
! # Classify without echoing to client, saving file for later RETR's
! my $class = $self->{classifier__}->classify_and_modify( $mail, $client, $download_count, $count, 0, '', 0 );
!
! $downloaded{$count} = 1;
if ( $self->echo_response_($mail, $client, $command ) ) {
***************
*** 337,351 ****
# is done so that fetchmail can be used with POPFile.
if ( ( $command =~ /RETR (.*)/i ) || ( $command =~ /TOP (.*) 99999999/i ) ) {
! # Get the message from the remote server, if there's an error then we're done, but if not then
! # we echo each line of the message until we hit the . at the end
! if ( $self->echo_response_($mail, $client, $command ) ) {
! $count += 1;
! my $class = $self->{classifier__}->classify_and_modify( $mail, $client, $download_count, $count, 0, '' );
! # Tell the parent that we just handled a mail
! print $pipe "CLASS:$class$eol";
! $self->flush_extra_( $mail, $client, 0 );
next;
}
}
--- 344,407 ----
# is done so that fetchmail can be used with POPFile.
if ( ( $command =~ /RETR (.*)/i ) || ( $command =~ /TOP (.*) 99999999/i ) ) {
!
! my $count = $1;
! my $class;
!
! my $file = $self->{classifier__}->history_filename($download_count, $count);
! my $short_file = $file;
! $short_file =~ s/^[^\/]*\///;
!
! if (defined($downloaded{$count}) && open( RETRFILE, "<$file" ) ) {
! # File has been fetched and classified already
!
! $self->log_( "Printing message from cache" );
!
! if (0) {
! # Ensure a .CRLF is on the end of the file (may be neccessary)
! open APPEND, ">>$file";
! binmode APPEND;
! print APPEND ".$eol";
! close APPEND;
! }
! # Give the client an +OK:
! print $client "+OK file data cached by POPFile$eol";
! # Load the last classification
!
! my ( $reclassified, $bucket, $usedtobe, $magnet) = $self->{classifier__}->history_load_class($short_file);
!
! if ($bucket ne 'unknown class') {
! # echo file, inserting known classification, without saving
!
! $class = $self->{classifier__}->classify_and_modify( \*RETRFILE, $client, $download_count, 0, 1, $bucket );
! } else {
! # If the class wasn't saved properly, classify from disk normally
!
! $class = $self->{classifier__}->classify_and_modify( \*RETRFILE, $client, $download_count, 0, 1, '' );
!
! print $pipe "CLASS:$class$eol";
!
! }
! close RETRFILE;
! print $client ".$eol";
next;
+ } else {
+ # Retrieve file directly from the server
+
+ # Get the message from the remote server, if there's an error then we're done, but if not then
+ # we echo each line of the message until we hit the . at the end
+ if ( $self->echo_response_($mail, $client, $command ) ) {
+ $class = $self->{classifier__}->classify_and_modify( $mail, $client, $download_count, $count, 0, '' );
+
+ # Tell the parent that we just handled a mail
+ print $pipe "CLASS:$class$eol";
+
+ # Note locally that file has been retrieved
+ $downloaded{$count} = 1;
+
+ $self->flush_extra_( $mail, $client, 0 );
+ next;
+ }
}
}
|
|
From: <ssc...@us...> - 2003-06-24 03:30:45
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv25800
Modified Files:
Bayes.pm
Log Message:
make message downloading more efficient
by indexing files based on POP3 parameter
moved .cls file handling to Bayes.pm
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** Bayes.pm 23 Jun 2003 22:35:35 -0000 1.152
--- Bayes.pm 24 Jun 2003 03:30:41 -0000 1.153
***************
*** 824,827 ****
--- 824,927 ----
# ---------------------------------------------------------------------------------------------
#
+ # history_filename
+ #
+ # Returns a path and filename for a POPFile message based on the session count and message count
+ #
+ # $dcount - the unique download/session count for this message
+ # $mcount - the message count for this message
+ # $ext - the extension for this message (defaults to .msg)
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub history_filename
+ {
+ my ( $self, $dcount, $mcount, $ext) = @_;
+
+ return $self->global_config_( 'msgdir' ) . "popfile$dcount" . "=$mcount" . (defined $ext?$ext:".msg");
+ }
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # history_write_class - write the class file for a message.
+ #
+ # $filename The name of the message to write the class for
+ # $reclassified Boolean, true if the message has been reclassified
+ # $bucket the name of the bucket the message is in
+ # $usedtobe the name of the bucket the messages used to be in
+ # $magnet the magnet, if any, used to reclassify the message
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub history_write_class
+ {
+ my ( $self, $filename, $reclassified, $bucket, $usedtobe, $magnet ) = @_;
+
+ $filename =~ s/msg$/cls/;
+
+ open CLASS, '>' . $self->global_config_( 'msgdir' ) . $filename;
+
+ if ( defined( $magnet ) && ( $magnet ne '' ) ) {
+ print CLASS "$bucket MAGNET $magnet\n";
+ } elsif (defined $reclassified && $reclassified == 1) {
+ print CLASS "RECLASSIFIED\n";
+ print CLASS "$bucket\n";
+ if ( defined( $usedtobe ) && ( $usedtobe ne '' ) ) {
+ print CLASS "$usedtobe\n";
+ }
+ } else {
+ print CLASS "$bucket\n";
+ }
+
+ close CLASS;
+ }
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # history_load_class - load the class file for a message.
+ #
+ # returns: ( reclassified, bucket, usedtobe, magnet )
+ # values:
+ # reclassified: boolean, true if message has been reclassified
+ # bucket: string, the bucket the message is in presently, unknown class if an error occurs
+ # usedtobe: string, the bucket the message used to be in (null if not reclassified)
+ # magnet: string, the magnet
+ #
+ # $filename The name of the message to load the class for
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub history_load_class
+ {
+ my ( $self, $filename ) = @_;
+
+ $filename =~ s/msg$/cls/;
+
+ my $reclassified = 0;
+ my $bucket = "unknown class";
+ my $usedtobe;
+ my $magnet = '';
+
+ if ( open CLASS, '<' . $self->global_config_( 'msgdir' ) . $filename ) {
+ $bucket = <CLASS>;
+ if ( $bucket =~ /([^ ]+) MAGNET (.+)/ ) {
+ $bucket = $1;
+ $magnet = $2;
+ }
+
+ $reclassified = 0;
+ if ( $bucket =~ /RECLASSIFIED/ ) {
+ $bucket = <CLASS>;
+ $usedtobe = <CLASS>;
+ $reclassified = 1;
+ $usedtobe =~ s/[\r\n]//g;
+ }
+ close CLASS;
+ $bucket =~ s/[\r\n]//g;
+ } else {
+ $self->log_( "Error: " . $self->global_config_( 'msgdir' ) . "$filename: $!" );
+ }
+ return ( $reclassified, $bucket, $usedtobe, $magnet );
+ }
+
+
+ # ---------------------------------------------------------------------------------------------
+ #
# classify_and_modify
#
***************
*** 871,876 ****
my $getting_headers = 1;
! my $temp_file = $self->global_config_( 'msgdir' ) . "popfile$dcount" . "=$mcount.msg";
! my $class_file = $self->global_config_( 'msgdir' ) . "popfile$dcount" . "=$mcount.cls";
open TEMP, ">$temp_file";
--- 971,976 ----
my $getting_headers = 1;
! my $temp_file = $self->history_filename($dcount,$mcount, ".msg");
! my $class_file = $self->history_filename($dcount,$mcount, ".cls");
open TEMP, ">$temp_file";
***************
*** 1050,1056 ****
if ( $got_full_body == 0 ) {
if ( $echo ) {
! $self->echo_to_dot_( $mail, $client );
} else {
! $self->echo_to_dot_( $mail, undef );
}
} else {
--- 1150,1156 ----
if ( $got_full_body == 0 ) {
if ( $echo ) {
! $self->echo_to_dot_( $mail, $client, ">>" . $temp_file );
} else {
! $self->echo_to_dot_( $mail, undef, ">>" . $temp_file );
}
} else {
***************
*** 1464,1467 ****
--- 1564,1568 ----
# $mail The stream (created with IO::) to send the message to (the remote mail server)
# $client The local mail client (created with IO::) that needs the response
+ # $file a file to print the response to
#
# echo all information from the $mail server until a single line with a . is seen
***************
*** 1470,1486 ****
sub echo_to_dot_
{
! my ( $self, $mail, $client ) = @_;
! while ( <$mail> ) {
! # Check for an abort
! last if ( $self->{alive_} == 0 );
! print $client $_ if ( defined( $client ) );
! # The termination has to be a single line with exactly a dot on it and nothing
! # else other than line termination characters. This is vital so that we do
! # not mistake a line beginning with . as the end of the block
! last if ( /^\.(\r\n|\r|\n)$/ );
! }
}
--- 1571,1638 ----
sub echo_to_dot_
{
! my ( $self, $mail, $client, $file ) = @_;
!
! # These if statements are repetitive to keep the inner loops efficient
!
! if ( defined($file) && defined($client) ) {
! # echo to file and stream
! open FILE, $file;
! while ( <$mail> ) {
! # Check for an abort
! last if ( $self->{alive_} == 0 );
!
! print $client $_;
! print FILE $_;
!
! # The termination has to be a single line with exactly a dot on it and nothing
! # else other than line termination characters. This is vital so that we do
! # not mistake a line beginning with . as the end of the block
! last if ( /^\.(\r\n|\r|\n)$/ );
! }
! close FILE;
! } elsif (defined($client)) {
! # Echo only to stream
! while ( <$mail> ) {
! # Check for an abort
! last if ( $self->{alive_} == 0 );
!
! print $client $_;
!
! # The termination has to be a single line with exactly a dot on it and nothing
! # else other than line termination characters. This is vital so that we do
! # not mistake a line beginning with . as the end of the block
! last if ( /^\.(\r\n|\r|\n)$/ );
! }
! } elsif (defined($file)) {
! # Echo only to file
! open FILE, $file;
! while ( <$mail> ) {
! # Check for an abort
! last if ( $self->{alive_} == 0 );
!
! print FILE $_;
!
! # The termination has to be a single line with exactly a dot on it and nothing
! # else other than line termination characters. This is vital so that we do
! # not mistake a line beginning with . as the end of the block
! last if ( /^\.(\r\n|\r|\n)$/ );
! }
! close FILE;
! } else {
! # consume without echoing
!
! while ( <$mail> ) {
! # Check for an abort
! last if ( $self->{alive_} == 0 );
!
! # The termination has to be a single line with exactly a dot on it and nothing
! # else other than line termination characters. This is vital so that we do
! # not mistake a line beginning with . as the end of the block
! last if ( /^\.(\r\n|\r|\n)$/ );
! }
! }
}
|
|
From: <ssc...@us...> - 2003-06-24 03:28:36
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv25497
Modified Files:
HTML.pm
Log Message:
make message downloading more efficient
by indexing files based on POP3 parameter
moved .cls file handling to Bayes.pm
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** HTML.pm 17 Jun 2003 17:21:38 -0000 1.170
--- HTML.pm 24 Jun 2003 03:28:33 -0000 1.171
***************
*** 2406,2410 ****
# function, and then parse the MSG file for the From and Subject information
! my ( $reclassified, $bucket, $usedtobe, $magnet ) = $self->history_load_class( $history_files[$i] );
my $from = '';
my $subject = '';
--- 2406,2410 ----
# function, and then parse the MSG file for the From and Subject information
! my ( $reclassified, $bucket, $usedtobe, $magnet ) = $self->{classifier__}->history_load_class( $history_files[$i] );
my $from = '';
my $subject = '';
***************
*** 2613,2696 ****
}
- # ---------------------------------------------------------------------------------------------
- #
- # history_write_class - write the class file for a message.
- #
- # $filename The name of the message to write the class for
- # $reclassified Boolean, true if the message has been reclassified
- # $bucket the name of the bucket the message is in
- # $usedtobe the name of the bucket the messages used to be in
- # $magnet the magnet, if any, used to reclassify the message
- #
- # ---------------------------------------------------------------------------------------------
- sub history_write_class
- {
- my ( $self, $filename, $reclassified, $bucket, $usedtobe, $magnet ) = @_;
-
- $filename =~ s/msg$/cls/;
-
- open CLASS, '>' . $self->global_config_( 'msgdir' ) . $filename;
-
- if ( defined( $magnet ) && ( $magnet ne '' ) ) {
- print CLASS "$bucket MAGNET $magnet\n";
- } elsif (defined $reclassified && $reclassified == 1) {
- print CLASS "RECLASSIFIED\n";
- print CLASS "$bucket\n";
- if ( defined( $usedtobe ) && ( $usedtobe ne '' ) ) {
- print CLASS "$usedtobe\n";
- }
- } else {
- print CLASS "$bucket\n";
- }
-
- close CLASS;
- }
-
- # ---------------------------------------------------------------------------------------------
- #
- # history_load_class - load the class file for a message.
- #
- # returns: ( reclassified, bucket, usedtobe, magnet )
- # values:
- # reclassified: boolean, true if message has been reclassified
- # bucket: string, the bucket the message is in presently, unknown class if an error occurs
- # usedtobe: string, the bucket the message used to be in (null if not reclassified)
- # magnet: string, the magnet
- #
- # $filename The name of the message to load the class for
- #
- # ---------------------------------------------------------------------------------------------
- sub history_load_class
- {
- my ( $self, $filename ) = @_;
-
- $filename =~ s/msg$/cls/;
-
- my $reclassified = 0;
- my $bucket = "unknown class";
- my $usedtobe;
- my $magnet = '';
-
- if ( open CLASS, '<' . $self->global_config_( 'msgdir' ) . $filename ) {
- $bucket = <CLASS>;
- if ( $bucket =~ /([^ ]+) MAGNET (.+)/ ) {
- $bucket = $1;
- $magnet = $2;
- }
-
- $reclassified = 0;
- if ( $bucket =~ /RECLASSIFIED/ ) {
- $bucket = <CLASS>;
- $usedtobe = <CLASS>;
- $reclassified = 1;
- $usedtobe =~ s/[\r\n]//g;
- }
- close CLASS;
- $bucket =~ s/[\r\n]//g;
- } else {
- $self->log_( "Error: " . $self->global_config_( 'msgdir' ) . "$filename: $!" );
- }
- return ( $reclassified, $bucket, $usedtobe, $magnet );
- }
# ---------------------------------------------------------------------------------------------
--- 2613,2616 ----
***************
*** 2733,2737 ****
# Get the current classification for this message
! my ( $reclassified, $bucket, $usedtobe, $magnet) = $self->history_load_class( $mail_file );
# Only reclassify messages that havn't been reclassified before
--- 2653,2657 ----
# Get the current classification for this message
! my ( $reclassified, $bucket, $usedtobe, $magnet) = $self->{classifier__}->history_load_class( $mail_file );
# Only reclassify messages that havn't been reclassified before
***************
*** 2763,2767 ****
# Update the class file
! $self->history_write_class( $mail_file, 1, $newbucket, ( $bucket || "unclassified" ) , '');
# Since we have just changed the classification of this file and it has
--- 2683,2687 ----
# Update the class file
! $self->{classifier__}->history_load_class( $mail_file, 1, $newbucket, ( $bucket || "unclassified" ) , '');
# Since we have just changed the classification of this file and it has
***************
*** 2798,2802 ****
# Load the class file
! my ( $reclassified, $bucket, $usedtobe, $magnet ) = $self->history_load_class( $mail_file );
# Only undo if the message has been classified...
--- 2718,2722 ----
# Load the class file
! my ( $reclassified, $bucket, $usedtobe, $magnet ) = $self->{classifier__}->history_load_class( $mail_file );
# Only undo if the message has been classified...
***************
*** 2837,2841 ****
# Update the class file
! $self->history_write_class( $mail_file, 0, ( $usedtobe || "unclassified" ), '', '');
# Add message feedback
--- 2757,2761 ----
# Update the class file
! $self->{classifier__}->history_load_class( $mail_file, 0, ( $usedtobe || "unclassified" ), '', '');
# Add message feedback
***************
*** 3611,3615 ****
mkdir( $path );
! my ($reclassified, $bucket, $usedtobe, $magnet) = $self->history_load_class( $mail_file );
if ( ( $bucket ne 'unclassified' ) && ( $bucket ne 'unknown class' ) ) {
--- 3531,3535 ----
mkdir( $path );
! my ($reclassified, $bucket, $usedtobe, $magnet) = $self->{classifier__}->history_load_class( $mail_file );
if ( ( $bucket ne 'unclassified' ) && ( $bucket ne 'unknown class' ) ) {
|
|
From: <xue...@us...> - 2003-06-24 00:41:23
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv7088
Modified Files:
installer.nsi
Log Message:
Make installer/uninstaller display user-friendly progress reports.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** installer.nsi 23 Jun 2003 11:42:40 -0000 1.73
--- installer.nsi 24 Jun 2003 00:41:20 -0000 1.74
***************
*** 42,47 ****
VIAddVersionKey "FileVersion" "${MUI_VERSION}"
! VIAddVersionKey "Build Type" "CVS Build (Experimental)"
! VIAddVersionKey "Build Date" "${__DATE__} @ ${__TIME__}"
#----------------------------------------------------------------------------------------
--- 42,48 ----
VIAddVersionKey "FileVersion" "${MUI_VERSION}"
! VIAddVersionKey "Build" "CVS Build (Experimental)"
! VIAddVersionKey "Build Date/Time" "${__DATE__} @ ${__TIME__}"
! VIAddVersionKey "Build Script" "${__FILE__} (${__TIMESTAMP__})"
#----------------------------------------------------------------------------------------
***************
*** 118,122 ****
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe"
! ; Allow user to check the log file (by clicking "Show Details" button on the "Install" page)
# !define MUI_FINISHPAGE_NOAUTOCLOSE
--- 119,123 ----
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe"
! ; Debug aid: Allow log file checking (by clicking "Show Details" button on the "Install" page)
# !define MUI_FINISHPAGE_NOAUTOCLOSE
***************
*** 280,283 ****
--- 281,288 ----
SectionIn RO
+
+ SetDetailsPrint textonly
+ DetailPrint "Checking for existing version of POPFile..."
+ SetDetailsPrint listonly
; If we are installing over a previous version, (try to) ensure that version is not running
***************
*** 295,298 ****
--- 300,307 ----
; Install the POPFile Core files
+
+ SetDetailsPrint textonly
+ DetailPrint "Installing POPFile core files..."
+ SetDetailsPrint listonly
SetOutPath $INSTDIR
***************
*** 372,375 ****
--- 381,388 ----
; Install the Minimal Perl files
+
+ SetDetailsPrint textonly
+ DetailPrint "Installing minimal Perl files..."
+ SetDetailsPrint listonly
SetOutPath $INSTDIR
***************
*** 462,465 ****
--- 475,482 ----
; Create the START MENU entries
+
+ SetDetailsPrint textonly
+ DetailPrint "Creating POPFile shortcuts..."
+ SetDetailsPrint listonly
SetOutPath $SMPROGRAMS\POPFile
***************
*** 505,508 ****
--- 522,529 ----
WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}" \
"NoRepair" "1"
+
+ SetDetailsPrint textonly
+ DetailPrint ""
+ SetDetailsPrint listonly
SectionEnd
***************
*** 513,516 ****
--- 534,541 ----
Section "Skins" SecSkins
+
+ SetDetailsPrint textonly
+ DetailPrint "Installing POPFile skin files..."
+ SetDetailsPrint listonly
SetOutPath $INSTDIR\skins
***************
*** 521,524 ****
--- 546,553 ----
SetOutPath $INSTDIR\skins\sleetImages
File "..\engine\skins\sleetImages\*.gif"
+
+ SetDetailsPrint textonly
+ DetailPrint ""
+ SetDetailsPrint listonly
SectionEnd
***************
*** 529,535 ****
--- 558,572 ----
Section "Languages" SecLangs
+
+ SetDetailsPrint textonly
+ DetailPrint "Installing POPFile UI language files..."
+ SetDetailsPrint listonly
SetOutPath $INSTDIR\languages
File "..\engine\languages\*.msg"
+
+ SetDetailsPrint textonly
+ DetailPrint ""
+ SetDetailsPrint listonly
SectionEnd
***************
*** 1610,1613 ****
--- 1647,1654 ----
; If the POPFile we are about to uninstall is still running,
; then one of the EXE files will be 'locked'
+
+ SetDetailsPrint textonly
+ DetailPrint "Shutting down POPFile..."
+ SetDetailsPrint listonly
IfFileExists "$INSTDIR\wperl.exe" 0 other_perl
***************
*** 1655,1658 ****
--- 1696,1704 ----
skip_shutdown:
+
+ SetDetailsPrint textonly
+ DetailPrint "Deleting 'Start Menu' entries for POPFile..."
+ SetDetailsPrint listonly
+
Delete $SMPROGRAMS\POPFile\Support\*.url
RMDir $SMPROGRAMS\POPFile\Support
***************
*** 1662,1665 ****
--- 1708,1715 ----
Delete "$SMSTARTUP\Run POPFile in background.lnk"
RMDir $SMPROGRAMS\POPFile
+
+ SetDetailsPrint textonly
+ DetailPrint "Deleting POPFile core files..."
+ SetDetailsPrint listonly
Delete $INSTDIR\*.log
***************
*** 1676,1679 ****
--- 1726,1733 ----
IfFileExists "$INSTDIR\popfile.reg" 0 no_reg_file
+ SetDetailsPrint textonly
+ DetailPrint "Restoring Outlook Express settings..."
+ SetDetailsPrint listonly
+
; Read the registry settings found in popfile.reg and restore them
; it there are any. All are assumed to be in HKCU
***************
*** 1723,1726 ****
--- 1777,1785 ----
Delete $INSTDIR\Exporter\*.*
RMDir $INSTDIR\Exporter
+
+ SetDetailsPrint textonly
+ DetailPrint "Deleting POPFile skins files..."
+ SetDetailsPrint listonly
+
Delete $INSTDIR\skins\*.css
Delete $INSTDIR\skins\*.gif
***************
*** 1739,1742 ****
--- 1798,1805 ----
Delete $INSTDIR\stopwords
RMDir /r $INSTDIR\messages
+
+ SetDetailsPrint textonly
+ DetailPrint "Deleting minimal Perl files..."
+ SetDetailsPrint listonly
Delete $INSTDIR\Win32\API\*
***************
*** 1792,1795 ****
--- 1855,1860 ----
"Note: $INSTDIR could not be removed."
Removed:
+
+ SetDetailsPrint both
!undef L_LNE
|
|
From: <xue...@us...> - 2003-06-24 00:12:20
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv3987
Modified Files:
CBP.nsh
Log Message:
When creating buckets, include the bucket header (matching the change introduced in Bayes.pm 1.152)
Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CBP.nsh 31 May 2003 19:52:43 -0000 1.7
--- CBP.nsh 24 Jun 2003 00:12:16 -0000 1.8
***************
*** 12,15 ****
--- 12,20 ----
# This version of 'CBP.nsh' was tested using NSIS 2.0b4 (CVS)
+ !ifdef CBP.nsh_included
+ !error "$\r$\n$\r$\nFatal error: CBP.nsh has been included more than once!$\r$\n"
+ !else
+ !define CBP.nsh_included
+
#//////////////////////////////////////////////////////////////////////////////////////////////
#
***************
*** 431,435 ****
; for a "fresh" install, one where there are no corpus files, so we can simply create a
; bucket by creating a corpus directory with the same name as the bucket and putting
! ; a file called "table" there. The "table" file just has a "$\r$\n" sequence in it.
; Process only the "used" entries in the bucket list
--- 436,441 ----
; for a "fresh" install, one where there are no corpus files, so we can simply create a
; bucket by creating a corpus directory with the same name as the bucket and putting
! ; a file called "table" there. The "table" file is empty apart from the bucket header
! ; (this mimics the behaviour of Bayes.pm version 1.152)
; Process only the "used" entries in the bucket list
***************
*** 455,459 ****
CreateDirectory ${CBP_L_CORPUS}\${CBP_L_CREATE_NAME}
FileOpen ${CBP_L_FILE_HANDLE} ${CBP_L_CORPUS}\${CBP_L_CREATE_NAME}\table w
! FileWrite ${CBP_L_FILE_HANDLE} "$\r$\n"
FileClose ${CBP_L_FILE_HANDLE}
StrCmp ${CBP_L_UNC} "\\" ignore_errors
--- 461,465 ----
CreateDirectory ${CBP_L_CORPUS}\${CBP_L_CREATE_NAME}
FileOpen ${CBP_L_FILE_HANDLE} ${CBP_L_CORPUS}\${CBP_L_CREATE_NAME}\table w
! FileWrite ${CBP_L_FILE_HANDLE} "__CORPUS__ __VERSION__ 1$\r$\n"
FileClose ${CBP_L_FILE_HANDLE}
StrCmp ${CBP_L_UNC} "\\" ignore_errors
***************
*** 2105,2108 ****
--- 2111,2115 ----
!undef CBP_MAX_BN_CBOX_PLUS_ONE
+ !endif
#==============================================================================================
# End of CBP.nsh
|
|
From: <jgr...@us...> - 2003-06-23 22:35:37
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv24300/Classifier
Modified Files:
Bayes.pm
Log Message:
When creating blank buckets at least include the bucket header
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** Bayes.pm 19 Jun 2003 13:58:30 -0000 1.151
--- Bayes.pm 23 Jun 2003 22:35:35 -0000 1.152
***************
*** 1292,1296 ****
if ( open NEW, '>' . $self->config_( 'corpus' ) . "/$bucket/table" ) {
! print NEW "\n";
close NEW;
}
--- 1292,1296 ----
if ( open NEW, '>' . $self->config_( 'corpus' ) . "/$bucket/table" ) {
! print NEW "__CORPUS__ __VERSION__ 1\n";
close NEW;
}
|
|
From: <jgr...@us...> - 2003-06-23 22:34:39
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv24126/UI
Modified Files:
HTTP.pm
Log Message:
Handle the case where Norton Internet Security sends through an invalid HTTP header
Index: HTTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HTTP.pm 14 Jun 2003 21:10:13 -0000 1.7
--- HTTP.pm 23 Jun 2003 22:34:37 -0000 1.8
***************
*** 130,134 ****
while ( <$client> ) {
$content_length = $1 if ( /Content-Length: (\d+)/i );
! last if ( !/[A-Z]/i );
}
--- 130,145 ----
while ( <$client> ) {
$content_length = $1 if ( /Content-Length: (\d+)/i );
!
! # Discovered that Norton Internet Security was adding
! # HTTP headers of the form
! #
! # ~~~~~~~~~~~~~~: ~~~~~~~~~~~~~
! #
! # which we were not recognizing as valid (surprise,
! # surprise) and this was messing about our handling
! # of POST data. Changed the end of header identification
! # to any line that does not contain a :
!
! last if ( !/:/i );
}
|
|
From: <jgr...@us...> - 2003-06-23 22:34:14
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv24060 Modified Files: tests.pl Log Message: Say IO::Handle instead of IO::handle Index: tests.pl =================================================================== RCS file: /cvsroot/popfile/engine/tests.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tests.pl 18 Jun 2003 20:34:55 -0000 1.15 --- tests.pl 23 Jun 2003 22:34:10 -0000 1.16 *************** *** 10,14 **** use strict; ! require IO::handle; # Look for all the TST files in the tests/ subfolder and run --- 10,14 ---- use strict; ! require IO::Handle; # Look for all the TST files in the tests/ subfolder and run |
|
From: <jgr...@us...> - 2003-06-23 22:33:47
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv23993 Modified Files: Español.msg Log Message: Updated Spanish translation Index: Español.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/Español.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Español.msg 19 May 2003 20:02:45 -0000 1.1 --- Español.msg 23 Jun 2003 22:33:44 -0000 1.2 *************** *** 40,44 **** --- 40,52 ---- Probability Probabilidad Score Puntuación + Scores Puntuaciones Lookup Búsqueda + Cc Cc + Count Contadas + Word Palabra + Refresh Recargar + Update Actualizar + QuickMagnets Iman Rapido + # The header and footer that appear on every UI page *************** *** 65,72 **** Configuration_Error5 El número de días en la Historia debe ser un número entre 1 and 366 Configuration_Error6 El tiempo límite de TCP debe ser un número entre 10 y 300 Configuration_POP3Port Puerto de escucha POP3 ! Configuration_POP3Update Actualizado el puerto a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Configuration_Separator Caracter separador ! Configuration_SepUpdate Caracter separador actualizado a %s Configuration_UI Puerto de la interfaz de usuario Configuration_UIUpdate Puerto de la interfaz de usuario actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado --- 73,79 ---- Configuration_Error5 El número de días en la Historia debe ser un número entre 1 and 366 Configuration_Error6 El tiempo límite de TCP debe ser un número entre 10 y 300 + Configuration_Error7 El puerto de XML RPC debe ser un número entre 1 y 65535 Configuration_POP3Port Puerto de escucha POP3 ! Configuration_POP3Update Actualizado el puerto POP3 a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado Configuration_UI Puerto de la interfaz de usuario Configuration_UIUpdate Puerto de la interfaz de usuario actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado *************** *** 79,83 **** Configuration_SkinsChoose Elegir skin Configuration_Language Languaje ! Configuration_LanguageChoose Escoger language Configuration_ListenPorts Puertos de escucha Configuration_HistoryView Vista de la Historia --- 86,90 ---- Configuration_SkinsChoose Elegir skin Configuration_Language Languaje ! Configuration_LanguageChoose Escoger languaje Configuration_ListenPorts Puertos de escucha Configuration_HistoryView Vista de la Historia *************** *** 88,93 **** Configuration_SubjectLine Modificación del Asunto Configuration_XTCInsertion Añadir cabecera X-Text-Classification ! Configuration_XPLInsertion Añadir cabecera X-POPFile-Link Header Configuration_Logging Logging Configuration_None Ninguna Configuration_ToScreen En pantalla --- 95,101 ---- Configuration_SubjectLine Modificación del Asunto Configuration_XTCInsertion Añadir cabecera X-Text-Classification ! Configuration_XPLInsertion Añadir cabecera X-POPFile-Link Configuration_Logging Logging + Configuration_CurrentLogFile <fichero actual de log> Configuration_None Ninguna Configuration_ToScreen En pantalla *************** *** 98,101 **** --- 106,119 ---- Configuration_SmallSkins Small Skins Configuration_TinySkins Tiny Skins + Configuration_NNTPPort Puerto de escucha NNTP + Configuration_NNTPSepUpdate Caracter separador NNTP actualizado a %s + Configuration_NNTPSeparator Caracter separador en servidor:puerto:usuario para NNTP + Configuration_NNTPUpdate Actualizado el puerto NNTP a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado + Configuration_POP3SepUpdate Caracter separador POP3 actualizado a %s + Configuration_POP3Separator Caracter separador en servidor:puerto:usuario para POP3 + Configuration_SMTPPort Puerto de escucha SMTP + Configuration_SMTPUpdate Actualizado el puerto SMTP a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado + Configuration_XMLRPCPort Puerto de escucha XML RPC + Configuration_XMLRPCUpdate Actualizado el puerto XML RPC a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado Advanced_Error1 '%s' ya está en la lista de Palabras a Ignorar *************** *** 130,133 **** --- 148,154 ---- History_Magnet (Mostrando sólo mensajes magnetizados) History_ResetSearch Reiniciar + History_MagnetBecause <b>Imán Usado</b><p>Clasificado en <font color="%s">%s</font> debido al Imán %s </p> + History_NoMagnet (Mostrando sólo mensajes no magnetizados) + History_ShowNoMagnet No Magnetizado Password_Title Contraseña *************** *** 145,152 **** Security_PasswordUpdate Contraseña actualizada a %s Security_AUTHTitle Autentificación segura de Contraseña/AUTH ! Security_SecureServer Sevidor Seguro ! Security_SecureServerUpdate Sevidor Seguro actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Security_SecurePort Puerto seguro ! Security_SecurePortUpdate Puerto seguro actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado Security_POP3 Aceptar conexiones POP3 de máquinas remotas (hay que reiniciar POPFile) Security_UI Aceptar conexiones HTTP (Interfaz de Usuario) de máquinas remotas (hay que reiniciar POPFile) --- 166,173 ---- Security_PasswordUpdate Contraseña actualizada a %s Security_AUTHTitle Autentificación segura de Contraseña/AUTH ! Security_SecureServer Sevidor POP3 SPA/AUTH seguro ! Security_SecureServerUpdate Sevidor POP3 SPA/AUTH seguro actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado ! Security_SecurePort Puerto POP3 SPA/AUTH ! Security_SecurePortUpdate Puerto POP3 SPA/AUTH seguro actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado Security_POP3 Aceptar conexiones POP3 de máquinas remotas (hay que reiniciar POPFile) Security_UI Aceptar conexiones HTTP (Interfaz de Usuario) de máquinas remotas (hay que reiniciar POPFile) *************** *** 155,158 **** --- 176,186 ---- Security_StatsTitle Enviar Stadísticas Security_Stats Enviar Stadísticas diariamente + Security_NNTP Aceptar conexiones NNTP de máquinas remotas (hay que reiniciar POPFile) + Security_SMTP Aceptar conexiones SMTP de máquinas remotas (hay que reiniciar POPFile) + Security_SMTPPort SMTP chain port + Security_SMTPPortUpdate SMTP chain port actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado + Security_SMTPServer SMTP chain server + Security_SMTPServerUpdate SMTP chain server actualizado a %s; Este cámbio no tendrá efecto hasta que POPFile sea reiniciado + Security_XMLRPC Aceptar conexiones POP3 de máquinas remotas (hay que reiniciar POPFile) Magnet_Error1 El Imán '%s' ya existe en la Categoría '%s' *************** *** 166,169 **** --- 194,198 ---- Magnet_Value Valor Magnet_Always Clasificar siempre en + Magnet_Jump Ir a página de Imanes Bucket_Error1 Los nombres de Categorías sólo pueden contener las letras de la a a la z en minúsculas mas - y _ *************** *** 201,206 **** Bucket_DoesNotAppear <p><b>%s</b> no aparece en ninguna de las Categorías Bucket_DisabledGlobally Deshabilitado Globalmente ! Bucket_To a Bucket_Quarantine Cuarentena SingleBucket_Title Detalles para %s --- 230,237 ---- Bucket_DoesNotAppear <p><b>%s</b> no aparece en ninguna de las Categorías Bucket_DisabledGlobally Deshabilitado Globalmente ! Bucket_To A Bucket_Quarantine Cuarentena + Bucket_ClassificationFN Falsos Negativos + Bucket_ClassificationFP Falsos Positivos SingleBucket_Title Detalles para %s *************** *** 211,218 **** --- 242,251 ---- SingleBucket_Message1 Las palabras marcadas con (*) han sido usadas para la Categoría en esta sesión de POPFile. "Pincha" en cualquier palabra para conocer su probabilidad en todas las Categorías. SingleBucket_Unique %s únicas + SingleBucket_ClearBucket Borrar todas las Palabras Session_Title Ha expirado la sesión de POPFile Session_Error Ha expirado tu sesión de POPFile. Esto puede ser debido a que haya dejado su navegador abierto mientras reiniciaba POPFile. Por favor, pinche en uno de los enlaces superiores para continuar usando POPFile. + View_Title Vista de un solo mensaje Header_MenuSummary This table is the navigation menu which allows access to each of the different pages of the control center. |
|
From: <ssc...@us...> - 2003-06-23 20:35:38
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv2775
Modified Files:
Tag: v0/18/1
MailParse.pm
Log Message:
merge patch 757860 (mannih2001) fixing HTML entity hash bug
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.91.2.6
retrieving revision 1.91.2.7
diff -C2 -d -r1.91.2.6 -r1.91.2.7
*** MailParse.pm 30 Apr 2003 03:10:00 -0000 1.91.2.6
--- MailParse.pm 23 Jun 2003 20:35:35 -0000 1.91.2.7
***************
*** 19,25 ****
# character code
! my %entityhash;
!
! @entityhash{'amp', 'nbsp','iexcl','cent','pound','curren','yen','brvbar','sect','uml','copy','ordf','laquo','not','shy','reg','macr','deg','plusmn','sup2','sup3','acute','micro','para','middot','cedil','sup1','ordm','raquo','frac14','frac12','frac34','iquest','Agrave','Aacute','Acirc','Atilde','Auml','Aring','AElig','Ccedil','Egrave','Eacute','Ecirc','Euml','Igrave','Iacute','Icirc','Iuml','ETH','Ntilde','Ograve','Oacute','Ocirc','Otilde','Ouml','times','Oslash','Ugrave','Uacute','Ucirc','Uuml','Yacute','THORN','szlig','agrave','aacute','acirc','atilde','auml','aring','aelig','ccedil','egrave','eacute','ecirc','euml','igrave','iacute','icirc','iuml','eth','ntilde','ograve','oacute','ocirc','otilde','ouml','divide','oslash','ugrave','uacute','ucirc','uuml','yacute','thorn','yuml'} = ( 38, 160,161,162,163,164,165,166,167,168,169,170,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 );
#----------------------------------------------------------------------------
--- 19,47 ----
# character code
! my %entityhash = ('aacute' => 224, 'Aacute' => 202, 'Acirc' => 203, 'acirc' => 225,
! 'acute' => 189, 'AElig' => 207, 'aelig' => 229, 'Agrave' => 201,
! 'agrave' => 223, 'amp' => 38, 'Aring' => 206, 'aring' => 228,
! 'atilde' => 226, 'Atilde' => 204, 'Auml' => 196, 'auml' => 228,
! 'brvbar' => 166, 'ccedil' => 230, 'Ccedil' => 208, 'cedil' => 193,
! 'cent' => 162, 'copy' => 169, 'curren' => 164, 'deg' => 185,
! 'divide' => 246, 'Eacute' => 210, 'eacute' => 232, 'ecirc' => 233,
! 'Ecirc' => 211, 'Egrave' => 209, 'egrave' => 231, 'ETH' => 217,
! 'eth' => 239, 'Euml' => 212, 'euml' => 234, 'frac12' => 198,
! 'frac14' => 197, 'frac34' => 199, 'iacute' => 236, 'Iacute' => 214,
! 'icirc' => 237, 'Icirc' => 215, 'iexcl' => 161, 'igrave' => 235,
! 'Igrave' => 213, 'iquest' => 200, 'iuml' => 238, 'Iuml' => 216,
! 'laquo' => 180, 'macr' => 184, 'micro' => 190, 'middot' => 192,
! 'nbsp' => 160, 'not' => 181, 'ntilde' => 240, 'Ntilde' => 218,
! 'oacute' => 242, 'Oacute' => 210, 'Ocirc' => 211, 'ocirc' => 243,
! 'Ograve' => 219, 'ograve' => 241, 'ordf' => 170, 'ordm' => 195,
! 'oslash' => 247, 'Oslash' => 215, 'Otilde' => 212, 'otilde' => 244,
! 'Ouml' => 214, 'ouml' => 246, 'para' => 191, 'plusmn' => 186,
! 'pound' => 163, 'raquo' => 196, 'reg' => 183, 'sect' => 167,
! 'shy' => 182, 'sup1' => 194, 'sup2' => 187, 'sup3' => 188,
! 'szlig' => 223, 'thorn' => 253, 'THORN' => 221, 'times' => 214,
! 'Uacute' => 217, 'uacute' => 249, 'ucirc' => 250, 'Ucirc' => 218,
! 'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
! 'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254);
#----------------------------------------------------------------------------
|
|
From: <ssc...@us...> - 2003-06-23 20:35:08
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv2678
Modified Files:
MailParse.pm
Log Message:
merge patch 757860 (mannih2001) fixing HTML entity hash bug
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** MailParse.pm 19 Jun 2003 15:03:06 -0000 1.137
--- MailParse.pm 23 Jun 2003 20:35:05 -0000 1.138
***************
*** 19,26 ****
# character code
! my %entityhash;
!
! @entityhash{'amp', 'nbsp','iexcl','cent','pound','curren','yen','brvbar','sect','uml','copy','ordf','laquo','not','shy','reg','macr','deg','plusmn','sup2','sup3','acute','micro','para','middot','cedil','sup1','ordm','raquo','frac14','frac12','frac34','iquest','Agrave','Aacute','Acirc','Atilde','Auml','Aring','AElig','Ccedil','Egrave','Eacute','Ecirc','Euml','Igrave','Iacute','Icirc','Iuml','ETH','Ntilde','Ograve','Oacute','Ocirc','Otilde','Ouml','times','Oslash','Ugrave','Uacute','Ucirc','Uuml','Yacute','THORN','szlig','agrave','aacute','acirc','atilde','auml','aring','aelig','ccedil','egrave','eacute','ecirc','euml','igrave','iacute','icirc','iuml','eth','ntilde','ograve','oacute','ocirc','otilde','ouml','divide','oslash','ugrave','uacute','ucirc','uuml','yacute','thorn','yuml'} = ( 38, 160,161,162,163,164,165,166,167,168,169,170,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 );
!
#----------------------------------------------------------------------------
# new
--- 19,47 ----
# character code
! my %entityhash = ('aacute' => 224, 'Aacute' => 202, 'Acirc' => 203, 'acirc' => 225,
! 'acute' => 189, 'AElig' => 207, 'aelig' => 229, 'Agrave' => 201,
! 'agrave' => 223, 'amp' => 38, 'Aring' => 206, 'aring' => 228,
! 'atilde' => 226, 'Atilde' => 204, 'Auml' => 196, 'auml' => 228,
! 'brvbar' => 166, 'ccedil' => 230, 'Ccedil' => 208, 'cedil' => 193,
! 'cent' => 162, 'copy' => 169, 'curren' => 164, 'deg' => 185,
! 'divide' => 246, 'Eacute' => 210, 'eacute' => 232, 'ecirc' => 233,
! 'Ecirc' => 211, 'Egrave' => 209, 'egrave' => 231, 'ETH' => 217,
! 'eth' => 239, 'Euml' => 212, 'euml' => 234, 'frac12' => 198,
! 'frac14' => 197, 'frac34' => 199, 'iacute' => 236, 'Iacute' => 214,
! 'icirc' => 237, 'Icirc' => 215, 'iexcl' => 161, 'igrave' => 235,
! 'Igrave' => 213, 'iquest' => 200, 'iuml' => 238, 'Iuml' => 216,
! 'laquo' => 180, 'macr' => 184, 'micro' => 190, 'middot' => 192,
! 'nbsp' => 160, 'not' => 181, 'ntilde' => 240, 'Ntilde' => 218,
! 'oacute' => 242, 'Oacute' => 210, 'Ocirc' => 211, 'ocirc' => 243,
! 'Ograve' => 219, 'ograve' => 241, 'ordf' => 170, 'ordm' => 195,
! 'oslash' => 247, 'Oslash' => 215, 'Otilde' => 212, 'otilde' => 244,
! 'Ouml' => 214, 'ouml' => 246, 'para' => 191, 'plusmn' => 186,
! 'pound' => 163, 'raquo' => 196, 'reg' => 183, 'sect' => 167,
! 'shy' => 182, 'sup1' => 194, 'sup2' => 187, 'sup3' => 188,
! 'szlig' => 223, 'thorn' => 253, 'THORN' => 221, 'times' => 214,
! 'Uacute' => 217, 'uacute' => 249, 'ucirc' => 250, 'Ucirc' => 218,
! 'ugrave' => 248, 'Ugrave' => 216, 'uml' => 168, 'Uuml' => 220,
! 'uuml' => 252, 'Yacute' => 220, 'yacute' => 252, 'yen' => 165,
! 'yuml' => 254);
#----------------------------------------------------------------------------
# new
|
|
From: <xue...@us...> - 2003-06-23 11:42:44
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv9490
Modified Files:
installer.nsi
Log Message:
Remove space character from URL
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** installer.nsi 22 Jun 2003 17:52:57 -0000 1.72
--- installer.nsi 23 Jun 2003 11:42:40 -0000 1.73
***************
*** 35,39 ****
VIAddVersionKey "ProductName" "POPFile"
! VIAddVersionKey "Comments" "POPFile Homepage: http:// popfile.sourceforge.net"
VIAddVersionKey "CompanyName" "POPFile Team"
# VIAddVersionKey "LegalTrademarks" "POPFile"
--- 35,39 ----
VIAddVersionKey "ProductName" "POPFile"
! VIAddVersionKey "Comments" "POPFile Homepage: http://popfile.sourceforge.net"
VIAddVersionKey "CompanyName" "POPFile Team"
# VIAddVersionKey "LegalTrademarks" "POPFile"
|
|
From: <ssc...@us...> - 2003-06-22 23:15:36
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv20384
Modified Files:
Tag: v0/18/1
Bayes.pm
Log Message:
remove some excess debug statements
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.107.2.8
retrieving revision 1.107.2.9
diff -C2 -d -r1.107.2.8 -r1.107.2.9
*** Bayes.pm 19 Jun 2003 01:36:06 -0000 1.107.2.8
--- Bayes.pm 22 Jun 2003 23:15:32 -0000 1.107.2.9
***************
*** 764,770 ****
$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
my $msg_head_before = ''; # Store the message headers that come before Subject here
--- 764,768 ----
$echo = 1 unless (defined $echo);
!
my $msg_subject = ''; # The message subject
my $msg_head_before = ''; # Store the message headers that come before Subject here
***************
*** 887,893 ****
# 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
if ( $classification ne 'unclassified' ) {
--- 885,889 ----
# an email of that type
$classification = ($class ne '')?$class:$self->classify_file($temp_file);
!
# Add the Subject line modification or the original line back again
if ( $classification ne 'unclassified' ) {
|
11 messages has been excluded from this view by a project administrator.
