--- dao/DelphiScanner/Main.pas	2015/08/26 19:52:38	2682
+++ dao/DelphiScanner/Main.pas	2015/09/03 13:43:10	2689
@@ -8,7 +8,7 @@
   IdTCPClient, IdHTTP, xmldom, XMLIntf, msxmldom, XMLDoc, IniFiles, AppEvnts,
   Menus, ExtCtrls, ComCtrls, StrUtils, MMSystem, DateUtils,
   IdExplicitTLSClientServerBase, IdFTP, pngimage, GIFImg, IdException,
-  Winspool, Registry, ShellApi, ClipBrd, Buttons, wininet,
+  Winspool, ShellApi, ClipBrd, Buttons, wininet,
   UITypes,
   PakkeshopLabels,
   StBarC,
@@ -101,7 +101,7 @@
   function retRutenummer(rutenummer : String) : String;
   function GetCurrentPrinterHandle() : THandle;
   function SavePChar(p: PChar): PChar;
-  function AdobeReaderExists(): Boolean;
+
   function FileTime2DateTime(FileTime: TFileTime): TDateTime;
   function CheckUrl(url:string):boolean;
 
@@ -193,7 +193,7 @@
     SkrivLog : String;
     Sted : String;
     StedNavn : String;
-    Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlEKLoverforsel : String;
+    Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlIndleveringsPakkeManglendeScanninger,UrlEKLoverforsel : String;
 // 29150330: start
     UrlEKLoverforselPakkeshop : String;
 // 20150330: slut
@@ -207,9 +207,9 @@
     AlarmLyd : String;
     ScannetOkLyd : String;
     ScannetOkStorLyd : String;
-// 20150317: start
+
     ScannetOkTilTjekkodeLyd : String;
-// 20150317: slut
+
     PrinterNavn : String;
     TjekPrinter : String;
     XPosRute : integer;
@@ -498,27 +498,11 @@
 
 procedure TMainForm.Automatiskvalg1Click(Sender: TObject);
 begin
-// 20150317: start
-(*
-  if Automatiskvalg1.Checked 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;
-// 20150317: slut
 end;
 
 procedure TMainForm.FormCreate(Sender: TObject);
@@ -578,7 +562,10 @@
     UrlPakkeshopManglendeScanninger := ReadString('Settings','UrlPakkeshopManglendeScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s');
     UrlPakkeshopManglendeReturScanninger := ReadString('Settings','UrlPakkeshopManglendeReturScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s');
 
+
     UrlIndleveringsPakke := ReadString('Settings','UrlIndleveringsPakke','http://omdeling.info/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s');
+    UrlIndleveringsPakkeManglendeScanninger := ReadString('Settings', 'UrlIndleveringsPakkeManglendeScanninger','http://omdeling.info/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s');
+
 
 
     LabelType := ReadInteger('Settings','LabelType',1);
@@ -790,7 +777,6 @@
     // Hvis specialversion er valgt (SpecialVersionSted er sat til en værdi ovenfor)
     // ændrer vi Sted og Scanningtype her:
 
-// 20150313: start
     if SpecialVersionSted = 'NS' then
     begin
        SpecialVersionSted := '01';
@@ -801,7 +787,6 @@
        SpecialVersionSted := '03';
        SpecialVersionScanningtype := '4';
     end;
-// 20150313: slut
 
     if SpecialVersionSted = 'BK' then
     begin
@@ -2924,6 +2909,58 @@
           end;
         end;
 
+       // Tjekker UrlIndleveringsPakke og UrlIndleveringsPakkeManglendeScanninger
+        if PanelValg7.Enabled = true then
+        begin
+          if CheckUrl(UrlIndleveringsPakke) then
+          begin
+            logTekst := 'UrlIndleveringsPakke accepteret: ' + UrlIndleveringsPakke;
+            SkrivScanningLogFil(logTekst);
+          end
+          else
+          begin
+            inc(urlFejl);   // Optæller antal fejl
+            logTekst := 'UrlIndleveringsPakke svarer ikke: ' + UrlIndleveringsPakke;
+            ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + logTekst);
+            if TjekUrls = '1' then
+            begin
+              logTekst := logTekst + crlf + crlf + 'Programmet afsluttes... ';
+            end;
+            SkrivScanningLogFil(logTekst);
+            if TjekUrls = '1' then
+            begin
+              ShowMessage(logTekst);
+              UrlSendPrograminfo := '';   // Her sletter vi lige url, så der ikke forsøges at sende besked ved program slut
+              Application.Terminate;
+              exit;
+            end;
+          end;
+
+          if CheckUrl(UrlIndleveringsPakkeManglendeScanninger) then
+          begin
+            logTekst := 'UrlIndleveringsPakkeManglendeScanninger accepteret: ' + UrlIndleveringsPakkeManglendeScanninger;
+            SkrivScanningLogFil(logTekst);
+          end
+          else
+          begin
+            inc(urlFejl);   // Optæller antal fejl
+            logTekst := 'UrlIndleveringsPakkeManglendeScanninger svarer ikke: ' + UrlIndleveringsPakkeManglendeScanninger;
+            ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + logTekst);
+            if TjekUrls = '1' then
+            begin
+              logTekst := logTekst + crlf + crlf + 'Programmet afsluttes... ';
+            end;
+            SkrivScanningLogFil(logTekst);
+            if TjekUrls = '1' then
+            begin
+              ShowMessage(logTekst);
+              UrlSendPrograminfo := '';   // Her sletter vi lige url, så der ikke forsøges at sende besked ved program slut
+              Application.Terminate;
+              exit;
+            end;
+          end;
+        end;
+
         // Tjekker UrlEKLoverforsel
         if PanelValg1.Enabled = true then
         begin
@@ -3437,7 +3474,7 @@
 
   if FileExists(fileName) then
   begin
-    if AdobeReaderExists then
+    if TUtils.AdobeReaderExists then
     begin
       //ShellExecute(Handle, 'open', 'c:\Windows\notepad.exe', nil, nil, SW_SHOWNORMAL);
       ShellExecute(Handle,'open',PChar(fileName), nil, nil, SW_SHOWNORMAL);
@@ -3461,7 +3498,7 @@
 
   if FileExists(fileName) then
   begin
-    if AdobeReaderExists then
+    if TUtils.AdobeReaderExists then
     begin
       //ShellExecute(Handle, 'open', 'c:\Windows\notepad.exe', nil, nil, SW_SHOWNORMAL);
       ShellExecute(Handle,'open',PChar(fileName), nil, nil, SW_SHOWNORMAL);
@@ -4534,7 +4571,6 @@
   XForm, XFormOld: TXForm; //Bruges til rotate X-formation
   Angle: integer;
   gMode: integer;
-  BarcodeArea: TRect;
   Dirigering: string;
 
 begin
@@ -4687,13 +4723,18 @@
       end;
 
 
-    if (Scanningtype = '6') then
+
+    if (Scanningtype = '7') then
+     begin
+      URLStr := Format(UrlIndleveringsPakkeManglendeScanninger, [StedKode]);
+     end
+    else if (Scanningtype = '6') then
      begin
-      URLStr := Format(UrlPakkeshopManglendeReturScanninger,[StedKode]);
+      URLStr := Format(UrlPakkeshopManglendeReturScanninger, [StedKode]);
      end
     else if (Scanningtype = '5') then
      begin
-      URLStr := Format(UrlPakkeshopManglendeScanninger,[StedKode]);
+      URLStr := Format(UrlPakkeshopManglendeScanninger, [StedKode]);
      end
     else if (Scanningtype = '1') then
      begin
@@ -5380,17 +5421,7 @@
   end;
 end;
 
-function TMainForm.AdobeReaderExists: Boolean;
-var
-  AReg: TRegistry;
-begin
-  result:= false;
-  AReg := TRegistry.Create;
-  AReg.RootKey := HKEY_LOCAL_MACHINE;
-  if AReg.KeyExists('\SOFTWARE\Adobe\Acrobat Reader') then
-    result:= True;
-  AReg.Free;
-end;
+
 
 
 function TMainForm.CheckUrl(url:string):boolean;