From 18acb288bcf1788c7d02cdfa2b94178a6d3fd0e0 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Thu, 21 Feb 2019 14:19:19 +0000
Subject: - PHP7 wieder raus :( - Export Profile Optimiert

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7305 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml   | 4 ++--
 views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml | 4 ++--
 views/mods/mod_si/cannotorder.phtml                              | 2 +-
 views/mods/mod_skrill/order_done.phtml                           | 2 +-
 views/order/backendEdit/editPayShipping.phtml                    | 8 ++++----
 views/order/view_customerdata.phtml                              | 4 ++--
 views/warenkorb/overview.phtml                                   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
index 7efc523..9e4e969 100644
--- a/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
+++ b/views/mods/mod_auftragsbestaetigung/auftragsbestaetigung.phtml
@@ -9,7 +9,7 @@
 
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??'')); ?>
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.wpsg_getStr($this->view['basket']['checkout']['nr'])); ?>
 <?php echo wpsg_pad_right(__('Land', 'wpsg').':', 35); ?><?php echo $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> 
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
 <?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?> 
@@ -34,7 +34,7 @@
  
 <?php echo wpsg_pad_right(__('Firma', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['firma']; ?> 
 <?php echo wpsg_pad_right(__('Name', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['vname']; ?> <?php echo $this->view['basket']['checkout']['name']; ?> 
-<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??'')); ?>    
+<?php echo wpsg_pad_right(__('Straße', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['strasse'].rtrim(' '.wpsg_getStr($this->view['basket']['checkout']['nr'])); ?>    
 <?php echo wpsg_pad_right(__('Land', 'wpsg').':', 35); ?><?php echo $this->db->fetchOne("SELECT `name` FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->view['basket']['checkout']['land'])."' "); ?> 
 <?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
 <?php echo wpsg_pad_right(__('USt.IdNr.', 'wpsg').':', 35); ?><?php echo $this->view['basket']['checkout']['ustidnr']; ?> 
diff --git a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
index d2c37d2..50f5b3e 100644
--- a/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
+++ b/views/mods/mod_shippingadress/wpsg_order_view_customerdata.phtml
@@ -47,7 +47,7 @@
                     <?php echo wpsg_drawForm_Input('dialog_shipping_name', __('Name', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_name']); ?>
                     <?php echo wpsg_drawForm_Input('dialog_shipping_strasse', __('Straße', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_strasse']); ?>
 						
-					<?php if (($this->view['pflicht']['wpsg_showNr']??'') === '1') { ?>
+					<?php if (wpsg_getStr($this->view['pflicht']['wpsg_showNr']) === '1') { ?>
 	
 						<?php echo wpsg_drawForm_Input('dialog_shipping_nr', __('Hausnummer', 'wpsg'), $this->view['wpsg_mod_shippingadress']['shipping_nr']); ?>
 						
@@ -79,7 +79,7 @@
             echo $this->view['arTitles'][$this->view['wpsg_mod_shippingadress']['shipping_title']];
 
     ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_vname']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_name']); ?><br />
-    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse'].rtrim(' '.($this->view['wpsg_mod_shippingadress']['shipping_nr']??''))); ?><br />
+    <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_strasse'].rtrim(' '.wpsg_getStr($this->view['wpsg_mod_shippingadress']['shipping_nr']))); ?><br />
 	<?php $lk = $this->view['wpsg_mod_shippingadress']['oCountry']->getShorttext(); ?>
     <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_plz']); ?> <?php echo wpsg_hspc($this->view['wpsg_mod_shippingadress']['shipping_ort']); ?> <?php echo wpsg_hspc($lk); ?><br />
     <a style="position: absolute; right:25px; top:10px; display:inline-block;" data-toggle="modal" data-target="#wpsg_customer_shipping_edit" href="#" title="<?php echo __('Lieferanschrift ändern', 'wpsg'); ?>">
diff --git a/views/mods/mod_si/cannotorder.phtml b/views/mods/mod_si/cannotorder.phtml
index a34e606..e8658e4 100644
--- a/views/mods/mod_si/cannotorder.phtml
+++ b/views/mods/mod_si/cannotorder.phtml
@@ -11,7 +11,7 @@
 		'project_id' => $this->get_option('wpsg_mod_si_project_id'), // Ihre Projektnummer des SOFORT Ident Projekts, z.B. "54321"
 		'firstname' => $this->view['basket']['checkout']['vname'], // Vorname des Kunden, z.B. "Max"
 		'lastname' => $this->view['basket']['checkout']['name'], // Nachname des Kunden, z.B. "Mustermann"
-		'street' => $this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??'')), // Straße und Hausnummer des Kunden, z.B. "Unter den Linden 77"
+		'street' => $this->view['basket']['checkout']['strasse'].rtrim(' '.wpsg_getStr($this->view['basket']['checkout']['nr'])), // Straße und Hausnummer des Kunden, z.B. "Unter den Linden 77"
 		'city' => $this->view['basket']['checkout']['ort'], // Wohnort des Kunden, z.B. "Berlin"
 		'zipcode' => $this->view['basket']['checkout']['plz'], // PLZ des Kunden, z.B. "10117"
 		'birthday' => date('Y-m-d', strtotime($this->view['basket']['checkout']['plz'])), // Geburtsdatum des Kunden im Format YYYY-MM-DD, z.B. "1978-09-24"
diff --git a/views/mods/mod_skrill/order_done.phtml b/views/mods/mod_skrill/order_done.phtml
index 1f60b35..ea8f417 100644
--- a/views/mods/mod_skrill/order_done.phtml
+++ b/views/mods/mod_skrill/order_done.phtml
@@ -26,7 +26,7 @@
 	<input type="hidden" name="firstname" value="<?php echo wpsg_hspc($this->view['kunde']['vname']); ?>" />
 	<input type="hidden" name="lastname" value="<?php echo wpsg_hspc($this->view['kunde']['name']); ?>" />
 	<input type="hidden" name="date_of_birth" value="<?php echo wpsg_hspc(date('dmY', strtotime($this->view['kunde']['geb']))); ?>" />
-	<input type="hidden" name="address" value="<?php echo wpsg_hspc(rtrim($this->view['kunde']['strasse'].' '.($this->view['kunde']['nr']??''))); ?>" />
+	<input type="hidden" name="address" value="<?php echo wpsg_hspc(rtrim($this->view['kunde']['strasse'].' '.wpsg_getStr($this->view['kunde']['nr']))); ?>" />
 	<input type="hidden" name="phone_number" value="<?php echo wpsg_hspc($this->view['kunde']['tel']); ?>" />
 	<input type="hidden" name="postal_code" value="<?php echo wpsg_hspc($this->view['kunde']['plz']); ?>" />
 	<input type="hidden" name="city" value="<?php echo wpsg_hspc($this->view['kunde']['ort']); ?>" />
diff --git a/views/order/backendEdit/editPayShipping.phtml b/views/order/backendEdit/editPayShipping.phtml
index a688f5f..04392cc 100644
--- a/views/order/backendEdit/editPayShipping.phtml
+++ b/views/order/backendEdit/editPayShipping.phtml
@@ -34,15 +34,15 @@
     
     if ($this->getBackendTaxview() === WPSG_BRUTTO) {
         
-    	$price_shipping = wpsg_ff(($arCalculation['shipping'][0]['brutto_single']??0), $this->get_option('wpsg_currency'));
-		$price_payment = wpsg_ff(($arCalculation['payment'][0]['brutto_single']??0), $this->get_option('wpsg_currency'));
+    	$price_shipping = wpsg_ff(wpsg_getInt($arCalculation['shipping'][0]['brutto_single']), $this->get_option('wpsg_currency'));
+		$price_payment = wpsg_ff(wpsg_getInt($arCalculation['payment'][0]['brutto_single']), $this->get_option('wpsg_currency'));
     	         
         $price_suffix = ' ('.__('Brutto', 'wpsg').')';
         
     } else {
 	
-		$price_shipping = wpsg_ff(($arCalculation['shipping'][0]['netto_single']??0), $this->get_option('wpsg_currency'));
-		$price_payment = wpsg_ff(($arCalculation['payment'][0]['netto_single']??0), $this->get_option('wpsg_currency'));
+		$price_shipping = wpsg_ff(wpsg_getInt($arCalculation['shipping'][0]['netto_single']), $this->get_option('wpsg_currency'));
+		$price_payment = wpsg_ff(wpsg_getInt($arCalculation['payment'][0]['netto_single']), $this->get_option('wpsg_currency'));
 
         $price_suffix = ' ('.__('Netto', 'wpsg').')';
         
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index 1326463..1fec340 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -53,7 +53,7 @@
                 	
 					<?php echo wpsg_drawForm_Input('dialog_strasse', __('Straße', 'wpsg'), $this->view['data']['strasse']); ?>
 	
-					<?php if (($this->view['pflicht']['wpsg_showNr']??'') === '1') { ?>
+					<?php if (wpsg_getStr($this->view['pflicht']['wpsg_showNr']) === '1') { ?>
 		
 						<?php echo wpsg_drawForm_Input('dialog_nr', __('Hausnummer', 'wpsg'), $this->view['data']['nr']); ?>
 						
@@ -114,7 +114,7 @@
     <?php } ?>                    
     <?php if ($this->view['pflicht']['strasse'] != '2') { ?>
 	
-		<?php echo wpsg_hspc($this->view['data']['strasse']); ?> <?php echo wpsg_hspc(($this->view['data']['nr']??'')); ?><br />
+		<?php echo wpsg_hspc($this->view['data']['strasse']); ?> <?php echo wpsg_hspc(wpsg_getStr($this->view['data']['nr'])); ?><br />
 		 
     <?php } ?>                    
    	<?php if ($this->view['pflicht']['plz'] != '2') { ?>
diff --git a/views/warenkorb/overview.phtml b/views/warenkorb/overview.phtml
index 3dd40c3..1456ad4 100644
--- a/views/warenkorb/overview.phtml
+++ b/views/warenkorb/overview.phtml
@@ -69,7 +69,7 @@
 				<?php echo wpsg_hspc($this->view['basket']['checkout']['name']); ?><br />
 			<?php } ?>
 			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?><br />
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.wpsg_getStr($this->view['basket']['checkout']['nr']))); ?><br />
 			<?php } ?>
 			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 				<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?> 
@@ -145,7 +145,7 @@
 				<?php echo $this->view['basket']['checkout']['name']; ?><br />
 			<?php } ?>	
 			<?php if ($this->view['pflicht']['strasse'] != '2') { ?>
-				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?><br />
+				<?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.wpsg_getStr($this->view['basket']['checkout']['nr']))); ?><br />
 			<?php } ?>
 			<?php if ($this->view['pflicht']['plz'] != '2') { ?>
 				<?php echo wpsg_hspc($this->view['basket']['checkout']['plz']); ?>
-- 
cgit v1.2.3