Changeset 10320

Timestamp:

09/27/10 04:34:12 (3 years ago)

Author:

tm1000

Message:

Simple fixes for EPM 2.3.0

Files:

• contributed_modules/modules/endpointman/includes/functions.inc (modified) (7 diffs)
• contributed_modules/modules/endpointman/module.xml (modified) (1 diff)

contributed_modules/modules/endpointman/includes/functions.inc

@@ -23 +23 @@
-        global $amp_conf, $db, $global_cfg;
-
+        //TODO: Need to have this change when the user changes timezones, for now we keep it set to my timezone
-        date_default_timezone_set('America/Los_Angeles');
-
+        //The only time dbh_asterisk is set is when we are inside the ARI Recording interface
-        if(isset($_SESSION['dbh_asterisk'])) {
-            $this->db = $_SESSION['dbh_asterisk'];
+            //We don't want to reference the recordings directory when in the recording interface.
-            $_SERVER["SCRIPT_FILENAME"] = str_replace("recordings/", "admin/", $_SERVER["SCRIPT_FILENAME"]);
-        } else {
-            $this->db = $db;
-        }
+
+        //Move all information from the global $amp_conf into our public space. This will help prevent security concerns
-        $this->amp_conf = $amp_conf;
+
+        //Generate empty array
-        $this->error = array();
-
+        //Get all global variables
-        $this->global_cfg =& $this->db->getAssoc("SELECT var_name, value FROM endpointman_global_vars");
-
+        //TODO: Possibly remove these as I don't believe anything uses them anymore
-        define("UPDATE_PATH", $this->global_cfg['update_server']);
-        define("VER", $this->global_cfg['version']);
+        //end possible removal
+
-        //Define the location of phone modules, keeping it outside of the module directory so that when the user updates endpointmanager they don't lose all of their phones
-        define("PHONE_MODULES_PATH", dirname($_SERVER["SCRIPT_FILENAME"])."/modules/_ep_phone_modules/");
@@ -53 +64 @@
-        }
-
-writable
+if config location is writable and/or exists!
-        if(isset($this->global_cfg['config_location'])) {
-            if(is_dir($this->global_cfg['config_location'])) {
@@ -71 +82 @@
-    }
-
+    /**
+     * Used to send sample configurations to provisioner.net
+     * NOTE: The user has to explicitly click a link that states they are sending the configuration to the project
+     * We don't take configs on our own accord!!
+     * @param <type> $brand Brand Directory
+     * @param <type> $product Product Directory
+     * @param <type> $orig_name The file's original name we are sending
+     * @param <type> $data The config file's data
+     */
-    function submit_config($brand,$product,$orig_name,$data) {
-        $posturl = 'http://www.provisioner.net/submit_config.php';
-&product=
+'.$brand.'&product='.$product.'
-
-        $ch = curl_init($posturl);
@@ -80 +100 @@
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_HEADER, 0);  // DO NOT RETURN HTTP HEADERS
-
+, probably not needed
-        $Rec_Data = curl_exec($ch);
-
@@ -144 +164 @@
-
-    /**
-
+ to this function
-     * @param string $mac
-     * @return array
@@ -274 +294 @@
-            $phone_info['product_id'] = 0;
-            $phone_info['custom_cfg_template'] = 0;
-            $phone_info['ext'] = $row['ext'];
-            $phone_info['mac'] = $row['mac'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return $phone_info;
-    }
@@ -671 +718 @@
-    /**
-     * Prepare and then send the data that Provisioner expects, then take what provisioner gives us and do what it says
-
+ Everything from get_phone_info
-     */
-    function prepare_configs($phone_info) {

contributed_modules/modules/endpointman/module.xml

@@ -22 +22 @@
-        </changelog>
-  <info>http://projects.colsolgrp.net/projects/show/endpointman</info>
-3.0
+2.9
-
-7adabdcde60d5f27a3dcae7c660e7526
+c9dd08b16ad7e9eb41164ab3a8e0123f
-</module>