Changeset 12983 for freepbx/branches

Timestamp:

11/30/11 19:54:50 (1 year ago)

Author:

p_lindheimer

Message:

auto-detect or correct ASTCONFAPP and notify if changes are made

Files:

• freepbx/branches/2.10/amp_conf/bin/retrieve_conf (modified) (2 diffs)

freepbx/branches/2.10/amp_conf/bin/retrieve_conf

@@ -550 +550 @@
-$freepbx_conf->set_conf_values($update_arr, true, true);
-
+$nt = notifications::create($db);
+
+$conf_change = _("Conference Room App Changed");
+$conf_change_desc = _("Your Conference Room App (ASTCONFAPP) was automatically changed from %s to %s because %s is not installed on your Asterisk installation");
+
+$conf_missing = _("No Conference Room App");
+$conf_missing_desc = _("Neither app_meetme nor app_confbridge is configured in Asterisk, conferencing, paging and other functionality will not work properly");
+
+if ($amp_conf['ASTCONFAPP'] == 'app_meetme' && !$astman->app_exists('meetme')) {
+  if ($astman->app_exists('confbridge')) {
+    $freepbx_conf->set_conf_values(array('ASTCONFAPP' => 'app_confbridge'), true, true);
+    $nt->add_notice('framework', 'ASTCONFAPPCHG', $conf_change, sprintf($conf_change_desc,'app_meetme','app_confbridge','app_meetme'));
+    $nt->delete('framework', 'ASTCONFAPPMISSING');
+  } else {
+    $nt->add_error('framework', 'ASTCONFAPPMISSING', $conf_missing, $conf_missing_desc);
+  }
+} elseif ($amp_conf['ASTCONFAPP'] == 'app_confbridge' && !$astman->app_exists('confbridge')) {
+  if ($astman->app_exists('meetme')) {
+    $freepbx_conf->set_conf_values(array('ASTCONFAPP' => 'app_meetme'), true, true);
+    $nt->add_notice('framework', 'ASTCONFAPPCHG', $conf_change, sprintf($conf_change_desc,'app_confbridge','app_meetme','app_confbridge'));
+    $nt->delete('framework', 'ASTCONFAPPMISSING');
+  } else {
+    $nt->add_error('framework', 'ASTCONFAPPMISSING', $conf_missing, $conf_missing_desc);
+  }
+} else {
+  $nt->delete('framework', 'ASTCONFAPPMISSING');
+}
+
-// Check for and report any extension conflicts
-//
@@ -555 +583 @@
-$extens_ok = true;
-$dests_ok = true;
-
-$nt = notifications::create($db);
-
-$my_hash = array_flip($module_list);