Changeset 10607

Timestamp:

11/22/10 19:35:53 (3 years ago)

Author:

p_lindheimer

Message:

add support to feature codes to allow it to generate destinations

Files:

• freepbx/trunk/SQL/newinstall.sql (modified) (1 diff)
• freepbx/trunk/SQL/newinstall.sqlite3.sql (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/featurecodes.class.php (modified) (6 diffs)
• freepbx/trunk/upgrades/2.9.0alpha1/tables.php (added)

freepbx/trunk/SQL/newinstall.sql

@@ -129 +129 @@
-  `customcode` varchar(20) default NULL,
-  `enabled` tinyint(4) NOT NULL default '0',
+  `providedest` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`modulename`,`featurename`),
-  KEY `enabled` (`enabled`)

freepbx/trunk/SQL/newinstall.sqlite3.sql

@@ -46 +46 @@
-  `customcode` varchar(20) default NULL,
-  `enabled` tinyint(4) NOT NULL default '0',
+  `providedest` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`modulename`,`featurename`)
---   KEY `enabled` (`enabled`)

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

@@ -8 +8 @@
-  var $_customcode; // Custom code
-  var $_enabled;    // Enabled/Disabled (0=disabled; 1=enabled; -1=unknown)
+  var $_providedest;    // 1=provide a featurecode destination for this code to modules
-  var $_loaded;   // If this feature code was succesfully loaded from the DB
-  var $_overridecodes;    // Overide defaults from featurecodes.conf
@@ -45 +46 @@
-    }
-      
-
+, providedest
-    $s .= "FROM featurecodes ";
-    $s .= "WHERE modulename = ".sql_formattext($this->_modulename)." AND featurename = ".sql_formattext($this->_featurename)." ";
@@ -64 +65 @@
-      $this->_customcode = $res[2];
-      $this->_enabled = $res[3];
+      $this->_providedest = $res[4];
-      
-      $this->_loaded = true;
@@ -91 +93 @@
-             'defaultcode = '.sql_formattext($this->_defaultcode).', '.
-             'customcode = '.sql_formattext($this->_customcode).', '.
-
+
+
-             'WHERE modulename = '.sql_formattext($this->_modulename).
-             ' AND featurename = '.sql_formattext($this->_featurename);
-    } else {
-
-            'VALUES ('.sql_formattext($this->_modulename).', '.sql_formattext($this->_featurename).', '.sql_formattext($this->_description).', '.sql_formattext($this->_defaultcode).', '.sql_formattext($this->_customcode).', '.sql_formattext($this->_enabled
+, providedest
+        'VALUES ('.sql_formattext($this->_modulename).', '.sql_formattext($this->_featurename).', '.sql_formattext($this->_description).', '.sql_formattext($this->_defaultcode).', '.sql_formattext($this->_customcode).', '.sql_formattext($this->_enabled).', '.sql_formattext($this->_providedest
-    }
-
@@ -204 +207 @@
-
-    return ($this->_enabled == 1);
+  }
+
+  // SET to provide destinatinos
+  function setProvideDest($b = true) {
+    if (!$this->isReady())
+      $this->init(1);
+
+    $this->_providedest = ($b ? 1 : 0);
+  }
+  
+  // GET status if providing providedests
+  function isProvideDest() {
+    if (!$this->isReady())
+      $this->init(1);
+
+    return ($this->_providedest == 1);
-  }
-
@@ -246 +265 @@
-  }
-  $s = "SELECT featurecodes.modulename, featurecodes.featurename, featurecodes.description AS featuredescription, featurecodes.enabled AS featureenabled, featurecodes.defaultcode, featurecodes.customcode, ";
-
+, featurecodes.providedest
-  $s .= "FROM featurecodes ";
-  $s .= "INNER JOIN modules ON modules.modulename = featurecodes.modulename ";