X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffilters.php;h=fe1a36c00990c04e4831d5c539ca6c0d81e8110b;hb=5e9e2e145dc720e1459a6f1f51f2a32f1fcc9b6d;hp=5dd7d6999025ddec270572adfccaf23db5ca54d3;hpb=5dc48c7ca2416a0893a34a2e049827a4b4ce68b9;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index 5dd7d69990..fe1a36c009 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -139,7 +139,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
// Handle failed logins here if not in guest
//* 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() == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) {
+ 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.0')))) {
// Handle failure
$content['content'] .= handleLoginFailures($data['access_level']);
} // END - if
@@ -165,10 +165,12 @@ 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()));
+
// Is this extension always activated?
if (isExtensionAlwaysActive()) {
// Then activate the extension
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name={$data['ext_name']}
");
doActivateExtension($data['ext_name']);
} // END - if
@@ -242,29 +244,35 @@ function FILTER_LOAD_INCLUDES ($pool) {
// Filter for running SQL commands
function FILTER_RUN_SQLS ($data) {
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Entered!");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Entered!');
// Is the array there?
if ((isSqlsValid()) && ((!isset($data['dry_run'])) || ($data['dry_run'] == false))) {
// Run SQL commands
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Found ".countSqls()." queries to run.");
- foreach (getSqls() as $sqls) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Found ' . countSqls() . ' queries to run.');
+ foreach (getSqls() as $mode=>$sqls) {
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'mode=' . $mode . ',count()=' . count($sqls));
+
// New cache format...
foreach ($sqls as $sql) {
// Trim spaces away
$sql = trim($sql);
+ // Is 'enable_codes' not set? Then set it to true
+ if (!isset($data['enable_codes'])) $data['enable_codes'] = true;
+
// 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
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Alterting table: {$sql}");
- SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Alterting table: ' . $sql . ',enable_codes=' . intval($data['enable_codes']));
+ SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__, $data['enable_codes']);
} else {
// Run regular SQL command
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running regular query: {$sql}");
- SQL_QUERY($sql, __FUNCTION__, __LINE__, false);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Running regular query: ' . $sql . ',enable_codes=' . intval($data['enable_codes']));
+ SQL_QUERY($sql, __FUNCTION__, __LINE__, $data['enable_codes']);
}
} // END - if
} // END - foreach
@@ -272,7 +280,7 @@ function FILTER_RUN_SQLS ($data) {
} // END - if
// Debug message
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "- Left!");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '- Left!');
}
// Filter for updating/validating login data
@@ -304,7 +312,7 @@ function FILTER_UPDATE_LOGIN_DATA () {
if (!isWhatSet()) {
// Fix it to default
setWhat('welcome');
- if (getConfig('index_home') != '') setWhatFromConfig('index_home');
+ if (getIndexHome() != '') setWhatFromConfig('index_home');
} // END - if
// Update last module / online time
@@ -459,10 +467,11 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
// Replace all matches
foreach ($matches[2] as $key => $cmd) {
// Init replacer/call-back variable
- $replacer = '';
- $callback = '';
- $extraFunction = '';
- $value = '';
+ $replacer = '';
+ $callback = '';
+ $extraFunction = '';
+ $extraFunction2 = '';
+ $value = '';
// Extract command and call-back
$cmdArray = explode(',', $cmd);
@@ -478,25 +487,35 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
if (isset($cmdArray[2])) {
// Also detected
$extraFunction = $cmdArray[2];
- } elseif (isset($matches[4][$key])) {
+ } // END - if
+
+ // Detect extra function 2
+ if (isset($cmdArray[3])) {
+ // Also detected
+ $extraFunction2 = $cmdArray[3];
+ } // END - if
+
+ // And value
+ if (isset($matches[4][$key])) {
// Use this as value
$value = $matches[4][$key];
- }
+ } // END - if
// Construct call-back function name for the command
- $commandFunction = 'doExpression' . ucfirst(strtolower($cmd));
+ $commandFunction = 'doExpression' . capitalizeUnderscoreString($cmd);
// Is this function there?
if (function_exists($commandFunction)) {
// Prepare $matches, $key, $outputMode, etc.
$data = array(
- 'matches' => $matches,
- 'key' => $key,
- 'mode' => $outputMode,
- 'code' => $code,
- 'callback' => $callback,
- 'extra_func' => $extraFunction,
- 'value' => $value
+ 'matches' => $matches,
+ 'key' => $key,
+ 'mode' => $outputMode,
+ 'code' => $code,
+ 'callback' => $callback,
+ 'extra_func' => $extraFunction,
+ 'extra_func2' => $extraFunction2,
+ 'value' => $value
);
// Call it
@@ -510,7 +529,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
} // END - if
// Do we have non-HTML mode?
- if ((getScriptOutputMode() != '0') || ($outputMode != '0')) $code = decodeEntities($code);
+ if ((!isHtmlOutputMode()) || ($outputMode != '0')) $code = decodeEntities($code);
// Return compiled code
//* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:
'.($code).''); @@ -534,7 +553,7 @@ function FILTER_UPDATE_EXTENSION_DATA ($ext_name) { // Load more reset scripts function FILTER_RUN_RESET_INCLUDES () { // Is the reset set or old sql_patches? - if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getScriptOutputMode() == '0')) { + if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (isHtmlOutputMode())) { // Then abort here debug_report_bug(__FUNCTION__, __LINE__, 'Cannot run reset! enabled='.intval(isResetModeEnabled()).',ext='.intval(isExtensionInstalled('sql_patches')).' Please report this bug. Thanks'); } // END - if @@ -624,14 +643,14 @@ function FILTER_DETERMINE_WHAT_ACTION () { } // END - if // Get all values - if ((getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) { + if ((!isCssOutputMode()) && (!isRawOutputMode())) { // Fix module if (!isModuleSet()) { // Is the request element set? if (isGetRequestParameterSet('module')) { // Set module from request setModule(getRequestParameter('module')); - } elseif (getScriptOutputMode() == '0') { + } elseif (isHtmlOutputMode()) { // Set default module 'index' setModule('index'); } else { @@ -641,10 +660,14 @@ function FILTER_DETERMINE_WHAT_ACTION () { } // END - if // Fix 'what' if not yet set - if (!isWhatSet()) setWhat(getWhatFromModule(getModule())); + if (!isWhatSet()) { + setWhat(getWhatFromModule(getModule())); + } // END - if // Fix 'action' if not yet set - if (!isActionSet()) setAction(getActionFromModuleWhat(getModule(), getWhat())); + if (!isActionSet()) { + setAction(getActionFromModuleWhat(getModule(), getWhat())); + } // END - if } else { // Set action/what to empty setAction(''); @@ -653,7 +676,7 @@ function FILTER_DETERMINE_WHAT_ACTION () { // Set default 'what' value //* DEBUG: */ debugOutput('-' . getModule() . '/' . getWhat() . '-'); - if ((!isWhatSet()) && (!isActionSet()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) { + if ((!isWhatSet()) && (!isActionSet()) && (!isCssOutputMode()) && (!isRawOutputMode())) { if (getModule() == 'admin') { // Set 'action' value to 'login' in admin menu setAction(getActionFromModuleWhat(getModule(), getWhat())); @@ -670,7 +693,7 @@ function FILTER_DETERMINE_WHAT_ACTION () { // Sends out pooled mails function FILTER_TRIGGER_SENDING_POOL () { // Are we in normal output mode? - if (getScriptOutputMode() != 0) { + if (!isHtmlOutputMode()) { // Only in normal output mode to prevent race-conditons! } // END - if @@ -708,7 +731,7 @@ function FILTER_RUN_DAILY_RESET () { if ((isInstallationPhase()) || (!isInstalled()) || (!isAdminRegistered()) || (!isExtensionInstalled('sql_patches'))) return; // 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')) && (getScriptOutputMode() != 1)) { + if (((getDay(getConfig('last_update')) != getDay()) || ((isConfigEntrySet('DEBUG_RESET')) && (getConfig('DEBUG_RESET') == 'Y'))) && (!isInstallationPhase()) && (isAdminRegistered()) && (!isGetRequestParameterSet('register')) && (!isCssOutputMode())) { // Tell every module we are in reset-mode! doReset(); } // END - if @@ -770,7 +793,7 @@ function FILTER_COUNT_MODULE () { // Handles fatal errors function FILTER_HANDLE_FATAL_ERRORS () { // Do we have errors to handle and right output mode? - if ((!ifFatalErrorsDetected()) || (getScriptOutputMode() != '0')) { + if ((!ifFatalErrorsDetected()) || (!isHtmlOutputMode())) { // Abort executing here return false; } // END - if @@ -871,7 +894,7 @@ function FILTER_DISPLAY_COPYRIGHT () { function FILTER_DISPLAY_PARSING_TIME () { // Shall we display the parsing time and number of queries? // 1234 5 54 4 5 5 4 4 5 543 3 4432 2 33 2 2 21 - if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (getScriptOutputMode() == '0') && ($GLOBALS['header_sent'] == 2)) { + if ((((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (getConfig('show_timings') == 'Y') && (!isGetRequestParameterSet('frame'))) || (isInstallationPhase())) && (isHtmlOutputMode()) && ($GLOBALS['header_sent'] == 2)) { // Then display it here displayParsingTime(); } // END - if @@ -951,11 +974,8 @@ function FILTER_DO_LOGIN_ADMIN ($data) { // Filter for loading page header, this should be ran first! function FILTER_LOAD_PAGE_HEADER () { - // Determine the page title - $content['header_title'] = determinePageTitle(); - // Output page header code - $GLOBALS['page_header'] = loadTemplate('page_header', true, $content); + $GLOBALS['page_header'] = loadTemplate('page_header', true); // Include meta data in 'guest' module if (getModule() == 'index') {