Changeset 11289

Timestamp:

02/03/11 10:00:02 (2 years ago)

Author:

p_lindheimer

Message:

closes #4790 adds sendprid/trustrpid to devices, un-tested so not publishing yet

Files:

• modules/branches/2.9/core/functions.inc.php (modified) (2 diffs)

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

@@ -3963 +3963 @@
-      array($account,'secret',$db->escapeSimple((isset($_REQUEST['secret']))?$_REQUEST['secret']:''),$flag++),
-      array($account,'canreinvite',$db->escapeSimple((isset($_REQUEST['canreinvite']))?$_REQUEST['canreinvite']:'no'),$flag++),
+
+      array($account,'trustrpid',$db->escapeSimple((isset($_REQUEST['trustrpid']))?$_REQUEST['trustrpid']:'no'),$flag++),
+      array($account,'sendrpid',$db->escapeSimple((isset($_REQUEST['sendrpid']))?$_REQUEST['sendrpid']:'no'),$flag++),
+
-      array($account,'context',$db->escapeSimple((isset($_REQUEST['context']))?$_REQUEST['context']:'from-internal'),$flag++),
-      array($account,'dtmfmode',$db->escapeSimple((isset($_REQUEST['dtmfmode']))?$_REQUEST['dtmfmode']:''),$flag++),
@@ -6385 +6389 @@
-
-    unset($select);
+    $select[] = array('value' => 'no', 'text' => _('No'));
+    $select[] = array('value' => 'yes', 'text' => _('Yes'));
+    $tmparr['trustrpid'] = array('value' => 'no', 'select' => $select, 'level' => 1);
+
+    unset($select);
+    $select[] = array('value' => 'no', 'text' => _('No'));
+    $select[] = array('value' => 'yes', 'text' => _('Send Remote-Party-ID header'));
+
+    if (version_compare($amp_conf['ASTVERSION'],'1.8','ge')) {
+      $select[] = array('value' => 'pai', 'text' => _('Send P-asserted-Identity header'));
+    }
+    $tmparr['sendrpid'] = array('value' => 'no', 'select' => $select, 'level' => 1);
+
+    $tmparr['context'] = array('value' => 'from-internal', 'level' => 1);
+    $tmparr['host'] = array('value' => 'dynamic', 'level' => 1);
+
+    unset($select);
-    $select[] = array('value' => 'friend', 'text' => 'friend');
-    $select[] = array('value' => 'peer', 'text' => 'peer');