X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=c15b92abab30287b2a99651b7c552de38b3f0d4d;hb=11692c9f43d52ad1dfe9498cd2f3aea70a3ebf78;hp=181c1fe4f2d9567b5858e42c17fba6074896c50d;hpb=a226d81121cb96048b1ed85fd8584a87d435b0db;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index 181c1fe4f2..c15b92abab 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -14,8 +14,6 @@
* $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 - 2009 by Roland Haeder *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
@@ -165,10 +163,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 +242,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 +278,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
@@ -348,7 +354,7 @@ function FILTER_REMOVE_UPDATES ($data) {
// Shall we remove this update?
if (in_array($ext_name, getExtensionRemovalList())) {
// Then remove this extension!
- removeExtensionUpdateDependency($ext_name);
+ removeExtensionDependency($ext_name);
} // END - if
} // END - foreach
} // END - if
@@ -494,7 +500,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
} // 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)) {
@@ -515,13 +521,13 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
$code = call_user_func($commandFunction, $data);
} else {
// Unsupported command detected
- debug_report_bug(__FUNCTION__, __LINE__, 'Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
+ logDebugMessage(__FUNCTION__, __LINE__, 'Command=' . $cmd . ', callback=' . $callback . ', extra=' . $extraFunction . ' is unsupported.');
}
} // END - foreach
} // 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).'
');
@@ -545,7 +551,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
@@ -635,14 +641,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 {
@@ -652,10 +658,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('');
@@ -664,7 +674,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()));
@@ -681,7 +691,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
@@ -700,15 +710,15 @@ function FILTER_TRIGGER_SENDING_POOL () {
}
// Filter for checking and updating SVN revision
-function FILTER_CHECK_SVN_REVISION () {
+function FILTER_CHECK_REPOSITORY_REVISION () {
// Only execute this filter if installed and all config entries are there
if ((!isInstalled()) || (!isConfigEntrySet('patch_level'))) return;
// Check for patch level differences between databases and current hard-coded
- if ((getCurrSvnRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURR_SVN_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
+ if ((getCurrentRepositoryRevision() > getConfig('patch_level')) || (getConfig('patch_level') == 'CURRENT_REPOSITORY_REVISION') || (getConfig('patch_ctime') == 'UNIX_TIMES')) {
// Update database and CONFIG array
- updateConfiguration(array('patch_level', 'patch_ctime'), array(getCurrSvnRevision(), 'UNIX_TIMESTAMP()'));
- setConfigEntry('patch_level', getCurrSvnRevision());
+ updateConfiguration(array('patch_level', 'patch_ctime'), array(getCurrentRepositoryRevision(), 'UNIX_TIMESTAMP()'));
+ setConfigEntry('patch_level', getCurrentRepositoryRevision());
setConfigEntry('patch_ctime', time());
} // END - if
}
@@ -719,7 +729,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
@@ -763,7 +773,7 @@ function FILTER_INIT_RANDOM_NUMBER () {
// Generate random number
setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
} else {
- // Generate weak (!!!) code
+ // Generate *WEAK* code
setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
}
@@ -781,7 +791,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
@@ -882,7 +892,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
@@ -962,11 +972,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') {
@@ -1007,5 +1014,15 @@ function FILTER_CLEANUP_DNS_CACHE () {
} // END - if
}
+// Filter for setting CURRENT_DATE, this is required after initialization of extensions
+function FILTER_SET_CURRENT_DATE () {
+ // Set current date
+ setConfigEntry('CURRENT_DATE', generateDateTime(time(), '3'));
+
+ // Timestamp for yesterday, today ... all at 00:00 am
+ setConfigEntry('START_YDAY', makeTime(0, 0, 0, time() - getConfig('ONE_DAY')));
+ setConfigEntry('START_TDAY', makeTime(0, 0, 0, time()));
+}
+
// [EOF]
?>