Minor - Flint fixes

pull/3522/head
Angel Fernando Quiroz Campos 5 years ago
parent fd3f1afd4f
commit ad358ef7b9
  1. 12
      plugin/zoom/Entity/RegistrantEntity.php
  2. 1
      plugin/zoom/lang/english.php
  3. 7
      plugin/zoom/lib/MeetingEntityRepository.php
  4. 6
      plugin/zoom/lib/ZoomPlugin.php

@ -131,9 +131,9 @@ class RegistrantEntity
} }
/** /**
* @return MeetingRegistrantListItem
* @throws Exception * @throws Exception
* *
* @return MeetingRegistrantListItem
*/ */
public function getMeetingRegistrantListItem() public function getMeetingRegistrantListItem()
{ {
@ -143,9 +143,9 @@ class RegistrantEntity
/** /**
* @param MeetingRegistrantListItem $meetingRegistrantListItem * @param MeetingRegistrantListItem $meetingRegistrantListItem
* *
* @return $this
* @throws Exception * @throws Exception
* *
* @return $this
*/ */
public function setMeetingRegistrantListItem($meetingRegistrantListItem) public function setMeetingRegistrantListItem($meetingRegistrantListItem)
{ {
@ -176,9 +176,9 @@ class RegistrantEntity
} }
/** /**
* @return CreatedRegistration
* @throws Exception * @throws Exception
* *
* @return CreatedRegistration
*/ */
public function getCreatedRegistration() public function getCreatedRegistration()
{ {
@ -188,9 +188,9 @@ class RegistrantEntity
/** /**
* @param CreatedRegistration $createdRegistration * @param CreatedRegistration $createdRegistration
* *
* @return $this
* @throws Exception * @throws Exception
* *
* @return $this
*/ */
public function setCreatedRegistration($createdRegistration) public function setCreatedRegistration($createdRegistration)
{ {
@ -205,9 +205,9 @@ class RegistrantEntity
} }
/** /**
* @return MeetingRegistrant
* @throws Exception * @throws Exception
* *
* @return MeetingRegistrant
*/ */
public function getMeetingRegistrant() public function getMeetingRegistrant()
{ {
@ -217,9 +217,9 @@ class RegistrantEntity
/** /**
* @param MeetingRegistrant $meetingRegistrant * @param MeetingRegistrant $meetingRegistrant
* *
* @return $this
* @throws Exception * @throws Exception
* *
* @return $this
*/ */
public function setMeetingRegistrant($meetingRegistrant) public function setMeetingRegistrant($meetingRegistrant)
{ {

@ -140,4 +140,3 @@ $strings['Meetings'] = "Meetings";
$strings['ConferenceType'] = "Conference type"; $strings['ConferenceType'] = "Conference type";
$strings['ForEveryone'] = "Everyone"; $strings['ForEveryone'] = "Everyone";
$strings['SomeUsers'] = "Some users (Select later)"; $strings['SomeUsers'] = "Some users (Select later)";

@ -79,7 +79,6 @@ class MeetingEntityRepository extends EntityRepository
Criteria::expr()->andX( Criteria::expr()->andX(
Criteria::expr()->eq('course', null), Criteria::expr()->eq('course', null),
Criteria::expr()->orX(Criteria::expr()->eq('user', null), Criteria::expr()->eq('user', $user)) Criteria::expr()->orX(Criteria::expr()->eq('user', null), Criteria::expr()->eq('user', $user))
) )
) )
); );
@ -100,9 +99,9 @@ class MeetingEntityRepository extends EntityRepository
} }
/** /**
* @param DateTime $start * @param DateTime $start
* @param DateTime $end * @param DateTime $end
* @param User $user * @param User $user
* *
* @return ArrayCollection|Collection|MeetingEntity[] * @return ArrayCollection|Collection|MeetingEntity[]
*/ */

@ -330,7 +330,6 @@ class ZoomPlugin extends Plugin
Display::addFlash( Display::addFlash(
Display::return_message($this->get_lang('MeetingUpdated'), 'confirm') Display::return_message($this->get_lang('MeetingUpdated'), 'confirm')
); );
} catch (Exception $exception) { } catch (Exception $exception) {
Display::addFlash( Display::addFlash(
Display::return_message($exception->getMessage(), 'error') Display::return_message($exception->getMessage(), 'error')
@ -721,7 +720,7 @@ class ZoomPlugin extends Plugin
$form->getSubmitValue('duration'), $form->getSubmitValue('duration'),
$form->getSubmitValue('topic'), $form->getSubmitValue('topic'),
$form->getSubmitValue('agenda'), $form->getSubmitValue('agenda'),
substr(uniqid('z', true),0, 10) substr(uniqid('z', true), 0, 10)
); );
Display::addFlash( Display::addFlash(
@ -790,7 +789,6 @@ class ZoomPlugin extends Plugin
} }
/** /**
*
* @return bool whether the logged-in user can manage conferences in this context, that is either * @return bool whether the logged-in user can manage conferences in this context, that is either
* the current course or session coach, the platform admin or the current course admin * the current course or session coach, the platform admin or the current course admin
*/ */
@ -969,7 +967,7 @@ class ZoomPlugin extends Plugin
} }
if ('true' === $this->get('enableParticipantRegistration')) { if ('true' === $this->get('enableParticipantRegistration')) {
//if ('true' === $this->get('enableParticipantRegistration') && $meeting->requiresRegistration()) { //if ('true' === $this->get('enableParticipantRegistration') && $meeting->requiresRegistration()) {
// the participant must be registered // the participant must be registered
$registrant = $meeting->getRegistrant($currentUser); $registrant = $meeting->getRegistrant($currentUser);
if (null !== $registrant) { if (null !== $registrant) {

Loading…
Cancel
Save