From 849fbd4f6aab6bf9bd3467719b683ee657c5f93d Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Tue, 26 Sep 2017 08:25:10 +0000
Subject: -

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@6534 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/admin/modulelist.phtml |  4 ++--
 views/admin/ueber.phtml      | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'views/admin')

diff --git a/views/admin/modulelist.phtml b/views/admin/modulelist.phtml
index b91963c..0a63e08 100644
--- a/views/admin/modulelist.phtml
+++ b/views/admin/modulelist.phtml
@@ -115,13 +115,13 @@
                         echo ' - <strong class="wpsg_message_ok">'.__('aktuell', 'wpsg').'</strong>';
                         
                     }
-                    else if (version_compare($modul_info['version'], WPSG_VERSION) > 0) 
+                    else if ($this->shop->hasModInstalled($modul_key) && version_compare($modul_info['version'], WPSG_VERSION) > 0) 
                     {
                         
                         echo ' - <strong class="wpsg_error">'.__('neue Version verfügbar', 'wpsg').'</strong><br />'.wpsg_translate(__('<a href="#1#">wpShopGermany Update</a> notwendig', 'wpsg'), WPSG_URL_WP.'wp-admin/plugins.php');
                         
                     }
-                    else if (version_compare($modul_info['version'], $this->shop->arAllModule[$modul_key]->version) > 0) 
+                    else if ($this->shop->hasModInstalled($modul_key) && version_compare($modul_info['version'], $this->shop->arAllModule[$modul_key]->version) > 0) 
                     {
                         
                         echo ' - <strong class="wpsg_error">'.__('neue Version verfügbar', 'wpsg').'</strong>';
diff --git a/views/admin/ueber.phtml b/views/admin/ueber.phtml
index 0d3289b..65c7901 100644
--- a/views/admin/ueber.phtml
+++ b/views/admin/ueber.phtml
@@ -181,16 +181,27 @@
 		return $aRes;
 	}
 
-	$arDir = iterateDir(WPSG_PATH_USERVIEW);
+	echo wpsg_drawForm_TextStart();
+	
+	if (file_exists(WPSG_PATH_USERVIEW) && is_dir(WPSG_PATH_USERVIEW))
+	{
+		
+		$arDir = iterateDir(WPSG_PATH_USERVIEW);
 
-	$sd = '';
-	foreach ($arDir as $k => $d)
-		$sd .= $d.'<br />';
+		$sd = ''; foreach ($arDir as $k => $d) $sd .= $d.'<br />';
 
-	echo wpsg_drawForm_TextStart();
-	echo $sd;
-	echo wpsg_drawForm_TextEnd(__('User-Views', 'wpsg'));
+		echo $sd;
 
+	} 
+	else 
+	{
+	
+		echo WPSG_PATH_USERVIEW;
+				
+	}
+	
+	echo wpsg_drawForm_TextEnd(__('User-Views', 'wpsg'));
+	
 	?>
 	</div>
 
-- 
cgit v1.2.3