X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=6eee1eddf6e93996b89532899bfbb5c77fb54678;hp=5d655b2f74b4fac3935630f250db0f6b54d4a08f;hb=49acdb7a7adbcf25a8e8683b5581bfcec72b23bd;hpb=8da353fa4bb729bb3299d247803c23833a52a327

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 5d655b2f74..6eee1eddf6 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,19 +42,22 @@ if (!defined('__SECURITY')) {
 
 // Register an administrator account
 function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'deny') {
+	// Only let valid data pass
+	assert(in_array($accessLevel, array('allow', 'deny')));
+
 	// Login does already exist
 	$ret = 'already';
 
 	// Lookup the admin
-	$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+	$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
 		array($adminLogin), __FUNCTION__, __LINE__);
 
 	// Is the entry there?
-	if (SQL_HASZERONUMS($result)) {
+	if (ifSqlHasZeroNumRows($result)) {
 		// Is ext-admins installed and version at least 0.3.0?
 		if (isExtensionInstalledAndNewer('admins', '0.3.0')) {
 			// Ok, let's create the admin login
-			SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`, `default_acl`) VALUES ('%s', '%s', '%s', '%s')",
+			sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`, `default_acl`) VALUES ('%s', '%s', '%s', '%s')",
 				array(
 					$adminLogin,
 					$passHash,
@@ -63,7 +66,7 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'd
 				), __FUNCTION__, __LINE__);
 		} else {
 			// Ok, let's create the admin login
-			SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
+			sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
 				array(
 					$adminLogin,
 					$passHash,
@@ -76,7 +79,7 @@ function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'd
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return result
 	return $ret;
@@ -132,6 +135,8 @@ function ifAdminLoginDataIsValid ($adminLogin, $adminPassword) {
 
 // Only be executed on cookie checking
 function ifAdminCookiesAreValid ($adminLogin, $passHash) {
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminLogin=' . $adminLogin . ',passHash=' . $passHash . ' - CALLED!');
+
 	// First of all, no admin login is found
 	$ret = '404';
 
@@ -158,7 +163,7 @@ function ifAdminCookiesAreValid ($adminLogin, $passHash) {
 	} // END - if
 
 	// Return status
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret='.$ret);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . $ret . ' - EXIT!');
 	return $ret;
 }
 
@@ -187,7 +192,7 @@ function doAdminAction () {
 	loadTemplate('admin_main', FALSE, $content);
 
 	// Check if action/what pair is valid
-	$result_action = SQL_QUERY_ESC("SELECT
+	$result_action = sqlQueryEscaped("SELECT
 	`id`
 FROM
 	`{?_MYSQL_PREFIX?}_admin_menu`
@@ -212,9 +217,9 @@ LIMIT 1",
 		), __FUNCTION__, __LINE__);
 
 	// Is there an entry?
-	if (SQL_NUMROWS($result_action) == 1) {
+	if (sqlNumRows($result_action) == 1) {
 		// Is valid but does the inlcude file exists?
-		$inc = sprintf("inc/modules/admin/action-%s.php", $action);
+		$inc = sprintf('inc/modules/admin/action-%s.php', $action);
 		if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === TRUE)) {
 			// Ok, we finally load the admin action module
 			loadInclude($inc);
@@ -231,7 +236,7 @@ LIMIT 1",
 	}
 
 	// Free memory
-	SQL_FREERESULT($result_action);
+	sqlFreeResult($result_action);
 
 	// Tableset footer
 	loadTemplate('admin_main_footer', FALSE, $content);
@@ -264,7 +269,7 @@ function addAdminMenu ($action, $what) {
 	$GLOBALS['menu']['title']       = array();
 
 	// Build main menu
-	$result_main = SQL_QUERY("SELECT
+	$result_main = sqlQuery("SELECT
 	`action` AS `main_action`,
 	`title` AS `main_title`,
 	`descr` AS `main_descr`
@@ -277,13 +282,13 @@ ORDER BY
 	`id` DESC", __FUNCTION__, __LINE__);
 
 	// Are there entries?
-	if (!SQL_HASZERONUMS($result_main)) {
+	if (!ifSqlHasZeroNumRows($result_main)) {
 		$OUT .= '<ul class="admin_menu_main">';
 
 		// Load all 'action' menus
-		while ($mainContent = SQL_FETCHARRAY($result_main)) {
+		while ($mainContent = sqlFetchArray($result_main)) {
 			// Filename
-			$inc = sprintf("inc/modules/admin/action-%s.php", $mainContent['main_action']);
+			$inc = sprintf('inc/modules/admin/action-%s.php', $mainContent['main_action']);
 
 			// Is the current admin allowed to access this 'action' menu?
 			if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
@@ -331,7 +336,7 @@ ORDER BY
 		$OUT .= '</ul>';
 
 		// Free memory
-		SQL_FREERESULT($result_main);
+		sqlFreeResult($result_main);
 	} // END - if
 
 	// Return content
@@ -344,7 +349,7 @@ function addAdminSubMenu ($mainContent, $action, $what) {
 	$OUT = '';
 
 	// Check for menu entries
-	$result_what = SQL_QUERY_ESC("SELECT
+	$result_what = sqlQueryEscaped("SELECT
 	`what` AS `sub_what`,
 	`title` AS `sub_title`,
 	`descr` AS `sub_descr`
@@ -360,7 +365,7 @@ ORDER BY
 		array($mainContent['main_action']), __FUNCTION__, __LINE__);
 
 	// Remember the count for later checks
-	setAdminMenuHasEntries($mainContent['main_action'], ((!SQL_HASZERONUMS($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
+	setAdminMenuHasEntries($mainContent['main_action'], ((!ifSqlHasZeroNumRows($result_what)) && (($action == $mainContent['main_action']) || (isAdminMenuJavascriptEnabled()))));
 
 	// Start li-tag for sub menu content
 	$OUT .= '<li class="admin_menu_sub" id="action_menu_' . $mainContent['main_action'] . '"' . addStyleMenuContent('admin', $mainContent['main_action'], $action) . '>';
@@ -371,14 +376,14 @@ ORDER BY
 		$SUB = TRUE;
 
 		// Are there entries?
-		if (!SQL_HASZERONUMS($result_what)) {
+		if (!ifSqlHasZeroNumRows($result_what)) {
 			// Start HTML code
 			$OUT .= '<ul class="admin_menu_sub">';
 
 			// Load all entries
-			while ($subContent = SQL_FETCHARRAY($result_what)) {
+			while ($subContent = sqlFetchArray($result_what)) {
 				// Filename
-				$inc = sprintf("inc/modules/admin/what-%s.php", $subContent['sub_what']);
+				$inc = sprintf('inc/modules/admin/what-%s.php', $subContent['sub_what']);
 
 				// Is the current admin allowed to access this 'what' menu?
 				if (isAdminAllowedAccessMenu(NULL, $subContent['sub_what'])) {
@@ -421,7 +426,7 @@ ORDER BY
 		} // END - if
 
 		// Free memory
-		SQL_FREERESULT($result_what);
+		sqlFreeResult($result_what);
 	} // END - if
 
 	// Close li-tag
@@ -443,7 +448,7 @@ function addAdminSelectionBox ($adminId = NULL, $special = '') {
 	} // END - if
 
 	// Query all entries
-	$result = SQL_QUERY('SELECT
+	$result = sqlQuery('SELECT
 	`id`,
 	`login`
 	' . $ADD . '
@@ -456,7 +461,7 @@ ORDER BY
 	$OUT = '';
 
 	// Load all entries
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($content = sqlFetchArray($result)) {
 		// Default is none
 		$content['default'] = '';
 
@@ -471,7 +476,7 @@ ORDER BY
 	} // END - if
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Add form to content
 	$content['form_selection'] = $OUT;
@@ -483,7 +488,7 @@ ORDER BY
 // Create a member selection box
 function addMemberSelectionBox ($userid = NULL, $add_all = FALSE, $return = FALSE, $none = FALSE, $field = 'userid', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {
 	// Output selection form with all confirmed user accounts listed
-	$result = SQL_QUERY('SELECT
+	$result = sqlQuery('SELECT
 	`userid`,
 	`surname`,
 	`family`
@@ -504,17 +509,17 @@ ORDER BY
 	}
 
 	// Load all entries
-	while ($content = SQL_FETCHARRAY($result)) {
+	while ($content = sqlFetchArray($result)) {
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . intval($userid) . '/' . $content['userid']);
 		$OUT .= '<option value="' . bigintval($content['userid']) . '"';
-		if (bigintval($userid, FALSE, FALSE) === bigintval($content['userid'])) {
+		if ($userid === $content['userid']) {
 			$OUT .= ' selected="selected"';
 		} // END - if
-		$OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ')</option>';
+		$OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . $content['userid'] . ')</option>';
 	} // END - while
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	if ($return === FALSE) {
 		// Remeber options in constant
@@ -536,16 +541,16 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 	$what = "`what` != '' AND `what` IS NOT NULL";
 	if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` != 'login'";
 
-	$result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
+	$result = sqlQueryEscaped("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
 		array($mode), __FUNCTION__, __LINE__);
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNumRows($result)) {
 		// Load menu as selection
 		$OUT = '<select name="' . $mode . '_menu';
 		if (!isValidId($defid)) $OUT .= '[' . intval($defid) . ']';
 		$OUT .= '" size="1" class="form_select">
 	<option value="">{--SELECT_NONE--}</option>';
 		// Load all entries
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			$OUT .= '<option value="' . $content['menu'] . '"';
 			if ((!empty($default)) && ($default == $content['menu'])) {
 				$OUT .= ' selected="selected"';
@@ -554,7 +559,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Add closing select-tag
 		$OUT .= '</select>';
@@ -611,10 +616,10 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 			// Shall we add numbers or strings?
 			if ('' . $val . '' == '' . $test . '') {
 				// Add numbers
-				array_push($tableData, sprintf("`%s`=%s", $id, $test));
+				array_push($tableData, sprintf('`%s`=%s', $id, $test));
 			} elseif (is_null($val)) {
 				// Add NULL
-				array_push($tableData, sprintf("`%s`=NULL", $id));
+				array_push($tableData, sprintf('`%s`=NULL', $id));
 			} else {
 				// Add strings
 				array_push($tableData, sprintf("`%s`='%s'", $id, trim($val)));
@@ -632,18 +637,18 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	$result = FALSE;
 	if ($alwaysAdd === FALSE) {
 		if (!empty($whereStatement)) {
-			$result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
+			$result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}' . $tableName . '` WHERE ' . $whereStatement . ' LIMIT 1', __FUNCTION__, __LINE__);
 		} else {
-			$result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` LIMIT 1", __FUNCTION__, __LINE__);
+			$result = sqlQuery('SELECT * FROM `{?_MYSQL_PREFIX?}' . $tableName . '` LIMIT 1', __FUNCTION__, __LINE__);
 		}
 	} // END - if
 
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// "Implode" all data to single string
 		$updatedData = implode(', ', $tableData);
 
 		// Generate SQL string
-		$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}%s` SET %s WHERE %s LIMIT 1",
+		$sql = sprintf('UPDATE `{?_MYSQL_PREFIX?}%s` SET %s WHERE %s LIMIT 1',
 			$tableName,
 			$updatedData,
 			$whereStatement
@@ -663,7 +668,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 		$values = implode(', '  , $values);
 
 		// Generate SQL string
-		$sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}%s` (%s) VALUES (%s)",
+		$sql = sprintf('INSERT INTO `{?_MYSQL_PREFIX?}%s` (%s) VALUES (%s)',
 			$tableName,
 			$keys,
 			$values
@@ -671,13 +676,13 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 	}
 
 	// Free memory
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Simply run generated SQL string
-	SQL_QUERY($sql, __FUNCTION__, __LINE__);
+	sqlQuery($sql, __FUNCTION__, __LINE__);
 
 	// Remember affected rows
-	$affected = SQL_AFFECTEDROWS();
+	$affected = sqlAffectedRows();
 
 	// Rebuild cache
 	rebuildCache('config', 'config');
@@ -695,7 +700,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
 // Generate a selection box
 function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 	// Open the requested menu directory
-	$menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', FALSE, FALSE);
+	$menuArray = getArrayFromDirectory(sprintf('inc/modules/%s/', $menu), $type . '-', FALSE, FALSE);
 
 	// Init the selection box
 	$OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
@@ -705,7 +710,7 @@ function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
 		// Is this a PHP script?
 		if ((!isDirectory($file)) && (isInString('' . $type . '-', $file)) && (isInString('.php', $file))) {
 			// Then test if the file is readable
-			$test = sprintf("inc/modules/%s/%s", $menu, $file);
+			$test = sprintf('inc/modules/%s/%s', $menu, $file);
 
 			// Is the file there?
 			if (isIncludeReadable($test)) {
@@ -799,17 +804,17 @@ 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 = sqlQueryEscaped('SELECT `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1',
 			array($adminId), __FUNCTION__, __LINE__);
 
 		// Is there an entry?
-		if (SQL_NUMROWS($result) == 1) {
+		if (sqlNumRows($result) == 1) {
 			// Load data
-			list($adminMode) = SQL_FETCHROW($result);
+			list($adminMode) = sqlFetchRow($result);
 		} // END - if
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	}
 
 	// Check what the admin wants and set it when it's not the default mode
@@ -833,7 +838,7 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 			// Should always be set... ;-)
 			if (!empty($selected)) {
 				// Determine new status
-				$result = SQL_QUERY_ESC("SELECT %s FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1",
+				$result = sqlQueryEscaped('SELECT %s FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1',
 					array(
 						$row,
 						$table,
@@ -842,15 +847,15 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 					), __FUNCTION__, __LINE__);
 
 				// Row found?
-				if (SQL_NUMROWS($result) == 1) {
+				if (sqlNumRows($result) == 1) {
 					// Load the status
-					list($currStatus) = SQL_FETCHROW($result);
+					list($currStatus) = sqlFetchRow($result);
 
 					// And switch it N<->Y
 					$newStatus = convertBooleanToYesNo(!($currStatus == 'Y'));
 
 					// Change this status
-					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
+					sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s` SET `%s`='%s' WHERE `%s`=%s LIMIT 1",
 						array(
 							$table,
 							$row,
@@ -860,11 +865,11 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
 						), __FUNCTION__, __LINE__);
 
 					// Count up affected rows
-					$count += SQL_AFFECTEDROWS();
+					$count += sqlAffectedRows();
 				} // END - if
 
 				// Free the result
-				SQL_FREERESULT($result);
+				sqlFreeResult($result);
 			} // END - if
 		} // END - foreach
 
@@ -900,10 +905,10 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 	// "Walk" through all entries
 	foreach (postRequestElement($idColumn[0]) as $id => $sel) {
 		// Construct SQL query
-		$sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET", SQL_ESCAPE($tableName[0]));
+		$sql = sprintf('UPDATE `{?_MYSQL_PREFIX?}_%s` SET', sqlEscapeString($tableName[0]));
 
 		// Load data of entry
-		$result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+		$result = sqlQueryEscaped('SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1',
 			array(
 				$tableName[0],
 				$idColumn[0],
@@ -911,10 +916,10 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 			), __FUNCTION__, __LINE__);
 
 		// Fetch the data
-		$content = SQL_FETCHARRAY($result);
+		$content = sqlFetchArray($result);
 
 		// Free the result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		// Add all status entries (e.g. status column last_updated or so)
 		$newStatus = 'UNKNOWN';
@@ -924,7 +929,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 			// Does the entry exist?
 			if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
 				// Add these entries for update
-				$sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
+				$sql .= sprintf(" `%s`='%s',", sqlEscapeString($column), sqlEscapeString($statusInfo[$content[$column]]));
 
 				// Remember status
 				if ($statusColumn == 'unknown') {
@@ -949,10 +954,10 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 				// Are there brackets () at the end?
 				if (substr($entries[$id], -2, 2) == '()') {
 					// Direct SQL command found
-					$sql .= sprintf(" `%s`=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+					$sql .= sprintf(' `%s`=%s,', sqlEscapeString($key), sqlEscapeString($entries[$id]));
 				} else {
 					// Add regular entry
-					$sql .= sprintf(" `%s`='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+					$sql .= sprintf(" `%s`='%s',", sqlEscapeString($key), sqlEscapeString($entries[$id]));
 
 					// Add entry
 					$content[$key] = $entries[$id];
@@ -972,7 +977,7 @@ function adminBuilderStatusHandler ($mode, $tableName, $columns, $filterFunction
 		);
 
 		// Run the SQL
-		SQL_QUERY($sql, __FUNCTION__, __LINE__);
+		sqlQuery($sql, __FUNCTION__, __LINE__);
 
 		// Send "build mails" out
 		sendGenericBuildMails($mode, $tableName, $content, $id, $statusInfo[$content[$column]], $userIdColumn);
@@ -1007,7 +1012,7 @@ function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunct
 			displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
 		} else {
 			// Some are still there :(
-			displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), countPostSelection($idColumn[0])));
+			displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), sqlAffectedRows(), countPostSelection($idColumn[0])));
 		}
 	} else {
 		// List for deletion confirmation
@@ -1113,7 +1118,7 @@ function adminAddEntries ($tableName, $columns = array(), $filterFunctions = arr
 	doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
 
 	// Entry has been added?
-	if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === TRUE)) {
+	if ((!ifSqlHasZeroAffectedRows()) && ($GLOBALS['__XML_PARSE_RESULT'] === TRUE)) {
 		// Display success message
 		displayMessage('{--ADMIN_ENTRY_ADDED--}');
 	} else {
@@ -1143,20 +1148,20 @@ function sendAdminPasswordResetLink ($email) {
 	$OUT = '';
 
 	// Look up administator login
-	$result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
+	$result = sqlQueryEscaped("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
 		array($email), __FUNCTION__, __LINE__);
 
 	// Is there an account?
-	if (SQL_HASZERONUMS($result)) {
+	if (ifSqlHasZeroNumRows($result)) {
 		// No account found
 		return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
 	} // END - if
 
 	// Load all data
-	$content = SQL_FETCHARRAY($result);
+	$content = sqlFetchArray($result);
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Generate hash for reset link
 	$content['hash'] = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $content['login'] . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
@@ -1181,13 +1186,13 @@ function adminResetValidateHashLogin ($hash, $login) {
 	$valid = FALSE;
 
 	// Then try to find that user
-	$result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+	$result = sqlQueryEscaped("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
 		array($login), __FUNCTION__, __LINE__);
 
 	// Is an account here?
-	if (SQL_NUMROWS($result) == 1) {
+	if (sqlNumRows($result) == 1) {
 		// Load all data
-		$content = SQL_FETCHARRAY($result);
+		$content = sqlFetchArray($result);
 
 		// Generate hash again
 		$hashFromData = generateHash(getUrl() . getEncryptSeparator() . $content['id'] . getEncryptSeparator() . $login . getEncryptSeparator() . $content['password'], substr($content['password'], getSaltLength()));
@@ -1197,7 +1202,7 @@ function adminResetValidateHashLogin ($hash, $login) {
 	} // END - if
 
 	// Free result
-	SQL_FREERESULT($result);
+	sqlFreeResult($result);
 
 	// Return result
 	return $valid;
@@ -1244,7 +1249,7 @@ function adminUpdateTaskData ($id, $row, $data) {
 		reportBug(__FUNCTION__, __LINE__, 'id=' . $id . ',row=' . $row . ',data=' . $data . ' - isAdmin()=false');
 	} elseif ($id <= 0) {
 		// Initiate backtrace
-		reportBug(__FUNCTION__, __LINE__, sprintf("id is invalid: %s. row=%s, data=%s",
+		reportBug(__FUNCTION__, __LINE__, sprintf('id is invalid: %s. row=%s, data=%s',
 			$id,
 			$row,
 			$data
@@ -1252,7 +1257,7 @@ function adminUpdateTaskData ($id, $row, $data) {
 	} // END - if
 
 	// Update the task
-	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
+	sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
 		array(
 			$row,
 			$data,
@@ -1448,7 +1453,7 @@ function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=f
 			$NAV .= '</a>';
 		}
 
-		// Add separator if we have not yet reached total pages
+		// Add separator if total pages has not been reached
 		if ($page < $numPages) {
 			// Add it
 			$NAV .= '|';
@@ -1489,7 +1494,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 				// Shall we update a menu or sub menu?
 				if (!isGetRequestElementSet('sub')) {
 					// Update with 'what'=null
-					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
+					sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
 						array(
 							$type,
 							$menu,
@@ -1498,7 +1503,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 						), __FUNCTION__, __LINE__);
 				} else {
 					// Update with selected 'what'
-					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+					sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
 						array(
 							$type,
 							$menu,
@@ -1510,7 +1515,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 				break;
 
 			case 'delete': // Delete menu
-				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+				sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
 					array(
 						$type,
 						$sel
@@ -1518,7 +1523,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 				break;
 
 			case 'status': // Change status of menus
-				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s',`locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+				sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s',`locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
 					array(
 						$type,
 						postRequestElement('visible', $sel),
@@ -1528,7 +1533,7 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 				break;
 
 			default: // Unexpected action
-				logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
+				logDebugMessage(__FUNCTION__, __LINE__, sprintf('Unsupported action %s detected.', postRequestElement('ok')));
 				displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
 				break;
 		} // END - switch
@@ -1548,49 +1553,49 @@ function doAdminProcessMenuWeightning ($type, $AND) {
 		// Get ids
 		if (isGetRequestElementSet('w')) {
 			// Sub menus selected
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
+			$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
 				array(
 					$type,
 					getRequestElement('act'),
 					bigintval(getRequestElement('tid'))
 				), __FUNCTION__, __LINE__);
-			list($tid) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
+			list($tid) = sqlFetchRow($result);
+			sqlFreeResult($result);
+			$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
 				array(
 					$type,
 					getRequestElement('act'),
 					bigintval(getRequestElement('fid'))
 				), __FUNCTION__, __LINE__);
-			list($fid) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
+			list($fid) = sqlFetchRow($result);
+			sqlFreeResult($result);
 		} else {
 			// Main menu selected
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
+			$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
 				array(
 					$type,
 					bigintval(getRequestElement('tid'))
 				), __FUNCTION__, __LINE__);
-			list($tid) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
+			list($tid) = sqlFetchRow($result);
+			sqlFreeResult($result);
+			$result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
 				array(
 					$type,
 					bigintval(getRequestElement('fid'))
 				), __FUNCTION__, __LINE__);
-			list($fid) = SQL_FETCHROW($result);
-			SQL_FREERESULT($result);
+			list($fid) = sqlFetchRow($result);
+			sqlFreeResult($result);
 		}
 
 		if ((!empty($tid)) && (!empty($fid))) {
 			// Sort menu
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(
 					$type,
 					bigintval(getRequestElement('tid')),
 					bigintval($fid)
 				), __FUNCTION__, __LINE__);
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
+			sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(
 					$type,
 					bigintval(getRequestElement('fid')),
@@ -1660,7 +1665,7 @@ function registerFirstAdmin () {
 
 			default:
 				// Any other kind will be logged
-				$errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+				$errorMessage = sprintf('Unknown return code %s from ifAdminLoginDataIsValid().', $ret);
 				logDebugMessage(__FUNCTION__, __LINE__, $errorMessage);
 
 				// Set this to have our error message displayed
@@ -1703,15 +1708,15 @@ function registerFirstAdmin () {
 			// No password 1 entered or to short?
 			if (!isPostRequestElementSet('admin_password1')) {
 				$password1Message = '{--ADMIN_NO_PASSWORD1--}';
-			} elseif (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) {
-				$password1Message = '{--ADMIN_SHORT_PASSWORD1--}';
+			} elseif (!isStrongPassword(postRequestElement('admin_password1'))) {
+				$password1Message = '{--ADMIN_WEAK_PASSWORD1--}';
 			}
 
 			// No password 2 entered or to short?
 			if (!isPostRequestElementSet('admin_password2')) {
 				$password2Message = '{--ADMIN_NO_PASSWORD2--}';
-			} elseif (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) {
-				$password2Message = '{--ADMIN_SHORT_PASSWORD2--}';
+			} elseif (!isStrongPassword(postRequestElement('admin_password2'))) {
+				$password2Message = '{--ADMIN_WEAK_PASSWORD2--}';
 			}
 
 			// Both didn't match?