./inc/modules/admin/what-bonus.php:46:// @TODO Unused at the moment
./inc/modules/admin/what-config_points.php:90: // @TODO Rewrite these two lines for new user_points columns (e.g. locked_order_points) with a filter
./inc/modules/admin/what-config_register.php:79: // @TODO Move this HTML code into a template
-./inc/modules/admin/what-del_email.php:61: // @TODO Unused: cat_id, payment_id
+./inc/modules/admin/what-del_email.php:57: // @TODO Unused: cat_id
./inc/modules/admin/what-edit_user.php:18: * @TODO Add support for ext-country *
./inc/modules/admin/what-email_stats.php:46:// @TODO Unused at the moment
./inc/modules/admin/what-extensions.php:366: // @TODO Rewrite this to a filter
./inc/modules/admin/what-mem_add.php:124: // @TODO This can be somehow rewritten to a function
./inc/modules/admin/what-mem_add.php:63: // @TODO Cant this be rewritten?
./inc/modules/admin/what-mem_add.php:79: // @TODO This can be somehow rewritten to a function
-./inc/modules/admin/what-unlock_emails.php:95: // @TODO Rewrite these if-blocks to a filter
+./inc/modules/admin/what-unlock_emails.php:93: // @TODO Rewrite these if-blocks to a filter
./inc/modules/admin/what-usage.php:89: // @TODO This code is double, see loadTemplate() and loadEmailTemplate() in functions.php
./inc/modules/admin/what-usr_online.php:49: // @TODO Add a filter for sponsor
./inc/modules/frametester.php:95: // @TODO Rewrite this somehow
./inc/modules/member/what-rallyes.php:99: // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&what=impressum&id=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
./inc/modules/member/what-reflinks.php:52:// @TODO Move this into a filter
./inc/modules/member/what-transfer.php:128: // @TODO Rewrite this to a filter
-./inc/modules/member/what-unconfirmed.php:178: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/member/what-unconfirmed.php:177: // @TODO Try to rewrite this to $content = SQL_FETCHARRAY()
+./inc/modules/member/what-unconfirmed.php:244: // @TODO cat_id is unused
./inc/modules/member/what-unconfirmed.php:247: // @TODO This 'userid' cannot be saved because of encapsulated EL code
./inc/modules/order.php:78: // @TODO Unused: 2,4
-./inc/mysql-manager.php:1492: // @TODO Rewrite these lines to a filter
-./inc/mysql-manager.php:1516: // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:1832: // @TODO Rewrite this to a filter
-./inc/mysql-manager.php:2000: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
-./inc/mysql-manager.php:2123: // @TODO Used generic 'userid' here
-./inc/mysql-manager.php:2344:// @TODO cacheFiles is not yet supported
+./inc/mysql-manager.php:1498: // @TODO Rewrite these lines to a filter
+./inc/mysql-manager.php:1522: // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:1838: // @TODO Rewrite this to a filter
+./inc/mysql-manager.php:2006: // @TODO If we can rewrite the EL sub-system to support more than one parameter, this call_user_func_array() can be avoided
+./inc/mysql-manager.php:2129: // @TODO Used generic 'userid' here
+./inc/mysql-manager.php:2350:// @TODO cacheFiles is not yet supported
./inc/mysql-manager.php:408: // @TODO Try to rewrite this to one or more functions
./inc/mysql-manager.php:44:// @TODO Can we cache this?
./inc/revision-functions.php:168:// @TODO This function does also set and get in 'cache_array'
LEFT JOIN
`{?_MYSQL_PREFIX?}_refdepths` AS `d`
ON
- s.`level`=`d`.`level`
+ `s`.`level`=`d`.`level`
WHERE
- s.`userid`=%s AND
- s.`level`=1",
+ `s`.`userid`=%s AND
+ `s`.`level`=1",
array(
bigintval($userid)
), __FUNCTION__, __LINE__);
// Create cache file
$GLOBALS['cache_instance']->init();
- // Load every data from DB to cache file
- //$add = runFilterChain('sql_admin_extra_data');
-
// Query the database about this
$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_foos` ORDER BY `some_bar` ASC', __FILE__, __LINE__);
while ($dummy = SQL_FETCHARRAY($result)) {
// Create cache file
$GLOBALS['cache_instance']->init();
- // Load every data from DB to cache file
- $add = runFilterChain('sql_admin_extra_data');
-
// Query the database about this
$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_imprint_data` ORDER BY `imprint_id` ASC', __FILE__, __LINE__);
while ($row = SQL_FETCHARRAY($result)) {
// Create cache file
$GLOBALS['cache_instance']->init();
- // Load every data from DB to cache file
- //$add = runFilterChain('sql_admin_extra_data');
-
// Query the database about this
$result = SQL_QUERY('SELECT * FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `id` ASC', __FILE__, __LINE__);
while ($dummy = SQL_FETCHARRAY($result)) {
// Delete mail only once
if (SQL_NUMROWS($result) == 1) {
// Load data
+ // @TODO Unused: cat_id
$content = SQL_FETCHARRAY($result);
- // Get points we shall pay back per mail
- $content['price'] = getPaymentData($content['payment_id'], 'price');
- // @TODO Unused: cat_id, payment_id
-
// Prepare data for the template
$content['timestamp'] = generateDateTime($content['timestamp'], 0);
// Fetch right stats_id from pool
$result_pool = SQL_QUERY_ESC("SELECT
- s.`id`
+ `s`.`id`
FROM
`{?_MYSQL_PREFIX?}_user_stats` AS `s`
LEFT JOIN
`{?_MYSQL_PREFIX?}_pool` AS `p`
ON
- s.`pool_id`=`p`.`id`
+ `s`.`pool_id`=`p`.`id`
WHERE
- s.`pool_id`=%s
+ `s`.`pool_id`=%s
LIMIT 1",
array(bigintval(getRequestElement('id'))), __FILE__, __LINE__);
if (SQL_NUMROWS($result_pool) == 1) {
if ((isPostRequestElementSet('id')) && (isGetRequestElementSet('type')) && (postRequestElement('type') == 'normal')) {
// SQL query for mail data
$sql = sprintf("SELECT
- s.`id`,
+ `s`.`id`,
`p`.`sender`,
`p`.`subject`,
`p`.`text`,
`p`.`url`,
`p`.`timestamp`,
- s.`max_rec`
+ `s`.`max_rec`
FROM
`{?_MYSQL_PREFIX?}_pool` AS `p`
LEFT JOIN
`{?_MYSQL_PREFIX?}_user_stats` AS `s`
ON
- `p`.`id`=s.`pool_id`
+ `p`.`id`=`s`.`pool_id`
WHERE
`p`.`id`=%s
LIMIT 1",
unsetPostRequestElement('ok');
} // END - if
+// Init SQL array
+nitSqls();
+
if (isFormSent()) {
switch (getRequestElement('do')) {
case 'add':
- addSql("INSERT INTO `{?_MYSQL_PREFIX?}_payments` (`time`, `payment`, `mail_title`, `price`) VALUES ('".postRequestElement('t_wait')."','".postRequestElement('payment')."','".postRequestElement('title')."','".postRequestElement('price')."')");
- if (countSumTotalData(postRequestElement('t_wait'), 'payments', 'id', 'time', TRUE) == 1) {
- // Re-init the array here
- initSqls();
+ if (countSumTotalData(postRequestElement('t_wait'), 'payments', 'id', 'time', TRUE) == 0) {
+ addSql("INSERT INTO
+ `{?_MYSQL_PREFIX?}_payments`
+(
+ `time`,
+ `payment`,
+ `mail_title`,
+ `price`
+) VALUES (
+ '" . postRequestElement('t_wait') . "',
+ '" . postRequestElement('payment') . "',
+ '" . postRequestElement('title') . "',
+ '" . postRequestElement('price') . "'
+)");
} // END - if
break;
case 'edit':
foreach (postRequestElement('time') as $id => $value) {
- addSql("UPDATE `{?_MYSQL_PREFIX?}_payments` SET `time`='" . $value . "',`payment`='".postRequestElement('payment', $id)."', price='".postRequestElement('price', $id)."', mail_title='".postRequestElement('mail_title', $id)."' WHERE `id`='".$id."' LIMIT 1");
+ // Secure id
+ $id = bigintval($id);
+
+ // Add UPDATE
+ addSql("UPDATE
+ `{?_MYSQL_PREFIX?}_payments`
+SET
+ `time`='" . $value . "',
+ `payment`='" . postRequestElement('payment', $id) . "',
+ `price`='" . postRequestElement('price', $id) . "',
+ `mail_title`='" . postRequestElement('mail_title', $id) . "'
+WHERE
+ `id`='" . $id . "'
+LIMIT 1");
} // END - foreach
break;
case 'delete':
foreach (postRequestElement('id') as $id => $value) {
- addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=" . bigintval($id) . " LIMIT 1");
+ // Secure id
+ $id = bigintval($id);
+
+ // Add DELETE
+ addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=" . $id . " LIMIT 1");
} // END - foreach
break;
} // END - switch
// Delete entries here
$OUT = '';
foreach (postRequestElement('sel') as $id => $value) {
- $result = SQL_QUERY_ESC("SELECT `id`, `time`, `mail_title` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT
+ `id`,
+ `time`,
+ `payment`,
+ `mail_title`,
+ `price`
+FROM
+ `{?_MYSQL_PREFIX?}_payments`
+WHERE
+ `id`=%s
+LIMIT 1",
array(bigintval($id)), __FILE__, __LINE__);
$content = SQL_FETCHARRAY($result);
// Edit entries
$OUT = '';
foreach (postRequestElement('sel') as $id => $value) {
- $result = SQL_QUERY_ESC("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT
+ `id`,
+ `time`,
+ `payment`,
+ `mail_title`,
+ `price`
+FROM
+ `{?_MYSQL_PREFIX?}_payments`
+WHERE
+ `id`=%s
+LIMIT 1",
array(bigintval($id)), __FILE__, __LINE__);
$content = SQL_FETCHARRAY($result);
loadTemplate('admin_edit_payments', FALSE, $OUT);
} else {
// Referral levels
- $result = SQL_QUERY("SELECT `id`, `time`, `payment`, `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` ORDER BY `time` ASC", __FILE__, __LINE__);
+ $result = SQL_QUERY("SELECT
+ `id`,
+ `time`,
+ `payment`,
+ `mail_title`,
+ `price`
+FROM
+ `{?_MYSQL_PREFIX?}_payments`
+ORDER BY
+ `time` ASC", __FILE__, __LINE__);
if (!SQL_HASZERONUMS($result)) {
// Make referral levels editable and deletable
$OUT = '';
// Order placed in queue...
$result = SQL_QUERY_ESC('SELECT
- po.`url`,
- po.`subject`,
- po.`sender`,
- pay.`payment`,
- po.`payment_id`
+ `url`,
+ `subject`,
+ `sender`,
+ `payment_id`
FROM
- `{?_MYSQL_PREFIX?}_pool` AS `po`
-INNER JOIN
- `{?_MYSQL_PREFIX?}_payments` AS `pay`
-ON
- po.`payment_id`=pay.`id`
+ `{?_MYSQL_PREFIX?}_pool`
WHERE
- po.`id`=%s
+ `id`=%s
LIMIT 1',
array($id), __FILE__, __LINE__);
// Load data
$content = SQL_FETCHARRAY($result);
+ // Get payment from getter to avoid JOIN
+ $content['payment'] = getPaymentData($content['payment_id', 'payment');
+
// Is the surfbar installed?
// @TODO Rewrite these if-blocks to a filter
if ((isExtensionActive('surfbar')) && (getConfig('surfbar_migrate_order') == 'Y')) {
} // END - if
// Calculate used points
- $usedPoints = $content['target_send'] * getPaymentData(bigintval(postRequestElement('mail_type')));
+ $usedPoints = $content['target_send'] * getPaymentPrice(bigintval(postRequestElement('mail_type')));
// Fix empty zip code
if (!isPostRequestElementSet('zip')) {
$content['category_selection'] = generateCategoryOptionsList(((isExtensionActive('html_mail')) && (isPostRequestElementSet('html'))) ? postRequestElement('html') : 'N', getMemberId());
// Mail type
- $content['type_selection'] = '';
+ $content['payment_selection'] = '';
foreach ($payments as $key => $value) {
if (is_array($value)) {
// Output option line
- $content['type_selection'] .= ' <option value="' . $payments[$key]['id'] . '"';
- if (($OLD_ORDER) && ($content['payment_id'] == $payments[$key]['id'])) $content['type_selection'] .= ' selected="selected"';
- $content['type_selection'] .= '>{%pipe,translateComma=' . $payments[$key]['price'] . '%} {--PER_MAIL--} - ' . $payments[$key]['mail_title'] . ' - ' . round($payments[$key]['payment']) . ' {--PAYMENT--}</option>';
+ $content['payment_selection'] .= ' <option value="' . $payments[$key]['id'] . '"';
+ if (($OLD_ORDER) && ($content['payment_id'] == $payments[$key]['id'])) $content['payment_selection'] .= ' selected="selected"';
+ $content['payment_selection'] .= '>{%pipe,translateComma=' . $payments[$key]['price'] . '%} {--PER_MAIL--} - ' . $payments[$key]['mail_title'] . ' - ' . round($payments[$key]['payment']) . ' {--PAYMENT--}</option>';
} // END - if
} // END - foreach
} elseif (isGetRequestElementSet('mailid')) {
// Display regular member mail by loading its full data
$result_data = SQL_QUERY_ESC("SELECT
- s.`id`,
- s.`subject`,
+ `s`.`id`,
+ `s`.`subject`,
`p`.`text`,
- s.`timestamp_ordered` AS `timestamp`,
- s.`cat_id`,
- pay.`price` AS `points`,
+ `s`.`timestamp_ordered` AS `timestamp`,
+ `s`.`cat_id`,
+ `p`.`payment_id`,
`p`.`sender`,
- pay.`time`,
`p`.`data_type`
FROM
`{?_MYSQL_PREFIX?}_user_stats` AS `s`
`{?_MYSQL_PREFIX?}_pool` AS `p`
ON
s.pool_id=p.id
-LEFT JOIN
- `{?_MYSQL_PREFIX?}_payments` AS `pay`
-ON
- `p`.`payment_id`=pay.`id`
WHERE
- s.`id`=%s
+ `s`.`id`=%s
LIMIT 1",
array(bigintval(getRequestElement('mailid'))), __FILE__, __LINE__);
// Load data
$content = SQL_FETCHARRAY($result_data);
+ // Get price/time to avoid one JOIN
+ $content['price'] = getPaymentPrice($content['payment_id']);
+ $content['time'] = getPaymentData($content['payment_id'], 'time');
+
// Translate some data
$content['timestamp'] = generateDateTime($content['timestamp'], '2');
$content['userid'] = getMemberId();
switch ($row['link_type']) {
case 'NORMAL':
$result_data = SQL_QUERY_ESC("SELECT
- s.`subject`,
- s.`timestamp_ordered` AS `timestamp`,
- s.`cat_id`,
- s.`payment_id`,
+ `s`.`subject`,
+ `s`.`timestamp_ordered` AS `timestamp`,
+ `s`.`cat_id`,
+ `s`.`payment_id`,
`p`.`sender`
FROM
`{?_MYSQL_PREFIX?}_user_stats` AS `s`
LEFT JOIN
`{?_MYSQL_PREFIX?}_pool` AS `p`
ON
- s.`pool_id`=`p`.`id`
+ `s`.`pool_id`=`p`.`id`
WHERE
- s.`id`=%s
+ `s`.`id`=%s
LIMIT 1",
array(bigintval($row['stats_id'])), __FILE__, __LINE__);
$row['link_type'] = 'mailid';
// Data found to this mail?
if ((SQL_NUMROWS($result_data) == 1) && (($row['link_type'] == 'mailid') || ($row['link_type'] == 'bonusid'))) {
// Mail was found
- list($subject, $timestamp, $cat, $pay, $sender) = SQL_FETCHROW($result_data);
+ $rowData = SQL_FETCHARRAY($result_data);
// Subject line found?
- if (empty($subject)) {
+ if (empty($rowData['subject'])) {
// No subject line!
- $subject = '{--DEFAULT_SUBJECT--}';
+ $rowData['subject'] = '{--DEFAULT_SUBJECT--}';
} // END - if
// Prepare sender id
- if ((isValidId($sender)) && ($row['link_type'] == 'mailid')) {
+ if ((isValidId($rowData['sender'])) && ($row['link_type'] == 'mailid')) {
// Sender id
- $sender = bigintval($sender);
+ $rowData['sender'] = bigintval($rowData['sender']);
} elseif ($row['link_type'] == 'bonusid') {
// Is admin
- $sender = '{--USERNAME_ADMIN_SHORT--}';
+ $rowData['sender'] = '{--USERNAME_ADMIN_SHORT--}';
} else {
// Deleted
- $sender = '{--EMAIL_STATUS_DELETED--}';
+ $rowData['sender'] = '{--EMAIL_STATUS_DELETED--}';
}
// Prepare data for template
- $content = array(
- 'data' => bigintval($data),
+ // @TODO cat_id is unused
+ $rowData = array(
+ 'data' => bigintval($data),
// @TODO This 'userid' cannot be saved because of encapsulated EL code
- 'userid' => getMemberId(),
- 'link_type' => $row['link_type'],
- 'subject' => $subject,
- 'sender' => $sender,
- 'timestamp' => generateDateTime($timestamp, 2),
- 'points' => $pay,
+ 'userid' => getMemberId(),
+ 'link_type' => $row['link_type'],
+ 'subject' => $rowData['subject'],
+ 'sender' => $rowData['sender'],
+ 'timestamp_ordered' => generateDateTime($rowData['timestamp_ordered'], 2),
+ 'payment_id' => $rowData['payment_id'],
);
// Load row template
if (isShowPointsUnconfirmedEnabled()) {
- $OUT .= loadTemplate('member_list_unconfirmed_row', TRUE, $content);
+ $OUT .= loadTemplate('member_list_unconfirmed_row', TRUE, $rowData);
} else {
- $OUT .= loadTemplate('member_list_unconfirmed_nopoints_row', TRUE, $content);
+ $OUT .= loadTemplate('member_list_unconfirmed_nopoints_row', TRUE, $rowData);
}
- // Count points
- $sum += $pay;
+ // Count points (price)
+ $sum += getPaymentPrice($rowData['payment_id']);
} else {
// Prepare data for template
- $content = array(
+ $rowData = array(
'data' => $data,
'message' => $message,
);
// Display points or not?
if (isShowPointsUnconfirmedEnabled()) {
- $OUT .= loadTemplate('member_list_unconfirmed_404_row', TRUE, $content);
+ $OUT .= loadTemplate('member_list_unconfirmed_404_row', TRUE, $rowData);
} else {
- $OUT .= loadTemplate('member_list_unconfirmed_nopoints_404_row', TRUE, $content);
+ $OUT .= loadTemplate('member_list_unconfirmed_nopoints_404_row', TRUE, $rowData);
}
}
} // END - if
// Calculate used points
- $content['payed_points'] = $content['target_send'] * getPaymentData($content['payment_id']);
+ $content['payed_points'] = $content['target_send'] * getPaymentPrice($content['payment_id']);
// Subtract them from the user's account and ignore return status
subtractPoints('order', getMemberId(), $content['payed_points']);
return $ret;
}
+// Get payment price
+function getPaymentPrice ($paymentsId) {
+ // Return result
+ return getPaymentData($paymentsId, 'price');
+}
+
// "Getter" for payment data (cached)
function getPaymentData ($paymentsId, $lookFor = 'price') {
// Default value...
// Is the userid set?
if (isValidId($userid)) {
// User does not exists, pay points back
- $points = getPaymentData($mailData['payment_id']);
+ $points = getPaymentPrice($mailData['payment_id']);
initReferralSystem();
addPointsThroughReferralSystem('pool_payback', $mailData['sender_userid'], $points);
// Then check for outdated mail order. We don't delete them just the confirmation links will be deleted.
$result = SQL_QUERY('SELECT
- `s`.`id`,
- `s`.`userid`,
- `s`.`pool_id`,
- `t`.`price`
+ `id`,
+ `userid`,
+ `pool_id`,
+ `payment_id`
FROM
- `{?_MYSQL_PREFIX?}_user_stats` AS `s`
-LEFT JOIN
- `{?_MYSQL_PREFIX?}_payments` AS `t`
-ON
- `s`.`payment_id`=`t`.`id`
+ `{?_MYSQL_PREFIX?}_user_stats`
WHERE
- (UNIX_TIMESTAMP() - `s`.`timestamp_ordered`) >= {?auto_purge?}
+ (UNIX_TIMESTAMP() - `timestamp_ordered`) >= {?auto_purge?}
ORDER BY
- `s`.`userid` ASC', __FILE__, __LINE__);
+ `userid` ASC', __FILE__, __LINE__);
if (!SQL_HASZERONUMS($result)) {
// Start deleting procedure
$userid = NULL;
// Add points
$userid = $content['userid'];
- $points += $content['price'];
+ $points += getPaymentPrice($content['payment_id']);
$admin_points += $content['price'];
// Remove confirmation links from queue
<td align="center" class="{%template,ColorSwitch%} bottom right">
[<a href="{%url=modules.php?module=login&what=unconfirmed&$content[link_type]=$content[data]%}">{--EMAIL_DETAILS_LINK--}</a>]
</td>
- <td align="center" class="{%template,ColorSwitch%} bottom">$content[timestamp]</td>
+ <td align="center" class="{%template,ColorSwitch%} bottom">
+ $content[timestamp_ordered]
+ </td>
</tr>
<td align="center" class="{%template,ColorSwitch%} bottom right">
[<a href="{%url=modules.php?module=login&what=unconfirmed&$content[link_type]=$content[data]%}">{--EMAIL_DETAILS_LINK--}</a>]
</td>
- <td align="center" class="{%template,ColorSwitch%} bottom right">$content[timestamp]</td>
+ <td align="center" class="{%template,ColorSwitch%} bottom right">
+ $content[timestamp_ordered]
+ </td>
<td align="right" class="{%template,ColorSwitch%} bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<td align="center" class="switch_sw2 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw2 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw2 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw2 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw2 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw2 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw2 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw2 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw1 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw1 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw1 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw1 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw1 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<tr>
<td align="center" class="switch_sw1 bottom right">{--EMAIL_POINTS--}:</td>
<td align="center" class="switch_sw1 bottom" style="padding-right:5px">
- {%pipe,translateComma=$content[points]%} {?POINTS?}
+ {%pipe,getPaymentPrice,translateComma=$content[payment_id]%} {?POINTS?}
</td>
</tr>
<tr>
<div>
<select name="mail_type" size="1" class="form_select">
<option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>
- $content[type_selection]
+ $content[payment_selection]
</select>
</div>
</div>
projects / mailer.git / commitdiff