Changeset 7880

Timestamp:

06/29/09 22:00:46 (3 years ago)

Author:

p_lindheimer

Message:

Merged revisions 7878 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7878 | p_lindheimer | 2009-06-29 19:36:32 -0700 (Mon, 29 Jun 2009) | 1 line

fixes #3741 added new function core_routing_trunk_del(trunknum) which deletes the specified trunk from all routes

........

Files:

• modules/branches/2.6 (modified) (1 prop)
• modules/branches/2.6/core/functions.inc.php (modified) (1 diff)
• modules/branches/2.6/core/page.trunks.php (modified) (1 diff)

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

@@ -4613 +4613 @@
-}
-
+/* Delete all occurences of the specified trunk from all routes that may use it
+ */
+function core_routing_trunk_del($trunknum) {
+  global $db;
+
+  $sql = "DELETE FROM `extensions` WHERE `application` = 'Macro' AND `context` LIKE 'outrt-%' AND `args` LIKE 'dialout-%,$trunknum,%'";
+  $result = $db->query($sql);
+}
+
-function core_routing_rename($oldname, $newname) {
-  global $db;

modules/branches/2.6/core/page.trunks.php

@@ -100 +100 @@
-  
-    core_trunks_del($trunknum);
+    core_routing_trunk_del($trunknum);
-    
-    /* //DIALRULES