Ticket #932: functions.inc.php.diff

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

@@ -206 +206 @@
-                        foreach ($results2_pre as $element) {
-                                $options = explode("&", $element['data']);
-                                foreach ($options as $option) {
-$element['keyword'] == 'disallow' && $option == 'all'
+($element['keyword'] == 'disallow' && $option == 'all') | ($element['keyword'] == 'deny')
-                                                array_unshift($results2,array('keyword'=>$element['keyword'],'data'=>$option));
-                                        } else {
-                                                $results2[] = array('keyword'=>$element['keyword'],'data'=>$option);
@@ -2231 +2231 @@
-                        array($account,'qualify',(isset($_REQUEST['qualify']))?$_REQUEST['qualify']:'yes'),
-                        array($account,'callgroup',(isset($_REQUEST['callgroup']))?$_REQUEST['callgroup']:''),
-                        array($account,'pickupgroup',(isset($_REQUEST['pickupgroup']))?$_REQUEST['pickupgroup']:''),
+                        array($account,'deny',(isset($_REQUEST['deny']))?$_REQUEST['deny']:''),
+                        array($account,'permit',(isset($_REQUEST['permit']))?$_REQUEST['permit']:''),
-                        array($account,'disallow',(isset($_REQUEST['disallow']))?$_REQUEST['disallow']:''),
-                        array($account,'allow',(isset($_REQUEST['allow']))?$_REQUEST['allow']:'')
-                        //array($account,'record_in',(isset($_REQUEST['record_in']))?$_REQUEST['record_in']:'On-Demand'),
@@ -2309 +2311 @@
-                        array($account,'qualify',($_REQUEST['qualify'])?$_REQUEST['qualify']:'yes'),
-                        array($account,'disallow',($_REQUEST['disallow'])?$_REQUEST['disallow']:''),
-                        array($account,'allow',($_REQUEST['allow'])?$_REQUEST['allow']:''),
+                        array($account,'deny',(isset($_REQUEST['deny']))?$_REQUEST['deny']:''),
+                        array($account,'permit',(isset($_REQUEST['permit']))?$_REQUEST['permit']:''),
-                        array($account,'accountcode',($_REQUEST['accountcode'])?$_REQUEST['accountcode']:'')
-                        //array($account,'record_in',($_REQUEST['record_in'])?$_REQUEST['record_in']:'On-Demand'),
-                        //array($account,'record_out',($_REQUEST['record_out'])?$_REQUEST['record_out']:'On-Demand'),
@@ -4426 +4430 @@
-                $tmparr['dial'] = array('value' => '', 'level' => 1);
-                $tmparr['accountcode'] = array('value' => '', 'level' => 1);
-                $tmparr['mailbox'] = array('value' => '', 'level' => 1);
+                $tmparr['deny'] = array('value' => '', 'level' => 1);
+                $tmparr['permit'] = array('value' => '', 'level' => 1);
-                $currentcomponent->addgeneralarrayitem('devtechs', 'iax2', $tmparr);
-                unset($tmparr);
-
@@ -4447 +4453 @@
-                $tmparr['dial'] = array('value' => '', 'level' => 1);
-                $tmparr['accountcode'] = array('value' => '', 'level' => 1);
-                $tmparr['mailbox'] = array('value' => '', 'level' => 1);
+                $tmparr['deny'] = array('value' => '', 'level' => 1);
+                $tmparr['permit'] = array('value' => '', 'level' => 1);
-                $currentcomponent->addgeneralarrayitem('devtechs', 'sip', $tmparr);
-                unset($tmparr);
-