Ticket #932: functions.inc.php.diff

File functions.inc.php.diff, 3.0 kB (added by shag, 4 years ago)

fixed diff file for 2.5.0rc2.4 - adds permit & deny on both sip & iax pages, fixes sorting to put deny= on top of all (like we do for disallow=)

  • /var/www/html/admin/modules/core/functions.inc.php

    old new  
    206206      foreach ($results2_pre as $element) { 
    207207        $options = explode("&", $element['data']); 
    208208        foreach ($options as $option) { 
    209           if ($element['keyword'] == 'disallow' && $option == 'all') { 
     209          if (($element['keyword'] == 'disallow' && $option == 'all') | ($element['keyword'] == 'deny')) { 
    210210            array_unshift($results2,array('keyword'=>$element['keyword'],'data'=>$option)); 
    211211          } else { 
    212212            $results2[] = array('keyword'=>$element['keyword'],'data'=>$option); 
    …… 
    22312231      array($account,'qualify',(isset($_REQUEST['qualify']))?$_REQUEST['qualify']:'yes'), 
    22322232      array($account,'callgroup',(isset($_REQUEST['callgroup']))?$_REQUEST['callgroup']:''), 
    22332233      array($account,'pickupgroup',(isset($_REQUEST['pickupgroup']))?$_REQUEST['pickupgroup']:''), 
     2234      array($account,'deny',(isset($_REQUEST['deny']))?$_REQUEST['deny']:''), 
     2235      array($account,'permit',(isset($_REQUEST['permit']))?$_REQUEST['permit']:''), 
    22342236      array($account,'disallow',(isset($_REQUEST['disallow']))?$_REQUEST['disallow']:''), 
    22352237      array($account,'allow',(isset($_REQUEST['allow']))?$_REQUEST['allow']:'') 
    22362238      //array($account,'record_in',(isset($_REQUEST['record_in']))?$_REQUEST['record_in']:'On-Demand'), 
    …… 
    23092311      array($account,'qualify',($_REQUEST['qualify'])?$_REQUEST['qualify']:'yes'), 
    23102312      array($account,'disallow',($_REQUEST['disallow'])?$_REQUEST['disallow']:''), 
    23112313      array($account,'allow',($_REQUEST['allow'])?$_REQUEST['allow']:''), 
     2314                        array($account,'deny',(isset($_REQUEST['deny']))?$_REQUEST['deny']:''), 
     2315                        array($account,'permit',(isset($_REQUEST['permit']))?$_REQUEST['permit']:''), 
    23122316      array($account,'accountcode',($_REQUEST['accountcode'])?$_REQUEST['accountcode']:'') 
    23132317      //array($account,'record_in',($_REQUEST['record_in'])?$_REQUEST['record_in']:'On-Demand'), 
    23142318      //array($account,'record_out',($_REQUEST['record_out'])?$_REQUEST['record_out']:'On-Demand'), 
    …… 
    44264430    $tmparr['dial'] = array('value' => '', 'level' => 1); 
    44274431    $tmparr['accountcode'] = array('value' => '', 'level' => 1); 
    44284432    $tmparr['mailbox'] = array('value' => '', 'level' => 1); 
     4433                $tmparr['deny'] = array('value' => '', 'level' => 1); 
     4434                $tmparr['permit'] = array('value' => '', 'level' => 1); 
    44294435    $currentcomponent->addgeneralarrayitem('devtechs', 'iax2', $tmparr); 
    44304436    unset($tmparr); 
    44314437 
    …… 
    44474453    $tmparr['dial'] = array('value' => '', 'level' => 1); 
    44484454    $tmparr['accountcode'] = array('value' => '', 'level' => 1); 
    44494455    $tmparr['mailbox'] = array('value' => '', 'level' => 1); 
     4456                $tmparr['deny'] = array('value' => '', 'level' => 1); 
     4457                $tmparr['permit'] = array('value' => '', 'level' => 1); 
    44504458    $currentcomponent->addgeneralarrayitem('devtechs', 'sip', $tmparr); 
    44514459    unset($tmparr); 
    44524460