From da762f51649635fd6f59a0ba5465dc9628fd9351 Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Wed, 10 Jun 2009 14:49:24 +0000 Subject: [PATCH] - fix problem where the client gets loaded even when user enters the wrong password git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1585 af16638f-c34d-0410-8cfa-b39d5352b314 --- .../PublicScheduledSessionController.groovy | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy index 1a67b48175..d244b9a44b 100644 --- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy +++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy @@ -114,30 +114,30 @@ class PublicScheduledSessionController { session["conference"] = confSession.tokenId session["room"] = confSession.sessionId session["voicebridge"] = confSession.voiceConferenceBridge - } - - def long _10_MINUTES = 10*60*1000 - def startTime = confSession.startDateTime.time - _10_MINUTES - def endTime = confSession.endDateTime.time + _10_MINUTES - - if ((startTime <= now.time) && (now.time <= endTime)) { - session["mode"] = "LIVE" - session["record"] = false - if (confSession.record) { - session["record"] = true + def long _10_MINUTES = 10*60*1000 + + def startTime = confSession.startDateTime.time - _10_MINUTES + def endTime = confSession.endDateTime.time + _10_MINUTES + + if ((startTime <= now.time) && (now.time <= endTime)) { + session["mode"] = "LIVE" + session["record"] = false + if (confSession.record) { + session["record"] = true + } + log.debug "Joining LIVE and recording is ${confSession.record}" + } else { + session["mode"] = "PLAYBACK" + log.debug "Joining PLAYBACK" } - log.debug "Joining LIVE and recording is ${confSession.record}" - } else { - session["mode"] = "PLAYBACK" - log.debug "Joining PLAYBACK" + + log.debug "Displaying session information" + //redirect(action:show) + def config = ConfigurationHolder.config + def hostUrl = config.bigbluebutton.web.serverURL + redirect(url:"${hostUrl}/client/BigBlueButton.html") } - - log.debug "Displaying session information" - //redirect(action:show) - def config = ConfigurationHolder.config - def hostUrl = config.bigbluebutton.web.serverURL - redirect(url:"${hostUrl}/client/BigBlueButton.html") } } }