From b1dad65b246f224c3ceea030ce2babc64147ecd2 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 10 Sep 2019 11:34:11 +0000
Subject: - Bugfix: Probleme beim erstmaligen aktivieren in einem Multiblog
 behoben

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7562 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_abo/index.phtml              |  4 ++-
 views/mods/mod_kundenverwaltung/edit.phtml  | 24 +++++++++--------
 views/mods/mod_kundenverwaltung/index.phtml | 41 +++++++++++++++++++++++------
 views/mods/mod_versandarten/list.phtml      | 24 +++++++++++------
 4 files changed, 65 insertions(+), 28 deletions(-)

(limited to 'views/mods')

diff --git a/views/mods/mod_abo/index.phtml b/views/mods/mod_abo/index.phtml
index 0f99c44..8ffdbfd 100644
--- a/views/mods/mod_abo/index.phtml
+++ b/views/mods/mod_abo/index.phtml
@@ -27,7 +27,9 @@
 			<div class="row">
 				<div class="col-lg-4">
 					<form method="post" id="filter_form" >
-
+						
+						<?php echo wpsg_formNounce('Abo', 'index', ['search' => '1']); ?>
+						
 						<input id="wpsg_seite" type="hidden" name="seite" value="<?php echo @$this->view['arFilter']['page']; ?>" class="current-page" />
 						<input id="wpsg_order" type="hidden" name="filter[order]" value="<?php echo @$this->view['arFilter']['order']; ?>" />
 						<input id="wpsg_ascdesc" type="hidden" name="filter[ascdesc]" value="<?php echo @$this->view['arFilter']['ascdesc']; ?>" />
diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml
index 915a9fe..fb5330e 100644
--- a/views/mods/mod_kundenverwaltung/edit.phtml
+++ b/views/mods/mod_kundenverwaltung/edit.phtml
@@ -36,6 +36,8 @@
 
 		<form method="POST" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=save&noheader=1" enctype="multipart/form-data">
 
+			<?php echo wpsg_formNounce('Customer', 'save'); ?>
+			
 			<div class="row">
 				<div class="col-md-8 col-lg-8">
 
@@ -115,7 +117,7 @@
 					<?php echo wpsg_drawForm_AdminboxStart(__('Passwortänderung', 'wpsg')); ?>
 						<?php echo wpsg_drawForm_Input('password1', __('Passwort', 'wpsg'), '', array('type' => 'password')); ?>
 						<?php echo wpsg_drawForm_Input('password2', __('Wiederholung', 'wpsg'), '', array('type' => 'password')); ?>
-                        <div id="wpsg_pwd_info">
+                        <div id="wpsg_pwd_info" style="display:none;">
                             <h4><?php echo __('Passwort sollte folgende Regeln befolgen:','wpsg') ?></h4>
                             <ul>
                                 <li id="wpsg_pwd_length" class="invalid"><?php echo __('Mindestens 8 Zeichen','wpsg')?></li>
@@ -213,7 +215,7 @@
 
 </div>
 
-<script type="text/javascript">/* <![CDATA[ */
+<script>
 	
 	jQuery(document).ready(function() {
 		
@@ -287,16 +289,16 @@
 
 			}
 
+		} ).on('focus', function() {
+			
 			jQuery('#wpsg_pwd_info').show();
+			
+		}).on('blur', function() {
 
-			jQuery(this).blur(function() {
-
-				jQuery('#wpsg_pwd_info').hide();
-
-			} );
-
-		} );
-
+			jQuery('#wpsg_pwd_info').hide();
+			
+		});
+		
 	} );
 
-/* ]]> */</script>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/views/mods/mod_kundenverwaltung/index.phtml b/views/mods/mod_kundenverwaltung/index.phtml
index afaf4a6..3b35ecb 100644
--- a/views/mods/mod_kundenverwaltung/index.phtml
+++ b/views/mods/mod_kundenverwaltung/index.phtml
@@ -17,7 +17,13 @@
 				<ul class="nav navbar-nav">
 					<li role="presentation" class="<?php echo ((!isset($_REQUEST['action']))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer" onclick="return false;"><?php echo wpsg_translate(__("Kundenverwaltung (#1# Kunden)", "wpsg"), $this->view['countAll']); ?></a></li>
 					<li role="presentation" class="wpsg-customer-tab-a wpsg_showhide_filter <?php echo ((wpsg_isTrue($this->view['hasFilter']))?'active':''); ?>" id="wpsg-customer-tab-0"><a href="#" onclick="return false;"><span class="glyphicon glyphicon-search"></span><?php echo __("Suche", "wpsg"); ?></a></li>
-                    <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=add"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); ?></a></li>
+                    <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'add'))?'active':''); ?>"><a href="<?php 
+						
+						echo wpsg_admin_url('Customer', 'add'); 
+						
+					?>"><span class="glyphicon glyphicon-plus"></span><?php echo __("Hinzufügen", "wpsg"); 
+							
+					?></a></li>
                     
                     <?php /* Integration Exportprofile */ ?>
                     <?php if ($this->hasMod('wpsg_mod_export')) { $arProfile = $this->callMod('wpsg_mod_export', 'getProfile', array(wpsg_mod_export::TYPE_CUSTOMER)); ?>
@@ -28,9 +34,17 @@
                         
 				</ul>
 				<ul class="nav navbar-nav navbar-right">
-                    <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'import'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=import"><span class="glyphicon glyphicon-import"></span><?php echo __("Daten-Import", "wpsg"); ?></a></li>
+                    <li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'import'))?'active':''); ?>"><a href="<?php
+		
+						echo wpsg_admin_url('Customer', 'import', [], ['noheader' => '1']);
+							
+					?>"><span class="glyphicon glyphicon-import"></span><?php echo __("Daten-Import", "wpsg"); ?></a></li>
 					<?php if (wpsg_isSizedArray($this->view['arData'])) { ?>
-					<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'export'))?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=export&noheader=1"><span class="glyphicon glyphicon-export"></span><?php echo __("Daten-Export", "wpsg"); ?></a></li>
+					<li role="presentation" class="<?php echo ((wpsg_isSizedString($_REQUEST['action'], 'export'))?'active':''); ?>"><a href="<?php
+							
+						echo wpsg_admin_url('Customer', 'export', [], ['noheader' => '1']);
+
+					?>"><span class="glyphicon glyphicon-export"></span><?php echo __("Daten-Export", "wpsg"); ?></a></li>
 					<?php } ?>
 				</ul>
 			</div>
@@ -159,15 +173,26 @@
                                     <a href="mailto:<?php echo $c->getEMail(); ?>" title="<?php echo __('Dem Kunden eine E-Mail schreiben.', 'wpsg'); ?>"><?php echo $c->getEMail();  ?></a>
                                 <?php } ?>
                                 <div class="row-actions">
-                                    <span class="edit"><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=edit&edit_id=<?php echo $c->id; ?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>
+                                    <span class="edit"><a title="<?php echo __("Diesen Kunden bearbeiten", "wpsg"); ?>" href="<?php 
+											
+										echo wpsg_admin_url('Customer', 'edit', ['edit_id' => $c->getId()]);
+											
+									?>"><?php echo __("Bearbeiten", "wpsg"); ?></a></span>
                                     |
-                                    <span class="del"><a onclick="if (!confirm('<?php echo __("Sind Sie sicher, dass Sie den Kunden löschen wollen?", "wpsg"); ?>')) return false;" title="<?php echo __("Diesen Kunden löschen", "wpsg"); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Customer&action=del&edit_id=<?php echo $c->id; ?>&noheader=1"><?php echo __("Löschen", "wpsg"); ?></a></span>
+                                    <span class="del"><a onclick="if (!confirm('<?php echo __("Sind Sie sicher, dass Sie den Kunden löschen wollen?", "wpsg"); ?>')) return false;" title="<?php echo __("Diesen Kunden löschen", "wpsg"); ?>" href="<?php 
+									
+										echo wpsg_admin_url('Customer', 'del', ['edit_id' => $c->id]);		
+											
+									?>&noheader=1"><?php echo __("Löschen", "wpsg"); ?></a></span>
                                     |
-                                    <span class="order"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Order&filter%5Bk_id%5D=<?php echo $c->id; ?>"><?php echo __('Bestellungen einsehen', 'wpsg'); ?></a></span>
-                                    
+									
                                     <?php if ($c->status !== '-1') { ?>
                                     |
-                                    <span class="order"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_kundenverwaltung&noheader=1&be_ajax=su_index&k_id=<?php echo $c->id; ?>"><?php echo __('Kundenlogin simulieren', 'wpsg'); ?></a></span>
+                                    <span class="order"><a href="<?php 
+											
+										echo wpsg_admin_url('Admin', 'module', ['modul' => 'wpsg_mod_kundenverwaltung', 'be_ajax' => 'su_index', 'k_id' => $c->getId()], ['noheader' => '1']);											
+											
+									?>"><?php echo __('Kundenlogin simulieren', 'wpsg'); ?></a></span>
                                     <?php } ?>
                                     
                                 </div>
diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml
index 07952a3..7775430 100644
--- a/views/mods/mod_versandarten/list.phtml
+++ b/views/mods/mod_versandarten/list.phtml
@@ -3,7 +3,9 @@
 	/**
 	 * Template für die Liste der Versandarten 
 	 */
-
+	
+	$arVzNamen = [];
+	
 ?>
 <?php if (!is_array($this->view['data']) || sizeof($this->view['data']) <= 0) { ?>
 <?php echo __('Bisher keine Versandarten angelegt.', 'wpsg'); ?>
@@ -87,13 +89,19 @@
         /* ]]> */</script>
 
         <?php echo wpsg_drawForm_TextStart(); ?>
-        <span id="va_vz_<?php echo $va['id']; ?>">
-        <?php if ($va['vz'] > 0) { ?>
-        	<?php echo wpsg_hspc($this->view['arVZ'][$va['vz']]['name']); ?>
-        	<?php } else { ?>
-        	<?php echo __('Alle Versandzonen', 'wpsg'); ?>
-        	<?php } ?>
-        </span>
+        <span id="va_vz_<?php echo $va['id']; ?>"><?php
+				
+				if ($va['vz'] > 0) { 
+					
+					echo wpsg_hspc($this->view['arVZ'][$va['vz']]['name']); 
+        		
+				} else { 
+        	
+					echo __('Alle Versandzonen', 'wpsg'); 
+        	
+				} 
+				
+        ?></span>
 		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_versandzone" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_versandzone"></a>
         <?php echo wpsg_drawForm_TextEnd(__('Versandzone', 'wpsg')); ?>
         <script type="text/javascript">/* <![CDATA[ */
-- 
cgit v1.2.3