- Lizenzverwaltung

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6488 0d5edaf7-2b12-4e95-93f4-047927463d4b

5 files changed, 16 insertions, 17 deletions

diff --git a/views/admin/access.phtml b/views/admin/access.phtml
index e50836a..2aa5cf3 100644
--- a/views/admin/access.phtml
+++ b/views/admin/access.phtml
@@ -58,7 +58,7 @@
 							<?php } ?>

 							<td></td>

 						</tr>

-						<?php if ($this->hasMod('wpsg_mod_core')) { ?>

+						<?php $wpsg_update_data = wpsg_get_update_data(); if (wpsg_isSizedInt($wpsg_update_data['returnCode'])) { ?>

 						<tr>

 							<td class="wpsg_col_capname"><?php echo __('Lizenzverwaltung', 'wpsg'); ?></td>

 							<?php foreach ($arRoles as $role_key => $r) { ?>

diff --git a/views/admin/extended.phtml b/views/admin/extended.phtml
index d35eb3c..d76e46f 100644
--- a/views/admin/extended.phtml
+++ b/views/admin/extended.phtml
@@ -32,10 +32,7 @@
 				<?php echo wpsg_drawForm_Checkbox('wpsg_displayTemplates', __('Verwendete Templates anzeigen (Nur im Frontend)', 'wpsg'), $this->get_option('wpsg_displayTemplates'), array('help' => 'wpsg_displayTemplates')); ?>

 				<?php echo wpsg_drawForm_Checkbox('wpsg_displayTemplatesLog', __('Verwendete Templates in Entwicklerkonsole anzeigen', 'wpsg'), $this->get_option('wpsg_displayTemplatesLog'), array('help' => 'wpsg_displayTemplatesLog')); ?>

 				<br />

-				<?php if ($this->hasMod('wpsg_mod_core')) { ?>

-				<?php echo wpsg_drawForm_Checkbox('wpsg_debugURL', __('Beta Updates laden', 'wpsg'), $this->get_option('wpsg_debugURL'), array('help' => 'wpsg_debugURL')); ?>				

-				<?php } ?>

-				

+								

 				<?php echo wpsg_drawForm_Checkbox('wpsg_referer_requesturi', __('RequestURI als ProduktURL verwenden', 'wpsg'), $this->get_option('wpsg_referer_requesturi'), array('help' => 'wpsg_referer_requesturi')); ?>

 				<?php echo wpsg_drawForm_Checkbox('wpsg_ignoreuserview', __('User Views ignorieren', 'wpsg'), $this->get_option('wpsg_ignoreuserview'), array('help' => 'wpsg_ignoreuserview')); ?>		

 				<?php echo wpsg_drawForm_Checkbox('wpsg_classicupload', __('Klassisches Upload Formular', 'wpsg'), $this->get_option('wpsg_classicupload')); ?>

diff --git a/views/admin/index.phtml b/views/admin/index.phtml
index dcebb2e..8926d14 100644
--- a/views/admin/index.phtml
+++ b/views/admin/index.phtml
@@ -4,6 +4,8 @@
 	 * Templatedatei für die Startseite/Konfiguration im Backend

 	 * Normalerweise sollte hier nichts angepasst werden

 	 */

+

+	$wpsg_update_data = wpsg_get_update_data();

  

 ?>

 

@@ -18,8 +20,8 @@
 				<ul class="nav navbar-nav">

 			 		<li role="presentation" class="<?php echo (($this->view['actionName'] == "index")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin"><?php echo __("Einstellungen", "wpsg"); ?></a></li>

 					<li role="presentation" class="<?php echo (($this->view['actionName'] == "module")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module"><?php echo __("Module", "wpsg"); ?></a></li>

-						

-					<?php if (current_user_can('wpsg_lizence') && is_array(wpsg_get_update_data())) { ?>			

+					

+					<?php if (current_user_can('wpsg_lizence') && wpsg_isSizedInt($wpsg_update_data['returnCode'])) { ?>			

 					<li role="presentation" class="<?php echo (($this->view['actionName'] == "registrierung")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=registrierung"><?php echo __("Lizenzverwaltung", "wpsg"); ?></a></li>

 					<?php } ?>

 					

@@ -38,8 +40,8 @@
 		</div>		

 	</nav>

 	

-	<hr class="wp-header-end" />

-				  	

+	<?php echo $this->writeBackendMessage(); ?>

+			  	

 	<div class="wpsg_admin_wrap">

 		<?php if (wpsg_isSizedString($this->view['subTemplate'])) { ?>

 		<?php $this->render($this->view['subTemplate']); ?>

diff --git a/views/admin/licence.phtml b/views/admin/licence.phtml
index b4fbec5..2577736 100644
--- a/views/admin/licence.phtml
+++ b/views/admin/licence.phtml
@@ -6,7 +6,7 @@
 

     $wpsg_update_data = wpsg_get_update_data();

 

-    if (!is_array($wpsg_update_data) || !current_user_can('wpsg_lizence')) die();

+    if (!is_array($wpsg_update_data) || !current_user_can('wpsg_lizence') || !wpsg_isSizedInt($wpsg_update_data['returnCode'])) die();

 

 ?>

 

@@ -215,8 +215,8 @@
                                                 <?php echo __('enthalten', 'wpsg'); ?>

                                             <?php } else { ?>

                                                 

-                                                <?php if (wpsg_isSizedString($modul_info['url_shop'])) { ?>

-                                                <a href="<?php echo $modul_info['url_shop']; ?>" target="_blank"><?php echo __('Modulcode erwerben', 'wpsg'); ?></a>

+                                                <?php if (wpsg_isSizedString($modul_info['shop_url'])) { ?>

+                                                <a href="<?php echo $modul_info['shop_url']; ?>" target="_blank"><?php echo __('Modulcode erwerben', 'wpsg'); ?></a>

                                                 <?php } else { ?>

                                                 <a href="https://shop.maennchen1.de" target="_blank"><?php echo __('Modulcode erwerben', 'wpsg'); ?></a>

                                                 <?php } ?>

diff --git a/views/admin/module.phtml b/views/admin/module.phtml
index 394ee7a..51b830e 100644
--- a/views/admin/module.phtml
+++ b/views/admin/module.phtml
@@ -131,7 +131,7 @@
 			

 		<?php } ?>

 		

-		<?php if (!isset($this->arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) || $this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0))) { ?>

+		<?php if (!isset($this->arAllModule[$_REQUEST['modul']]->version) || ((wpsg_isTrue($this->arAllModule[$_REQUEST['modul']]->free) || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods']))))) { ?>

 			<?php if ($this->arAllModule[$_REQUEST['modul']]->inline === true) { ?>

 			<p class="submit"><input type="submit" value="<?php echo __('Einstellungen speichern', 'wpsg'); ?>" class="button-primary" id="submit" name="submit"></p>

 			<?php } ?> 

@@ -157,7 +157,7 @@
 	</form>

 	<?php } ?>

 	

-	<?php if (array_key_exists($_REQUEST['modul'], $this->arModule) && (!isset($this->arAllModule[$_REQUEST['modul']]->version) || (($this->arAllModule[$_REQUEST['modul']]->free === true || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])) || $this->arAllModule[$_REQUEST['modul']]->getDemoDays() > 0)))) { ?>

+	<?php if (array_key_exists($_REQUEST['modul'], $this->arModule) && (!isset($this->arAllModule[$_REQUEST['modul']]->version) || (($this->arAllModule[$_REQUEST['modul']]->free === true || (is_array($this->arLizenz) && in_array($_REQUEST['modul'], (array)$this->arLizenz['mods'])))))) { ?>

 	<?php echo $this->arModule[$_REQUEST['modul']]->settings_edit_afterform(); ?>

 	<?php } ?>	

 	

@@ -196,7 +196,7 @@
 				<hr />

 				

 				<?php $wpsg_update_data = wpsg_get_update_data(); ?>

-				<?php if (wpsg_isSizedArray($wpsg_update_data)) { ?>

+				<?php if (wpsg_isSizedArray($wpsg_update_data['modulinfo'])) { ?>

 				

 					<table class="table modultable">

   						<thead>

@@ -236,8 +236,8 @@
 										<?php echo __('enthalten', 'wpsg'); ?>

 									<?php } else { ?>

 										

-										<?php if (wpsg_isSizedString($modul_info['url_shop'])) { ?>

-										<a href="<?php echo $modul_info['url_shop']; ?>" target="_blank"><?php echo __('Modulcode erwerben', 'wpsg'); ?></a>

+										<?php if (wpsg_isSizedString($modul_info['shop_url'])) { ?>

+										<a href="<?php echo $modul_info['shop_url']; ?>" target="_blank"><?php echo __('Modulcode erwerben', 'wpsg'); ?></a>

 										<?php } else { ?>

 										<a href="https://shop.maennchen1.de" target="_blank"><?php echo __('Modulcode erwerben', 'wpsg'); ?></a>

 										<?php } ?>