X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=f067f2e4ebcaca546ed04590ede935f82e60080d;hb=62d8f6d89c35bebe15b8f716a5629f14d95f3078;hp=1ac3596bd77dc5a92b2c03d82cc3c802e50ba6c5;hpb=4364ed437657ee01c99c51b88bd6f915d036d24f;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 1ac3596bd7..f067f2e4eb 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -65,7 +63,7 @@ function outputAdvancedOverview (&$result_main) {
 	// Init SQLs
 	initSqls();
 
-	// Init contentn
+	// Init content
 	foreach (
 		array(
 			// Member accounts
@@ -210,11 +208,11 @@ function outputAdvancedOverview (&$result_main) {
 		} elseif (isExtensionActive('bonus')) {
 			$content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
 		} else {
-			$content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_BONUS_404--}</span>';
+			$content['purged_bonus_mails'] = '<span class="notice">{--ADMIN_EXTENSION_BONUS_404--}</span>';
 		}
 	} else {
-		$content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
-		$content['purged_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+		$content['purged_bonus_mails'] = '<span class="notice">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+		$content['purged_mails'] = '<span class="notice">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
 	}
 
 	//
@@ -239,10 +237,10 @@ function outputAdvancedOverview (&$result_main) {
 
 		// Check for more extensions
 		// @TODO These can be rewritten to filter
-		if (getConfig('def_refid') > 0)                $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
-		if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.userid != {?beg_userid?}';
-		if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.userid != {?bonus_userid?}';
-		if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid != {?doubler_userid?}';
+		if (isValidUserId(getDefRefid()))              $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}';
+		if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.`userid` != {?beg_userid?}';
+		if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.`userid` != {?bonus_userid?}';
+		if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.`userid` != {?doubler_userid?}';
 		if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
 			// Recent ext-holiday found
 			$EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
@@ -270,7 +268,7 @@ ORDER BY
 		// Check for accounts without referal
 		addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC");
 		$DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}';
-		$TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF_TITLE--}';
+		$TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}';
 		$WHATs[]  = 'list_user&amp;mode=norefs';
 	}
 
@@ -342,11 +340,13 @@ ORDER BY
 		} // END - if
 
 		addSql("SELECT
-	".$USE." AS points
+	" . $USE . " AS points
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`status`='CONFIRMED' AND ".$USE." > 0".$lastOnline."
+	`status`='CONFIRMED' AND
+	" . $USE . " > 0
+	" . $lastOnline . "
 ORDER BY
 	`points` DESC,
 	`userid` ASC");
@@ -379,7 +379,7 @@ ORDER BY
 		$WHATs[]  = 'list_beg';
 		$DESCRs[] = '{--ADMIN_TASK_LIST_BEG--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_BEG_TITLE--}';
-	}
+	} // END - if
 
 	if (isExtensionActive('doubler')) {
 		// List waiting payouts
@@ -391,7 +391,7 @@ ORDER BY
 		$WHATs[]  = 'list_doubler';
 		$DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL--}';
 		$TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL_TITLE--}';
-	}
+	} // END - if
 
 	//
 	// All referal banner
@@ -558,12 +558,6 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
 			// Run SQL command, get line numbers and free memory
 			$result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
 
-			// Get rows
-			$value = SQL_NUMROWS($result);
-
-			// Free result
-			SQL_FREERESULT($result);
-
 			// Prepare array for output
 			$content = array(
 				'row_descr' => $DESCRs[$key],
@@ -573,13 +567,18 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
 			// Rewrite CSS class if not last entry is reached
 			if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom';
 
-			if (($value > 0) && (!empty($WHATs[$key]))) {
-				if (empty($TITLEs[$key])) $TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}';
-				$content['row_link'] = '<a href="{%url=modules.php?module=admin&amp;what=' . $WHATs[$key] . '%}" title="' . $TITLEs[$key] . '">' . $value . '</a>';
+			if ((SQL_NUMROWS($result) > 0) && (!empty($WHATs[$key]))) {
+				if (empty($TITLEs[$key])) {
+					$TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}';
+				} // END - if
+				$content['row_link'] = '<a href="{%url=modules.php?module=admin&amp;what=' . $WHATs[$key] . '%}" title="' . $TITLEs[$key] . '">' . SQL_NUMROWS($result) . '</a>';
 			} else {
 				$content['row_link'] = '0';
 			}
 
+			// Free result
+			SQL_FREERESULT($result);
+
 			// And insert the final string into extras template
 			$OUT .= loadTemplate('admin_overview_task_rows', true, $content);
 		} // END- foreach