Changeset 5364

Timestamp:

12/06/07 13:02:19 (5 years ago)

Author:

p_lindheimer

Message:

#2299 provide support to Asterisk trunk (1.6) in dialparties.agi - thx pnlarsson

Files:

• modules/branches/2.4/core/agi-bin/dialparties.agi (modified) (3 diffs)
• modules/branches/2.4/core/functions.inc.php (modified) (1 diff)

modules/branches/2.4/core/agi-bin/dialparties.agi

@@ -49 +49 @@
-$ampmgrpass  = get_var( $AGI, "AMPMGRPASS" );
-$cwinusebusy = get_var( $AGI, "CWINUSEBUSY" );
+$ast_version = get_var( $AGI, "ASTVERSION" );
-
-$cwignore    = get_var( $AGI, "CWIGNORE" );
@@ -582 +583 @@
-  $AGI->noop('');
-} else {
+  // Asterisk 1.6 uses , instead of | and 1.4 can't recieve a , in the ds.
+  //
+  if (version_compare($ast_version, "1.6", "ge")) { 
+    $ds_seperator = ',';
+  } else {
+    $ds_seperator = '|';
+  }
+  
-  if (($rgmethod == "hunt") || ($rgmethod == "memoryhunt") || ($rgmethod == "firstavailable") || ($rgmethod == "firstnotonphone")) {
-'|'
+$ds_seperator
-    if ($timer) {
-      $ds .= $timer;
-    }
-'|'
+$ds_seperator
-    $AGI->set_variable('ds',$ds);
-    $AGI->set_variable("HuntMembers",$loops);
-    $AGI->set_priority("huntdial"); // dial command was at priority 20 where dialplan handles calling a ringgroup with strategy of "hunt" or "MemoryHunt"
-  } else {
-'|'
+$ds_seperator
-    if ($timer) {
-      $ds .= $timer;
@@ -599 +608 @@
-      }
-    }
-'|'
+$ds_seperator
-    if (trim($use_confirmation) != "FALSE") {
-      $AGI->set_variable('__RG_IDX',$ringgroup_index);

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

@@ -813 +813 @@
-        }
-      }
-
+
+
+
-      /* outbound routes */
-      // modules should use their own table for storage (and module_get_config() to add dialplan)