[xoops-svn] SF.net SVN: xoops-svn:[11288] XoopsModules/wfdownloads/trunk/wfdownloads

[<be...@us...>]

Revision: 11288
          http://sourceforge.net/p/xoops/svn/11288
Author:   beckmi
Date:     2013-03-23 09:58:37 +0000 (Sat, 23 Mar 2013)
Log Message:
-----------
fixed calculations for file voting results view in admin 

Modified Paths:
--------------
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php
    XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php	2013-03-23 02:09:50 UTC (rev 11287)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/main.php	2013-03-23 09:58:37 UTC (rev 11288)
@@ -137,7 +137,7 @@
         $regvotes = $rating_handler->getObjects($reg_criteria);
 
         $anon_criteria = new CriteriaCompo(new Criteria('lid', $lid));
-        $anon_criteria->add(new Criteria("ratinguser", 0, ">"));
+        $anon_criteria->add(new Criteria("ratinguser", 0, "="));
         $votesanon = $rating_handler->getCount($anon_criteria);
         $anon_criteria->setSort("ratingtimestamp");
         $anon_criteria->setOrder("DESC");
@@ -176,8 +176,8 @@
                 $uids[] = $regvotes[$i]->getVar('ratinguser');
             }
 
-            $criteria = new Criteria("uid", "(".implode(',', $uids).")", "IN");
-            $criteria->setGroupby("uid");
+            $criteria = new Criteria("ratinguser", "(".implode(',', $uids).")", "IN");
+            $criteria->setGroupby("ratinguser");
             $userratings = $rating_handler->getUserAverage($criteria);
 
 
@@ -219,12 +219,13 @@
             echo "<tr><td colspan='7' align='center' class='even'><b>" . _AM_WFD_VOTE_NOUNREGVOTES . "</b></td></tr>";
         }
         else {
-            $criteria = new Criteria("uid", 0);
+            $criteria = new Criteria("ratinguser", 0);
             $userratings = $rating_handler->getUserAverage($criteria);
+            $anonvotes = $rating_handler->getObjects($anon_criteria);
 
 
-            foreach (array_keys($regvotes) as $i) {
-                $formatted_date = formatTimestamp($regvotes[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
+            foreach (array_keys($anonvotes) as $i) {
+                $formatted_date = formatTimestamp($anonvotes[$i]->getVar('ratingtimestamp'), $xoopsModuleConfig['dateformat']);
                 $useravgrating = isset($userratings['avg']) ? $userratings["avg"] : 0;
                 $uservotes = isset($userratings['count']) ? $userratings["count"] : 0;
 
@@ -232,13 +233,13 @@
 
                 echo "
             		<tr><td align='center' class='head'>$ratinguname</td>\n
-            		<td align='center' class='even'>".$regvotes[$i]->getVar('ratinghostname')."</th>\n
-            		<td align='center' class='even'>".$regvotes[$i]->getVar('rating')."</th>\n
+            		<td align='center' class='even'>".$anonvotes[$i]->getVar('ratinghostname')."</th>\n
+            		<td align='center' class='even'>".$anonvotes[$i]->getVar('rating')."</th>\n
             		<td align='center' class='even'>$useravgrating</th>\n
             		<td align='center' class='even'>$uservotes</th>\n
             		<td align='center' class='even'>$formatted_date</th>\n
             		<td align='center' class='even'>\n
-            		<a href='".WFDOWNLOADS_URL."admin/main.php?op=delVote&amp;lid=" . $lid . "&amp;rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+            		<a href='".WFDOWNLOADS_URL."admin/main.php?op=delVote&amp;lid=" . $lid . "&amp;rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
             		</th></tr>\n
             		";
             }

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt	2013-03-23 02:09:50 UTC (rev 11287)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt	2013-03-23 09:58:37 UTC (rev 11288)
@@ -1,3 +1,7 @@
+<b><u>=> Version 3.22 RC1 (2013-03-23)</u></b>
+- fixed minor bugs in update procedure (luciorota)
+- fixed calculations for file voting results view in admin  (mamba)
+
 <b><u>=> Version 3.21 Final (2012-12-16)</u></b>
 
 - Final Release (mamba)