Fix redirect + php warnings see BT#15618

pull/2926/head
Julio Montoya 7 years ago
parent 7a58cfd900
commit e190df7d20
  1. 2
      plugin/bbb/lib/bbb.lib.php
  2. 21
      plugin/bbb/lib/bbb_api.php
  3. 2
      plugin/bbb/listing.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;
}

@ -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;
}
}

@ -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']);

Loading…
Cancel
Save