Changeset 12183 for freepbx

Timestamp:

05/20/11 19:32:04 (2 years ago)

Author:

p_lindheimer

Message:

fixes #5138 make restrict_mods local and also detect and skip bootstrap if already called

Files:

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

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

@@ -24 +24 @@
- * $bootstrap_settings['function_modules_included'] = true/false true if one or more were included, false if all were skipped;
- */
+
+// we should never re-run this file, something is wrong if we do.
+//
+if (isset($bootstrap_settings['bootstrapped'])) {
+  freepbx_log(FPBX_LOG_ERROR,"Bootstrap has already been called once, bad code somewhere");
+  return;
+} else {
+  $bootstrap_settings['bootstrapped'] = true;
+}
-
-if (!isset($bootstrap_settings['skip_astman'])) {
@@ -128 +137 @@
-if (!defined('FREEPBX_IS_AUTH')) { die('No direct script access allowed'); }//we should never need this, just another line of defence
-
+$restrict_mods_local = $restrict_mods;
-// I'm pretty sure if this is == true then there is no need to even pull all the module info as we are going down a path
-// such as an ajax path that this is just overhead. (We'll know soon enough if this is too restrcitive).
-//
-
+_local
-  $active_modules = module_getinfo(false, MODULE_STATUS_ENABLED);
-
@@ -138 +148 @@
-    foreach($active_modules as $key => $module) {
-      //include module functions if there not dissabled
- || (is_array($restrict_mods) && isset($restrict_mods
+_local || (is_array($restrict_mods_local) && isset($restrict_mods_local
-        require_once($amp_conf['AMPWEBROOT']."/admin/modules/{$key}/functions.inc.php");
-      }