Changeset 6122

Timestamp:

07/21/08 17:19:51 (3 months ago)

Author:

p_lindheimer

Message:

allow splice to splice before a tag so you don't always need to know the exact priority

Files:

• freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php (modified) (2 diffs)

freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php

@@ -106 +106 @@
-        /* This function allows new priorities to be injected into already generated dialplan
-        *  usage: $ext->splice($context, $exten, $priority_number, new ext_goto('1','s','ext-did'));
+        *         if $priority is not numeric, it will interpret it as a tag and try to inject 
+        *         the command just prior to  the first instruction it finds with the specified tag
+        *         if it can't find the tag, it will inject it after the last instruction
-        */
-        function splice($section, $extension, $priority, $command) {
+
+                // if the priority is a tag, then we look for the real priority to insert it before that
+                // tag. If the tag does not exists, then we put it at the very end which may not be
+                // desired but it puts it somewhere
+                //
+                if (!ctype_digit($priority)) {
+                        $new_priority = false;
+                        $count = 0;
+                        if (isset($this->_exts[$section][$extension])) {
+                                foreach($this->_exts[$section][$extension] as $pri => $curr_command) {
+                                        if ($curr_command['tag'] == $priority) {
+                                                $new_priority = $count;
+                                                break;
+                                        }
+                                        $count++;
+                                }
+                        }
+                        $priority = ($new_priority === false) ? $count : $new_priority;
+                }
-                if($priority == 0) {
-                        $basetag = '1';
@@ -125 +147 @@
-                *  problems that array_splice has with multidmentional arrays
-                */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                // apply our newly modified array
-                //echo "Splicing [$section] $extension\n";
-                $this->_exts[$section][$extension] = $array;            
-
+
-                //print_r($this->_exts[$section][$extension]);
-        }