--- dao/DelphiScanner/Main.pas	2015/09/03 13:43:10	2689
+++ dao/DelphiScanner/Main.pas	2015/09/03 14:48:45	2697
@@ -52,13 +52,13 @@
     Testlyd1: TMenuItem;
     ListBox1: TListBox;
     Budlevering1: TMenuItem;
-    DownloadButton01: TButton;
+    BtnDownloadKontrolfil: TButton;
     IdFTP1: TIdFTP;
     Image1: TImage;
     ListBox2: TListBox;
     OpdaterListenButton01: TButton;
-    UploadButton01: TButton;
-    DownloadButton03: TButton;
+    BtnUploadLogfil: TButton;
+    BtnDownloadRuteskiftFil: TButton;
     Pakkeshoplevering1: TMenuItem;
     PakkeshopText1: TStaticText;
     btnNulstil: TButton;
@@ -93,18 +93,12 @@
     PanelManglendePakker6: TPanel;
     menuIndlevering: TMenuItem;
 
-
-  function Sto_GetFmtFileVersion(const FileName: String = ''): String;
-
   function getProddato() : TDate;
   function getProddag() : String;
   function retRutenummer(rutenummer : String) : String;
   function GetCurrentPrinterHandle() : THandle;
   function SavePChar(p: PChar): PChar;
 
-  function FileTime2DateTime(FileTime: TFileTime): TDateTime;
-  function CheckUrl(url:string):boolean;
-
   procedure PlaySound(filename : PWideChar);
   procedure StartScreen();
   procedure InitScreen();
@@ -134,7 +128,7 @@
   procedure Button1Click(Sender: TObject);
   procedure ListBox1DrawItem(Control: TWinControl; Index: Integer; Rect: TRect; State: TOwnerDrawState);
   procedure Budlevering1Click(Sender: TObject);
-  procedure DownloadButton01Click(Sender: TObject);
+  procedure BtnDownloadKontrolfilClick(Sender: TObject);
   procedure OpdaterListenButton01Click(Sender: TObject);
   procedure DownloadBladhusRuteskiftfil();
   procedure DownloadBladhusKontrolfil();
@@ -143,8 +137,8 @@
   procedure UploadInifilTilDAO();
   procedure SletStregkodelinieFraListboks2(StregKode : String);
   procedure FormDestroy(Sender: TObject);
-  procedure UploadButton01Click(Sender: TObject);
-  procedure DownloadButton03Click(Sender: TObject);
+  procedure BtnUploadLogfilClick(Sender: TObject);
+  procedure BtnDownloadRuteskiftFilClick(Sender: TObject);
   procedure Pakkeshoplevering1Click(Sender: TObject);
   procedure btnNulstilClick(Sender: TObject);
   procedure Returpakkerfrapakkeshop1Click(Sender: TObject);
@@ -605,11 +599,11 @@
 
     if (SkrivLog = '1') then
     begin
-      logTekst := 'Program start (Version: ' + Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now);
+      logTekst := 'Program start (Version: ' + TUtils.Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now);
       try
         SkrivScanningLogFil(logTekst);
         Uploadlogfil1.Enabled := true;
-        UploadButton01.Enabled := true;
+        BtnUploadLogfil.Enabled := true;
         logTekst := 'Programmet er installeret som: '+ParamStr(0);
         SkrivScanningLogFil(logTekst);
         // Oprydning i gamle logfiler
@@ -1131,7 +1125,7 @@
     Scanningtype := gemScanningtype;
 
     SendInfoTilServer(Sted, Scanningtype, 'Begin', '');
-    SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', Sto_GetFmtFileVersion(''));
+    SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', TUtils.Sto_GetFmtFileVersion(''));
 
 end;
 
@@ -1980,7 +1974,7 @@
     01 :
           begin;      // NS
             Testprinter1.Visible := true;
-            DownloadButton01.Enabled := true;
+            BtnDownloadKontrolfil.Enabled := true;
             OpdaterListenButton01.Enabled := true;
             IdFTP1.Passive := true;
             IdFTP1.PassiveUseControlHost := true;
@@ -1996,7 +1990,7 @@
             Storepakker1.Enabled := true;
             radioStorPakke.Enabled := true;
             radioLillePakke.Enabled := true;
-            DownloadButton01.Enabled := false;     // kontrolfil bruges ikke her
+            BtnDownloadKontrolfil.Enabled := false;     // kontrolfil bruges ikke her
             OpdaterListenButton01.Enabled := true;
             IdFTP1.Passive := true;
             IdFTP1.PassiveUseControlHost := true;
@@ -2007,13 +2001,13 @@
             Testprinter1.Visible := true;
            if (getProddag() = 'lørdag') then
             begin
-              DownloadButton03.Visible := false;
+              BtnDownloadRuteskiftFil.Visible := false;
             end
             else
             begin
-              DownloadButton03.Visible := false;
+              BtnDownloadRuteskiftFil.Visible := false;
             end;
-            DownloadButton01.Enabled := true;
+            BtnDownloadKontrolfil.Enabled := true;
             OpdaterListenButton01.Enabled := true;
             IdFTP1.Passive := true;
             IdFTP1.PassiveUseControlHost := true;
@@ -2034,7 +2028,7 @@
             Storepakker1.Enabled := true;
             radioStorPakke.Enabled := true;
             radioLillePakke.Enabled := true;
-            DownloadButton01.Enabled := false;    // kontrolfil bruges ikke her
+            BtnDownloadKontrolfil.Enabled := false;    // kontrolfil bruges ikke her
             OpdaterListenButton01.Enabled := true;
             IdFTP1.Passive := true;
             IdFTP1.PassiveUseControlHost := true;
@@ -2294,7 +2288,7 @@
   SkrivScanningLogFil(logTekst);
 end;
 
-procedure TMainForm.UploadButton01Click(Sender: TObject);
+procedure TMainForm.BtnUploadLogfilClick(Sender: TObject);
 begin
   UploadLogfilTilDAO();
   UploadInifilTilDAO();
@@ -2658,7 +2652,7 @@
         // Tjekker UrlNormal
         if PanelValg1.Enabled = true then
         begin
-          if CheckUrl(UrlNormal) then
+          if TUtils.CheckUrl(UrlNormal) then
           begin
             logTekst := 'UrlNormal accepteret: ' + UrlNormal;
             SkrivScanningLogFil(logTekst);
@@ -2687,7 +2681,7 @@
         // Tjekker UrlReturDAO
         if PanelValg2.Enabled = true then
         begin
-          if CheckUrl(UrlReturDAO) then
+          if TUtils.CheckUrl(UrlReturDAO) then
           begin
             logTekst := 'UrlReturDAO accepteret: ' + UrlReturDAO;
             SkrivScanningLogFil(logTekst);
@@ -2715,7 +2709,7 @@
         // Tjekker UrlReturBoghandler
         if PanelValg3.Enabled = true then
         begin
-          if CheckUrl(UrlReturBoghandler) then
+          if TUtils.CheckUrl(UrlReturBoghandler) then
           begin
             logTekst := 'UrlReturBoghandler accepteret: ' + UrlReturBoghandler;
             SkrivScanningLogFil(logTekst);
@@ -2743,7 +2737,7 @@
         // Tjekker UrlBudlevering
         if PanelValg4.Enabled = true then
         begin
-          if CheckUrl(UrlBudlevering) then
+          if TUtils.CheckUrl(UrlBudlevering) then
           begin
             logTekst := 'UrlBudlevering accepteret: ' + UrlBudlevering;
             SkrivScanningLogFil(logTekst);
@@ -2771,7 +2765,7 @@
         // Tjekker UrlPakkeshoplevering
         if PanelValg5.Enabled = true then
         begin
-          if CheckUrl(UrlPakkeshoplevering) then
+          if TUtils.CheckUrl(UrlPakkeshoplevering) then
           begin
             logTekst := 'UrlPakkeshoplevering accepteret: ' + UrlPakkeshoplevering;
             SkrivScanningLogFil(logTekst);
@@ -2799,7 +2793,7 @@
         // Tjekker UrlReturPakkeshop
         if PanelValg6.Enabled = true then
         begin
-          if CheckUrl(UrlReturPakkeshop) then
+          if TUtils.CheckUrl(UrlReturPakkeshop) then
           begin
             logTekst := 'UrlReturPakkeshop accepteret: ' + UrlReturPakkeshop;
             SkrivScanningLogFil(logTekst);
@@ -2828,7 +2822,7 @@
         if (PanelValg1.Enabled = true)
         or (PanelValg4.Enabled = true) then
         begin
-          if CheckUrl(UrlManglendeScanninger) then
+          if TUtils.CheckUrl(UrlManglendeScanninger) then
           begin
             logTekst := 'UrlManglendeScanninger accepteret: ' + UrlManglendeScanninger;
             SkrivScanningLogFil(logTekst);
@@ -2856,7 +2850,7 @@
         // Tjekker UrlPakkeshopManglendeScanninger
         if PanelValg5.Enabled = true then
         begin
-          if CheckUrl(UrlPakkeshopManglendeScanninger) then
+          if TUtils.CheckUrl(UrlPakkeshopManglendeScanninger) then
           begin
             logTekst := 'UrlPakkeshopManglendeScanninger accepteret: ' + UrlPakkeshopManglendeScanninger;
             SkrivScanningLogFil(logTekst);
@@ -2884,7 +2878,7 @@
         // Tjekker UrlPakkeshopManglendeReturScanninger
         if PanelValg6.Enabled = true then
         begin
-          if CheckUrl(UrlPakkeshopManglendeReturScanninger) then
+          if TUtils.CheckUrl(UrlPakkeshopManglendeReturScanninger) then
           begin
             logTekst := 'UrlPakkeshopManglendeReturScanninger accepteret: ' + UrlPakkeshopManglendeReturScanninger;
             SkrivScanningLogFil(logTekst);
@@ -2912,7 +2906,7 @@
        // Tjekker UrlIndleveringsPakke og UrlIndleveringsPakkeManglendeScanninger
         if PanelValg7.Enabled = true then
         begin
-          if CheckUrl(UrlIndleveringsPakke) then
+          if TUtils.CheckUrl(UrlIndleveringsPakke) then
           begin
             logTekst := 'UrlIndleveringsPakke accepteret: ' + UrlIndleveringsPakke;
             SkrivScanningLogFil(logTekst);
@@ -2936,7 +2930,7 @@
             end;
           end;
 
-          if CheckUrl(UrlIndleveringsPakkeManglendeScanninger) then
+          if TUtils.CheckUrl(UrlIndleveringsPakkeManglendeScanninger) then
           begin
             logTekst := 'UrlIndleveringsPakkeManglendeScanninger accepteret: ' + UrlIndleveringsPakkeManglendeScanninger;
             SkrivScanningLogFil(logTekst);
@@ -2964,7 +2958,7 @@
         // Tjekker UrlEKLoverforsel
         if PanelValg1.Enabled = true then
         begin
-          if CheckUrl(UrlEKLoverforsel) then
+          if TUtils.CheckUrl(UrlEKLoverforsel) then
           begin
             logTekst := 'UrlEKLoverforsel accepteret: ' + UrlEKLoverforsel;
             SkrivScanningLogFil(logTekst);
@@ -2993,7 +2987,7 @@
         // Tjekker UrlEKLoverforselPakkeshop
         if PanelValg5.Enabled = true then
         begin
-          if CheckUrl(UrlEKLoverforselPakkeshop) then
+          if TUtils.CheckUrl(UrlEKLoverforselPakkeshop) then
           begin
             logTekst := 'UrlEKLoverforselPakkeshop accepteret: ' + UrlEKLoverforselPakkeshop;
             SkrivScanningLogFil(logTekst);
@@ -3020,7 +3014,7 @@
 
 
         // Tjekker UrlFindPakketype
-        if CheckUrl(UrlFindPakketype) then
+        if TUtils.CheckUrl(UrlFindPakketype) then
         begin
           logTekst := 'UrlFindPakketype accepteret: ' + UrlFindPakketype;
           SkrivScanningLogFil(logTekst);
@@ -3045,7 +3039,7 @@
         end;
 
         // Tjekker UrlSendPrograminfo
-        if CheckUrl(UrlSendPrograminfo) then
+        if TUtils.CheckUrl(UrlSendPrograminfo) then
         begin
           logTekst := 'UrlSendPrograminfo accepteret: ' + UrlSendPrograminfo;
           SkrivScanningLogFil(logTekst);
@@ -3082,16 +3076,6 @@
 
 end;
 
-function TMainForm.FileTime2DateTime(FileTime: TFileTime): TDateTime;
-var
-   LocalFileTime: TFileTime;
-   SystemTime: TSystemTime;
-begin
-   FileTimeToLocalFileTime(FileTime, LocalFileTime) ;
-   FileTimeToSystemTime(LocalFileTime, SystemTime) ;
-   Result := SystemTimeToDateTime(SystemTime) ;
-end;
-
 procedure TMainForm.SletLogfiler(Path: string; FileList: TStrings);
 var
   SR: TSearchRec;
@@ -3111,7 +3095,7 @@
 
         dt := fileDateToDateTime(SR.Time);  // finder filens timestamp for seneste ændring
         CreationTime := SR.FindData.ftCreationTime;  // finder filens timestamp for oprettelse
-        dtCreation := FileTime2DateTime(CreationTime);   // finder filens timestamp for oprettelse
+        dtCreation := TUtils.FileTime2DateTime(CreationTime);   // finder filens timestamp for oprettelse
         // Selvom creation date godt kan være forskellig fra modified date,
         // skal vi alligevel altid tjekke filens alder ud fra modified date
         // (ændring den kan ligge både før og efter oprettelse, hvis filerne er flyttet eller ændret manuelt)
@@ -3244,27 +3228,14 @@
 
 procedure TMainForm.PanelValgAClick(Sender: TObject);
 begin
-// 20150311: start
-(*
-  if PanelValgA.Color = clBtnFace then
-  begin
-     AutomatiskValg1.Checked := true;
-     PanelValgA.Color := clGreen;
-     PanelValgA.Font.Color := clWhite;
-  end
-  else
-  begin
-     AutomatiskValg1.Checked := false;
-     PanelValgA.Color := clBtnFace;
-     PanelValgA.Font.Color := clWindowText;
-  end;
-*)
 // Skal ikke toggle men bare sætte funktionen on
 // Fravælges ved at vælge en scanningstype
-     AutomatiskValg1.Checked := true;
-     PanelValgA.Color := clGreen;
-     PanelValgA.Font.Color := clWhite;
-// 20150311: slut
+  AutomatiskValg1.Checked := true;
+  PanelValgA.Color := clGreen;
+  PanelValgA.Font.Color := clWhite;
+
+
+
 end;
 
 procedure TMainForm.Pakkernormal1Click(Sender: TObject);
@@ -3379,7 +3350,7 @@
  tekst, filversion : String;
 begin
 
-  filversion := Sto_GetFmtFileVersion('');
+  filversion := TUtils.Sto_GetFmtFileVersion('');
   tekst := 'Program til indscanning af pakker'+crlf+'Version '+filversion+crlf+crlf+'Udviklet af it afdelingen, DAO';
 
   tekst := tekst+crlf+crlf;
@@ -3657,9 +3628,9 @@
       radioLillePakke.Enabled := true;
       ListBox1.Visible := true;
       ListBox1.Items.Clear;
-      DownloadButton01.Enabled := false;
+      BtnDownloadKontrolfil.Enabled := false;
       OpdaterListenButton01.Enabled := true;
-      DownloadButton03.Visible := false;
+      BtnDownloadRuteskiftFil.Visible := false;
       EKLoverforsel.Enabled := false;
       IdFTP1.Passive := true;
       IdFTP1.PassiveUseControlHost := true;
@@ -3693,7 +3664,7 @@
       radioLillePakke.Enabled := false;
       ListBox1.Visible := true;
       ListBox1.Items.Clear;
-      DownloadButton01.Enabled := false;
+      BtnDownloadKontrolfil.Enabled := false;
       OpdaterListenButton01.Enabled := true;
 
       EKLoverforsel.Enabled := true;
@@ -3730,7 +3701,7 @@
       radioLillePakke.Enabled := false;
       ListBox1.Visible := true;
       ListBox1.Items.Clear;
-      DownloadButton01.Enabled := false;
+      BtnDownloadKontrolfil.Enabled := false;
       OpdaterListenButton01.Enabled := true;
       EKLoverforsel.Enabled := false;
       InitLillePakke();
@@ -3777,7 +3748,7 @@
       ListBox1.Visible := true;
       ListBox1.Items.Clear();
 
-      DownloadButton01.Enabled := false;
+      BtnDownloadKontrolfil.Enabled := false;
       OpdaterListenButton01.Enabled := true;
       EKLoverforsel.Enabled := false;
       InitLillePakke();
@@ -3817,60 +3788,7 @@
 // 20150310: slut
 end;
 
-/// <summary>
-///   This function reads the file resource of "FileName" and returns
-///   the version number as formatted text.</summary>
-/// <example>
-///   Sto_GetFmtFileVersion() = '4.13.128.0'
-///   Sto_GetFmtFileVersion('', '%.2d-%.2d-%.2d') = '04-13-128'
-/// </example>
-/// <remarks>If "Fmt" is invalid, the function may raise an
-///   EConvertError exception.</remarks>
-/// <param name="FileName">Full path to exe or dll. If an empty
-///   string is passed, the function uses the filename of the
-///   running exe or dll.</param>
-/// <param name="Fmt">Format string, you can use at most four integer
-///   values.</param>
-/// <returns>Formatted version number of file, '' if no version
-///   resource found.</returns>
-function TMainForm.Sto_GetFmtFileVersion(const FileName: String = ''): String;
-var
-  sFileName: String;
-  iBufferSize: DWORD;
-  iDummy: DWORD;
-  pBuffer: Pointer;
-  pFileInfo: Pointer;
-  iVer: array[1..4] of Integer;
-begin
-  // set default value
-  Result := '';
-  // get filename of exe/dll if no filename is specified
-  sFileName := Trim(FileName);
-  if (sFileName = '') then
-    sFileName := GetModuleName(HInstance);
-  // get size of version info (0 if no version info exists)
-  iBufferSize := GetFileVersionInfoSize(PChar(sFileName), iDummy);
-  if (iBufferSize > 0) then
-  begin
-    GetMem(pBuffer, iBufferSize);
-    try
-    // get fixed file info (language independent)
-    GetFileVersionInfo(PChar(sFileName), 0, iBufferSize, pBuffer);
-    VerQueryValue(pBuffer, '\', pFileInfo, iDummy);
-    // read version blocks
-    iVer[1] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS);
-    iVer[2] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS);
-    iVer[3] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS);
-    iVer[4] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS);
-    finally
-      FreeMem(pBuffer);
-    end;
 
-    // format result string
-    Result := Format('%d.%d.%d.%d', [iVer[1], iVer[2], iVer[3], iVer[4]]);
-
-  end;
-end;
 
 procedure TMainForm.PlaySound(filename : PWideChar);
 begin
@@ -4540,7 +4458,7 @@
   ListBox1.SetFocus;  // for at flytte fokus væk fra upload knappen så denne ikke aktiveres ved scanning / indtastning af stregkode
 end;
 
-procedure TMainForm.DownloadButton01Click(Sender: TObject);
+procedure TMainForm.BtnDownloadKontrolfilClick(Sender: TObject);
 begin
     DownloadBladhusKontrolfil();
     ListBox1.SetFocus;  // for at flytte fokus væk fra download knappen så denne ikke aktiveres ved scanning / indtastning af stregkode
@@ -4555,7 +4473,7 @@
     ListBox1.SetFocus;  // for at flytte fokus væk fra download knappen så denne ikke aktiveres ved scanning / indtastning af stregkode
 end;
 
-procedure TMainForm.DownloadButton03Click(Sender: TObject);
+procedure TMainForm.BtnDownloadRuteskiftFilClick(Sender: TObject);
 begin
     if (getProddag() = 'lørdag') then
     begin
@@ -5424,44 +5342,7 @@
 
 
 
-function TMainForm.CheckUrl(url:string):boolean;
-var
-  hSession, hfile: hInternet;
-  dwindex,dwcodelen :dword;
-  dwcode:array[1..20] of char;
-  res : pchar;
-begin
-  if pos('http://',lowercase(url))=0 then
-    url := 'http://'+url;
-  Result := false;
-  hSession := InternetOpen('InetURL:/1.0',
-                            INTERNET_OPEN_TYPE_PRECONFIG,
-                            nil,
-                            nil,
-                            0);
-  if assigned(hsession) then
-  begin
-    hfile := InternetOpenUrl(hsession,
-                             pchar(url),
-                             nil,
-                             0,
-                             INTERNET_FLAG_RELOAD,
-                             0);
-    dwIndex := 0;
-    dwCodeLen := 10;
-    HttpQueryInfo(hfile,
-                  HTTP_QUERY_STATUS_CODE,
-                  @dwcode,
-                  dwcodeLen,
-                  dwIndex);
-    res := pchar(@dwcode);
-    result:= (res ='200') or (res ='302');
-    if assigned(hfile) then
-      InternetCloseHandle(hfile);
-    InternetCloseHandle(hsession);
-  end;
 
-end;
 
 
 procedure TMainForm.CheckPrintQue(tjektype : string);