Changeset 13054 for freepbx/branches

Timestamp:

12/09/11 11:18:20 (1 year ago)

Author:

p_lindheimer

Message:

add some logging, add set-freepbx-settings option (experimental untested), make parser force booleans

Files:

• freepbx/branches/2.10/install_amp (modified) (10 diffs)

freepbx/branches/2.10/install_amp

@@ -80 +80 @@
-  foreach ($file as $line) {
-    if (preg_match("/^\s*([a-zA-Z0-9]+)\s*=\s*(.*)\s*([;#].*)?/",$line,$matches)) { 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  }
@@ -95 +112 @@
-  if ( !isset($conf["AMPENGINE"]) || ($conf["AMPENGINE"] == "")) {
-    $conf["AMPENGINE"] = "asterisk";
+  }
+  out("parsed amp_conf variables from $filename:");
+  foreach ($conf as $keyword => $value) {
+    out("amp_conf [$keyword] => [$value]");
-  }
-
@@ -577 +598 @@
-// **** Parse out command-line options
-$shortopts = "h?u:p:";
-
+,"set-freepbx-settings"
-
-$args = Console_Getopt::getopt(Console_Getopt::readPHPArgv(), $shortopts, $longopts);
@@ -595 +616 @@
-$make_links = false;
-$module_install = true;
+$set_freepbx_settings = false;
-
-//initialize variables to avoid php notices
@@ -660 +682 @@
-    case "--install-moh":
-      $install_moh = true;
+    break;
+    case "--set-freepbx-settings":
+      $set_freepbx_settings = true;
-    break;
-    case "--fopwebroot":
@@ -753 +778 @@
-// **** Check for amportal.conf, create if necessary
-
+// TODO: Check if freepbx_settings has been setup, if so then we don't even want to mess with ampportal.conf, that
+//       should only be first time install.
+//
-outn("Checking for ".AMP_CONF."..");
-if (!file_exists(AMP_CONF)) {
@@ -1073 +1101 @@
-}
-
-// **** Apply amportal.conf configuration to files
-if (file_exists(dirname(__FILE__)."/apply_conf.sh")) { 
-  debug("Running ".dirname(__FILE__)."/apply_conf.sh");
-}
-
-// Ensure executables are executable
@@ -1108 +1132 @@
-    outn("no freepbx_engine..");
-  }
+  // TODO: we just did this above
-  if (file_exists($amp_conf["AMPBIN"]."/freepbx_setting")) {
-    exec("chmod 755 ".$amp_conf["AMPBIN"]."/freepbx_setting");
@@ -1134 +1159 @@
-  // reload manager in asterisk if it is running:
-  //
-  outn("apply username/password changes to conf files..");
-  if (file_exists(dirname(__FILE__)."/apply_conf.sh")) { 
+    out("apply username/password changes to conf files:");
+    debug("Running ".dirname(__FILE__)."/apply_conf.sh");
+    $apply_conf_out = array();
-    if ($force_amportal_conf) {
+      out("running apply_conf.sh from " . AMP_CONF);
-      putenv('FORCE_AMPORTAL_CONF=1');
-
+, $apply_conf_out
-      putenv('FORCE_AMPORTAL_CONF=');
-    } else {
-
+
+
-    }
-
-
+
+
+
+
+
+
-
-  /* As of Asterisk 1.4.16 or there about, a missing #include file will make the reload fail. So
@@ -1229 +1262 @@
-out("..OK");
-
+// TODO: if file is $force_amportal_conf let's go set any settings in freepbx_settings,
+//       question is, should we do this further up???
+//
+if ($set_freepbx_settings && $force_amportal_conf) {
+  out("Setting freepbx settings form " . AMP_CONF);
+  $freepbx_conf =& freepbx_conf::create();
+  foreach ($amp_conf as $keyword => $value) {
+    if ($freepbx_conf->conf_setting_exists($keyword)) {
+      $freepbx_conf->set_conf_values(array($keyword => $value),true,true);
+      out("freepbx setting [$keyword] set to [$value]");
+    } else {
+      out("freepbx setting [$keyword] DOES NOT EXIST, can't set to [$value]");
+    }
+  }
+}
+
-// **** Generate AMP configs
-out("Generating AMP configs..");