diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php index 3a8c1e5827..ace7595e77 100755 --- a/plugin/bbb/lib/bbb.lib.php +++ b/plugin/bbb/lib/bbb.lib.php @@ -1154,7 +1154,7 @@ class bbb if ($recordExists) { $recordingParams = ['recordId' => $recordId]; - $result = $this->api->generateRecordingWithXmlResponseArray($recordingParams); + $result = $this->api->generateRecording($recordingParams); if (!empty($result) && isset($result['deleted']) && $result['deleted'] === 'true') { return true; } diff --git a/plugin/bbb/lib/bbb_api.php b/plugin/bbb/lib/bbb_api.php index 31dd5e851d..82decef55f 100755 --- a/plugin/bbb/lib/bbb_api.php +++ b/plugin/bbb/lib/bbb_api.php @@ -645,20 +645,21 @@ class BigBlueButtonBN { * 'recordId' => '1234', -- REQUIRED - comma separate if multiple ids * ); */ - public function generateRecordingWithXmlResponseArray($recordingParams) + public function generateRecording($recordingParams) { - $recordingsUrl = $this->_bbbServerBaseUrl.'demo/regenerateRecord.jsp?'; + $recordingsUrl = $this->_bbbServerBaseUrl.'../demo/regenerateRecord.jsp?'; $params = 'recordID='.urlencode($recordingParams['recordId']); $url = $recordingsUrl.$params.'&checksum='.sha1('regenerateRecord'.$params.$this->_securitySalt); - $xml = $this->_processXmlResponse($url); - if ($xml) { - return array( - 'returncode' => $xml->returncode->__toString(), - ); - } else { - return null; - } + $ch = curl_init() or die ( curl_error($ch) ); + $timeout = 10; + curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt( $ch, CURLOPT_URL, $url ); + curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 ); + curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, $timeout); + $data = curl_exec( $ch ); + curl_close( $ch ); + return true; } } \ No newline at end of file diff --git a/plugin/bbb/listing.php b/plugin/bbb/listing.php index c8d9ba788c..efc1324099 100755 --- a/plugin/bbb/listing.php +++ b/plugin/bbb/listing.php @@ -72,6 +72,8 @@ if ($conferenceManager) { } else { $message = Display::return_message(get_lang('Error'), 'error'); } + Display::addFlash($message); + header('Location: '.$bbb->getListingUrl()); break; case 'delete_record': $result = $bbb->deleteRecording($_GET['id']);