X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=69c19b7ae209d42fd12a7d455f99cf4d727609ed;hb=e1235e719b767d6693976c3d24489beaa38a3667;hp=aafb7bf7bef14dbab525de259ca4a70fe5362218;hpb=dbb6aa4eaeff7c3bab27f143d881781380d43d41;p=mailer.git
diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index aafb7bf7be..69c19b7ae2 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -1,7 +1,7 @@
".$id."";
+ $LINK = "".$id."";
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 = "".$id2."";
+ $LINK = "".$id2."";
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,
- 'subject' => $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'] = "".$email."";
+ $content['surname'] = getUserData('surname');
+ $content['family'] = getUserData('family');
+ $content['email'] = "".getUserData('email')."";
$content['rows'] = $OUT;
$content['nums'] = $nums;
$content['userid'] = bigintval(getRequestElement('userid'));