X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=0622a21253fab406f6936504702ebf86f0019418;hb=3767eef30a9e514e95625e6da22418ab297b204d;hp=57431c93293b4da3e2b502bea058e760efa5f936;hpb=061d09696aff5e519597f77f4e91dc5dd4824a77;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 57431c9329..0622a21253 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                    *
@@ -135,7 +133,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 		$prefix = '';
 
 		// Is HTML?
-		if ($isHTML == 'Y') {
+		if ($isHtml == 'Y') {
 			// Set prefix
 			$prefix = 'html_';
 		} // END - if
@@ -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
@@ -585,9 +586,6 @@ function redirectToUrl ($URL, $allowSpider = true) {
 		// Clear own output buffer
 		$GLOBALS['output'] = '';
 
-		// Set header
-		setHttpStatus('302 Found');
-
 		// Load URL when headers are not sent
 		sendRawRedirect(doFinalCompilation(str_replace('&', '&', $URL), false));
 	} else {
@@ -1450,7 +1448,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;
@@ -1478,12 +1476,13 @@ 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)) {
 				$message = '{--ERROR_CONFIRMING_MAIL--}';
 			} else {
-				$message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid');
+				$message = generateExtensionInactiveNotInstalledMessage('mailid');
 			}
 			break;
 
@@ -1495,34 +1494,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:
@@ -2016,7 +2012,9 @@ function initMemberId () {
 // Setter for member id
 function setMemberId ($memberid) {
 	// We should not set member id to zero
-	if ($memberid == '0') debug_report_bug(__FUNCTION__, __LINE__, 'Userid should not be set zero.');
+	if ($memberid == '0') {
+		debug_report_bug(__FUNCTION__, __LINE__, 'Userid should not be set zero.');
+	} // END - if
 
 	// Set it secured
 	$GLOBALS['member_id'] = bigintval($memberid);