Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
denis bonnenfant
bigbluebutton-api-php
Commits
fe55f959
Unverified
Commit
fe55f959
authored
Apr 02, 2020
by
Ghazi Triki
Committed by
GitHub
Apr 02, 2020
Browse files
Merge pull request #62 from jibon57/master
remove urlencode() from endCallbackUrl and bbb-recording-ready-url
parents
92c37069
236df4c4
Changes
4
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
fe55f959
composer.phar
/vendor/
composer.lock
.DS_Store
## Directory-based project format:
.idea/
...
...
src/BigBlueButton.php
View file @
fe55f959
...
...
@@ -461,6 +461,7 @@ class BigBlueButton
curl_setopt
(
$ch
,
CURLOPT_ENCODING
,
'UTF-8'
);
curl_setopt
(
$ch
,
CURLOPT_URL
,
$url
);
curl_setopt
(
$ch
,
CURLOPT_RETURNTRANSFER
,
1
);
curl_setopt
(
$ch
,
CURLOPT_FOLLOWLOCATION
,
1
);
curl_setopt
(
$ch
,
CURLOPT_CONNECTTIMEOUT
,
$timeout
);
curl_setopt
(
$ch
,
CURLOPT_COOKIEFILE
,
$cookiefilepath
);
curl_setopt
(
$ch
,
CURLOPT_COOKIEJAR
,
$cookiefilepath
);
...
...
src/Parameters/CreateMeetingParameters.php
View file @
fe55f959
...
...
@@ -753,7 +753,7 @@ class CreateMeetingParameters extends MetaParameters
*/
public
function
setEndCallbackUrl
(
$endCallbackUrl
)
{
$this
->
addMeta
(
'endCallbackUrl'
,
urlencode
(
$endCallbackUrl
)
)
;
$this
->
addMeta
(
'endCallbackUrl'
,
$endCallbackUrl
);
return
$this
;
}
...
...
@@ -764,7 +764,7 @@ class CreateMeetingParameters extends MetaParameters
*/
public
function
setRecordingReadyCallbackUrl
(
$recordingReadyCallbackUrl
)
{
$this
->
addMeta
(
'bbb-recording-ready-url'
,
urlencode
(
$recordingReadyCallbackUrl
)
)
;
$this
->
addMeta
(
'bbb-recording-ready-url'
,
$recordingReadyCallbackUrl
);
return
$this
;
}
...
...
tests/Parameters/CreateMeetingParametersTest.php
View file @
fe55f959
...
...
@@ -60,8 +60,8 @@ class CreateMeetingParametersTest extends TestCase
$this
->
assertEquals
(
$params
[
'lockSettingsLockOnJoin'
],
$createMeetingParams
->
isLockSettingsLockOnJoin
());
$this
->
assertEquals
(
$params
[
'lockSettingsLockOnJoinConfigurable'
],
$createMeetingParams
->
isLockSettingsLockOnJoinConfigurable
());
$this
->
assertEquals
(
$params
[
'meta_presenter'
],
$createMeetingParams
->
getMeta
(
'presenter'
));
$this
->
assertEquals
(
$params
[
'meta_endCallbackUrl'
],
urlencode
(
$createMeetingParams
->
getMeta
(
'endCallbackUrl'
))
)
;
$this
->
assertEquals
(
$params
[
'meta_bbb-recording-ready-url'
],
urlencode
(
$createMeetingParams
->
getMeta
(
'bbb-recording-ready-url'
))
)
;
$this
->
assertEquals
(
$params
[
'meta_endCallbackUrl'
],
$createMeetingParams
->
getMeta
(
'endCallbackUrl'
));
$this
->
assertEquals
(
$params
[
'meta_bbb-recording-ready-url'
],
$createMeetingParams
->
getMeta
(
'bbb-recording-ready-url'
));
// Check values are empty of this is not a breakout room
$this
->
assertNull
(
$createMeetingParams
->
isBreakout
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment