| 1 |
--- functions.inc.php.orig 2009-11-22 09:23:55.000000000 +0100 |
|---|
| 2 |
+++ functions.inc.php 2009-11-22 10:32:55.000000000 +0100 |
|---|
| 3 |
@@ -2942,6 +2942,7 @@ |
|---|
| 4 |
function core_devices_addsip($account) { |
|---|
| 5 |
global $db; |
|---|
| 6 |
global $currentFile; |
|---|
| 7 |
+ global $version; |
|---|
| 8 |
|
|---|
| 9 |
$flag = 2; |
|---|
| 10 |
foreach ($_REQUEST as $req=>$data) { |
|---|
| 11 |
@@ -2958,10 +2959,15 @@ |
|---|
| 12 |
} |
|---|
| 13 |
|
|---|
| 14 |
if ( !is_array($sipfields) ) { // left for compatibilty....lord knows why ! |
|---|
| 15 |
+ if (version_compare($version, '1.6.2', 'lt')) { |
|---|
| 16 |
+ $directmedia='canreinvite'; |
|---|
| 17 |
+ } else { |
|---|
| 18 |
+ $directmedia='directmedia'; |
|---|
| 19 |
+ } |
|---|
| 20 |
$sipfields = array( |
|---|
| 21 |
array($account,'accountcode',$db->escapeSimple((isset($_REQUEST['accountcode']))?$_REQUEST['accountcode']:''),$flag++), |
|---|
| 22 |
array($account,'secret',$db->escapeSimple((isset($_REQUEST['secret']))?$_REQUEST['secret']:''),$flag++), |
|---|
| 23 |
- array($account,'canreinvite',$db->escapeSimple((isset($_REQUEST['canreinvite']))?$_REQUEST['canreinvite']:'no'),$flag++), |
|---|
| 24 |
+ array($account,$directmedia,$db->escapeSimple((isset($_REQUEST[$directmedia]))?$_REQUEST[$directmedia]:'no'),$flag++), |
|---|
| 25 |
array($account,'context',$db->escapeSimple((isset($_REQUEST['context']))?$_REQUEST['context']:'from-internal'),$flag++), |
|---|
| 26 |
array($account,'dtmfmode',$db->escapeSimple((isset($_REQUEST['dtmfmode']))?$_REQUEST['dtmfmode']:''),$flag++), |
|---|
| 27 |
array($account,'host',$db->escapeSimple((isset($_REQUEST['host']))?$_REQUEST['host']:'dynamic'),$flag++), |
|---|
| 28 |
@@ -5138,10 +5144,9 @@ |
|---|
| 29 |
return true; |
|---|
| 30 |
} |
|---|
| 31 |
|
|---|
| 32 |
- |
|---|
| 33 |
function core_devices_configpageinit($dispnum) { |
|---|
| 34 |
global $currentcomponent; |
|---|
| 35 |
- |
|---|
| 36 |
+ $version='1.6.2'; |
|---|
| 37 |
if ( $dispnum == 'devices' || $dispnum == 'extensions' ) { |
|---|
| 38 |
// Setup arrays for device types |
|---|
| 39 |
$currentcomponent->addgeneralarray('devtechs'); |
|---|
| 40 |
@@ -5196,7 +5201,11 @@ |
|---|
| 41 |
$tmparr = array(); |
|---|
| 42 |
$tmparr['secret'] = array('value' => '', 'level' => 0, 'jsvalidation' => '(isEmpty() && !confirm("'.$msgConfirmSecret.'")) || (!isEmpty() && weakSecret())', 'failvalidationmsg' => $msgInvalidSecret); |
|---|
| 43 |
$tmparr['dtmfmode'] = array('value' => 'rfc2833', 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidDTMFMODE ); |
|---|
| 44 |
- $tmparr['canreinvite'] = array('value' => 'no', 'level' => 1); |
|---|
| 45 |
+ if (version_compare($version, '1.6.2', 'lt')) { |
|---|
| 46 |
+ $tmparr['canreinvite'] = array('value' => 'no', 'level' => 1); |
|---|
| 47 |
+ } else { |
|---|
| 48 |
+ $tmparr['directmedia'] = array('value' => 'no', 'level' => 1); |
|---|
| 49 |
+ } |
|---|
| 50 |
$tmparr['context'] = array('value' => 'from-internal', 'level' => 1); |
|---|
| 51 |
$tmparr['host'] = array('value' => 'dynamic', 'level' => 1); |
|---|
| 52 |
$tmparr['type'] = array('value' => 'friend', 'level' => 1); |
|---|
