X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=2b241f52d69f48ad12796c5002bde464e67a0c87;hb=0e104a9282a1cdc7d769bbccb03bd3462aa8f4e0;hp=ae2bc37ccd762365e36138c8cb5833061c7e71f1;hpb=4b93525eb57c07b89c127494a45ec3d5666fa71a;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index ae2bc37ccd..2b241f52d6 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -54,11 +54,11 @@ 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'));
@@ -137,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']);
@@ -180,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)) {
@@ -293,7 +295,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
} // END - if
// Recheck if logged in
- if (!isMember()) {
+ if ((!isMember()) || ((isAdmin()) && (!isDebugModeEnabled()))) {
return false;
} // END - if
@@ -485,7 +487,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
$callback = '';
$extraFunction = '';
$extraFunction2 = '';
- $value = null;
+ $value = NULL;
// Extract command and call-back
$cmdArray = explode(',', $cmd);
@@ -825,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));
@@ -840,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
@@ -859,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?
@@ -903,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
@@ -971,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)) {
@@ -1087,5 +1090,57 @@ function FILTER_EXTENSION_MARK_INSTALLED ($data) {
$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]
?>