From a5eca6ce916669bb9bdeb606dd91ecf35dd5a74a Mon Sep 17 00:00:00 2001 From: FraGoTe Date: Tue, 24 Sep 2013 01:38:55 -0500 Subject: [PATCH] Last changes Open Meetings --- .../om_integration/lib/om_integration.lib.php | 101 ++++++++++++------ .../services/closeRoom/closeRoom.class.php | 6 +- .../getRoomById/getRoomById.class.php | 5 + .../getRoomWithCurrentUsersById.class.php | 4 +- ...ectAndGenerateRecordingHashByURL.class.php | 10 ++ plugin/om_integration/listing.php | 2 +- 6 files changed, 90 insertions(+), 38 deletions(-) create mode 100644 plugin/om_integration/lib/services/getRoomById/getRoomById.class.php create mode 100644 plugin/om_integration/lib/services/setUserObjectAndGenerateRecordingHashByURL/setUserObjectAndGenerateRecordingHashByURL.class.php diff --git a/plugin/om_integration/lib/om_integration.lib.php b/plugin/om_integration/lib/om_integration.lib.php index 998e80a289..5819603e49 100644 --- a/plugin/om_integration/lib/om_integration.lib.php +++ b/plugin/om_integration/lib/om_integration.lib.php @@ -5,6 +5,7 @@ include_once 'services/addRoomWithModerationAndExternalType/addRoomWithModeratio include_once 'services/getRoomWithCurrentUsersById/getRoomWithCurrentUsersById.class.php'; include_once 'services/setUserObjectAndGenerateRoomHashByURLAndRecFlag/setUserObjectAndGenerateRoomHashByURLAndRecFlag.class.php'; include_once 'services/closeRoom/closeRoom.class.php'; +include_once 'services/getRoomById/getRoomById.class.php'; /** * Open Meetings-Chamilo connector class */ @@ -97,8 +98,6 @@ class om_integration { try{ $objAddRoom = new addRoomWithModerationAndExternalType(); $roomtypes_id = $isModerated = ( $this->is_teacher() ) ? 1 : 2 ; - - $course_name = 'COURSE_ID_' . $params['c_id'] .'_NAME_' . $params['meeting_name']; $urlWsdl = CONFIG_OMSERVER_BASE_URL . "/services/RoomService?wsdl"; @@ -106,7 +105,7 @@ class om_integration { $objAddRoom->name = $course_name; $objAddRoom->roomtypes_id = $roomtypes_id; $objAddRoom->comment = 'Curso: ' . $params['meeting_name'] . '
Plugin for Chamilo'; - $objAddRoom->numberOfPartizipants = 4; + $objAddRoom->numberOfPartizipants = 40; $objAddRoom->ispublic = true; $objAddRoom->appointment = false; $objAddRoom->isDemoRoom = false; @@ -158,19 +157,14 @@ class om_integration { } $params = array( 'room_id' => $meetingid ); + $returnVal = $this->setUserObjectAndGenerateRoomHashByURLAndRecFlag( $params ); $urlWithoutProtocol = str_replace("http://", CONFIG_OMSERVER_BASE_URL); $imgWithoutProtocol = str_replace("http://", $_SESSION['_user']['avatar'] ); - $iframe = CONFIG_OMSERVER_BASE_URL . "/?" . - "secureHash=" . $returnVal . - "&scopeRoomId=" . $meeting_data['id'] . - "&language=" . "" . - "&picture=" . $imgWithoutProtocol . - "&user_id=". $_SESSION['_user']['user_id'] . - "&chamiloRoom=1" . - "&wwwroot=" . $urlWithoutProtocol; - + $iframe = CONFIG_OMSERVER_BASE_URL . "?" . + "secureHash=" . $returnVal ; + printf("