Changeset 3584

Timestamp:

01/20/07 20:51:18 (2 years ago)

Author:

qldrob

Message:

Apply fix for #1361 (patch #1667), mailbox field not being propogated in deviceanduser mode.

Files:

• freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php (modified) (3 diffs)

freepbx/branches/2.2/amp_conf/htdocs/admin/modules/core/functions.inc.php

@@ -778 +778 @@
-                        if ( $keyword == 'dial' && $data == '' ) {
-                                $sipfields[] = array($account, $keyword, 'SIP/'.$account);
+                        } elseif ($keyword == 'mailbox' && $data == '') {
+                                $sipfields[] = array($account,'mailbox',$account.'@device');
-                        } else {
-                                $sipfields[] = array($account, $keyword, $data);
@@ -857 +859 @@
-                        if ( $keyword == 'dial' && $data == '' ) {
-                                $iaxfields[] = array($account, $keyword, 'IAX2/'.$account);
+                        } elseif ($keyword == 'mailbox' && $data == '') {
+                                $iaxfields[] = array($account,'mailbox',$account.'@device');
-                        } else {
-                                $iaxfields[] = array($account, $keyword, $data);
@@ -937 +941 @@
-                                $zapchan = $_REQUEST['devinfo_channel'] != '' ? $_REQUEST['devinfo_channel'] : $_REQUEST['channel'];
-                                $zapfields[] = array($account, $keyword, 'ZAP/'.$zapchan);
+                        } elseif ($keyword == 'mailbox' && $data == '') {
+                                $zapfields[] = array($account,'mailbox',$account.'@device');
-                        } else {
-                                $zapfields[] = array($account, $keyword, $data);