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

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 68560831e6..0b483d1c7f 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -99,7 +99,7 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 				$ret = 'done';
 			} else {
 				// Set status
-				$ret = 'pass';
+				$ret = 'password';
 			}
 		} // END - if
 	} // END - if
@@ -139,7 +139,7 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
 			$ret = 'done';
 		} else {
 			// Set status
-			$ret = 'pass';
+			$ret = 'password';
 		}
 	} // END - if
 
@@ -256,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)) {
@@ -289,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;
@@ -322,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">';
@@ -359,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;
@@ -443,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 . ']';
@@ -662,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?
@@ -766,7 +766,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 
 // Build a special template list
 function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $userid = 'userid') {
-	$OUT = ''; $SW = 2;
+	$OUT = '';
 
 	// "Walk" through all entries
 	foreach ($IDs as $id => $selected) {
@@ -805,18 +805,12 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions,
 				$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
@@ -869,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
 
@@ -1120,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
@@ -1130,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']);
@@ -1143,7 +1137,7 @@ function sendAdminPasswordResetLink ($email) {
 	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
@@ -1161,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);
@@ -1187,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
@@ -1399,7 +1393,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 			$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')) && (bigintval(getRequestParameter('userid')) > 0)) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
+			if ((isGetRequestParameterSet('userid')) && (isValidUserId(getRequestParameter('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestParameter('userid'));
 
 			// Close open anchor tag
 			$NAV .= '%}">';