X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=fb8fd95c230f57feebe447b997c7216993098f04;hb=498867478820a2eecb1da991a682ad31fae90c55;hp=08adc665b24d79c53a4d282c33992a0e47f80d82;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 08adc665b2..fb8fd95c23 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/03/2004 *
- * ================                             Last change: 11/19/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 08/03/2004 *
+ * ===================                          Last change: 11/19/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : task_functions.php                               *
@@ -86,7 +86,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");
 
 	if ($value > 0) {
-		$content['update_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=updates\">".$value."</a>";
+		$content['update_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=updates%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -96,21 +96,21 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
 
 	if ($value > 0) {
-		$content['confirmed_members'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</a>";
+		$content['confirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=confirmed%}">' . $value . '</a>';
 	} // END - if
 
 	// Unconfirmed accounts
 	$value = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
 
 	if ($value > 0) {
-		$content['unconfirmed_members'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=chk_regs\">".$value."</a>";
+		$content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=chk_regs%}">' . $value . '</a>';
 	} // END - if
 
 
 	// And locked accounts
 	$value = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
 	if ($value > 0) {
-		$content['locked_members'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</a>";
+		$content['locked_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=locked%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -119,7 +119,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'");
 
 	if ($value > 0) {
-		$content['new_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=unassigned\">".$value."</a>";
+		$content['new_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=unassigned%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -128,7 +128,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true);
 
 	if ($value > 0) {
-		$content['closed_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=closed\">".$value."</a>";
+		$content['closed_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=closed%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -137,7 +137,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true);
 
 	if ($value > 0) {
-		$content['deleted_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=deleted\">".$value."</a>";
+		$content['deleted_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=deleted%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -146,7 +146,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', true, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
 
 	if ($value > 0) {
-		$content['solved_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task&amp;type=solved\">".$value."</a>";
+		$content['solved_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=solved%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -155,7 +155,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
 
 	if ($value > 0) {
-		$content['your_tasks'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_task\">".$value."</a>";
+		$content['your_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -164,7 +164,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', true);
 
 	if ($value > 0) {
-		$content['pending_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=unlock_emails\">".$value."</a>";
+		$content['pending_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=unlock_emails%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -173,7 +173,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', true);
 
 	if ($value > 0) {
-		$content['canceled_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+		$content['canceled_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -182,7 +182,7 @@ function outputAdvancedOverview (&$result_main) {
 	$value = countSumTotalData('SEND', 'pool', 'id', 'data_type', true);
 
 	if ($value > 0) {
-		$content['send_emails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_archiv\">".$value."</a>";
+		$content['send_emails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_archiv%}">' . $value . '</a>';
 	} // END - if
 
 	//
@@ -193,7 +193,7 @@ function outputAdvancedOverview (&$result_main) {
 		$value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', true);
 
 		if ($value > 0) {
-			$content['purged_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+			$content['purged_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 		} // END - if
 
 		//
@@ -204,10 +204,10 @@ function outputAdvancedOverview (&$result_main) {
 			$value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', true);
 
 			if ($value > 0) {
-				$content['purged_bonus_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+				$content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 			} // END - if
 		} elseif (isExtensionActive('bonus')) {
-			$content['purged_bonus_mails'] = sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED'), '0.1.8');
+			$content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXT_BONUS_OUTDATED', '0.1.8');
 		} else {
 			$content['purged_bonus_mails'] = "<span class=\"admin_note\">{--ADMIN_EXT_BONUS_404--}</span>";
 		}
@@ -224,10 +224,10 @@ function outputAdvancedOverview (&$result_main) {
 		$value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', true, " AND `is_notify`='N'");
 
 		if ($value > 0) {
-			$content['send_bonus_mails'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=email_details\">".$value."</a>";
+			$content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 		} // END - if
 	} elseif (isExtensionActive('bonus')) {
-		$content['send_bonus_mails'] = sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED'), '0.1.8');
+		$content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXT_BONUS_OUTDATED', '0.1.8');
 	} else {
 		$content['send_bonus_mails'] = getMessage('ADMIN_EXT_BONUS_404');
 	}
@@ -268,7 +268,7 @@ ORDER BY
 		$TITLEs[] = getMessage('ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE');
 	}
 
-	if (getExtensionVersion('sql_patches') >= '0.3.4') {
+	if (isExtensionInstalledAndNewer('sql_patches', '0.3.4')) {
 		// Check for accounts without referal
 		addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC");
 		$DESCRs[] = getMessage('ADMIN_TASK_LIST_ACCOUNT_NOREF');
@@ -574,11 +574,11 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
 			);
 
 			// Rewrite CSS class if not last entry is reached
-			if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom2';
+			if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom';
 
 			if (($value > 0) && (!empty($WHATs[$key]))) {
 				if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE');
-				$content['row_link'] = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</a>";
+				$content['row_link'] = '<a href="{%url=modules.php?module=admin&amp;what=' . $WHATs[$key] . '%}" title="' . $TITLEs[$key] . '">' . $value . '</a>';
 			} else {
 				$content['row_link'] = '0';
 			}