auf Verwendung von hashcash statt sha1sum umgestellt

3 files changed, 78 insertions, 65 deletions

diff --git a/emails.lps b/emails.lps
index a01cd53..c3f7382 100644
--- a/emails.lps
+++ b/emails.lps
@@ -9,7 +9,7 @@
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="-1"/>
         <CursorPos Y="7"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="24"/>
       </Unit0>
       <Unit1>
         <Filename Value="unit1.pas"/>
@@ -19,9 +19,9 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="173"/>
-        <CursorPos X="20" Y="180"/>
-        <UsageCount Value="21"/>
+        <TopLine Value="74"/>
+        <CursorPos X="3" Y="91"/>
+        <UsageCount Value="24"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -29,9 +29,9 @@
         <Filename Value="../units/popunit.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="354"/>
-        <CursorPos X="69" Y="381"/>
-        <UsageCount Value="21"/>
+        <TopLine Value="134"/>
+        <CursorPos X="5" Y="161"/>
+        <UsageCount Value="24"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
@@ -50,9 +50,9 @@
       <Unit5>
         <Filename Value="../units/mystringlistunit.pas"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="42"/>
-        <CursorPos Y="42"/>
-        <UsageCount Value="10"/>
+        <TopLine Value="147"/>
+        <CursorPos X="25" Y="158"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit5>
       <Unit6>
@@ -66,123 +66,120 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="433" Column="16" TopLine="416"/>
       </Position1>
       <Position2>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="55" TopLine="21"/>
+        <Caret Line="253" Column="27" TopLine="229"/>
       </Position2>
       <Position3>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="548" Column="70" TopLine="521"/>
+        <Caret Line="263" Column="29" TopLine="230"/>
       </Position3>
       <Position4>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="265" Column="3" TopLine="245"/>
+        <Caret Line="281" Column="31" TopLine="249"/>
       </Position4>
       <Position5>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="48" Column="29" TopLine="5"/>
+        <Caret Line="588" Column="61" TopLine="562"/>
       </Position5>
       <Position6>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="99" Column="15" TopLine="77"/>
       </Position6>
       <Position7>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="152" Column="33" TopLine="130"/>
+        <Caret Line="271" Column="30" TopLine="245"/>
       </Position7>
       <Position8>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="157" Column="30" TopLine="135"/>
+        <Caret Line="55" Column="35" TopLine="22"/>
       </Position8>
       <Position9>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="18" Column="33"/>
+        <Caret Line="186" Column="35" TopLine="166"/>
       </Position9>
       <Position10>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="98" TopLine="76"/>
+        <Caret Line="200" Column="21" TopLine="180"/>
       </Position10>
       <Position11>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="149" TopLine="127"/>
+        <Caret Line="240" Column="31" TopLine="217"/>
       </Position11>
       <Position12>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="181" TopLine="160"/>
+        <Caret Line="251" TopLine="231"/>
       </Position12>
       <Position13>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="199" TopLine="178"/>
+        <Caret Line="252" Column="33" TopLine="232"/>
       </Position13>
       <Position14>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="204" TopLine="183"/>
+        <Caret Line="253" Column="36" TopLine="243"/>
       </Position14>
       <Position15>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="312" TopLine="272"/>
+        <Caret Line="281" Column="52" TopLine="262"/>
       </Position15>
       <Position16>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="233" TopLine="213"/>
+        <Caret Line="286" Column="23" TopLine="266"/>
       </Position16>
       <Position17>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="270" TopLine="249"/>
+        <Caret Line="187" TopLine="156"/>
       </Position17>
       <Position18>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="286" TopLine="265"/>
+        <Caret Line="188" TopLine="156"/>
       </Position18>
       <Position19>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="302" TopLine="281"/>
+        <Caret Line="551" TopLine="530"/>
       </Position19>
       <Position20>
         <Filename Value="../units/popunit.pas"/>
-        <Caret Line="318" TopLine="297"/>
+        <Caret Line="598" Column="45" TopLine="577"/>
       </Position20>
       <Position21>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="181" Column="39" TopLine="172"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="605" Column="22" TopLine="583"/>
       </Position21>
       <Position22>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="182" TopLine="172"/>
+        <Filename Value="../units/popunit.pas"/>
       </Position22>
       <Position23>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="178" TopLine="169"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="264" Column="16" TopLine="231"/>
       </Position23>
       <Position24>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="179" TopLine="169"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="282" Column="18" TopLine="250"/>
       </Position24>
       <Position25>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="189" TopLine="169"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="316" Column="18" TopLine="283"/>
       </Position25>
       <Position26>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="178" TopLine="169"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="353" Column="16" TopLine="321"/>
       </Position26>
       <Position27>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="191" TopLine="169"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="369" Column="16" TopLine="337"/>
       </Position27>
       <Position28>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="196" TopLine="169"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="385" Column="16" TopLine="353"/>
       </Position28>
       <Position29>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="197" TopLine="169"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="401" Column="16" TopLine="369"/>
       </Position29>
       <Position30>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="198" TopLine="169"/>
+        <Filename Value="../units/popunit.pas"/>
+        <Caret Line="454" Column="20" TopLine="422"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/unit1.lfm b/unit1.lfm
index 0ca6924..4677922 100644
--- a/unit1.lfm
+++ b/unit1.lfm
@@ -1,7 +1,7 @@
 object Form1: TForm1
-  Left = 1462
+  Left = 137
   Height = 756
-  Top = 167
+  Top = 158
   Width = 999
   Caption = 'Form1'
   ClientHeight = 756
@@ -72,18 +72,18 @@ object Form1: TForm1
   end
   object CheckBox1: TCheckBox
     Left = 272
-    Height = 21
+    Height = 24
     Top = 596
-    Width = 93
+    Width = 98
     Caption = 'aufploppen'
     OnClick = CheckBox1Click
     TabOrder = 2
   end
   object CheckBox2: TCheckBox
     Left = 416
-    Height = 21
+    Height = 24
     Top = 596
-    Width = 86
+    Width = 94
     Caption = 'Ton geben'
     Checked = True
     OnClick = CheckBox1Click
diff --git a/unit1.pas b/unit1.pas
index 5871981..d7da1d3 100644
--- a/unit1.pas
+++ b/unit1.pas
@@ -87,6 +87,17 @@ begin
   pc.host:='eckner.net';
   pc.user:='notify@eckner.net';
   pc.pass:='C7sd7k8*';
+  pc.gueltigerAdressat:='('+
+     '.*@eckner\.net'                                                                    +'|'+
+     '(ee|intern|vorstand)@wurzel\.org'                                                  +'|'+
+     'erich\.eckner@uni-jena\.de'                                                        +'|'+
+     'erich\.eckner@gmx\.de'                                                             +'|'+
+     '(ioq_(nlo|staff)|alle_mitarbeiter|fsr-physik-newsletter)@listserv\.uni-jena\.de'   +'|'+
+     '(sox-users|logwatch-devel)@lists\.sourceforge\.net'                                +'|'+
+     'gmp-discuss@gmplib\.org'                                                           +'|'+
+     'hashcash@freelists\.org'                                                           +'|'+
+     'crux(-commits)?@lists.crux.nu'+
+     ')';
   pc.port:=995;
 end;
 
@@ -169,30 +180,33 @@ end;
 
 procedure tForm1.neueNachrichten(sender: tObject);
 var
-  i,mitMarkeDa: longint;
-  argumente:    array of string;
-  ausgabe:      string;
+  i,ung,mitMarkeDa: longint;
+  argumente:        array of string;
+  ausgabe:          string;
 begin
   mitMarkeDa:=0;
   memo1.lines.clear;
+  ung:=0;
   for i:=pc.nAnz-1 downto 0 do
     case pc.marke(i) of
-      mvUngueltig:
-        pc.loesche(i);
       mvGueltig: begin
         inc(mitMarkeDa);
         memo1.lines.add('! '+pc.zeit(i)+' '+pc.von(i)+': '+pc.betreff(i));
       end;
+      mvUngueltig: begin
+        memo1.lines.add('( '+pc.zeit(i)+' '+pc.von(i)+': '+pc.betreff(i)+' )');
+        inc(ung);
+      end;
       mvKeine:
-        memo1.lines.add(pc.zeit(i)+' '+pc.von(i)+': '+pc.betreff(i));
+        memo1.lines.add('  '+pc.zeit(i)+' '+pc.von(i)+': '+pc.betreff(i));
     end{of case};
-  if pc.nAnz=0 then begin
+  if pc.nAnz<=ung then begin
     trayIcon1.icon:=nichtsDaIcon.picture.icon;
     trayIcon1.hint:='keine Post';
   end
   else begin
     trayIcon1.icon:=emailsDaIcon.picture.icon;
-    trayIcon1.hint:=inttostr(pc.nAnz)+' neue Nachrichten';
+    trayIcon1.hint:=inttostr(pc.nAnz-ung)+' neue Nachrichten';
     if mitMarkeDa>0 then begin
       trayIcon1.hint:=trayIcon1.hint+', davon '+inttostr(mitMarkeDa)+' mit Marke';
       if checkBox1.checked then
@@ -201,11 +215,13 @@ begin
         setlength(argumente,1);
         argumente[0]:=extractFilePath(application.exename)+'gotmail.wav';
         ausgabe:='';
-        runCommand('mplayer',argumente,ausgabe);
+        runCommand('play',argumente,ausgabe);
         setlength(argumente,0);
       end;
     end;
   end;
+  if ung>0 then
+    trayIcon1.hint:=trayIcon1.hint+' (und noch '+inttostr(ung)+' mit ungültiger Marke)';
   trayIcon1.visible:=true;
   form1.icon:=trayIcon1.icon;
   form1.caption:=trayIcon1.hint;