X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=b1784834747acc3e5cd82a9be03b740917f589c8;hp=1ffea5b4208a6d0d597807fa718e0cb0be955720;hb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;hpb=59bd8a9805c51c895a92cc12825f4cbdfd792597 diff --git a/inc/filters.php b/inc/filters.php index 1ffea5b420..b178483474 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Funktionen fuer Filter-System * * -------------------------------------------------------------------- * - * * + * $Revision:: $ * + * $Date:: $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -33,45 +38,58 @@ // Some security stuff... if (!defined('__SECURITY')) { - $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php"; + $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php'; require($INC); } // Init "generic filter system" -function INIT_FILTER_SYSTEM () { - global $filters, $loadedFilters, $counter; - +function initFilterSystem () { // Is the filter already initialized? - if ((isset($filters)) && (is_array($filters))) { + if ((isset($GLOBALS['filters']['chains'])) && (is_array($GLOBALS['filters']['chains']))) { // Then abort here - addFatalMessage(getMessage('FILTER_FAILED_ALREADY_INIT')); - return false; + debug_report_bug(getMessage('FILTER_FAILED_ALREADY_INIT')); } // END - if // Init the filter system (just some ideas) - $filters = array( - // Filters for pre-init phase - 'preinit' => array(), - // Filters for post-init phase - 'postinit' => array(), - // Filters for shutdown phase - 'shutdown' => array() + $GLOBALS['filters']['chains'] = array( + 'preinit' => array(), // Filters for pre-init phase + 'postinit' => array(), // Filters for post-init phase + 'shutdown' => array() // Filters for shutdown phase ); // Init loaded filters and counter - $loadedFilters = array(); - $counter = array(); + $GLOBALS['filters']['loaded'] = array(); + $GLOBALS['filters']['counter'] = array(); // Load all saved filers if sql_patches is updated - if (GET_EXT_VERSION("sql_patches") >= "0.5.9") { + if (isset($GLOBALS['cache_array']['filter']['filter_name'])) { + // Found in cache so rewrite the array + $filterArray = array(); + foreach ($GLOBALS['cache_array']['filter']['filter_name'] as $idx => $filterName) { + // Get filter function + $filterFunction = $GLOBALS['cache_array']['filter']['filter_function'][$idx]; + + // Add the element with mapped index + $filterArray['counter'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_counter'][$idx]; + $filterArray['loaded'][$filterName][$filterFunction] = true; + $filterArray['chains'][$filterName][$filterFunction] = $GLOBALS['cache_array']['filter']['filter_active'][$idx]; + } // END - foreach + + // Set the array + //die('
'.print_r($filterArray, true).'
'); + $GLOBALS['filters'] = $filterArray; + + // Remove the cache + unset($GLOBALS['cache_array']['filter']); + } elseif (GET_EXT_VERSION('sql_patches') >= '0.5.9') { // Init add - $ADD = ""; - if (GET_EXT_VERSION("sql_patches") >= "0.6.0") $ADD = ", `filter_counter`"; + $add = ''; + if (GET_EXT_VERSION('sql_patches') >= '0.6.0') $add = ", `filter_counter`"; // Load all active filers - $result = SQL_QUERY("SELECT `filter_name`, `filter_function`, `filter_active`".$ADD." + $result = SQL_QUERY("SELECT `filter_name`,`filter_function`,`filter_active`".$add." FROM `{!_MYSQL_PREFIX!}_filters` -ORDER BY `filter_id` ASC", __FILE__, __LINE__); +ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__); // Are there entries? if (SQL_NUMROWS($result) > 0) { @@ -82,69 +100,69 @@ ORDER BY `filter_id` ASC", __FILE__, __LINE__); $filterFunction = $filterArray['filter_function']; // Set counter to default - $counter[$filterName][$filterFunction] = 0; + $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 0; // Mark this filter as loaded (from database) - $loadedFilters[$filterName][$filterFunction] = true; + $GLOBALS['filters']['loaded'][$filterName][$filterFunction] = true; // Set this filter - $filters[$filterName][$filterFunction] = $filterArray['filter_active']; + $GLOBALS['filters']['chains'][$filterName][$filterFunction] = $filterArray['filter_active']; // Is the array element for counter there? if (isset($filterArray['filter_counter'])) { // Then use this value! - $counter[$filterName][$filterFunction] = $filterArray['filter_counter']; + $GLOBALS['filters']['counter'][$filterName][$filterFunction] = $filterArray['filter_counter']; } // END - if } // END - while } // END - if - + // Free result SQL_FREERESULT($result); - } // END - if + } // Init filters - REGISTER_FILTER('init', 'UPDATE_LOGIN_DATA'); - REGISTER_FILTER('init', 'INIT_RANDOMIZER'); + registerFilter('init', 'UPDATE_LOGIN_DATA'); + registerFilter('init', 'INIT_RANDOMIZER'); + registerFilter('init', 'DETERMINE_USERNAME'); // Login failures handler - REGISTER_FILTER('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES'); + registerFilter('post_youhere_line', 'CALL_HANDLER_LOGIN_FAILTURES'); // Filters for pre-extension-registration - REGISTER_FILTER('pre_extension_installed', 'RUN_SQLS'); + registerFilter('pre_extension_installed', 'RUN_SQLS'); // Filters for post-extension-registration - REGISTER_FILTER('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION'); - REGISTER_FILTER('post_extension_installed', 'SOLVE_TASK'); - REGISTER_FILTER('post_extension_installed', 'LOAD_INCLUDES'); + registerFilter('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION'); + registerFilter('post_extension_installed', 'SOLVE_TASK'); + registerFilter('post_extension_installed', 'LOAD_INCLUDES'); + registerFilter('post_extension_installed', 'REMOVE_UPDATES'); // Solving tasks - REGISTER_FILTER('solve_task', 'SOLVE_TASK'); + registerFilter('solve_task', 'SOLVE_TASK'); // Loading includes in general - REGISTER_FILTER('load_includes', 'LOAD_INCLUDES'); + registerFilter('load_includes', 'LOAD_INCLUDES'); // Run SQLs - REGISTER_FILTER('run_sqls', 'RUN_SQLS'); + registerFilter('run_sqls', 'RUN_SQLS'); // Admin ACL check - REGISTER_FILTER('check_admin_acl', 'CHECK_ADMIN_ACL'); + registerFilter('check_admin_acl', 'CHECK_ADMIN_ACL'); // Register shutdown filters - REGISTER_FILTER('shutdown', 'FLUSH_FILTERS'); + registerFilter('shutdown', 'FLUSH_FILTERS'); } // "Registers" a new filter function -function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) { - global $filters, $counter; - +function registerFilter ($filterName, $filterFunction, $silentAbort = true, $force = false, $dry_run = false) { // Extend the filter function name $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction)); // Is that filter already there? - if ((isset($filters[$filterName][$filterFunction])) && (!$force)) { + if ((isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) { // Then abort here - if (!$silentAbort) { - addFatalMessage(getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName)); + if ($silentAbort === false) { + addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_ALREADY_ADDED'), array($filterFunction, $filterName)); } // END - if // Abort here @@ -154,53 +172,45 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo // Is the function there? if (!function_exists($filterFunction)) { // Then abort here - addFatalMessage(getMessage('FILTER_FAILED_NOT_FOUND'), array($filterFunction, $filterName)); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NOT_FOUND'), array($filterFunction, $filterName)); return false; } // END - if // Shall we add it? if (!$dry_run) { // Simply add it to the array - $filters[$filterName][$filterFunction] = "Y"; - $counter[$filterName][$filterFunction] = 0; + $GLOBALS['filters']['chains'][$filterName][$filterFunction] = 'Y'; + $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 0; } // END - if } // "Unregisters" a filter from the given chain -function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_run = false) { - global $filters, $counter, $loadedFilters; - +function unregisterFilter ($filterName, $filterFunction, $force = false, $dry_run = false) { // Extend the filter function name only if not loaded from database - if (!isset($loadedFilters[$filterName][$filterFunction])) { + if (!isset($GLOBALS['filters']['loaded'][$filterName][$filterFunction])) { $filterFunction = sprintf("FILTER_%s", strtoupper($filterFunction)); } // END - if // Is that filter there? - if ((!isset($filters[$filterName][$filterFunction])) && (!$force)) { + if ((!isset($GLOBALS['filters']['chains'][$filterName][$filterFunction])) && (!$force)) { // Not found, so abort here - addFatalMessage(getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName)); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FAILED_NOT_REMOVED'), array($filterFunction, $filterName)); return false; } // END - if // Shall we remove? (default, not while just showing an extension removal) - if (!$dry_run) { + if ($dry_run === false) { // Mark for filter removal - $filters[$filterName][$filterFunction] = "R"; - unset($counter[$filterName][$filterFunction]); + $GLOBALS['filters']['chains'][$filterName][$filterFunction] = 'R'; } // END - if } // "Runs" the given filters, data is optional and can be any type of data -function RUN_FILTER ($filterName, $data = null, $silentAbort = true) { - global $filters, $counter; - +function runFilterChain ($filterName, $data = null) { // Is that filter chain there? - if (!isset($filters[$filterName])) { - // Then abort here (quick'N'dirty hack) - if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) { - // Add fatal message - addFatalMessage(getMessage('FILTER_FAILED_NO_FILTER_FOUND'), $filterName); - } // END - if + if (!isset($GLOBALS['filters']['chains'][$filterName])) { + // We should find all these non-existing filter chains + DEBUG_LOG(__FUNCTION__, __LINE__, 'Filter chain ' . $filterName . ' not found!'); // Abort here return false; @@ -210,16 +220,16 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) { $returnValue = $data; // Then run all filters - foreach ($filters[$filterName] as $filterFunction=>$active) { + foreach ($GLOBALS['filters']['chains'][$filterName] as $filterFunction => $active) { // Debug message - //* DEBUG: */ echo __FUNCTION__."(".__LINE__."): name={$filterName},func={$filterFunction},active={$active}
\n"; + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Running: name={$filterName},func={$filterFunction},active={$active}"); // Is the filter active? - if ($active == "Y") { + if (($active == 'Y') || ((in_array($filterName, array('extension_remove', 'post_extension_run_sql'))) && ($active == 'R'))) { // Is this filter there? if (!function_exists($filterFunction)) { // Unregister it - UNREGISTER_FILTER($filterName, $filterFunction); + unregisterFilter($filterName, $filterFunction); // Skip this entry continue; @@ -229,55 +239,75 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) { $returnValue = call_user_func_array($filterFunction, array($returnValue)); // Update usage counter - $counter[$filterName][$filterFunction]++; - } // END - if + countFilterUsage($filterName, $filterFunction); + } elseif (isDebugModeEnabled()) { + // Debug message + DEBUG_LOG(__FUNCTION__, __LINE__, "Skipped: name={$filterName},func={$filterFunction},active={$active}"); + } } // END - foreach // Return the filtered content return $returnValue; } +// Count the filter usage +function countFilterUsage ($filterName, $filterFunction) { + // Is it there? + if (isset($GLOBALS['filters']['counter'][$filterName][$filterFunction])) { + // Yes, then increase + $GLOBALS['filters']['counter'][$filterName][$filterFunction]++; + } else { + // No, then create + $GLOBALS['filters']['counter'][$filterName][$filterFunction] = 1; + } +} + // ----------------------------------------------------------------------------- // Generic filter functions we always need // ----------------------------------------------------------------------------- // Filter for flushing all new filters to the database function FILTER_FLUSH_FILTERS () { - global $filters, $counter, $link, $loadedFilters, $SQLs; - // Clear all previous SQL queries - $SQLs = array(); + INIT_SQLS(); + + // Are we installing? + if ((isInstalling()) || (!isInstalled())) { + // Then silently skip this filter + return true; + } // END - if // Is a database link here and not in installation mode? - if ((!is_resource($link)) && (!isBooleanConstantAndTrue('mxchange_installing'))) { + if ((!SQL_IS_LINK_UP()) && (!isInstalling())) { // Abort here - addFatalMessage(getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'), array($filterFunction, $filterName)); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FLUSH_FAILED_NO_DATABASE')); return false; } // END - if // Is the extension sql_patches updated? - if (EXT_VERSION_IS_OLDER("sql_patches", "0.5.9")) { + if (EXT_VERSION_IS_OLDER('sql_patches', '0.5.9')) { // Abort silently here return false; } // END - if // Nothing is added/remove by default - $inserted = 0; $removed = 0; + $inserted = 0; + $removed = 0; // Prepare SQL queries $insertSQL = "INSERT INTO `{!_MYSQL_PREFIX!}_filters` (`filter_name`,`filter_function`,`filter_active`) VALUES"; $removeSQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_filters` WHERE"; // Write all filters to database - foreach ($filters as $filterName => $filterArray) { + foreach ($GLOBALS['filters']['chains'] as $filterName => $filterArray) { // Walk through all filters foreach ($filterArray as $filterFunction => $active) { // Is this filter loaded? - if (!isset($loadedFilters[$filterName][$filterFunction])) { + if (!isset($GLOBALS['filters']['loaded'][$filterName][$filterFunction])) { // Add this filter (all filters are active by default) $insertSQL .= sprintf("('%s','%s','Y'),", $filterName, $filterFunction); $inserted++; - } elseif ($active == "R") { + } elseif ($active == 'R') { // Remove this filter $removeSQL .= sprintf(" (`filter_name`='%s' AND `filter_function`='%s') OR", $filterName, $filterFunction); $removed++; @@ -291,36 +321,36 @@ function FILTER_FLUSH_FILTERS () { $insertSQL = substr($insertSQL, 0, -1); // And run it - $SQLs[] = $insertSQL; + ADD_SQL($insertSQL); } // END - if // Something has been removed? if ($removed > 0) { // Finish SQL command - $removeSQL = substr($removeSQL, 0, -2) . "LIMIT ".$removed; + $removeSQL = substr($removeSQL, 0, -2) . 'LIMIT '.$removed; // And run it - $SQLs[] = $removeSQL; + ADD_SQL($removeSQL); } // END - if // Shall we update usage counters (ONLY FOR DEBUGGING!) - if (getConfig('update_filter_usage') == "Y") { + if (getConfig('update_filter_usage') == 'Y') { // Update all counters - foreach ($counter as $filterName => $filterArray) { + foreach ($GLOBALS['filters']['counter'] as $filterName => $filterArray) { // Walk through all filters foreach ($filterArray as $filterFunction => $cnt) { // Construct and add the query - $SQLs[] = sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1", + ADD_SQL(sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1", bigintval($cnt), $filterName, $filterFunction - ); + )); } // END - foreach } // END - foreach } // END - if // Run the run_sqls filter in non-dry mode - RUN_FILTER('run_sqls', array('dry_run' => false, 'sqls' => $SQLs)); + runFilterChain('run_sqls'); } // Filter for calling the handler for login failures @@ -329,8 +359,8 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) { $content = $data; // Handle failed logins here if not in guest - //* DEBUG: */ print __FUNCTION__."(".__LINE__."):type={$data['type']},action={$GLOBALS['action']},what={$GLOBALS['what']},lvl={$data['access_level']}
\n"; - if ((($data['type'] == "what") || ($data['type'] == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == getConfig('index_home')))) && ($data['access_level'] != "guest") && ((GET_EXT_VERSION("sql_patches") >= "0.4.7") || (GET_EXT_VERSION("admins") >= "0.7.0"))) { + //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."):type={$data['type']},action={getAction()},what={getWhat()},lvl={$data['access_level']}
"); + if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((GET_EXT_VERSION('sql_patches') >= '0.4.7') || (GET_EXT_VERSION('admins') >= '0.7.0'))) { // Handle failure $content['content'] .= HANDLE_LOGIN_FAILTURES($data['access_level']); } // END - if @@ -342,26 +372,24 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) { // Filter for redirecting to logout if sql_patches has been installed function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () { // Remove this filter - UNREGISTER_FILTER('shutdown', __FUNCTION__); + unregisterFilter('shutdown', __FUNCTION__); // Is the element set? if (isset($GLOBALS['ext_load_mode'])) { // Redirect here - LOAD_URL("modules.php?module=admin&logout=1&".$GLOBALS['ext_load_mode']."=sql_patches"); + redirectToUrl('modules.php?module=admin&logout=1&' . $GLOBALS['ext_load_mode'] . '=sql_patches'); } // END - if // This should not happen! - DEBUG_LOG(__FUNCTION__, __LINE__, "Cannot auto-logout because no extension load-mode has been set."); + DEBUG_LOG(__FUNCTION__, __LINE__, 'Cannot auto-logout because no extension load-mode has been set.'); } // Filter for auto-activation of a extension function FILTER_AUTO_ACTIVATE_EXTENSION ($data) { - global $EXT_ALWAYS_ACTIVE; - // Is this extension always activated? - if ($EXT_ALWAYS_ACTIVE == "Y") { + if (EXT_GET_ALWAYS_ACTIVE() == 'Y') { // Then activate the extension - //* DEBUG: */ echo __FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
\n"; + //* DEBUG: */ OUTPUT_HTML(__FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
"); ACTIVATE_EXTENSION($data['ext_name']); } // END - if @@ -388,29 +416,28 @@ function FILTER_SOLVE_TASK ($data) { } // Filter to load include files -function FILTER_LOAD_INCLUDES ($data) { +function FILTER_LOAD_INCLUDES () { // Default is $data as inclusion list - $INC_POOL = $data; + $data = GET_INC_POOL(); // Is it an array? if ((!isset($data)) || (!is_array($data))) { // Then abort here - DEBUG_LOG(__FILE__, __LINE__, "INC_POOL is no array!"); - return $data; + debug_report_bug(sprintf("INC_POOL is no array! Type: %s", gettype($data))); } elseif (isset($data['inc_pool'])) { // Use this as new inclusion pool! - $INC_POOL = $data['inc_pool']; + SET_INC_POOL($data['inc_pool']); } // Check for added include files - if (count($INC_POOL) > 0) { + if (COUNT_INC_POOL() > 0) { // Loads every include file - foreach ($INC_POOL as $FQFN) { - LOAD_INC_ONCE($FQFN); + foreach (GET_INC_POOL() as $FQFN) { + loadIncludeOnce($FQFN); } // END - foreach // Reset array - if (isset($data['inc_pool'])) $data['inc_pool'] = array(); + INIT_INC_POOL(); } // END - if // Continue with processing @@ -419,66 +446,82 @@ function FILTER_LOAD_INCLUDES ($data) { // Filter for running SQL commands function FILTER_RUN_SQLS ($data) { + // Debug message + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "- Entered!"); + // Is the array there? - if ((isset($data['sqls'])) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) { + if ((IS_SQLS_VALID()) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) { // Run SQL commands - foreach ($data['sqls'] as $sql) { + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "- Found ".COUNT_SQLS()." queries to run."); + foreach (GET_SQLS() as $sql) { + // Trim spaces away $sql = trim($sql); + + // Is there still a query left? if (!empty($sql)) { // Do we have an "ALTER TABLE" command? if (substr(strtolower($sql), 0, 11) == "alter table") { // Analyse the alteration command - SQL_ALTER_TABLE($sql, __FILE__, __LINE__); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Alterting table: {$sql}"); + SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__); } else { // Run regular SQL command - $result = SQL_QUERY($sql, __FILE__, __LINE__, false); + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "Running regular query: {$sql}"); + SQL_QUERY($sql, __FUNCTION__, __LINE__, false); } } // END - if } // END - foreach } // END - if + + // Debug message + //* DEBUG: */ DEBUG_LOG(__FUNCTION__, __LINE__, "- Left!"); } // Filter for updating/validating login data function FILTER_UPDATE_LOGIN_DATA () { - global $LAST; - if (!is_array($LAST)) $LAST = array(); + // Add missing array + if ((!isset($GLOBALS['last'])) || (!is_array($GLOBALS['last']))) $GLOBALS['last'] = array(); // Recheck if logged in if (!IS_MEMBER()) return false; // Secure user ID - $GLOBALS['userid'] = bigintval(get_session('userid')); + setUserId(getSession('userid')); // Load last module and last online time - $result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", - array($GLOBALS['userid']), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `last_module`, `last_online` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", + array(getUserId()), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { // Load last module and online time - list($mod, $onl) = SQL_FETCHROW($result); + $DATA = SQL_FETCHARRAY($result); // Maybe first login time? - if (empty($mod)) $mod = "login"; + if (empty($DATA['last_module'])) $DATA['last_module'] = 'login'; // This will be displayed on welcome page! :-) - if (empty($LAST['module'])) { - $LAST['module'] = $mod; $LAST['online'] = $onl; + if (empty($GLOBALS['last']['module'])) { + $GLOBALS['last']['module'] = $DATA['last_module']; $GLOBALS['last']['online'] = $DATA['last_online']; } // END - if - // "what" not set? - if (empty($GLOBALS['what'])) { + // 'what' not set? + if (!isWhatSet()) { // Fix it to default - $GLOBALS['what'] = "welcome"; - if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home'); + setWhat('welcome'); + if (getConfig('index_home') != '') setWhatFromConfig('index_home'); } // END - if // Update last module / online time - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET last_module='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1", - array($GLOBALS['what'], GET_REMOTE_ADDR(), $GLOBALS['userid']), __FILE__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `last_module`='%s', `last_online`=UNIX_TIMESTAMP(), `REMOTE_ADDR`='%s' WHERE `userid`=%s LIMIT 1", + array( + getWhat(), + detectRemoteAddr(), + getUserId() + ), __FUNCTION__, __LINE__); } else { // Destroy session, we cannot update! - destroy_user_session(); + destroyUserSession(); } // Free the result @@ -491,16 +534,16 @@ function FILTER_CHECK_ADMIN_ACL () { $ret = true; // Ok, Cookie-Update done - if (GET_EXT_VERSION("admins") >= "0.3") { + if ((GET_EXT_VERSION('admins') >= '0.3.0') && (EXT_IS_ACTIVE('admins'))) { // Check if action GET variable was set - $action = SQL_ESCAPE($GLOBALS['action']); - if (!empty($GLOBALS['what'])) { + $action = getAction(); + if (isWhatSet()) { // Get action value by what-value - $action = GET_ACTION("admin", $GLOBALS['what']); + $action = getModeAction('admin', getWhat()); } // END - if // Check for access control line of current menu entry - $ret = ADMINS_CHECK_ACL($action, $GLOBALS['what']); + $ret = adminsCheckAdminAcl($action, getWhat()); } // END - if // Return result @@ -510,7 +553,74 @@ function FILTER_CHECK_ADMIN_ACL () { // Filter for initializing randomizer function FILTER_INIT_RANDOMIZER () { // Simply init the randomizer with seed and _ADD value - mt_srand(generateSeed() + constant('_ADD')); + mt_srand(generateSeed() + getConfig('_ADD')); +} + +// Filter for removing updates +function FILTER_REMOVE_UPDATES () { + // Init removal list + EXT_INIT_REMOVAL_LIST(); + + // Add the current extension to it + EXT_ADD_CURRENT_TO_REMOVAL_LIST(); + + // Simply remove it + UNSET_EXT_SQLS(); + + // Do we need to remove update depency? + if (EXT_COUNT_UPDATE_DEPENDS() > 0) { + // Then find all updates we shall no longer execute + foreach (EXT_GET_UPDATE_DEPENDS() as $id=>$ext_name) { + // Shall we remove this update? + if (in_array($ext_name, EXT_GET_REMOVAL_LIST())) { + // Then remove this extension! + EXT_REMOVE_UPDATE_DEPENDS($ext_name); + } // END - if + } // END - foreach + } // END - if +} + +// Determines username for current user state +function FILTER_DETERMINE_USERNAME () { + global $username; + + // Check if logged in + if (IS_MEMBER()) { + // Is still logged in so we welcome him with his name + $result = SQL_QUERY_ESC("SELECT `surname`, `family` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", + array(getUserId()), __FILE__, __LINE__); + if (SQL_NUMROWS($result) == 1) { + // Load surname and family's name and build the username + $content = SQL_FETCHARRAY($result); + + // Prepare username + $username = $content['surname'] . ' ' . $content['family']; + + // Additionally admin? + if (IS_ADMIN()) { + // Add it + $username .= ' ({--_ADMIN_SHORT--})'; + } // END - if + } else { + // Hmmm, logged in and no valid userid? + $username = '{--_UNKNOWN--}'; + + // Destroy session + destroyUserSession(); + + // Kill userid + setUserId(0); + } + + // Free memory + SQL_FREERESULT($result); + } elseif (IS_ADMIN()) { + // Admin is there + $username = getMessage('_ADMIN'); + } else { + // He's a guest, hello there... ;-) + $username = getMessage('_GUEST'); + } } //