Mediadata extension now creates the guest menu link, extension 'active' fixed

diff --git a/inc/databases.php b/inc/databases.php
index 35128c568eda81c22db75485d986baf0ce4d90af..43f22f101c587941f87ac2a6e77af425fded2e83 100644 (file)
--- 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 835fbda692586264156b36918beda4cc54a07f4b..d734b49bec71cf171986557d12b89f0be257b547 100644 (file)
--- 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 0dea4fa9566ba99c02e7be1dec66237e52cd1e4c..f7d481760b20fb1f0cb8c7984c82aae59a9f745d 100644 (file)
--- 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 e0d1a6e95ec1f76dc781caaf4edf95b769410370..ba45f0cc7a246c018b85d23bf39fe8447d77d9e6 100644 (file)
--- 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 d3046bb56c1e7a27577588634cd9e491c511c0a3..b252aee5e638e0ea7e2c7e714c8a55b25996b724 100644 (file)
--- 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');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');\r
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mediadata','Mediendaten',3,'Y','N');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');\r
 \r
 INSERT INTO `mxchange_max_receive` VALUES (1,0,'Urlaub');\r

diff --git a/install/menu-en.sql b/install/menu-en.sql
index d3046bb56c1e7a27577588634cd9e491c511c0a3..b252aee5e638e0ea7e2c7e714c8a55b25996b724 100644 (file)
--- 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');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','impressum','Impressum',5,'Y','N');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','agb','AGBs',4,'Y','N');\r
-INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','mediadata','Mediendaten',3,'Y','N');\r
 INSERT INTO `mxchange_guest_menu` (`action`,`what`,`title`,`sort`,`visible`,`locked`) VALUES ('main','infos','Infos',2,'Y','N');\r
 \r
 INSERT INTO `mxchange_max_receive` VALUES (1,0,'Urlaub');\r