Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.

[mailer.git] / inc / modules / admin / what-surfbar_stats.php

diff --git a/inc/modules/admin/what-surfbar_stats.php b/inc/modules/admin/what-surfbar_stats.php
index 54ff5df476f48c92f282f3778132f8dd43861973..aca6624c8a7d1579528489c64a05077d1c38f690 100644 (file)
--- a/inc/modules/admin/what-surfbar_stats.php
+++ b/inc/modules/admin/what-surfbar_stats.php
@@ -14,12 +14,10 @@
  * $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                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -40,15 +38,15 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Is the 'url_id' set?
-if (isGetRequestParameterSet(('url_id'))) {
+if (isGetRequestElementSet('url_id')) {
        // Generate general statistics
-       $result = SQL_QUERY_ESC("SELECT
+       $result = sqlQueryEscaped("SELECT
        `stats_userid`,
        `stats_count` AS `total_visits`,
        UNIX_TIMESTAMP(`stats_last_surfed`) AS `last_surfed`
@@ -58,44 +56,41 @@ WHERE
        `stats_url_id`=%s
 ORDER BY
        `stats_userid` ASC",
-               array(bigintval(getRequestParameter('url_id'))), __FILE__, __LINE__);
+               array(bigintval(getRequestElement('url_id'))), __FILE__, __LINE__);
 
        // Entries found?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // Get all rows
-               $OUT = ''; $SW = 2; $cnt = '0'; $visits = '0';
-               while ($content = SQL_FETCHARRAY($result)) {
+               $OUT = ''; $count = '0'; $visits = '0';
+               while ($content = sqlFetchArray($result)) {
                        // Count totals
                        $visits += $content['total_visits'];
 
                        // "Translate" some data
-                       $content['stats_userid'] = generateUserProfileLink($content['stats_userid']);
-                       $content['total_visits'] = translateComma($content['total_visits']);
                        $content['last_surfed']  = generateDateTime($content['last_surfed'], 2);
-                       $content['sw']           = $SW;
 
                        // Load row template
-                       $OUT .= loadTemplate('admin_surfbar_url_stats_row', true, $content);
-                       $cnt++; $SW = 3 - $SW;
+                       $OUT .= loadTemplate('admin_surfbar_url_stats_row', TRUE, $content);
+                       $count++;
                } // END - while
 
                // Prepare content
                $content = array(
                        'rows'    => $OUT,
-                       'userids' => $cnt,
+                       'userids' => $count,
                        'visits'  => $visits
                );
 
 
                // Load main template
-               loadTemplate('admin_surfbar_url_stats', false, $content);
+               loadTemplate('admin_surfbar_url_stats', FALSE, $content);
        } else {
                // No statistics so far
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_URL_STATS'));
+               displayMessage('{--ADMIN_SURFBAR_NO_URL_STATS--}');
        }
 } else {
        // Generate general statistics
-       $result = SQL_QUERY("SELECT
+       $result = sqlQuery("SELECT
        `stats_userid`,
        COUNT(`stats_url_id`) AS `visited_urls`,
        SUM(`stats_count`) AS `total_visits`
@@ -107,44 +102,36 @@ ORDER BY
        `stats_userid` ASC", __FILE__, __LINE__);
 
        // Entries found?
-       if (SQL_NUMROWS($result) > 0) {
+       if (!ifSqlHasZeroNumRows($result)) {
                // Get all rows
-               $OUT = ''; $SW = 2; $urls = '0'; $visits = '0';
-               while ($content = SQL_FETCHARRAY($result)) {
+               $OUT = ''; $urlArray = '0'; $visits = '0';
+               while ($content = sqlFetchArray($result)) {
                        // Count totals
-                       $urls   += $content['visited_urls'];
-                       $visits += $content['total_visits'];
-
-                       // "Translate" some data
-                       // @TODO Can't all these translation blocks moved into templates? This code looks ugly.
-                       $content['stats_userid'] = generateUserProfileLink($content['stats_userid']);
-                       $content['visited_urls'] = translateComma($content['visited_urls']);
-                       $content['total_visits'] = translateComma($content['total_visits']);
-                       $content['sw']           = $SW;
+                       $urlArray += $content['visited_urls'];
+                       $visits   += $content['total_visits'];
 
                        // Load row template
-                       $OUT .= loadTemplate('admin_surfbar_stats_row', true, $content);
-                       $SW = 3 - $SW;
+                       $OUT .= loadTemplate('admin_surfbar_stats_row', TRUE, $content);
                } // END - while
 
                // Prepare content
                $content = array(
                        'rows'   => $OUT,
-                       'urls'   => $urls,
+                       'urls'   => $urlArray,
                        'visits' => $visits
                );
 
 
                // Load main template
-               loadTemplate('admin_surfbar_stats', false, $content);
+               loadTemplate('admin_surfbar_stats', FALSE, $content);
        } else {
                // No statistics so far
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_SURFBAR_NO_STATS'));
+               displayMessage('{--ADMIN_SURFBAR_NO_STATS--}');
        }
 }
 
 // Free result
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
-//
+// [EOF]
 ?>