Skip to content

Commit

Permalink
Fixing an issue with the dial twiml where having a user with no conne…
Browse files Browse the repository at this point in the history 
…ctable devices would cause an application error - if no devices are found the call is immediately sent to the "next" action.
  • Loading branch information
@Gipetto
Gipetto committed Jul 29, 2011
1 parent 3dd0010 commit 25579c4
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 48 deletions.
37 changes: 16 additions & 21 deletions assets/c/site-1008.css
View file
Expand Up @@ -1425,40 +1425,35 @@ button.inline-button { float: left; margin: 0 10px 0 0 !important;}
div.time-picker { position: absolute; height: 191px; width:4em; /* needed for IE */ overflow: auto; background: #fff; border: 1px solid #aaa; z-index: 99; margin: 0;}div.time-picker-12hours { width:6em; /* needed for IE */}

div.time-picker ul { list-style-type: none; margin: 0; padding: 0;}div.time-picker li { cursor: pointer; height: 10px; font: 12px/1 Helvetica, Arial, sans-serif; padding: 4px 3px;}div.time-picker li.selected { background: #0063CE; color: #fff;}
#vbx-client-status { float: right;}
#vbx-client-status { float: right; position: relative; overflow: visible;}

#vbx-client-status .client-button { height: 32px; width: 88px; line-height: 32px; padding: 0 28px 0 14px; font-size: 14px; font-weight: bold; color: #999; background: #404040 url(../i/vbx-client-status.png) 65px -32px no-repeat; -moz-border-radius: 5px; /* FF1+ */ -webkit-border-radius: 5px; /* Saf3+, Chrome */ -khtml-border-radius: 5px; /* Konqueror */ border-radius: 5px; /* Standard. IE9 */ /** * @bugfix border-radius background bleed * @see http://tumble.sneak.co.nz/post/928998513/fixing-the-background-bleed */ -webkit-background-clip: padding-box;}
#vbx-client-status .client-button,#vbx-client-status .client-button-wrap { -moz-border-radius: 5px; /* FF1+ */ -webkit-border-radius: 5px; /* Saf3+, Chrome */ -khtml-border-radius: 5px; /* Konqueror */ border-radius: 5px; /* Standard. IE9 */ /** * @bugfix border-radius background bleed * @see http://tumble.sneak.co.nz/post/928998513/fixing-the-background-bleed */ -webkit-background-clip: padding-box;}

#vbx-client-status.online .client-button { color: #FFF; background-color: #53A82B; background-color: -moz-linear-gradient(100% 100% 90deg, #448723, #53A82B); background-color: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#53A82B), to(#448723)); background-position: 65px top;}
#vbx-client-status .client-button { height: 29px; width: 86px; line-height: 30px; padding: 0 26px 0 12px; font-size: 14px; font-weight: bold; color: #999; background: #404040 url(../i/vbx-client-status.png) 65px -34px no-repeat; border: 1px solid #505050;}

#vbx-client-status .isonline,#vbx-client-status.online .isoffline { display: none;}

#vbx-client-status.online .isonline { display: block;}
#vbx-client-status .client-button-wrap { width: 86px; height: 29px; border: 1px solid #404040;}

/*#client-dialog { padding: 0px; height: 360px;}
#vbx-client-status.online .client-button-wrap { border-color: #448723;}

#client-ui-message { font-size: 42px; text-align: center; color: #666; font-weight: normal; margin: 40px 0px 0px;}
#vbx-client-status.online .client-button { color: #FFF; border-color: #7FCC5A; background-color: #53A82B; background-color: -moz-linear-gradient(100% 100% 90deg, #448723, #53A82B); background-color: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#53A82B), to(#448723)); background-position: 65px -2px;}

#client-ui-timer { font-size: 84px; text-align: center; color: #ef3b37; font-weight: normal; margin: 0px;}
#vbx-client-status .client-button:hover { border-color: #808080;}

#client-ui-right-panel { float: left; width: 200px; padding: 20px;}
#vbx-client-status.online .client-button:hover { border-color: #9EED77;}

#client-ui-bottom { background: #ccc; position: absolute; bottom: 0px; width: 560px; padding: 12px 20px;}
#client-ui-actions { height: 35px;}
#vbx-client-status .isonline,#vbx-client-status.online .isoffline { display: none;}

#client-ui-bottom button { float: right; border-radius: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; margin-left: 10px; display: none; padding: 0 5px; font-weight: bold; color: #444444;}
#vbx-client-status.online .isonline { display: block;}

#client-ui-bottom button:hover { background-color: #ef3b37; color: white;}
#client-first-run { position: relative; display: block; padding: 10px 10px 10px 70px; margin: 0 0 1px 0; background: #222 url(../../assets/i/client-first-run-bg.png) no-repeat 20px center; border: 5px solid #333;}

.client-ui-button-row { float: left; clear: both;}
#client-first-run p { font-size: 13px; color: #999; background-color: #222}

.client-ui-button { float: left; padding: 12px; margin: 5px; background: #9d9d9d; color: #fff; text-align: center; width: 30px; height: 32px; font-size: 24px; font-weight: bold; cursor: pointer; border-radius: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px;}
#client-first-run h3 { margin: 0 0 2px 0; font-size: 16px; color: #FFF;}

.client-ui-button:hover { background: #ef3b37;}
#client-first-run .dismiss { color: #BBB;}

.client-ui-button .client-ui-button-number { margin-top: -4px;}
#client-first-run .dismiss:hover { color: #FFF; }

.client-ui-button .client-ui-button-number.asterisk { font-size: 40px;}
#client-first-run .arrow { position: absolute; top: -15px; right: 30px;}

.client-ui-button .client-ui-button-letters { font-weight: normal; font-size: 12px; margin-top: -3px;}*/
4 changes: 2 additions & 2 deletions assets/j/compiled/1008/site.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 18 additions & 10 deletions plugins/standard/applets/dial/TwimlDial.php
View file
Expand Up @@ -4,8 +4,9 @@ class TwimlDial {
/**
* For testing only. Some proxies and firewalls
* don't properly pass or set the server name so
* cookies may not set due to a mismatch. Use
* this in testing as it will break in load-balanced
* cookies may not set due to a mismatch. Use this
* only in testing if you're having trouble setting
* cookies as it will break in load-balanced
* server configurations
*
* @var bool
Expand Down Expand Up @@ -42,13 +43,16 @@ public function __construct(){
// Actions

public function dial($user) {
$dial = $this->response->addDial(array(
'action' => current_url(),
'callerId' => $callerId,
'timeout' => 5
));

$dial = new Dial(NULL, array(
array(
'action' => current_url(),
'callerId' => $callerId,
'timeout' => 5
)
));

// get users devices and add all active devices to do simultaneous dialing
$dialed = false;
if (count($user->devices)) {
$call_opts = array(
'url' => site_url('twiml/whisper?name='.urlencode($user->first_name)),
Expand All @@ -61,11 +65,15 @@ public function dial($user) {
else {
$dial->addNumber($device->value, $call_opts);
}
$dialed = true;
}
}
return true;
}
return false;

if ($dialed) {
$this->response->append($dial);
}
return $dialed;
}

/**
Expand Down
43 changes: 28 additions & 15 deletions plugins/standard/applets/dial/twiml.php
View file
Expand Up @@ -13,16 +13,23 @@
case 'hangup':
$dialer->hangup();
break;
case 'new':
case 'new':
if ($dialer->dial_whom_user_or_group instanceof VBX_User || $dialer->dial_whom_user_or_group instanceof VBX_Group) {
// create a dial list from the input state
$dial_list = DialList::get($dialer->dial_whom_user_or_group);
$to_dial = $dial_list->next();
if ($to_dial instanceof VBX_User) {
$dialer->dial($to_dial);
$dialer->state = $dial_list->get_state();
}
else {

$dialed = false;
do {
$to_dial = $dial_list->next();
if ($to_dial instanceof VBX_User) {
$dialed = $dialer->dial($to_dial);
if ($dialed) {
$dialer->state = $dial_list->get_state();
}
}
} while(!$dialed && $to_dial instanceof VBX_User);

if (!$dialed) {
// nobody to call, push directly to voicemail
$dialer->noanswer();
}
Expand All @@ -46,14 +53,20 @@
default:
// rolling through users, populate dial list from state
$dial_list = DialList::load($dialer->state);
// get the next user
$to_dial = $dial_list->next();
if ($to_dial instanceof VBX_User) {
// we have a user target, dial
$dialer->dial($to_dial);
$dialer->state = $dial_list->get_state();
}
else {

// get the next valid user
$dialed = false;
do {
$to_dial = $dial_list->next();
if ($to_dial instanceof VBX_User) {
$dialed = $dialer->dial($to_dial);
if ($dialed) {
$dialer->state = $dial_list->get_state();
}
}
} while(!$dialed && $to_dial instanceof VBX_User);

if (!$dialed) {
// no users left see what next action is, or go to voicemail
$dialer->noanswer();
}
Expand Down

0 comments on commit 25579c4

Please sign in to comment.