From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Sat, 5 Jun 2010 12:25:02 +0000 (+0200)
Subject: Fixes vote for survey (user_id instead of uid). Closes #1078
X-Git-Tag: xorg/1.0.0~185
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d25ac13d033de3008e13978818f9950bba74bf39;p=platal.git

Fixes vote for survey (user_id instead of uid). Closes #1078
---

diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php
index 6d8a410..fe559fc 100644
--- a/modules/survey/survey.inc.php
+++ b/modules/survey/survey.inc.php
@@ -190,7 +190,7 @@ class Survey
         $nbf = count($line);
         $users = array();
         if ($this->isMode(self::MODE_XIDENT)) { // if the mode is non anonymous
-            $users = User::getBulkUsersWithUIDs(XDB::fetchAllAssoc('vid', 'SELECT  v.id AS vid, v.uid
+            $users = User::getBulkUsersWithUIDs(XDB::fetchAllAssoc('vid', 'SELECT  v.id AS vid, v.user_id
                                                                              FROM  survey_votes AS v
                                                                             WHERE  v.survey_id = {?}
                                                                          ORDER BY  vid ASC',
@@ -434,7 +434,7 @@ class Survey
     public function vote($uid, $args)
     {
         XDB::execute('INSERT INTO  survey_votes
-                              SET  survey_id = {?}, uid = {?};', $this->id, $uid); // notes the user as having voted
+                              SET  survey_id = {?}, user_id = {?};', $this->id, $uid); // notes the user as having voted
         $vid = XDB::insertId();
         for ($i = 0; $i < count($this->questions); $i++) {
             $ans = $this->questions[$i]->checkAnswer($args[$i]);
@@ -453,7 +453,7 @@ class Survey
     {
         $res = XDB::query('SELECT  id
                              FROM  survey_votes
-                            WHERE  survey_id = {?} AND uid = {?};', $this->id, $uid); // checks whether the user has already voted
+                            WHERE  survey_id = {?} AND user_id = {?};', $this->id, $uid); // checks whether the user has already voted
         return ($res->numRows() != 0);
     }
     // }}}