Ticket #1964: sip-call-limit.diff

amp_conf/htdocs/admin/modules/core/functions.inc.php

@@ -889 +889 @@
-      array($account,'callgroup',(isset($_REQUEST['callgroup']))?$_REQUEST['callgroup']:''),
-      array($account,'pickupgroup',(isset($_REQUEST['pickupgroup']))?$_REQUEST['pickupgroup']:''),
-      array($account,'disallow',(isset($_REQUEST['disallow']))?$_REQUEST['disallow']:''),
-
+
+
-      //array($account,'record_in',(isset($_REQUEST['record_in']))?$_REQUEST['record_in']:'On-Demand'),
-      //array($account,'record_out',(isset($_REQUEST['record_out']))?$_REQUEST['record_out']:'On-Demand'),
-      //array($account,'callerid',(isset($_REQUEST['description']))?$_REQUEST['description']." <".$account.'>':'device'." <".$account.'>')
@@ -2806 +2807 @@
-    $tmparr['dial'] = array('value' => '', 'level' => 1);
-    $tmparr['accountcode'] = array('value' => '', 'level' => 1);
-    $tmparr['mailbox'] = array('value' => '', 'level' => 1);
+    $tmparr['call-limit'] = array('value' => '', 'level' => 1);
-    $currentcomponent->addgeneralarrayitem('devtechs', 'sip', $tmparr);
-    unset($tmparr);
-
@@ -2903 +2905 @@
-    if ( is_array($deviceInfo) )
-      extract($deviceInfo, EXTR_PREFIX_ALL, 'devinfo');
-
+    // Extract call-limit explicitly in a separate variable, 'cos the dash is not allowed in variable name
+    $devinfo_calllimit = isset($deviceInfo['call-limit']) ? $deviceInfo['call-limit'] : '';
+
-    // Setup vars for use in the gui later on             
-    $fc_logon = featurecodes_getFeatureCode('core', 'userlogon');
-    $fc_logoff = featurecodes_getFeatureCode('core', 'userlogoff');
@@ -2938 +2943 @@
-    $currentcomponent->addguielem($section, new gui_label('techlabel', sprintf(_("This device uses %s technology."),$devinfo_tech)),4);
-    $devopts = $currentcomponent->getgeneralarrayitem('devtechs', $devinfo_tech);
-    foreach ($devopts as $devopt=>$devoptarr) {
-
-
+
+
+
+
+
+
+
-      $devoptjs = isset($devoptarr['jsvalidation']) ? $devoptarr['jsvalidation'] : '';
-      $devoptfailmsg = isset($devoptarr['failvalidationmsg']) ? $devoptarr['failvalidationmsg'] : '';
-