Fixes for absent ext-user and misleading data removed

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index a6f7d718077d903b38394d32a4431c1212028649..c8c30db2a220b6639513f7cdd9c892fa7c38c005 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mediendaten                                      *
  * -------------------------------------------------------------------- *
- *          mod_media - By Robert Niedziela                             *
- *          (c)2003 www.megacomputing.net                               *
- * -------------------------------------------------------------------- *
- *           Rewritten by Roland Haeder, 2003 - 2009                    *
- * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
@@ -48,10 +43,14 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addYouAreHereLink('guest', __FILE__);
 
+// Both ext-mediadata and ext-user must be there
 if ((!isExtensionActive('mediadata')) && (!isAdmin())) {
        displayMessage(generateExtensionInactiveNotInstalledMessage('mediadata'));
        return;
-} // END - if
+} elseif ((!isExtensionActive('user')) && (!isAdmin())) {
+       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       return;
+}
 
 // Get total confirmed user ids...
 $content['user_confirmed']   = getTotalConfirmedUser();

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index ff9863dd8b2ba6905685530c049b47abb9a9ba43..ca20611192b8a1b766402a26b5d71c8bef11a9b9 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -43,8 +43,16 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 addYouAreHereLink('guest', __FILE__);
 
-// Derterminate which stats we want and set mode and title for the link below stats block
-if (!isGetRequestParameterSet('mode')) setGetRequestParameter('mode', strtolower(getConfig('guest_stats')));
+// This part only works if ext-user is active
+if ((!isExtensionActive('user')) && (!isAdmin())) {
+       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       return;
+} // END - if
+
+// Determine which stats we want and set mode and title for the link below stats block
+if (!isGetRequestParameterSet('mode')) {
+       setGetRequestParameter('mode', strtolower(getConfig('guest_stats')));
+} // END - if
 
 // Set config temporarily
 setConfigEntry('guest_stats', strtoupper(getRequestParameter('mode')));

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 2c7ea72a2b1512901cb5122b5a4592531b11577c..6df25311c6e342088fb03a13730bbbcc411eaa74 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -428,6 +428,12 @@ function isMember () {
 
 // Fetch user data for given user id
 function fetchUserData ($value, $column = 'userid') {
+       // Extension ext-user must be there at any case
+       if (!isExtensionActive('user')) {
+               // Absent ext-user is really not good
+               return false;
+       } // END - if
+
        // If we should look for userid secure&set it here
        if (substr($column, -2, 2) == 'id') {
                // Secure userid
@@ -444,9 +450,6 @@ function fetchUserData ($value, $column = 'userid') {
                        // Use cache, so it is fine
                        return true;
                }
-       } elseif (!isExtensionActive('user')) {
-               // Absent ext-user is really not good
-               return false;
        } elseif (isUserDataValid())  {
                // Using cache is fine
                return true;