Changeset 10965 for freepbx/trunk

Timestamp:

01/15/11 03:39:06 (2 years ago)

Author:

p_lindheimer

Message:

partially done work to intialize freepbx_settings, will replace migration insert table, the plan is that we will be able to run this from framework modules or install_amp like ugrades, need to make sure we can run this class from install_amp though re #4740, this work is untested and should not currently do anything

Files:

• freepbx/trunk/install_amp (modified) (4 diffs)
• freepbx/trunk/libfreepbx.install.php (modified) (1 diff)

freepbx/trunk/install_amp

@@ -765 +765 @@
-// **** read amportal.conf
-
+// TODO: should check for freepbx.conf first in case this is not a first
+//       time install?
+//       If it is successful, then do we bootsrap (otherwise we won't have
+//       these other parameters which are coming out of amportal.con
+//
-outn("Reading ".AMP_CONF."..");
-$amp_conf = install_parse_amportal_conf(AMP_CONF);
@@ -828 +833 @@
-} 
-// write amportal.conf
+// TODO: What we do here may depend on if we bootsrapped, as well as how we set the
+//       other paramerts just above (e.g. we would want to use the define
+//
-write_amportal_conf(AMP_CONF, $amp_conf);
-
@@ -866 +874 @@
-$amp_conf["AMPENGINE"]=$pbx_engine;
-
+// TODO: Again? didn't we just do that above?
+//
-write_amportal_conf(AMP_CONF, $amp_conf);
-
@@ -1159 +1169 @@
-upgrade_all($version);
-
+// TODO: this is probably where we will put freepbx_settings_init
+//       to initialize/update all the possible settings
+
-// **** Generate AMP configs
-out("Generating AMP configs..");

freepbx/trunk/libfreepbx.install.php

@@ -378 +378 @@
-/********************************************************************************************************************/
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+