X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=bd4fd26d0644170312c57881c7ef8a282ec50535;hb=49ffe0a4fb551d0965e97db1ad4ff12f13f4b9ad;hp=8ebe34f0c6a24180a9b0122cd1c194b42d9b47b7;hpb=89c00e43d2ce1dd1afe11c2c8485307342805f97;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 8ebe34f0c6..bd4fd26d06 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -38,13 +38,13 @@ if (!defined('__SECURITY')) {
 }
 
 // Init "generic filter system"
-function INIT_FILTER_SYSTEM() {
+function INIT_FILTER_SYSTEM () {
 	global $filters, $loadedFilters, $counter;
 
 	// Is the filter already initialized?
 	if ((isset($filters)) && (is_array($filters))) {
 		// Then abort here
-		ADD_FATAL(FILTER_FAILED_ALREADY_INIT);
+		addFatalMessage(FILTER_FAILED_ALREADY_INIT);
 		return false;
 	} // END - if
 
@@ -143,7 +143,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
 	if ((isset($filters[$filterName][$filterFunction])) && (!$force)) {
 		// Then abort here
 		if (!$silentAbort) {
-			ADD_FATAL(sprintf(FILTER_FAILED_ALREADY_ADDED, $filterFunction, $filterName));
+			addFatalMessage(sprintf(FILTER_FAILED_ALREADY_ADDED, $filterFunction, $filterName));
 		} // END - if
 
 		// Abort here
@@ -153,7 +153,7 @@ function REGISTER_FILTER ($filterName, $filterFunction, $silentAbort = true, $fo
 	// Is the function there?
 	if (!function_exists($filterFunction)) {
 		// Then abort here
-		ADD_FATAL(sprintf(FILTER_FAILED_NOT_FOUND, $filterFunction, $filterName));
+		addFatalMessage(sprintf(FILTER_FAILED_NOT_FOUND, $filterFunction, $filterName));
 		return false;
 	} // END - if
 
@@ -177,7 +177,7 @@ function UNREGISTER_FILTER ($filterName, $filterFunction, $force = false, $dry_r
 	// Is that filter there?
 	if ((!isset($filters[$filterName][$filterFunction])) && (!$force)) {
 		// Not found, so abort here
-		ADD_FATAL(sprintf(FILTER_FAILED_NOT_REMOVED, $filterFunction, $filterName));
+		addFatalMessage(sprintf(FILTER_FAILED_NOT_REMOVED, $filterFunction, $filterName));
 		return false;
 	} // END - if
 
@@ -198,7 +198,7 @@ function RUN_FILTER ($filterName, $data = null, $silentAbort = true) {
 		// Then abort here (quick'N'dirty hack)
 		if ((!$silentAbort) && (defined('FILTER_FAILED_NO_FILTER_FOUND'))) {
 			// Add fatal message
-			ADD_FATAL(sprintf(FILTER_FAILED_NO_FILTER_FOUND, $filterName));
+			addFatalMessage(sprintf(FILTER_FAILED_NO_FILTER_FOUND, $filterName));
 		} // END - if
 
 		// Abort here
@@ -250,7 +250,7 @@ function FILTER_FLUSH_FILTERS () {
 	// Is a database link here and not in installation mode?
 	if ((!is_resource($link)) && (!isBooleanConstantAndTrue('mxchange_installing'))) {
 		// Abort here
-		ADD_FATAL(sprintf(FILTER_FLUSH_FAILED_NO_DATABASE, $filterFunction, $filterName));
+		addFatalMessage(sprintf(FILTER_FLUSH_FAILED_NO_DATABASE, $filterFunction, $filterName));
 		return false;
 	} // END - if
 
@@ -450,40 +450,40 @@ function FILTER_UPDATE_LOGIN_DATA () {
 	// Secure user ID
 	$GLOBALS['userid'] = bigintval(get_session('userid'));
 
-	// Extract last online time (life) and how long is auto-login valid (time)
-	$newl = time() + bigintval(get_session('lifetime'));
-
 	// 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($GLOBALS['userid']), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT last_module, last_online FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+		array($GLOBALS['userid']), __FILE__, __LINE__);
+
+	// Entry found?
 	if (SQL_NUMROWS($result) == 1) {
 		// Load last module and online time
 		list($mod, $onl) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
 
 		// Maybe first login time?
 		if (empty($mod)) $mod = "login";
 
-		if (set_session("userid", $GLOBALS['userid'], $newl, COOKIE_PATH) && set_session("u_hash", get_session('u_hash'), $newl, COOKIE_PATH) && set_session("lifetime", bigintval(get_session('lifetime')), $newl, COOKIE_PATH)) {
-			// This will be displayed on welcome page! :-)
-			if (empty($LAST['module'])) {
-				$LAST['module'] = $mod; $LAST['online'] = $onl;
-			} // END - if
+		// This will be displayed on welcome page! :-)
+		if (empty($LAST['module'])) {
+			$LAST['module'] = $mod; $LAST['online'] = $onl;
+		} // END - if
 
-			// "what" not set?
-			if (empty($GLOBALS['what'])) {
-				// Fix it to default
-			 	$GLOBALS['what'] = "welcome";
-			 	if (getConfig('index_home') != "") $GLOBALS['what'] = getConfig('index_home');
-			} // END - if
+		// "what" not set?
+		if (empty($GLOBALS['what'])) {
+			// Fix it to default
+		 	$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(), $GLOBALS['userid']), __FILE__, __LINE__);
-		}
+		// 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(), $GLOBALS['userid']), __FILE__, __LINE__);
 	}  else {
 		// Destroy session, we cannot update!
 		destroy_user_session();
 	}
+
+	// Free the result
+	SQL_FREERESULT($result);
 }
 
 // Filter for checking admin ACL
@@ -492,7 +492,7 @@ function FILTER_CHECK_ADMIN_ACL () {
 	$ret = true;
 
 	// Ok, Cookie-Update done
-	if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
+	if (GET_EXT_VERSION("admins") >= "0.3") {
 		// Check if action GET variable was set
 		$action = SQL_ESCAPE($GLOBALS['action']);
 		if (!empty($GLOBALS['what'])) {