Changeset 13475

Show
Ignore:
Timestamp:
02/18/12 22:47:59 (1 year ago)
Author:
p_lindheimer
Message:

Merged revisions 13472-13473 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.10

........

r13472 | p_lindheimer | 2012-02-18 19:09:14 -0800 (Sat, 18 Feb 2012) | 1 line


fixes #5596 proper message and bevhavior if queue is restricted

........

r13473 | p_lindheimer | 2012-02-18 19:22:15 -0800 (Sat, 18 Feb 2012) | 1 line


closes #5271 clarify password usage in queues

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svn:mergeinfo changed from /modules/branches/2.10:12193,13090,13103-13104,13106,13450 to /modules/branches/2.10:12193,13090,13103-13104,13106,13450,13472-13473
    • Property svnmerge-integrated changed from /modules/branches/2.10:1-12085,12193,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.10:1-12085,12193,13055,13061,13067,13069,13090,13097-13100,13103-13104,13106,13450,13472-13473 /modules/branches/2.8:1-12454 /modules/branches/bootstrap-2.9:1-10853

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

    r11823 r13475  
    10921092  $ext->add($id, $c, 'deactivate', new ext_noop('Agent Logged out')); 
    10931093  $ext->add($id, $c, '', new ext_macro('toggle-del-agent')); 
     1094  $logout_label = 'logout'; 
    10941095  if ($amp_conf['USEDEVSTATE']) { 
    1095     $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
     1096    $ext->add($id, $c, $logout_label, new ext_setvar('STATE', 'NOT_INUSE')); 
    10961097    $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
    1097     } 
    1098   $ext->add($id, $c, '', new ext_playback('agent-loggedoff')); 
     1098    $logout_label = ''; 
     1099  } 
     1100  $ext->add($id, $c, $logout_label, new ext_playback('agent-loggedoff')); 
    10991101  $ext->add($id, $c, '', new ext_macro('hangupcall')); 
    11001102 
    11011103  $ext->add($id, $c, 'activate', new ext_noop('Agent Logged In')); 
    11021104  $ext->add($id, $c, '', new ext_macro('toggle-add-agent')); 
     1105  $ext->add($id, $c, '', new ext_gotoif('$["${QAGENT_UNAUTHORIZED}"="1"]', 'logout')); 
    11031106  if ($amp_conf['USEDEVSTATE']) { 
    11041107    $ext->add($id, $c, '', new ext_setvar('STATE', 'INUSE')); 
    …… 
    11591162  $ext->add($id, $c, '', new ext_macroexit()); 
    11601163  $ext->add($id, $c, 'invalid', new ext_playback('pbx-invalid')); 
     1164  $ext->add($id, $c, '', new ext_set('QAGENT_UNAUTHORIZED','1')); 
    11611165  $ext->add($id, $c, '', new ext_macroexit()); 
    11621166} 

  • modules/branches/2.9/queues/page.queues.php

    r11957 r13475  
    271271 
    272272  <tr> 
    273     <td><a href="#" class="info"><?php echo _("Queue Password:")?><span><?php echo _("You can require agents to enter a password before they can log in to this queue.<br><br>This setting is optional.")?></span></a></td> 
     273    <td><a href="#" class="info"><?php echo _("Queue Password:")?><span><?php echo _("You can require agents to enter a password before they can log in to this queue.<br><br>This setting is optional.") . '<br /><br />' . _("The password is only used when logging in with the legacy queueno* code. When using the toggle codes, you must use the Restrict Dynamic Agents option in conjunction with the Dynamic Members list to control access.")?></span></a></td> 
    274274    <td><input type="text" name="password" value="<?php echo (isset($password) ? $password : ''); ?>" tabindex="<?php echo ++$tabindex;?>"></td> 
    275275  </tr>