Merge

plugin/zoom/Entity/RegistrantEntity.php

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

plugin/zoom/lang/english.php

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

plugin/zoom/lib/ZoomPlugin.php

@@ -330,7 +330,6 @@ class ZoomPlugin extends Plugin
                 Display::addFlash(
                     Display::return_message($this->get_lang('MeetingUpdated'), 'confirm')
                 );
-
             } catch (Exception $exception) {
                 Display::addFlash(
                     Display::return_message($exception->getMessage(), 'error')
@@ -721,7 +720,7 @@ class ZoomPlugin extends Plugin
                     $form->getSubmitValue('duration'),
                     $form->getSubmitValue('topic'),
                     $form->getSubmitValue('agenda'),
-                    substr(uniqid('z', true),0, 10)
+                    substr(uniqid('z', true), 0, 10)
                 );
 
                 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
      *              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') && $meeting->requiresRegistration()) {
+                    //if ('true' === $this->get('enableParticipantRegistration') && $meeting->requiresRegistration()) {
                     // the participant must be registered
                     $registrant = $meeting->getRegistrant($currentUser);
                     if (null !== $registrant) {