Changeset 1528 in ExiteCMS

Timestamp:

07/07/08 17:53:43 (4 years ago)

Author:

hverton

Message:

test if the report query is correct and whould produce any results before showing it

Location:

modules/common/download_statistics/php-files/modules/download_statistics

Files:

• module_installer.php (modified) (4 diffs)
• report.topfiles.php (modified) (1 diff)
• templates/modules.download_statistics.side_panel.tpl (modified) (1 diff)

modules/common/download_statistics/php-files/modules/download_statistics/module_installer.php

@@ -17 +17 @@
 $mod_title = "Download Statistics";
 $mod_description = "Gather and display download statistics from download mirror logs. includes a Google Map with downloaders per country";
-$mod_version = "1.1.1";
+$mod_version = "1.1.2";
 $mod_developer = "WanWizard";
 $mod_email = "wanwizard@gmail.com";
@@ -117 +117 @@
 $localestrings['en']['dls800'] = "Top files downloaded";
 $localestrings['en']['dls801'] = "Filenames filter";
-$localestrings['en']['dls802'] = "This filter is a regex";
+$localestrings['en']['dls802'] = "This filter is a regexp";
 $localestrings['en']['dls803'] = "Show me";
 $localestrings['en']['dls804'] = "the top";
@@ -124 +124 @@
 $localestrings['en']['dls807'] = "Ascending";
 $localestrings['en']['dls808'] = "Descending";
-$localestrings['en']['dls809'] = "Error in regex:";
+$localestrings['en']['dls809'] = "Error in regexp:";
 $localestrings['en']['dls810'] = "Filename";
 $localestrings['en']['dls811'] = "Download Count";
@@ -152 +152 @@
 $localestrings['en']['dls928'] = "You have to select either a download item or enter filename(s), or both";
 $localestrings['en']['dls929'] = "Are you sure you want to delete this statistics counter?";
+// Messages: Reports
+$localestrings['en']['dls950'] = "The report could not be generated:";
 
 /*---------------------------------------------------+

modules/common/download_statistics/php-files/modules/download_statistics/report.topfiles.php

@@ -80 +80 @@
 
             // check how many rows this would output
-            $rptresult = dbquery($sql.($top ? (" LIMIT 0,".$top) : ""));
-            // store some row counter for the pager
-            $variables['rows'] = dbrows($rptresult);
-            $variables['rowstart'] = $rowstart;
+            $rptresult = mysql_query($sql);
+            if ($rptresult) {
+                // store some row counter for the pager
+                $variables['rows'] = dbrows($rptresult);
+                $variables['rowstart'] = $rowstart;
 
-            // now add a query limit, make sure not to overshoot the limit requested
-            if ($top > 0 && $rowstart+$settings['numofthreads'] > $top) {
-                $rowstart = max(0, $limit - $settings['numofthreads']);
+                // now add a query limit, make sure not to overshoot the limit requested
+                if ($top > 0 && $rowstart+$settings['numofthreads'] > $top) {
+                    $rowstart = max(0, $limit - $settings['numofthreads']);
+                } else {
+                    // technically, this is never going to be the limit ;-)
+                    $top = 99999999999999;
+                }
+                $rptresult = dbquery($sql." LIMIT ".$rowstart.",".min($rowstart+$top, $settings['numofthreads']));
+
+                // get the results
+                $reportvars['output'] = array();
+                while ($rptdata = dbarray($rptresult)) {
+                    $reportvars['output'][] = $rptdata;
+                }
             } else {
-                // technically, this is never going to be the limit ;-)
-                $top = 99999999999999;
+                $variables['message'] = $locale['dls950']." ".mysql_error();
             }
-            $rptresult = dbquery($sql." LIMIT ".$rowstart.",".min($rowstart+$top, $settings['numofthreads']));
-
-            // get the results
-            $reportvars['output'] = array();
-            while ($rptdata = dbarray($rptresult)) {
-                $reportvars['output'][] = $rptdata;
-            }
-
         }
     }

modules/common/download_statistics/php-files/modules/download_statistics/templates/modules.download_statistics.side_panel.tpl

@@ -30 +30 @@
         </td>
         <td style='border-left: 1px solid #cccccc;'>
-            <div style='width:background-color: #f6f6f6;{$barwidth}'>
+            <div style='background-color: #f6f6f6;width:{$barwidth}px'>
                 <div style='height:12px;width:{$counters[bar].width}px;background-color:rgb({$counters[bar].red},{$counters[bar].green},{$counters[bar].blue});' title='{$counters[bar].description}'></div>
             </div>