X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=2eca98fd20baa12c5b80023f5dbe6bf681d0da83;hb=8ba389b59f6d41f88752cae896143135e575f34a;hp=bd2f71179f5d403bbf6807c28c0b0981313c7b96;hpb=6896b68f8242a49fff5e09f5e740305eb00e4edc;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index bd2f71179f..2eca98fd20 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -32,10 +32,11 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
+
 //
 // The advanced overview shows detailed informations to your exchange script:
 //  - Unconfirmed / locked accounts
@@ -272,21 +273,17 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
 	if (EXT_IS_ACTIVE("autopurge")) {
 		// Start finding them...
 		$since = (time() - $_CONFIG['ap_in_since']);
-		$EXCLUDE_LIST = " AND d.userid != c.def_refid";
+		$EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid']."";
 
 		// Check for more extensions
-		if (EXT_IS_ACTIVE("beg"))     $EXCLUDE_LIST .= " AND d.userid != c.beg_uid";
-		if (EXT_IS_ACTIVE("bonus"))   $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
-		if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
-
-		// Check for new holiday system
-		if (GET_EXT_VERSION("holiday") >= "0.1.3") {
-			$EXCLUDE_LIST .= " AND d.holiday_active = 'N'";
-		}
+		if (EXT_IS_ACTIVE("beg"))                  $EXCLUDE_LIST .= " AND d.userid != c.beg_uid";
+		if (EXT_IS_ACTIVE("bonus"))                $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
+		if (EXT_IS_ACTIVE("doubler"))              $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
+		if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active = 'N'";
 
 		// Check for all accounts
 		$SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online
-FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c
+FROM "._MYSQL_PREFIX."_user_data AS d
 WHERE d.status='CONFIRMED' AND d.joined < ".$since." AND d.last_online < ".$since." AND d.ap_notified < ".$since."
 ".$EXCLUDE_LIST."
 ORDER BY d.userid";
@@ -323,6 +320,14 @@ ORDER BY d.userid";
 		$TITLEs[] = TASK_ADMIN_LIST_WERNIS_ALL_TITLE;
 	}
 
+	if (EXT_IS_ACTIVE("primera")) {
+		// List new primera requests
+		$SQLs[]   = "SELECT userid FROM "._MYSQL_PREFIX."_user_primera ORDER BY userid";
+		$WHATs[]  = "list_primera";
+		$DESCRs[] = TASK_ADMIN_LIST_PRIMERA_ALL;
+		$TITLEs[] = TASK_ADMIN_LIST_PRIMERA_ALL_TITLE;
+	}
+
 	if (EXT_IS_ACTIVE("holiday")) {
 		// List holiday requests
 		$SQLs[]   = "SELECT userid FROM "._MYSQL_PREFIX."_user_holidays ORDER BY userid";
@@ -547,10 +552,14 @@ ORDER BY beg_points DESC, userid";
 function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){
 	// Init
 	$OUT = ""; $SW = 2; $MAX = sizeof($SQLs) - 1;
-	foreach ($SQLs as $key=>$sql) {
+	foreach ($SQLs as $key => $sql) {
 		// Run SQL command, get line numbers and free memory
 		$result = SQL_QUERY($sql, __FILE__, __LINE__);
+
+		// Get rows
 		$value = SQL_NUMROWS($result);
+
+		// Free result
 		SQL_FREERESULT($result);
 
 		$content = array(
@@ -564,7 +573,7 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){
 			if (empty($TITLEs[$key])) $TITLEs[$key] = TASK_ADMIN_UNKNOWN_LIST_TITLE;
 			$content['row_link'] = "<A href=\"".URL."/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</A>";
 		} else {
-			$content['row_link'] = "0";
+			$content['row_link'] = 0;
 		}
 
 		// Switch color
@@ -572,7 +581,7 @@ function TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs){
 
 		// And insert the final string into extras template
 		$OUT .= LOAD_TEMPLATE("admin_overview_task_rows", true, $content);
-	}
+	} // END - if
 
 	// Return output
 	return LOAD_TEMPLATE("admin_overview_task_extras", true, $OUT);