X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffilters.php;h=4426a95aa66ce611a60ba19814e5edac3a55e83d;hb=d1ca15cbf3bbbf1281a24fdf204aa5a9bae80e0f;hp=4a55f46e244a403e21f5c7f3886c7bad1cff3d80;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;p=mailer.git

diff --git a/inc/filters.php b/inc/filters.php
index 4a55f46e24..4426a95aa6 100644
--- a/inc/filters.php
+++ b/inc/filters.php
@@ -258,11 +258,11 @@ function FILTER_RUN_SQLS ($data) {
 					// 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}");
+						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Alterting table: {$sql}");
 						SQL_ALTER_TABLE($sql, __FUNCTION__, __LINE__);
 					} else {
 						// Run regular SQL command
-						/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running regular query: {$sql}");
+						//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "Running regular query: {$sql}");
 						SQL_QUERY($sql, __FUNCTION__, __LINE__, false);
 					}
 				} // END - if
@@ -283,23 +283,20 @@ function FILTER_UPDATE_LOGIN_DATA () {
 	if (!isMember()) return false;
 
 	// Secure user id
-	setUserId(getSession('userid'));
+	setMemberId(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__);
-
-	// Entry found?
-	if (SQL_NUMROWS($result) == 1) {
+	// Found a userid?
+	if (fetchUserData(getMemberId())) {
 		// Load last module and online time
-		$content = SQL_FETCHARRAY($result);
+		$content = getUserDataArray();
 
 		// Maybe first login time?
 		if (empty($content['last_module'])) $content['last_module'] = 'login';
 
 		// This will be displayed on welcome page! :-)
 		if (empty($GLOBALS['last_online']['module'])) {
-			$GLOBALS['last_online']['module'] = $content['last_module']; $GLOBALS['last_online']['online'] = $content['last_online'];
+			$GLOBALS['last_online']['module'] = $content['last_module'];
+			$GLOBALS['last_online']['online'] = $content['last_online'];
 		} // END - if
 
 		// 'what' not set?
@@ -314,15 +311,12 @@ function FILTER_UPDATE_LOGIN_DATA () {
 			array(
 				getWhat(),
 				detectRemoteAddr(),
-				getUserId()
+				getMemberId()
 			), __FUNCTION__, __LINE__);
 	}  else {
 		// Destroy session, we cannot update!
-		destroyUserSession();
+		destroyMemberSession();
 	}
-
-	// Free the result
-	SQL_FREERESULT($result);
 }
 
 // Filter for initializing randomizer
@@ -372,11 +366,9 @@ function FILTER_DETERMINE_USERNAME () {
 	// Check if logged in
 	if (isMember()) {
 		// Is still logged in so we welcome him with his name
-		$result = SQL_QUERY_ESC("SELECT `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-			array(getUserId()), __FILE__, __LINE__);
-		if (SQL_NUMROWS($result) == 1) {
+		if (fetchUserData(getMemberId())) {
 			// Load surname and family's name and build the username
-			$content = SQL_FETCHARRAY($result);
+			$content = getUserDataArray();
 
 			// Prepare username
 			setUsername($content['surname'] . ' ' . $content['family']);
@@ -391,14 +383,8 @@ function FILTER_DETERMINE_USERNAME () {
 			setUsername('<em>{--USERNAME_UNKNOWN--}</em>');
 
 			// Destroy session
-			destroyUserSession();
-
-			// Kill userid
-			setUserId(0);
+			destroyMemberSession();
 		}
-
-		// Free memory
-		SQL_FREERESULT($result);
 	} elseif (isAdmin()) {
 		// Admin is there
 		setUsername('{--USERNAME_ADMIN--}');
@@ -409,40 +395,55 @@ function FILTER_DETERMINE_USERNAME () {
 }
 
 // Filter for compiling config entries
-function FILTER_COMPILE_CONFIG ($code) {
-	// Compile {?some_var?} to getConfig('some_var')
-	preg_match_all('/\{\?(([a-zA-Z0-9-_]+)*)\?\}/', $code, $matches);
+function FILTER_COMPILE_CONFIG ($code, $compiled = false) {
+	// Save the uncompiled code
+	$uncompiled = $code;
+
+	// Do we have cache?
+	if (!isset($GLOBALS['compiled_config'][$code])) {
+		// Compile {?some_var?} to getConfig('some_var')
+		preg_match_all('/\{\?(([a-zA-Z0-9-_]+)*)\?\}/', $code, $matches);
+
+		// Some entries found?
+		if ((count($matches) > 0) && (count($matches[0]) > 0)) {
+			// Replace all matches
+			foreach ($matches[0] as $key => $match) {
+				// Do we have cache?
+				if (!isset($GLOBALS['compile_config'][$matches[1][$key]])) {
+					// Is the config valid?
+					if (isConfigEntrySet($matches[1][$key])) {
+						// Set it for caching
+						$GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . $matches[1][$key] . "').\"";
+					} elseif (isConfigEntrySet('default_' . strtoupper($matches[1][$key]))) {
+						// Use default value
+						$GLOBALS['compile_config'][$matches[1][$key]] = "\".getConfig('" . 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\"";
+					} elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) {
+						// No config, try the language system
+						$GLOBALS['compile_config'][$matches[1][$key]] = "\".getMessage('". 'DEFAULT_' . strtoupper($matches[1][$key]) . "').\"";
+					} else {
+						// Unhandled!
+						$GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
+					}
+				} // END - if
 
-	// Some entries found?
-	if ((count($matches) > 0) && (count($matches[0]) > 0)) {
-		// Replace all matches
-		foreach ($matches[0] as $key => $match) {
-			// Do we have cache?
-			if (!isset($GLOBALS['compile_config'][$matches[1][$key]])) {
-				// Is the config valid?
-				if (isConfigEntrySet($matches[1][$key])) {
-					// Set it for caching
-					$GLOBALS['compile_config'][$matches[1][$key]] = getConfig($matches[1][$key]);
-				} elseif (isConfigEntrySet('default_' . strtoupper($matches[1][$key]))) {
-					// Use default value
-					$GLOBALS['compile_config'][$matches[1][$key]] = getConfig('DEFAULT_' . strtoupper($matches[1][$key]));
-				} elseif (isMessageIdValid('DEFAULT_' . strtoupper($matches[1][$key]))) {
-					// No config, try the language system
-					$GLOBALS['compile_config'][$matches[1][$key]] = getMessage('DEFAULT_' . strtoupper($matches[1][$key]));
-				} else {
-					// Unhandled!
-					$GLOBALS['compile_config'][$matches[1][$key]] = '!' . $matches[1][$key] . '!';
-				}
-			} // END - if
+				// Use this for replacing
+				$code = str_replace($match, $GLOBALS['compile_config'][$matches[1][$key]], $code);
+				//* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die('<pre>'.htmlentities($code).'</pre>');
+			} // END - foreach
+		} // END - if
 
-			// Use this for replacing
-			$code = str_replace($match, $GLOBALS['compile_config'][$matches[1][$key]], $code);
-			//* DEBUG: */ if (($match == '{?URL?}') && (strlen($code) > 10000)) die('<pre>'.htmlentities($code).'</pre>');
-		} // END - foreach
+		// Add it to cache
+		$GLOBALS['compiled_config'][$uncompiled] = $code;
+	} // END - if
+
+	// Should we compile it?
+	if ($compiled === true) {
+		// Run the code
+		eval("\$GLOBALS['compiled_config'][\$uncompiled] = \"" . $GLOBALS['compiled_config'][$uncompiled] . "\";");
 	} // END - if
 
 	// Return compiled code
-	return $code;
+	return $GLOBALS['compiled_config'][$uncompiled];
 }
 
 // Filter for compiling extension data
@@ -494,7 +495,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()) || (!isExtensionInstalledAndOlder('sql_patches', '0.4.5'))) && (getOutputMode() == 0)) {
+	if (((!isResetModeEnabled()) || (!isExtensionInstalled('sql_patches'))) && (getOutputMode() == 0)) {
 		// Then abort here
 		logDebugMessage(__FUNCTION__, __LINE__, 'Cannot run reset! Please report this bug. Thanks');
 	} // END - if
@@ -503,7 +504,7 @@ function FILTER_RUN_RESET_INCLUDES () {
 	setIncludePool('reset', getArrayFromDirectory('inc/reset/', 'reset_'));
 
 	// Update database
-	if ((!isConfigEntrySet('DEBUG_RESET')) || (getConfig('DEBUG_RESET') != 'Y')) updateConfiguration('last_update', time());
+	if ((!isConfigEntrySet('DEBUG_RESET')) || (getConfig('DEBUG_RESET') != 'Y')) updateConfiguration('last_update', 'UNIX_TIMESTAMP()');
 
 	// Is the config entry set?
 	if (isExtensionInstalledAndNewer('sql_patches', '0.4.2')) {
@@ -716,7 +717,7 @@ function FILTER_INIT_RANDOM_NUMBER () {
 	// Is the extension sql_patches installed and at least 0.3.6?
 	if ((isExtensionInstalledAndNewer('sql_patches', '0.3.6')) && (isExtensionInstalledAndNewer('other', '0.2.5'))) {
 		// Generate random number
-		setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), ''));
+		setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getMemberId(), ''));
 	} else {
 		// Generate weak (!!!) code
 		setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -843,5 +844,17 @@ function FILTER_DISPLAY_PARSING_TIME () {
 	} // END - if
 }
 
+// Filter for flushing template cache
+function FILTER_FLUSH_TEMPLATE_CACHE () {
+	// Do we have cached eval() data?
+	if ((isset($GLOBALS['template_eval'])) && (count($GLOBALS['template_eval']) > 0)) {
+		// Now flush all
+		foreach ($GLOBALS['template_eval'] as $template=>$eval) {
+			// Flush the cache (if not yet found)
+			flushTemplateCache($template, $eval);
+		} // END - if
+	} // END - if
+}
+
 // [EOF]
 ?>