Previous fix fixed, a lot constants rewritten (unfinished)

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

diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index 9628f98de05a770814f9d8a75588eb66273ca5e0..7fa594a0dfc4cf7d4082989f1aedb59b5ff6aa24 100644 (file)
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -52,19 +52,19 @@ switch (getConfig('guest_stats'))
 {
 case "MEMBERS": // Statistics about your members
        // Members yesterday / today online
-       $ymem = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE last_online >= ".START_YDAY." AND last_online < ".START_TDAY." AND status='CONFIRMED'", __FILE__, __LINE__));
-       $tmem = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE last_online >= ".START_TDAY." AND status='CONFIRMED'", __FILE__, __LINE__));
+       $ymem = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE last_online >= ".START_YDAY." AND last_online < ".START_TDAY." AND status='CONFIRMED'", __FILE__, __LINE__));
+       $tmem = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE last_online >= ".START_TDAY." AND status='CONFIRMED'", __FILE__, __LINE__));
 
        // Yesterday / today registered
-       $yreg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE joined >= ".START_YDAY." AND joined < ".START_TDAY, __FILE__, __LINE__));
-       $treg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE joined >= ".START_TDAY, __FILE__, __LINE__));
+       $yreg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE joined >= ".START_YDAY." AND joined < ".START_TDAY, __FILE__, __LINE__));
+       $treg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE joined >= ".START_TDAY, __FILE__, __LINE__));
 
        // Only males / females
-       $male   = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE gender='M' AND status='CONFIRMED'", __FILE__, __LINE__));
-       $female = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE gender='F' AND status='CONFIRMED'", __FILE__, __LINE__));
+       $male   = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE gender='M' AND status='CONFIRMED'", __FILE__, __LINE__));
+       $female = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE gender='F' AND status='CONFIRMED'", __FILE__, __LINE__));
 
        // Unconfirmed accounts
-       $unconfirmed = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE status != 'CONFIRMED'", __FILE__, __LINE__));
+       $unconfirmed = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status != 'CONFIRMED'", __FILE__, __LINE__));
 
        // Total members
        $total = $male + $female;
@@ -74,12 +74,12 @@ case "MEMBERS": // Statistics about your members
        for ($idx = 1; $idx < 13; $idx++)
        {
                $month = $idx; if ($idx < 10) $month = "0".$idx;
-               $months[$month] = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE birth_month=%s AND status='CONFIRMED'",
+               $months[$month] = SQL_NUMROWS(SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE birth_month=%s AND status='CONFIRMED'",
                 array(bigintval($month)), __FILE__, __LINE__));
        }
 
        // Members in categories
-       $result = SQL_QUERY("SELECT id, cat FROM `{!MYSQL_PREFIX!}_cats` WHERE visible='Y' ORDER BY id", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE `visible`='Y' ORDER BY `id`", __FILE__, __LINE__);
 
        // Load categories first
        $cats = array(); $cat_cnt = array();
@@ -91,7 +91,7 @@ case "MEMBERS": // Statistics about your members
        // Now we have all categories loaded, count members
        foreach ($cats as $id => $dummy) {
                // We only need id and nothing more to count...
-               $cat_cnt[$id] = SQL_NUMROWS(SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
+               $cat_cnt[$id] = SQL_NUMROWS(SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE cat_id=%s",
                        array(bigintval($id)), __FILE__, __LINE__));
        }
 
@@ -163,27 +163,24 @@ case "MEMBERS": // Statistics about your members
 
 case "MODULES": // TOP10 module clicks
        $AND = "";
-       if (!IS_ADMIN()) $AND = " AND locked='N' AND visible='Y'";
-       $guest_t10 = SQL_QUERY("SELECT counter, title FROM `{!MYSQL_PREFIX!}_guest_menu` WHERE counter > 0".$AND." ORDER BY counter DESC LIMIT 0,10", __FILE__, __LINE__);
-       $mem_t10   = SQL_QUERY("SELECT counter, title FROM `{!MYSQL_PREFIX!}_member_menu` WHERE counter > 0".$AND." ORDER BY counter DESC LIMIT 0,10", __FILE__, __LINE__);
-       if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0))
-       {
+       if (!IS_ADMIN()) $AND = " AND `locked`='N' AND `visible`='Y'";
+       $guest_t10 = SQL_QUERY("SELECT counter, title FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE counter > 0".$AND." ORDER BY counter DESC LIMIT 0,10", __FILE__, __LINE__);
+       $mem_t10   = SQL_QUERY("SELECT counter, title FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE counter > 0".$AND." ORDER BY counter DESC LIMIT 0,10", __FILE__, __LINE__);
+       if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0)) {
                // Output header
                OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"guest_table dashed\" width=\"310\">
 <tr>
-  <td align=\"center\" class=\"guest_stats_title bottom2\" colspan=\"2\"><strong>".GUEST_TOPTEN_STATS."</strong></td>
+  <td align=\"center\" class=\"guest_stats_title bottom2\" colspan=\"2\"><strong>{!GUEST_TOPTEN_STATS!}</strong></td>
 </tr>");
        }
 
-       if (SQL_NUMROWS($guest_t10) > 0)
-       {
+       if (SQL_NUMROWS($guest_t10) > 0) {
                // Guest clicks
                OUTPUT_HTML("<tr>
   <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_GUEST_STATS."</td>
 </tr>");
                $SW = 2;
-               while (list($clicks, $title) = SQL_FETCHROW($guest_t10))
-               {
+               while (list($clicks, $title) = SQL_FETCHROW($guest_t10)) {
                        OUTPUT_HTML("<tr>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</td>
   <td class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</td>
@@ -191,15 +188,14 @@ case "MODULES": // TOP10 module clicks
                        $SW = 3 - $SW;
                }
        }
-       if (SQL_NUMROWS($guest_t10) > 0)
-       {
+
+       if (SQL_NUMROWS($guest_t10) > 0) {
                // Guest clicks
                OUTPUT_HTML("<tr>
   <td align=\"center\" class=\"guest_title2 bottom2\" colspan=\"2\">".GUEST_TOP_MEMBER_STATS."</td>
 </tr>");
                $SW = 2;
-               while (list($clicks, $title) = SQL_FETCHROW($mem_t10))
-               {
+               while (list($clicks, $title) = SQL_FETCHROW($mem_t10)) {
                        OUTPUT_HTML("<tr>
   <td class=\"switch_sw".$SW." bottom2 right2\" align=\"right\" width=\"250\">".$title."&nbsp;</td>
   <td class=\"switch_sw".$SW." bottom2\" width=\"50\">&nbsp;".$clicks."</td>
@@ -207,11 +203,11 @@ case "MODULES": // TOP10 module clicks
                        $SW = 3 - $SW;
                }
        }
-       if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0))
-       {
+
+       if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0)) {
                // Output footer
                OUTPUT_HTML("<tr>
-  <td align=\"center\" class=\"guest_stats_footer\" colspan=\"2\"><a href=\"".URL."/modules.php?module=index&amp;what=stats&amp;mode=".$lmode."\">".$ltitle."</a></td>
+  <td align=\"center\" class=\"guest_stats_footer\" colspan=\"2\"><a href=\"{!URL!}/modules.php?module=index&amp;what=stats&amp;mode=".$lmode."\">".$ltitle."</a></td>
 </tr>
 </table>");
        }