Changeset 13080

Show
Ignore:
Timestamp:
12/16/11 17:00:34 (1 year ago)
Author:
p_lindheimer
Message:

fixes #5477 honor RINGTIMER_DEFAULT

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/core/functions.inc.php

    r13074 r13080  
    14401440          $vm = ((($exten['voicemail'] == "novm") || ($exten['voicemail'] == "disabled") || ($exten['voicemail'] == "")) ? "novm" : $exten['extension']); 
    14411441 
    1442           $ext->add('ext-local', $exten['extension'], '', new ext_execif('$[${DB(AMPUSER/'.$exten['extension'].'/ringtimer)} > 0]','Set','__RINGTIMER=${DB(AMPUSER/'.$exten['extension'].'/ringtimer)}')); 
     1442          $ext->add('ext-local', $exten['extension'], '', new ext_set('__RINGTIMER', '${IF($[${DB(AMPUSER/'.$exten['extension'].'/ringtimer)} > 0]?${DB(AMPUSER/'.$exten['extension'].'/ringtimer)}:${RINGTIMER_DEFAULT})}')); 
    14431443           
    14441444          $dest_args = ','.($exten['noanswer_dest']==''?'0':'1').','.($exten['busy_dest']==''?'0':'1').','.($exten['chanunavail_dest']==''?'0':'1'); 
    …… 
    16951695      foreach($globals as $global) { 
    16961696        $value = $global['value']; 
     1697 
     1698        // Ticket # 5477 Create a default value that can't be polluted 
     1699        if ($global['variable'] == 'RINGTIMER') { 
     1700          $ext->addGlobal('RINGTIMER_DEFAULT', $value); 
     1701          continue; 
     1702        } 
    16971703        $ext->addGlobal($global['variable'],$value); 
    16981704