Skip to content

Commit

Permalink
- fixed few issues and cleaned up
Browse files Browse the repository at this point in the history
  • Loading branch information
BigBlueButton committed Jul 19, 2010
1 parent ea156fe commit 333dd13
Show file tree
Hide file tree
Showing 43 changed files with 9 additions and 2,942 deletions.
7 changes: 0 additions & 7 deletions bigbluebutton-web/grails-app/conf/BootStrap.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@
*
* $Id: $
*/
import org.jsecurity.crypto.hash.Sha1Hash
import org.bigbluebutton.web.domain.Role
import org.bigbluebutton.web.domain.User
import org.bigbluebutton.web.domain.UserRoleRel
import org.bigbluebutton.web.domain.ScheduledSession
import org.bigbluebutton.web.domain.Conference
import java.util.UUID

class BootStrap {
def jmsContainer
Expand Down
41 changes: 0 additions & 41 deletions bigbluebutton-web/grails-app/conf/SecurityFilters.groovy

This file was deleted.

228 changes: 0 additions & 228 deletions bigbluebutton-web/grails-app/realms/DbRealm.groovy

This file was deleted.

31 changes: 0 additions & 31 deletions ...uebutton-web/grails-app/services/org/bigbluebutton/pbx/asterisk/AsteriskAgiService.groovy
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import org.asteriskjava.fastagi.AgiRequest
import org.asteriskjava.fastagi.AgiScript

import java.util.Calendar
import org.bigbluebutton.web.domain.ScheduledSession
import org.bigbluebutton.web.services.DynamicConferenceService


Expand All @@ -38,36 +37,6 @@ public class AsteriskAgiService implements AgiScript {
public void service(AgiRequest request, AgiChannel channel)
throws AgiException {

def number = request.getParameter("conference")
log.debug "Looking for conference $number"
def conf = ScheduledSession.findByVoiceConferenceBridge(number)

if (conf) {
log.debug("found conference " + conf.name)
def startTime = conf.startDateTime.time - _10_minutes
def endTime = conf.endDateTime.time + _10_minutes
def now = new Date()

log.debug("startTime " + new Date(startTime) + " endTime " + new Date(endTime) + " now " + now)

if ((startTime < now.time) && (endTime > now.time)) {
log.debug("Setting channel var CONFERENCE_FOUND to $number")
channel.setVariable("CONFERENCE_FOUND", number)
} else {
log.debug("The conference $number has no schedule at this moment")
setConferenceNotFound()
}
} else {
log.debug "Cannot find conference from database. Looking in Dynamic conference"
if (dynamicConferenceService == null) log.error "dynamicConferenceService is NULL"
if (dynamicConferenceService.isMeetingWithVoiceBridgeExist(number)) {
log.debug("Setting channel var CONFERENCE_FOUND to $number")
channel.setVariable("CONFERENCE_FOUND", number)
} else {
log.debug("Could not find conference $number")
setConferenceNotFound()
}
}
}

private void setConferenceNotFound() {
Expand Down
Loading

0 comments on commit 333dd13

Please sign in to comment.