BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #756 from ritzalam/fix-issue-1966

Browse Source 
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id…
This commit is contained in:
Richard Alam 2015-08-11 16:38:33 -04:00
commit 6156cdf9f7
1 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View File

@ -450,7 +450,7 @@ class ApiController {
returncode(RESP_CODE_SUCCESS) returncode(RESP_CODE_SUCCESS)
messageKey("successfullyJoined") messageKey("successfullyJoined")
message("You have joined successfully.") message("You have joined successfully.")
meeting_id(us.meetingID) meeting_id() { mkp.yield(us.meetingID) }
user_id(us.internalUserId) user_id(us.internalUserId)
auth_token(us.authToken) auth_token(us.authToken)
} }
@ -803,22 +803,22 @@ class ApiController {
meetings { meetings {
for (m in mtgs) { for (m in mtgs) {
meeting { meeting {
meetingID(m.getExternalId()) meetingID() { mkp.yield(m.getExternalId()) }
meetingName(m.getName()) meetingName() { mkp.yield(m.getName()) }
createTime(m.getCreateTime()) createTime(m.getCreateTime())
createDate(formatPrettyDate(m.getCreateTime())) createDate(formatPrettyDate(m.getCreateTime()))
voiceBridge(m.getTelVoice()) voiceBridge() { mkp.yield(m.getTelVoice()) }
dialNumber(m.getDialNumber()) dialNumber() { mkp.yield(m.getDialNumber()) }
attendeePW(m.getViewerPassword()) attendeePW() { mkp.yield(m.getViewerPassword()) }
moderatorPW(m.getModeratorPassword()) moderatorPW() { mkp.yield(m.getModeratorPassword()) }
hasBeenForciblyEnded(m.isForciblyEnded() ? "true" : "false") hasBeenForciblyEnded(m.isForciblyEnded() ? "true" : "false")
running(m.isRunning() ? "true" : "false") running(m.isRunning() ? "true" : "false")
participantCount(m.getNumUsers()) participantCount(m.getNumUsers())
listenerCount(m.getNumListenOnly()) listenerCount(m.getNumListenOnly())
voiceParticipantCount(m.getNumVoiceJoined()) voiceParticipantCount(m.getNumVoiceJoined())
videoCount(m.getNumVideos()) videoCount(m.getNumVideos())
duration(m.duration) duration(m.duration)
hasUserJoined(m.hasUserJoined()) hasUserJoined(m.hasUserJoined())
} }
} }
} }
@ -896,9 +896,9 @@ class ApiController {
sessions { sessions {
for (m in sssns) { for (m in sssns) {
meeting { meeting {
meetingID(m.meetingID) meetingID() { mkp.yield(m.meetingID) }
meetingName(m.conferencename) meetingName() { mkp.yield(m.conferencename) }
userName(m.fullname) userName() { mkp.yield(m.fullname) }
} }
} }
} }
@ -1392,10 +1392,10 @@ class ApiController {
subscriptions() { subscriptions() {
list.each{ item -> list.each{ item ->
subscription(){ subscription(){
subscriptionID(item.get("subscriptionID")) subscriptionID() { mkp.yield(item.get("subscriptionID")) }
event(item.get("event")) event() { mkp.yield(item.get("event")) }
callbackURL(item.get("callbackURL")) callbackURL() { mkp.yield(item.get("callbackURL")) }
active(item.get("active")) active() { mkp.yield(item.get("active")) }
} }
} }
} }
@ -1443,7 +1443,7 @@ class ApiController {
response() { response() {
returncode("FAILED") returncode("FAILED")
message("Could not find conference.") message("Could not find conference.")
logoutURL(logoutUrl) logoutURL() { mkp.yield(logoutUrl) }
} }
} }
} }
@ -1451,9 +1451,7 @@ class ApiController {
} else { } else {
UserSession us = meetingService.getUserSession(session['user-token']); UserSession us = meetingService.getUserSession(session['user-token']);
log.info("Found session for " + us.fullname) log.info("Found session for " + us.fullname)
println ("Found session for " + us.fullname)
println us.configXML
response.addHeader("Cache-Control", "no-cache") response.addHeader("Cache-Control", "no-cache")
render text: us.configXML, contentType: 'text/xml' render text: us.configXML, contentType: 'text/xml'
} }
@ -1556,10 +1554,10 @@ class ApiController {
defaultLayout = us.defaultLayout defaultLayout = us.defaultLayout
avatarURL = us.avatarURL avatarURL = us.avatarURL
customdata = array { customdata = array {
userCustomData.each { k, v -> userCustomData.each { k, v ->
// Somehow we need to prepend something (custdata) for the JSON to work // Somehow we need to prepend something (custdata) for the JSON to work
custdata "$k" : v custdata "$k" : v
} }
} }
} }
} }
@ -1726,7 +1724,7 @@ class ApiController {
// Do we agree on the checksum? If not, complain. // Do we agree on the checksum? If not, complain.
if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) { if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
errors.checksumError() errors.checksumError()
respondWithErrors(errors) respondWithErrors(errors)
return return
} }
@ -1766,8 +1764,8 @@ class ApiController {
recs.values().each { r -> recs.values().each { r ->
recording() { recording() {
recordID(r.getId()) recordID(r.getId())
meetingID(r.getMeetingID()) meetingID() { mkp.yield(r.getMeetingID()) }
name(''){ name('') {
mkp.yieldUnescaped("<![CDATA["+r.getName()+"]]>") mkp.yieldUnescaped("<![CDATA["+r.getName()+"]]>")
} }
published(r.isPublished()) published(r.isPublished())
@ -2073,19 +2071,19 @@ class ApiController {
render(contentType:"text/xml") { render(contentType:"text/xml") {
response() { response() {
returncode(RESP_CODE_SUCCESS) returncode(RESP_CODE_SUCCESS)
meetingName(meeting.getName()) meetingName() { mkp.yield(meeting.getName()) }
meetingID(meeting.getExternalId()) meetingID() { mkp.yield(meeting.getExternalId()) }
internalMeetingID(meeting.getInternalId()) internalMeetingID(meeting.getInternalId())
createTime(meeting.getCreateTime()) createTime(meeting.getCreateTime())
createDate(formatPrettyDate(meeting.getCreateTime())) createDate(formatPrettyDate(meeting.getCreateTime()))
voiceBridge(meeting.getTelVoice()) voiceBridge() { mkp.yield(meeting.getTelVoice()) }
dialNumber(meeting.getDialNumber()) dialNumber() { mkp.yield(meeting.getDialNumber()) }
attendeePW(meeting.getViewerPassword()) attendeePW() { mkp.yield(meeting.getViewerPassword()) }
moderatorPW(meeting.getModeratorPassword()) moderatorPW() { mkp.yield(meeting.getModeratorPassword()) }
running(meeting.isRunning() ? "true" : "false") running(meeting.isRunning() ? "true" : "false")
duration(meeting.duration) duration(meeting.duration)
hasUserJoined(meeting.hasUserJoined()) hasUserJoined(meeting.hasUserJoined())
recording(meeting.isRecord() ? "true" : "false") recording(meeting.isRecord() ? "true" : "false")
hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false") hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false")
startTime(meeting.getStartTime()) startTime(meeting.getStartTime())
endTime(meeting.getEndTime()) endTime(meeting.getEndTime())
@ -2098,8 +2096,8 @@ class ApiController {
attendees() { attendees() {
meeting.getUsers().each { att -> meeting.getUsers().each { att ->
attendee() { attendee() {
userID("${att.externalUserId}") userID() { mkp.yield("${att.externalUserId}") }
fullName("${att.fullname}") fullName() { mkp.yield("${att.fullname}") }
role("${att.role}") role("${att.role}")
isPresenter("${att.isPresenter()}") isPresenter("${att.isPresenter()}")
isListeningOnly("${att.isListeningOnly()}") isListeningOnly("${att.isListeningOnly()}")
@ -2134,15 +2132,15 @@ class ApiController {
render(contentType:"text/xml") { render(contentType:"text/xml") {
response() { response() {
returncode(RESP_CODE_SUCCESS) returncode(RESP_CODE_SUCCESS)
meetingID(meeting.getExternalId()) meetingID() { mkp.yield(meeting.getExternalId()) }
attendeePW(meeting.getViewerPassword()) attendeePW() { mkp.yield(meeting.getViewerPassword()) }
moderatorPW(meeting.getModeratorPassword()) moderatorPW() { mkp.yield(meeting.getModeratorPassword()) }
createTime(meeting.getCreateTime()) createTime(meeting.getCreateTime())
voiceBridge(meeting.getTelVoice()) voiceBridge() { mkp.yield(meeting.getTelVoice()) }
dialNumber(meeting.getDialNumber()) dialNumber() { mkp.yield(meeting.getDialNumber()) }
createDate(formatPrettyDate(meeting.getCreateTime())) createDate(formatPrettyDate(meeting.getCreateTime()))
hasUserJoined(meeting.hasUserJoined()) hasUserJoined(meeting.hasUserJoined())
duration(meeting.duration) duration(meeting.duration)
hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false") hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false")
messageKey(msgKey == null ? "" : msgKey) messageKey(msgKey == null ? "" : msgKey)
message(msg == null ? "" : msg) message(msg == null ? "" : msg)