X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=0b8b56becdb2463777a43bf48c5af4d685107e10;hb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;hp=da819b4e753547c18d9f108c865ebbf77388bcb3;hpb=258bb8c82f21617f7f90bff8023602a11b986f7e;p=mailer.git

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index da819b4e75..0b8b56becd 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 07/13/2004 *
- * ===============                              Last change: 08/02/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 07/13/2004 *
+ * ===================                          Last change: 08/02/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : overview-inc.php                                 *
@@ -93,9 +93,9 @@ function outputStandardOverview (&$result_tasks) {
 					updateExtension($ext_name, $ext_ver);
 				} // END - if
 
-				if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) {
+				if (isset($GLOBALS['cache_array']['always_active'][$ext_name])) {
 					// Maybe we want to keept the current extension active?
-					if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
+					if (($GLOBALS['cache_array']['always_active'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
 						// Reactivate this extension!
 						doActivateExtension($ext_name);
 					} // END - if
@@ -152,8 +152,11 @@ LIMIT 1",
 
 				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__);
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=0 LIMIT 1",
+						array(
+							getCurrentAdminId(),
+							bigintval($tid)
+						), __FILE__, __LINE__);
 				} // END - if
 
 				$add = '';
@@ -161,7 +164,7 @@ LIMIT 1",
 				if ($type == 'SUPPORT_MEMBER') {
 					$mode = substr($text, 0, strpos($text, ':'));
 					$text = substr($text, strpos($text, ':') + 1);
-					$add = "<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>".$mode."</strong></li>";
+					$add = "<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>" . $mode . "</strong></li>";
 				} // END - if
 
 				// Is a userid assign?
@@ -172,7 +175,7 @@ LIMIT 1",
 						$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>";
+						$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!');
@@ -203,7 +206,7 @@ LIMIT 1",
 						// Is this non-productive?
 						if (isExtensionProductive() === false) {
 							// Issue warning
-							$text .= loadTemplate('admin_settings_saved', true, sprintf(getMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE'), $ext_name));
+							$text .= loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name));
 						} // END - if
 
 						// Set current extension name
@@ -241,7 +244,7 @@ LIMIT 1",
 					// Add SQLs to a table
 					if ((!empty($ext_name)) && (getExtensionVersion('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
 						// Add verbose SQL table
-						$text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top2 left2 right2\"", true, '100%') . "<br />\n";
+						$text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top left right\"", true, '100%') . "<br />\n";
 					} // END - if
 				} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
 					// Run SQL commands in dry mode but only return the notes
@@ -271,7 +274,7 @@ LIMIT 1",
 				$OUT .= loadTemplate('admin_overview_row', true, $content);
 
 				// Which task do we actually have here?
-				// @TODO Rewrite this to something with include files
+				// @TODO Rewrite this to something with include files and/or filter
 				switch ($type) {
 					case 'EXTENSION': // Install new extensions
 						$ext_name = substr($subj, 1, strpos($subj, ':') - 1);
@@ -287,9 +290,9 @@ LIMIT 1",
 							));
 						} else {
 							// Task is closed so nothing is todo
-							$OUT .= "<div class=\"admin_failed\">{--ADMIN_EXT_ALREADY_REGISTERED--}</div>\n";
+							$OUT .= '<div class="admin_failed">{--ADMIN_EXT_ALREADY_REGISTERED--}</div>';
 
-							// Close task but not already closes or deleted or update tasks
+							// Close task but not already closed, solved, deleted or update tasks
 							if ((!in_array($status, array('CLOSED','DELETED','SOLVED'))) && ($type != 'EXTENSION_UPDATE')) {
 								// Solve the task
 								runFilterChain('solve_task', $tid);
@@ -299,7 +302,7 @@ LIMIT 1",
 
 					case 'EXTENSION_UPDATE': // Extension update
 						// Extension updates are installed automatically
-						$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_EXTENSION_UPDATED--}</div>\n";
+						$OUT .= '<div class="admin_failed medium">{--ADMIN_EXTENSION_UPDATED--}</div>';
 
 						// Close task
 						if (($status != 'CLOSED') && ($status != 'DELETED')) {
@@ -313,7 +316,7 @@ LIMIT 1",
 						switch ($mode) {
 							default: // @TODO Unknown support mode
 							logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
-							$OUT .= "<div class=\"admin_failed medium\">".sprintf(getMessage('ADMIN_UNKNOWN_SUPPORT_MODE'), $mode)."</div>\n";
+							$OUT .= '<div class="admin_failed medium">' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '</div>';
 							break;
 						}
 						break;
@@ -321,7 +324,7 @@ LIMIT 1",
 					case 'PAYOUT_REQUEST': // Payout requests
 						if (isExtensionActive('payout')) {
 							// Extension is installed so let him send a notification to the user
-							$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND payout_timestamp=%s LIMIT 1",
+							$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND `payout_timestamp`=%s LIMIT 1",
 								array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
 							list($pid) = SQL_FETCHROW($result_pay);
 							SQL_FREERESULT($result_pay);
@@ -337,11 +340,11 @@ LIMIT 1",
 								$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
 							} else {
 								// Problem obtaining payout id
-								$OUT .= "<div class=\"admin_failed medium\">{--PAYOUT_OBTAIN_ID_FAILED--}</div>\n";
+								$OUT .= '<div class="admin_failed medium">{--PAYOUT_OBTAIN_ID_FAILED--}</div>';
 							}
 						} else {
 							// Extension is not installed
-							$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>\n";
+							$OUT .= '<div class="admin_failed medium">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>';
 						}
 						break;
 
@@ -362,11 +365,11 @@ LIMIT 1",
 								$OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
 							} else {
 								// Problem obtaining wernis id
-								$OUT .= "<div class=\"admin_failed medium\">{--WERNIS_OBTAIN_ID_FAILED--}</div>\n";
+								$OUT .= '<div class="admin_failed medium">{--WERNIS_OBTAIN_ID_FAILED--}</div>';
 							}
 						} else {
 							// Extension is not installed
-							$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>\n";
+							$OUT .= '<div class="admin_failed medium">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>';
 						}
 						break;
 
@@ -380,12 +383,12 @@ LIMIT 1",
 
 					default: // Unknown task type
 						logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
-						$OUT .= "<div class=\"admin_failed medium\">".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."</div>\n";
+						$OUT .= '<div class="admin_failed medium">' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id) . '</div>';
 						break;
 				}
-				$OUT .= "  </td>
-  <td width=\"1%\" class=\"switch_sw".$SW." bottom2 right2\">&nbsp;</td>
-</tr>\n";
+				$OUT .= '
+  </td>
+</tr>';
 			} // END - if
 
 			// Free result
@@ -409,7 +412,7 @@ LIMIT 1",
 			} elseif (isset($postData['del'])) {
 				// Delete tasks
 				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",
+					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__);
 				}
 			} else {
@@ -447,7 +450,7 @@ LIMIT 1",
 				// Member found otherwise it's a system task
 				$content['userid'] = generateUserProfileLink($content['userid']);
 			} else {
-				$content['userid'] = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
+				$content['userid'] = '<em>{--ADMIN_IS_SYSTEM_TASK--}</em>';
 			}
 
 			// Prepare content