X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=3f5d28cbc4254dbc863de07569c064849db5818a;hb=5c2fa5bcdb71881440947473ddef3612d9a2f2e1;hp=3c3adcb14bd30b7a853c72f1c169870f4b5dfb5d;hpb=8b592f641011ec7f3037cd3f5f3122b44e271d4c;p=mailer.git

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 3c3adcb14b..3f5d28cbc4 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } elseif (!EXT_IS_ACTIVE('mailid')) {
-	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'mailid'));
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('mailid'));
 	return;
 }
 
@@ -53,9 +53,9 @@ if (!REQUEST_ISSET_GET('del')) REQUEST_SET_GET('del', '');
 if (REQUEST_ISSET_GET('uid')) {
 	// 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(REQUEST_GET('uid'))), __FILE__, __LINE__);
+	array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 
-	 // Is there an entry?
+	// Is there an entry?
 	if (SQL_NUMROWS($result) == 1) {
 		// Loads surname, family's name and the email address
 		list($sname, $fname, $email) = SQL_FETCHROW($result);
@@ -65,11 +65,11 @@ if (REQUEST_ISSET_GET('uid')) {
 		if (EXT_IS_ACTIVE('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(REQUEST_GET('uid'))), __FILE__, __LINE__);
+			array(bigintval(REQUEST_GET('uid'))), __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`",
-				array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+			array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 		}
 
 		// Get number of rows from the query
@@ -80,11 +80,11 @@ if (REQUEST_ISSET_GET('uid')) {
 			if (REQUEST_GET('del') == "all") {
 				// Delete all unconfirmed mails by this user
 				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s LIMIT %s",
-					array(bigintval(REQUEST_GET('uid')), $nums), __FILE__, __LINE__);
+				array(bigintval(REQUEST_GET('uid')), $nums), __FILE__, __LINE__);
 
 				// Prepare mail and send it away
 				$msg = LOAD_EMAIL_TEMPLATE("admin-del_links", $nums, bigintval(REQUEST_GET('uid')));
-				SEND_EMAIL($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $msg);
+				sendEmail($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $msg);
 
 				// Display message
 				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
@@ -104,24 +104,24 @@ if (REQUEST_ISSET_GET('uid')) {
 					// Load data from stats table...
 					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",
+						case "NORMAL":
+							$result_data = SQL_QUERY_ESC("SELECT subject, timestamp_ordered, 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?uid=".REQUEST_GET('uid')."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
-						break;
+							$type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+							$LINK = "<a href=\"{!URL!}/mailid.php?uid=".REQUEST_GET('uid')."&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",
+						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?uid=".REQUEST_GET('uid')."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
-						break;
-
-					default: // Problem in application detected!
-						// Log the error
-						DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid email type %s detected.", $type));
-						break;
+							$type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+							$LINK = "<a href=\"{!URL!}/mailid.php?uid=".REQUEST_GET('uid')."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
+							break;
+
+						default: // Problem in application detected!
+							// Log the error
+							DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid email type %s detected.", $type));
+							break;
 					}
 
 					if (SQL_NUMROWS($result_data) == 1) {
@@ -135,8 +135,8 @@ if (REQUEST_ISSET_GET('uid')) {
 							'sw'    => $SW,
 							'link'  => $LINK,
 							'subj'  => $subject,
-							'stamp' => MAKE_DATETIME($timestamp, "0"),
-							'cat'   => GET_CATEGORY($cat),
+							'stamp' => generateDateTime($timestamp, '0'),
+							'cat'   => getCategory($cat),
 						);
 
 						// Load row template
@@ -144,11 +144,11 @@ if (REQUEST_ISSET_GET('uid')) {
 					} else {
 						// Load template for error
 						$OUT .= LOAD_TEMPLATE("admin_list_links_problem",
-							array(
+						array(
 								'sw'		=> $SW,
 								'problem'	=> $PROBLEM,
 								'data'		=> $DATA
-							)
+						)
 						);
 					}
 					$SW = 3 - $SW;
@@ -160,7 +160,7 @@ if (REQUEST_ISSET_GET('uid')) {
 				// Remember list in constant for the template
 				define('__SNAME_VALUE', $sname);
 				define('__FNAME_VALUE', $fname);
-				define('__EMAIL_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</a>");
+				define('__EMAIL_VALUE', "<a href=\"".generateMemberEmailLink($email, "user_data")."\">".$email."</a>");
 				define('__EMAIL_LIST' , $OUT);
 				define('__NUMS_VALUE' , $nums);
 				define('__UID'        , bigintval(REQUEST_GET('uid')));