X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=29151e81e02a79e8b77ab201a0ad87daed99b9f7;hb=b1f1d6878ad781f5be5c8e2e4c0e5b2def3a0c0d;hp=f44633a7c4d9fd55494914451b9a3dc5170007dc;hpb=9eef96ed2070a2ca0eefb1e1e6cc4a1c8bb3a919;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index f44633a7c4..29151e81e0 100644
--- a/inc/functions.php
+++ b/inc/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                    *
@@ -458,6 +456,9 @@ function translateUserStatus ($status) {
 
 // "Translates" 'visible' and 'locked' to a CSS class
 function translateMenuVisibleLocked ($content, $prefix = '') {
+	// Default is 'menu_unknown'
+	$content['visible_css'] = $prefix . 'menu_unknown';
+
 	// Translate 'visible' and keep an eye on the prefix
 	switch ($content['visible']) {
 		// Should be visible
@@ -712,10 +713,13 @@ function bigintval ($num, $castValue = true, $abortOnMismatch = true) {
 	$ret = preg_replace('/[^0123456789]/', '', $num);
 
 	// Shall we cast?
-	if ($castValue === true) $ret = (double)$ret;
+	if ($castValue === true) {
+		// Cast to biggest numeric type
+		$ret = (double) $ret;
+	} // END - if
 
 	// Has the whole value changed?
-	if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true)) {
+	if (('' . $ret . '' != '' . $num . '') && ($abortOnMismatch === true) && (!is_null($num))) {
 		// Log the values
 		debug_report_bug(__FUNCTION__, __LINE__, 'Problem with number found. ret=' . $ret . ', num='. $num);
 	} // END - if
@@ -1447,7 +1451,7 @@ function getMessageFromErrorCode ($code) {
 	switch ($code) {
 		case '': break;
 		case getCode('LOGOUT_DONE')        : $message = '{--LOGOUT_DONE--}'; break;
-		case getCode('LOGOUT_FAILED')      : $message = '<span class="guest_failed">{--LOGOUT_FAILED--}</span>'; break;
+		case getCode('LOGOUT_FAILED')      : $message = '<span class="notice">{--LOGOUT_FAILED--}</span>'; break;
 		case getCode('DATA_INVALID')       : $message = '{--MAIL_DATA_INVALID--}'; break;
 		case getCode('POSSIBLE_INVALID')   : $message = '{--MAIL_POSSIBLE_INVALID--}'; break;
 		case getCode('USER_404')           : $message = '{--USER_404--}'; break;
@@ -1475,6 +1479,7 @@ function getMessageFromErrorCode ($code) {
 		case getCode('NO_MAIL_TYPE')       : $message = '{--MEMBER_NO_MAIL_TYPE_SELECTED--}'; break;
 		case getCode('UNKNOWN_ERROR')      : $message = '{--LOGIN_UNKNOWN_ERROR--}'; break;
 		case getCode('UNKNOWN_STATUS')     : $message = '{--LOGIN_UNKNOWN_STATUS--}'; break;
+		case getCode('PROFILE_UPDATED')    : $message = '{--MEMBER_PROFILE_UPDATED--}'; break;
 
 		case getCode('ERROR_MAILID'):
 			if (isExtensionActive('mailid', true)) {
@@ -1492,34 +1497,31 @@ function getMessageFromErrorCode ($code) {
 			}
 			break;
 
-		case getCode('URL_TLOCK'):
+		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__);
 
 			// Load timestamp from last order
-			list($timestamp) = SQL_FETCHROW($result);
+			$content = SQL_FETCHARRAY($result);
 
 			// Free memory
 			SQL_FREERESULT($result);
 
 			// Translate it for templates
-			$timestamp = generateDateTime($timestamp, 1);
+			$content['timestamp'] = generateDateTime($content['timestamp'], 1);
 
 			// Calculate hours...
-			$STD = round(getConfig('url_tlock') / 60 / 60);
+			$content['hours'] = round(getConfig('url_tlock') / 60 / 60);
 
 			// Minutes...
-			$MIN = round((getConfig('url_tlock') - $STD * 60 * 60) / 60);
+			$content['minutes'] = round((getConfig('url_tlock') - $content['hours'] * 60 * 60) / 60);
 
 			// And seconds
-			$SEC = getConfig('url_tlock') - $STD * 60 * 60 - $MIN * 60;
+			$content['seconds'] = round(getConfig('url_tlock') - $content['hours'] * 60 * 60 - $content['minutes'] * 60);
 
 			// Finally contruct the message
-			// @TODO Rewrite this old lost code to a template
-			$message = '{--MEMBER_URL_TIME_LOCK--}<br />{--CONFIG_URL_TLOCK--} ' . $STD . '
-			{--_HOURS--}, ' . $MIN . ' {--_MINUTES--} {--_AND--} ' . $SEC . ' {--_SECONDS--}<br />
-			{--MEMBER_LAST_TLOCK--}: ' . $timestamp;
+			$message = loadTemplate('tlock_message', true, $content);
 			break;
 
 		default:
@@ -1947,11 +1949,11 @@ function determineReferalId () {
 		$GLOBALS['refid'] = getConfig('def_refid');
 	} else {
 		// No default id when sql_patches is not installed or none set
-		$GLOBALS['refid'] = '0';
+		$GLOBALS['refid'] = null;
 	}
 
 	// Set cookie when default refid > 0
-	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isConfigEntrySet('def_refid')) && (isValidUserId(getConfig('def_refid'))))) {
+	if (!isSessionVariableSet('refid') || (isValidUserId($GLOBALS['refid'])) || ((!isValidUserId(getSession('refid'))) && (isConfigEntrySet('def_refid')) && (isValidUserId(getConfig('def_refid'))))) {
 		// Default is not found
 		$found = false;
 
@@ -1971,7 +1973,7 @@ function determineReferalId () {
 		} // END - if
 
 		// Set cookie
-		setSession('refid', $GLOBALS['refid']);
+		setSession('refid', bigintval($GLOBALS['refid']));
 	} // END - if
 
 	// Return determined refid
@@ -2443,7 +2445,7 @@ if (!function_exists('http_build_query')) {
 	// Taken from documentation on www.php.net, credits to Marco K. (Germany) and some light mods by R.Haeder
 	function http_build_query($data, $prefix = '', $sep = '', $key = '') {
 		$ret = array();
-		foreach ((array)$data as $k => $v) {
+		foreach ((array) $data as $k => $v) {
 			if (is_int($k) && $prefix != null) {
 				$k = urlencode($prefix . $k);
 			} // END - if