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-05-02 17:45:42
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv14361/Classifier
Modified Files:
Bayes.pm
Log Message:
Make the characters in a subject modification configurable; allow numbers in bucket names
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** Bayes.pm 27 Apr 2003 01:11:00 -0000 1.140
--- Bayes.pm 2 May 2003 17:45:37 -0000 1.141
***************
*** 116,119 ****
--- 116,123 ----
$self->config_( 'corpus', 'corpus' );
+ # The characters that appear before and after a subject modification
+ $self->config_( 'subject_mod_left', '[' );
+ $self->config_( 'subject_mod_right', ']' );
+
# Get the hostname for use in the X-POPFile-Link header
$self->{hostname__} = hostname;
***************
*** 780,784 ****
{
my ( $self, $mail, $client, $dcount, $mcount, $nosave, $class, $echo ) = @_;
!
$echo = 1 unless (defined $echo);
--- 784,788 ----
{
my ( $self, $mail, $client, $dcount, $mcount, $nosave, $class, $echo ) = @_;
!
$echo = 1 unless (defined $echo);
***************
*** 846,854 ****
$message_size += length $line;
print TEMP $fileline;
!
# If there is no echoing occuring, it doesn't matter what we do to these
!
! if ($echo) {
!
if ( $line =~ /^Subject:(.*)/i ) {
$msg_subject = $1;
--- 850,857 ----
$message_size += length $line;
print TEMP $fileline;
!
# If there is no echoing occuring, it doesn't matter what we do to these
!
! if ( $echo ) {
if ( $line =~ /^Subject:(.*)/i ) {
$msg_subject = $1;
***************
*** 856,860 ****
next;
}
!
# Strip out the X-Text-Classification header that is in an incoming message
if ( ( $line =~ /^X-Text-Classification:/i ) == 0 ) {
--- 859,863 ----
next;
}
!
# Strip out the X-Text-Classification header that is in an incoming message
if ( ( $line =~ /^X-Text-Classification:/i ) == 0 ) {
***************
*** 891,895 ****
--- 894,900 ----
# Do the text classification and update the counter for that bucket that we just downloaded
# an email of that type
+
$classification = ($class ne '')?$class:$self->classify_file($temp_file);
+ my $modification = $self->config_( 'subject_mod_left' ) . $classification . $self->config_( 'subject_mod_right' );
# Add the Subject line modification or the original line back again
***************
*** 900,904 ****
( $self->{parameters__}{$classification}{subject} == 1 ) &&
( $self->{parameters__}{$classification}{quarantine} == 0 ) ) {
! $msg_subject = " [$classification]$msg_subject";
}
}
--- 905,909 ----
( $self->{parameters__}{$classification}{subject} == 1 ) &&
( $self->{parameters__}{$classification}{quarantine} == 0 ) ) {
! $msg_subject = " $modification$msg_subject";
}
}
***************
*** 947,951 ****
if ( !( $msg_subject =~ /\[\Q$classification\E\]/ ) &&
( $self->{parameters__}{$classification}{subject} == 1 ) ) {
! $msg_subject = " [$classification]$msg_subject";
}
}
--- 952,956 ----
if ( !( $msg_subject =~ /\[\Q$classification\E\]/ ) &&
( $self->{parameters__}{$classification}{subject} == 1 ) ) {
! $msg_subject = " $modification$msg_subject";
}
}
|
|
From: <ssc...@us...> - 2003-05-02 02:14:41
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv29887
Modified Files:
HTML.pm
Log Message:
fix print_form_fields__ to handle session-key better
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** HTML.pm 30 Apr 2003 05:46:46 -0000 1.147
--- HTML.pm 2 May 2003 02:14:36 -0000 1.148
***************
*** 3365,3376 ****
$formstring = "$amp" if (!$first);
! foreach my $field ( @include ) {
! unless ( !defined($self->{form_}{$field}) || ( $self->{form_}{$field} eq '' ) ) {
$formstring .= "$amp" if ($count > 0);
! if ($field eq 'session') {
! $formstring .= "session=$self->{session_key__}";
! } else {
! $formstring .= "$field=$self->{form_}{$field}";
}
$count++;
}
--- 3365,3378 ----
$formstring = "$amp" if (!$first);
! foreach my $field ( @include ) {
! if ($field eq 'session') {
$formstring .= "$amp" if ($count > 0);
! $formstring .= "session=$self->{session_key__}";
! $count++;
! next;
}
+ unless ( !defined($self->{form_}{$field}) || ( $self->{form_}{$field} eq '' ) ) {
+ $formstring .= "$amp" if ($count > 0);
+ $formstring .= "$field=$self->{form_}{$field}";
$count++;
}
|
|
From: <jgr...@us...> - 2003-04-30 20:33:19
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv844/languages Added Files: Svenska.msg Log Message: Added Swedish translation --- NEW FILE: Svenska.msg --- # This is used to get the appropriate subdirectory for the manual LanguageCode sv LanguageCharset ISO-8859-1 # Common words that are used on their own all over the interface Apply Verkställ On On Off Off TurnOn Sätt på TurnOff Stäng av Add Lägg till Remove Ta bort Previous Föregående Next Nästa From Från Subject Ämne Classification Klassifikation Reclassify Reklassifikation Undo Ångra Close Stäng av server Find Sök Filter Filter Yes Ja No Nej ChangeToYes Ändra till Ja ChangeToNo Ändra till Nej Bucket Hink Magnet Magnet Delete Ta bort Create Skapa To Till Total Totalt Rename Döp om Frequency Frekvens Probability Sannolikhet Score Resultat Lookup Leta efter # The header and footer that appear on every UI page Header_Title Kontrollpanel Header_Shutdown Stäng Header_History Historia Header_Buckets Hinkar Header_Configuration Konfiguration Header_Advanced Avancerat Header_Security Säkerhet Header_Magnets Magneter Footer_HomePage Hem Footer_Manual Manual Footer_Forums Forum Footer_FeedMe Återkoppling Footer_RequestFeature Föreslå funktioner Footer_MailingList Mailinglistor Configuration_Error1 Det avskiljande tecknet kan bara vara ett tecken. Configuration_Error2 Webgränssnittets post måste vara ett tal mellan 1 och 65535 Configuration_Error3 POP3 porten måste vara ett tal mellan 1 och 65535 Configuration_Error4 Sidans storlek måste vara ett tal mellan 1 och 1000 Configuration_Error5 Antal dagar i 'histora' måste vara ett tal mellan 1 och 366 Configuration_Error6 TCP timeout måste vara ett tal mellan 10 och 300 Configuration_POP3Port POP3 port Configuration_POP3Update Uppdaterade porten till %s; denna ändring kommer inte att gälla förrän servern är omstartad. Configuration_Separator Avskiljare Configuration_SepUpdate Uppdaterade det avskiljande tecknet till %s Configuration_UI Webgränssnittets HTTP port Configuration_UIUpdate Uppdaterade webgränssnittets HTTP port till %s; denna ändring kommer inte att gälla förrän servern är omstartad. Configuration_History Antal epost per sida Configuration_HistoryUpdate Uppdaterede antal email per sida till %s Configuration_Days Antal dagar histora skall behållas Configuration_DaysUpdate Uppdaterede antal dagar histora skall sparas: %s Configuration_UserInterface Gränssnitt Configuration_Skins Utseende ytan Configuration_SkinsChoose Välj tema Configuration_Language Språk Configuration_LanguageChoose Välj språk Configuration_ListenPorts POP3 Configuration_HistoryView Formatera 'Historia' vyn Configuration_TCPTimeout TCP förbindelsens timeout Configuration_TCPTimeoutSecs TCP förbindelsens timeout i sekunder Configuration_TCPTimeoutUpdate Updatera TCP förbindelsens timeout till %s Configuration_ClassificationInsertion Klassifikation epost headers Configuration_SubjectLine Ämnesrad modifiering Configuration_XTCInsertion X-Text-Klassification insättning Configuration_XPLInsertion X-POPFile-Länk insättning Configuration_Logging Logging Configuration_None Ingen Configuration_ToScreen Till skärm Configuration_ToFile Till fil Configuration_ToScreenFile Till skärm och fil Configuration_LoggerOutput Loggning utdata Advanced_Error1 '%s' finns redan i stoppord listan Advanced_Error2 Stoppord kan bara innehålla alfanumeriska tecken, ., _, -, eller @ tegn Advanced_Error3 '%s' är lagt till stopordlistan Advanced_Error4 '%s' finns inte i stoppordlistan Advanced_Error5 '%s' är borttaget från stoppordlistan Advanced_StopWords Stoppord Advanced_Message1 Följande ord ignoreras av klassifikationen eftersom de förekommer ofta. Advanced_AddWord Lägg till ord Advanced_RemoveWord Ta bort ord History_Filter (visa bara spannet <font color=%s>%s</font>) History_Search (sök ämne för %s) History_Title Historia History_Jump Spring til besked History_ShowAll Visa alla History_ShouldBe skulle vara History_NoFrom inget från rad History_NoSubject iget ämne rad History_ClassifyAs klassificerat som History_MagnetUsed Magnet använd History_ChangedTo Ändrat till <font color=%s>%s History_Already Redan reklassificerat som <font color=%s>%s</font> History_RemoveAll Ta bort alla History_RemovePage Ta bort sida History_Remove för att ta bort historia History_SearchMessage Sök ämne History_NoMessages Inga meddelanden Password_Title Lösenord Password_Enter Indtast kodeord Password_Go Go! Password_Error1 Fel lösenord Security_Error1 Den säkra porten måste vara ett tal mellan 1 och 65535 Security_Stealth Server körläge Security_NoStealthMode Nej (Lokalt läge) Security_ExplainStats (Data används för att förbättra servern) Security_ExplainUpdate (Om uppdatering finns tillgänglig kommer en logotyp att visas på sidan) Security_PasswordTitle Lösenord till webgränssnittet Security_Password Lösenord Security_PasswordUpdate Uppdaterar lösenord till %s Security_AUTHTitle Lösenord för epostkonto med extra autentisering Security_SecureServer Server Security_SecureServerUpdate Uppdaterade servern till %s; denna ändring kommer inte att träda i kraft förrän servern är omstartad Security_SecurePort Port Security_SecurePortUpdate Uppdaterade porten till %s; denna ändring kommer inte att träda i kraft förrän servern är omstartad Security_POP3 Acceptera anslutningar till POP3 från externa källa Security_UI Acceptera HTTP anslutningar från extern källa Security_UpdateTitle Automatisk uppdatering Security_Update Sök efter uppdateringar varje dag Security_StatsTitle Statistikrapportering Security_Stats Skicka statistik till programmets skapare dagligen Magnet_Error1 Magnet '%s' finns redan i '%s' Magnet_Error2 Det nya statiska filtret '%s' kommer i konflikt med det statiska filtret '%s' i '%s' och kan skapa tvetydiga resultat. Det nya statiska filtret skapades inte. Magnet_Error3 Skapade ny magnet '%s' i '%s' Magnet_CurrentMagnets Aktuella magneter Magnet_Message1 Följande magneter garanterar att email alltid hamnar i en viss hink. Magnet_CreateNew Skapa ny magnet Magnet_Explanation Tre typer av magneter är tillgängliga: <ul><li>Från adressen eller namnet:</b> Till exempel: test@företag.se för att matcha en specifik adress, <br>företag.se för att matcha alla avsändare från företaget, <br>John Doe för att matcha en specifik person, John för att matcha alla Johns<li><b>Till adressen eller namnet:</b> Liksom ovan men för to: eller till: -raden. <li><b>Ämnet:</b> Till exempel: Hej! för att matcha alla 'Hej!' i ämnesraden.</ul> Magnet_MagnetType Magnettyper Magnet_Value Värden Magnet_Always Tillhör alltid magneten Bucket_Error1 Hinkens namn kan bara innehålla bokstäverna a till z (små bokstäver) samt - och _ Bucket_Error2 Hinken med namnet %s finns redan Bucket_Error3 Upprätta hink med namnet %s Bucket_Error4 Var god fyll i ett ord Bucket_Error5 Döp inte om hinken %s till %s Bucket_Error6 Tog bort hinken %s Bucket_Title Överblick Bucket_BucketName Hinkens namn Bucket_WordCount Antal Bucket_WordCounts Fördelning av ord Bucket_UniqueWords Unika ord Bucket_SubjectModification Ämnesrad modifiering Bucket_ChangeColor Byt färg Bucket_NotEnoughData Finns inte data Bucket_ClassificationAccuracy Klassifikationens exakthet Bucket_EmailsClassified Antal email Bucket_EmailsClassifiedUpper Antal email Bucket_ClassificationErrors Antal fel Bucket_Accuracy Exakthet Bucket_ClassificationCount Antal klassificeringar Bucket_ResetStatistics Nollställ statistiken Bucket_LastReset Förra nollställningen Bucket_CurrentColor %s nuvarande färg är %s Bucket_SetColorTo Sätt %s färgen till %s Bucket_Maintenance Hantering Bucket_CreateBucket Skapa hink med namnet Bucket_DeleteBucket Ta bort hink med namnet Bucket_RenameBucket Döp om hink Bucket_Lookup Hitta Bucket_LookupMessage Hitta ord i hink Bucket_LookupMessage2 Hitta för Bucket_LookupMostLikely Det är mest sannolikt att <b>%s</b> kommer att visas i <font color=%s>%s</font> Bucket_DoesNotAppear <p><b>%s</b> kommer inte att visas i någon hink Bucket_DisabledGlobally Deaktivera globalt Bucket_To till Bucket_Quarantine Karantän SingleBucket_Title Fler detaljer för %s SingleBucket_WordCount Totalt antal ord i hinken SingleBucket_TotalWordCount Totalt antal ord SingleBucket_Percentage Procent SingleBucket_WordTable Ordtabell för %s SingleBucket_Message1 Markerat (*) ord har använts till klassifiering i denna sessionen. Tryck på ett ord för att visa dess sannolikhet i alla hinkar. SingleBucket_Unique %s unique Session_Title Sessionen har gått ut Session_Error Din session har gått ut. Detta kan ha orsakats genom att starta och stänga av servern medan webläsaren har förblivit öppen. Klicka på en av länkarna ovan för att fortsätta använda webgränsnittet. |
|
From: <jgr...@us...> - 2003-04-30 20:28:35
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv30866/POPFile
Modified Files:
Logger.pm
Log Message:
Add leading zeroes in the hours, minutes, seconds
Index: Logger.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Logger.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Logger.pm 29 Apr 2003 12:10:55 -0000 1.15
--- Logger.pm 30 Apr 2003 20:28:30 -0000 1.16
***************
*** 7,11 ****
#----------------------------------------------------------------------------
#
! # This module handles POPFile's logger. It is used to save debugging
# information to disk or to send it to the screen.
#
--- 7,11 ----
#----------------------------------------------------------------------------
#
! # This module handles POPFile's logger. It is used to save debugging
# information to disk or to send it to the screen.
#
***************
*** 143,148 ****
$year += 1900;
$mon += 1;
- my $msg = "$year/$mon/$mday $hour:$min:$sec $$: $message";
if ( $self->global_config_( 'debug' ) & 1 ) {
--- 143,152 ----
$year += 1900;
$mon += 1;
+ $min = "0$min" if ( $min < 10 );
+ $hour = "0$hour" if ( $hour < 10 );
+ $sec = "0$sec" if ( $sec < 10 );
+
+ my $msg = "$year/$mon/$mday $hour:$min:$sec $$: $message";
if ( $self->global_config_( 'debug' ) & 1 ) {
|
|
From: <ssc...@us...> - 2003-04-30 05:46:50
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv8285
Modified Files:
HTML.pm
Log Message:
Fixes deletion bug by redirecting to a safe URL from any non-idempotent pages.
Also adds a method for printing multiple form fields (correctly omits them if they have no value)
[ 699073 ] prevent repeated message deletion
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** HTML.pm 27 Apr 2003 01:08:13 -0000 1.146
--- HTML.pm 30 Apr 2003 05:46:46 -0000 1.147
***************
*** 2302,2306 ****
$body .= "[<a href=\"/history?start_message=";
$body .= $start_message - $self->config_( 'page_size' );
! $body .= "&session=$self->{session_key__}&sort=$self->{form_}{sort}&search=$self->{form_}{search}&filter=$self->{form_}{filter}\">< $self->{language__}{Previous}</a>] ";
}
my $i = 0;
--- 2302,2306 ----
$body .= "[<a href=\"/history?start_message=";
$body .= $start_message - $self->config_( 'page_size' );
! $body .= $self->print_form_fields_(0,1,('session','filter','search','sort')) . "\">< $self->{language__}{Previous}</a>] ";
}
my $i = 0;
***************
*** 2310,2314 ****
$body .= $i+1 . "</b>";
} else {
! $body .= "[<a href=\"/history?start_message=$i&session=$self->{session_key__}&search=$self->{form_}{search}&sort=$self->{form_}{sort}&filter=$self->{form_}{filter}\">";
$body .= $i+1 . "</a>]";
}
--- 2310,2314 ----
$body .= $i+1 . "</b>";
} else {
! $body .= "[<a href=\"/history?start_message=$i" . $self->print_form_fields_(0,1,('session','filter','search','sort')). "\">";
$body .= $i+1 . "</a>]";
}
***************
*** 2320,2324 ****
$body .= "[<a href=\"/history?start_message=";
$body .= $start_message + $self->config_( 'page_size' );
! $body .= "&session=$self->{session_key__}&sort=$self->{form_}{sort}&search=$self->{form_}{search}&filter=$self->{form_}{filter}\">$self->{language__}{Next} ></a>]";
}
--- 2320,2324 ----
$body .= "[<a href=\"/history?start_message=";
$body .= $start_message + $self->config_( 'page_size' );
! $body .= $self->print_form_fields_(0,1,('session','filter','search','sort')) . "\">$self->{language__}{Next} ></a>]";
}
***************
*** 2716,2719 ****
--- 2716,2729 ----
( defined( $self->{form_}{clearall} ) ) ||
( defined( $self->{form_}{clearpage} ) ) );
+
+ # Redirect somewhere safe if non-idempotent action has been taken
+
+ if ( defined( $self->{form_}{deletemessage} ) ||
+ defined( $self->{form_}{clearpage} ) ||
+ defined( $self->{form_}{undo} ) ||
+ defined( $self->{form_}{reclassify} ) ) {
+ return $self->http_redirect_( $client, "/history?" . $self->print_form_fields_(1,0,('start_message','filter','search','sort','session') ) );
+ }
+
my $body = '';
***************
*** 2723,2726 ****
--- 2733,2737 ----
$start_message = $self->{form_}{start_message} if ( ( defined($self->{form_}{start_message}) ) && ($self->{form_}{start_message} > 0 ) );
+ $self->{form_}{start_message} = $start_message;
my $stop_message = $start_message + $self->config_( 'page_size' ) - 1;
$stop_message = $self->history_size() - 1 if ( $stop_message >= $self->history_size() );
***************
*** 2773,2777 ****
foreach my $header ('', 'from', 'subject', 'bucket') {
$body .= "<th class=\"historyLabel\" scope=\"col\">\n";
! $body .= "<a href=\"/history?session=$self->{session_key__}&filter=$self->{form_}{filter}&setsort=" . ($self->{form_}{sort} eq "$header"?"-":"");
$body .= "$header\">";
--- 2784,2788 ----
foreach my $header ('', 'from', 'subject', 'bucket') {
$body .= "<th class=\"historyLabel\" scope=\"col\">\n";
! $body .= "<a href=\"/history?" . $self->print_form_fields_(1,1,('filter','session','search')) . "&setsort=" . ($self->{form_}{sort} eq "$header"?"-":"");
$body .= "$header\">";
***************
*** 2822,2826 ****
$mail_file =~ /popfile\d+=(\d+)\.msg$/;
$body .= "<a title=\"$from\">$short_from</a></td>\n";
! $body .= "<td><a class=\"messageLink\" title=\"$subject\" href=\"/view?view=$mail_file&start_message=$start_message&session=$self->{session_key__}&sort=$self->{form_}{sort}&filter=$self->{form_}{filter}&search=$self->{form_}{search}\">";
$body .= "$short_subject</a></td>\n<td>";
if ( $reclassified ) {
--- 2833,2837 ----
$mail_file =~ /popfile\d+=(\d+)\.msg$/;
$body .= "<a title=\"$from\">$short_from</a></td>\n";
! $body .= "<td><a class=\"messageLink\" title=\"$subject\" href=\"/view?view=$mail_file" . $self->print_form_fields_(0,1,('start_message','session','filter','search','sort')) . "\">";
$body .= "$short_subject</a></td>\n<td>";
if ( $reclassified ) {
***************
*** 2933,2937 ****
$body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index - 1 ];
$body .= "&start_message=". ((( $index - 1 ) >= $start_message )?$start_message:($start_message - $self->config_( 'page_size' )));
! $body .= "&session=$self->{session_key__}&sort=$self->{form_}{sort}&filter=$self->{form_}{filter}&search=$self->{form_}{search}\"><<";
$body .= $self->{language__}{Previous};
$body .= "</a> ";
--- 2944,2948 ----
$body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index - 1 ];
$body .= "&start_message=". ((( $index - 1 ) >= $start_message )?$start_message:($start_message - $self->config_( 'page_size' )));
! $body .= $self->print_form_fields_(0,1,('filter','session','search','sort')) . "\"><<";
$body .= $self->{language__}{Previous};
$body .= "</a> ";
***************
*** 2941,2945 ****
$body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index + 1 ];
$body .= "&start_message=". ((( $index + 1 ) < ( $start_message + $self->config_( 'page_size' ) ) )?$start_message:($start_message + $self->config_( 'page_size' )));
! $body .= "&session=$self->{session_key__}&sort=$self->{form_}{sort}&filter=$self->{form_}{filter}&search=$self->{form_}{search}\"> ";
$body .= $self->{language__}{Next};
$body .= ">></a>";
--- 2952,2956 ----
$body .= "<a href=\"/view?view=" . $self->{history_keys__}[ $index + 1 ];
$body .= "&start_message=". ((( $index + 1 ) < ( $start_message + $self->config_( 'page_size' ) ) )?$start_message:($start_message + $self->config_( 'page_size' )));
! $body .= $self->print_form_fields_(0,1,('filter','session','search','sort')) . "\"> ";
$body .= $self->{language__}{Next};
$body .= ">></a>";
***************
*** 2949,2953 ****
$body .= "<td class=\"openMessageCloser\">";
! $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&session=$self->{session_key__}&sort=$self->{form_}{sort}&search=$self->{form_}{search}&filter=$self->{form_}{filter}\">\n";
$body .= "<span class=\"historyLabel\">$self->{language__}{Close}</span>\n</a>\n";
$body .= "</td>\n</tr>\n</table>\n";
--- 2960,2964 ----
$body .= "<td class=\"openMessageCloser\">";
! $body .= "<a class=\"messageLink\" href=\"/history?" . $self->print_form_fields_(1,1,('start_message','filter','session','search','sort')) . "\">\n";
$body .= "<span class=\"historyLabel\">$self->{language__}{Close}</span>\n</a>\n";
$body .= "</td>\n</tr>\n</table>\n";
***************
*** 3068,3072 ****
$body .= "<tr>\n<td class=\"openMessageCloser\">";
! $body .= "<a class=\"messageLink\" href=\"/history?start_message=$start_message&session=$self->{session_key__}&sort=$self->{form_}{sort}&search=$self->{form_}{search}&filter=$self->{form_}{filter}\">\n";
$body .= "<span class=\"historyLabel\">$self->{language__}{Close}</span>\n</a>\n";
$body .= "</td>\n</tr>\n";
--- 3079,3083 ----
$body .= "<tr>\n<td class=\"openMessageCloser\">";
! $body .= "<a class=\"messageLink\" href=\"/history?" . $self->print_form_fields_(1,1,('start_message','filter','session','search','sort')). "\">\n";
$body .= "<span class=\"historyLabel\">$self->{language__}{Close}</span>\n</a>\n";
$body .= "</td>\n</tr>\n";
***************
*** 3328,3331 ****
--- 3339,3384 ----
}
}
+
+ # ---------------------------------------------------------------------------------------------
+ #
+ # print_form_fields_ - Returns a form string containing any presently defined form fields
+ #
+ # $first - 1 if the form field is at the beginning of a query, 0 otherwise
+ # $in_href - 1 if the form field is printing in a href, 0 otherwise (eg, for a 302 redirect)
+ # $include - a list of fields to return
+ #
+ # ---------------------------------------------------------------------------------------------
+ sub print_form_fields_
+ {
+ my ($self, $first, $in_href, @include) = @_;
+
+ my $amp;
+ if ($in_href) {
+ $amp = '&';
+ } else {
+ $amp = '&';
+ }
+
+ my $count = 0;
+ my $formstring = '';
+
+ $formstring = "$amp" if (!$first);
+
+ foreach my $field ( @include ) {
+ unless ( !defined($self->{form_}{$field}) || ( $self->{form_}{$field} eq '' ) ) {
+ $formstring .= "$amp" if ($count > 0);
+ if ($field eq 'session') {
+ $formstring .= "session=$self->{session_key__}";
+ } else {
+ $formstring .= "$field=$self->{form_}{$field}";
+ }
+ $count++;
+ }
+ }
+
+ return $formstring if ($count > 0);
+ return '';
+ }
+
# ---------------------------------------------------------------------------------------------
|
|
From: <ssc...@us...> - 2003-04-30 03:13:42
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv30969
Modified Files:
MailParse.pm
Log Message:
fix bug preventing decoding of mail [ 729551 ]
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** MailParse.pm 29 Apr 2003 13:25:12 -0000 1.122
--- MailParse.pm 30 Apr 2003 03:13:36 -0000 1.123
***************
*** 1201,1206 ****
if ( $header =~ /^From$/i ) {
- $encoding = '';
- $self->{content_type__} = '';
$self->{from__} = $argument if ( $self->{from__} eq '' ) ;
$prefix = 'from';
--- 1201,1204 ----
|
|
From: <ssc...@us...> - 2003-04-30 03:10:06
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv29721
Modified Files:
Tag: v0/18/1
MailParse.pm
Log Message:
fix bug preventing decoding of mail
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.91.2.5
retrieving revision 1.91.2.6
diff -C2 -d -r1.91.2.5 -r1.91.2.6
*** MailParse.pm 20 Apr 2003 22:21:53 -0000 1.91.2.5
--- MailParse.pm 30 Apr 2003 03:10:00 -0000 1.91.2.6
***************
*** 1014,1019 ****
if ( $header =~ /^From$/i ) {
- $encoding = '';
- $self->{content_type} = '';
$self->{from} = $argument if ( $self->{from} eq '' ) ;
$prefix = 'from';
--- 1014,1017 ----
|
|
From: <jgr...@us...> - 2003-04-29 13:25:19
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv4816/Classifier
Modified Files:
MailParse.pm
Log Message:
Remove debug line
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** MailParse.pm 29 Apr 2003 13:22:30 -0000 1.121
--- MailParse.pm 29 Apr 2003 13:25:12 -0000 1.122
***************
*** 154,158 ****
my ( $self, $prefix, $word ) = @_;
- print "update_pseudoword:$prefix:$word\n";
$self->increment_word( "$prefix:$word" );
}
--- 154,157 ----
|
|
From: <jgr...@us...> - 2003-04-29 13:22:34
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv3735/Classifier
Modified Files:
MailParse.pm
Log Message:
Fix bug in HTML parser where tags split across lines got spaces added messing up attribute values; fix bug in invisibleink detection; strip CRLF from quoted-printable decoded lines
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** MailParse.pm 27 Apr 2003 04:01:14 -0000 1.120
--- MailParse.pm 29 Apr 2003 13:22:30 -0000 1.121
***************
*** 154,157 ****
--- 154,158 ----
my ( $self, $prefix, $word ) = @_;
+ print "update_pseudoword:$prefix:$word\n";
$self->increment_word( "$prefix:$word" );
}
***************
*** 319,323 ****
}
} else {
! $self->increment_word( 'trick:invisibleink' );
}
}
--- 320,326 ----
}
} else {
! if ( $bigline ne '' ) {
! $self->increment_word( 'trick:invisibleink' );
! }
}
}
***************
*** 722,727 ****
my $found = 1;
! $line =~ s/[\r\n]+/ /g;
! $line =~ s/[\t ]+$//;
print "parse_html: [$line] " . $self->{in_html_tag__} . "\n" if $self->{debug};
--- 725,729 ----
my $found = 1;
! $line =~ s/[\r\n]+//gm;
print "parse_html: [$line] " . $self->{in_html_tag__} . "\n" if $self->{debug};
***************
*** 737,742 ****
$found = 0;
- $line =~ s/^[\t ]+//;
-
# If we are in an HTML tag then look for the close of the tag, if we get it then
# handle the tag, if we don't then keep building up the arguments of the tag
--- 739,742 ----
***************
*** 744,748 ****
if ( $self->{in_html_tag__} ) {
if ( $line =~ s/^(.*?)>// ) {
! $self->{html_arg__} .= ' ' . $1;
$self->{in_html_tag__} = 0;
$self->{html_tag__} =~ s/=\n ?//g;
--- 744,748 ----
if ( $self->{in_html_tag__} ) {
if ( $line =~ s/^(.*?)>// ) {
! $self->{html_arg__} .= $1;
$self->{in_html_tag__} = 0;
$self->{html_tag__} =~ s/=\n ?//g;
***************
*** 754,758 ****
next;
} else {
! $self->{html_arg__} .= ' ' . $line;
return 1;
}
--- 754,758 ----
next;
} else {
! $self->{html_arg__} .= $line;
return 1;
}
***************
*** 1012,1015 ****
--- 1012,1016 ----
if ( $encoding =~ /quoted\-printable/i ) {
$line = decode_qp( $line );
+ $line =~ s/[\r\n]+$//g;
$self->{ut__} = decode_qp( $self->{ut__} ) if ( $self->{color__} );
}
|
|
From: <jgr...@us...> - 2003-04-29 12:10:59
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv30535
Modified Files:
Logger.pm
Log Message:
Month was off by one
Index: Logger.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Logger.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Logger.pm 18 Apr 2003 21:01:59 -0000 1.14
--- Logger.pm 29 Apr 2003 12:10:55 -0000 1.15
***************
*** 142,146 ****
--- 142,148 ----
my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) = localtime;
$year += 1900;
+ $mon += 1;
my $msg = "$year/$mon/$mday $hour:$min:$sec $$: $message";
+
if ( $self->global_config_( 'debug' ) & 1 ) {
|
|
From: <ssc...@us...> - 2003-04-27 21:05:26
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv11282
Modified Files:
Tag: v0/18/1
POP3.pm
Log Message:
prevent duplicates, header saving and message over-writing when toptoo is enabled
[ 701390 ] -toptoo 1 results in duplicates in history
[ 705448 ] Right Classification, Wrong Headers
[ 694002 ] email scored as spam but classified as real
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -C2 -d -r1.40.2.1 -r1.40.2.2
*** POP3.pm 2 Mar 2003 19:26:53 -0000 1.40.2.1
--- POP3.pm 27 Apr 2003 21:05:23 -0000 1.40.2.2
***************
*** 525,531 ****
if ( $self->{configuration}->{configuration}{toptoo} ) {
if ( echo_response( $self, $mail, $client, "RETR $1" ) ) {
! my $class = $self->{classifier}->classify_and_modify( $mail, $client, $download_count, $count, 1, '' );
if ( echo_response( $self, $mail, $client, $command ) ) {
! $self->{classifier}->classify_and_modify( $mail, $client, $download_count, $count, 0, $class );
# Tell the parent that we just handled a mail
--- 525,539 ----
if ( $self->{configuration}->{configuration}{toptoo} ) {
if ( echo_response( $self, $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, $client, $download_count, 0, 1, '', 0 );
!
if ( echo_response( $self, $mail, $client, $command ) ) {
!
! # Classify with pre-defined class, without saving, echoing to client
!
! $self->{classifier}->classify_and_modify( $mail, $client, $download_count, 0, 1, $class, 1 );
# Tell the parent that we just handled a mail
|
|
From: <ssc...@us...> - 2003-04-27 21:05:05
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv11074
Modified Files:
Tag: v0/18/1
Bayes.pm
Log Message:
prevent duplicates, header saving and message over-writing when toptoo is enabled
[ 701390 ] -toptoo 1 results in duplicates in history
[ 705448 ] Right Classification, Wrong Headers
[ 694002 ] email scored as spam but classified as real
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.107.2.4
retrieving revision 1.107.2.5
diff -C2 -d -r1.107.2.4 -r1.107.2.5
*** Bayes.pm 19 Apr 2003 11:53:55 -0000 1.107.2.4
--- Bayes.pm 27 Apr 2003 21:05:00 -0000 1.107.2.5
***************
*** 754,757 ****
--- 754,758 ----
# $nosave - indicates that the message downloaded should not be saved in the history
# $class - if we already know the classification
+ # $echo - 1 to echo to the client, 0 to supress, defaults to 1
#
# Returns a classification if it worked, otherwise returns an empty string
***************
*** 760,764 ****
sub classify_and_modify
{
! my ( $self, $mail, $client, $dcount, $mcount, $nosave, $class ) = @_;
my $msg_subject = ''; # The message subject
--- 761,767 ----
sub classify_and_modify
{
! my ( $self, $mail, $client, $dcount, $mcount, $nosave, $class, $echo ) = @_;
!
! $echo = 1 unless (defined $echo);
my $msg_subject = ''; # The message subject
***************
*** 829,845 ****
$message_size += length $line;
print TEMP $fileline;
! if ( $line =~ /^Subject:(.*)/i ) {
! $msg_subject = $1;
! $msg_subject =~ s/(\012|\015)//g;
! next;
! }
! # Strip out the X-Text-Classification header that is in an incoming message
! if ( ( $line =~ /^X-Text-Classification:/i ) == 0 ) {
! if ( $msg_subject eq '' ) {
! $msg_head_before .= $line;
! } else {
! $msg_head_after .= $line;
}
}
--- 832,852 ----
$message_size += length $line;
print TEMP $fileline;
+
+ # If there is no echoing occuring, it doesn't matter what we do to these
! if ($echo) {
! if ( $line =~ /^Subject:(.*)/i ) {
! $msg_subject = $1;
! $msg_subject =~ s/(\012|\015)//g;
! next;
! }
! # Strip out the X-Text-Classification header that is in an incoming message
! if ( ( $line =~ /^X-Text-Classification:/i ) == 0 ) {
! if ( $msg_subject eq '' ) {
! $msg_head_before .= $line;
! } else {
! $msg_head_after .= $line;
! }
}
}
***************
*** 857,861 ****
# Check to see if too much time has passed and we need to keep the mail client happy
if ( time > ( $last_timeout + 2 ) ) {
! print $client "X-POPFile-TimeoutPrevention: $timeout_count$eol" if ( !$nosave );
$timeout_count += 1;
$last_timeout = time;
--- 864,868 ----
# Check to see if too much time has passed and we need to keep the mail client happy
if ( time > ( $last_timeout + 2 ) ) {
! print $client "X-POPFile-TimeoutPrevention: $timeout_count$eol" if ( $echo );
$timeout_count += 1;
$last_timeout = time;
***************
*** 911,915 ****
# Echo the text of the message to the client
! if ( !$nosave ) {
# If the bucket is quarantined then we'll treat it specially by changing the message header to contain
--- 918,922 ----
# Echo the text of the message to the client
! if ( $echo ) {
# If the bucket is quarantined then we'll treat it specially by changing the message header to contain
***************
*** 947,956 ****
print $client $msg_head_after;
print $client $msg_body;
- }
! if ( $got_full_body == 0 ) {
! echo_to_dot( $self, $mail, $client ) if ( !$nosave );
! } else {
! print $client ".$eol" if ( !$nosave );
}
--- 954,963 ----
print $client $msg_head_after;
print $client $msg_body;
! if ( $got_full_body == 0 ) {
! echo_to_dot( $self, $mail, $client );
! } else {
! print $client ".$eol";
! }
}
|
|
From: <xue...@us...> - 2003-04-27 14:29:59
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv12199
Modified Files:
installer.nsi
Log Message:
Installer now uses the popfile.ico file from the "engine\Platform" folder and the uninstaller uses a modified version of that icon file.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** installer.nsi 25 Apr 2003 11:25:36 -0000 1.37
--- installer.nsi 27 Apr 2003 14:29:55 -0000 1.38
***************
*** 62,65 ****
--- 62,72 ----
!define MUI_CUSTOMPAGECOMMANDS
+ ; The icon files for the installer and uninstaller must have the same structure. For example,
+ ; if one icon file contains a 32x32 16-colour image and a 16x16 16-colour image then the other
+ ; file cannot just contain a 32x32 16-colour image, it must also have a 16x16 16-colour image.
+
+ !define MUI_ICON "..\engine\Platform\popfile.ico"
+ !define MUI_UNICON "remove.ico"
+
#--------------------------------------------------------------------------
# User Registers (Global)
|
|
From: <xue...@us...> - 2003-04-27 14:24:34
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1:/tmp/cvs-serv8253 Added Files: remove.ico Log Message: Icon for the POPFile uninstaller. --- NEW FILE: remove.ico --- (This appears to be a binary file; contents omitted.) |
|
From: <ssc...@us...> - 2003-04-27 04:01:18
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv20929
Modified Files:
MailParse.pm
Log Message:
improve URL parsing and decoding
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** MailParse.pm 27 Apr 2003 02:57:12 -0000 1.119
--- MailParse.pm 27 Apr 2003 04:01:14 -0000 1.120
***************
*** 419,423 ****
} else {
! my $host = add_url( $self, $value, $encoded, $quote, $end_quote, '' );
# If the host name is not blank (i.e. there was a hostname in the url
--- 419,423 ----
} else {
! my $host = add_url( $self, $value, $encoded, $quote, $end_quote, '' );
# If the host name is not blank (i.e. there was a hostname in the url
***************
*** 586,600 ****
# Strip the protocol part of a URL (e.g. http://)
! $protocol = $1 if ( $url =~ s/^(.*)\:\/\/// );
# Remove any URL encoding (protocol may not be URL encoded)
! while ( $url =~ /(\%([0-9A-Fa-f][0-9A-Fa-f]))/g ) {
! my $from = "$1";
! my $to = chr(hex("0x$2"));
! $url =~ s/$from/$to/g;
! $self->{ut__} =~ s/$from/$to/g;
! print "$from -> $to\n" if $self->{debug};
increment_word( $self, "html:encodedurl" );
}
--- 586,598 ----
# Strip the protocol part of a URL (e.g. http://)
! $protocol = $1 if ( $url =~ s/^([^:]*)\:\/\/// );
# Remove any URL encoding (protocol may not be URL encoded)
! if ( $url =~ s/(\%([0-9A-Fa-f][0-9A-Fa-f]))/chr(hex("0x$2"))/eg ) {
increment_word( $self, "html:encodedurl" );
+ my $new_url = (defined $protocol?"$protocol://":'') . $url;
+ print "$temp_url -> " . $new_url . "\n" if $self->{debug};
+ $self->{ut__} =~ s/$temp_url/$new_url/e if $self->{color__};
}
|
|
From: <ssc...@us...> - 2003-04-27 02:57:16
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv21009
Modified Files:
MailParse.pm
Log Message:
protect CID: URL's from identification as off-site images
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** MailParse.pm 27 Apr 2003 00:20:51 -0000 1.118
--- MailParse.pm 27 Apr 2003 02:57:12 -0000 1.119
***************
*** 408,422 ****
( ( $tag =~ /^img|frame|iframe$/i )
|| ( $tag =~ /^script$/i && $parse_script_uri ) ) ) {
! my $host = add_url( $self, $value, $encoded, $quote, $end_quote, '' );
! # If the host name is not blank (i.e. there was a hostname in the url
! # and it was an image, then if the host was not this host then report
! # an off machine image
! if ( ( $host ne '' ) && ( $tag =~ /^img$/i ) ) {
! if ( $host ne 'localhost' ) {
! $self->update_pseudoword( 'html', 'imgremotesrc' );
! }
! }
next;
--- 408,435 ----
( ( $tag =~ /^img|frame|iframe$/i )
|| ( $tag =~ /^script$/i && $parse_script_uri ) ) ) {
!
! # "CID:" links refer to an origin-controlled attachment to a html email.
! # Adding strings from these, even if they appear to be hostnames, may or
! # may not be beneficial
! if ($value =~ /^cid\:/i )
! {
! # TODO: Decide what to do here, ignoring CID's for now
!
! } else {
! my $host = add_url( $self, $value, $encoded, $quote, $end_quote, '' );
!
! # If the host name is not blank (i.e. there was a hostname in the url
! # and it was an image, then if the host was not this host then report
! # an off machine image
!
! if ( ( $host ne '' ) && ( $tag =~ /^img$/i ) ) {
! if ( $host ne 'localhost' ) {
! $self->update_pseudoword( 'html', 'imgremotesrc' );
! }
! }
! }
!
next;
***************
*** 485,489 ****
$attribute = lc( $attribute );
$self->update_pseudoword( 'html', "img$attribute$value" );
! }
# Font sizes
--- 498,502 ----
$attribute = lc( $attribute );
$self->update_pseudoword( 'html', "img$attribute$value" );
! }
# Font sizes
|
|
From: <ssc...@us...> - 2003-04-27 01:11:17
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1:/tmp/cvs-serv26129 Modified Files: English.msg Log Message: localize a magnet string, fix new version checking, fix magnet highlighting for < and > Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** English.msg 21 Apr 2003 20:54:01 -0000 1.31 --- English.msg 27 Apr 2003 01:11:14 -0000 1.32 *************** *** 137,140 **** --- 137,141 ---- History_ClassifyAs Classify as History_MagnetUsed Magnet used + History_MagnetBecause <b>Magnet Used</b><p>Classified to <font color="%s">%s</font> because of magnet %s </p> History_ChangedTo Changed to <font color="%s">%s History_Already Already reclassified as <font color="%s">%s</font> |
|
From: <ssc...@us...> - 2003-04-27 01:11:04
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv25992
Modified Files:
Bayes.pm
Log Message:
localize a magnet string, fix new version checking, fix magnet highlighting for < and >
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** Bayes.pm 27 Apr 2003 00:11:57 -0000 1.139
--- Bayes.pm 27 Apr 2003 01:11:00 -0000 1.140
***************
*** 541,545 ****
if ( $noattype =~ m/\Q$regex\E/i ) {
! $self->{scores__} = "<b>Magnet Used</b><p>Classified to <font color=\"$self->{colors__}{$bucket}\">$bucket</font> because of magnet $type: " . Classifier::MailParse::splitline($magnet,0) . "</p>";
$self->{magnet_used__} = 1;
$self->{magnet_detail__} = "$type: $magnet";
--- 541,545 ----
if ( $noattype =~ m/\Q$regex\E/i ) {
! $self->{scores__} = '';
$self->{magnet_used__} = 1;
$self->{magnet_detail__} = "$type: $magnet";
|
|
From: <ssc...@us...> - 2003-04-27 01:08:17
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv24890
Modified Files:
HTML.pm
Log Message:
localize a magnet string, fix new version checking, fix magnet highlighting for < and >
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** HTML.pm 26 Apr 2003 04:21:31 -0000 1.145
--- HTML.pm 27 Apr 2003 01:08:13 -0000 1.146
***************
*** 411,415 ****
if ( $self->config_( 'update_check' ) ) {
$update_check = "<a href=\"http://sourceforge.net/project/showfiles.php?group_id=63137\">\n";
! $update_check .= "<img border=\"0\" alt=\"\" src=\"http://www.usethesource.com/cgi-bin/popfile_update.pl?ma=$self->{configuration}{major_version}&mi=$self->{configuration}{minor_version}&bu=$self->{configuration}{build_version}\" />\n</a>\n";
}
--- 411,416 ----
if ( $self->config_( 'update_check' ) ) {
$update_check = "<a href=\"http://sourceforge.net/project/showfiles.php?group_id=63137\">\n";
! my ( $major_version, $minor_version, $build_version ) = $self->version() =~ /^v([^.]*)\.([^.]*)\.(.*)$/;
! $update_check .= "<img border=\"0\" alt=\"\" src=\"http://www.usethesource.com/cgi-bin/popfile_update.pl?ma=" . $major_version . "&mi=" . $minor_version . "&bu=" . $build_version . "\" />\n</a>\n";
}
***************
*** 2999,3034 ****
$body .= $self->{classifier__}->get_html_colored_message($self->global_config_( 'msgdir' ) . $mail_file);
} else {
! $self->{history__}{$mail_file}{magnet} =~ /(.+): ([^\r\n]+)/;
! my $header = $1;
! my $text = $2;
! $body .= "<tt>";
!
! open MESSAGE, '<' . $self->global_config_( 'msgdir' ) . $mail_file;
! my $line;
! # process each line of the message
! while ($line = <MESSAGE>) {
! $line =~ s/</</g;
! $line =~ s/>/>/g;
!
! $line =~ s/([^\r\n]{100,150} )/$1<br \/>/g;
! $line =~ s/([^ \r\n]{150})/$1<br \/>/g;
! $line =~ s/[\r\n]+/<br \/>/g;
!
! if ( $line =~ /^([A-Za-z-]+): ?([^\n\r]*)/ ) {
! my $head = $1;
! my $arg = $2;
!
! if ( $head =~ /\Q$header\E/i ) {
! if ( $arg =~ /\Q$text\E/i ) {
! my $new_color = $self->{classifier__}->get_bucket_color($self->{history__}{$mail_file}{bucket});
! $line =~ s/(\Q$text\E)/<b><font color=\"$new_color\">$1<\/font><\/b>/;
! }
! }
! }
!
! $body .= $line;
! }
! close MESSAGE;
! $body .= "</tt>\n";
}
--- 3000,3039 ----
$body .= $self->{classifier__}->get_html_colored_message($self->global_config_( 'msgdir' ) . $mail_file);
} else {
! $self->{history__}{$mail_file}{magnet} =~ /(.+): ([^\r\n]+)/;
! my $header = $1;
! my $text = $2;
! $body .= "<tt>";
!
! open MESSAGE, '<' . $self->global_config_( 'msgdir' ) . $mail_file;
! my $line;
! # process each line of the message
! while ($line = <MESSAGE>) {
! $line =~ s/</</g;
! $line =~ s/>/>/g;
!
! $line =~ s/([^\r\n]{100,150} )/$1<br \/>/g;
! $line =~ s/([^ \r\n]{150})/$1<br \/>/g;
! $line =~ s/[\r\n]+/<br \/>/g;
!
! if ( $line =~ /^([A-Za-z-]+): ?([^\n\r]*)/ ) {
! my $head = $1;
! my $arg = $2;
!
! if ( $head =~ /\Q$header\E/i ) {
!
! $text =~ s/</</g;
! $text =~ s/>/>/g;
!
! if ( $arg =~ /\Q$text\E/i ) {
! my $new_color = $self->{classifier__}->get_bucket_color($bucket);
! $line =~ s/(\Q$text\E)/<b><font color=\"$new_color\">$1<\/font><\/b>/;
! }
! }
! }
!
! $body .= $line;
! }
! close MESSAGE;
! $body .= "</tt>\n";
}
***************
*** 3036,3053 ****
$body .= "<tr><td class=\"top20\" valign=\"top\">\n";
!
! # Enable saving of word-scores
!
! $self->{classifier__}->wordscores( 1 );
!
! # Build the scores by classifying the message
!
! $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . $mail_file, $self);
!
! # Disable, print, and clear saved word-scores
!
! $self->{classifier__}->wordscores( 0 );
! $body .= $self->{classifier__}->scores();
! $self->{classifier__}->scores('');
# Close button
--- 3041,3067 ----
$body .= "<tr><td class=\"top20\" valign=\"top\">\n";
!
! if ($self->{history__}{$mail_file}{magnet} eq '') {
!
! # Enable saving of word-scores
!
! $self->{classifier__}->wordscores( 1 );
!
! # Build the scores by classifying the message
!
! $self->{classifier__}->classify_file($self->global_config_( 'msgdir' ) . $mail_file, $self);
!
! # Disable, print, and clear saved word-scores
!
! $self->{classifier__}->wordscores( 0 );
! $body .= $self->{classifier__}->scores();
! $self->{classifier__}->scores('');
!
! } else {
! $body .= sprintf( $self->{language__}{History_MagnetBecause},
! $color, $bucket,
! Classifier::MailParse::splitline($self->{history__}{$mail_file}{magnet},0)
! );
! }
# Close button
|
|
From: <jgr...@us...> - 2003-04-27 00:20:55
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv27871/Classifier
Modified Files:
MailParse.pm
Log Message:
Added pseudowords html:imgremotesrc to catch The Big Picture spams
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** MailParse.pm 27 Apr 2003 00:11:57 -0000 1.117
--- MailParse.pm 27 Apr 2003 00:20:51 -0000 1.118
***************
*** 408,412 ****
( ( $tag =~ /^img|frame|iframe$/i )
|| ( $tag =~ /^script$/i && $parse_script_uri ) ) ) {
! add_url( $self, $value, $encoded, $quote, $end_quote, '' );
next;
}
--- 408,423 ----
( ( $tag =~ /^img|frame|iframe$/i )
|| ( $tag =~ /^script$/i && $parse_script_uri ) ) ) {
! my $host = add_url( $self, $value, $encoded, $quote, $end_quote, '' );
!
! # If the host name is not blank (i.e. there was a hostname in the url
! # and it was an image, then if the host was not this host then report
! # an off machine image
!
! if ( ( $host ne '' ) && ( $tag =~ /^img$/i ) ) {
! if ( $host ne 'localhost' ) {
! $self->update_pseudoword( 'html', 'imgremotesrc' );
! }
! }
!
next;
}
***************
*** 539,542 ****
--- 550,555 ----
# identification of values found in for example the subject line
#
+ # Returns the hostname
+ #
# ---------------------------------------------------------------------------------------------
sub add_url
***************
*** 642,648 ****
}
! if ( !defined $host || $host eq '' ) {
print "no hostname found: [$temp_url]\n" if ($self->{debug});
! return 0;
}
--- 655,661 ----
}
! if ( !defined( $host ) || ( $host eq '' ) ) {
print "no hostname found: [$temp_url]\n" if ($self->{debug});
! return '';
}
***************
*** 652,656 ****
$hash = $1 if ( $url =~ s/^[\#](.*)$// );
! if ( !defined $protocol || $protocol =~ /^(http|https)$/ ) {
$temp_before = $before;
$temp_before = "\:\/\/" if (defined $protocol);
--- 665,669 ----
$hash = $1 if ( $url =~ s/^[\#](.*)$// );
! if ( !defined( $protocol ) || ( $protocol =~ /^(http|https)$/ ) ) {
$temp_before = $before;
$temp_before = "\:\/\/" if (defined $protocol);
***************
*** 678,682 ****
# $protocol $authinfo $host $port $query $hash may be processed below if desired
! return 1;
}
--- 691,695 ----
# $protocol $authinfo $host $port $query $hash may be processed below if desired
! return $host;
}
|
|
From: <jgr...@us...> - 2003-04-27 00:12:03
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv22470/Classifier
Modified Files:
Bayes.pm MailParse.pm
Log Message:
Added new pseudowords html:imgwidthX and html:imgheightY used to catch web bugs
Index: Bayes.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/Bayes.pm,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** Bayes.pm 26 Apr 2003 09:43:20 -0000 1.138
--- Bayes.pm 27 Apr 2003 00:11:57 -0000 1.139
***************
*** 1287,1291 ****
if ( /([^\s]+) (\d+)/ ) {
! my $word = $self->{mangler__}->mangle($1,1);
my $value = $2;
$value =~ s/[\r\n]//g;
--- 1287,1291 ----
if ( /([^\s]+) (\d+)/ ) {
! my $word = $1;
my $value = $2;
$value =~ s/[\r\n]//g;
***************
*** 1345,1349 ****
if ( /([^\s]+) (\d+)/ ) {
! my $word = $self->{mangler__}->mangle($1,1);
my $value = $2;
$value =~ s/[\r\n]//g;
--- 1345,1349 ----
if ( /([^\s]+) (\d+)/ ) {
! my $word = $1;
my $value = $2;
$value =~ s/[\r\n]//g;
Index: MailParse.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** MailParse.pm 25 Apr 2003 07:02:06 -0000 1.116
--- MailParse.pm 27 Apr 2003 00:11:57 -0000 1.117
***************
*** 424,433 ****
}
} else {
# Anything that isn't a mailto is probably an URL
!
$self->add_url($value, $encoded, $quote, $end_quote, '');
}
!
! next;
}
--- 424,434 ----
}
} else {
+
# Anything that isn't a mailto is probably an URL
!
$self->add_url($value, $encoded, $quote, $end_quote, '');
}
!
! next;
}
***************
*** 455,458 ****
--- 456,460 ----
# Tags with colors in them
+
if ( ( $attribute =~ /^color$/i ) && ( $tag =~ /^font$/i ) ) {
update_word( $self, $value, $encoded, $quote, $end_quote, '' );
***************
*** 467,471 ****
--- 469,481 ----
}
+ # The width and height of images
+
+ if ( ( $attribute =~ /^(width|height)$/i ) && ( $tag =~ /^img$/i ) ) {
+ $attribute = lc( $attribute );
+ $self->update_pseudoword( 'html', "img$attribute$value" );
+ }
+
# Font sizes
+
if ( ( $attribute =~ /^size$/i ) && ( $tag =~ /^font$/i ) ) {
$self->update_pseudoword( 'html', "fontsize$value" );
|
|
From: <ssc...@us...> - 2003-04-26 10:22:26
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv11598
Modified Files:
HTTP.pm
Log Message:
allow "+" to be submitted encoded in a form
Index: HTTP.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTTP.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HTTP.pm 25 Mar 2003 05:24:58 -0000 1.1
--- HTTP.pm 26 Apr 2003 10:22:23 -0000 1.2
***************
*** 210,217 ****
$self->{form_}{$arg} = $2;
# Expand %7E (hex) escapes in the form data
$self->{form_}{$arg} =~ s/%([0-9A-F][0-9A-F])/chr hex $1/gie;
- $self->{form_}{$arg} =~ s/\+/ /g;
# Push the value onto an array to allow for multiple values of the same name
--- 210,218 ----
$self->{form_}{$arg} = $2;
+ $self->{form_}{$arg} =~ s/\+/ /g;
+
# Expand %7E (hex) escapes in the form data
$self->{form_}{$arg} =~ s/%([0-9A-F][0-9A-F])/chr hex $1/gie;
# Push the value onto an array to allow for multiple values of the same name
|
|
From: <ssc...@us...> - 2003-04-26 10:21:43
|
Update of /cvsroot/popfile/engine/UI
In directory sc8-pr-cvs1:/tmp/cvs-serv11259
Modified Files:
Tag: v0/18/1
HTML.pm
Log Message:
allow "+" to be submitted encoded in a form
Index: HTML.pm
===================================================================
RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v
retrieving revision 1.98.2.5
retrieving revision 1.98.2.6
diff -C2 -d -r1.98.2.5 -r1.98.2.6
*** HTML.pm 10 Apr 2003 23:15:46 -0000 1.98.2.5
--- HTML.pm 26 Apr 2003 10:21:39 -0000 1.98.2.6
***************
*** 3145,3154 ****
my $arg = $1;
$self->{form}{$arg} = $2;
# Expand %7E (hex) escapes in the form data
$self->{form}{$arg} =~ s/%([0-9A-F][0-9A-F])/chr hex $1/gie;
-
- $self->{form}{$arg} =~ s/\+/ /g;
# Push the value onto an array to allow for multiple values of the same name
--- 3145,3155 ----
my $arg = $1;
$self->{form}{$arg} = $2;
+
+
+ $self->{form}{$arg} =~ s/\+/ /g;
# Expand %7E (hex) escapes in the form data
$self->{form}{$arg} =~ s/%([0-9A-F][0-9A-F])/chr hex $1/gie;
# Push the value onto an array to allow for multiple values of the same name
|
|
From: <ssc...@us...> - 2003-04-26 10:07:54
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv6748
Modified Files:
POP3.pm
Log Message:
fix changing of pop3 separator in UI
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** POP3.pm 26 Apr 2003 09:44:16 -0000 1.52
--- POP3.pm 26 Apr 2003 10:07:51 -0000 1.53
***************
*** 489,493 ****
if ( defined($$form{pop3_separator}) ) {
if ( length($$form{pop3_separator}) == 1 ) {
! $self->config_( 'separator', $$form{separator} );
return '<blockquote>' . sprintf( $$language{Configuration_POP3SepUpdate} . '</blockquote>' , $self->config_( 'separator' ) );
} else {
--- 489,493 ----
if ( defined($$form{pop3_separator}) ) {
if ( length($$form{pop3_separator}) == 1 ) {
! $self->config_( 'separator', $$form{pop3_separator} );
return '<blockquote>' . sprintf( $$language{Configuration_POP3SepUpdate} . '</blockquote>' , $self->config_( 'separator' ) );
} else {
|
|
From: <ssc...@us...> - 2003-04-26 09:44:19
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv32665
Modified Files:
POP3.pm
Log Message:
prevent duplicates, header saving and message over-writing when toptoo is enabled
[ 701390 ] -toptoo 1 results in duplicates in history
[ 705448 ] Right Classification, Wrong Headers
Index: POP3.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/POP3.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** POP3.pm 15 Apr 2003 14:48:09 -0000 1.51
--- POP3.pm 26 Apr 2003 09:44:16 -0000 1.52
***************
*** 269,275 ****
if ( $self->config_( 'toptoo' ) ) {
if ( $self->echo_response_($mail, $client, "RETR $1" ) ) {
! my $class = $self->{classifier__}->classify_and_modify( $mail, $client, $download_count, $count, 1, '' );
if ( $self->echo_response_($mail, $client, $command ) ) {
! $self->{classifier__}->classify_and_modify( $mail, $client, $download_count, $count, 0, $class );
# Tell the parent that we just handled a mail
--- 269,283 ----
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 ) ) {
!
! # Classify with pre-defined class, without saving, echoing to client
!
! $self->{classifier__}->classify_and_modify( $mail, $client, $download_count, 0, 1, $class, 1 );
# Tell the parent that we just handled a mail
|
11 messages has been excluded from this view by a project administrator.
