X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=dd8a1af0b29b3316d6c4d949924e0473d6e678b7;hb=a13cee9b7e7f0e4b40969c8957af72cb46bdb3a3;hp=ab5a1b975b5af071d8711f83e865499e35d83530;hpb=e54d3ae5331f50db6811510ff8e22227c09e4c77;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index ab5a1b975b..dd8a1af0b2 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -127,15 +127,13 @@ function clearOutputBuffer () {
 }
 
 // Encode strings
-// @TODO Implement $compress
-function encodeString ($str, $compress = true) {
+function encodeString ($str) {
 	$str = urlencode(base64_encode(compileUriCode($str)));
 	return $str;
 }
 
 // Decode strings encoded with encodeString()
-// @TODO Implement $decompress
-function decodeString ($str, $decompress = true) {
+function decodeString ($str) {
 	$str = compileUriCode(base64_decode(urldecode(compileUriCode($str))));
 	return $str;
 }
@@ -172,7 +170,7 @@ function isFileReadable ($FQFN) {
 	// Do we have cache?
 	if (!isset($GLOBALS['file_readable'][$FQFN])) {
 		// Check all...
-		$GLOBALS['file_readable'][$FQFN] = ((file_exists($FQFN)) && (is_file($FQFN)) && (is_readable($FQFN)));
+		$GLOBALS['file_readable'][$FQFN] = ((is_file($FQFN)) && (file_exists($FQFN)) && (is_readable($FQFN)));
 	} // END - if
 
 	// Return result
@@ -313,7 +311,7 @@ function isInstalling () {
 	// Determine wether we are installing
 	if (!isset($GLOBALS['mailer_installing'])) {
 		// Check URL (css.php/js.php need this)
-		$GLOBALS['mailer_installing'] = isGetRequestParameterSet('installing');
+		$GLOBALS['mailer_installing'] = isGetRequestElementSet('installing');
 	} // END - if
 
 	// Return result
@@ -542,9 +540,9 @@ function removeFile ($FQFN) {
 // Wrapper for $_POST['sel']
 function countPostSelection ($element = 'sel') {
 	// Is it set?
-	if (isPostRequestParameterSet($element)) {
+	if (isPostRequestElementSet($element)) {
 		// Return counted elements
-		return countSelection(postRequestParameter($element));
+		return countSelection(postRequestElement($element));
 	} else {
 		// Return zero if not found
 		return 0;
@@ -561,7 +559,7 @@ function isNicknameUsed ($userid) {
 	// Is the cache there
 	if (!isset($GLOBALS[__FUNCTION__][$userid])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__][$userid] = ((!empty($userid)) && (('' . round($userid) . '') != $userid));
+		$GLOBALS[__FUNCTION__][$userid] = ((!empty($userid)) && (('' . round($userid) . '') != $userid) && ($userid != 'NULL'));
 	} // END - if
 
 	// Return the result
@@ -1146,7 +1144,7 @@ function sendRawRedirect ($url) {
 
 	// check if running on IIS < 6 with CGI-PHP
 	if ((isset($_SERVER['SERVER_SOFTWARE'])) && (isset($_SERVER['GATEWAY_INTERFACE'])) &&
-		(strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') !== false) &&
+		(isInString('CGI', $_SERVER['GATEWAY_INTERFACE'])) &&
 		(preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($_SERVER['SERVER_SOFTWARE']), $matches)) &&
 		($matches[1] < 6)) {
 		// Send the IIS header
@@ -2376,6 +2374,42 @@ function getUrlTlock () {
 	return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for title_left
+function getTitleLeft () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('title_left');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for title_right
+function getTitleRight () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('title_right');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for title_middle
+function getTitleMiddle () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('title_middle');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
 // Getter for 'check_double_email'
 function getCheckDoubleEmail () {
 	// Is the cache entry set?
@@ -2441,7 +2475,7 @@ function ifPostContainsSelections ($element = 'sel') {
 	// Do we have cache?
 	if (!isset($GLOBALS[__FUNCTION__][$element])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__][$element] = ((isPostRequestParameterSet($element)) && (countPostSelection($element) > 0));
+		$GLOBALS[__FUNCTION__][$element] = ((isPostRequestElementSet($element)) && (countPostSelection($element) > 0));
 	} // END - if
 
 	// Return cache
@@ -2595,10 +2629,10 @@ function createConfigurationTimeSelections ($configEntry, $stamps, $align = 'cen
 // Shortens converting of German comma to Computer's version in POST data
 function convertCommaToDotInPostData ($postEntry) {
 	// Read and convert given entry
-	$postValue = convertCommaToDot(postRequestParameter($postEntry));
+	$postValue = convertCommaToDot(postRequestElement($postEntry));
 
 	// ... and set it again
-	setPostRequestParameter($postEntry, $postValue);
+	setPostRequestElement($postEntry, $postValue);
 }
 
 // Converts German commas to Computer's version in all entries
@@ -2606,7 +2640,7 @@ function convertCommaToDotInPostDataArray ($postEntries) {
 	// Replace german decimal comma with computer decimal dot
 	foreach ($postEntries as $entry) {
 		// Is the entry there?
-		if (isPostRequestParameterSet($entry)) {
+		if (isPostRequestElementSet($entry)) {
 			// Then convert it
 			convertCommaToDotInPostData($entry);
 		} // END - if