Changeset 7871

Timestamp:

06/27/09 00:04:39 (3 years ago)

Author:

p_lindheimer

Message:

fix bug when accessing a stale page where the trunk no longer exists and no technology type is returned resulting in a sql query accessing a blank table

Files:

• modules/branches/2.6/core/functions.inc.php (modified) (5 diffs)

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

@@ -3790 +3790 @@
-  // conditionally, delete from iax or sip
-  switch (strtolower($tech)) {
+    case "iax2":
+      $tech = "iax";
+      // fall through
-    case "iax":
-    case "iax2":
-      sql("DELETE FROM `iax` WHERE `id` IN ('tr-peer-$trunknum', 'tr-user-$trunknum', 'tr-reg-$trunknum')");
-    break;
-    case "sip": 
-sip
+$tech
-    break;
-  }
@@ -3806 +3806 @@
-
-  $tech = core_trunks_getTrunkTech($trunknum);
+  if ($tech == "") {
+    return false;
+  }
-  core_trunks_del($trunknum, $tech);
-  core_trunks_backendAdd($trunknum, $tech, $channelid, $dialoutprefix, $maxchans, $outcid, $peerdetails, $usercontext, $userconfig, $register, $keepcid, $failtrunk, $disabletrunk, $name, $provider);
@@ -4107 +4110 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+ || $tech == ""
-  
-  $results = sql("SELECT keyword,data FROM $tech WHERE `id` = 'tr-peer-$trunknum' ORDER BY flags, keyword DESC","getAll");
@@ -4132 +4135 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+ || $tech == ""
-  
-  $results = sql("SELECT keyword,data FROM $tech WHERE `id` = 'tr-user-$trunknum' ORDER BY flags, keyword DESC","getAll");
@@ -4151 +4154 @@
-  $tech = core_trunks_getTrunkTech($trunknum);
-  
-
+ || $tech == ""
-  
-  $results = sql("SELECT `keyword`, `data` FROM $tech WHERE `id` = 'tr-reg-$trunknum'","getAll");