X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=3f7f91ed1166c5cfc01c3e6908454695abe62dcd;hb=922091a1d2878a65f702ab1a858d3425dd1ca594;hp=20169be5dd324ab3e6199474f65343fd935370df;hpb=e5dffd4249c97200cbad02f3f4eaf5c373fdb89a;p=mailer.git diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 20169be5dd..3f7f91ed11 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -10,13 +10,8 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Wrapper-Funktionen * * -------------------------------------------------------------------- * - * $Revision:: $ * - * $Date:: $ * - * $Tag:: 0.2.1-FINAL $ * - * $Author:: $ * - * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2013 by Mailer Developer Team * + * Copyright (c) 2009 - 2016 by Mailer Developer Team * * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -66,7 +61,7 @@ function writeToFile ($FQFN, $content, $aquireLock = FALSE) { // Is the file writeable? if ((isFileReadable($FQFN)) && (!is_writeable($FQFN)) && (!changeMode($FQFN, 0644))) { // Not writeable! - logDebugMessage(__FUNCTION__, __LINE__, sprintf("File %s not writeable or cannot change CHMOD to 0644.", basename($FQFN))); + logDebugMessage(__FUNCTION__, __LINE__, sprintf('File %s not writeable or cannot change CHMOD to 0644.', basename($FQFN))); // Failed! :( return FALSE; @@ -157,10 +152,10 @@ function merge_array ($array1, $array2, $keepIndex = FALSE) { reportBug(__FUNCTION__, __LINE__, 'No arrays provided!'); } elseif (!is_array($array1)) { // Left one is not an array - reportBug(__FUNCTION__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1))); + reportBug(__FUNCTION__, __LINE__, sprintf('array1 is not an array. array != %s', gettype($array1))); } elseif (!is_array($array2)) { // Right one is not an array - reportBug(__FUNCTION__, __LINE__, sprintf("array2 is not an array. array != %s", gettype($array2))); + reportBug(__FUNCTION__, __LINE__, sprintf('array2 is not an array. array != %s', gettype($array2))); } // Maintain index of array2? @@ -298,6 +293,24 @@ function detectServerName () { return (getenv('SERVER_NAME')); } +// Detects server protocol (http/s) +function detectServerProtocol () { + // Is cache there? + if (!isset($GLOBALS[__FUNCTION__])) { + // Default is HTTP + $GLOBALS[__FUNCTION__] = 'http'; + + // Are some specific fields set? + if (((isset($_SERVER['HTTPS'])) && (strtolower($_SERVER['HTTPS']) == 'on')) || ((isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) && (strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https'))) { + // Switch to HTTPS + $GLOBALS[__FUNCTION__] = 'https'; + } // END - if + } // END - if + + // Return cached value + return $GLOBALS[__FUNCTION__]; +} + // Removes any existing www. from SERVER_NAME. This is very silly but enough // for our purpose here. function detectDomainName () { @@ -527,7 +540,7 @@ function isDebugBuildMailsEnabled () { } // Checks whether the cache instance is valid -function isCacheInstanceValid () { +function isValidCacheInstance () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it @@ -829,7 +842,7 @@ function isBlockModeEnabled () { // Abort if not set if (!isset($GLOBALS['__block_mode'])) { // Needs to be fixed - reportBug(__FUNCTION__, __LINE__, 'Block_mode is not set.'); + reportBug(__FUNCTION__, __LINE__, '__block_mode is not set.'); } // END - if // Return it @@ -1004,6 +1017,9 @@ function setAdminMd5 ($adminMd5) { // Set session $status = setSession('admin_md5', $adminMd5); + // Remove cache to get correct results + unset($GLOBALS['isAdmin']); + // Return status return $status; } @@ -1085,7 +1101,7 @@ function getUserDataArray () { // Checks if the user data is valid, this may indicate that the user has logged // in, but you should use isMember() if you want to find that out. -function isUserDataValid () { +function isValidUserData () { // User id should not be zero so abort here if (!isCurrentUserIdSet()) { // Debug message, may be noisy @@ -1175,7 +1191,7 @@ function isDebugTemplateCacheEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = (getConfig('DEBUG_TEMPLATE_CACHE') == 'Y'); + $GLOBALS[__FUNCTION__] = ((isConfigEntrySet('DEBUG_TEMPLATE_CACHE')) && (getConfig('DEBUG_TEMPLATE_CACHE') == 'Y')); } // END - if // Return cache @@ -1261,6 +1277,8 @@ function getHttpStatus () { * @access private */ function sendRawRedirect ($url) { + //* DEBUG-DIE */ die(__METHOD__ . ':url=' . $url); + // Clear output buffer clearOutputBuffer(); @@ -1278,6 +1296,7 @@ function sendRawRedirect ($url) { // Revert entity & $url = str_replace('&', '&', $url); + //* DEBUG-DIE */ die(__METHOD__ . ':url=' . $url); // check if running on IIS < 6 with CGI-PHP if ((isset($_SERVER['SERVER_SOFTWARE'])) && (isset($_SERVER['GATEWAY_INTERFACE'])) && @@ -1421,30 +1440,6 @@ function encodeEntities ($str) { return $str; } -// "Getter" for date from patch_ctime -function getDateFromRepository () { - // Is it cached? - if (!isset($GLOBALS[__FUNCTION__])) { - // Then set it - $GLOBALS[__FUNCTION__] = generateDateTime(getConfig('CURRENT_REPOSITORY_DATE'), '5'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - -// "Getter" for date/time from patch_ctime -function getDateTimeFromRepository () { - // Is it cached? - if (!isset($GLOBALS[__FUNCTION__])) { - // Then set it - $GLOBALS[__FUNCTION__] = generateDateTime(getConfig('CURRENT_REPOSITORY_DATE'), '2'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - // Getter for current year (default) function getYear ($timestamp = NULL) { // Is it cached? @@ -1594,7 +1589,7 @@ function isTitleDecorationEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Just check it - $GLOBALS[__FUNCTION__] = (getConfig('enable_title_deco') == 'Y'); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.1.6')) && (isConfigEntrySet('enable_title_deco')) && (getConfig('enable_title_deco') == 'Y')); } // END - if // Return cache @@ -1654,7 +1649,7 @@ function isDisplayDebugSqlEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('other', '0.2.2')) && (getDisplayDebugSqls() == 'Y')); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('other', '0.2.2')) && (isConfigEntrySet('display_debug_sql')) && (getDisplayDebugSqls() == 'Y')); } // END - if // Return cache @@ -1666,7 +1661,7 @@ function isModuleTitleEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = (getConfig('enable_mod_title') == 'Y'); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.1.6')) && (isConfigEntrySet('enable_mod_title')) && (getConfig('enable_mod_title') == 'Y')); } // END - if // Return cache @@ -1678,7 +1673,7 @@ function isWhatTitleEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = (getConfig('enable_what_title') == 'Y'); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.1.6')) && (isConfigEntrySet('enable_what_title')) && (getConfig('enable_what_title') == 'Y')); } // END - if // Return cache @@ -1714,7 +1709,7 @@ function isAdminNotificationEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('other', '0.3.0')) && (getAdminNotify() == 'Y')); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('other', '0.3.0')) && (isConfigEntrySet('admin_notify')) && (getAdminNotify() == 'Y')); } // END - if // Return cache @@ -1726,7 +1721,7 @@ function isRandomReferralIdEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getSelectUserZeroRefid() == 'Y')); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('user', '0.3.4')) && (isConfigEntrySet('select_user_zero_refid')) && (getSelectUserZeroRefid() == 'Y')); } // END - if // Return cache @@ -1793,6 +1788,18 @@ function getCachePath () { return $GLOBALS[__FUNCTION__]; } +// "Getter" for cache_extension +function getCacheExtension () { + // Is there cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Determine it + $GLOBALS[__FUNCTION__] = getConfig('CACHE_EXTENSION'); + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + // "Getter" for WRITE_FOOTER function getWriteFooter () { // Is there cache? @@ -1901,6 +1908,18 @@ function getTableType () { return $GLOBALS[__FUNCTION__]; } +// "Getter" for db_type +function getDbType () { + // Is there cache? + if (!isset($GLOBALS[__FUNCTION__])) { + // Determine it + $GLOBALS[__FUNCTION__] = getConfig('_DB_TYPE'); + } // END - if + + // Return cache + return $GLOBALS[__FUNCTION__]; +} + // "Getter" for salt_length function getSaltLength () { // Is there cache? @@ -1949,18 +1968,6 @@ function getTitle () { return $GLOBALS[__FUNCTION__]; } -// "Getter" for curr_svn_revision -function getCurrentRepositoryRevision () { - // Is there cache? - if (!isset($GLOBALS[__FUNCTION__])) { - // Determine it - $GLOBALS[__FUNCTION__] = getConfig('CURRENT_REPOSITORY_REVISION'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - // "Getter" for server_url function getServerUrl () { // Is there cache? @@ -2601,7 +2608,7 @@ function isDisplayHomeInIndexEnabled () { // Is the cache entry set? if (!isset($GLOBALS[__FUNCTION__])) { // No, so determine it - $GLOBALS[__FUNCTION__] = (getDisplayHomeInIndex() == 'Y'); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.8.3')) && (isConfigEntrySet('display_home_in_index')) && (getDisplayHomeInIndex() == 'Y')); } // END - if // Return cached entry @@ -2625,7 +2632,7 @@ function isShowPointsUnconfirmedEnabled () { // Is the cache entry set? if (!isset($GLOBALS[__FUNCTION__])) { // No, so determine it - $GLOBALS[__FUNCTION__] = (getShowPointsUnconfirmed() == 'Y'); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.5.5')) && (isConfigEntrySet('show_points_unconfirmed')) && (getShowPointsUnconfirmed() == 'Y')); } // END - if // Return cached entry @@ -2649,7 +2656,7 @@ function isYoureHereEnabled () { // Is the cache entry set? if (!isset($GLOBALS[__FUNCTION__])) { // No, so determine it - $GLOBALS[__FUNCTION__] = (getYoureHere() == 'Y'); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (isConfigEntrySet('youre_here')) && (getYoureHere() == 'Y')); } // END - if // Return cached entry @@ -2673,7 +2680,7 @@ function isShowTimingsEnabled () { // Is the cache entry set? if (!isset($GLOBALS[__FUNCTION__])) { // No, so determine it - $GLOBALS[__FUNCTION__] = (getShowTimings() == 'Y'); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.4.1')) && (isConfigEntrySet('show_timings')) && (getShowTimings() == 'Y')); } // END - if // Return cached entry @@ -2910,7 +2917,7 @@ function isDirectPaymentEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = (getConfig('allow_direct_pay') == 'Y'); + $GLOBALS[__FUNCTION__] = ((isConfigEntrySet('allow_direct_pay')) && (getConfig('allow_direct_pay') == 'Y')); } // END - if // Return cache @@ -2922,7 +2929,7 @@ function isAdminMenuJavascriptEnabled () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.8.7')) && (getAdminMenuJavaScript() == 'Y')); + $GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('sql_patches', '0.8.7')) && (isConfigEntrySet('admin_menu_javascript')) && (getAdminMenuJavaScript() == 'Y')); } // END - if // Return cache @@ -3502,7 +3509,7 @@ function shift_array (&$array, $value, $key = '0') { // Wrapper for str_pad() with left padding zeros function padLeftZero ($str, $amount = 2) { // Is str_pad() there? - if (function_exists('str_pad')) { + if (!function_exists('str_pad')) { // Use prependZeros() return prependZeros($str, $amount); } else { @@ -3541,7 +3548,7 @@ function isFilledArray ($array) { // Checks whether this script runs on a developer system (called with localhost/127.0.0.1 SERVER_NAME) function isDeveloperSystem () { // Determine it - return in_array(detectServerName(), array('localhost', '127.0.0.1')); + return in_array(detectServerName(), array('localhost', 'daedalus', '127.0.0.1')); } // Checks whether given subject line has '_ref' suffix @@ -3556,5 +3563,48 @@ function ifSubjectHasReferralSuffix ($subject) { return $GLOBALS[__FUNCTION__][$subject]; } +// Converts an API response to an associative array +function convertApiResponseToArray ($responseString, $keyDelimiter, $valueDelimiter) { + // Explode for key delimiter + $keys = explode($keyDelimiter, $responseString); + + // Init returned array and "walk" through all entries + $returned = array(); + foreach ($keys as $keyValue) { + // Explode it + $parts = explode($valueDelimiter, $keyValue); + + // Count must be 2 + assert(count($parts) == 2); + + // Then add both: 0=key, 1=value + $returned[sqlEscapeString($parts[0])] = sqlEscapeString($parts[1]); + } // END - if + + // Return finished array + return $returned; +} + +// Getter for full (generic) hash file name +function getGenericHashFileName () { + // Return result + return sprintf('%s%s.%s%s', getPath(), getCachePath(), getFileHash(), getCacheExtension()); +} + +// "Compiles" the given value and sets it in given key +function setSessionCompiled ($key, $value) { + // Debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key[]=' . gettype($key) . ',value[]=' . gettype($value)); + + // Is the value not an array? + if (!is_array($value)) { + // "Compile" the value + $value = doFinalCompilation(compileRawCode($value)); + } // END - if + + // And set it + return setSession($key, $value); +} + // [EOF] ?>