X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=1dd3aa1ca361c916a3e33212b50524acba610c66;hp=16211103a2763161acb911d6ab36d7007a48156b;hb=241acfbd7e38ff9916100dac9d88892713f85c7f;hpb=6b9595ec5034045297bb3461e715a28a4edbde60

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 16211103a2..1dd3aa1ca3 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -42,60 +42,12 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
-// "Getter" for module title
-function getModuleTitle ($module) {
-	// Init variables
-	$data['title'] = '';
-	$result = false;
-
-	// Is the script installed?
-	if (isInstalled()) {
-		// Check if cache is valid
-		if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($module, $GLOBALS['cache_array']['modules']['module']))) {
-			// Load from cache
-			$data['title'] = $GLOBALS['cache_array']['modules']['title'][$module];
-
-			// Update cache hits
-			incrementStatsEntry('cache_hits');
-		} elseif (!isExtensionActive('cache')) {
-			// Load from database
-			$result = SQL_QUERY_ESC("SELECT `title` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
-				array($module), __FUNCTION__, __LINE__);
-
-			// Is the entry there?
-			if (SQL_NUMROWS($result)) {
-				// Get the title from database
-				$data = SQL_FETCHARRAY($result);
-			} // END - if
-
-			// Free the result
-			SQL_FREERESULT($result);
-		}
-	} // END - if
-
-	// Trim name
-	$data['title'] = trim($data['title']);
-
-	// Still no luck or empty title?
-	if (empty($data['title'])) {
-		// No name found
-		$data['title'] = getMaskedMessage('UNKNOWN_MODULE_DETECTED', $module);
-		if ((is_resource($result)) && (SQL_HASZERONUMS($result))) {
-			// Add module to database
-			$dummy = checkModulePermissions($module);
-		} // END - if
-	} // END - if
-
-	// Return name
-	return $data['title'];
-}
-
 // "Getter" for module description
 // @TODO Can we cache this?
 function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
 	// Fix empty 'what'
 	if (empty($what)) {
-		$what = getConfig('index_home');
+		$what = getIndexHome();
 	} // END - if
 
 	// Default is not found
@@ -122,177 +74,6 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
 	return $data['title'];
 }
 
-// Check validity of a given module name (no file extension)
-function checkModulePermissions ($module = '') {
-	// Is it empty (default), then take the current one
-	if (empty($module)) $module = getModule();
-
-	// Do we have cache?
-	if (isset($GLOBALS['module_status'][$module])) {
-		// Then use it
-		return $GLOBALS['module_status'][$module];
-	} // END - if
-
-	// Filter module name (names with low chars and underlines are fine!)
-	$module = preg_replace('/[^a-z_]/', '', $module);
-
-	// Check for prefix is a extension...
-	$modSplit = explode('_', $module);
-	$extension = ''; $module_chk = $module;
-	//* DEBUG: */ debugOutput(__LINE__.'*'.count($modSplit).'/'.$module.'*');
-	if (count($modSplit) == 2) {
-		// Okay, there is a seperator (_) in the name so is the first part a module?
-		//* DEBUG: */ debugOutput(__LINE__.'*'.$modSplit[0].'*');
-		if (isExtensionActive($modSplit[0])) {
-			// The prefix is an extension's name, so let's set it
-			$extension = $modSplit[0]; $module = $modSplit[1];
-		} // END - if
-	} // END - if
-
-	// Major error in module registry is the default
-	$ret = 'major';
-
-	// Check if script is installed if not return a 'done' to prevent some errors
-	if ((isInstallationPhase()) || (!isAdminRegistered())) {
-		// Not installed or no admin registered or in installation phase
-		return 'done';
-	} // END - if
-
-	// Init data array
-	$data = array(
-		'locked'     => 'Y',
-		'hidden'     => 'N',
-		'admin_only' => 'N',
-		'mem_only'   => 'N'
-	);
-
-	// By default nothing is found
-	$found  = false;
-
-	// Check if cache is latest version
-	if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
-		// Is the cache there?
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using cache.');
-		if (isset($GLOBALS['cache_array']['modules']['locked'][$module_chk])) {
-			// Check cache
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cache found.');
-			$data['locked']     = $GLOBALS['cache_array']['modules']['locked'][$module_chk];
-			$data['hidden']     = $GLOBALS['cache_array']['modules']['hidden'][$module_chk];
-			$data['admin_only'] = $GLOBALS['cache_array']['modules']['admin_only'][$module_chk];
-			$data['mem_only']   = $GLOBALS['cache_array']['modules']['mem_only'][$module_chk];
-
-			// Update cache hits
-			incrementStatsEntry('cache_hits');
-			$found = true;
-		} else {
-			// No, then we have to update it!
-			$ret = 'cache_miss';
-		}
-	} elseif (!isExtensionActive('cache')) {
-		// Check for module in database
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Using database.');
-		$result = SQL_QUERY_ESC("SELECT `locked`, `hidden`, `admin_only`, `mem_only` FROM `{?_MYSQL_PREFIX?}_mod_reg` WHERE `module`='%s' LIMIT 1",
-			array($module_chk), __FUNCTION__, __LINE__);
-		if (SQL_NUMROWS($result) == 1) {
-			// Read data
-			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Entry found.');
-			$data = SQL_FETCHARRAY($result);
-			$found = true;
-		} elseif (isDebugModeEnabled()) {
-			// Debug message only in debug-mode...
-			logDebugMessage(__FUNCTION__, __LINE__, 'Module ' . $module_chk . ' not found!');
-		}
-
-		// Free result
-		SQL_FREERESULT($result);
-	}
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret);
-
-	// Is the module found?
-	if ($found === true) {
-		// Check returned values against current access permissions
-		//
-		//  Admin access                   ----- Guest access -----                                     --- Guest   or   member? ---
-		if ((isAdmin()) || (($data['locked'] != 'Y') && ($data['admin_only'] != 'Y') && (($data['mem_only'] != 'Y') || (isMember())))) {
-			// If you are admin you are welcome for everything!
-			$ret = 'done';
-		} elseif ($data['locked'] == 'Y') {
-			// Module is locked
-			$ret = 'locked';
-		} elseif (($data['mem_only'] == 'Y') && (!isMember())) {
-			// You have to login first!
-			$ret = 'mem_only';
-		} elseif (($data['admin_only'] == 'Y') && (!isAdmin())) {
-			// Only the Admin is allowed to enter this module!
-			$ret = 'admin_only';
-		} else {
-			// @TODO Nothing helped???
-			logDebugMessage(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
-				$ret,
-				$data['locked'],
-				$data['admin_only'],
-				$data['mem_only']
-			));
-		}
-	} // END - if
-
-	// Still no luck or not found?
-	if (($found === false) && (!isExtensionActive('cache')) && ($ret != 'done'))  {
-		//              ----- Legacy module -----                                               ---- Module in base folder  ----                       --- Module with extension's name ---
-		if ((isIncludeReadable(sprintf("inc/modules/%s.php", $module))) || (isIncludeReadable(sprintf("%s.php", $module))) || (isIncludeReadable(sprintf("%s/%s.php", $extension, $module)))) {
-			// Data is missing so we add it
-			if (isExtensionInstalledAndNewer('sql_patches', '0.3.6')) {
-				// Since 0.3.6 we have a has_menu column, this took me a half hour
-				// to find a loop here... *sigh*
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
-(`module`, `locked`, `hidden`, `mem_only`, `admin_only`, `has_menu`) VALUES
-('%s','Y','N','N','N','N')", array($module_chk), __FUNCTION__, __LINE__);
-			} else {
-				// Wrong/missing sql_patches!
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_mod_reg`
-(`module`, `locked`, `hidden`, `mem_only`, `admin_only`) VALUES
-('%s','Y','N','N','N')", array($module_chk), __FUNCTION__, __LINE__);
-			}
-
-			// Everthing is fine?
-			if (SQL_AFFECTEDROWS() < 1) {
-				// Something bad happend!
-				return 'major';
-			} // END - if
-
-			// Destroy cache here
-			// @TODO Rewrite this to a filter
-			if ((getOutputMode() == '0') || (getOutputMode() == -1)) rebuildCache('modules', 'modules');
-
-			// And reload data
-			unset($GLOBALS['module_status'][$module]);
-			$ret = checkModulePermissions($module_chk);
-		} else {
-			// Module not found we don't add it to the database
-			$ret = '404';
-		}
-	} elseif (($ret == 'cache_miss') && (getOutputMode() == '0')) {
-		// Rebuild the cache files
-		rebuildCache('modules', 'modules');
-	} elseif ($found === false) {
-		// Problem with module detected
-		logDebugMessage(__FUNCTION__, __LINE__, sprintf("Problem in module %s detected. ret=%s, locked=%s, hidden=%s, mem=%s, admin=%s, output_mode=%s",
-			$module,
-			$ret,
-			$data['locked'],
-			$data['hidden'],
-			$data['mem_only'],
-			$data['admin_only'],
-			getOutputMode()
-		));
-	}
-
-	// Return the value
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret);
-	$GLOBALS['module_status'][$module] = $ret;
-	return $ret;
-}
-
 // Add menu description pending on given file name (without path!)
 function addMenuDescription ($accessLevel, $FQFN, $return = false) {
 	// Use only filename of the FQFN...
@@ -328,7 +109,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
 		if (isAdmin()) $ADD = '';
 
 		$dummy = substr($search, 0, -4);
-		$ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
+		$ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
 	} elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
 		// Sponsor / engine menu
 		$type     = 'what';
@@ -427,7 +208,7 @@ ORDER BY
 		array($mode), __FUNCTION__, __LINE__);
 
 	//* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
-	if (SQL_NUMROWS($result_main) > 0) {
+	if (!SQL_HASZERONUMS($result_main)) {
 		// There are menus available, so we simply display them... :)
 		$GLOBALS['rows'] = '';
 		while ($content = SQL_FETCHARRAY($result_main)) {
@@ -456,7 +237,7 @@ ORDER BY
 				array($mode, $content['action']), __FUNCTION__, __LINE__);
 
 			// Do we have some entries?
-			if (SQL_NUMROWS($result_sub) > 0) {
+			if (!SQL_HASZERONUMS($result_sub)) {
 				// Init counter
 				$cnt = '0';
 
@@ -481,11 +262,11 @@ ORDER BY
 						$OUT .= '<a name="menu" class="menu_blur" href="{%url=modules.php?module=' . getModule() . '&amp;what=' . $content['sub_what'] . '%}" target="_self">';
 					} else {
 						// Not found! - open
-						$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=' . $content['sub_what'] . '%}">';
 					}
 
 					// Menu title
-					$OUT .= getConfig('menu_blur_spacer') . $content['sub_title'];
+					$OUT .= '{?menu_blur_spacer?}' . $content['sub_title'];
 
 					if (isIncludeReadable($inc)) {
 						$OUT .= '</a>';
@@ -733,7 +514,7 @@ function fetchUserData ($userid, $column = 'userid') {
 }
 
 // This patched function will reduce many SELECT queries for the specified or current admin login
-function isAdmin ($adminLogin = '') {
+function isAdmin () {
 	// No admin in installation phase!
 	if ((isInstallationPhase()) || (!isAdminRegistered())) {
 		return false;
@@ -741,39 +522,45 @@ function isAdmin ($adminLogin = '') {
 
 	// Init variables
 	$ret = false;
+	$adminId = '0';
 	$passCookie = '';
 	$valPass = '';
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId);
 
 	// If admin login is not given take current from cookies...
-	if ((empty($adminLogin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
+	if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5'))) {
 		// Get admin login and password from session/cookies
-		$adminLogin = getSession('admin_login');
+		$adminId    = getSession('admin_id');
 		$passCookie = getSession('admin_md5');
 	} // END - if
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminLogin.'/'.$passCookie);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId.'/'.$passCookie);
+
+	// Abort if admin id is zero
+	if ($adminId == '0') {
+		return false;
+	} // END - if
 
 	// Do we have cache?
-	if (!isset($GLOBALS['is_admin'][$adminLogin])) {
+	if (!isset($GLOBALS['is_admin'][$adminId])) {
 		// Init it with failed
-		$GLOBALS['is_admin'][$adminLogin] = false;
+		$GLOBALS['is_admin'][$adminId] = false;
 
 		// Search in array for entry
 		if (isset($GLOBALS['admin_hash'])) {
 			// Use cached string
 			$valPass = $GLOBALS['admin_hash'];
-		} elseif ((!empty($passCookie)) && (isAdminHashSet($adminLogin) === true) && (!empty($adminLogin))) {
+		} elseif ((!empty($passCookie)) && (isAdminHashSet($adminId) === true) && (!empty($adminId))) {
 			// Login data is valid or not?
-			$valPass = encodeHashForCookie(getAdminHash($adminLogin));
+			$valPass = encodeHashForCookie(getAdminHash($adminId));
 
 			// Cache it away
 			$GLOBALS['admin_hash'] = $valPass;
 
 			// Count cache hits
 			incrementStatsEntry('cache_hits');
-		} elseif ((!empty($adminLogin)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminLogin) === false))) {
+		} elseif ((!empty($adminId)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminId) === false))) {
 			// Get admin hash and hash it
-			$valPass = encodeHashForCookie(getAdminHash($adminLogin));
+			$valPass = encodeHashForCookie(getAdminHash($adminId));
 
 			// Cache it away
 			$GLOBALS['admin_hash'] = $valPass;
@@ -782,12 +569,12 @@ function isAdmin ($adminLogin = '') {
 		if (!empty($valPass)) {
 			// Check if password is valid
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
-			$GLOBALS['is_admin'][$adminLogin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
+			$GLOBALS['is_admin'][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
 		} // END - if
 	} // END - if
 
 	// Return result of comparision
-	return $GLOBALS['is_admin'][$adminLogin];
+	return $GLOBALS['is_admin'][$adminId];
 }
 
 // Generates a list of "max receiveable emails per day"
@@ -814,7 +601,7 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
 	}
 
 	// Some entries are found?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			$OUT .= '      <option value="' . $content['value'] . '"';
@@ -945,7 +732,7 @@ function getActionFromModuleWhat ($module, $what) {
 		}
 	} elseif ((empty($what)) && ($module != 'admin')) {
 		// Use configured 'home'
-		$what = getConfig('index_home');
+		$what = getIndexHome();
 	} // END - if
 
 	if ($module == 'admin') {
@@ -1121,22 +908,22 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
 		// Count or sum whole table?
 		if ($countRows === true) {
 			// Count whole table
-			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+			$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
 				array($lookFor, $tableName), __FUNCTION__, __LINE__);
 		} else {
 			// Sum whole table
-			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+			$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
 				array($lookFor, $tableName), __FUNCTION__, __LINE__);
 		}
 	} elseif (($countRows === true) || ($lookFor == 'userid')) {
 		// Count rows
 		//* DEBUG: */ debugOutput('COUNT!');
-		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+		$result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
 			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
 	} else {
 		// Add all rows
 		//* DEBUG: */ debugOutput('SUM!');
-		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+		$result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
 			array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
 	}
 
@@ -1202,12 +989,12 @@ function getReferalLevelPercents ($level) {
  * userid         = Referal id wich should receive...
  * points      = ... xxx points
  * sendNotify  = shall I send the referal an email or not?
- * rid         = inc/modules/guest/what-confirm.php need this
+ * refid       = inc/modules/guest/what-confirm.php need this
  * locked      = Shall I pay it to normal (false) or locked (true) points ammount?
  * add_mode    = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
  *               for default value will cause no referal will get points ever!!!)
  */
-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $rid = '0', $locked = false, $add_mode = 'ref') {
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $locked = false, $add_mode = 'ref') {
 	//* DEBUG: */ debugOutput('----------------------- <font color="#00aa00">' . __FUNCTION__ . ' - ENTRY</font> ------------------------<ul><li>');
 	// Convert mode to lower-case
 	$add_mode = strtolower($add_mode);
@@ -1225,7 +1012,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 		'userid'   => $userid,
 		'points'   => $points,
 		'notify'   => $sendNotify,
-		'rid'      => $rid,
+		'refid'    => $refid,
 		'locked'   => $locked,
 		'mode'     => 'add',
 		'sub_mode' => $add_mode,
@@ -1288,13 +1075,12 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 			} // END - if
 
 			// Points updated, maybe I shall send him an email?
-			if (($sendNotify === true) && (getUserData('refid') > 0) && ($locked === false)) {
+			if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
 				// Prepare content
 				$content = array(
 					'percents' => $per,
 					'level'    => bigintval($GLOBALS['ref_level']),
 					'points'   => $ref_points,
-					'refid'    => getUserData('refid')
 				);
 
 				// Load email template
@@ -1313,12 +1099,12 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 				$message = loadEmailTemplate('add-points', $content, $userid);
 
 				// And sent it away
-				sendEmail($userid, '{--SUBJECT_DIRECT_PAYMENT--}', $message);
+				sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
 				if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
 			}
 
 			// Maybe there's another ref?
-			if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
+			if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
 				// Then let's credit him here...
 				//* DEBUG: */ debugOutput(__FUNCTION__ . '(<font color="#0000aa">' . __LINE__ . '</font>):userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
 				addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
@@ -1375,6 +1161,7 @@ function updateReferalCounter ($userid) {
 	$GLOBALS['cache_array']['ref_level'][$userid]--;
 
 	// Handle refback here if extension is installed
+	// @TODO Rewrite this to a filter
 	if (isExtensionActive('refback')) {
 		updateRefbackTable($userid);
 	} // END - if
@@ -1432,10 +1219,7 @@ function getCurrentAdminId () {
 	// Do we have cache?
 	if (!isset($GLOBALS['current_admin_id'])) {
 		// Get the admin login from session
-		$adminLogin = getSession('admin_login');
-
-		// "Solve" it into an id
-		$adminId = getAdminId($adminLogin);
+		$adminId = getSession('admin_id');
 
 		// Remember in cache securely
 		setCurrentAdminId(bigintval($adminId));
@@ -1452,20 +1236,20 @@ function setCurrentAdminId ($currentAdminId) {
 }
 
 // Get password hash from administrator's login name
-function getAdminHash ($adminLogin) {
+function getAdminHash ($adminId) {
 	// By default an invalid hash is returned
 	$data['password'] = '-1';
 
-	if (isAdminHashSet($adminLogin)) {
+	if (isAdminHashSet($adminId)) {
 		// Check cache
-		$data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminLogin];
+		$data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminId];
 
 		// Update cache hits
 		incrementStatsEntry('cache_hits');
 	} elseif (!isExtensionActive('cache')) {
 		// Load from database
-		$result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
-			array($adminLogin), __FUNCTION__, __LINE__);
+		$result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+			array(bigintval($adminId)), __FUNCTION__, __LINE__);
 
 		// Do we have an entry?
 		if (SQL_NUMROWS($result) == 1) {
@@ -1473,7 +1257,7 @@ function getAdminHash ($adminLogin) {
 			$data = SQL_FETCHARRAY($result);
 
 			// Set cache
-			setAdminHash($adminLogin, $data['password']);
+			setAdminHash($adminId, $data['password']);
 		} // END - if
 
 		// Free result
@@ -1622,7 +1406,7 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
 			), __FUNCTION__, __LINE__);
 
 		// Do we have rows?
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Found data so add them as OPTION lines: $id is the value and $name is the "name" of the option
 			// @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
 			while (list($value, $title, $add) = SQL_FETCHROW($result)) {
@@ -1659,9 +1443,7 @@ function FILTER_ACTIVATE_EXCHANGE () {
 	} // END - if
 
 	// Check total amount of users
-	$totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND max_mails > 0');
-
-	if ($totalUsers >= getConfig('activate_xchange')) {
+	if (getTotalConfirmedUser() >= getConfig('activate_xchange')) {
 		// Activate System
 		setSqlsArray(array(
 			"UPDATE `{?_MYSQL_PREFIX?}_mod_reg` SET `locked`='N', `hidden`='N', `mem_only`='Y' WHERE `module`='order' LIMIT 1",
@@ -1732,11 +1514,10 @@ LIMIT 1",
 
 	// Add reason and translate points
 	$data['text']   = $reason;
-	$data['points'] = translateComma($data['points']);
 
 	// Now a mail to the user and that's all...
 	$message = loadEmailTemplate('del-user', $data, $userid);
-	sendEmail($userid, '{--ADMIN_DEL_ACCOUNT--}', $message);
+	sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message);
 
 	// Ok, delete the account!
 	SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
@@ -1764,7 +1545,7 @@ function getWhatFromModule ($modCheck) {
 			// Is ext-sql_patches installed and newer than 0.0.5?
 			if (isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
 				// Use it from config
-				$what = getConfig('index_home');
+				$what = getIndexHome();
 			} else {
 				// Use default 'welcome'
 				$what = 'welcome';
@@ -1799,21 +1580,9 @@ function subtractPoints ($subject, $userid, $points) {
 }
 
 // "Getter" for total available receivers
-function getTotalReceivers ($mode='normal') {
-	// Query database
-	$result_all = SQL_QUERY("SELECT
-	`userid`
-FROM
-	`{?_MYSQL_PREFIX?}_user_data`
-WHERE
-	`status`='CONFIRMED' AND `receive_mails` > 0 ".runFilterChain('exclude_users', $mode),
-	__FUNCTION__, __LINE__);
-
+function getTotalReceivers ($mode = 'normal') {
 	// Get num rows
-	$numRows = SQL_NUMROWS($result_all);
-
-	// Free result
-	SQL_FREERESULT($result_all);
+	$numRows = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, ' AND `receive_mails` > 0' . runFilterChain('exclude_users', $mode));
 
 	// Return value
 	return $numRows;
@@ -1837,7 +1606,7 @@ function generateCategoryOptionsList ($mode) {
 		__FUNCTION__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// ... and begin loading stuff
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Transfer some data
@@ -1875,7 +1644,7 @@ function generateCategoryOptionsList ($mode) {
 		} // END - foreach
 	} else {
 		// No cateogries are defined yet
-		$OUT = '<option class="member_failed">{--MEMBER_NO_CATS--}</option>';
+		$OUT = '<option class="member_failed">{--MEMBER_NO_CATEGORIES--}</option>';
 	}
 
 	// Return HTML code
@@ -2044,11 +1813,11 @@ ORDER BY
 		), __FUNCTION__, __LINE__);
 
 	// Are there some entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Fetch all entries
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Get total points of this user
-			$row['points'] = countSumTotalData($row['refid'], 'user_points', 'points') - countSumTotalData($row['refid'], 'user_data', 'used_points');
+			$row['points'] = getTotalPoints($row['refid']);
 
 			// Get unconfirmed mails
 			$row['unconfirmed']  = countSumTotalData($row['refid'], 'user_links', 'id', 'userid', true);
@@ -2066,7 +1835,7 @@ ORDER BY
 			$row['activity'] = '{--MEMBER_ACTIVITY_ACTIVE--}';
 
 			// Is autopurge installed and the user inactive?
-			if ((isExtensionActive('autopurge')) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online']))  {
+			if ((isExtensionActive('autopurge')) && ((time() - getApInactiveSince()) >= $row['last_online']))  {
 				// Inactive user!
 				$row['activity'] = '{--MEMBER_ACTIVITY_INACTIVE--}';
 			} // END - if
@@ -2096,7 +1865,7 @@ function reduceRecipientReceivedMails ($column, $id, $count) {
 		array($column, bigintval($id), $count), __FUNCTION__, __LINE__);
 
 	// Are there entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Now load all userids for one big query!
 		$userids = array();
 		while ($data = SQL_FETCHARRAY($result)) {