From e8b99d201eaf3ef83bb83e6b42f146752a06721a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 18 Dec 2008 22:10:06 +0000
Subject: [PATCH] Mediadata extension now creates the guest menu link,
 extension 'active' fixed

---
 inc/databases.php                   |  2 +-
 inc/extensions/ext-mediadata.php    | 12 ++++++++++--
 inc/modules/guest/action-online.php |  3 +++
 inc/modules/guest/what-active.php   |  2 +-
 install/menu-de.sql                 |  1 -
 install/menu-en.sql                 |  1 -
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/inc/databases.php b/inc/databases.php
index 35128c568e..43f22f101c 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
-define('CURR_SVN_REVISION', "655");
+define('CURR_SVN_REVISION', "656");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/extensions/ext-mediadata.php b/inc/extensions/ext-mediadata.php
index 835fbda692..d734b49bec 100644
--- a/inc/extensions/ext-mediadata.php
+++ b/inc/extensions/ext-mediadata.php
@@ -38,13 +38,13 @@ if (!defined('__SECURITY')) {
 }
 
 // Version number
-$EXT_VERSION = "0.0.8";
+$EXT_VERSION = "0.0.9";
 
 // Auto-set extension version
 if (empty($EXT_VER)) $EXT_VER = $EXT_VERSION;
 
 // Version history array (add more with , "0.1" and so on)
-$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8");
+$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9");
 
 switch ($EXT_LOAD_MODE)
 {
@@ -57,6 +57,7 @@ case "remove": // Do stuff when removing extension
 	// SQL commands to run
 	$SQLs[] = "DROP TABLE IF EXISTS "._MYSQL_PREFIX."_mediadata";
 	$SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE what='config_mediadata' LIMIT 1";
+	$SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_guest_menu` WHERE what='mediadata' LIMIT 1";
 	break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -124,6 +125,13 @@ Bitte stellen Sie diesen derzeit manuell unter <A href=\"{!URL!}/modules.php?mod
 		// Update notes (these will be set as task text!)
 		$UPDATE_NOTES = "Fehlerhinweis bei deaktivierter Erweiterung verbessert.";
 		break;
+
+	case "0.0.9": // SQL queries for v0.0.9
+		$SQLs[] = "INSERT INTO `"._MYSQL_PREFIX."_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mediadata','Mediendaten',3,'Y','N')";
+
+		// Update notes (these will be set as task text!)
+		$UPDATE_NOTES = "Men&uuml;punkt wird durch diese Erweiterung generiert.";
+		break;
 	}
 	break;
 
diff --git a/inc/modules/guest/action-online.php b/inc/modules/guest/action-online.php
index 0dea4fa956..f7d481760b 100644
--- a/inc/modules/guest/action-online.php
+++ b/inc/modules/guest/action-online.php
@@ -38,6 +38,9 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE("online")) && (!IS_ADMIN())) {
 	// Just skip this extension
 	return;
+} elseif (defined('GUESTS_ONLINE_CNT')) {
+	// Skip it if already executed
+	return;
 }
 
 $result_guests  = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__);
diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php
index e0d1a6e95e..ba45f0cc7a 100644
--- a/inc/modules/guest/what-active.php
+++ b/inc/modules/guest/what-active.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("guest", __FILE__);
 
 // Extra field to include is by default uid
-$ADD = "uid";
+$ADD = "userid";
 
 // If nickname is installed the extra field is the nickname of the user
 if (EXT_IS_ACTIVE("nickname")) $ADD = "nickname";
diff --git a/install/menu-de.sql b/install/menu-de.sql
index d3046bb56c..b252aee5e6 100644
--- a/install/menu-de.sql
+++ b/install/menu-de.sql
@@ -60,7 +60,6 @@ INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`loc
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N');
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mediadata','Mediendaten',3,'Y','N');
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');
 
 INSERT INTO `mxchange_max_receive` VALUES (1,0,'Urlaub');
diff --git a/install/menu-en.sql b/install/menu-en.sql
index d3046bb56c..b252aee5e6 100644
--- a/install/menu-en.sql
+++ b/install/menu-en.sql
@@ -60,7 +60,6 @@ INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`loc
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('members','login','Einloggen',3,'Y','N');
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mediadata','Mediendaten',3,'Y','N');
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');
 
 INSERT INTO `mxchange_max_receive` VALUES (1,0,'Urlaub');
-- 
2.39.5