X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=557f7e2d3d0d51d742d6f666224ec88f67e575ec;hb=3310a168bbd1e9e16b09608700fb9c4fc1d32e80;hp=4e235f5017f328826646ee982577b6540d444d5b;hpb=25139c1a286c8da88c99711cacb11b4b7e9581d0;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 4e235f5017..557f7e2d3d 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -571,7 +571,7 @@ function isNicknameUsed ($userid) {
 // Getter for 'what' value
 function getWhat () {
 	// Default is null
-	$what = null;
+	$what = NULL;
 
 	// Is the value set?
 	if (isWhatSet(true)) {
@@ -615,7 +615,7 @@ function isWhatSet ($strict =  false) {
 // Getter for 'action' value
 function getAction ($strict = true) {
 	// Default is null
-	$action = null;
+	$action = NULL;
 
 	// Is the value set?
 	if (isActionSet(($strict) && (isHtmlOutputMode()))) {
@@ -650,7 +650,7 @@ function isActionSet ($strict =  false) {
 // Getter for 'module' value
 function getModule ($strict = true) {
 	// Default is null
-	$module = null;
+	$module = NULL;
 
 	// Is the value set?
 	if (isModuleSet($strict)) {
@@ -688,7 +688,7 @@ function getScriptOutputMode () {
 	// Do we have cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Default is null
-		$output_mode = null;
+		$output_mode = NULL;
 
 		// Is the value set?
 		if (isOutputModeSet(true)) {
@@ -949,6 +949,7 @@ function initUserData () {
 	} // END - if
 
 	// Init the user
+	unset($GLOBALS['is_userdata_valid'][getCurrentUserId()]);
 	$GLOBALS['user_data'][getCurrentUserId()] = array();
 }
 
@@ -961,7 +962,7 @@ function getUserData ($column) {
 	} // END - if
 
 	// Default is empty
-	$data = null;
+	$data = NULL;
 
 	if (isset($GLOBALS['user_data'][getCurrentUserId()][$column])) {
 		// Return the value
@@ -1009,7 +1010,9 @@ function getUserDataArray () {
 // in, but you should use isMember() if you want to find that out.
 function isUserDataValid () {
 	// User id should not be zero so abort here
-	if (!isCurrentUserIdSet()) return false;
+	if (!isCurrentUserIdSet()) {
+		return false;
+	} // END - if
 
 	// Is it cached?
 	if (!isset($GLOBALS['is_userdata_valid'][getCurrentUserId()])) {
@@ -1270,11 +1273,23 @@ function encodeEntities ($str) {
 }
 
 // "Getter" for date from patch_ctime
-function getDateFromPatchTime () {
+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('patch_ctime'), '5');
+		$GLOBALS[__FUNCTION__] = generateDateTime(getConfig('CURRENT_REPOSITORY_DATE'), '2');
 	} // END - if
 
 	// Return cache
@@ -1282,7 +1297,7 @@ function getDateFromPatchTime () {
 }
 
 // Getter for current year (default)
-function getYear ($timestamp = null) {
+function getYear ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1299,7 +1314,7 @@ function getYear ($timestamp = null) {
 }
 
 // Getter for current month (default)
-function getMonth ($timestamp = null) {
+function getMonth ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// If null is set, use time()
@@ -1317,7 +1332,7 @@ function getMonth ($timestamp = null) {
 }
 
 // Getter for current hour (default)
-function getHour ($timestamp = null) {
+function getHour ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1334,7 +1349,7 @@ function getHour ($timestamp = null) {
 }
 
 // Getter for current day (default)
-function getDay ($timestamp = null) {
+function getDay ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1351,7 +1366,7 @@ function getDay ($timestamp = null) {
 }
 
 // Getter for current week (default)
-function getWeek ($timestamp = null) {
+function getWeek ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1366,7 +1381,7 @@ function getWeek ($timestamp = null) {
 }
 
 // Getter for current short_hour (default)
-function getShortHour ($timestamp = null) {
+function getShortHour ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1381,7 +1396,7 @@ function getShortHour ($timestamp = null) {
 }
 
 // Getter for current long_hour (default)
-function getLongHour ($timestamp = null) {
+function getLongHour ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1396,7 +1411,7 @@ function getLongHour ($timestamp = null) {
 }
 
 // Getter for current second (default)
-function getSecond ($timestamp = null) {
+function getSecond ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -1411,7 +1426,7 @@ function getSecond ($timestamp = null) {
 }
 
 // Getter for current minute (default)
-function getMinute ($timestamp = null) {
+function getMinute ($timestamp = NULL) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
@@ -2361,6 +2376,90 @@ 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?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = getConfig('check_double_email');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'check_double_email' is 'Y'
+function isCheckDoubleEmailEnabled () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = (getCheckDoubleEmail() == 'Y');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Getter for 'display_home_in_index'
+function getDisplayHomeInIndex () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = getConfig('display_home_in_index');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'display_home_in_index' is 'Y'
+function isDisplayHomeInIndexEnabled () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = (getDisplayHomeInIndex() == 'Y');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
 // Checks wether proxy configuration is used
 function isProxyUsed () {
 	// Do we have cache?
@@ -2567,9 +2666,9 @@ function parseFloat ($floatString){
 }
 
 // Generates a YES/NO option list from given default
-function generateYesNoOptionList ($default = '') {
+function generateYesNoOptionList ($configValue = '') {
 	// Generate it
-	return generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $default);
+	return generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $configValue);
 }
 
 // "Getter" for total available receivers
@@ -2593,33 +2692,5 @@ function getTotalUnconfirmedMails ($userid) {
 	return $GLOBALS[__FUNCTION__][$userid];
 }
 
-//-----------------------------------------------------------------------------
-//                        Configuration wrapper
-//-----------------------------------------------------------------------------
-
-// Getter for 'check_double_email'
-function getCheckDoubleEmail () {
-	// Is the cache entry set?
-	if (!isset($GLOBALS[__FUNCTION__])) {
-		// No, so determine it
-		$GLOBALS[__FUNCTION__] = getConfig('check_double_email');
-	} // END - if
-
-	// Return cached entry
-	return $GLOBALS[__FUNCTION__];
-}
-
-// Checks wether 'check_double_email' is 'Y'
-function isCheckDoubleEmailEnabled () {
-	// Is the cache entry set?
-	if (!isset($GLOBALS[__FUNCTION__])) {
-		// No, so determine it
-		$GLOBALS[__FUNCTION__] = (getCheckDoubleEmail() == 'Y');
-	} // END - if
-
-	// Return cached entry
-	return $GLOBALS[__FUNCTION__];
-}
-
 // [EOF]
 ?>