Changeset 10440

Show
Ignore:
Timestamp:
10/22/10 18:12:50 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 10417,10419,10421-10422,10424-10439 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
........

r10430 | p_lindheimer | 2010-10-22 14:50:43 -0700 (Fri, 22 Oct 2010) | 1 line


fix utility tool

........

................

r10438 | p_lindheimer | 2010-10-22 15:02:30 -0700 (Fri, 22 Oct 2010) | 1 line


no more pl version

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svnmerge-integrated changed from /modules/branches/2.8:1-10416,10418-10423 to /modules/branches/2.8:1-10439

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

    r9759 r10440  
    125125  $ext->add($id, $c, 'deactivate', new ext_dbdel('CF/${fromext}'));  
    126126  if ($amp_conf['USEDEVSTATE']) { 
    127     $ext->add($id, $c, '', new ext_setvar('STATE', 'UNKNOWN')); 
     127    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    128128    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    129129  } 
    …… 
    259259  $ext->add($id, $c, '', new ext_dbdel('CF/${fromext}'));  
    260260  if ($amp_conf['USEDEVSTATE']) { 
    261     $ext->add($id, $c, '', new ext_setvar('STATE', 'UNKNOWN')); 
     261    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    262262    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    263263  } 
    …… 
    297297  $ext->add($id, $c, '', new ext_dbdel('CF/${fromext}'));  
    298298  if ($amp_conf['USEDEVSTATE']) { 
    299     $ext->add($id, $c, '', new ext_setvar('STATE', 'UNKNOWN')); 
     299    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    300300    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    301301  } 
    …… 
    315315  $ext->add($id, $c, '', new ext_dbdel('CF/${fromext}'));  
    316316  if ($amp_conf['USEDEVSTATE']) { 
    317     $ext->add($id, $c, '', new ext_setvar('STATE', 'UNKNOWN')); 
     317    $ext->add($id, $c, '', new ext_setvar('STATE', 'NOT_INUSE')); 
    318318    $ext->add($id, $c, '', new ext_gosub('1', 'sstate', $id)); 
    319319  } 

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

    r9802 r10440  
    22  <rawname>callforward</rawname> 
    33  <name>Call Forward</name> 
    4   <version>2.8.0.3</version> 
     4  <version>2.8.0.4</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    77  <changelog> 
     8    *2.8.0.4* #4578 
    89    *2.8.0.3* #4294 
    910    *2.8.0.2* #4114, #4115, #3605 
    …… 
    2728  <type>setup</type> 
    2829  <category>Internal Options &amp; Configuration</category> 
    29   <location>release/2.8/callforward-2.8.0.3.tgz</location> 
    30   <md5sum>f19293902cbaf162d27342743077e27b</md5sum> 
     30  <location>release/2.8/callforward-2.8.0.4.tgz</location> 
     31  <md5sum>0cacfa87351b837c639a63ce8cd0d788</md5sum> 
    3132</module> 

  • modules/branches/2.9/fw_fopsvn.pl

    r10128 r10440  
    3232  print "Geting svn log since that version for $rver : .... \n\n"; 
    3333  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs_panel -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
    34  
     34  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/bin/retrieve_op_conf_from_mysql.php -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD");