Fix php warnings

pull/3290/head
Julio Montoya 5 years ago
parent 6e55b699d4
commit bd22cd0e3d
  1. 1
      main/survey/survey.lib.php
  2. 25
      main/survey/surveyUtil.class.php
  3. 2
      main/survey/survey_invite.php

@ -2794,6 +2794,7 @@ class SurveyManager
); );
SurveyUtil::saveInvitations( SurveyUtil::saveInvitations(
$surveyId,
['users' => $tutor['user_id']], ['users' => $tutor['user_id']],
$subject, $subject,
$content, $content,

@ -2377,15 +2377,16 @@ class SurveyUtil
* and additional users in the database * and additional users in the database
* and sends the invitations by email. * and sends the invitations by email.
* *
* @param $users_array Users $array array can be both a list of course uids AND a list of additional emailaddresses * @param int $surveyId
* @param $invitation_title Title $string of the invitation, used as the title of the mail * @param array $users_array Users array can be both a list of course uids AND a list of additional email addresses
* @param $invitation_text Text $string of the invitation, used as the text of the mail. * @param string $invitation_title title of the mail
* The text has to contain a **link** string or this will automatically be added to the end * @param string $invitation_text text of the mail has to contain a **link** string or
* @param int $reminder * this will automatically be added to the end
* @param bool $sendmail * @param int $reminder
* @param int $remindUnAnswered * @param bool $sendmail
* @param bool $isAdditionalEmail * @param int $remindUnAnswered
* @param bool $hideLink * @param bool $isAdditionalEmail
* @param bool $hideLink
* *
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @author Julio Montoya - Adding auto-generated link support * @author Julio Montoya - Adding auto-generated link support
@ -2393,6 +2394,7 @@ class SurveyUtil
* @version January 2007 * @version January 2007
*/ */
public static function saveInvitations( public static function saveInvitations(
$surveyId,
$users_array, $users_array,
$invitation_title, $invitation_title,
$invitation_text, $invitation_text,
@ -2402,12 +2404,13 @@ class SurveyUtil
$isAdditionalEmail = false, $isAdditionalEmail = false,
$hideLink = false $hideLink = false
) { ) {
$surveyId = (int) $surveyId;
if (!is_array($users_array)) { if (!is_array($users_array)) {
return 0; return 0;
} }
// Getting the survey information // Getting the survey information
$survey_data = SurveyManager::get_survey($_GET['survey_id']); $survey_data = SurveyManager::get_survey($surveyId);
$survey_invitations = self::get_invitations($survey_data['survey_code']); $survey_invitations = self::get_invitations($survey_data['survey_code']);
$already_invited = self::get_invited_users($survey_data['code']); $already_invited = self::get_invited_users($survey_data['code']);
@ -2416,7 +2419,7 @@ class SurveyUtil
if (1 == $remindUnAnswered) { if (1 == $remindUnAnswered) {
// Remind only unanswered users // Remind only unanswered users
$reminder = 1; $reminder = 1;
$exclude_users = SurveyManager::get_people_who_filled_survey($_GET['survey_id']); $exclude_users = SurveyManager::get_people_who_filled_survey($surveyId);
} }
$counter = 0; // Nr of invitations "sent" (if sendmail option) $counter = 0; // Nr of invitations "sent" (if sendmail option)

@ -208,6 +208,7 @@ if ($form->validate()) {
// Saving the invitations for the course users // Saving the invitations for the course users
$count_course_users = SurveyUtil::saveInvitations( $count_course_users = SurveyUtil::saveInvitations(
$survey_data['survey_id'],
$users, $users,
$values['mail_title'], $values['mail_title'],
$values['mail_text'], $values['mail_text'],
@ -227,6 +228,7 @@ if ($form->validate()) {
} }
$counter_additional_users = SurveyUtil::saveInvitations( $counter_additional_users = SurveyUtil::saveInvitations(
$survey_data['survey_id'],
$additional_users, $additional_users,
$values['mail_title'], $values['mail_title'],
$values['mail_text'], $values['mail_text'],

Loading…
Cancel
Save