X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=a31c402069ef86f8c151aa68bc481bbf26d62817;hp=de1578bff7b1d1db91e2d80a4a1780e95187ac88;hb=bd439a79803904c8f255b9b89c876825790f1bfa;hpb=3c0c6ad28a250c08b3fe8b166c589d0d49441ad3

diff --git a/inc/functions.php b/inc/functions.php
index de1578bff7..a31c402069 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -77,7 +77,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 
 				// The same as above... ^
 				outputRawCode($htmlCode);
-				if ($newLine) print("\n");
+				if ($newLine === true) print("\n");
 				break;
 
 			default:
@@ -312,7 +312,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
 			eval($GLOBALS['template_eval'][$template]);
 		} elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
 			// Only admins shall see this warning or when installation mode is active
-			$ret = '<br /><span class=\\"guest_failed\\">{--TEMPLATE_404--}</span><br />
+			$ret = '<br /><span class="guest_failed">{--TEMPLATE_404--}</span><br />
 (' . $template . ')<br />
 <br />
 {--TEMPLATE_CONTENT--}
@@ -350,44 +350,53 @@ function detectExtraTemplatePath ($template) {
 	// Default is empty
 	$extraPath = '';
 
-	// Check for admin/guest/member templates
-	if (substr($template, 0, 6) == 'admin_') {
-		// Admin template found
-		$extraPath = 'admin/';
-	} elseif (substr($template, 0, 6) == 'guest_') {
-		// Guest template found
-		$extraPath = 'guest/';
-	} elseif (substr($template, 0, 7) == 'member_') {
-		// Member template found
-		$extraPath = 'member/';
-	} elseif (substr($template, 0, 8) == 'install_') {
-		// Installation template found
-		$extraPath = 'install/';
-	} elseif (substr($template, 0, 4) == 'ext_') {
-		// Extension template found
-		$extraPath = 'ext/';
-	} elseif (substr($template, 0, 3) == 'la_') {
-		// 'Logical-area' template found
-		$extraPath = 'la/';
-	} elseif (substr($template, 0, 3) == 'js_') {
-		// JavaScript template found
-		$extraPath = 'js/';
-	} elseif (substr($template, 0, 5) == 'menu_') {
-		// Menu template found
-		$extraPath = 'menu/';
-	} else {
-		// Test for extension
-		$test = substr($template, 0, strpos($template, '_'));
+	// Do we have cache?
+	if (!isset($GLOBALS['extra_path'][$template])) {
+		// Check for admin/guest/member/etc. templates
+		if (substr($template, 0, 6) == 'admin_') {
+			// Admin template found
+			$extraPath = 'admin/';
+		} elseif (substr($template, 0, 6) == 'guest_') {
+			// Guest template found
+			$extraPath = 'guest/';
+		} elseif (substr($template, 0, 7) == 'member_') {
+			// Member template found
+			$extraPath = 'member/';
+		} elseif (substr($template, 0, 7) == 'select_') {
+			// Selection template found
+			$extraPath = 'select/';
+		} elseif (substr($template, 0, 8) == 'install_') {
+			// Installation template found
+			$extraPath = 'install/';
+		} elseif (substr($template, 0, 4) == 'ext_') {
+			// Extension template found
+			$extraPath = 'ext/';
+		} elseif (substr($template, 0, 3) == 'la_') {
+			// 'Logical-area' template found
+			$extraPath = 'la/';
+		} elseif (substr($template, 0, 3) == 'js_') {
+			// JavaScript template found
+			$extraPath = 'js/';
+		} elseif (substr($template, 0, 5) == 'menu_') {
+			// Menu template found
+			$extraPath = 'menu/';
+		} else {
+			// Test for extension
+			$test = substr($template, 0, strpos($template, '_'));
 
-		// Probe for valid extension name
-		if (isExtensionNameValid($test)) {
-			// Set extra path to extension's name
-			$extraPath = $test . '/';
-		} // END - if
-	}
+			// Probe for valid extension name
+			if (isExtensionNameValid($test)) {
+				// Set extra path to extension's name
+				$extraPath = $test . '/';
+			} // END - if
+		}
+
+		// Store it in cache
+		$GLOBALS['extra_path'][$template] = $extraPath;
+	} // END - if
 
 	// Return result
-	return $extraPath;
+	return $GLOBALS['extra_path'][$template];
 }
 
 // Loads an email template and compiles it
@@ -439,7 +448,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 +1350,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 +1467,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 +1655,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 +2037,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
 
@@ -2488,7 +2497,7 @@ function getActualVersion ($type = 'Revision') {
 					$new = true;
 				} else {
 					// Generate fake cache entry
-					foreach ($mapper as $map=>$idx) {
+					foreach ($mapper as $map => $idx) {
 						$GLOBALS['cache_array']['revision'][$map][0] = $ins_vers[$idx];
 					} // END - foreach
 
@@ -2638,7 +2647,7 @@ function debug_report_bug ($message = '') {
 	} // END - if
 
 	// Add output
-	$debug .= "Please report this bug at <a title=\"Direct link to the bug-tracker\" href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a> and include the logfile from <strong>" . getConfig('CACHE_PATH') . "debug.log</strong> in your report (you can now attach files):<pre>";
+	$debug .= "Please report this bug at <a title=\"Direct link to the bug-tracker\" href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a> and include the logfile from <strong>" . str_replace(getConfig('PATH'), '', getConfig('CACHE_PATH')) . "debug.log</strong> in your report (you can now attach files):<pre>";
 	$debug .= debug_get_printable_backtrace();
 	$debug .= "</pre>\nRequest-URI: " . getRequestUri()."<br />\n";
 	$debug .= "Thank you for finding bugs.";
@@ -3164,7 +3173,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 +3190,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 +3234,7 @@ function shutdown () {
 		addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
 	}
 
-	// Stop2 executing here
+	// Stop executing here
 	exit;
 }
 
@@ -3608,10 +3617,10 @@ function determinePageTitle () {
 		$mode = '';
 		if (getModule() == 'login') $mode = 'member';
 		elseif (getModule() == 'index') $mode = 'guest';
-		if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= " ".trim(getConfig('title_middle'))." ".getModuleDescription($mode, getWhat());
+		if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= ' ' . trim(getConfig('title_middle')) . ' ' . getTitleFromMenu($mode, getWhat());
 
 		// Add title decorations? (right)
-		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= " ".trim(getConfig('title_right'));
+		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= ' ' . trim(getConfig('title_right'));
 
 		// Remember title in constant for the template
 		$pageTitle = $TITLE;
@@ -3815,6 +3824,58 @@ function sendModeMails ($mod, $modes) {
 	loadTemplate('admin_settings_saved', false, $content);
 }
 
+// Generates a 'selection box' from given array
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent) {
+	// Start the output
+	$OUT = '<select name="' . $name . '" size="1" class="admin_select">
+<option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
+
+	// Walk through all options
+	foreach ($options as $option) {
+		// Add the <option> entry
+		$OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
+	} // END - foreach
+
+	// Finish selection box
+	$OUT .= '</select>';
+
+	// Prepare output
+	$content = array(
+		'selection_box' => $OUT,
+		'module'        => getModule(),
+		'what'          => getWhat()
+	);
+
+	// Load template and return it
+	return loadTemplate('select_' . $name . '_box', true, $content);
+}
+
+// Get a module from filename and access level
+function getModuleFromFileName ($file, $accessLevel) {
+	// Default is 'invalid';
+	$modCheck = 'invalid';
+
+	// @TODO This is still very static, rewrite it somehow
+	switch ($accessLevel) {
+		case 'admin':
+			$modCheck = 'admin';
+			break;
+
+		case 'sponsor':
+		case 'guest':
+		case 'member':
+			$modCheck = getModule();
+			break;
+
+		default: // Unsupported file name / access level
+			debug_report_bug('Unsupported file name=' . basename($file) . '/access level=' . $accessLevel);
+			break;
+	}
+
+	// Return result
+	return $modCheck;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////