X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=0b483d1c7ffd716cde5164f32cd0df028af27b83;hp=e63b021236d942ab9de98650db49aae2e365fe85;hb=27272fdaa3ad8895e6b55ec77658ad5c1f80e89c;hpb=ad30a667fd8abeb576c04026b62c2e8a29d86f52

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index e63b021236..0b483d1c7f 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -77,29 +77,36 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 	// First of all, no admin login is found
 	$ret = '404';
 
-	// Then we need to lookup the login name by getting the admin hash
-	$adminHash = getAdminHash($adminLogin);
-
-	// If this is fine, we can continue
-	if ($adminHash != '-1') {
-		// Get admin id and set it as current
-		setCurrentAdminId(getAdminId($adminLogin));
-
-		// Now, we need to encode the password in the same way the one is encoded in database
-		$testHash = generateHash($adminPassword, $adminHash);
-
-		// If they both match, the login data is valid
-		if ($testHash == $adminHash) {
-			// All fine
-			$ret = 'done';
-		} else {
-			// Set status
-			$ret = 'pass';
-		}
+	// Get admin id from login
+	$adminId = getAdminId($adminLogin);
+
+	// Continue only with found admin ids
+	if ($adminId > 0) {
+		// Then we need to lookup the login name by getting the admin hash
+		$adminHash = getAdminHash($adminId);
+
+		// If this is fine, we can continue
+		if ($adminHash != '-1') {
+			// Get admin id and set it as current
+			setCurrentAdminId($adminId);
+
+			// Now, we need to encode the password in the same way the one is encoded in database
+			$testHash = generateHash($adminPassword, $adminHash);
+
+			// If they both match, the login data is valid
+			if ($testHash == $adminHash) {
+				// All fine
+				$ret = 'done';
+			} else {
+				// Set status
+				$ret = 'password';
+			}
+		} // END - if
 	} // END - if
 
 	// Prepare data array
 	$data = array(
+		'id'         => $adminId,
 		'login'      => $adminLogin,
 		'plain_pass' => $adminPassword,
 		'pass_hash'  => $adminHash
@@ -124,7 +131,7 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
 	if ($adminHash != '-1') {
 		// Now, we need to encode the password in the same way the one is encoded in database
 		$testHash = encodeHashForCookie($adminHash);
-		//* DEBUG: */ outputHtml('adminLogin='.$adminLogin.',<br />passHash='.$passHash.',<br />adminHash='.$adminHash.',<br />testHash='.$testHash.'<br />');
+		//* DEBUG: */ debugOutput('adminLogin=' . $adminLogin . ',passHash='.$passHash.',adminHash='.$adminHash.',testHash='.$testHash);
 
 		// If they both match, the login data is valid
 		if ($testHash == $passHash) {
@@ -132,12 +139,12 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
 			$ret = 'done';
 		} else {
 			// Set status
-			$ret = 'pass';
+			$ret = 'password';
 		}
 	} // END - if
 
 	// Return status
-	//* DEBUG: */ outputHtml('ret='.$ret);
+	//* DEBUG: */ debugOutput('ret='.$ret);
 	return $ret;
 }
 
@@ -146,7 +153,7 @@ function doAdminAction () {
 	// Get default what
 	$what = getWhat();
 
-	//* DEBUG: */ outputHtml(__LINE__.'*'.$what.'/'.getModule().'/'.getAction().'/'.getWhat().'*<br />');
+	//* DEBUG: */ debugOutput(__LINE__.'*'.$what.'/'.getModule().'/'.getAction().'/'.getWhat().'*');
 
 	// Remove any spaces from variable
 	if (empty($what)) {
@@ -161,7 +168,7 @@ function doAdminAction () {
 	$action = getActionFromModuleWhat(getModule(), $what);
 
 	// Define admin login name and id number
-	$content['login'] = getSession('admin_login');
+	$content['login'] = getAdminLogin(getSession('admin_id'));
 	$content['id']    = getCurrentAdminId();
 
 	// Preload templates
@@ -249,7 +256,7 @@ ORDER BY
 	`id` DESC", __FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		$OUT .= '<ul class="admin_menu_main">';
 		// @TODO Rewrite this to $content = SQL_FETCHARRAY()
 		while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
@@ -282,7 +289,7 @@ ORDER BY
 						$OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
 					}
 				} else {
-					$OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_ACTION_404--}">';
+					$OUT .= '<em style="cursor:help" class="admin_note" title="{%message,MENU_ACTION_404=' . $menu . '}">';
 				}
 
 				$OUT .= $title;
@@ -315,10 +322,10 @@ ORDER BY
 					array($menu), __FUNCTION__, __LINE__);
 
 				// Remember the count for later checks
-				setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($action == $menu)));
+				setAdminMenuHasEntries($menu, ((!SQL_HASZERONUMS($result_what)) && ($action == $menu)));
 
 				// Do we have entries?
-				if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
+				if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
 					$GLOBALS['menu']['description'] = array();
 					$GLOBALS['menu']['title'] = array(); $SUB = true;
 					$OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
@@ -352,7 +359,7 @@ ORDER BY
 									$OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
 								}
 							} else {
-								$OUT .= '<em style="cursor:help" class="admin_note" title="{--MENU_WHAT_404--}">';
+								$OUT .= '<em style="cursor:help" class="admin_note" title="{%message,MENU_WHAT_404=' . $what_sub . '%}">';
 							}
 
 							$OUT .= $title_what;
@@ -436,7 +443,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 
 	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Load menu as selection
 		$OUT = '<select name="' . $mode . '_menu';
 		if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
@@ -456,7 +463,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 		$OUT .= '</select>';
 	} else {
 		// No menus???
-		$OUT = getMessage('ADMIN_PROBLEM_NO_MENU');
+		$OUT = '{--ADMIN_PROBLEM_NO_MENU--}';
 	}
 
 	// Return output
@@ -570,7 +577,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	rebuildCache('config', 'config');
 
 	// Settings saved, so display message?
-	if ($displayMessage === true) loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+	if ($displayMessage === true) loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 
 	// Return affected rows
 	return $affected;
@@ -655,7 +662,7 @@ function adminGetMenuMode () {
 		incrementStatsEntry('cache_hits');
 	} elseif (isExtensionInstalledAndNewer('admins', '0.6.7')) {
 		// Load from database when version of 'admins' is enough
-		$result = SQL_QUERY_ESC("SELECT la_mode FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 			array($adminId), __FUNCTION__, __LINE__);
 
 		// Do we have an entry?
@@ -715,12 +722,12 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs)));
 	} else {
 		// Nothing selected!
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NOTHING_SELECTED_CHANGE'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTHING_SELECTED_CHANGE--}');
 	}
 }
 
 // Send mails for del/edit/lock build modes
-function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') {
+function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userid = 'userid') {
 	// Default subject is the subject part
 	$subject = $subjectPart;
 
@@ -731,9 +738,9 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') {
 	} // END - if
 
 	// Is the raw userid set?
-	if (postRequestParameter('userid_raw', $id) > 0) {
+	if (postRequestParameter($userid, $id) > 0) {
 		// Generate subject
-		$subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+		$subject = '{--MEMBER_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
 
 		// Load email template
 		if (!empty($subjectPart)) {
@@ -743,23 +750,23 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') {
 		}
 
 		// Send email out
-		sendEmail(postRequestParameter('userid_raw', $id), $subjectLine, $mail);
+		sendEmail(postRequestParameter($userid, $id), $subject, $mail);
 	} // END - if
 
 	// Generate subject
-	$subjectLine = getMessage('ADMIN_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+	$subject = '{--ADMIN_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
 
 	// Send admin notification out
 	if (!empty($subjectPart)) {
-		sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter('userid_raw', $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
 	} else {
-		sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . $table, $content, postRequestParameter('userid_raw', $id));
+		sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
 	}
 }
 
 // Build a special template list
-function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) {
-	$OUT = ''; $SW = 2;
+function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $userid = 'userid') {
+	$OUT = '';
 
 	// "Walk" through all entries
 	foreach ($IDs as $id => $selected) {
@@ -780,35 +787,30 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
 				$idx = array_search($key, $columns, true);
 
 				// Do we have a userid?
-				if ($key == 'userid') {
+				if ($key == $userIdColumn) {
 					// Add it again as raw id
-					$content['userid_raw'] = bigintval($value);
+					$content[$userIdColumn] = bigintval($value);
+					$content[$userIdColumn . '_raw'] = $content[$userIdColumn];
 				} // END - if
 
 				// If the key matches the idColumn variable, we need to temporary remember it
-				//* DEBUG: */ print 'key=' . $key . ',idColumn=' . $idColumn . ',value=' . $value . '<br />';
+				//* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn . ',value=' . $value);
 				if ($key == $idColumn) {
 					// Found, so remember it
 					$GLOBALS['admin_list_builder_id_value'] = $value;
 				} // END - if
 
 				// Handle the call in external function
-				//* DEBUG: */ print 'key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value . '<br />';
+				//* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
 				$content[$key] = handleExtraValues($filterFunctions[$idx], $value, $extraValues[$idx]);
 			} // END - foreach
 
-			// Add color switching
-			$content['sw'] = $SW;
-
 			// Then list it
 			$OUT .= loadTemplate(sprintf("admin_%s_%s_row",
 				$listType,
 				$table
 				), true, $content
 			);
-
-			// Switch color
-			$SW = 3 - $SW;
 		} // END - if
 
 		// Free the result
@@ -824,7 +826,7 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
 }
 
 // Change status of "build" list
-function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray) {
+function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $userid = 'userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
 		// "Walk" through all entries
@@ -861,7 +863,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 					} // END - if
 				} elseif (isset($content[$column])) {
 					// Unfinished!
-					debug_report_bug(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+					debug_report_bug(__FUNCTION__, __LINE__, ':UNFINISHED: id=' . $id . ',column=' . $column . '[' . gettype($statusInfo) . '] = ' . $content[$column]);
 				}
 			} // END - foreach
 
@@ -871,7 +873,7 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 				logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
 
 				// Skip id, raw userid and 'do_$mode'
-				if (!in_array($key, array($idColumn, 'userid_raw', ('do_' . $mode)))) {
+				if (!in_array($key, array($idColumn, $userid, ('do_' . $mode)))) {
 					// Are there brackets () at the end?
 					if (substr($entries[$id], -2, 2) == '()') {
 						// Direct SQL command found
@@ -913,22 +915,26 @@ function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFuncti
 }
 
 // Delete rows by given id numbers
-function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn='id', $userIdColumn='userid') {
+function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
 		// Shall we delete here or list for deletion?
 		if ($deleteNow === true) {
 			// The base SQL command:
-			$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s IN (%s)";
+			$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s` IN (%s)";
 
 			// Delete them all
 			$idList = '';
 			foreach ($IDs as $id => $sel) {
 				// Is there a userid?
-				if (isPostRequestParameterSet('userid_raw', $id)) {
+				if (isPostRequestParameterSet($userid, $id)) {
 					// Load all data from that id
-					$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1",
-					array($table, $idColumn, $id), __FUNCTION__, __LINE__);
+					$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+						array(
+							$table,
+							$idColumn,
+							$id
+						), __FUNCTION__, __LINE__);
 
 					// Fetch the data
 					$content = SQL_FETCHARRAY($result);
@@ -945,12 +951,12 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunct
 			} // END - foreach
 
 			// Run the query
-			SQL_QUERY($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
+			SQL_QUERY_ESC($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
 
 			// Was this fine?
 			if (SQL_AFFECTEDROWS() == count($IDs)) {
 				// All deleted
-				loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_REMOVED'));
+				loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_REMOVED--}');
 			} else {
 				// Some are still there :(
 				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
@@ -963,7 +969,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunct
 }
 
 // Edit rows by given id numbers
-function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn='id', $userIdColumn='userid') {
+function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = 'userid') {
 	// All valid entries? (We hope so here!)
 	if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
 		// Shall we change here or list for editing?
@@ -980,7 +986,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctio
 				);
 				foreach (postRequestArray() as $key => $entries) {
 					// Skip raw userid which is always invalid
-					if ($key == 'userid_raw') {
+					if ($key == $userid) {
 						// Continue with next field
 						continue;
 					} // END - if
@@ -1039,7 +1045,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctio
 			// Was this fine?
 			if ($affected == count($IDs)) {
 				// All deleted
-				loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_EDITED'));
+				loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_EDITED--}');
 			} else {
 				// Some are still there :(
 				loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
@@ -1108,7 +1114,7 @@ function sendAdminPasswordResetLink ($email) {
 	// Is there an account?
 	if (SQL_HASZERONUMS($result)) {
 		// No account found!
-		return getMessage('ADMIN_NO_LOGIN_WITH_EMAIL');
+		return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
 	} // END - if
 
 	// Load all data
@@ -1118,7 +1124,7 @@ function sendAdminPasswordResetLink ($email) {
 	SQL_FREERESULT($result);
 
 	// Generate hash for reset link
-	$content['hash'] = generateHash(getConfig('URL') . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10));
+	$content['hash'] = generateHash(getUrl() . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10));
 
 	// Remove some data
 	unset($content['id']);
@@ -1128,10 +1134,10 @@ function sendAdminPasswordResetLink ($email) {
 	$mailText = loadEmailTemplate('admin_reset_password', $content);
 
 	// Send it out
-	sendEmail($email, getMessage('ADMIN_RESET_PASS_LINK_SUBJ'), $mailText);
+	sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
 
 	// Prepare output
-	return getMessage('ADMIN_RESET_LINK_SENT');
+	return '{--ADMIN_RESET_LINK_SENT--}';
 }
 
 // Validate hash and login for password reset
@@ -1149,7 +1155,7 @@ function adminResetValidateHashLogin ($hash, $login) {
 		$content = SQL_FETCHARRAY($result);
 
 		// Generate hash again
-		$hashFromData = generateHash(getConfig('URL') . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
+		$hashFromData = generateHash(getUrl() . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
 
 		// Does both match?
 		$valid = ($hash == $hashFromData);
@@ -1175,7 +1181,7 @@ function doResetAdminPassword ($login, $password) {
 	runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
 
 	// Return output
-	return getMessage('ADMIN_PASSWORD_RESET_DONE');
+	return '{--ADMIN_PASSWORD_RESET_DONE--}';
 }
 
 // Solves a task by given id number
@@ -1268,7 +1274,7 @@ function generateAdminLink ($adminId) {
 				$adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
 			} else {
 				// Extension not found
-				$adminLink = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'admins');
+				$adminLink = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'admins');
 			}
 		} else {
 			// Maybe deleted?
@@ -1341,12 +1347,89 @@ function doVerifyExpertSettings () {
 	// Output message for other status than ask/agreed
 	if (($return != 'ask') && ($return != 'agreed')) {
 		// Output message
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return)));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
 	} // END - if
 
 	// Return status
 	return $return;
 }
 
+// Generate link to unconfirmed mails for admin
+function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
+	// Init output
+	$OUT = $unconfirmed;
+
+	// Do we have unconfirmed mails?
+	if ($unconfirmed > 0) {
+		// Add link to list_unconfirmed what-file
+		$OUT = '<a href="{%url=modules.php?module=admin&amp;what=list_unconfirmed&amp;' . $type . '=' . $id . '%}">' . translateComma($unconfirmed) . '</a>';
+	} // END - if
+
+	// Return it
+	return $OUT;
+}
+
+// Generates a navigation row for listing emails
+function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=false) {
+	// Don't do anything if $numPages is 1
+	if ($numPages == 1) {
+		// Abort here with empty content
+		return '';
+	} // END - if
+
+	$TOP = '';
+	if ($show_form === false) {
+		$TOP = ' top';
+	} // END - if
+
+	$NAV = '';
+	for ($page = 1; $page <= $numPages; $page++) {
+		// Is the page currently selected or shall we generate a link to it?
+		if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+			// Is currently selected, so only highlight it
+			$NAV .= '<strong>-';
+		} else {
+			// Open anchor tag and add base URL
+			$NAV .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;page=' . $page . '&amp;offset=' . $offset;
+
+			// Add userid when we shall show all mails from a single member
+			if ((isGetRequestParameterSet('userid')) && (isValidUserId(getRequestParameter('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
+
+			// Close open anchor tag
+			$NAV .= '%}">';
+		}
+		$NAV .= $page;
+		if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+			// Is currently selected, so only highlight it
+			$NAV .= '-</strong>';
+		} else {
+			// Close anchor tag
+			$NAV .= '</a>';
+		}
+
+		// Add seperator if we have not yet reached total pages
+		if ($page < $numPages) {
+			// Add it
+			$NAV .= '|';
+		} // END - if
+	} // END - for
+
+	// Define constants only once
+	$content['nav']  = $NAV;
+	$content['span'] = $colspan;
+	$content['top']  = $TOP;
+
+	// Load navigation template
+	$OUT = loadTemplate('admin_email_nav_row', true, $content);
+
+	if ($return === true) {
+		// Return generated HTML-Code
+		return $OUT;
+	} else {
+		// Output HTML-Code
+		outputHtml($OUT);
+	}
+}
+
 // [EOF]
 ?>