X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=c56adab059809f21e5346f07a19d2ac1a4a25a76;hb=40a3f53ad48b0205d39498ab28d526b4fd30a0ec;hp=38a6eb12d2288b27863acdfe0948e317ce16fae9;hpb=215d0d0d066ee2924ec8fa4b8efe6bf93358ad6f;p=mailer.git diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 38a6eb12d2..c56adab059 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]; @@ -262,6 +268,12 @@ 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 @@ -329,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 @@ -385,6 +402,7 @@ function copyFileVerified ($source, $dest, $chmod = '') { // 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); } @@ -396,10 +414,12 @@ function flushHeaders () { debug_report_bug('Headers already sent!'); } // END - if - // Flush all headers - foreach ($GLOBALS['header'] as $header) { - header($header); - } // END - foreach + // 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(); @@ -721,6 +741,28 @@ function getPhpCaching () { // Checks wether the admin hash is set function isAdminHashSet ($admin) { + /** + * @TODO Do we really need this check? If yes, try to fix this: + * 1.:functions.php:2504, debug_get_mailable_backtrace(0) + * 2.:wrapper-functions.php:744, debug_report_bug(1) + * 3.:mysql-manager.php:728, isAdminHashSet(1) + * 4.:filters.php:384, isAdmin(0) + * 5.:debug_get_mailable_backtrace:2457, FILTER_DETERMINE_USERNAME(1) + * 6.:filter-functions.php:280, call_user_func_array(2) + * 7.:load_cache.php:74, runFilterChain(1) + * 8.:inc-functions.php:131, include(1) + * 9.:inc-functions.php:145, loadInclude(1) + * 10.:mysql-connect.php:104, loadIncludeOnce(1) + * 11.:inc-functions.php:131, include(1) + * 12.:inc-functions.php:145, loadInclude(1) + * 13.:config-global.php:106, loadIncludeOnce(1) + * 14.:js.php:57, require(1) + */ + if (!isset($GLOBALS['cache_array']['admin'])) { + debug_report_bug('Cache not set.'); + } // END - if + + // Check for admin hash return isset($GLOBALS['cache_array']['admin']['password'][$admin]); } @@ -749,11 +791,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 @@ -808,5 +859,16 @@ function getFetchedUserData ($keyColumn, $userId, $valueColumn) { 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] ?>