Changeset 9130

Timestamp:

03/11/10 14:42:06 (2 years ago)

Author:

p_lindheimer

Message:

closes #4125 adds some methods to ext-class to add comments and selectively or globally remove all auto-generated custom context includes, as well as amporta.conf setting to enact this and code in retrieve_conf to turn this on

Files:

• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php (modified) (4 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php (modified) (1 diff)
• freepbx/trunk/amportal.conf (modified) (1 diff)

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -352 +352 @@
-require_once($amp_conf['AMPWEBROOT']."/admin/extensions.class.php");
-$ext = new extensions;
+
+if ($amp_conf['DISABLECUSTOMCONTEXTS']) {
+  $ext->disableCustomContexts(true);
+}
-
-// create objects for any module classes

freepbx/trunk/amp_conf/htdocs/admin/extensions.class.php

@@ -14 +14 @@
-  
-  var $_sorted;
+
+  var $_section_comment = array();
+
+  var $_section_no_custom = array();
+
+  var $disable_custom_contexts = false;
-  
-  /** The filename to write this configuration to
@@ -83 +89 @@
-    $this->_sorted = true;
-  }
+  function addSectionComment($section, $comment) {
+    $this->_section_comment[$section] = $comment;
+  }
+
+  function addSectionNoCustom($section, $setting) {
+    $this->_section_no_custom[$section] = $setting ? true : false;
+  }
+
+  function disableCustomContexts($setting) {
+    $this->_disable_custom_contexts = $setting ? true : false;
+  }
-  
-  function addHint($section, $extension, $hintvalue) {
@@ -92 +109 @@
-  }
-  
-
-   $this->_includes[$section][] = $incsection
+, $comment=''
+    $this->_includes[$section][] = array('include' => $incsection, 'comment' => $comment)
-  }
-
@@ -266 +283 @@
-    if(is_array($this->_exts)){
-      foreach (array_keys($this->_exts) as $section) {
-
+
+
-        
-
-
+
+
+
+
-        //add requested includes for this context
-        if (isset($this->_includes[$section])) {
-          foreach ($this->_includes[$section] as $include) {
-.
+['include'] . ($include['comment'] != ''?' ; '.$include['comment']:'') . 
-          }
-        }

freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

@@ -754 +754 @@
-  'USEDIALONE'      => array('bool' , false),
-  'RELOADCONFIRM'   => array('bool' , true),
+  'DISABLECUSTOMCONTEXTS'   => array('bool' , false),
-);
-

freepbx/trunk/amportal.conf

@@ -283 +283 @@
-# When set to true, a beep is played instead of confirmation message when activating/de-activating:
-# CallForward, CallWaiting, DayNight, DoNotDisturb and FindMeFollow
+
+DISABLECUSTOMCONTEXTS=true
+# DISABLECUSTOMCONTEXTS=true|false
+# DEFAULT VALUE: false
+# Normally FreePBX auto-generates a custome context that may be usable for adding custom dialplan to modify the normal behavior
+# of FreePBX. It takes a good understanding of how Asterisk processes these includes to use this and in many of the cases, there
+# is no useful application. All includes will result in a WARNING in the Asterisk log if there is no countext found to include
+# though it results in no errors. If you know that you want the includes, you can set this to true. If you comment it out FreePBX
+# will revert to legacy behavior and include the contexts.