Skip to content

Commit fe55f95

Browse files
authored
Merge pull request #62 from jibon57/master
remove urlencode() from endCallbackUrl and bbb-recording-ready-url
2 parents 92c3706 + 236df4c commit fe55f95

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
composer.phar
22
/vendor/
33
composer.lock
4+
.DS_Store
45

56
## Directory-based project format:
67
.idea/

src/BigBlueButton.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ private function processXmlResponse($url, $payload = '', $contentType = 'applica
461461
curl_setopt($ch, CURLOPT_ENCODING, 'UTF-8');
462462
curl_setopt($ch, CURLOPT_URL, $url);
463463
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
464+
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
464465
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
465466
curl_setopt($ch, CURLOPT_COOKIEFILE, $cookiefilepath);
466467
curl_setopt($ch, CURLOPT_COOKIEJAR, $cookiefilepath);

src/Parameters/CreateMeetingParameters.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ public function setLockSettingsLockOnJoinConfigurable($lockOnJoinConfigurable)
753753
*/
754754
public function setEndCallbackUrl($endCallbackUrl)
755755
{
756-
$this->addMeta('endCallbackUrl', urlencode($endCallbackUrl));
756+
$this->addMeta('endCallbackUrl', $endCallbackUrl);
757757

758758
return $this;
759759
}
@@ -764,7 +764,7 @@ public function setEndCallbackUrl($endCallbackUrl)
764764
*/
765765
public function setRecordingReadyCallbackUrl($recordingReadyCallbackUrl)
766766
{
767-
$this->addMeta('bbb-recording-ready-url', urlencode($recordingReadyCallbackUrl));
767+
$this->addMeta('bbb-recording-ready-url', $recordingReadyCallbackUrl);
768768

769769
return $this;
770770
}

tests/Parameters/CreateMeetingParametersTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public function testCreateMeetingParameters()
6060
$this->assertEquals($params['lockSettingsLockOnJoin'], $createMeetingParams->isLockSettingsLockOnJoin());
6161
$this->assertEquals($params['lockSettingsLockOnJoinConfigurable'], $createMeetingParams->isLockSettingsLockOnJoinConfigurable());
6262
$this->assertEquals($params['meta_presenter'], $createMeetingParams->getMeta('presenter'));
63-
$this->assertEquals($params['meta_endCallbackUrl'], urlencode($createMeetingParams->getMeta('endCallbackUrl')));
64-
$this->assertEquals($params['meta_bbb-recording-ready-url'], urlencode($createMeetingParams->getMeta('bbb-recording-ready-url')));
63+
$this->assertEquals($params['meta_endCallbackUrl'], $createMeetingParams->getMeta('endCallbackUrl'));
64+
$this->assertEquals($params['meta_bbb-recording-ready-url'], $createMeetingParams->getMeta('bbb-recording-ready-url'));
6565

6666
// Check values are empty of this is not a breakout room
6767
$this->assertNull($createMeetingParams->isBreakout());

0 commit comments

Comments
 (0)