Changeset 7306

Timestamp:

12/01/08 08:45:04 (1 year ago)

Author:

mickecarlsson

Message:

Closes #932 adds permit/deny to sip and iax devices

Files:

• modules/branches/2.6/core/functions.inc.php (modified) (6 diffs)

modules/branches/2.6/core/functions.inc.php

@@ -212 +212 @@
-                        }
-
-
+and 'deny' 
-                        //
-                        $results2 = array();
@@ -218 +218 @@
-                                $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 {
@@ -2391 +2391 @@
-                        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']:'')
@@ -2467 +2469 @@
-                        array($account,'port',($_REQUEST['port'])?$_REQUEST['port']:'4569'),
-                        array($account,'qualify',($_REQUEST['qualify'])?$_REQUEST['qualify']:'yes'),
+                        array($account,'deny',(isset($_REQUEST['deny']))?$_REQUEST['deny']:''),
+                        array($account,'permit',(isset($_REQUEST['permit']))?$_REQUEST['permit']:''),                   
-                        array($account,'disallow',($_REQUEST['disallow'])?$_REQUEST['disallow']:''),
-                        array($account,'allow',($_REQUEST['allow'])?$_REQUEST['allow']:''),
@@ -4613 +4617 @@
-                $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);
@@ -4634 +4640 @@
-                $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);