Changeset 6972 for modules/branches

Show
Ignore:
Timestamp:
10/12/08 21:02:15 (5 years ago)
Author:
p_lindheimer
Message:

fixes #3274 add context in the gosub() calls for sstate as some usage of the feature codes are falling through to the wrong subroutine

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.5/donotdisturb/functions.inc.php

    r6913 r6972  
    7272  if ($amp_conf['USEDEVSTATE']) { 
    7373    $ext->add($id, $c, '', new ext_setvar('STATE', 'BUSY')); 
    74     $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
     74    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    7575  } 
    7676  $ext->add($id, $c, '', new ext_playback('do-not-disturb&activated')); // $cmd,n,Playback(...) 
    …… 
    107107  if ($amp_conf['USEDEVSTATE']) { 
    108108    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    109     $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
     109    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    110110  } 
    111111  $ext->add($id, $c, '', new ext_playback('do-not-disturb&de-activated')); // $cmd,n,Playback(...) 
    …… 
    144144  if ($amp_conf['USEDEVSTATE']) { 
    145145    $ext->add($id, $c, '', new ext_setvar('STATE', 'BUSY')); 
    146     $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
     146    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    147147  } 
    148148  $ext->add($id, $c, '', new ext_playback('do-not-disturb&activated')); 
    …… 
    152152  if ($amp_conf['USEDEVSTATE']) { 
    153153    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    154     $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
     154    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    155155  } 
    156156  $ext->add($id, $c, '', new ext_playback('do-not-disturb&de-activated')); 

  • modules/branches/2.5/findmefollow/functions.inc.php

    r6944 r6972  
    466466  if ($amp_conf['USEDEVSTATE']) { 
    467467    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    468     $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
     468    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    469469  } 
    470470  $ext->add($id, $c, '', new ext_playback('followme&de-activated')); 
    …… 
    474474  if ($amp_conf['USEDEVSTATE']) { 
    475475    $ext->add($id, $c, '', new ext_setvar('STATE', 'INUSE')); 
    476     $ext->add($id, $c, '', new ext_gosub('1', 'sstate')); 
     476    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    477477  } 
    478478  $ext->add($id, $c, '', new ext_playback('followme&activated'));