Changeset 10785

Timestamp:

12/30/10 17:46:13 (2 years ago)

Author:

p_lindheimer

Message:

adds standardized bootstrap_settings array but still retains the past globals for compatibility

Files:

• freepbx/branches/bootstrap/amp_conf/htdocs/admin/bootstrap.php (modified) (7 diffs)

freepbx/branches/bootstrap/amp_conf/htdocs/admin/bootstrap.php

@@ -1 +1 @@
-<?php
+/* Bootstrap Settings:
+ *
+ * bootstrap_settings['skip_db']               - legacy $skip_db, default false
+ * bootstrap_settings['skip_astman']           - legacy $skip_astman, default false
+ *
+ * bootstrap_settings['astman_config']         - default null, config arguemnt when creating new Astman
+ * bootstrap_settings['astman_options']        - default array(), config options creating new Astman
+ *                                               e.g. array('cachemode' => true), see astman documentation
+ * bootstrap_settings['astman_events']         - default 'off' used when connecting, Astman defaults to 'on'
+ *
+ * bootstrap_settings['freepbx_error_handler'] - false don't set it, true use default, named use what is passed
+ *
+ * bootstrap_settings['freepbx_auth']          - true (default) - authorize, false - bypass authentication
+ *
+ * $restrict_mods: false means include all modules functions.inc.php
+ *                 array of hashes means each module where there is a hash
+ *                 e.g. ($restrict_mods = array('core' => true, 'dashboard' => true)
+ */
+
+if (!isset($bootstrap_settings['skip_db'])) {
+  $bootstrap_settings['skip_db'] = isset($skip_db) ? $skip_db : false;
+}
+if (!isset($bootstrap_settings['skip_astman'])) {
+  $bootstrap_settings['skip_astman'] = isset($skip_astman) ? $skip_astman : false;
+}
+$bootstrap_settings['astman_config'] = isset($bootstrap_settings['astman_config']) ? $bootstrap_settings['astman_config'] : null;
+$bootstrap_settings['astman_options'] = isset($bootstrap_settings['astman_options']) && is_array($bootstrap_settings['astman_options']) ? $bootstrap_settings['astman_options'] : array();
+$bootstrap_settings['astman_events'] = isset($bootstrap_settings['astman_events']) ? $bootstrap_settings['astman_events'] : 'off';
+
+$bootstrap_settings['freepbx_error_handler'] = isset($bootstrap_settings['freepbx_error_handler']) ? $bootstrap_settings['freepbx_error_handler'] : true;
+$bootstrap_settings['freepbx_auth'] = isset($bootstrap_settings['freepbx_auth']) ? $bootstrap_settings['freepbx_auth'] : true;
+
+
+$restrict_mods = isset($restrict_mods) ? $restrict_mods : false;
+
+
+
-//enable error reporting and start benchmarking
-error_reporting(1);
@@ -9 +46 @@
-
-//now that its been included, use our own error handler as it tends to be much more verbose.
-
+
+
+
+
-
-//include database conifguration
@@ -17 +57 @@
-
-// connect to database
-isset($skip_db) || !$skip_db
+!$bootstrap_settings['skip_db']
-  require_once(dirname(__FILE__) . '/common/db_connect.php'); //PEAR must be installed
-  //keep old values as well so that we have the db settings handy
@@ -30 +70 @@
-}
-
-isset($skip_astman) || !$skip_astman
+$bootstrap_settings['skip_astman']
-  require_once(dirname(__FILE__) . '/libraries/php-asmanager.php');
-
-
+
-  // attempt to connect to asterisk manager proxy
-
+, $bootstrap_settings['astman_events']
-    // attempt to connect directly to asterisk, if no proxy or if proxy failed
-amp_conf['ASTMANAGEREVENTS
+bootstrap_settings['astman_events
-      // couldn't connect at all
-      unset( $astman );
@@ -46 +85 @@
-//include gui functions + auth if nesesarry
-//TODO: PHP4 returns 'cgi', this needs to be addressed so it works properly -PL
-
+ || !$bootstrap_settings['freepbx_auth']
-  if (!defined('FREEPBX_IS_AUTH')) {
-    define('FREEPBX_IS_AUTH', 'TRUE');
@@ -64 +103 @@
-    //echo '<pre>';print_r($active_modules[$key]['changelog']);echo '</pre>';
-    //include module functions if there not dissabled
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    
-    //create an array of module sections to display
@@ -99 +129 @@
-  }
-}
-
-?>