--- dao/DelphiScanner/Configuration.pas	2016/08/15 12:44:21	3086
+++ dao/DelphiScanner/Configuration.pas	2016/08/15 14:14:14	3087
@@ -38,18 +38,32 @@
 
     BaseURL : string;
 
+
+   UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering,
+            UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,
+            UrlIndleveringsPakkeManglendeScanninger,UrlEKLoverforsel, URLOmdirigerTilPakkeshop : String;
+
+    UrlEKLoverforselPakkeshop : String;
+
+    UrlFindPakketype, UrlSendPrograminfo: String;
+
+
+
     procedure ReadFromInifile( iniFile: TIniFile);
+    function InjectURL(Url : String) : String;
 
   end;
 
 implementation
 
+uses Utils;
+
 
 procedure TConfiguration.ReadFromInifile( iniFile: TIniFile);
 begin
 
-  // ToDO : Omskriv alle URL referncer til at basere sig på BaseURL
-  BaseURL := 'http://omdeling.info/webservices';
+
+  BaseURL := 'http://omdeling.info/';
 
   with iniFile do
   begin
@@ -127,6 +141,66 @@
     end;
   end;  //With ... do
 
+    UrlFindPakketype := BaseURL + '/webservices/bogpakkekontrol/FindPakketype.php?stregkode=%s';
+    UrlFindPakketype := InjectURL(UrlFindPakketype);
+
+    UrlSendPrograminfo := BaseURL + '/webservices/bogpakkekontrol/SendPrograminfo.php?programnavn=%s&sted=%s&scanningtype=%s&infotype=%s&info=%s';
+    UrlSendPrograminfo := InjectURL(UrlSendPrograminfo);
+
+    UrlNormal := BaseURL + '/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&tjekkode=%s';
+    UrlNormal := InjectURL(UrlNormal);
+
+    UrlReturDAO := BaseURL + '/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s';
+    UrlReturDAO := InjectURL(UrlReturDAO);
+
+    UrlReturBoghandler := BaseURL + '/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s';
+    UrlReturBoghandler := InjectURL(UrlReturBoghandler);
+
+    UrlBudlevering := BaseURL + '/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&leveringstype=%s&pakkestorrelse=%s';
+    UrlBudlevering := InjectURL(UrlBudlevering);
+
+    UrlManglendeScanninger := BaseURL + '/webservices/bogpakkekontrol/bogpakkemanglendescanninger.php?sted=%s&type=%s';
+    UrlManglendeScanninger := InjectURL(UrlManglendeScanninger);
+
+    UrlEKLoverforsel := BaseURL + '/webservices/bogpakkekontrol/bogpakkertilekl.php?sted=%s';
+    UrlEKLoverforsel := InjectURL(UrlEKLoverforsel);
+
+    UrlEKLoverforselPakkeshop := BaseURL + '/webservices/pakkeshop/pakkertilekl.php?sted=%s';
+    UrlEKLoverforselPakkeshop := InjectURL(UrlEKLoverforselPakkeshop);
+
+    UrlPakkeshoplevering := BaseURL + '/webservices/pakkeshop/pakkekontrol.php?sted=%s&stregkode=%s&tjekkode=%s';
+    UrlPakkeshoplevering := InjectURL(UrlPakkeshoplevering);
+
+    UrlReturPakkeshop := BaseURL + '/webservices/pakkeshop/returpakkekontrol.php?sted=%s&stregkode=%s';
+    UrlReturPakkeshop := InjectURL(UrlReturPakkeshop);
+
+    UrlPakkeshopManglendeScanninger := BaseURL + '/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s';
+    UrlPakkeshopManglendeScanninger := InjectURL(UrlPakkeshopManglendeScanninger);
+
+    UrlPakkeshopManglendeReturScanninger := BaseURL + '/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s';
+    UrlPakkeshopManglendeReturScanninger := InjectURL(UrlPakkeshopManglendeReturScanninger);
+
+    UrlIndleveringsPakke := BaseURL + '/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s';
+    UrlIndleveringsPakke := InjectURL(UrlIndleveringsPakke);
+
+    UrlIndleveringsPakkeManglendeScanninger := BaseURL + '/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s';
+    UrlIndleveringsPakkeManglendeScanninger := InjectURL(UrlIndleveringsPakkeManglendeScanninger);
+
+    URLOmdirigerTilPakkeshop := BaseURL + '/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s';
+    URLOmdirigerTilPakkeshop := InjectURL(URLOmdirigerTilPakkeshop);
+
+
+end;
+
+
+function TConfiguration.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;
 
 end.