X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-mediadata.php;h=50078e5ade00e38f53b5e1f732222b8ea181f9dd;hb=1c4e78c5d68b97b82a3b930aa6db1e6df188f653;hp=4da05fad705987ece86f6838748d8899161af892;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index 4da05fad70..50078e5ade 100644 --- a/inc/modules/guest/what-mediadata.php +++ b/inc/modules/guest/what-mediadata.php @@ -1,7 +1,7 @@ 0) { $TEST = makeTime(0, 0, 0, $PROJECTED); if ($TEST > time()) { - $content['projected'] = generateDateTime($PROJECTED, 3); + $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', generateDateTime($PROJECTED, 3)); } else { - $content['projected'] = getMessage('USER_PROJECTION_UNKNOWN'); + $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', getMessage('USER_PROJECTION_UNKNOWN')); } // User who can receive mails @@ -174,9 +175,9 @@ $content['ref_clicks'] = $clicks; // // Initialize Variables -$OUT_EXTRA = ''; $ROWS_EXTRA = 2; -$OUT_POINTS = ''; $ROWS_POINTS = 2; -$OUT_USER = ''; $ROWS_USER = 6; +$OUT_EXTRA = ''; +$OUT_POINTS = ''; +$OUT_USER = ''; $OUT_SPECIAL = ''; // We don't need row count here // @TODO Rewrite all these if-blocks to filters @@ -184,10 +185,9 @@ if (isExtensionActive('beg')) { // Clicks on beg links $data = array( 'lang' => getMessage('MEDIA_BEG_CLICKS'), - 'value' => countSumTotalData(1, 'user_data', 'beg_clicks', 1, false, " AND `beg_clicks` > 0") + 'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, " AND `beg_clicks` > 0") ); $OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data); - $ROWS_EXTRA++; } if (isExtensionActive('doubler')) { @@ -198,7 +198,6 @@ if (isExtensionActive('doubler')) { $data = array( 'lang' => getMessage('MEDIA_DOUBLER_COUNT'), 'value' => countSumTotalData('Y','doubler','id','completed', true, " AND `points` > 0"), - 'rows' => 4 ); // Add points @@ -241,7 +240,6 @@ WHERE 'value' => $holiday ); $OUT_USER .= loadTemplate('mediadata_extra_row', true, $data); - $ROWS_USER++; } if (isExtensionActive('transfer')) { @@ -275,7 +273,6 @@ ON t.userid=d.userid", $data = array( 'lang' => getMessage('MEDIA_TRANSFER_IN_COUNT'), 'value' => $count_in, - 'rows' => 4 ); $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data); $data = array( @@ -295,13 +292,10 @@ ON t.userid=d.userid", $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data); } // END - if -$content['out_extra'] = $OUT_EXTRA; -$content['out_points'] = $OUT_POINTS; -$content['out_user'] = $OUT_USER; -$content['out_special'] = $OUT_SPECIAL; -$content['rowspan_extra'] = $ROWS_EXTRA; -$content['rowspan_points'] = $ROWS_POINTS; -$content['rowspan_user'] = $ROWS_USER; +$content['out_extra'] = $OUT_EXTRA; +$content['out_points'] = $OUT_POINTS; +$content['out_user'] = $OUT_USER; +$content['out_special'] = $OUT_SPECIAL; // Patch timespamp $content['patch_ctime'] = generateDateTime(getConfig('patch_ctime'), 2);