X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffilters.php;h=e5714e88b7017e4e2997ed51b7034428a821b842;hb=b8bb07ca2993ae80746a809853fdd46f5cde14e3;hp=6ec29093ff180772213f3a9656def13f4eb2a041;hpb=6d348813375b48ecd6344d52ec2b821046c353a9;p=mailer.git
diff --git a/inc/filters.php b/inc/filters.php
index 6ec29093ff..e5714e88b7 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -38,7 +38,7 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
+ $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
}
@@ -53,11 +53,11 @@ function INIT_FILTER_SYSTEM () {
// Init the filter system (just some ideas)
$GLOBALS['filters']['chains'] = array(
- // Filters for pre-init phase
+ // Filters for pre-init phase
'preinit' => array(),
- // Filters for post-init phase
+ // Filters for post-init phase
'postinit' => array(),
- // Filters for shutdown phase
+ // Filters for shutdown phase
'shutdown' => array()
);
@@ -66,13 +66,13 @@ function INIT_FILTER_SYSTEM () {
$GLOBALS['filters']['counter'] = array();
// Load all saved filers if sql_patches is updated
- if (GET_EXT_VERSION("sql_patches") >= "0.5.9") {
+ if (GET_EXT_VERSION('sql_patches') >= '0.5.9') {
// Init add
- $ADD = "";
- if (GET_EXT_VERSION("sql_patches") >= "0.6.0") $ADD = ", `filter_counter`";
+ $add = '';
+ if (GET_EXT_VERSION('sql_patches') >= '0.6.0') $add = ", `filter_counter`";
// Load all active filers
- $result = SQL_QUERY("SELECT `filter_name`,`filter_function`,`filter_active`".$ADD."
+ $result = SQL_QUERY("SELECT `filter_name`,`filter_function`,`filter_active`".$add."
FROM `{!_MYSQL_PREFIX!}_filters`
ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
@@ -100,7 +100,7 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
} // END - if
} // END - while
} // END - if
-
+
// Free result
SQL_FREERESULT($result);
} // END - if
@@ -118,14 +118,14 @@ ORDER BY `filter_id` ASC", __FUNCTION__, __LINE__);
// Filters for post-extension-registration
REGISTER_FILTER('post_extension_installed', 'AUTO_ACTIVATE_EXTENSION');
REGISTER_FILTER('post_extension_installed', 'SOLVE_TASK');
- REGISTER_FILTER('post_extension_installed', 'LOAD_INCLUDES');
+ REGISTER_FILTER('post_extension_installed', 'loadIncludeLUDES');
REGISTER_FILTER('post_extension_installed', 'REMOVE_UPDATES');
// Solving tasks
REGISTER_FILTER('solve_task', 'SOLVE_TASK');
// Loading includes in general
- REGISTER_FILTER('load_includes', 'LOAD_INCLUDES');
+ REGISTER_FILTER('load_includes', 'loadIncludeLUDES');
// Run SQLs
REGISTER_FILTER('run_sqls', 'RUN_SQLS');
@@ -163,7 +163,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
// Shall we add it?
if (!$dry_run) {
// Simply add it to the array
- $GLOBALS['filters']['chains'][$filterName][$filterFunction] = "Y";
+ $GLOBALS['filters']['chains'][$filterName][$filterFunction] = 'Y';
$GLOBALS['filters']['counter'][$filterName][$filterFunction] = 0;
} // END - if
}
@@ -213,7 +213,7 @@ function runFilterChain ($filterName, $data = null, $silentAbort = true) {
//* DEBUG: */ echo __FUNCTION__."(".__LINE__."): name={$filterName},func={$filterFunction},active={$active}
\n";
// Is the filter active?
- if ($active == "Y") {
+ if ($active == 'Y') {
// Is this filter there?
if (!function_exists($filterFunction)) {
// Unregister it
@@ -258,7 +258,7 @@ function FILTER_FLUSH_FILTERS () {
} // END - if
// Is the extension sql_patches updated?
- if (EXT_VERSION_IS_OLDER("sql_patches", "0.5.9")) {
+ if (EXT_VERSION_IS_OLDER('sql_patches', '0.5.9')) {
// Abort silently here
return false;
} // END - if
@@ -306,16 +306,16 @@ function FILTER_FLUSH_FILTERS () {
} // END - if
// Shall we update usage counters (ONLY FOR DEBUGGING!)
- if (getConfig('update_filter_usage') == "Y") {
+ if (getConfig('update_filter_usage') == 'Y') {
// Update all counters
foreach ($GLOBALS['filters']['counter'] as $filterName => $filterArray) {
// Walk through all filters
foreach ($filterArray as $filterFunction => $cnt) {
// Construct and add the query
ADD_SQL(sprintf("UPDATE `{!_MYSQL_PREFIX!}_filters` SET `filter_counter`=%s WHERE `filter_name`='%s' AND `filter_function`='%s' LIMIT 1",
- bigintval($cnt),
- $filterName,
- $filterFunction
+ bigintval($cnt),
+ $filterName,
+ $filterFunction
));
} // END - foreach
} // END - foreach
@@ -332,7 +332,7 @@ function FILTER_CALL_HANDLER_LOGIN_FAILTURES ($data) {
// Handle failed logins here if not in guest
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):type={$data['type']},action={$GLOBALS['action']},what={$GLOBALS['what']},lvl={$data['access_level']}
\n";
- if ((($data['type'] == "what") || ($data['type'] == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == getConfig('index_home')))) && ($data['access_level'] != "guest") && ((GET_EXT_VERSION("sql_patches") >= "0.4.7") || (GET_EXT_VERSION("admins") >= "0.7.0"))) {
+ if ((($data['type'] == "what") || ($data['type'] == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == getConfig('index_home')))) && ($data['access_level'] != 'guest') && ((GET_EXT_VERSION('sql_patches') >= '0.4.7') || (GET_EXT_VERSION('admins') >= '0.7.0'))) {
// Handle failure
$content['content'] .= HANDLE_LOGIN_FAILTURES($data['access_level']);
} // END - if
@@ -349,17 +349,17 @@ function FILTER_REDIRECT_TO_LOGOUT_SQL_PATCHES () {
// Is the element set?
if (isset($GLOBALS['ext_load_mode'])) {
// Redirect here
- LOAD_URL("modules.php?module=admin&logout=1&".$GLOBALS['ext_load_mode']."=sql_patches");
+ redirectToUrl('modules.php?module=admin&logout=1&' . $GLOBALS['ext_load_mode'] . '=sql_patches');
} // END - if
// This should not happen!
- DEBUG_LOG(__FUNCTION__, __LINE__, "Cannot auto-logout because no extension load-mode has been set.");
+ DEBUG_LOG(__FUNCTION__, __LINE__, 'Cannot auto-logout because no extension load-mode has been set.');
}
// Filter for auto-activation of a extension
function FILTER_AUTO_ACTIVATE_EXTENSION ($data) {
// Is this extension always activated?
- if (EXT_GET_ALWAYS_ACTIVE() == "Y") {
+ if (EXT_GET_ALWAYS_ACTIVE() == 'Y') {
// Then activate the extension
//* DEBUG: */ echo __FUNCTION__."(".__LINE__."): ext_name={$data['ext_name']}
\n";
ACTIVATE_EXTENSION($data['ext_name']);
@@ -388,7 +388,7 @@ function FILTER_SOLVE_TASK ($data) {
}
// Filter to load include files
-function FILTER_LOAD_INCLUDES () {
+function FILTER_loadIncludeLUDES () {
// Default is $data as inclusion list
$data = GET_INC_POOL();
@@ -405,7 +405,7 @@ function FILTER_LOAD_INCLUDES () {
if (COUNT_INC_POOL() > 0) {
// Loads every include file
foreach (GET_INC_POOL() as $FQFN) {
- LOAD_INC_ONCE($FQFN);
+ loadIncludeOnce($FQFN);
} // END - foreach
// Reset array
@@ -458,11 +458,11 @@ function FILTER_UPDATE_LOGIN_DATA () {
if (!IS_MEMBER()) return false;
// Secure user ID
- setUserId(get_session('userid'));
+ setUserId(getSession('userid'));
// Load last module and last online time
$result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
- array(getUserId()), __FUNCTION__, __LINE__);
+ array(getUserId()), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
@@ -480,16 +480,16 @@ function FILTER_UPDATE_LOGIN_DATA () {
// "what" not set?
if (empty($GLOBALS['what'])) {
// Fix it to default
- $GLOBALS['what'] = "welcome";
- if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
+ $GLOBALS['what'] = "welcome";
+ if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
} // END - if
// Update last module / online time
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET last_module='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",
- array($GLOBALS['what'], GET_REMOTE_ADDR(), getUserId()), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `last_module`='%s', last_online=UNIX_TIMESTAMP(), REMOTE_ADDR='%s' WHERE userid=%s LIMIT 1",
+ array($GLOBALS['what'], detectRemoteAddr(), getUserId()), __FUNCTION__, __LINE__);
} else {
// Destroy session, we cannot update!
- destroy_user_session();
+ destroyUserSession();
}
// Free the result
@@ -502,16 +502,16 @@ function FILTER_CHECK_ADMIN_ACL () {
$ret = true;
// Ok, Cookie-Update done
- if (GET_EXT_VERSION("admins") >= "0.3") {
+ if (GET_EXT_VERSION('admins') >= '0.3.0') {
// Check if action GET variable was set
$action = SQL_ESCAPE($GLOBALS['action']);
if (!empty($GLOBALS['what'])) {
// Get action value by what-value
- $action = GET_ACTION("admin", $GLOBALS['what']);
+ $action = getModeAction('admin', $GLOBALS['what']);
} // END - if
// Check for access control line of current menu entry
- $ret = ADMINS_CHECK_ACL($action, $GLOBALS['what']);
+ $ret = adminsCheckAdminAcl($action, $GLOBALS['what']);
} // END - if
// Return result
@@ -521,7 +521,7 @@ function FILTER_CHECK_ADMIN_ACL () {
// Filter for initializing randomizer
function FILTER_INIT_RANDOMIZER () {
// Simply init the randomizer with seed and _ADD value
- mt_srand(generateSeed() + constant('_ADD'));
+ mt_srand(generateSeed() + getConfig('_ADD'));
}
// Filter for removing updates