Fix additional issue in rooms re-opening - OpenMeetings plugin - refs BT#7046 refs #5491 An error occurred

plugin/openmeetings/lib/openmeetings.class.php

@@ -135,6 +135,7 @@ class OpenMeetings
         $roomId = null;
         $meetingData = \Database::select('*', $this->table, array('where' => array('c_id = ?' => $this->chamiloCourseId, ' AND session_id = ? ' => $this->chamiloSessionId)), 'first');
         if ($meetingData != false && count($meetingData) > 0) {
+            error_log(print_r($meetingData,1));
             //error_log('Found previous room reference - reusing');
             // There has been a room in the past for this course. It should
             // still be on the server, so update (instead of creating a new one)
@@ -214,18 +215,7 @@ class OpenMeetings
         //$imgWithoutProtocol = str_replace("http://", $_SESSION['_user']['avatar'] );
 
         $iframe = $this->url . "/?" .
-                "secureHash=" . $returnVal /*.
-                '&username=FRAGOTE' .
-                '&firstname=DD' .
-                '&lastname=DDDD' .
-                '&profilePictureUrl=X' .
-                '&email=xxx' .
-                '&externalUserId=fragote' .
-                '&room_id=38' .
-                '&scopeRoomId=38' .
-                '&becomeModeratorAsInt=1' .
-                '&showAudioVideoTestAsInt=0' .
-                '&allowRecording=1'*/;
+                "secureHash=" . $returnVal;
 
         printf("<iframe src='%s' width='%s' height = '%s' />", $iframe, "100%", 640);
     }

plugin/openmeetings/lib/openmeetings_gateway.php

@@ -132,7 +132,7 @@ class OpenMeetingsGateway
             $isModeratedRoom = true;
         }
         
-        $result = $this->rest->call($this->getRestUrl("RoomService")
+        $url = $this->getRestUrl($this->getRestUrl("RoomService")
                 . "updateRoomWithModeration?SID=" . $this->sessionId
                 . "&room_id=" . $room->room_id
                 . "&name=" . urlencode($room->name)
@@ -144,7 +144,9 @@ class OpenMeetingsGateway
                 . "&isDemoRoom=false"
                 . "&demoTime=0"
                 . "&isModeratedRoom=" . $this->var_to_str($isModeratedRoom));
-        
+        error_log($url);
+        $result = $this->rest->call($url);
+
         if ($result->fault) {
             error_log('Fault (Expect - The request contains an invalid SOAP body) '.print_r($result,1));
         } else {

plugin/openmeetings/lib/room.class.php

@@ -57,7 +57,7 @@ class Room
     public function loadRoomId($id)
     {
         if (!empty($id)) {
-            $roomData = \Database::select('*', $this->table, array('where' => array('id = ?' => $id)), 'first');
+            $roomData = \Database::select('*', $this->table, array('where' => array('room_id = ?' => $id)), 'last');
             if (!empty($roomData)) {
                 $this->rooms_id = $this->room_id = $roomData['room_id'];
                 $this->status = $roomData['status'];