X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=f3aecaf590d36c57dfcff8b47fa7414902622cfe;hb=b7ec93f8292180fa480361949f8da5d6f558ef7e;hp=5ebcaebce1fc5211496031264048ccf9a9deb519;hpb=c4f05bcedf352407065b4fcc91c57fb84683ff87;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 5ebcaebce1..f3aecaf590 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -439,7 +439,7 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):UID={$UID},template={$template},content[]=".gettype($content).'<br />');
 	if (($UID > 0) && (is_array($content))) {
 		// If nickname extension is installed, fetch nickname as well
-		if (isNicknameUsed($UID)) {
+		if ((isExtensionActive('nickname')) && (isNicknameUsed($UID))) {
 			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />");
 			// Load by nickname
 			fetchUserData($UID, 'nickname');
@@ -1341,7 +1341,7 @@ function bigintval ($num, $castValue = true) {
 function generateImageOrCode ($img_code, $headerSent = true) {
 	// Is the code size oversized or shouldn't we display it?
 	if ((strlen($img_code) > 6) || (empty($img_code)) || (getConfig('code_length') == '0')) {
-		// Stop2 execution of function here because of over-sized code length
+		// Stop execution of function here because of over-sized code length
 		debug_report_bug('img_code ' . $img_code .' has invalid length. img_code()=' . strlen($img_code) . ' code_length=' . getConfig('code_length'));
 	} elseif ($headerSent === false) {
 		// Return an HTML code here
@@ -1458,31 +1458,31 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 		$OUT .= "<tr>\n";
 
 		if (ereg('Y', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom2\"><div class=\"tiny\">{--_YEARS--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_YEARS--}</strong></td>\n";
 		}
 
 		if (ereg('M', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom2\"><div class=\"tiny\">{--_MONTHS--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MONTHS--}</strong></td>\n";
 		}
 
 		if (ereg('W', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom2\"><div class=\"tiny\">{--_WEEKS--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_WEEKS--}</strong></td>\n";
 		}
 
 		if (ereg('D', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom2\"><div class=\"tiny\">{--_DAYS--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_DAYS--}</strong></td>\n";
 		}
 
 		if (ereg('h', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom2\"><div class=\"tiny\">{--_HOURS--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_HOURS--}</strong></td>\n";
 		}
 
 		if (ereg('m', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom2\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
 		}
 
 		if (ereg('s', $display) || (empty($display))) {
-			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom2\"><div class=\"tiny\">{--_SECONDS--}</strong></td>\n";
+			$OUT .= "  <td align=\"center\" class=\"timebox_column bottom\"><div class=\"tiny\">{--_SECONDS--}</strong></td>\n";
 		}
 
 		$OUT .= "</tr>\n";
@@ -1646,7 +1646,7 @@ function createFancyTime ($stamp) {
 function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=false) {
 	$SEP = ''; $TOP = '';
 	if ($show_form === false) {
-		$TOP = " top2";
+		$TOP = " top";
 		$SEP = "<tr><td colspan=\"" . $colspan."\" class=\"seperator\">&nbsp;</td></tr>";
 	}
 
@@ -2028,7 +2028,7 @@ function generateHash ($plainText, $salt = '') {
 
 	// Do we miss an arry element here?
 	if (!isConfigEntrySet('file_hash')) {
-		// Stop2 here
+		// Stop here
 		debug_report_bug('Missing file_hash in ' . __FUNCTION__ . '.');
 	} // END - if
 
@@ -3164,7 +3164,7 @@ function determineReferalId () {
 	} elseif ((isSessionVariableSet('refid')) && (getSession('refid') != 0)) {
 		// Set session refid als global
 		$GLOBALS['refid'] = bigintval(getSession('refid'));
-	} elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid')) == 'Y') {
+	} elseif ((isExtensionInstalledAndNewer('user', '0.3.4')) && (getConfig('select_user_zero_refid') == 'Y')) {
 		// Select a random user which has confirmed enougth mails
 		$GLOBALS['refid'] = determineRandomReferalId();
 	} elseif ((isExtensionInstalled('sql_patches')) && (getConfig('def_refid') > 0)) {
@@ -3181,7 +3181,7 @@ function determineReferalId () {
 		$found = false;
 
 		// Do we have nickname or userid set?
-		if (isNicknameUsed($GLOBALS['refid'])) {
+		if ((isExtensionActive('nickname')) && (isNicknameUsed($GLOBALS['refid']))) {
 			// Nickname in URL, so load the id
 			$found = fetchUserData($GLOBALS['refid'], 'nickname');
 		} elseif ($GLOBALS['refid'] > 0) {
@@ -3225,7 +3225,7 @@ function shutdown () {
 		addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
 	}
 
-	// Stop2 executing here
+	// Stop executing here
 	exit;
 }