Fix fetching of phones for user addresses

[platal.git] / modules / survey.php

diff --git a/modules/survey.php b/modules/survey.php
index f74f222..15ee732 100644 (file)
--- a/modules/survey.php
+++ b/modules/survey.php
@@ -110,6 +110,7 @@ class SurveyModule extends PLModule
         }
         if ($show == 'csv') {
             pl_content_headers("text/csv");
+            header('Content-Disposition: attachment; filename="'.addslashes($survey->getTitle()).'.csv"');
             echo $survey->toCSV();
             exit;
         } else {
@@ -396,31 +397,34 @@ class SurveyModule extends PLModule
     // }}}
 
     // {{{ function check_surveyPerms() : checks the particular surveys access permissions
-    function check_surveyPerms(&$page, $survey)
+    function check_surveyPerms(&$page, $survey, $silent = false)
     {
         $this->load('survey.inc.php');
-        if (!$survey->isMode(Survey::MODE_ALL)) { // if the survey is reserved to alumni
-            if (!S::logged()) {
-                return false;
-            }
-            $profile = S::user()->profile();
-            if (!$profile) {
-                return false;
-            }
-            // checks promotion
-            $allowed = false;
-            foreach ($profile->yearspromo() as $p) {
-                var_dump($p);
-                if ($survey->checkPromo($p)) {
-                    $allowed = true;
-                    break;
-                }
-            }
-            if (!$allowed) {
-                $page->kill("Tu n'as pas accès à ce sondage car il est réservé à d'autres promotions.");
+        if ($survey->isMode(Survey::MODE_ALL)) { // if the survey is not reserved to alumni
+            return true;
+        }
+        if (!S::logged()) {
+            return false;
+        }
+        $profile = S::user()->profile();
+        if (!$profile) {
+            return false;
+        }
+        // checks promotion
+        $allowed = false;
+        foreach ($profile->yearspromo() as $p) {
+            if ($survey->checkPromo($p)) {
+                $allowed = true;
+                break;
             }
         }
-        return true;
+        if ($allowed) {
+            return true;
+        }
+        if (!$silent) {
+            $page->kill("Tu n'as pas accès à ce sondage car il est réservé à d'autres promotions.");
+        }
+        return false;
     }
     // }}}