diff options
| -rw-r--r-- | emails.lps | 120 | ||||
| -rw-r--r-- | unit1.pas | 16 |
2 files changed, 72 insertions, 64 deletions
@@ -19,8 +19,9 @@ <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <UnitName Value="Unit1"/> - <TopLine Value="129"/> - <CursorPos Y="149"/> + <IsVisibleTab Value="True"/> + <TopLine Value="177"/> + <CursorPos X="30" Y="201"/> <UsageCount Value="37"/> <Loaded Value="True"/> <LoadedDesigner Value="True"/> @@ -28,76 +29,75 @@ <Unit2> <Filename Value="../units/popimapunit.pas"/> <IsPartOfProject Value="True"/> - <IsVisibleTab Value="True"/> <EditorIndex Value="4"/> - <TopLine Value="601"/> - <CursorPos Y="632"/> + <TopLine Value="171"/> + <CursorPos Y="184"/> <UsageCount Value="30"/> <Loaded Value="True"/> </Unit2> <Unit3> + <Filename Value="../units/deencrypt.pas"/> + <IsPartOfProject Value="True"/> + <EditorIndex Value="-1"/> + <TopLine Value="22"/> + <CursorPos X="97" Y="25"/> + <UsageCount Value="30"/> + </Unit3> + <Unit4> <Filename Value="../units/popunit.pas"/> <EditorIndex Value="-1"/> <TopLine Value="209"/> <CursorPos X="18" Y="398"/> <UsageCount Value="25"/> - </Unit3> - <Unit4> + </Unit4> + <Unit5> <Filename Value="Hashes.pas"/> <EditorIndex Value="-1"/> <TopLine Value="85"/> <UsageCount Value="9"/> - </Unit4> - <Unit5> + </Unit5> + <Unit6> <Filename Value="/usr/lib/fpc/src/packages/fcl-process/src/process.pp"/> <EditorIndex Value="-1"/> <TopLine Value="612"/> <CursorPos X="39" Y="27"/> <UsageCount Value="10"/> - </Unit5> - <Unit6> + </Unit6> + <Unit7> <Filename Value="../units/mystringlistunit.pas"/> <EditorIndex Value="2"/> <TopLine Value="578"/> <CursorPos X="35" Y="618"/> <UsageCount Value="16"/> <Loaded Value="True"/> - </Unit6> - <Unit7> + </Unit7> + <Unit8> <Filename Value="../units/lowlevelunit.pas"/> <EditorIndex Value="3"/> <TopLine Value="367"/> <CursorPos X="47" Y="403"/> <UsageCount Value="15"/> <Loaded Value="True"/> - </Unit7> - <Unit8> + </Unit8> + <Unit9> <Filename Value="../units/gitupdateunit.pas"/> <EditorIndex Value="-1"/> <CursorPos Y="39"/> <UsageCount Value="9"/> - </Unit8> - <Unit9> + </Unit9> + <Unit10> <Filename Value="../units/refreshexecutableunit.pas"/> <EditorIndex Value="-1"/> <TopLine Value="31"/> <CursorPos X="21" Y="70"/> <UsageCount Value="9"/> - </Unit9> - <Unit10> + </Unit10> + <Unit11> <Filename Value="/usr/lib/fpc/src/rtl/objpas/classes/classesh.inc"/> <EditorIndex Value="-1"/> <TopLine Value="691"/> <CursorPos X="14" Y="710"/> <UsageCount Value="9"/> - </Unit10> - <Unit11> - <Filename Value="../units/deencrypt.pas"/> - <IsPartOfProject Value="True"/> - <EditorIndex Value="-1"/> - <TopLine Value="22"/> - <CursorPos X="97" Y="25"/> - <UsageCount Value="30"/> </Unit11> <Unit12> <Filename Value="../epost/werteunit.pas"/> @@ -116,123 +116,123 @@ <JumpHistory Count="30" HistoryIndex="29"> <Position1> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="83" Column="29" TopLine="66"/> + <Caret Line="435" Column="66" TopLine="410"/> </Position1> <Position2> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="84" Column="29" TopLine="66"/> + <Caret Line="430" TopLine="409"/> </Position2> <Position3> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="85" Column="29" TopLine="66"/> + <Caret Line="48" Column="61" TopLine="19"/> </Position3> <Position4> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="435" Column="66" TopLine="410"/> + <Caret Line="424" Column="72" TopLine="404"/> </Position4> <Position5> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="430" TopLine="409"/> + <Caret Line="433" Column="35" TopLine="413"/> </Position5> <Position6> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="48" Column="61" TopLine="19"/> + <Caret Line="21" TopLine="21"/> </Position6> <Position7> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="424" Column="72" TopLine="404"/> + <Caret Line="424" Column="25" TopLine="404"/> </Position7> <Position8> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="433" Column="35" TopLine="413"/> + <Caret Line="49" Column="36" TopLine="40"/> </Position8> <Position9> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="21" TopLine="21"/> + <Caret Line="604" Column="20" TopLine="585"/> </Position9> <Position10> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="424" Column="25" TopLine="404"/> + <Caret Line="424" Column="45" TopLine="410"/> </Position10> <Position11> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="49" Column="36" TopLine="40"/> + <Caret Line="438" Column="92" TopLine="428"/> </Position11> <Position12> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="604" Column="20" TopLine="585"/> + <Caret Line="49" Column="22" TopLine="22"/> </Position12> <Position13> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="424" Column="45" TopLine="410"/> + <Caret Line="459" Column="44" TopLine="456"/> </Position13> <Position14> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="438" Column="92" TopLine="428"/> + <Caret Line="457" Column="43" TopLine="448"/> </Position14> <Position15> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="49" Column="22" TopLine="22"/> + <Caret Line="459" Column="44" TopLine="448"/> </Position15> <Position16> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="459" Column="44" TopLine="456"/> + <Caret Line="477" Column="37" TopLine="461"/> </Position16> <Position17> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="457" Column="43" TopLine="448"/> + <Caret Line="570" Column="19" TopLine="541"/> </Position17> <Position18> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="459" Column="44" TopLine="448"/> + <Caret Line="615" Column="23" TopLine="601"/> </Position18> <Position19> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="477" Column="37" TopLine="461"/> + <Caret Line="21" Column="26"/> </Position19> <Position20> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="570" Column="19" TopLine="541"/> + <Caret Line="229" Column="33" TopLine="214"/> </Position20> <Position21> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="615" Column="23" TopLine="601"/> + <Caret Line="18" Column="3"/> </Position21> <Position22> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="21" Column="26"/> + <Caret Line="612" Column="42" TopLine="592"/> </Position22> <Position23> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="229" Column="33" TopLine="214"/> + <Caret Line="616" Column="102" TopLine="592"/> </Position23> <Position24> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="18" Column="3"/> + <Caret Line="628" Column="26" TopLine="599"/> </Position24> <Position25> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="612" Column="42" TopLine="592"/> + <Caret Line="619" TopLine="604"/> </Position25> <Position26> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="616" Column="102" TopLine="592"/> + <Caret Line="635" TopLine="599"/> </Position26> <Position27> <Filename Value="../units/popimapunit.pas"/> - <Caret Line="628" Column="26" TopLine="599"/> + <Caret Line="629" Column="35" TopLine="604"/> </Position27> <Position28> - <Filename Value="../units/popimapunit.pas"/> - <Caret Line="619" TopLine="604"/> + <Filename Value="unit1.pas"/> + <Caret Line="138" Column="47" TopLine="117"/> </Position28> <Position29> - <Filename Value="../units/popimapunit.pas"/> - <Caret Line="635" TopLine="599"/> + <Filename Value="unit1.pas"/> + <Caret Line="195" Column="22" TopLine="176"/> </Position29> <Position30> - <Filename Value="../units/popimapunit.pas"/> - <Caret Line="629" Column="35" TopLine="604"/> + <Filename Value="unit1.pas"/> + <Caret Line="49" Column="56" TopLine="25"/> </Position30> </JumpHistory> <RunParams> @@ -36,7 +36,8 @@ type lb: tMouseButton; public { public declarations } - pc: tPopImapClient; + pc: tPopImapClient; + encryptionUser: string; procedure neueNachrichten(sender: tObject); end; @@ -45,7 +46,7 @@ var implementation -uses myStringListUnit, lowLevelUnit, process; +uses myStringListUnit, lowLevelUnit, process, deencrypt; {$R *.lfm} @@ -83,6 +84,12 @@ begin else if s<>'' then raise exception.create(''''+s+''' ist kein gültiger Wert für ''Ton geben'' (ja|nein)!'); + s:=sl.grepFirst('^Encryption-User\s*='); + if erstesArgument(s,'=')<>'' then + encryptionUser:=s + else + raise exception.create('Kein Encryption-User in '''+extractfilepath(application.exename)+'optionen.konf'' angegeben!'); + pc:=tPopImapClient.create; s:=sl.grepFirst('^Timeout\s*='); if erstesArgument(s,'=')<>'' then @@ -103,7 +110,7 @@ begin raise exception.create('Kein User in '''+extractfilepath(application.exename)+'optionen.konf'' angegeben!'); s:=sl.grepFirst('^Pass\s*='); if erstesArgument(s,'=')<>'' then - pc.pass:=s + pc.pass:=decrypt(s) else raise exception.create('Kein Pass in '''+extractfilepath(application.exename)+'optionen.konf'' angegeben!'); found:=false; @@ -179,12 +186,13 @@ begin sl.addWithLineBreaks('gültiger Adressat = '+umbrechen(copy(pc.gueltigerAdressat,2,length(pc.gueltigerAdressat)-2),'|',true,'gültiger Adressat = ')); + sl.add('Encryption-User = ' + encryptionUser); sl.add('Timeout = ' + floatToStr(pc.timeOut)); if pc.sshUser<>'' then sl.add('ssh-User = ' + pc.sshUser); sl.add('Host = ' + pc.host); sl.add('User = ' + pc.user); - sl.add('Pass = ' + pc.pass); + sl.add('Pass = ' + encrypt(pc.pass, encryptionUser)); sl.add('Port = ' + intToStr(pc.port)); case pc.mailProtocol of mpPop: |