} // END - if
// Shall we update usage counters (ONLY FOR DEBUGGING!)
- if ((isExtensionInstalledAndNewer('sql_patches', '0.6.0')) && (getConfig('update_filter_usage') == 'Y')) {
+ if ((isExtensionInstalledAndNewer('sql_patches', '0.6.0')) && (isConfigEntrySet('update_filter_usage')) && (getConfig('update_filter_usage') == 'Y')) {
// Update all counters
foreach ($GLOBALS['cache_array']['filter']['counter'] as $filterName => $filterArray) {
// Walk through all filters
adminSolveTask($data['task_id']);
} else {
// Not detectable!
- debug_report_bug(sprintf("Cannot resolve task. data[%s]=<pre>%s</pre>", gettype($data), print_r($data, true)));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Cannot resolve task. data[%s]=<pre>%s</pre>", gettype($data), print_r($data, true)));
}
// Return the data
// Is it null?
if (is_null($pool)) {
// This should not happen!
- debug_report_bug('pool is null.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'pool is null.');
} // END - if
// Is the pool an array and 'pool' set?
// Is it an array?
if ((!isset($data)) || (!is_array($data))) {
// Then abort here
- debug_report_bug(sprintf("INC_POOL is no array! Type: %s", gettype($data)));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("INC_POOL is no array! Type: %s", gettype($data)));
} elseif (isset($data['inc_pool'])) {
// Use this as new inclusion pool!
setIncludePool($realPool, $data['inc_pool']);
// Replace all matches
foreach ($matches[2] as $key => $cmd) {
// Init replacer/call-back variable
- $replacer = '';
- $callback = '';
+ $replacer = '';
+ $callback = '';
$extraFunction = '';
+ $value = '';
// Extract command and call-back
$cmdArray = explode(',', $cmd);
$cmd = $cmdArray[0];
- if (isset($cmdArray[1])) $callback = $cmdArray[1];
- if (isset($cmdArray[2])) $extraFunction = $cmdArray[2];
+
+ // Detect call-back function
+ if (isset($cmdArray[1])) {
+ // Call-back function detected
+ $callback = $cmdArray[1];
+ } // END - if
+
+ // Detect extra function
+ if (isset($cmdArray[2])) {
+ // Also detected
+ $extraFunction = $cmdArray[2];
+ } elseif (isset($matches[4][$key])) {
+ // Use this as value
+ $value = $matches[4][$key];
+ }
// Construct call-back function name for the command
$commandFunction = 'doExpression' . ucfirst(strtolower($cmd));
'mode' => $outputMode,
'code' => $code,
'callback' => $callback,
- 'extra_func' => $extraFunction
+ 'extra_func' => $extraFunction,
+ 'value' => $value
);
// Call it
$code = call_user_func($commandFunction, $data);
} else {
// Unsupported command detected
- debug_report_bug('Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
}
} // END - foreach
} // END - if
// Is the reset set or old sql_patches?
if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == '0')) {
// Then abort here
- debug_report_bug('Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks');
} // END - if
// Get more daily reset scripts
// Get user data
if (!fetchUserData($userid)) {
// Userid is not valid
- debug_report_bug('User id '.$userid . ' is invalid.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'User id '.$userid . ' is invalid.');
} // END - if
// Set member id
// Is the user data valid?
if (!isMember()) {
// Do only run for logged in members
- debug_report_bug('Please only run this filter for logged in users.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'Please only run this filter for logged in users.');
} // END - if
// Remmeber login failures if available
WHERE
`userid`=%s
LIMIT 1",
- array(getMemberId()), __FILE__, __LINE__);
+ array(getMemberId()), __FUNCTION__, __LINE__);
// Store it in session
setSession('mailer_member_failures' , getUserData('login_failures'));