Changeset 5872

Timestamp:

07/01/08 21:46:18 (3 months ago)

Author:

p_lindheimer

Message:

added support to featurescodes class to use freepbx_featurecodes.conf in place of hardcoded module settings for default values when supplied

Files:

• freepbx/trunk/amp_conf/htdocs/admin/featurecodes.class.php (modified) (6 diffs)

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

@@ -9 +9 @@
-        var $_enabled;          // Enabled/Disabled (0=disabled; 1=enabled; -1=unknown)
-        var $_loaded;           // If this feature code was succesfully loaded from the DB
+        var $_overridecodes;            // Overide defaults from featurecodes.conf
-
-        // CONSTRUCTOR
-        function featurecode($modulename, $featurename) {
+                global $amp_conf;
+
-                if ($modulename == '' || $featurename == '')
-                        die_freepbx('feature code class must be called with ModuleName and FeatureName');
+
+                $fd = $amp_conf['ASTETCDIR'].'/freepbx_featurecodes.conf';
+                $this->_overridecodes = array();
+                if (file_exists($fd)) {
+                        $this->_overridecodes = parse_ini_file($fd,true);
+                }
-
-                $this->_modulename = $modulename;
@@ -43 +52 @@
-                if (is_array($res)) { // found something, read it
-                        $this->_description = $res[0];
-
+
+
+
+
+
+
+
+
+
+
-                        $this->_customcode = $res[2];
-                        $this->_enabled = $res[3];
@@ -109 +127 @@
-        
-        // SET DEFAULT CODE
-af
+fa
-                if (!$this->isReady())
-                        $this->init(1);
-                        
-
+
+
+
+
+
-                        unset($this->_defaultcode);
-                } else {
-af
+fa
-                }
-
@@ -122 +144 @@
-                        $this->_enabled = ($defaultenabled) ? 1 : 0;
-                }
-
-
-        }
@@ -217 +238 @@
-
-function featurecodes_getAllFeaturesDetailed() {
+        global $amp_conf;
+
+        $fd = $amp_conf['ASTETCDIR'].'/freepbx_featurecodes.conf';
+        $overridecodes = array();
+        if (file_exists($fd)) {
+                $overridecodes = parse_ini_file($fd,true);
+        }
-        $s = "SELECT featurecodes.modulename, featurecodes.featurename, featurecodes.description AS featuredescription, featurecodes.enabled AS featureenabled, featurecodes.defaultcode, featurecodes.customcode, ";
-        $s .= "modules.enabled AS moduleenabled ";
@@ -227 +255 @@
-                $modules = module_getinfo(false, MODULE_STATUS_ENABLED);
-                foreach ($results as $key => $item) {
+
-                        // get the module display name
-                        $results[$key]['moduledescription'] = (!empty($modules[ $item['modulename'] ]['name']) ? $modules[ $item['modulename'] ]['name'] : ucfirst($item['modulename']));
+                        if (isset($overridecodes[$item['modulename']][$item['featurename']]) && trim($overridecodes[$item['modulename']][$item['featurename']]) != '') {
+                                $results[$key]['defaultcode'] = $overridecodes[$item['modulename']][$item['featurename']];
+                        }
-                }
-