--- dao/DelphiScanner/Main.pas	2016/03/31 08:17:44	2995
+++ dao/DelphiScanner/Main.pas	2016/04/08 14:01:34	2996
@@ -260,6 +260,7 @@
     procedure SkrivScanningLogFil(var tekst : string);
     function TjekKoreliste(var RuteNummer, Koreliste : string) : string;
     procedure VisAlarmSkaerm(strMessage: string);
+    function InjectURL(Url : String) : String;
 
   public
     { Public declarations }
@@ -503,6 +504,15 @@
      PanelValgA.Font.Color := clWhite;
 end;
 
+function TMainForm.InjectURL(Url : String) : String;
+begin
+
+  Url := Url + '&ver=' + TUtils.URLEncode( TUtils.Sto_GetFmtFileVersion(''));
+  Url := Url + '&host=' + TUtils.URLEncode( TUtils.GetComputerNameHelper());
+  Url := Url + '&user=' + TUtils.URLEncode( TUtils.GetCurrentUserName());
+
+  Result := Url;
+end;
 
 //InitForm kaldes før FormCreate
 procedure TMainForm.FormCreate(Sender: TObject);
@@ -553,27 +563,54 @@
     SkrivLog := ReadString('Settings','SkrivLog','0');
     Sted := ReadString('Settings','Sted','');
     StedNavn := ReadString('Settings','Stednavn','');
+
     UrlFindPakketype := ReadString('Settings','UrlFindPakketype','http://omdeling.info/webservices/bogpakkekontrol/FindPakketype.php?stregkode=%s');
+    UrlFindPakketype := InjectURL(UrlFindPakketype);
+
     UrlSendPrograminfo := ReadString('Settings','UrlSendPrograminfo','http://omdeling.info/webservices/bogpakkekontrol/SendPrograminfo.php?programnavn=%s&sted=%s&scanningtype=%s&infotype=%s&info=%s');
+    UrlSendPrograminfo := InjectURL(UrlSendPrograminfo);
+
     UrlNormal := ReadString('Settings','UrlNormal','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&tjekkode=%s');
+    UrlNormal := InjectURL(UrlNormal);
+
     UrlReturDAO := ReadString('Settings','UrlReturDAO','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s');
+    UrlReturDAO := InjectURL(UrlReturDAO);
+
     UrlReturBoghandler := ReadString('Settings','UrlReturBoghandler','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s');
+    UrlReturBoghandler := InjectURL(UrlReturBoghandler);
+
     UrlBudlevering := ReadString('Settings','UrlBudlevering','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&leveringstype=%s&pakkestorrelse=%s');
+    UrlBudlevering := InjectURL(UrlBudlevering);
+
     UrlManglendeScanninger := ReadString('Settings','UrlManglendeScanninger','http://omdeling.info/webservices/bogpakkekontrol/bogpakkemanglendescanninger.php?sted=%s&type=%s');
+    UrlManglendeScanninger := InjectURL(UrlManglendeScanninger);
+
     UrlEKLoverforsel := ReadString('Settings','UrlEKLoverforsel','http://omdeling.info/webservices/bogpakkekontrol/bogpakkertilekl.php?sted=%s');
+    UrlEKLoverforsel := InjectURL(UrlEKLoverforsel);
 
     UrlEKLoverforselPakkeshop := ReadString('Settings','UrlEKLoverforselPakkeshop','http://omdeling.info/webservices/pakkeshop/pakkertilekl.php?sted=%s');
+    UrlEKLoverforselPakkeshop := InjectURL(UrlEKLoverforselPakkeshop);
 
     UrlPakkeshoplevering := ReadString('Settings','UrlPakkeshoplevering','http://omdeling.info/webservices/pakkeshop/pakkekontrol.php?sted=%s&stregkode=%s&tjekkode=%s');
+    UrlPakkeshoplevering := InjectURL(UrlPakkeshoplevering);
+
     UrlReturPakkeshop := ReadString('Settings','UrlReturPakkeshop','http://omdeling.info/webservices/pakkeshop/returpakkekontrol.php?sted=%s&stregkode=%s');
+    UrlReturPakkeshop := InjectURL(UrlReturPakkeshop);
+
     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');
+    UrlPakkeshopManglendeScanninger := InjectURL(UrlPakkeshopManglendeScanninger);
 
+    UrlPakkeshopManglendeReturScanninger := ReadString('Settings','UrlPakkeshopManglendeReturScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s');
+    UrlPakkeshopManglendeReturScanninger := InjectURL(UrlPakkeshopManglendeReturScanninger);
 
     UrlIndleveringsPakke := ReadString('Settings','UrlIndleveringsPakke','http://omdeling.info/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s');
+    UrlIndleveringsPakke := InjectURL(UrlIndleveringsPakke);
+
     UrlIndleveringsPakkeManglendeScanninger := ReadString('Settings', 'UrlIndleveringsPakkeManglendeScanninger','http://omdeling.info/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s');
-    URLOmdirigerTilPakkeshop := ReadString('Settings', 'URLOmdirigerTilPakkeshop','http://omdeling.info/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s');
+    UrlIndleveringsPakkeManglendeScanninger := InjectURL(UrlIndleveringsPakkeManglendeScanninger);
 
+    URLOmdirigerTilPakkeshop := ReadString('Settings', 'URLOmdirigerTilPakkeshop','http://omdeling.info/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s');
+    URLOmdirigerTilPakkeshop := InjectURL(URLOmdirigerTilPakkeshop);
 
 
 
@@ -725,10 +762,29 @@
        SpecialVersionSted := '01';
        SpecialVersionScanningtype := '4';
     end;
+
     if SpecialVersionSted = 'FD' then
     begin
-       SpecialVersionSted := '03';
-       SpecialVersionScanningtype := '4';
+       //SpecialVersionSted := '03'; //fra før at FD overtog scanning
+       //SpecialVersionScanningtype := '4';
+
+
+      //FarveNormal := 'A9F5A9';  // her kan vi evt. overrule ini fil
+      Sted := SpecialVersionSted;
+     // her skal vi også disable de knapper BK ikke kan bruge
+      PanelValg2.Enabled := false;
+      PanelValg2.Font.Color := clInactiveCaption;
+      PanelValg3.Enabled := false;
+      PanelValg3.Font.Color := clInactiveCaption;
+      //PanelValg6.Enabled := false;
+      //PanelValg6.Font.Color := clInactiveCaption;
+
+     // her skal vi også disable de menupunkter FD ikke kan bruge
+      ReturpakkerfraDAO1.Enabled := false;
+      Returpakkerfraboghandler1.Enabled := false;
+
+      //Returpakkerfrapakkeshop1.Enabled := false;
+
     end;
 
     if (SpecialVersionSted = 'BK') OR (SpecialVersionSted = 'TK') then