Show
Ignore:
Timestamp:
10/22/10 17:57:23 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10432 via svnmerge from
http://svn.freepbx.org/modules/branches/2.8

........

r10432 | p_lindheimer | 2010-10-22 14:54:49 -0700 (Fri, 22 Oct 2010) | 1 line


fixes #4578 use NOT_INUSE in place of UNKNOWN

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.7

    • Property svnmerge-integrated changed from /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752,9773 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607,9845,9880,9976,10020-10021,10299,10338,10391,10418 to /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416,9752,9773 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607,9845,9880,9976,10020-10021,10299,10338,10391,10418,10432

  • modules/branches/2.7/callforward/functions.inc.php

    r9670 r10433  
    117117  $ext->add($id, $c, 'deactivate', new ext_dbdel('CF/${fromext}'));  
    118118  if ($amp_conf['USEDEVSTATE']) { 
    119     $ext->add($id, $c, '', new ext_setvar('STATE', 'UNKNOWN')); 
     119    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    120120    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    121121  } 
    …… 
    232232  $ext->add($id, $c, '', new ext_dbdel('CF/${fromext}'));  
    233233  if ($amp_conf['USEDEVSTATE']) { 
    234     $ext->add($id, $c, '', new ext_setvar('STATE', 'UNKNOWN')); 
     234    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    235235    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    236236  } 
    …… 
    270270  $ext->add($id, $c, '', new ext_dbdel('CF/${fromext}'));  
    271271  if ($amp_conf['USEDEVSTATE']) { 
    272     $ext->add($id, $c, '', new ext_setvar('STATE', 'UNKNOWN')); 
     272    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    273273    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    274274  } 
    …… 
    288288  $ext->add($id, $c, '', new ext_dbdel('CF/${fromext}'));  
    289289  if ($amp_conf['USEDEVSTATE']) { 
    290     $ext->add($id, $c, '', new ext_setvar('STATE', 'UNKNOWN')); 
     290    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    291291    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    292292  } 

  • modules/branches/2.7/callforward/module.xml

    r9681 r10433  
    22  <rawname>callforward</rawname> 
    33  <name>Call Forward</name> 
    4   <version>2.7.0.4</version> 
     4  <version>2.7.0.5</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    77  <changelog> 
     8    *2.7.0.5* #4578 
    89    *2.7.0.4* #4214, #4114, #4115 
    910    *2.7.0.3* #4116, #4105 again