projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove call-time pass-by-reference code which produces fatal error with PHP>=5.4
[platal.git]
/
modules
/
survey
/
survey.inc.php
diff --git
a/modules/survey/survey.inc.php
b/modules/survey/survey.inc.php
index
497a7f8
..
6f8ad08
100644
(file)
--- a/
modules/survey/survey.inc.php
+++ b/
modules/survey/survey.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
1
Polytechnique.org *
+ * Copyright (C) 2003-201
3
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-199,11
+199,11
@@
class Survey
$nbf = count($line);
$users = array();
if ($this->isMode(self::MODE_XIDENT)) { // if the mode is non anonymous
$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
-
FROM survey_votes AS v
-
WHERE v.survey_id = {?}
-
ORDER BY vid ASC',
-
$this->id)
);
+ $users = XDB::fetchAllAssoc('vid', 'SELECT v.id AS vid, v.uid
+ FROM survey_votes AS v
+ WHERE v.survey_id = {?}
+ ORDER BY vid ASC',
+
$this->id
);
}
$sql = 'SELECT v.id AS vid, a.question_id AS qid, a.answer AS answer
FROM survey_votes AS v
}
$sql = 'SELECT v.id AS vid, a.question_id AS qid, a.answer AS answer
FROM survey_votes AS v
@@
-221,9
+221,10
@@
class Survey
$line[0] = $vid_; // the first field is a 'clean' vote id (not the one stored in database)
if ($this->isMode(self::MODE_XIDENT)) { // if the mode is non anonymous
if (array_key_exists($vid, $users)) { // and if the user data can be found
$line[0] = $vid_; // the first field is a 'clean' vote id (not the one stored in database)
if ($this->isMode(self::MODE_XIDENT)) { // if the mode is non anonymous
if (array_key_exists($vid, $users)) { // and if the user data can be found
- $line[1] = $users[$vid]->lastName(); // adds the user data (in the first fields of the line)
- $line[2] = $users[$vid]->firstName();;
- $line[3] = $users[$vid]->promo();
+ $user=PlUser::getWithUID($users[$vid]);
+ $line[1] = $user->lastName(); // adds the user data (in the first fields of the line)
+ $line[2] = $user->firstName();
+ $line[3] = $user->promo();
}
}
$vid_++;
}
}
$vid_++;
@@
-348,7
+349,10
@@
class Survey
default:
return null;
}
default:
return null;
}
- $sql = 'SELECT id, title, end, mode
+ if (!S::user()->checkPerms(PERMS_USER)) {
+ $where .= XDB::format(' AND mode = {?}', self::MODE_ALL);
+ }
+ $sql = 'SELECT id, title, uid, end, mode
FROM surveys
WHERE '.$where.'
ORDER BY end DESC;';
FROM surveys
WHERE '.$where.'
ORDER BY end DESC;';