Ticket #2560: iax_transfer.diff

functions.inc.php

@@ -213 +213 @@
-
-       function generate_iax_additional($ast_version) {
-               global $db;
+               global $version;
-
-               $table_name = "iax";
-               $additional = "";
@@ -243 +244 @@
-                       if(DB::IsError($results2)) {
-                       die($results2->getMessage());
-                       }
+
+                       if (version_compare($version, '1.4', 'ge')) {
+                               foreach ($results2 as $result2){
+                                       $goon = true;
+
+                                       if ($result2['keyword'] == 'notransfer'){
+                                               switch ($result2['data']){
+                                                       case 'yes':
+                                                               $tmp[] = array('keyword' => 'transfer', 'data' => 'no');
+                                                               break;
+                                                       case 'media':
+                                                               $tmp[] = array('keyword' => 'transfer', 'data' => 'media');
+                                                               break;
+                                                       default:
+                                                               $tmp[] = array('keyword' => 'transfer', 'data' => 'yes');
+                                                               break;
+                                               }
+                                               $goon = false;
+                                       }
+
+                                       if (($result2['keyword'] == 'allow' || $result2['keyword'] == 'disallow') && $result2['data'] == ''){
+                                               $goon = false;
+                                       }
+
+                                       if ($goon)
+                                               $tmp[] = $result2;
+
+                               }
+                               $results2 = $tmp;
+                               unset($tmp);
+                       }
+
-                       foreach ($results2 as $result2) {
-                               $options = explode("&", $result2['data']);
-                               foreach ($options as $option) {