Changeset 8256

Timestamp:

08/31/09 15:38:16 (4 years ago)

Author:

p_lindheimer

Message:

fixes #3849 iax extension updates failing, also removes bogus field device_secret_origional from being instered in iax or sip extensions

Files:

• modules/branches/2.6/core/functions.inc.php (modified) (3 diffs)
• modules/branches/2.6/core/module.xml (modified) (1 diff)

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

@@ -2801 +2801 @@
-  //take care of sip/iax/zap config
-  $funct = "core_devices_add".strtolower($tech);
+  
+  // before calling device specifc funcitions, get rid of any bogus fields in the REQUEST array
+  //
+  if (isset($_REQUEST['devinfo_secret_origional'])) {
+    unset($_REQUEST['devinfo_secret_origional']);
+  }
-  if(function_exists($funct)){
-    $funct($id);
@@ -3058 +3064 @@
-  global $db;
-  global $currentFile;
-
+
+
-  foreach ($_REQUEST as $req=>$data) {
-    if ( substr($req, 0, 8) == 'devinfo_' ) {
-      $keyword = substr($req, 8);
-      if ( $keyword == 'dial' && $data == '' ) {
-
+, $flag++
-      } elseif ($keyword == 'mailbox' && $data == '') {
-
+, $flag++
-      } else {
-
+, $flag++
-      }
-    }
@@ -3073 +3080 @@
-  
-  if ( !is_array($iaxfields) ) { // left for compatibilty....lord knows why !
-    $flag = 2;
-    $iaxfields = array(
-      array($account,'secret',$db->escapeSimple(($_REQUEST['secret'])?$_REQUEST['secret']:''),$flag++),

modules/branches/2.6/core/module.xml

@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
- 
+, #3849
-    *2.6.0beta2.0* #3075, #3501, #3636, #3581, #3266, #3701, #3545, #3430, #3798, #3609, #3836
-    *2.6.0beta1.3* trunk tab improvements