Extension 'active' now depends on 'online' because of a filter for the 'Who is online...

diff --git a/.gitattributes b/.gitattributes
index 7e9f6da89c4843ff644318f3cb67c105c2386fdb..684360a5732a186e80a7261887915d54e95e739d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -210,6 +210,7 @@ inc/language/user_de.php -text
 inc/language/wernis_de.php -text
 inc/language/yoomedia_de.php -text
 inc/libs/.htaccess -text
+inc/libs/active_functions.php -text
 inc/libs/admins_functions.php -text
 inc/libs/autopurge_functions.php -text
 inc/libs/beg_functions.php -text

diff --git a/inc/databases.php b/inc/databases.php
index fd18e36899ce46880e62f3e64796511ca81f4798..1cb01137c7241a17bd91bd096d6154b0d6c77d7d 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', "653");
+define('CURR_SVN_REVISION', "654");
 
 // 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-active.php b/inc/extensions/ext-active.php
index b357a96a526fe24c5868c2029c966be6bac125a6..eaeec47073955e9b2031b31d8521209e943f76d7 100644 (file)
--- a/inc/extensions/ext-active.php
+++ b/inc/extensions/ext-active.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)
 {
@@ -60,6 +60,9 @@ case "remove": // Do stuff when removing extension
        // SQL commands to run
        $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_guest_menu` WHERE what='active' LIMIT 1";
        $SQLs[] = "DELETE LOW_PRIORITY FROM `"._MYSQL_PREFIX."_admin_menu` WHERE what='config_active' LIMIT 1";
+
+       // Unregister filter
+       UNREGISTER_FILTER('online_extra_links', 'ADD_LINK_ACTIVE_LIST', true, $dry_run);
        break;
 
 case "activate": // Do stuff when admin activates this extension
@@ -117,6 +120,17 @@ case "update": // Update an extension
                // 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
+               // Make update depending on "online"
+               $EXT_UPDATE_DEPENDS = "online";
+
+               // Register filter
+               REGISTER_FILTER('online_extra_links', 'ADD_LINK_ACTIVE_LIST', false, true, $dry_run);
+
+               // Update notes (these will be set as task text!)
+               $UPDATE_NOTES = "Filter f&uuml;r den &quot;Wer ist Online&quot; Block hinzugef&uuml;gt und ist von <strong>online</strong> abh&auml;ngig.";
+               break;
        }
        break;
 

diff --git a/inc/libs/active_functions.php b/inc/libs/active_functions.php
new file mode 100644 (file)
index 0000000..d353642
--- /dev/null
+++ b/inc/libs/active_functions.php
@@ -0,0 +1,56 @@
+<?php
+/************************************************************************
+ * MXChange v0.2.1                                    Start: 06/30/2003 *
+ * ===============                              Last change: 11/27/2004 *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * File              : active_functions.php                             *
+ * -------------------------------------------------------------------- *
+ * Short description : Functions for the active extension               *
+ * -------------------------------------------------------------------- *
+ * Kurzbeschreibung  : Funktionen fuer die active-Erweiterung           *
+ * -------------------------------------------------------------------- *
+ *                                                                      *
+ * -------------------------------------------------------------------- *
+ * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * For more information visit: http://www.mxchange.org                  *
+ *                                                                      *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program; if not, write to the Free Software          *
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               *
+ * MA  02110-1301  USA                                                  *
+ ************************************************************************/
+
+// Some security stuff...
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       require($INC);
+}
+
+// Filter for adding link to "active list"
+function FILTER_ADD_LINK_ACTIVE_LIST () {
+       // Are the extensions online and active there?
+       if ((EXT_IS_ACTIVE("active")) && (EXT_IS_ACTIVE("online"))) {
+               // Init content
+               $content = array(
+                       'menu' => "<A class=\"menu_blur\" href=\"".URL."/modules.php?module=index&amp;what=active\">".getConfig('menu_blur_spacer').GUEST_ACTIVE_LINK."</A>",
+                       'what' => "active"
+               );
+
+               // Add link to "we were active today" page
+               LOAD_TEMPLATE("guest_menu_bottom", false, $content);
+       } // END - if
+}
+
+//
+?>

diff --git a/inc/modules/guest/action-online.php b/inc/modules/guest/action-online.php
index 37e623e572ec46988cd6cb95d176595f46612f09..0dea4fa9566ba99c02e7be1dec66237e52cd1e4c 100644 (file)
--- a/inc/modules/guest/action-online.php
+++ b/inc/modules/guest/action-online.php
@@ -61,16 +61,8 @@ define('ADMINS_ONLINE_CNT' , SQL_NUMROWS($result_admins));
 // Output table
 LOAD_TEMPLATE("online_now");
 
-if (EXT_IS_ACTIVE("active")) {
-       // Init content
-       $content = array(
-               'menu' => "<A class=\"menu_blur\" href=\"".URL."/modules.php?module=index&amp;what=active\">".getConfig('menu_blur_spacer').GUEST_ACTIVE_LINK."</A>",
-               'what' => "active"
-       );
-
-       // Add link to "we were active today" page
-       LOAD_TEMPLATE("guest_menu_bottom", false, $content);
-} // END - if
+// Add more links in this block
+RUN_FILTER('online_extra_links');
 
 //
 ?>