X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=69c19b7ae209d42fd12a7d455f99cf4d727609ed;hb=b8c071f12a601619c4c02b9441b3e0e012db6ced;hp=6e9ad7d1e237a97886eb614d9eb35cd39d490057;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 6e9ad7d1e2..69c19b7ae2 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 01/28/2004 *
- * ================                             Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 01/28/2004 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_links.php                              *
@@ -51,23 +51,16 @@ if (!isExtensionActive('mailid')) {
 
 if (isGetRequestElementSet('userid')) {
 	// Check if the user already exists
-	$result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-	array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
-
-	// Is there an entry?
-	if (SQL_NUMROWS($result) == 1) {
-		// Loads surname, family's name and the email address
-		list($surname, $family, $email) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
-
+	if (fetchUserData(getRequestElement('userid'))) {
 		// Grab user's all unconfirmed mails
+		// @TODO Try to rewrite this to a filter
 		if (isExtensionActive('bonus')) {
-			// Load bonus ID
-			$result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id`",
-			array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
+			// Load bonus id
+			$result = SQL_QUERY_ESC("SELECT `stats_id`, `bonus_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id`",
+				array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
 		} else {
-			// Load stats ID (2nd will be ignored later! But it is needed for the same fetchrow command)
-			$result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+			// Load stats id (2nd will be ignored later! But it is needed for the same fetchrow command)
+			$result = SQL_QUERY_ESC("SELECT `stats_id`, `stats_id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
 				array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
 		}
 
@@ -83,7 +76,7 @@ if (isGetRequestElementSet('userid')) {
 
 				// Prepare mail and send it away
 				$message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestElement('userid')));
-				sendEmail($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+				sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
 
 				// Display message
 				loadTemplate('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
@@ -104,38 +97,39 @@ if (isGetRequestElementSet('userid')) {
 					// @TODO Rewrite this to includes/filter
 					switch ($type) {
 						case 'NORMAL':
-							$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
+							$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
 								array(bigintval($id)), __FILE__, __LINE__);
 							$type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
-							$LINK = "<a href=\"{?URL?}/mailid.php?userid=".getRequestElement('userid')."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
+							$LINK = "<a href=\"{%url=mailid.php?userid=".getRequestElement('userid')."&amp;mailid=".$id."%}\" target=\"_blank\">".$id."</a>";
 							break;
 
 						case 'BONUS':
 							$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
 								array(bigintval($id2)), __FILE__, __LINE__);
 							$type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
-							$LINK = "<a href=\"{?URL?}/mailid.php?userid=".getRequestElement('userid')."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
+							$LINK = "<a href=\"{%url=mailid.php?userid=".getRequestElement('userid')."&amp;bonusid=".$id2."%}\" target=\"_blank\">".$id2."</a>";
 							break;
 
 						default: // Problem in application detected!
 							// Log the error
 							logDebugMessage(__FILE__, __LINE__, sprintf("Invalid email type %s detected.", $type));
 							break;
-					}
+					} // END - switch
 
 					if (SQL_NUMROWS($result_data) == 1) {
 						// Mail was found!
-						list($subject, $timestamp, $cat) = SQL_FETCHROW($result_data);
-						SQL_FREERESULT($result_data);
-						if (empty($subject)) $subject = getMessage('DEFAULT_SUBJECT_LINE');
+						$content = SQL_FETCHARRAY($result_data);
+
+						// Fix empty subject
+						if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
 
 						// Prepare data for the row template
 						$content = array(
-							'sw'    => $SW,
-							'link'  => $LINK,
-							'subj'  => $subject,
-							'stamp' => generateDateTime($timestamp, '0'),
-							'cat'   => getCategory($cat),
+							'sw'        => $SW,
+							'link'      => $LINK,
+							'subject'   => $content['subject'],
+							'timestamp' => generateDateTime($content['timestamp'], 0),
+							'cat'       => getCategory($content['cat_id']),
 						);
 
 						// Load row template
@@ -143,23 +137,26 @@ if (isGetRequestElementSet('userid')) {
 					} else {
 						// Load template for error
 						$OUT .= loadTemplate('admin_list_links_problem',
-						array(
+							array(
 								'sw'		=> $SW,
 								'problem'	=> $PROBLEM,
 								'data'		=> $DATA
-						)
+							)
 						);
 					}
+
+					// Switch color and free result
 					$SW = 3 - $SW;
-				}
+					SQL_FREERESULT($result_data);
+				} // END - while
 
 				// Free memory
 				SQL_FREERESULT($result);
 
 				// Remember list in constant for the template
-				$content['surname'] = $surname;
-				$content['family']  = $family;
-				$content['email']   = "<a href=\"" . generateEmailLink($email, 'user_data') . "\">".$email."</a>";
+				$content['surname'] = getUserData('surname');
+				$content['family']  = getUserData('family');
+				$content['email']   = "<a href=\"" . generateEmailLink(getUserData('email'), 'user_data') . "\">".getUserData('email')."</a>";
 				$content['rows']    = $OUT;
 				$content['nums']    = $nums;
 				$content['userid']  = bigintval(getRequestElement('userid'));