Fixes for absent ext-user and misleading data removed

[mailer.git] / inc / modules / guest / what-mediadata.php

diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php
index 6fd3e085d1201f16b3c5b193eac09b69bf2d5ba0..c8c30db2a220b6639513f7cdd9c892fa7c38c005 100644 (file)
--- a/inc/modules/guest/what-mediadata.php
+++ b/inc/modules/guest/what-mediadata.php
@@ -10,20 +10,13 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mediendaten                                      *
  * -------------------------------------------------------------------- *
- *          mod_media - By Robert Niedziela                             *
- *          (c)2003 www.megacomputing.net                               *
- * -------------------------------------------------------------------- *
- *           Rewritten by Roland Haeder, 2003 - 2009                    *
- * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,12 +41,16 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('guest', __FILE__);
+addYouAreHereLink('guest', __FILE__);
 
+// Both ext-mediadata and ext-user must be there
 if ((!isExtensionActive('mediadata')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mediadata'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('mediadata'));
        return;
-} // END - if
+} elseif ((!isExtensionActive('user')) && (!isAdmin())) {
+       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
+       return;
+}
 
 // Get total confirmed user ids...
 $content['user_confirmed']   = getTotalConfirmedUser();
@@ -126,20 +123,20 @@ $content['user_links'] = abs($sent - $clicks);
 
 $clr = '0.00000';
 if ($sent > 0) $clr = $clicks / $sent * 100;
-$content['_clr'] = translateComma($clr) . '%';
+$content['_clr'] = $clr;
 
 // Load jackpot
 $jackpot = '0';
 if (isExtensionActive('jackpot')) $jackpot = getJackpotPoints();
 
 if (empty($jackpot)) $jackpot = '0';
-$content['jackpot'] = translateComma($jackpot);
+$content['jackpot'] = $jackpot;
 
 // Total referal link clicks, total logins
-$result = SQL_QUERY("SELECT
+$result = SQL_QUERY('SELECT
        SUM(d.ref_clicks), SUM(d.total_logins)
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d", __FILE__, __LINE__);
+       `{?_MYSQL_PREFIX?}_user_data` AS d', __FILE__, __LINE__);
 list($ref, $logins) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
@@ -150,7 +147,7 @@ if (empty($points)) $points = '0';
 if (empty($ref))    $ref    = '0';
 if (empty($logins)) $logins = '0';
 
-$content['total_points']    = translateComma($points);
+$content['total_points']    = $points;
 $content['total_refclicks'] = $ref;
 $content['total_logins']    = $logins;
 
@@ -188,7 +185,7 @@ if (isExtensionActive('beg')) {
                'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, ' AND `beg_clicks` > 0')
        );
        $OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data);
-}
+} // END - if
 
 if (isExtensionActive('doubler')) {
        // Add header
@@ -217,7 +214,7 @@ if (isExtensionActive('doubler')) {
                'value' => countSumTotalData('N','doubler','id','completed', false, ' AND `points` > 0')
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
-}
+} // END - if
 
 if (isExtensionActive('holiday')) {
        // Total holiday requests
@@ -240,12 +237,12 @@ WHERE
                'value' => $holiday
        );
        $OUT_USER .= loadTemplate('mediadata_extra_row', true, $data);
-}
+} // END - if
 
 if (isExtensionActive('transfer')) {
        // Statistics for points transfers
        $result = SQL_QUERY("SELECT
-       COUNT(t.id) AS cnt, SUM(t.points) AS points
+       COUNT(t.id) AS cnt, SUM(t.points) AS `points`
 FROM
        `{?_MYSQL_PREFIX?}_user_transfers_in` AS t
 LEFT JOIN
@@ -258,10 +255,14 @@ ON
        if (empty($count_in))  $count_in  = '0';
        if (empty($points_in)) $points_in = '0';
 
-       $result = SQL_QUERY("SELECT COUNT(t.id), SUM(t.points)
-FROM `{?_MYSQL_PREFIX?}_user_transfers_out` AS t
-LEFT JOIN `{?_MYSQL_PREFIX?}_user_data` AS d
-ON t.userid=d.userid",
+       $result = SQL_QUERY("SELECT
+       COUNT(t.id), SUM(t.points)
+FROM
+       `{?_MYSQL_PREFIX?}_user_transfers_out` AS t
+LEFT JOIN
+       `{?_MYSQL_PREFIX?}_user_data` AS d
+ON
+       t.userid=d.userid",
        __FILE__, __LINE__);
        list($count_out, $points_out) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);