X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffilters.php;h=21f2e59e86943b96a502b2073c7c0f2759e19233;hp=fd55e5785abbc2c10312add003fcb4cde87837d5;hb=62947352bd79291a551be2b5a5cb7c7b89516856;hpb=c00854616d540e2372c89cc04ab3677544efbd35
diff --git a/inc/filters.php b/inc/filters.php
index fd55e5785a..21f2e59e86 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -127,7 +128,7 @@ function FILTER_FLUSH_FILTERS () {
// Should we rebuild cache?
if (($inserted > 0) || ($removed > 0)) {
// Destroy cache
- rebuildCacheFile('filter', 'filter');
+ rebuildCache('filter', 'filter');
} // END - if
}
@@ -137,10 +138,10 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
$content = $data;
// Handle failed logins here if not in guest
- //* DEBUG: */ outputHtml(__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() == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((isExtensionInstalledAndNewer('sql_patches', '0.4.7')) || (isExtensionInstalledAndNewer('admins', '0.7.0')))) {
// Handle failure
- $content['content'] .= handleLoginFailtures($data['access_level']);
+ $content['content'] .= handleLoginFailures($data['access_level']);
} // END - if
// Return the content
@@ -167,7 +168,7 @@ function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
// Is this extension always activated?
if (getExtensionAlwaysActive() == 'Y') {
// Then activate the extension
- //* DEBUG: */ outputHtml(__FUNCTION__ . '(' . __LINE__."): ext_name={$data['ext_name']}
");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "ext_name={$data['ext_name']}
");
doActivateExtension($data['ext_name']);
} // END - if
@@ -450,7 +451,7 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) {
preg_match_all('/\{%(([a-zA-Z0-9-_,]+)(=([^\}]+)){0,1})*%\}/', $code, $matches);
//* DEBUG: */ print('
'.print_r($matches, true).''); - // Default is from OUTPUT_HTML + // Default is from outputHtml() $outputMode = getOutputMode(); // Some entries found? @@ -475,11 +476,12 @@ function FILTER_COMPILE_EXPRESSION_CODE ($code) { if (function_exists($commandFunction)) { // Prepare $matches, $key, $outputMode, etc. $data = array( - 'matches' => $matches, - 'key' => $key, - 'mode' => $outputMode, - 'code' => $code, - 'callback' => $callback + 'matches' => $matches, + 'key' => $key, + 'mode' => $outputMode, + 'code' => $code, + 'callback' => $callback, + 'extra_func' => $extraFunction ); // Call it @@ -533,24 +535,24 @@ function FILTER_RUN_RESET_INCLUDES () { $currWeek = date('W', time()); // Has it changed? - if ((getConfig('last_week') != $currWeek) || (getConfig('DEBUG_WEEKLY') == 'Y')) { + if ((getConfig('last_week') != $currWeek) || ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') == 'Y'))) { // Include weekly reset scripts mergeIncludePool('reset', getArrayFromDirectory('inc/weekly/', 'weekly_')); // Update config - if ((isConfigEntrySet('DEBUG_WEEKLY')) && (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek); + if ((!isConfigEntrySet('DEBUG_WEEKLY')) || (getConfig('DEBUG_WEEKLY') != 'Y')) updateConfiguration('last_week', $currWeek); } // END - if // Create current month mark $currMonth = date('m', time()); // Has it changed? - if ((getConfig('last_month') != $currMonth) || (getConfig('DEBUG_MONTHLY') == 'Y')) { + if ((getConfig('last_month') != $currMonth) || ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') == 'Y'))) { // Include monthly reset scripts mergeIncludePool('reset', getArrayFromDirectory('inc/monthly/', 'monthly_')); // Update config - if ((isConfigEntrySet('DEBUG_MONTHLY')) && (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth); + if ((!isConfigEntrySet('DEBUG_MONTHLY')) || (getConfig('DEBUG_MONTHLY') != 'Y')) updateConfiguration('last_month', $currMonth); } // END - if } // END - if @@ -564,11 +566,11 @@ function FILTER_REMOVE_EXTENSION () { SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1", array(getCurrentExtensionName()), __FUNCTION__, __LINE__); - // Remove the extension from global cache array as well + // Remove the extension from cache array as well removeExtensionFromArray(); // Remove the cache - rebuildCacheFile('extension', 'extension'); + rebuildCache('extension', 'extension'); } // Filter for flushing the output @@ -703,14 +705,6 @@ function FILTER_LOAD_RUNTIME_INCLUDES () { // Load the include loadIncludeOnce($inc); } // END - foreach - - // Load admin include file if he is admin - if (isAdmin()) { - // Administrative functions - loadIncludeOnce('inc/modules/admin/admin-inc.php'); - } // END - if - //* DEBUG: */ addPointsThroughReferalSystem('test', 36, 1000); - //* DEBUG: */ die(); } // Filter for checking admin ACL @@ -920,9 +914,54 @@ LIMIT 1", // Store it in session setSession('mxchange_member_failures' , getUserData('login_failures')); - setSession('mxchange_member_last_fail', getUserData('last_failure')); + setSession('mxchange_member_last_failure', getUserData('last_failure')); + } // END - if +} + +// Try to login the admin by setting some session/cookie variables +function FILTER_DO_LOGIN_ADMIN ($data) { + // Now set all session variables and store the result for later processing + $GLOBALS['admin_login_success'] = (( + setSession('admin_md5', encodeHashForCookie($data['pass_hash'])) + ) && ( + setSession('admin_login', $data['login']) + ) && ( + setSession('admin_last', time()) + )); + + // Return the data for further processing + return $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); + + // Include meta data in 'guest' module + if (getModule() == 'index') { + // Load meta data template + $GLOBALS['page_header'] .= loadTemplate('metadata', true); + + // Add meta description to header + if ((isInstalled()) && (isAdminRegistered()) && (SQL_IS_LINK_UP())) { + // Add meta description not in admin and login module and when the script is installed + generateMetaDescriptionCode(); + } // END - if } // END - if } +// Filter for adding style sheet, closing page header +function FILTER_FINISH_PAGE_HEADER () { + // Include stylesheet + loadIncludeOnce('inc/stylesheet.php'); + + // Closing HEAD tag + $GLOBALS['page_header'] .= ''; +} + // [EOF] ?>