X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=8be13d2e1652d116158aa7125d7a0872524d4fb8;hp=57a889db6c197ca5ad162709d20716beac2a32eb;hb=ca256746fe0757a23df4064824c8fe2087ad5634;hpb=387d390181f4aefd6d1e6d8fe16d9697801e99d7

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 57a889db6c..8be13d2e16 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -92,7 +92,7 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 	$adminId = getAdminId($adminLogin);
 
 	// Continue only with found admin ids
-	if ($adminId > 0) {
+	if (isValidId($adminId)) {
 		// Then we need to lookup the login name by getting the admin hash
 		$adminHash = getAdminHash($adminId);
 
@@ -541,7 +541,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 	if (!SQL_HASZERONUMS($result)) {
 		// Load menu as selection
 		$OUT = '<select name="' . $mode . '_menu';
-		if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
+		if (!isValidId($defid)) $OUT .= '[' . intval($defid) . ']';
 		$OUT .= '" size="1" class="form_select">
 	<option value="">{--SELECT_NONE--}</option>';
 		// Load all entries
@@ -586,7 +586,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	//* BUG: */ reportBug(__FUNCTION__, __LINE__, '<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
 	foreach ($postData as $id => $val) {
 		// Process only formular field but not submit buttons ;)
-		if ($id =='save_config') {
+		if ($id == 'save_config') {
 			// Skip this button
 			continue;
 		} // END - if
@@ -737,10 +737,10 @@ function generateUserProfileLink ($userid, $title = '', $what = '') {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$userid][$title . '_' . $what])) {
 		// Is title empty and valid userid?
-		if (($title == '') && (isValidUserId($userid))) {
+		if (($title == '') && (isValidId($userid))) {
 			// Set userid as title
 			$title = $userid;
-		} elseif (!isValidUserId($userid)) {
+		} elseif (!isValidId($userid)) {
 			// User id zero is invalid
 			return '<strong>' . convertNullToZero($userid) . '</strong>';
 		}
@@ -942,7 +942,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 		// Add other columns as well
 		foreach (postRequestArray() as $key => $entries) {
 			// Debug message
-			logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
+			/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
 
 			// Skip id, raw userid and 'do_$mode'
 			if (!in_array($key, array($idColumn[0], $rawUserId[0], ('do_' . $mode)))) {
@@ -957,7 +957,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 					// Add entry
 					$content[$key] = $entries[$id];
 				}
-			} else {
+			} elseif (isDebugModeEnabled()) {
 				// Skipped entry
 				logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
 			}
@@ -1128,7 +1128,7 @@ function adminTestProxySettings ($settingsArray) {
 	mergeConfig($settingsArray);
 
 	// Now get the test URL
-	$content = sendGetRequest('check-updates3.php');
+	$content = sendHttpGetRequest('check-updates3.php');
 
 	// Is the first line with "200 OK"?
 	$valid = isInString('200 OK', $content[0]);
@@ -1284,7 +1284,7 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
 // Creates a link to the user's admin-profile
 function adminCreateUserLink ($userid) {
 	// Is the userid set correctly?
-	if (isValidUserId($userid)) {
+	if (isValidId($userid)) {
 		// Create a link to that profile
 		return '{%url=modules.php?module=admin&amp;what=list_user&amp;userid=' . bigintval($userid) . '%}';
 	} // END - if
@@ -1299,7 +1299,7 @@ function generateAdminLink ($adminId) {
 	$adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}';
 
 	// Zero? = Not assigned
-	if (isValidUserId($adminId)) {
+	if (isValidId($adminId)) {
 		// Load admin's login
 		$login = getAdminLogin($adminId);
 
@@ -1434,7 +1434,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 ((isGetRequestElementSet('userid')) && (isValidUserId(getRequestElement('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
+			if ((isGetRequestElementSet('userid')) && (isValidId(getRequestElement('userid')))) $NAV .= '&amp;userid=' . bigintval(getRequestElement('userid'));
 
 			// Close open anchor tag
 			$NAV .= '%}">';