X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=6e8cb2e97b73f771c1c6fe6ef535a81d11b53984;hb=e2074329ede4aecf833db84c4faa594b97cd4ec5;hp=e23913c49b24c6ad72b7ca8b22340996cefeeb1f;hpb=eedaa98921b57874a77ac7fd804158310a86273e;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index e23913c49b..6e8cb2e97b 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -368,8 +368,14 @@ function isSqlDebuggingEnabled () {
 
 // Checks wether we shall debug regular expressions
 function isDebugRegularExpressionEnabled () {
-	// Simply check it
-	return ((isConfigEntrySet('DEBUG_REGEX')) && (getConfig('DEBUG_REGEX') == 'Y'));
+	// Is cache set?
+	if (!isset($GLOBALS['is_regular_exp_debug_enabled'])) {
+		// Simply check it
+		$GLOBALS['is_regular_exp_debug_enabled'] = ((isConfigEntrySet('DEBUG_REGEX')) && (getConfig('DEBUG_REGEX') == 'Y'));
+	} // END - if
+
+	// Return it
+	return $GLOBALS['is_regular_exp_debug_enabled'];
 }
 
 // Checks wether the cache instance is valid
@@ -557,12 +563,12 @@ function isWhatSet ($strict =  false) {
 }
 
 // Getter for 'action' value
-function getAction () {
+function getAction ($strict = true) {
 	// Default is null
 	$action = null;
 
 	// Is the value set?
-	if (isActionSet(true)) {
+	if (isActionSet(($strict) && (getOutputMode() == 0))) {
 		// Then use it
 		$action = $GLOBALS['action'];
 	} // END - if
@@ -707,16 +713,32 @@ function redirectToDereferedUrl ($URL) {
 
 // Wrapper function for checking if extension is installed and newer or same version
 function isExtensionInstalledAndNewer ($ext_name, $version) {
+	// Is an cache entry found?
+	if (!isset($GLOBALS['ext_installed_newer'][$ext_name][$version])) {
+		$GLOBALS['ext_installed_newer'][$ext_name][$version] = ((isExtensionInstalled($ext_name)) && (getExtensionVersion($ext_name) >= $version));
+	} else {
+		// Cache hits should be incremented twice
+		incrementStatsEntry('cache_hits', 2);
+	}
+
 	// Return it
-	//* DEBUG: */ print __FUNCTION__.':'.$ext_name.'=&gt;'.$version.'<br />';
-	return ((isExtensionInstalled($ext_name)) && (getExtensionVersion($ext_name) >= $version));
+	//* DEBUG: */ print __FUNCTION__.':'.$ext_name.'=&gt;'.$version.':'.intval($GLOBALS['ext_installed_newer'][$ext_name][$version]).'<br />';
+	return $GLOBALS['ext_installed_newer'][$ext_name][$version];
 }
 
 // Wrapper function for checking if extension is installed and older than given version
 function isExtensionInstalledAndOlder ($ext_name, $version) {
+	// Is an cache entry found?
+	if (!isset($GLOBALS['ext_installed_older'][$ext_name][$version])) {
+		$GLOBALS['ext_installed_older'][$ext_name][$version] = ((isExtensionInstalled($ext_name)) && (isExtensionOlder($ext_name, $version)));
+	} else {
+		// Cache hits should be incremented twice
+		incrementStatsEntry('cache_hits', 2);
+	}
+
 	// Return it
-	//* DEBUG: */ print __FUNCTION__.':'.$ext_name.'&lt;'.$version.'<br />';
-	return ((isExtensionInstalled($ext_name)) && (isExtensionOlder($ext_name, $version)));
+	//* DEBUG: */ print __FUNCTION__.':'.$ext_name.'&lt;'.$version.':'.intval($GLOBALS['ext_installed_older'][$ext_name][$version]).'<br />';
+	return $GLOBALS['ext_installed_older'][$ext_name][$version];
 }
 
 // Set username
@@ -750,7 +772,14 @@ function isInstallationPhase () {
 
 // Checks wether the extension demo is actuve and the admin login is demo (password needs to be demo, too!)
 function isDemoModeActive () {
-	return ((isExtensionActive('demo')) && (getSession('admin_login') == 'demo'));
+	// Is cache set?
+	if (!isset($GLOBALS['demo_mode_active'])) {
+		// Simply check it
+		$GLOBALS['demo_mode_active'] = ((isExtensionActive('demo')) && (getSession('admin_login') == 'demo'));
+	} // END - if
+
+	// Return it
+	return $GLOBALS['demo_mode_active'];
 }
 
 // Getter for PHP caching value
@@ -874,14 +903,14 @@ function isDebuggingTemplateCache () {
 }
 
 // Wrapper for fetchUserData() and getUserData() calls
-function getFetchedUserData ($keyColumn, $userId, $valueColumn) {
+function getFetchedUserData ($keyColumn, $userid, $valueColumn) {
 	// Is it cached?
 	if (!isset($GLOBALS['user_data_cache'][$userid][$keyColumn][$valueColumn])) {
 		// Default is 'guest'
 		$data = getMessage('USERNAME_GUEST');
 
 		// Can we fetch the user data?
-		if (($userId > 0) && (fetchUserData($userId, $keyColumn))) {
+		if (($userid > 0) && (fetchUserData($userid, $keyColumn))) {
 			// Now get the data back
 			$data = getUserData($valueColumn);
 		} // END - if
@@ -912,5 +941,10 @@ function ifFatalErrorsDetected () {
 	return (getTotalFatalErrors() > 0);
 }
 
+// Wrapper until we merged to the EL branch
+function preCompileCode ($code, $template = '', $compiled = false, $full = true, $overwrite = false) {
+	return compileCode($code, false, true, $full);
+}
+
 // [EOF]
 ?>