X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=2b241f52d69f48ad12796c5002bde464e67a0c87;hb=0e104a9282a1cdc7d769bbccb03bd3462aa8f4e0;hp=9985adf03d5852c2f38047a633125a2484a8a48c;hpb=ef8bdde1d3b805a341e64cb29c89e562e1ca963f;p=mailer.git diff --git a/inc/filters.php b/inc/filters.php index 9985adf03d..2b241f52d6 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -54,13 +54,14 @@ function FILTER_FLUSH_FILTERS () { // Is a database link here and not in installation mode? if ((!SQL_IS_LINK_UP()) && (!isInstalling())) { // Abort here - addFatalMessage(__FUNCTION__, __LINE__, '{--FILTER_FLUSH_FAILED_NO_DATABASE--}'); + debug_report_bug(__FUNCTION__, __LINE__, 'No database link is up. Cannot flush filters.'); return false; } // END - if - // Is the extension sql_patches updated? + // Is the extension ext-sql_patches updated? if ((!isExtensionInstalled('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.9'))) { // Abort silently here + logDebugMessage(__FUNCTION__, __LINE__, 'Cannot flush filters, sql_patches might be missing. isExtensionInstalled()=' . isExtensionInstalled('sql_patches') . ',isExtensionInstalledAndOlder()=' . isExtensionInstalledAndOlder('sql_patches', '0.5.9')); return false; } // END - if @@ -136,7 +137,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) { $content = $data; // Handle failed logins here if not in guest - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "type=".$data['type'].",action=".getAction().",what=".getWhat().",level=".$data['access_level']."
"); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'type=' . $data['type'] . ',action=' . getAction() . ',what=' . getWhat() . ',level=' . $data['access_level']); if ((($data['type'] == 'what') || ($data['type'] == 'action') && ((!isWhatSet()) || (getWhat() == 'overview') || (getWhat() == getIndexHome()))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.6')))) { // Handle failure $content['content'] .= handleLoginFailures($data['access_level']); @@ -164,10 +165,10 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () { // Filter for auto-activation of a extension function FILTER_AUTO_ACTIVATE_EXTENSION ($data) { // Debug message - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $data['ext_name'] . ',isExtensionAlwaysActive()=' . intval(isExtensionAlwaysActive())); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $data['ext_name'] . ',isThisExtensionAlwaysActive()=' . intval(isThisExtensionAlwaysActive())); // Is this extension always activated? - if (isExtensionAlwaysActive()) { + if (isThisExtensionAlwaysActive()) { // Then activate the extension doActivateExtension($data['ext_name']); } // END - if @@ -179,7 +180,9 @@ function FILTER_AUTO_ACTIVATE_EXTENSION ($data) { // Filter for solving task given task function FILTER_SOLVE_TASK ($data) { // Don't solve anything if no admin! - if (!isAdmin()) return $data; + if (!isAdmin()) { + return $data; + } // END - if // Is this a direct task id or array element task_id is found? if (is_int($data)) { @@ -242,6 +245,7 @@ function FILTER_LOAD_INCLUDES ($pool) { // Filter for running SQL commands function FILTER_RUN_SQLS ($data) { // Debug message + //* DEBUG: */ die('getSqls()=
'.print_r(getSqls(), true).'
ext_update_depends=
'.print_r($GLOBALS['ext_update_depends'], true).'
'); //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!'); // Is the array there? @@ -258,7 +262,9 @@ function FILTER_RUN_SQLS ($data) { $sql = trim($sql); // Is 'enable_codes' not set? Then set it to true - if (!isset($data['enable_codes'])) $data['enable_codes'] = true; + if (!isset($data['enable_codes'])) { + $data['enable_codes'] = true; + } // END - if // Is there still a query left? if (!empty($sql)) { @@ -284,10 +290,14 @@ function FILTER_RUN_SQLS ($data) { // Filter for updating/validating login data function FILTER_UPDATE_LOGIN_DATA () { // Add missing array - if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array(); + if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) { + $GLOBALS['last_online'] = array(); + } // END - if // Recheck if logged in - if (!isMember()) return false; + if ((!isMember()) || ((isAdmin()) && (!isDebugModeEnabled()))) { + return false; + } // END - if // Secure user id setMemberId(getSession('userid')); @@ -298,7 +308,9 @@ function FILTER_UPDATE_LOGIN_DATA () { $content = getUserDataArray(); // Maybe first login time? - if (empty($content['last_module'])) $content['last_module'] = 'login'; + if (empty($content['last_module'])) { + $content['last_module'] = 'login'; + } // END - if // This will be displayed on welcome page! :-) if (empty($GLOBALS['last_online']['module'])) { @@ -310,7 +322,9 @@ function FILTER_UPDATE_LOGIN_DATA () { if (!isWhatSet()) { // Fix it to default setWhat('welcome'); - if (getIndexHome() != '') setWhatFromConfig('index_home'); + if (getIndexHome() != '') { + setWhatFromConfig('index_home'); + } // END - if } // END - if // Update last module / online time @@ -323,12 +337,16 @@ function FILTER_UPDATE_LOGIN_DATA () { // Filter for initializing randomizer function FILTER_INIT_RANDOMIZER () { - // Only execute this filter if installed - if ((!isInstalled()) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) return; - // Take a prime number which is long (if you know a longer one please try it out!) setConfigEntry('_PRIME', 591623); + // Only execute this filter if installed + if ((!isInstalled()) || (!isExtensionInstalledAndNewer('other', '0.2.5'))) { + // Set missing entry + setConfigEntry('_ADD', 0); + return; + } // END - if + // Calculate "entropy" with the prime number (for code generation) setConfigEntry('_ADD', (getPrime() * getPrime() / (pi() * getCodeLength() + 1))); @@ -469,7 +487,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) { $callback = ''; $extraFunction = ''; $extraFunction2 = ''; - $value = null; + $value = NULL; // Extract command and call-back $cmdArray = explode(',', $cmd); @@ -550,6 +568,26 @@ function FILTER_UPDATE_EXTENSION_DATA ($ext_name) { unset($GLOBALS['update_ver'][$ext_name]); } +// Load more hourly reset scripts +function FILTER_RUN_HOURLY_INCLUDES () { + // Is the reset set or old sql_patches? + if (((!isHourlyResetEnabled()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) && (isHtmlOutputMode())) { + // Then abort here + debug_report_bug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isHourlyResetEnabled()).',ext_newer[sql_patches:0.7.5]='.intval(isExtensionInstalledAndNewer('sql_patches', '0.7.5')).' Please report this bug. Thanks'); + } // END - if + + // Get more hourly reset scripts + setIncludePool('hourly', getArrayFromDirectory('inc/hourly/', 'hourly_')); + + // Update database + if ((!isConfigEntrySet('DEBUG_RESET')) || (!isDebugResetEnabled())) { + updateConfiguration('last_hour', getHour()); + } // END - if + + // Run the filter + runFilterChain('load_includes', 'hourly'); +} + // Load more reset scripts function FILTER_RUN_RESET_INCLUDES () { // Is the reset set or old sql_patches? @@ -562,20 +600,21 @@ function FILTER_RUN_RESET_INCLUDES () { setIncludePool('reset', getArrayFromDirectory('inc/daily/', 'daily_')); // Update database - if ((!isConfigEntrySet('DEBUG_RESET')) || (getConfig('DEBUG_RESET') != 'Y')) updateConfiguration('last_update', 'UNIX_TIMESTAMP()'); + if ((!isConfigEntrySet('DEBUG_RESET')) || (!isDebugResetEnabled())) { + updateConfiguration('last_update', 'UNIX_TIMESTAMP()'); + } // END - if // Is the config entry set? if (isExtensionInstalledAndNewer('sql_patches', '0.4.2')) { - // Create current week mark - $currWeek = getWeek(); - // Has it changed? - if ((getConfig('last_week') != $currWeek) || (isWeeklyResetDebugEnabled())) { + if (((isConfigEntrySet('last_week')) && (getConfig('last_week') != getWeek())) || (isWeeklyResetDebugEnabled())) { // Include weekly reset scripts mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_')); // Update config if not in debug mode - if (!isWeeklyResetDebugEnabled()) updateConfiguration('last_week', $currWeek); + if (!isWeeklyResetDebugEnabled()) { + updateConfiguration('last_week', getWeek()); + } // END - if } // END - if // Create current month mark @@ -587,7 +626,9 @@ function FILTER_RUN_RESET_INCLUDES () { mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_')); // Update config - if (!isMonthlyResetDebugEnabled()) updateConfiguration('last_month', $currMonth); + if (!isMonthlyResetDebugEnabled()) { + updateConfiguration('last_month', $currMonth); + } // END - if } // END - if } // END - if @@ -728,15 +769,31 @@ function FILTER_CHECK_REPOSITORY_REVISION () { // Filter for running daily reset function FILTER_RUN_DAILY_RESET () { // Only execute this filter if installed - if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) return; + if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) { + return; + } // END - if // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D - if (((getDay(getConfig('last_update')) != getDay()) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) { + if (((getDay(getConfig('last_update')) != getDay()) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) { // Tell every module we are in reset-mode! doReset(); } // END - if } +// Filter for running hourly reset +function FILTER_RUN_HOURLY_RESET () { + // Only execute this filter if installed + if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalledAndNewer('sql_patches', '0.7.5'))) { + return; + } // END - if + + // Shall we run the reset scripts? If a day has changed, maybe also a week/month has changed... Simple! :D + if ((((isConfigEntrySet('last_hour')) && (getConfig('last_hour') != getHour())) || (isDebugResetEnabled())) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) { + // Tell every module we are in reset-mode! + doHourly(); + } // END - if +} + // Filter for loading more runtime includes (not for installation) function FILTER_LOAD_RUNTIME_INCLUDES () { // Load more includes @@ -761,7 +818,7 @@ function FILTER_CHECK_ADMIN_ACL () { } // END - if // Check for access control line of current menu entry - $ret = adminsCheckAdminAcl($action, getWhat()); + $ret = isAdminsAllowedByAcl($action, getWhat()); } // END - if // Set it here @@ -770,10 +827,10 @@ function FILTER_CHECK_ADMIN_ACL () { // Init random number/cache buster function FILTER_INIT_RANDOM_NUMBER () { - // Is the extension sql_patches installed and at least 0.3.6? + // Is the extension ext-sql_patches installed and at least 0.3.6? if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) { // Generate random number - setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), '')); + setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 99999), getMemberId(), '')); } else { // Generate *WEAK* code setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999)); @@ -785,9 +842,11 @@ function FILTER_INIT_RANDOM_NUMBER () { // Update module counter function FILTER_COUNT_MODULE () { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ' - ENTERED!'); // Do count all other modules but not accesses on CSS file css.php! SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `clicks`=`clicks`+1 WHERE `module`='%s' LIMIT 1", array(getModule()), __FUNCTION__, __LINE__); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getModule()=' . getModule() . ',SQL_AFFECTEDROWS()=' . SQL_AFFECTEDROWS() . ' - EXIT!'); } // Handles fatal errors @@ -804,10 +863,7 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Load config here loadIncludeOnce('inc/load_config.php'); - // Set unset variable - if (empty($check)) $check = ''; - - // Default is none + // Default content is none $content = ''; // Installation phase or regular mode? @@ -848,9 +904,9 @@ function FILTER_HANDLE_FATAL_ERRORS () { // Message to regular users (non-admin) $CORR = '{--FATAL_REPORT_ERRORS--}'; - // PHP warnings fixed - if ($check == 'done') { - if (isAdmin()) $CORR = '{--FATAL_CORRECT_ERRORS--}'; + // Maybe the admin wants to take a look? + if (isAdmin()) { + $CORR = '{--FATAL_CORRECT_ERRORS--}'; } // END - if // Remember all in array @@ -916,9 +972,11 @@ function FILTER_FLUSH_TEMPLATE_CACHE () { } // Filter for loading user data -function FILTER_FETCH_USER_DATA ($userid = 0) { +function FILTER_FETCH_USER_DATA ($userid = NULL) { // Is the userid not set? Then use member id - if (($userid == '0') || (is_null($userid))) $userid = getMemberId(); + if (!isValidUserId($userid)) { + $userid = getMemberId(); + } // END - if // Get user data if (!fetchUserData($userid)) { @@ -1021,10 +1079,68 @@ function FILTER_SET_CURRENT_DATE () { // Set current date setConfigEntry('CURRENT_DATE', generateDateTime(time(), '3')); - // Timestamp for yesterday, today ... all at 00:00 am + // Epoche time for yesterday, today ... all at 00:00 am setConfigEntry('START_YDAY', makeTime(0, 0, 0, time() - getOneDay())); setConfigEntry('START_TDAY', makeTime(0, 0, 0, time())); } +// Filter for marking extension as installed +function FILTER_EXTENSION_MARK_INSTALLED ($data) { + // Mark it as installed + $GLOBALS['ext_is_installed'][$data['ext_name']] = true; +} + +// Filter for generating mails links for 'pool' mails +function FILTER_GENERATE_POOL_MAIL_LINKS ($data) { + // Is type 'mid'? + if ($data['type'] == 'mid') { + // Load template + $data['__output'] .= loadTemplate('admin_links_' . strtolower($data['mail_status']) . '_pool_mail', true, $data); + } // END - if + + // Return data + return $data; +} + +// Filter to activate exchange +function FILTER_ACTIVATE_EXCHANGE () { + // Is the extension 'user' there? + if ((!isExtensionActive('user')) || (getActivateXchange() == '0')) { + // Silently abort here + return false; + } // END - if + + // Check total amount of users + if (getTotalConfirmedUser() >= getActivateXchange()) { + // Activate System + addSql("UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1"); + addSql("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `visible`='Y', `locked`='N' WHERE `what`='order' OR `what`='unconfirmed' LIMIT 2"); + + // Run SQLs + runFilterChain('run_sqls'); + + // Update configuration + updateConfiguration('activate_xchange' ,0); + + // Rebuild cache + rebuildCache('modules', 'modules'); + } // END - if +} + +// Filter to handle configuration +function FILTER_HANDLE_HOME_IN_INDEX_SETTING ($data) { + // Is ext-sql_patches up-to-date? + if ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isDisplayHomeInIndexEnabled())) { + // Is 'search' as same as 'index_home'? + if ($data['search'] == getIndexHome()) { + // Then set 'content' to link to index.php + $data['content'] = $data['prefix'] . '' . getTitleFromMenu($data['access_level'], $data['search'], $data['type'], $data['add']) . ''; + } // END - if + } // END - if + + // Return data + return $data; +} + // [EOF] ?>