X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=da819b4e753547c18d9f108c865ebbf77388bcb3;hb=0e269568bd666186509e98594e83bac199ac26da;hp=e2adbfaa1023cd2ec2639a249e57ed522e76af62;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;p=mailer.git

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index e2adbfaa10..da819b4e75 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -132,10 +132,10 @@ ORDER BY
 
 // Outputs selected tasks
 function outputSeletectedTasks ($postData, $result_tasks) {
-	if ((isset($postData['assign'])) && (count($postData['task']) > 0)) {
+	if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
 		// Assign / do tasks
 		$OUT = ''; $SW = 2;
-		foreach ($postData['task'] as $id => $sel) {
+		foreach ($postData['sel'] as $id => $sel) {
 			$result_task = SQL_QUERY_ESC("SELECT
 	`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
 FROM
@@ -150,7 +150,7 @@ LIMIT 1",
 				// Task is valid...
 				list($tid, $userid, $type, $subj, $text, $created, $status, $adminId) = SQL_FETCHROW($result_task);
 
-				if ($adminId == 0) {
+				if ($adminId == '0') {
 					// Assgin current admin to unassgigned task
 					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s LIMIT 1",
 					array(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__);
@@ -167,24 +167,17 @@ LIMIT 1",
 				// Is a userid assign?
 				if ($userid > 0) {
 					// Then load his data!
-					// @TODO Can this SQL be encapsulated in a function, so all similar queries can be rewritten?
-					$result_user = SQL_QUERY_ESC("SELECT `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-						array(bigintval($userid)), __FILE__, __LINE__);
-
-					// Entry found?
-					if (SQL_NUMROWS($result_user) == 1) {
+					if (fetchUserData($userid)) {
 						// Fetch row
-						$content = SQL_FETCHARRAY($result_user);
+						$content = getUserDataArray();
+
 						// Generate HTML list entry
 						$add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".generateUserProfileLink($userid, 'user_data')." (<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>)</strong></li>";
 					} else {
 						// Invalid userid, so log and zero it
 						logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!');
-						$userid = 0;
+						$userid = '0';
 					}
-
-					// Free result
-					SQL_FREERESULT($result_user);
 				} // END - if
 
 				// Decode entities of the text
@@ -286,7 +279,7 @@ LIMIT 1",
 							array($ext_name), __FILE__, __LINE__);
 						$lines = SQL_NUMROWS($result_lines);
 						SQL_FREERESULT($result_lines);
-						if ($lines == 0) {
+						if ($lines == '0') {
 							// New extension found
 							$OUT .= loadTemplate('admin_ext_reg_form', true, array(
 								'id'       => bigintval($id),
@@ -339,6 +332,8 @@ LIMIT 1",
 									'pid' => $pid,
 									'tid' => $tid,
 								);
+
+								// Load template
 								$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
 							} else {
 								// Problem obtaining payout id
@@ -354,7 +349,7 @@ LIMIT 1",
 						if (isExtensionActive('wernis')) {
 							// Extension is installed so let him send a notification to the user
 							$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
-							array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+								array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
 							list($pid) = SQL_FETCHROW($result_pay);
 							SQL_FREERESULT($result_pay);
 
@@ -403,17 +398,17 @@ LIMIT 1",
 		// Load final template
 		loadTemplate('admin_overview_list', false, $OUT);
 	} else {
-		if ((isset($postData['task'])) && ((count($postData['task']) > 0) || ($postData['task'][0] == 1))) {
+		if ((isset($postData['sel'])) && ((count($postData['sel']) > 0) || ($postData['sel'][0] == 1))) {
 			// Only unassign / delete tasks when there are selected tasks posted
 			if (!empty($postData['unassign'])) {
 				// Unassign from tasks
-				foreach ($postData['task'] as $id => $sel) {
+				foreach ($postData['sel'] as $id => $sel) {
 					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
 						array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
 				}
 			} elseif (isset($postData['del'])) {
 				// Delete tasks
-				foreach ($postData['task'] as $id => $sel) {
+				foreach ($postData['sel'] as $id => $sel) {
 					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND assigned_admin IN (%s,0) LIMIT 1",
 						array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
 				}