X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=43b1b306c4959d7982beb780ddac64ca98fc3cc9;hb=9f7884e487d89c5d311531d1da67f1806b48ec27;hp=7e2856402937a850599a48ed7f7f3b9287be0fce;hpb=b8a6f8012aa3509d8e0f8fd078e044f20e80707a;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 7e28564029..43b1b306c4 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,31 +43,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 +107,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);
 }
@@ -170,7 +170,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];
@@ -251,12 +257,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('&', '&', (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
@@ -318,6 +341,11 @@ function isDebugModeEnabled () {
 	return ((isConfigEntrySet('DEBUG_MODE')) && (getConfig('DEBUG_MODE') == 'Y'));
 }
 
+// Checks wether SQL debugging is enabled
+function isSqlDebuggingEnabled () {
+	return ((isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y'));
+}
+
 // Checks wether we shall debug regular expressions
 function isDebugRegExpressionEnabled () {
 	// Simply check it
@@ -373,14 +401,28 @@ 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
+	//* DEBUG: */ logDebugMessage(__FUNCTION__ . ': header=' . $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 +457,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;
@@ -482,7 +524,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 +559,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)) {
@@ -653,7 +695,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
@@ -689,6 +741,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]);
 }
 
@@ -717,11 +770,20 @@ function getUserData ($column) {
 
 // Geter for whole user data array
 function getUserDataArray () {
+	// Get user id
+	$uid = getCurrentUserId();
+
 	// User id should not be zero
-	if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
+	if ($uid < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
 
-	// Get the whole array
-	return $GLOBALS['user_data'][getCurrentUserId()];
+	// Get the whole array if found
+	if (isset($GLOBALS['user_data'][$uid])) {
+		// Found, so return it
+		return $GLOBALS['user_data'][$uid];
+	} else {
+		// Return empty array
+		return array();
+	}
 }
 
 // Checks if the user data is valid, this may indicate that the user has logged
@@ -761,5 +823,31 @@ 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;
+}
+
+// Wrapper for strpos() to ease porting from deprecated ereg() function
+function isInString ($needle, $haystack) {
+	return (strpos($haystack, $needle) !== false);
+}
+
+// Wrapper for strpos() to ease porting from deprecated eregi() function
+// This function is case-insensitive
+function isInStringIgnoreCase ($needle, $haystack) {
+	return (isInString(strtolower($haystack), strtolower($needle)));
+}
+
 // [EOF]
 ?>