X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=362597d312c9bdeacfa106793d7f4d1ccc2beffe;hb=91d298e5ec7193849a92bd4902abc02ffab8305b;hp=344b5909ffa60d37fa9f034c5454e8328797ef36;hpb=3543514ab0caa123aeaf18caa7804208cf972c44;p=mailer.git

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 344b5909ff..362597d312 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -329,10 +329,7 @@ function adminsEditAdminAccount ($postData) {
 // Delete given admin accounts
 function adminsDeleteAdminAccount ($postData) {
 	// Check if this account is the last one which cannot be deleted...
-	$result_main = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins`", __FUNCTION__, __LINE__);
-	$accounts = SQL_NUMROWS($result_main);
-	SQL_FREERESULT($result_main);
-	if ($accounts > 1) {
+	if (countSumTotalData('', 'admins', 'id', '', true) > 1) {
 		// Delete accounts
 		$OUT = '';
 		foreach ($postData['sel'] as $id => $selected) {
@@ -340,12 +337,13 @@ function adminsDeleteAdminAccount ($postData) {
 			$id = bigintval($id);
 
 			// Get the admin's data
-			$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `login`, `email`, `default_acl` AS `mode`, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
 				array($id), __FUNCTION__, __LINE__);
+
+			// Do we have an entry?
 			if (SQL_NUMROWS($result) == 1) {
-				// Entry found
+				// Entry found, so load data
 				$content = SQL_FETCHARRAY($result);
-				SQL_FREERESULT($result);
 				$content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
 				$content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
 
@@ -355,6 +353,9 @@ function adminsDeleteAdminAccount ($postData) {
 				// Load row template and switch color
 				$OUT .= loadTemplate('admin_del_admins_row', true, $content);
 			} // END - if
+
+			// Free result
+			SQL_FREERESULT($result);
 		} // END - foreach
 
 		// Load template
@@ -392,16 +393,13 @@ function adminsRemoveAdminAccount ($postData) {
 // List all admin accounts
 function adminsListAdminAccounts() {
 	// Select all admin accounts
-	$result = SQL_QUERY("SELECT `id`, `login`, `email`, `default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC", __FUNCTION__, __LINE__);
+	$result = SQL_QUERY('SELECT `id`, `login`, `email`, `default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC', __FUNCTION__, __LINE__);
 	$OUT = '';
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Compile some variables
 		$content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
 		$content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
 
-		// Prepare some more data
-		$content['email_link'] = generateEmailLink($content['id'], 'admins');
-
 		// Load row template and switch color
 		$OUT .= loadTemplate('admin_list_admins_row', true, $content);
 	} // END - while
@@ -459,7 +457,7 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
 			}
 		} elseif (($adminId == '0') || (empty($adminId))) {
 			// Select all email adresses
-			$result = SQL_QUERY("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC",
+			$result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC',
 				__FUNCTION__, __LINE__);
 		} else {
 			// If Admin-Id is not "to-all" select
@@ -623,9 +621,9 @@ function getAdminLastFailure ($adminId) {
 	return $data['last_failure'];
 }
 
-//*****************************************************************************
-//                     Below only filter functions
-//*****************************************************************************
+//-----------------------------------------------------------------------------
+//                                Filter Functions
+//-----------------------------------------------------------------------------
 
 // Filter for adding extra data to the query
 function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {