X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-mediadata.php;h=804b4191fe19b88f46da179eb3601be0563ddd19;hb=88011a1b5523b5e5ba9bc6495c3e361fc4a3dc8a;hp=9e8eba501c5e000c894bf69a482349de0afcd724;hpb=e5fe5afb17a5c8106f4c890234dfa39419e70f5d;p=mailer.git

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 9e8eba501c..804b4191fe 100644
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -23,6 +23,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -74,9 +75,9 @@ if ($content['user_count'] > 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', '{--USER_PROJECTION_UNKNOWN--}');
 }
 
 // User who can receive mails
@@ -174,47 +175,45 @@ $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
 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")
+		'lang'  => '{--MEDIA_BEG_CLICKS--}',
+		'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')) {
 	// Add header
-	$OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, getMessage('MEDIA_DOUBLER_HEADER'));
+	$OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, '{--MEDIA_DOUBLER_HEADER--}');
 
 	// Add first line (count)
 	$data = array(
-		'lang'  => getMessage('MEDIA_DOUBLER_COUNT'),
+		'lang'  => '{--MEDIA_DOUBLER_COUNT--}',
 		'value' => countSumTotalData('Y','doubler','id','completed', true, " AND `points` > 0"),
-		'rows'  => 4
 	);
 
 	// Add points
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_DOUBLER_CPOINTS'),
+		'lang'  => '{--MEDIA_DOUBLER_CPOINTS--}',
 		'value' => translateComma(countSumTotalData('Y','doubler','id','completed', false, " AND `points` > 0"))
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_DOUBLER_WAITING'),
+		'lang'  => '{--MEDIA_DOUBLER_WAITING--}',
 		'value' => translateComma(countSumTotalData('N','doubler','id','completed', true, " AND `points` > 0"))
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_DOUBLER_WPOINTS'),
+		'lang'  => '{--MEDIA_DOUBLER_WPOINTS--}',
 		'value' => translateComma(countSumTotalData('N','doubler','id','completed', false, " AND `points` > 0"))
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
@@ -237,11 +236,10 @@ WHERE
 	SQL_FREERESULT($result);
 	if (empty($holiday)) $holiday = '0';
 	$data = array(
-		'lang'  => getMessage('MEDIA_HOLIDAY_COUNT'),
+		'lang'  => '{--MEDIA_HOLIDAY_COUNT--}',
 		'value' => $holiday
 	);
 	$OUT_USER .= loadTemplate('mediadata_extra_row', true, $data);
-	$ROWS_USER++;
 }
 
 if (isExtensionActive('transfer')) {
@@ -271,37 +269,33 @@ ON t.userid=d.userid",
 	if (empty($points_out)) $points_out = '0';
 
 	// Add header
-	$OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, getMessage('MEDIA_TRANSFER_HEADER'));
+	$OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, '{--MEDIA_TRANSFER_HEADER--}');
 	$data = array(
-		'lang'  => getMessage('MEDIA_TRANSFER_IN_COUNT'),
+		'lang'  => '{--MEDIA_TRANSFER_IN_COUNT--}',
 		'value' => $count_in,
-		'rows'  => 4
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_TRANSFER_IN_POINTS'),
+		'lang'  => '{--MEDIA_TRANSFER_IN_POINTS--}',
 		'value' => translateComma($points_in)
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_TRANSFER_OUT_COUNT'),
+		'lang'  => '{--MEDIA_TRANSFER_OUT_COUNT--}',
 		'value' => $count_out
 	);
 	$OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
 	$data = array(
-		'lang'  => getMessage('MEDIA_TRANSFER_OUT_POINTS'),
+		'lang'  => '{--MEDIA_TRANSFER_OUT_POINTS--}',
 		'value' => translateComma($points_out)
 	);
 	$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);