Changeset 4357

Timestamp:

07/11/07 21:40:54 (6 years ago)

Author:

gregmac

Message:

Fix bugs in module version dependency checking

Files:

• freepbx/branches/2.3/amp_conf/htdocs/admin/functions.inc.php (modified) (3 diffs)

freepbx/branches/2.3/amp_conf/htdocs/admin/functions.inc.php

@@ -473 +473 @@
-  return array('engine'=>'ERROR-UNSUPPORTED-ENGINE-'.$amp_conf['AMPENGINE'], 'version'=>'0', 'additional' => '0');
-}
+
+
+/* verison_compare that works with freePBX version numbers
+ */
+function version_compare_freepbx($version1, $version2, $op = null) {
+        $version1 = str_replace("rc","RC", strtolower($version1));
+        $version2 = str_replace("rc","RC", strtolower($version2));
+    if (!is_null($op)) {
+      return version_compare($version1, $version2, $op);
+    } else {
+      return version_compare($version1, $version2);
+    }
+}
+
-
-/* queries database using PEAR.
@@ -1630 +1644 @@
-            if (preg_match('/^(lt|le|gt|ge|==|=|eq|!=|ne)?\s*(\d*[beta|alpha|rc|RC]?\d+(\.[^\.]+)*)$/i', $value, $matches)) {
-              // matches[1] = operator, [2] = version
-
+installed_
-              $operator = (!empty($matches[1]) ? $matches[1] : 'ge'); // default to >=
-
-
+
+
+
+
+
-              }
-            }
@@ -1647 +1664 @@
-                    if (!empty($matches[4])) {
-                      // also doing version checking
+                      $installed_ver = $modules[$matches[1]]['dbversion'];
+                      $compare_ver = $matches[4];
-                      $operator = (!empty($matches[3]) ? $matches[3] : 'ge'); // default to >=
-
-
+
+
+
+
+
-                      }
-                    }