X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsurvey.php;h=b28aea73a066fd68030a1035a530d6c9ed81cf75;hb=4d7d27fc5c01f66e772a25cad7c1a7d33ea7bf43;hp=73a892a872a0a92199ebea28834e9117f5998bc6;hpb=a7c29df3b9bf8f3c3b23fec0f1d2feb814cb61fe;p=platal.git diff --git a/modules/survey.php b/modules/survey.php index 73a892a..b28aea7 100644 --- a/modules/survey.php +++ b/modules/survey.php @@ -1,6 +1,6 @@ load('survey.inc.php'); $page->changeTpl('survey/index.tpl'); $page->assign('survey_current', Survey::retrieveList('c')); $page->assign('survey_old', Survey::retrieveList('o')); @@ -59,7 +59,7 @@ class SurveyModule extends PLModule if ($id == -1) { return $this->show_error($page, "Un identifiant de sondage doit être précisé.", 'survey'); } - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); $survey = Survey::retrieveSurvey($id); // retrieves the survey object structure if ($survey == null || !$survey->isValid()) { return $this->show_error($page, "Sondage ".$id." introuvable.", 'survey'); @@ -67,7 +67,7 @@ class SurveyModule extends PLModule return $this->show_error($page, "Le sondage ".$survey->getTitle()." est terminé.", 'survey'); } if (!$this->check_surveyPerms($page, $survey)) { - return; + return PL_DO_AUTH; } if (Post::has('survey_submit')) { // checks if the survey has already been filled in $uid = 0; @@ -98,7 +98,7 @@ class SurveyModule extends PLModule if ($id == -1) { return $this->show_error($page, "Un identifiant de sondage doit être précisé.", 'survey'); } - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); $survey = Survey::retrieveSurvey($id); // retrieves the survey object structure if ($survey == null || !$survey->isValid()) { return $this->show_error($page, "Sondage ".$id." introuvable.", 'survey'); @@ -106,7 +106,7 @@ class SurveyModule extends PLModule return $this->show_error($page, "Le sondage ".$survey->getTitle()." n'est pas encore terminé.", 'survey'); } if (!$this->check_surveyPerms($page, $survey)) { - return; + return PL_DO_AUTH; } if ($show == 'csv') { header('Content-Type: text/csv; charset="UTF-8"'); @@ -122,7 +122,7 @@ class SurveyModule extends PLModule // {{{ function handler_admin() : index of admin mode function handler_admin(&$page, $id = -1) { - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); $this->clear_session(); if ($id == -1) { $page->changeTpl('survey/admin.tpl'); @@ -148,7 +148,7 @@ class SurveyModule extends PLModule if ($id == -1 || ($id == 'req' && $req == -1)) { return $this->show_error($page, "Un identifiant de sondage doit être précisé.", 'survey/admin'); } - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); $this->clear_session(); // cleans session (in case there would have been a problem before) if ($id == 'req') { $survey = Survey::retrieveSurveyReq($req); @@ -180,7 +180,7 @@ class SurveyModule extends PLModule return $this->show_error($page, "Un identifiant de sondage doit être précisé.", 'survey/admin'); } $id = intval($id); - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); $surveyInfo = Survey::retrieveSurveyInfo($id); // retrieves information about the survey (does not retrieve and unserialize the object structure) if ($surveyInfo == null) { return $this->show_error($page, "Sondage ".$id." introuvable.", 'survey/admin'); @@ -209,7 +209,7 @@ class SurveyModule extends PLModule return $this->show_error($page, "Un identifiant de sondage doit être précisé.", 'survey/admin'); } $id = intval($id); - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); $surveyInfo = Survey::retrieveSurveyInfo($id); // retrieves information about the survey (does not retrieve and unserialize the object structure) if ($surveyInfo == null) { return $this->show_error($page, "Sondage ".$id." introuvable.", 'survey/admin'); @@ -229,7 +229,7 @@ class SurveyModule extends PLModule // {{{ function handler_edit() : edits a survey (in normal mode unless called by handler_adminEdit() ) function handler_edit(&$page, $action = 'show', $qid = 'root') { - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); $action = Post::v('survey_action', $action); $qid = Post::v('survey_qid', $qid); if (Post::has('survey_cancel')) { // after cancelling changes, shows the survey @@ -331,7 +331,7 @@ class SurveyModule extends PLModule $this->show_error($page, "", 'survey/edit', $errors); } else { if (S::has('survey_id')) { - $this->show_confirm($page, "Veuillez confirmer l'enregistrement des modifications apportées à ce sondage", 'edit', array('action' => 'valid')); + $this->show_confirm($page, "Veuillez confirmer l'enregistrement des modifications apportées à ce sondage.", 'edit', array('action' => 'valid')); } else { $this->show_confirm($page, "Veuillez confirmer l'envoi de cette proposition de sondage.", 'edit', array('action' => 'valid')); } @@ -363,7 +363,7 @@ class SurveyModule extends PLModule // {{{ function handler_ajax() : some ajax in editing a new question (for now, there may be a little more later) function handler_ajax(&$page, $type) { - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); header('Content-Type: text/html; charset="UTF-8"'); if (Survey::isType($type)) { // when type has been chosen, the form is updated to fit exactly the type of question chosen $page->changeTpl('survey/edit_new.tpl', NO_SKIN); @@ -398,16 +398,13 @@ class SurveyModule extends PLModule // {{{ function check_surveyPerms() : checks the particular surveys access permissions function check_surveyPerms(&$page, $survey) { - require_once dirname(__FILE__).'/survey/survey.inc.php'; + $this->load('survey.inc.php'); if (!$survey->isMode(Survey::MODE_ALL)) { // if the survey is reserved to alumni - global $globals; - if (!call_user_func(array($globals->session, 'doAuth'))) { // checks authentification - global $platal; - $platal->force_login($page); + if (!S::logged()) { + return false; } if (!$survey->checkPromo(S::v('promo'))) { // checks promotion - $this->show_error($page, "Tu n'as pas accès à ce sondage car il est réservé à d'autres promotions.", 'survey'); - return false; + $page->kill("Tu n'as pas accès à ce sondage car il est réservé à d'autres promotions."); } } return true; @@ -462,6 +459,7 @@ class SurveyModule extends PLModule if (!is_null($errArray)) { $page->assign('survey_errors', $errArray); } + } // }}}