X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=2e401e4bc565234818cddc67e5d3b3b11d43f8e7;hb=6a675521bf2bf11b0cd521a9c602085f7bec5283;hp=ce8ad1099950f6b4eed1ddf32f921f1c9eac0dce;hpb=6a5589c1a7793b19dbce958053d6fea41eaee533;p=mailer.git diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index ce8ad10999..2e401e4bc5 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -46,19 +46,19 @@ function readFromFile ($FQFN) { if (!isFileReadable($FQFN)) { // This should not happen reportBug(__FUNCTION__, __LINE__, 'File ' . basename($FQFN) . ' is not readable!'); - } elseif (!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 + // Load the file + if (function_exists('file_get_contents')) { + // Use new function + $fileContent = file_get_contents($FQFN); + } else { + // Fall-back to implode-file chain + $fileContent = implode('', file($FQFN)); + } + // Return the content - return $GLOBALS['file_content'][$FQFN]; + return $fileContent; } // Writes content to a file @@ -66,7 +66,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.", basename($FQFN))); + logDebugMessage(__FUNCTION__, __LINE__, sprintf("File %s not writeable or cannot change CHMOD to 0644.", basename($FQFN))); // Failed! :( return FALSE; @@ -74,7 +74,6 @@ function writeToFile ($FQFN, $content, $aquireLock = FALSE) { // By default all is failed... $GLOBALS['file_readable'][$FQFN] = FALSE; - unset($GLOBALS['file_content'][$FQFN]); $return = FALSE; // Is the function there? @@ -89,7 +88,8 @@ function writeToFile ($FQFN, $content, $aquireLock = FALSE) { } } else { // Write it with fopen - $fp = fopen($FQFN, 'w') or reportBug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($FQFN) . '!'); + $fp = fopen($FQFN, 'w') + or reportBug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($FQFN) . '!'); // Aquire a lock? if ($aquireLock === TRUE) { @@ -108,9 +108,6 @@ function writeToFile ($FQFN, $content, $aquireLock = FALSE) { if ($return !== FALSE) { // Mark it as readable $GLOBALS['file_readable'][$FQFN] = TRUE; - - // Remember content in cache - $GLOBALS['file_content'][$FQFN] = $content; } // END - if // Return status @@ -123,10 +120,7 @@ function clearOutputBuffer () { if (isset($GLOBALS[__FUNCTION__])) { // This function is called twice reportBug(__FUNCTION__, __LINE__, 'Double call of ' . __FUNCTION__ . ' may cause more trouble.'); - } // END - if - - // Trigger an error on failure - if ((ob_get_length() > 0) && (!ob_end_clean())) { + } elseif ((ob_get_length() > 0) && (!ob_end_clean())) { // Failed! reportBug(__FUNCTION__, __LINE__, 'Failed to clean output buffer.'); } // END - if @@ -349,9 +343,9 @@ function isInstalled () { // First is config ( ( - isConfigEntrySet('MXCHANGE_INSTALLED') + isConfigEntrySet('MAILER_INSTALLED') ) && ( - getConfig('MXCHANGE_INSTALLED') == 'Y' + getConfig('MAILER_INSTALLED') == 'Y' ) ) ) || ( @@ -449,6 +443,18 @@ function isDebugRegularExpressionEnabled () { return $GLOBALS[__FUNCTION__]; } +// Checks whether debugging of build mails is enabled +function isDebugBuildMailsEnabled () { + // Is cache set? + if (!isset($GLOBALS[__FUNCTION__])) { + // Simply check it + $GLOBALS[__FUNCTION__] = ((isConfigEntrySet('DEBUG_BUILD_MAILS')) && (getConfig('DEBUG_BUILD_MAILS') == 'Y')); + } // END - if + + // Return it + return $GLOBALS[__FUNCTION__]; +} + // Checks whether the cache instance is valid function isCacheInstanceValid () { // Is there cache? @@ -597,7 +603,7 @@ function setWhatFromConfig ($configEntry) { } // Checks whether what is set and optionally aborts on miss -function isWhatSet ($strict = false) { +function isWhatSet ($strict = FALSE) { // Check for it $isset = (isset($GLOBALS['__what']) && (!empty($GLOBALS['__what']))); @@ -632,7 +638,7 @@ function setAction ($newAction) { } // Checks whether action is set and optionally aborts on miss -function isActionSet ($strict = false) { +function isActionSet ($strict = FALSE) { // Check for it $isset = ((isset($GLOBALS['__action'])) && (!empty($GLOBALS['__action']))); @@ -668,7 +674,7 @@ function setModule ($newModule) { } // Checks whether module is set and optionally aborts on miss -function isModuleSet ($strict = false) { +function isModuleSet ($strict = FALSE) { // Check for it $isset = ((isset($GLOBALS['__module'])) && (!empty($GLOBALS['__module']))); @@ -701,13 +707,13 @@ function getScriptOutputMode () { } // Setter for 'output_mode' value -function setOutputMode ($newOutputMode) { +function setScriptOutputMode ($newOutputMode) { //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'output_mode=' . $newOutputMode); $GLOBALS['__output_mode'] = (int) $newOutputMode; } // Checks whether output_mode is set and optionally aborts on miss -function isOutputModeSet ($strict = false) { +function isOutputModeSet ($strict = FALSE) { // Check for it $isset = (isset($GLOBALS['__output_mode'])); @@ -762,35 +768,35 @@ function redirectToDereferedUrl ($url) { } // Wrapper function for checking if extension is installed and newer or same version -function isExtensionInstalledAndNewer ($ext_name, $version) { +function isExtensionInstalledAndNewer ($ext_name, $ext_ver) { // Is an cache entry found? - if (!isset($GLOBALS[__FUNCTION__][$ext_name][$version])) { + if (!isset($GLOBALS[__FUNCTION__][$ext_name][$ext_ver])) { // Determine it - $GLOBALS[__FUNCTION__][$ext_name][$version] = ((isExtensionInstalled($ext_name)) && (getExtensionVersion($ext_name) >= $version)); + $GLOBALS[__FUNCTION__][$ext_name][$ext_ver] = ((isExtensionInstalled($ext_name)) && (version_compare(getExtensionVersion($ext_name), $ext_ver, '>=') === TRUE)); } else { // Cache hits should be incremented twice incrementStatsEntry('cache_hits', 2); } // Return it - //* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $ext_name . '=>' . $version . ':' . intval($GLOBALS[__FUNCTION__][$ext_name][$version])); - return $GLOBALS[__FUNCTION__][$ext_name][$version]; + //* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $ext_name . '=>' . $ext_ver . ':' . intval($GLOBALS[__FUNCTION__][$ext_name][$ext_ver])); + return $GLOBALS[__FUNCTION__][$ext_name][$ext_ver]; } // Wrapper function for checking if extension is installed and older than given version -function isExtensionInstalledAndOlder ($ext_name, $version) { +function isExtensionInstalledAndOlder ($ext_name, $ext_ver) { // Is an cache entry found? - if (!isset($GLOBALS[__FUNCTION__][$ext_name][$version])) { + if (!isset($GLOBALS[__FUNCTION__][$ext_name][$ext_ver])) { // Determine it - $GLOBALS[__FUNCTION__][$ext_name][$version] = ((isExtensionInstalled($ext_name)) && (isExtensionOlder($ext_name, $version))); + $GLOBALS[__FUNCTION__][$ext_name][$ext_ver] = ((isExtensionInstalled($ext_name)) && (version_compare(getExtensionVersion($ext_name), $ext_ver, '<') === TRUE)); } else { // Cache hits should be incremented twice incrementStatsEntry('cache_hits', 2); } // Return it - //* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $ext_name . '<' . $version . ':' . intval($GLOBALS[__FUNCTION__][$ext_name][$version])); - return $GLOBALS[__FUNCTION__][$ext_name][$version]; + //* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $ext_name . '<' . $ext_ver . ':' . intval($GLOBALS[__FUNCTION__][$ext_name][$ext_ver])); + return $GLOBALS[__FUNCTION__][$ext_name][$ext_ver]; } // Set username @@ -1170,7 +1176,7 @@ function sendRawRedirect ($url) { $GLOBALS['__output'] = ''; // To make redirects working (no content type), output mode must be raw - setOutputMode(-1); + setScriptOutputMode(-1); // Send helping header setHttpStatus('302 Found'); @@ -1297,7 +1303,7 @@ function isValidUserId ($userid) { // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$userid])) { // Check it out - $GLOBALS[__FUNCTION__][$userid] = ((!is_null($userid)) && (!empty($userid)) && ($userid > 0)); + $GLOBALS[__FUNCTION__][$userid] = ((!is_null($userid)) && (!empty($userid)) && ($userid != 'NULL') && ($userid > 0)); } // END - if // Return cache @@ -1952,79 +1958,6 @@ function getUserMinConfirmed () { // Return cache return $GLOBALS[__FUNCTION__]; } - -// "Getter" for auto_purge -function getAutoPurge () { - // Is there cache? - if (!isset($GLOBALS[__FUNCTION__])) { - // Determine it - $GLOBALS[__FUNCTION__] = getConfig('auto_purge'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - -// "Getter" for bonus_userid -function getBonusUserid () { - // Is there cache? - if (!isset($GLOBALS[__FUNCTION__])) { - // Determine it - $GLOBALS[__FUNCTION__] = getConfig('bonus_userid'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - -// "Getter" for ap_inactive_time -function getApInactiveTime () { - // Is there cache? - if (!isset($GLOBALS[__FUNCTION__])) { - // Determine it - $GLOBALS[__FUNCTION__] = getConfig('ap_inactive_time'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - -// "Getter" for ap_dm_timeout -function getApDmTimeout () { - // Is there cache? - if (!isset($GLOBALS[__FUNCTION__])) { - // Determine it - $GLOBALS[__FUNCTION__] = getConfig('ap_dm_timeout'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - -// "Getter" for ap_tasks_time -function getApTasksTime () { - // Is there cache? - if (!isset($GLOBALS[__FUNCTION__])) { - // Determine it - $GLOBALS[__FUNCTION__] = getConfig('ap_tasks_time'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - -// "Getter" for ap_unconfirmed_time -function getApUnconfirmedTime () { - // Is there cache? - if (!isset($GLOBALS[__FUNCTION__])) { - // Determine it - $GLOBALS[__FUNCTION__] = getConfig('ap_unconfirmed_time'); - } // END - if - - // Return cache - return $GLOBALS[__FUNCTION__]; -} - // "Getter" for points function getPoints () { // Is there cache? @@ -2541,6 +2474,42 @@ function isDisplayHomeInIndexEnabled () { return $GLOBALS[__FUNCTION__]; } +// Getter for 'ap_server_name_since' +function getApServerNameSince () { + // Is the cache entry set? + if (!isset($GLOBALS[__FUNCTION__])) { + // No, so determine it + $GLOBALS[__FUNCTION__] = getConfig('ap_server_name_since'); + } // END - if + + // Return cached entry + return $GLOBALS[__FUNCTION__]; +} + +// Getter for 'ap_server_name' +function getApServerName () { + // Is the cache entry set? + if (!isset($GLOBALS[__FUNCTION__])) { + // No, so determine it + $GLOBALS[__FUNCTION__] = getConfig('ap_server_name'); + } // END - if + + // Return cached entry + return $GLOBALS[__FUNCTION__]; +} + +// Checks whether 'ap_server_name' is 'Y' +function isApServerNameEnabled () { + // Is the cache entry set? + if (!isset($GLOBALS[__FUNCTION__])) { + // No, so determine it + $GLOBALS[__FUNCTION__] = (getApServerName() == 'Y'); + } // END - if + + // Return cached entry + return $GLOBALS[__FUNCTION__]; +} + // Getter for 'admin_menu_javascript' function getAdminMenuJavascript () { // Is the cache entry set? @@ -2795,7 +2764,7 @@ function ifUserPointsLocked ($userid) { // This function does always add a new-line character to every line. function appendLineToFile ($file, $line) { $fp = fopen($file, 'a') or reportBug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($file) . '!'); - fwrite($fp, $line . chr(10)); + fwrite($fp, $line . PHP_EOL); fclose($fp); }