From 56dab61941986dcf29c15875a7c34b96affc9504 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 20 Oct 2022 14:53:32 +0200
Subject: [PATCH] Fixed generated urls sometimes interfering with rewrite rules

---
 lib/mvcfronk/mfBase/mfBaseController.php                  | 2 +-
 lib/mvcfronk/mfLayout/mfLayout.php                        | 2 +-
 scripts/addressdb/addressdb_import_bev_adressregister.php | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/mvcfronk/mfBase/mfBaseController.php b/lib/mvcfronk/mfBase/mfBaseController.php
index a01e3085e..f4fdf8299 100644
--- a/lib/mvcfronk/mfBase/mfBaseController.php
+++ b/lib/mvcfronk/mfBase/mfBaseController.php
@@ -264,7 +264,7 @@ class mfBaseController {
       }
     }
 		if(is_array($param) && count($param)) {
-      $url .= (MFUSEFANCYURLS) ? "/" : "&amp;";
+      $url .= (MFUSEFANCYURLS) ? "/?" : "&amp;";
       $param_qs = http_build_query($param);
 			$url .= "$param_qs";
 		}
diff --git a/lib/mvcfronk/mfLayout/mfLayout.php b/lib/mvcfronk/mfLayout/mfLayout.php
index 39fb39b53..1837a8d43 100644
--- a/lib/mvcfronk/mfLayout/mfLayout.php
+++ b/lib/mvcfronk/mfLayout/mfLayout.php
@@ -207,7 +207,7 @@ class mfLayout {
       }
     }
     if (is_array($param) && count($param)) {
-      $url .= (MFUSEFANCYURLS) ? "/" : "&amp;";
+      $url .= (MFUSEFANCYURLS) ? "/?" : "&amp;";
       $param_qs = http_build_query($param);
       $url .= "$param_qs";
     }
diff --git a/scripts/addressdb/addressdb_import_bev_adressregister.php b/scripts/addressdb/addressdb_import_bev_adressregister.php
index d07115e34..99441f26d 100755
--- a/scripts/addressdb/addressdb_import_bev_adressregister.php
+++ b/scripts/addressdb/addressdb_import_bev_adressregister.php
@@ -13,6 +13,8 @@ require_once(LIBDIR."/mvcfronk/mfBase/mfBaseController.php");
 
 $me = new User(1);
 
+$gemeinden_cache = [];
+
 $folder = BASEDIR."/scripts/addressdb/import/bev";
 $db = FronkDB::singleton(ADDRESSDB_DBHOST, ADDRESSDB_DBUSER, ADDRESSDB_DBPASS, ADDRESSDB_DBNAME);
 $log = mfLoghandler::singleton();
@@ -223,7 +225,6 @@ while($csv = fgetcsv($input, 0, ";")) {
 echo "\n".($i-1)." Straßen importiert\n";
 
 
-$gemeinden_cache = [];
 function getGemeinde($kz) {
   global $gemeinden_cache;