Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Author: ywarnier

main/auth/inscription.php

@@ -465,7 +465,9 @@
                 $termExtraFields = new ExtraFieldValue('terms_and_condition');
                 $values = $termExtraFields->getAllValuesByItem($term_preview['id']);
                 foreach ($values as $value) {
-                    echo '<h3>'.$value['display_text'].'</h3><br />'.$value['value'].'<br />';
+                    if (!empty($value['value'])) {
+                        echo '<h3>'.get_lang($value['display_text']).'</h3><br />'.$value['value'].'<br />';
+                    }
                 }
             } else {
                 echo get_lang('ComingSoon');

plugin/zoom/Entity/Meeting.php

@@ -540,7 +540,12 @@ public function getIntroduction()
     {
         $introduction = sprintf('<h1>%s</h1>', $this->meetingInfoGet->topic);
         if (!$this->isGlobalMeeting()) {
-            $introduction .= sprintf('<p>%s (%s)</p>', $this->formattedStartTime, $this->formattedDuration);
+            if (!empty($this->formattedStartTime)) {
+                $introduction .= $this->formattedStartTime;
+                if (!empty($this->formattedDuration)) {
+                    $introduction .= '( '.$this->formattedDuration.')';
+                }
+            }
         }
         if ($this->user) {
             $introduction .= sprintf('<p>%s</p>', $this->user->getFullname());

plugin/zoom/lib/ZoomPlugin.php

@@ -341,9 +341,14 @@ public function deleteMeeting($meeting, $returnURL)
         if (null === $meeting) {
             return false;
         }
+
         $em = Database::getManager();
         try {
-            $meeting->getMeetingInfoGet()->delete();
+            // No need to delete a instant meeting.
+            if (\Chamilo\PluginBundle\Zoom\API\Meeting::TYPE_INSTANT != $meeting->getMeetingInfoGet()->type) {
+                $meeting->getMeetingInfoGet()->delete();
+            }
+
             $em->remove($meeting);
             $em->flush();
 
@@ -925,6 +930,7 @@ public function getStartOrJoinMeetingURL($meeting)
                         }
 
                         if (\Chamilo\PluginBundle\Zoom\API\Meeting::TYPE_INSTANT == $meeting->getMeetingInfoGet()->type) {
+
                             return $meeting->getMeetingInfoGet()->join_url;
                         }
 
@@ -1217,9 +1223,11 @@ private function unregister($meeting, $registrants)
      */
     private function startInstantMeeting($topic, $user = null, $course = null, $group = null, $session = null)
     {
+        $meetingInfoGet = MeetingInfoGet::fromTopicAndType($topic, MeetingInfoGet::TYPE_INSTANT);
+        $meetingInfoGet->settings->approval_type = MeetingSettings::APPROVAL_TYPE_AUTOMATICALLY_APPROVE;
         $meeting = $this->createMeetingFromMeeting(
             (new Meeting())
-                ->setMeetingInfoGet(MeetingInfoGet::fromTopicAndType($topic, MeetingInfoGet::TYPE_INSTANT))
+                ->setMeetingInfoGet($meetingInfoGet)
                 ->setUser($user)
                 ->setGroup($group)
                 ->setCourse($course)
@@ -1240,12 +1248,14 @@ private function startInstantMeeting($topic, $user = null, $course = null, $grou
     private function createMeetingFromMeeting($meeting)
     {
         $currentUser = api_get_user_entity(api_get_user_id());
-        //$meeting->getMeetingInfoGet()->host_email = $currentUser->getEmail();
+
         $meeting->getMeetingInfoGet()->settings->contact_email = $currentUser->getEmail();
         $meeting->getMeetingInfoGet()->settings->contact_name = $currentUser->getFullname();
         $recording = 'true' === $this->get('enableCloudRecording') ? 'cloud' : 'local';
         $meeting->getMeetingInfoGet()->settings->auto_recording = $recording;
         $meeting->getMeetingInfoGet()->settings->registrants_email_notification = false;
+
+        //$meeting->getMeetingInfoGet()->host_email = $currentUser->getEmail();
         //$meeting->getMeetingInfoGet()->settings->alternative_hosts = $currentUser->getEmail();
 
         // Send create to Zoom.