Changeset 10719 for freepbx/trunk

Timestamp:

12/19/10 00:51:33 (2 years ago)

Author:

p_lindheimer

Message:

get engine info before creating the conf file classes in case any of them actually depend on that info, and check for existance of func_shared()

Files:

• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (2 diffs)

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -524 +524 @@
-}
-
+$engineinfo = engine_getinfo();
+if($engineinfo['version'] == 0){
+  freepbx_log('retrieve_conf', 'fatal', "Failed to get engine information (engine_getinfo: {$engineinfo['engine']})");
+  fatal(_("Failed to get engine_info"),_("retreive_conf failed to get engine information and cannot configure up a softwitch with out it. Error: {$engineinfo['engine']}"));
+}
+// was setting these variables before, assume we still need them
+$engine = $engineinfo['engine'];
+$version = $engineinfo['version'];
+$chan_dahdi = ast_with_dahdi();
+
+$has_func_shared = false;
+if (version_compare($version, '1.6', 'lt')) {
+  $response = $astman->send_request('Command', array('Command' => 'module show like func_shared'));
+  if (preg_match('/1 modules loaded/', $response['data'])) {
+    $has_func_shared = true;
+  }
+} else {
+  $has_func_shared = true;
+}
+
-// create objects for any module classes
-// currently only 1 class can be declared per module, not sure if that will be an issue
@@ -536 +556 @@
-}
-
-$engineinfo = engine_getinfo();
-if($engineinfo['version'] == 0){
-  freepbx_log('retrieve_conf', 'fatal', "Failed to get engine information (engine_getinfo: {$engineinfo['engine']})");
-  fatal(_("Failed to get engine_info"),_("retreive_conf failed to get engine information and cannot configure up a softwitch with out it. Error: {$engineinfo['engine']}"));
-}
-// was setting these variables before, assume we still need them
-$engine = $engineinfo['engine'];
-$version = $engineinfo['version'];
-$chan_dahdi = ast_with_dahdi();
-
-// Check for and report any extension conflicts
-//
-
-$extens_ok = true;
-$dests_ok = true;