Changeset 9669

Timestamp:

05/22/10 11:07:58 (2 years ago)

Author:

p_lindheimer

Message:

fixes #4183 duplicate order_DialRules function and missing declaration of sql() which works in upgrade module but not with install_amp

Files:

• freepbx/trunk/upgrades/2.8.0alpha1/tables.php (modified) (1 diff)
• freepbx/trunk/upgrades/2.8.0alpha2/tables.php (modified) (3 diffs)

freepbx/trunk/upgrades/2.8.0alpha1/tables.php

@@ -2 +2 @@
-global $amp_conf;
-global $db;
+
+if (!function_exists('sql')) {
+  function sql($sql,$type="query",$fetchmode=null) {
+    global $db;
+    $results = $db->$type($sql,$fetchmode);
+    if(DB::IsError($results)) {
+      die($results->getDebugInfo() . "SQL - <br /> $sql" );
+    }
+    return $results;
+  }
+}
-
-/*  fix manager.conf settings for older manager.conf files being upgraded as new permissions are needed for later releases of Asterisk

freepbx/trunk/upgrades/2.8.0alpha2/tables.php

@@ -2 +2 @@
-global $amp_conf;
-global $db;
+
+if (!function_exists('sql')) {
+  function sql($sql,$type="query",$fetchmode=null) {
+    global $db;
+    $results = $db->$type($sql,$fetchmode);
+    if(DB::IsError($results)) {
+      die($results->getDebugInfo() . "SQL - <br /> $sql" );
+    }
+    return $results;
+  }
+}
-
-/*  fix manager.conf settings for older manager.conf files being upgraded as new permissions are needed for later releases of Asterisk
@@ -173 +184 @@
-    foreach ($conf as $tname => $rules) {
-      $tid = ltrim($tname,'trunk-');
-
+2
-      $seq = 1;
-      foreach ($rules as $rule) {
@@ -188 +199 @@
-  }
-}
-
+2
-  return substr($a,4) > substr($b,4);
-}