X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=26d0bafc5a4533f87a0c095a510cacd14dd94d43;hb=f328172e16c619d30889fac830e873f2eeef857a;hp=1c5ee8fd3193186614180b1f5d8c9f0e5378334d;hpb=8e1fd7e3be3811cb108a074bece2eecd5bcced8f;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 1c5ee8fd31..26d0bafc5a 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1185,11 +1185,11 @@ function getMessageFromErrorCode ($code) {
 		case getCode('COOKIES_DISABLED')   : $message = '{--LOGIN_COOKIES_DISABLED--}'; break;
 		case getCode('BEG_SAME_AS_OWN')    : $message = '{--BEG_SAME_USERID_AS_OWN--}'; break;
 		case getCode('LOGIN_FAILED')       : $message = '{--GUEST_LOGIN_FAILED_GENERAL--}'; break;
-		case getCode('MODULE_MEMBER_ONLY') : $message = '{%message,MODULE_MEMBER_ONLY=' . getRequestParameter('mod') . '%}'; break;
+		case getCode('MODULE_MEMBER_ONLY') : $message = '{%message,MODULE_MEMBER_ONLY=' . getRequestElement('mod') . '%}'; break;
 		case getCode('OVERLENGTH')         : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break;
 		case getCode('URL_FOUND')          : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break;
 		case getCode('SUBJECT_URL')        : $message = '{--MEMBER_SUBJECT_CONTAINS_URL--}'; break;
-		case getCode('BLIST_URL')          : $message = '{--MEMBER_URL_BLACK_LISTED--}<br />{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestParameter('blist'), 0); break;
+		case getCode('BLIST_URL')          : $message = '{--MEMBER_URL_BLACK_LISTED--}<br />{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestElement('blist'), 0); break;
 		case getCode('NO_RECS_LEFT')       : $message = '{--MEMBER_SELECTED_MORE_RECS--}'; break;
 		case getCode('INVALID_TAGS')       : $message = '{--MEMBER_HTML_INVALID_TAGS--}'; break;
 		case getCode('MORE_POINTS')        : $message = '{--MEMBER_MORE_POINTS_NEEDED--}'; break;
@@ -1211,8 +1211,8 @@ function getMessageFromErrorCode ($code) {
 			break;
 
 		case getCode('EXTENSION_PROBLEM'):
-			if (isGetRequestParameterSet('ext')) {
-				$message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestParameter('ext') . '%}';
+			if (isGetRequestElementSet('ext')) {
+				$message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestElement('ext') . '%}';
 			} else {
 				$message = '{--EXTENSION_PROBLEM_UNSET_EXT--}';
 			}
@@ -1221,7 +1221,7 @@ function getMessageFromErrorCode ($code) {
 		case getCode('URL_TIME_LOCK'):
 			// @TODO Move this SQL code into a function, let's say 'getTimestampFromPoolId($id) ?
 			$result = SQL_QUERY_ESC("SELECT `timestamp` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
-				array(bigintval(getRequestParameter('id'))), __FUNCTION__, __LINE__);
+				array(bigintval(getRequestElement('id'))), __FUNCTION__, __LINE__);
 
 			// Load timestamp from last order
 			$content = SQL_FETCHARRAY($result);
@@ -1553,7 +1553,7 @@ function handleLoginFailures ($accessLevel) {
 // Rebuild cache
 function rebuildCache ($cache, $inc = '', $force = false) {
 	// Debug message
-	/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, sprintf("cache=%s, inc=%s, force=%s", $cache, $inc, intval($force)));
 
 	// Shall I remove the cache file?
 	if (isCacheInstanceValid()) {
@@ -1655,22 +1655,22 @@ function determineReferalId () {
 	if (isReferalIdValid()) {
 		// This is fine...
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GLOBALS (' . getReferalId() . ')');
-	} elseif (isPostRequestParameterSet('refid')) {
+	} elseif (isPostRequestElementSet('refid')) {
 		// Get referal id from POST element refid
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestParameter('refid') . ')');
-		setReferalId(secureString(postRequestParameter('refid')));
-	} elseif (isGetRequestParameterSet('refid')) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from POST data (' . postRequestElement('refid') . ')');
+		setReferalId(secureString(postRequestElement('refid')));
+	} elseif (isGetRequestElementSet('refid')) {
 		// Get referal id from GET parameter refid
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestParameter('refid') . ')');
-		setReferalId(secureString(getRequestParameter('refid')));
-	} elseif (isGetRequestParameterSet('ref')) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from GET data (' . getRequestElement('refid') . ')');
+		setReferalId(secureString(getRequestElement('refid')));
+	} elseif (isGetRequestElementSet('ref')) {
 		// Set refid=ref (the referal link uses such variable)
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestParameter('refid') . ')');
-		setReferalId(secureString(getRequestParameter('ref')));
-	} elseif ((isGetRequestParameterSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using ref from GET data (' . getRequestElement('refid') . ')');
+		setReferalId(secureString(getRequestElement('ref')));
+	} elseif ((isGetRequestElementSet('user')) && (basename($_SERVER['PHP_SELF']) == 'click.php')) {
 		// The variable user comes from  click.php
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestParameter('user') . ')');
-		setReferalId(bigintval(getRequestParameter('user')));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using user from GET data (' . getRequestElement('user') . ')');
+		setReferalId(bigintval(getRequestElement('user')));
 	} elseif ((isSessionVariableSet('refid')) && (isValidUserId(getSession('refid')))) {
 		// Set session refid as global
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using refid from SESSION data (' . getSession('refid') . ')');
@@ -2173,7 +2173,7 @@ function handleFieldWithBraces ($field) {
 // Converts a zero or NULL to word 'NULL'
 function makeZeroToNull ($number) {
 	// Is it a valid username?
-	if ((!is_null($number)) && ($number > 0)) {
+	if ((!is_null($number)) && (!empty($number)) && ($number > 0)) {
 		// Always secure it
 		$number = bigintval($number);
 	} else {