From c5ee7faae197f6e4b01f99cb7ea84b6fe5d39340 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 17 Jan 2024 17:57:17 +0100
Subject: [PATCH] Added trims to BMD Export

---
 application/Address/AddressController.php | 44 +++++++++++------------
 lib/mvcfronk/mfRequest/mfRequest.php      | 28 +++++++++++++--
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index c601d725e..0ab460003 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -433,31 +433,31 @@ class AddressController extends mfBaseController {
     
     $data = [];
     $data['parent_id'] = (!$r->parent_id) ? null : $r->parent_id;
-    $data['company'] = $r->company;
-    $data['firstname'] = $r->firstname;
-    $data['lastname'] = $r->lastname;
-    $data['street'] = $r->street;
-    $data['zip'] = $r->zip;
-    $data['city'] = $r->city;
-    $data['country'] = $r->country;
-    $data['phone'] = $r->phone;
-    $data['fax'] = $r->fax;
-    $data['mobile'] = $r->mobile;
-    $data['email'] = $r->email;
-    $data['note'] = $r->note;
-    $data['uid'] = $r->uid;
+    $data['company'] = trim($r->company);
+    $data['firstname'] = trim($r->firstname);
+    $data['lastname'] = trim($r->lastname);
+    $data['street'] = trim($r->street);
+    $data['zip'] = trim($r->zip);
+    $data['city'] = trim($r->city);
+    $data['country'] = trim($r->country);
+    $data['phone'] = trim($r->phone);
+    $data['fax'] = trim($r->fax);
+    $data['mobile'] = trim($r->mobile);
+    $data['email'] = trim($r->email);
+    $data['note'] = trim($r->note);
+    $data['uid'] = trim($r->uid);
     
     if($this->me->can("Fibu")) {
-      $data['fibu_account_number'] = ($r->fibu_account_number) ? $r->fibu_account_number : null;
-      $data['fibu_supplier_number'] = ($r->fibu_supplier_number) ? $r->fibu_supplier_number : null;
+      $data['fibu_account_number'] = ($r->fibu_account_number) ? trim($r->fibu_account_number) : null;
+      $data['fibu_supplier_number'] = ($r->fibu_supplier_number) ? trim($r->fibu_supplier_number) : null;
       if($r->fibu_primary_account) {
         $data['fibu_primary_account'] = 1;
       } else {
         $data['fibu_primary_account'] = 0;
       }
-      $data['fibu_supplier_due'] = ($r->fibu_supplier_due) ? $r->fibu_supplier_due : null;
-      $data['fibu_supplier_skonto'] = ($r->fibu_supplier_skonto) ? $r->fibu_supplier_skonto : null;
-      $data['fibu_supplier_skonto_rate'] = ($r->fibu_supplier_skonto_rate) ? $r->fibu_supplier_skonto_rate : null;
+      $data['fibu_supplier_due'] = ($r->fibu_supplier_due) ? trim($r->fibu_supplier_due) : null;
+      $data['fibu_supplier_skonto'] = ($r->fibu_supplier_skonto) ? trim($r->fibu_supplier_skonto) : null;
+      $data['fibu_supplier_skonto_rate'] = ($r->fibu_supplier_skonto_rate) ? trim($r->fibu_supplier_skonto_rate) : null;
     }
     
     
@@ -492,10 +492,10 @@ class AddressController extends mfBaseController {
     }
     
     
-    $data['bank_account_bank'] = $r->bank_account_bank;
-    $data['bank_account_owner'] = $r->bank_account_owner;
-    $data['bank_account_iban'] = $r->bank_account_iban;
-    $data['bank_account_bic'] = $r->bank_account_bic;
+    $data['bank_account_bank'] = trim($r->bank_account_bank);
+    $data['bank_account_owner'] = trim($r->bank_account_owner);
+    $data['bank_account_iban'] = trim($r->bank_account_iban);
+    $data['bank_account_bic'] = trim($r->bank_account_bic);
     $data['allow_contact'] = ($r->allow_contact) ? 1 : 0;
     $data['allow_spin'] = ($r->allow_spin) ? 1 : 0;
     
diff --git a/lib/mvcfronk/mfRequest/mfRequest.php b/lib/mvcfronk/mfRequest/mfRequest.php
index faef3c2ae..1619b5283 100644
--- a/lib/mvcfronk/mfRequest/mfRequest.php
+++ b/lib/mvcfronk/mfRequest/mfRequest.php
@@ -2,6 +2,7 @@
 
 class mfRequest {
   protected static $instance;
+  protected $original_request = [];
   protected $request = [];
   
   public function __construct(Array $request = []) {
@@ -9,8 +10,19 @@ class mfRequest {
       $this->request = $request;
     } else {
       // get request from POST/GET
-      if(isset($_POST) && isset($_GET)) {
-        $this->request = array_merge($_GET, $_POST);
+      $_request = [];
+      if(isset($_GET)) {
+        $_request = array_merge($_request, $_GET);
+      }
+      if(isset($_POST)) {
+        $_request = array_merge($_request, $_POST);
+      }
+      if(!count($_request)) {
+        return true;
+      }
+      foreach($_request as $key => $name) {
+        $this->original_request[$key] = $name;
+        $this->request[$key] = trim($name);
       }
     }
   }
@@ -41,6 +53,18 @@ class mfRequest {
     return $this->request;
   }
   
+  public function getUnmodified($name = null) {
+    if($name) {
+      if(array_key_exists($name, $this->original_request)) {
+        //var_dump($this->request);exit;
+        return $this->original_request[$name];
+      } else {
+        return null;
+      }
+    }
+    return $this->request;
+  }
+  
   public function __get($name) {
     return $this->get($name);
   }