Changeset 7721

Timestamp:

05/13/09 15:48:19 (1 year ago)

Author:

xrobau

Message:

Apply fixes from #3423

Files:

• modules/branches/2.6/core/agi-bin/enumlookup.agi (modified) (5 diffs)

modules/branches/2.6/core/agi-bin/enumlookup.agi

@@ -3 +3 @@
-// Replacement for Asterisk's ENUMLOOKUP function. 
-// Written by Rob Thomas <xrobau@gmail.com>
-
+
+
-//
-//    FreePBX is free software: you can redistribute it and/or modify
-General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-
+Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or 
-//
-//    FreePBX is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
-
-
+Affero 
+
+Affero 
-//    along with FreePBX.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-
-
+
+
+
+
+
-
-/* --------WARNING---------
- * 
-
-
-
-
+
+
+
+
+
+
+
+
-
-require_once "phpagi.php";
@@ -34 +41 @@
-$lookup = get_var( $AGI, "DIAL_NUMBER" );
-
-
-
-
-
-
-
-
+
-
-$dialstr = "";
-
-
+  // Go through the ENUM providers and look for the number.
-        // Are we using php5 and can use get_dns_record?
-                if (function_exists("dns_get_record")) {
@@ -72 +73 @@
-                        if (eregi('SIP|IAX', $row['tech'])) {
-                                $URI = $row['URI'];
-
+
+
-                        }
-                }
@@ -84 +86 @@
-        global $AGI;
-
-;
+
-        $arpa = "";
-        for ($i = 0; $i < strlen($lookup); $i++) {
@@ -157 +159 @@
-}
-
+function get_enum_providers() {
+        // parse enum.conf config file 
+        $localprefix_file = get_var($AGI, "ASTETCDIR")."/enum.conf"; 
+        if (file_exists($localprefix_file)) { 
+                $section="general"; 
+                parse_conf($localprefix_file, $conf, $section); 
+                if (count($conf) == 0) { 
+                        $AGI->verbose("Could not parse config file $localprefix_file - using default e164.org", 0); 
+                        return Array("e164.org");
+                } 
+        } else { 
+                $AGI->verbose("Could not open config file $localprefix_file - using default e164.org", 0); 
+                return Array("e164.org");
+        } 
+
+        $enums = Array(); 
+        // pickup search org from the conf array 
+        if (isset($conf["general"])) { 
+                foreach ($conf["general"] as $key=>$options) { 
+                        if (isset($options["search"])) { 
+                                foreach($options as $enumorgs) { 
+                                        $enums[]=$enumorgs; 
+                                } // store each enumorg in array         
+                        } // else, diff option  
+                } // else, this isn't the section we want 
+        } // else, no config for this section 
+}
+
+function parse_conf($filename, &$conf, &$section) { 
+        global $AGI; 
+        $AGI->verbose("Parsing config file $filename",3); 
+
+        if (is_null($conf)) { $conf = array(); } 
+
+        if (is_null($section)) { $section = "general"; } 
+
+        if (file_exists($filename)) { 
+                $fd = fopen($filename, "r"); 
+                while ($line = fgets($fd, 1024)) { 
+                        if (preg_match("/^\s*([a-zA-Z0-9-_]+)\s*=>\s*(.*?)\s*([;#].*)?$/",$line,$matches)) { 
+                                // name => => value 
+                                // keep [] to allow for duplicate options like search 
+                                // could extend options to include for example: 
+                                // skipgateway => slow-sip-gateway.com 
+                                // earlyexit => yes (to return only 1 enum from dns lookup)  
+                                $conf[$section][][$matches[1]] = $matches[2]; 
+                        } else if (preg_match("/^\s*\[(.+)\]/",$line,$matches)) { 
+                                // section name 
+                                $section = strtolower($matches[1]); 
+                        } else if (preg_match("/^\s*#include\s+(.*)\s*([;#].*)?/",$line,$matches)) { 
+                                // include another file 
+                                if ($matches[1][0] == "/") { 
+                                        // absolute path 
+                                        $filename = $matches[1]; 
+                                } else { 
+                                        // relative path 
+                                        $filename =  dirname($filename)."/".$matches[1]; 
+                                } 
+                                parse_conf($filename, $conf, $section); 
+                        } 
+                }
+        }
+}
+
-?>