Changeset 9648

Show
Ignore:
Timestamp:
05/17/10 21:12:07 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9639-9640,9642-9647 via svnmerge from
http://svn.freepbx.org/modules/branches/2.7

........

r9640 | GameGamer?43 | 2010-05-14 15:20:36 -0700 (Fri, 14 May 2010) | 1 line


fixes #4186 - apparently IE needs us to defined checked as true rather than just tell the browser it should be checked

........

r9646 | p_lindheimer | 2010-05-17 17:57:49 -0700 (Mon, 17 May 2010) | 1 line


fixes #4279 put in proper toggle code per queue and allow to work even when devstate is disabled

........

r9647 | p_lindheimer | 2010-05-17 18:09:26 -0700 (Mon, 17 May 2010) | 1 line


additional tweaks re #4279

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.8

    • Property svnmerge-integrated changed from /modules/branches/2.7:1-9638 to /modules/branches/2.7:1-9647

  • modules/branches/2.8/blacklist/page.blacklist.php

    r7556 r9648  
    114114                <td><a href="#" class="info"><?php echo _("Block Unknown/Blocked Caller ID:")?> 
    115115                <span><?php echo _("Check here to catch Unknown/Blocked Caller ID")?></span></a></td> 
    116                 <td><input type="checkbox" name="blocked" value="1" <? echo ($filter_blocked === true?" checked":"");?></td> 
     116                <td><input type="checkbox" name="blocked" value="1" <? echo ($filter_blocked === true?" checked=1":"");?></td> 
    117117        </tr> 
    118118 

  • modules/branches/2.8/queues/functions.inc.php

    r9639 r9648  
    428428          } 
    429429          $ext->add('ext-queues', $exten."**", '', new ext_macro('agent-del',"$exten")); 
     430          if ($que_code != '') { 
     431            $ext->add('ext-queues', $que_code.$exten, '', new ext_setvar('QUEUENO',$exten)); 
     432            $ext->add('ext-queues', $que_code.$exten, '', new ext_goto('start','s','app-queue-toggle')); 
     433          } 
    430434          /* Trial Devstate */ 
    431435          // Create Hints for Devices and Add Astentries for Users 
    …… 
    435439            foreach ($device_list as $device) { 
    436440              $ext->add('ext-queues', $que_code.$device['id'].'*'.$exten, '', new ext_setvar('QUEUENO',$exten)); 
    437               $ext->add('ext-queues', $que_code.$device['id'].'*'.$exten, '', new ext_goto("1",$que_code,"app-queue-toggle")); 
     441              $ext->add('ext-queues', $que_code.$device['id'].'*'.$exten, '', new ext_goto('start','s','app-queue-toggle')); 
    438442              $ext->addHint('ext-queues', $que_code.$device['id'].'*'.$exten, "Custom:QUEUE".$device['id'].'*'.$exten); 
    439443            } 
    …… 
    939943  $ext->addInclude('from-internal-additional', $id); // Add the include from from-internal 
    940944 
    941   $ext->add($id, $c, '', new ext_goto('start','s',$id)); 
    942945  $c = 's'; 
    943946 
    …… 
    946949  $ext->add($id, $c, '', new ext_macro('user-callerid')); 
    947950  $ext->add($id, $c, '', new ext_setvar('QUEUESTAT', 'LOGGEDOUT')); 
    948   $ext->add($id, $c, '', new ext_deadagi('queue_devstate.agi,getqueues,${AMPUSER}')); 
     951  $ext->add($id, $c, '', new ext_agi('queue_devstate.agi,getqueues,${AMPUSER}')); 
    949952 
    950953  $ext->add($id, $c, '', new ext_gotoif('$["${QUEUESTAT}" = "LOGGEDOUT"]', 'activate')); 
    …… 
    952955  $ext->add($id, $c, '', new ext_gotoif('$["${QUEUESTAT}" = "STATIC"]', 'static','end')); 
    953956  $ext->add($id, $c, 'deactivate', new ext_noop('Agent Logged out')); 
     957  $ext->add($id, $c, '', new ext_macro('toggle-del-agent')); 
    954958  if ($amp_conf['USEDEVSTATE']) { 
    955959    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    956     $ext->add($id, $c, '', new ext_macro('toggle-del-agent')); 
    957960    $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
    958     $ext->add($id, $c, '', new ext_playback('agent-loggedoff')); 
    959   } 
     961    } 
     962  $ext->add($id, $c, '', new ext_playback('agent-loggedoff')); 
    960963  $ext->add($id, $c, '', new ext_macro('hangupcall')); 
    961964 
    962965  $ext->add($id, $c, 'activate', new ext_noop('Agent Logged In')); 
     966  $ext->add($id, $c, '', new ext_macro('toggle-add-agent')); 
    963967  if ($amp_conf['USEDEVSTATE']) { 
    964968    $ext->add($id, $c, '', new ext_setvar('STATE', 'INUSE')); 
    965     $ext->add($id, $c, '', new ext_macro('toggle-add-agent')); 
    966969    $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
    967   $ext->add($id, $c, '', new ext_playback('agent-loginok')); 
    968   $ext->add($id, $c, '', new ext_saydigits('${CALLBACKNUM}')); 
    969   } 
     970  } 
     971  $ext->add($id, $c, '', new ext_playback('agent-loginok')); 
     972  $ext->add($id, $c, '', new ext_saydigits('${CALLBACKNUM}')); 
    970973  $ext->add($id, $c, '', new ext_macro('hangupcall')); 
    971974 
    …… 
    974977    $ext->add($id, $c, '', new ext_setvar('STATE', 'INUSE')); 
    975978    $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
    976   $ext->add($id, $c, '', new ext_playback('agent-loginok')); 
    977   } 
     979  } 
     980  $ext->add($id, $c, '', new ext_playback('agent-loginok')); 
    978981  $ext->add($id, $c, '', new ext_macro('hangupcall')); 
    979982