X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=e989dd9a79aa392fe0d4847acf4dc69debbc1831;hb=72ac9f672704438aabc4f4bada7f5c3b40499f1a;hp=64ac4a9660af8fd81e9d710b354aabeb447ae24e;hpb=735545e765720a954a345bc068239e2fffa0dbe1;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 64ac4a9660..e989dd9a79 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/04/2009 *
- * ===============                              Last change: 04/04/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 04/04/2009 *
+ * ===================                          Last change: 04/04/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : wrapper-functions.php                            *
@@ -42,31 +42,27 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Read a given file
-function readFromFile ($FQFN, $sqlPrepare = false) {
+function readFromFile ($FQFN) {
 	// Sanity-check if file is there (should be there, but just to make it sure)
 	if (!isFileReadable($FQFN)) {
 		// This should not happen
 		debug_report_bug(__FUNCTION__.': File ' . basename($FQFN) . ' is not readable!');
 	} // END - if
 
-	// Load the file
-	if (function_exists('file_get_contents')) {
-		// Use new function
-		$content = file_get_contents($FQFN);
-	} else {
-		// Fall-back to implode-file chain
-		$content = implode('', file($FQFN));
-	}
-
-	// Prepare SQL queries?
-	if ($sqlPrepare === true) {
-		// Remove some unwanted chars
-		$content = str_replace("\r", '', $content);
-		$content = str_replace("\n\n", "\n", $content);
+	// Is it cached?
+	if (!isset($GLOBALS['file_content'][$FQFN])) {
+		// Load the file
+		if (function_exists('file_get_contents')) {
+			// Use new function
+			$GLOBALS['file_content'][$FQFN] = file_get_contents($FQFN);
+		} else {
+			// Fall-back to implode-file chain
+			$GLOBALS['file_content'][$FQFN] = implode('', file($FQFN));
+		}
 	} // END - if
 
 	// Return the content
-	return $content;
+	return $GLOBALS['file_content'][$FQFN];
 }
 
 // Writes content to a file
@@ -110,6 +106,9 @@ function writeToFile ($FQFN, $content, $aquireLock = false) {
 	// Mark it as readable
 	$GLOBALS['file_readable'][$FQFN] = true;
 
+	// Remember content in cache
+	$GLOBALS['file_content'][$FQFN] = $content;
+
 	// Return status
 	return changeMode($FQFN, 0644);
 }
@@ -138,9 +137,9 @@ function decodeString ($str, $decompress = true) {
 }
 
 // Decode entities in a nicer way
-function decodeEntities ($str) {
+function decodeEntities ($str, $quote = ENT_NOQUOTES) {
 	// Decode the entities to UTF-8 now
-	$decodedString = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8');
+	$decodedString = html_entity_decode($str, $quote, 'UTF-8');
 
 	// Return decoded string
 	return $decodedString;
@@ -170,7 +169,13 @@ function isFileReadable ($FQFN) {
 	if (!isset($GLOBALS['file_readable'][$FQFN])) {
 		// Check all...
 		$GLOBALS['file_readable'][$FQFN] = ((file_exists($FQFN)) && (is_file($FQFN)) && (is_readable($FQFN)));
-	} // END - if
+
+		// Debug message
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'file=' . basename($FQFN) . ' - CHECK! (' . intval($GLOBALS['file_readable'][$FQFN]) . ')');
+	} else {
+		// Cache used
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'file=' . basename($FQFN) . ' - CACHE! (' . intval($GLOBALS['file_readable'][$FQFN]) . ')');
+	}
 
 	// Return result
 	return $GLOBALS['file_readable'][$FQFN];
@@ -222,12 +227,12 @@ function detectRemoteHostname () {
 }
 
 // "Getter" for user agent
-function detectUserAgent () {
+function detectUserAgent ($alwaysReal = false) {
 	// Get remote ip from environment
 	$userAgent = getenv('HTTP_USER_AGENT');
 
 	// Is removeip installed?
-	if (isExtensionActive('removeip')) {
+	if ((isExtensionActive('removeip')) && ($alwaysReal === false)) {
 		// Then anonymize it
 		$userAgent = getAnonymousUserAgent($userAgent);
 	} // END - if
@@ -251,12 +256,29 @@ function detectReferer () {
 	return $referer;
 }
 
+// "Getter" for request URI
+function detectRequestUri () {
+	// Return it
+	return (getenv('REQUEST_URI'));
+}
+
+// "Getter" for query string
+function detectQueryString () {
+	return str_replace('&', '&amp;', (getenv('QUERY_STRING')));
+}
+
+// "Getter" for SERVER_NAME
+function detectServerName () {
+	// Return it
+	return (getenv('SERVER_NAME'));
+}
+
 // Check wether we are installing
 function isInstalling () {
 	// Determine wether we are installing
 	if (!isset($GLOBALS['mxchange_installing'])) {
 		// Check URL (css.php/js.php need this)
-		$GLOBALS['mxchange_installing'] = isGetRequestElementSet('installing');
+		$GLOBALS['mxchange_installing'] = isGetRequestParameterSet('installing');
 	} // END - if
 
 	// Return result
@@ -373,14 +395,27 @@ function copyFileVerified ($source, $dest, $chmod = '') {
 // Wrapper function for header()
 // Send a header but checks before if we can do so
 function sendHeader ($header) {
+	// Send the header
+	$GLOBALS['header'][] = trim($header);
+}
+
+// Flushes all headers
+function flushHeaders () {
 	// Is the header already sent?
 	if (headers_sent()) {
 		// Then abort here
 		debug_report_bug('Headers already sent!');
 	} // END - if
 
-	// Send the header
-	header(trim($header));
+	// Flush all headers if found
+	if ((isset($GLOBALS['header'])) && (is_array($GLOBALS['header']))) {
+		foreach ($GLOBALS['header'] as $header) {
+			header($header);
+		} // END - foreach
+	} // END - if
+
+	// Mark them as flushed
+	$GLOBALS['header'] = array();
 }
 
 // Wrapper function for chmod()
@@ -415,9 +450,9 @@ function removeFile ($FQFN) {
 // Wrapper for $_POST['sel']
 function countPostSelection ($element = 'sel') {
 	// Is it set?
-	if (isPostRequestElementSet($element)) {
+	if (isPostRequestParameterSet($element)) {
 		// Return counted elements
-		return countSelection(postRequestElement($element));
+		return countSelection(postRequestParameter($element));
 	} else {
 		// Return zero if not found
 		return 0;
@@ -440,7 +475,7 @@ function isNicknameUsed ($userid) {
 		$isUsed = $GLOBALS['is_nickname_used'][$userid];
 	} else {
 		// Determine it
-		$isUsed = ((isExtensionActive('nickname')) && (('' . round($userid) . '') != $userid));
+		$isUsed = (('' . round($userid) . '') != $userid);
 
 		// And write it to the cache
 		$GLOBALS['is_nickname_used'][$userid] = $isUsed;
@@ -482,7 +517,7 @@ function setWhatFromConfig ($configEntry) {
 // Checks wether what is set and optionally aborts on miss
 function isWhatSet ($strict =  false) {
 	// Check for it
-	$isset = (isset($GLOBALS['what']));
+	$isset = isset($GLOBALS['what']);
 
 	// Should we abort here?
 	if (($strict === true) && ($isset === false)) {
@@ -517,7 +552,7 @@ function setAction ($newAction) {
 // Checks wether action is set and optionally aborts on miss
 function isActionSet ($strict =  false) {
 	// Check for it
-	$isset = (isset($GLOBALS['action']));
+	$isset = ((isset($GLOBALS['action'])) && (!empty($GLOBALS['action'])));
 
 	// Should we abort here?
 	if (($strict === true) && ($isset === false)) {
@@ -558,14 +593,11 @@ function isModuleSet ($strict =  false) {
 	// Should we abort here?
 	if (($strict === true) && ($isset === false)) {
 		// Output backtrace
-		print 'Module not set!<pre>';
-		debug_print_backtrace();
-		die('</pre');
 		debug_report_bug('module is empty.');
 	} // END - if
 
 	// Return it
-	return $isset;
+	return (($isset === true) && ($GLOBALS['module'] != 'unknown')) ;
 }
 
 // Getter for 'output_mode' value
@@ -656,7 +688,17 @@ function setUsername ($userName) {
 
 // Get username
 function getUsername () {
-	return $GLOBALS['username'];
+	// default is guest
+	$username = getMessage('USERNAME_GUEST');
+
+	// User name set?
+	if (isset($GLOBALS['username'])) {
+		// Use the set name
+		$username = $GLOBALS['username'];
+	} // END - if
+
+	// Return it
+	return $username;
 }
 
 // Wrapper function for installation phase
@@ -692,6 +734,7 @@ function getPhpCaching () {
 
 // Checks wether the admin hash is set
 function isAdminHashSet ($admin) {
+	if (!isset($GLOBALS['cache_array']['admin'])) debug_report_bug('Cache not set.');
 	return isset($GLOBALS['cache_array']['admin']['password'][$admin]);
 }
 
@@ -759,5 +802,25 @@ function isCurrentUserIdSet () {
 	return isset($GLOBALS['current_userid']);
 }
 
+// Checks wether we are debugging template cache
+function isDebuggingTemplateCache () {
+	return (getConfig('DEBUG_TEMPLATE_CACHE') == 'Y');
+}
+
+// Wrapper for fetchUserData() and getUserData() calls
+function getFetchedUserData ($keyColumn, $userId, $valueColumn) {
+	// Default is 'guest'
+	$data = getMessage('USERNAME_GUEST');
+
+	// Can we fetch the user data?
+	if (($userId > 0) && (fetchUserData($userId, $keyColumn))) {
+		// Now get the data back
+		$data = getUserData($valueColumn);
+	} // END - if
+
+	// Return it
+	return $data;
+}
+
 // [EOF]
 ?>