X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=4a6e0e0dc9f01ea38ffd6727128eff575e8c1318;hb=34297125f617f854d2cc009d3cc4f16b6581a1f5;hp=918ad0a93a039bb7686851c30d9cfb01d4951b89;hpb=2242e96edcd22361e94ed18d72f5667ab286f791;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 918ad0a93a..4a6e0e0dc9 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -773,7 +771,7 @@ function isDemoModeActive () {
 	// Is cache set?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Simply check it
-		$GLOBALS[__FUNCTION__] = ((isExtensionActive('demo')) && (getAdminLogin(getSession('admin_id')) == 'demo'));
+		$GLOBALS[__FUNCTION__] = ((isExtensionActive('demo')) && (getCurrentAdminLogin() == 'demo'));
 	} // END - if
 
 	// Return it
@@ -802,12 +800,75 @@ function setAdminHash ($adminId, $hash) {
 	$GLOBALS['cache_array']['admin']['password'][$adminId] = $hash;
 }
 
+// Getter for current admin login
+function getCurrentAdminLogin () {
+	// Log debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'called!');
+
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getAdminLogin(getCurrentAdminId());
+	} // END - if
+
+	// Return it
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Setter for admin id (and current)
+function setAdminId ($adminId) {
+	// Log debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminId=' . $adminId);
+
+	// Set session
+	$status = setSession('admin_id', bigintval($adminId));
+
+	// Set current id
+	setCurrentAdminId($adminId);
+
+	// Return status
+	return $status;
+}
+
+// Setter for admin_last
+function setAdminLast ($adminLast) {
+	// Log debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminLast=' . $adminLast);
+
+	// Set session
+	$status = setSession('admin_last', $adminLast);
+
+	// Return status
+	return $status;
+}
+
+// Setter for admin_md5
+function setAdminMd5 ($adminMd5) {
+	// Log debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminMd5=' . $adminMd5);
+
+	// Set session
+	$status = setSession('admin_md5', $adminMd5);
+
+	// Return status
+	return $status;
+}
+
+// Getter for admin_md5
+function getAdminMd5 () {
+	// Log debug message
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'called!');
+
+	// Get session
+	return getSession('admin_md5');
+}
+
 // Init user data array
 function initUserData () {
 	// User id should not be zero
 	if (!isValidUserId(getCurrentUserId())) {
 		// Should be always valid
-		debug_report_bug(__FUNCTION__, __LINE__, 'User id is zero.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Current user id is invalid: ' . getCurrentUserId());
 	} // END - if
 
 	// Init the user
@@ -819,7 +880,7 @@ function getUserData ($column) {
 	// User id should not be zero
 	if (!isValidUserId(getCurrentUserId())) {
 		// Should be always valid
-		debug_report_bug(__FUNCTION__, __LINE__, 'User id is zero.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Current user id is invalid: ' . getCurrentUserId());
 	} // END - if
 
 	// Return the value
@@ -834,7 +895,7 @@ function getUserDataArray () {
 	// Is the current userid valid?
 	if (!isValidUserId($userid)) {
 		// Should be always valid
-		debug_report_bug(__FUNCTION__, __LINE__, 'User id is invalid.');
+		debug_report_bug(__FUNCTION__, __LINE__, 'Current user id is invalid: ' . $userid);
 	} // END - if
 
 	// Get the whole array if found
@@ -947,6 +1008,13 @@ function setHttpStatus ($status) {
 
 // Getter for HTTP status
 function getHttpStatus () {
+	// Is the status set?
+	if (!isset($GLOBALS['http_status'])) {
+		// Abort here
+		debug_report_bug(__FUNCTION__, __LINE__, 'No HTTP status set!');
+	} // END - if
+
+	// Return it
 	return $GLOBALS['http_status'];
 }
 
@@ -1105,8 +1173,11 @@ function getYear ($timestamp = null) {
 function getMonth ($timestamp = null) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
-		// null is time()
-		if (is_null($timestamp)) $timestamp = time();
+		// If null is set, use time()
+		if (is_null($timestamp)) {
+			// Use time() which is current timestamp
+			$timestamp = time();
+		} // END - if
 
 		// Then create it
 		$GLOBALS[__FUNCTION__][$timestamp] = date('m', $timestamp);
@@ -1319,7 +1390,7 @@ function isRandomReferalIdEnabled () {
 	// Do we have cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = (getConfig('select_user_zero_refid') == 'Y');
+		$GLOBALS[__FUNCTION__] = ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid') == 'Y'));
 	} // END - if
 
 	// Return cache
@@ -1338,6 +1409,18 @@ function getDefaultLanguage () {
 	return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for default referal id
+function getDefRefid () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('def_refid');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
 // "Getter" for path
 function getPath () {
 	// Do we have cache?
@@ -1495,11 +1578,11 @@ function getTitle () {
 }
 
 // "Getter" for curr_svn_revision
-function getCurrSvnRevision () {
+function getCurrentRepositoryRevision () {
 	// Do we have cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__] = getConfig('CURR_SVN_REVISION');
+		$GLOBALS[__FUNCTION__] = getConfig('CURRENT_REPOSITORY_REVISION');
 	} // END - if
 
 	// Return cache
@@ -1842,6 +1925,102 @@ function getOneDay () {
 	return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for activate_xchange
+function getActivateXchange () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('activate_xchange');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for img_type
+function getImgType () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('img_type');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for code_length
+function getCodeLength () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('code_length');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for least_cats
+function getLeastCats () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('least_cats');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for pass_len
+function getPassLen () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('pass_len');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for admin_menu
+function getAdminMenu () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('admin_menu');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for last_month
+function getLastMonth () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('last_month');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
+// "Getter" for __DB_NAME
+function getDbName () {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('__DB_NAME');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
 // Checks wether proxy configuration is used
 function isProxyUsed () {
 	// Do we have cache?
@@ -1944,5 +2123,40 @@ function isRawOutputMode () {
 	return (getScriptOutputMode() == -1);
 }
 
+// Wrapper to generate a user email link
+function generateWrappedUserEmailLink ($email) {
+	// Just call the inner function
+	return generateEmailLink($email, 'user_data');
+}
+
+// Wrapper to check if user points are locked
+function ifUserPointsLocked ($userid) {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][$userid])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__][$userid] = ((getFetchedUserData('userid', $userid, 'ref_payout') > 0) && (!isDirectPaymentEnabled()));
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][$userid];
+}
+
+// Appends a line to an existing file or creates it instantly with given content.
+// This function does always add a new-line character to every line.
+function appendLineToFile ($file, $line) {
+	$fp = fopen($file, 'a') or debug_report_bug(__FUNCTION__, __LINE__, 'Cannot write to file ' . basename($file) . '!');
+	fwrite($fp, $line . "\n");
+	fclose($fp);
+}
+
+// Wrapper for changeDataInFile() but with full path added
+function changeDataInInclude ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
+	// Add full path
+	$FQFN = getPath() . $FQFN;
+
+	// Call inner function
+	changeDataInFile($FQFN, $comment, $prefix, $suffix, $DATA, $seek);
+}
+
 // [EOF]
 ?>