Changeset 2683

Timestamp:

10/15/06 06:57:25 (7 years ago)

Author:

qldrob

Message:

Move function out from inside another function, where it can get called twice..

Files:

• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (4 diffs)

freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

@@ -1259 +1259 @@
- */
-function module_checkdepends($modulename) {
-  function comparison_error_message($module, $reqversion, $version, $operator) {
-    switch ($operator) {
-      case 'lt': case '<':
-        return sprintf(_('A %s version below %s is required, you have %s'), $module, $reqversion, $version);
-      break;
-      case 'le': case '<=';
-        return sprintf(_('%s version %s or below is required, you have %s'), $module, $reqversion, $version);
-      break;
-      case 'gt': case '>';
-        return sprintf(_('A %s version newer than %s required, you have %s'), $module, $reqversion, $version);
-      break;
-      case 'ne': case '!=': case '<>':
-        return sprintf(_('Your %s version (%s) is incompatible.'), $version, $reqversion);
-      break;
-      case 'eq': case '==': case '=': 
-        return sprintf(_('Only %s version %s is compatible, you have %s'), $module, $reqversion, $version);
-      break;
-      default:
-      case 'ge': case '>=':
-        return sprintf(_('%s version %s or higher is required, you have %s'), $module, $reqversion, $version);
-    }
-  }
-  
-  // check if we were passed a modulexml array, or a string (name)
@@ -1315 +1293 @@
-              $operator = (!empty($matches[1]) ? $matches[1] : 'ge'); // default to >=
-              if (version_compare($matches[2], $ver, $operator) ) {
-
+_module_
-              }
-            }
@@ -1330 +1308 @@
-                      $operator = (!empty($matches[3]) ? $matches[3] : 'ge'); // default to >=
-                      if (version_compare($matches[4], $modules[$matches[1]]['dbversion'], $operator) ) {
-
+_module_
-                      }
-                    }
@@ -1422 +1400 @@
-}
-
+function _module_comparison_error_message($module, $reqversion, $version, $operator) {
+  switch ($operator) {
+    case 'lt': case '<':
+      return sprintf(_('A %s version below %s is required, you have %s'), $module, $reqversion, $version);
+    break;
+    case 'le': case '<=';
+      return sprintf(_('%s version %s or below is required, you have %s'), $module, $reqversion, $version);
+    break;
+    case 'gt': case '>';
+      return sprintf(_('A %s version newer than %s required, you have %s'), $module, $reqversion, $version);
+    break;
+    case 'ne': case '!=': case '<>':
+      return sprintf(_('Your %s version (%s) is incompatible.'), $version, $reqversion);
+    break;
+    case 'eq': case '==': case '=': 
+      return sprintf(_('Only %s version %s is compatible, you have %s'), $module, $reqversion, $version);
+    break;
+    default:
+    case 'ge': case '>=':
+      return sprintf(_('%s version %s or higher is required, you have %s'), $module, $reqversion, $version);
+  }
+}
+
-/** Finds all the enabled modules that depend on a given module
- * @param  mixed  The name of the module, or the modulexml Array