Changeset 11618

Timestamp:

02/27/11 20:03:06 (2 years ago)

Author:

tm1000

Message:

Fixed #4870, #4892 & allowed duplicate extensions on phones

Files:

• modules/branches/2.9/endpointman/assets/js/jquery-1.3.2.min.js (deleted)
• modules/branches/2.9/endpointman/assets/js/jquery.js (deleted)
• modules/branches/2.9/endpointman/functions.inc.php (modified) (5 diffs)
• modules/branches/2.9/endpointman/includes/abstraction/freepbx.inc (modified) (2 diffs)
• modules/branches/2.9/endpointman/includes/advanced.inc (modified) (9 diffs)
• modules/branches/2.9/endpointman/includes/brand_model_manager.inc (modified) (1 diff)
• modules/branches/2.9/endpointman/includes/functions.inc (modified) (37 diffs)
• modules/branches/2.9/endpointman/includes/installer.php (modified) (1 diff)
• modules/branches/2.9/endpointman/includes/popup.php (modified) (4 diffs)
• modules/branches/2.9/endpointman/install.php (modified) (4 diffs)
• modules/branches/2.9/endpointman/module.xml (modified) (3 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_iedl.html (modified) (1 diff)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_manual_upload.html (modified) (2 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_oui.html (modified) (2 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_poce.html (modified) (5 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_settings.html (modified) (3 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_sh_manager.html (modified) (3 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_subheader.html (modified) (1 diff)
• modules/branches/2.9/endpointman/templates/freepbx/brand_model_manager.html (modified) (4 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/devices_manager.html (modified) (3 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/global_footer.html (modified) (2 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/global_header.html (modified) (3 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/message_box.html (modified) (1 diff)
• modules/branches/2.9/endpointman/templates/freepbx/template_editor.html (modified) (2 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/template_manager.html (modified) (2 diffs)

modules/branches/2.9/endpointman/functions.inc.php

@@ -34 +34 @@
-}
-function endpointman_configpageinit($pagename) {
-
+, $amp_conf
-
-        $display = isset($_REQUEST['display'])?$_REQUEST['display']:null;
-
-
-
+
+
+
+
+
+
+
+
-            $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
-        }
+
-        $action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
-        $delete = isset($_REQUEST['epm_delete'])?$_REQUEST['epm_delete']:null;
-        $tech = isset($_REQUEST['tech_hardware'])?$_REQUEST['tech_hardware']:null;
-
-$display == "extensions"
+($display == "extensions") OR ($display == "devices")
-            global $endpoint;
-
-_SERVER["DOCUMENT_ROOT"
+amp_conf['AMPWEBROOT'
-            require($doc_root . "includes/functions.inc");
-
@@ -80 +86 @@
-                    $line = isset($_REQUEST['epm_line'])?$_REQUEST['epm_line']:null;
-                    $temp = isset($_REQUEST['epm_temps'])?$_REQUEST['epm_temps']:null;
-
+
+
+
+
+
-                    $reboot = isset($_REQUEST['epm_reboot'])?$_REQUEST['epm_reboot']:null;
-
@@ -165 +175 @@
-function endpointman_configpageload() {
-  global $currentcomponent, $endpoint, $db;
+
+        $display = isset($_REQUEST['display'])?$_REQUEST['display']:null;
-
-  // Init vars from $_REQUEST[]
@@ -236 +248 @@
-                $currentcomponent->addguielem($section, new gui_checkbox('epm_delete', $checked, 'Delete','Delete this Extension from Endpoint Manager'),9);
-                $currentcomponent->addguielem($section, new gui_textbox('epm_mac', $info['mac'], 'MAC Address', 'The MAC Address of the Phone Assigned to this Extension/Device. <br />(Leave Blank to Remove from Endpoint Manager)', '', 'Please enter a valid MAC Address', true, 17, false),9);
-extensions
-extensions
+'.$display.'
+'.$display.'
-                $currentcomponent->addguielem($section, new gui_selectbox('epm_line', $line_list, $line_info['line'], 'Line', 'The Line of this Extension/Device.', false, '', false),9);
-                $currentcomponent->addguielem($section, new gui_selectbox('epm_temps', $template_list, $info['template_id'], 'Template', 'The Template of this Phone.', false, '', false),9);
@@ -272 +284 @@
-
-                $currentcomponent->addguielem($section, new gui_textbox('epm_mac', $info['mac'], 'MAC Address', 'The MAC Address of the Phone Assigned to this Extension/Device. <br />(Leave Blank to Remove from Endpoint Manager)', '', 'Please enter a valid MAC Address', true, 17, false),9);
-extensions
-extensions
+'.$display.'
+'.$display.'
-                $currentcomponent->addguielem($section, new gui_selectbox('epm_line', $line_list, $line_info['line'], 'Line', 'The Line of this Extension/Device.', false, '', false),9);
-                $currentcomponent->addguielem($section, new gui_selectbox('epm_temps', $template_list, $info['template_id'], 'Template', 'The Template of this Phone.', false, '', false),9);

modules/branches/2.9/endpointman/includes/abstraction/freepbx.inc

@@ -9 +9 @@
-    public $db;
-    public $amp_conf;
+    public $global_cfg;
-
-    function __construct() {
-        //Pull in shit from FreePBX! (it's all about the globals baaaaabbbyyyyyyyy)
-, $global_cfg
+
-
-        //The only time dbh_asterisk is set is when we are inside the ARI Recording interface
@@ -114 +115 @@
-
-    function all_unused_registrations() {
-
+
+
+
+
+
-        $result =& $this->db->getAll($not_added,array(), DB_FETCHMODE_ASSOC);
-        return($result);

modules/branches/2.9/endpointman/includes/advanced.inc

@@ -159 +159 @@
-                $endpoint->error['manual_upload'] = "Invalid File Extension";
-            }
-            
-
-        } elseif(isset($_REQUEST['upload_master_xml'])) {
-            $extension = pathinfo($_FILES["xml"]["name"],PATHINFO_EXTENSION);
-            if($extension == "xml") {
-                if ($_FILES['xml']['error'] == UPLOAD_ERR_OK) {
-                    $tmp_name = $_FILES['xml']["tmp_name"];
-                    $name = $_FILES['xml']["name"];
-                    move_uploaded_file($tmp_name, "$uploads_dir/$name");
-                    $endpoint->tpl->assign("show_installer", 1);
-                    $endpoint->tpl->assign("package", 0);
-                    $endpoint->tpl->assign("type", "upload_master_xml");
-                    $endpoint->tpl->assign("xml", $name);
-                } else {
-                    $endpoint->error['manual_upload'] = $endpoint->file_upload_error_message($_FILES['xml']['error']);
-                }
-            } else {
-                $endpoint->error['manual_upload'] = "Invalid File Extension";
-            }
-        } elseif(isset($_REQUEST['upload_brand'])) {
-            $error = FALSE;
@@ -184 +165 @@
-            foreach($_FILES as $files) {
-                $extension = pathinfo($files["name"],PATHINFO_EXTENSION);
-($extension == "xml") OR ($extension == "tgz")
+$extension == "tgz"
-                    if ($files['error'] == UPLOAD_ERR_OK) {
-                        $tmp_name = $files["tmp_name"];
@@ -202 +183 @@
-            if(!$error){
-                $endpoint->tpl->assign("show_installer", 1);
-1
+0
-                $endpoint->tpl->assign("type", "upload_brand");
-                $endpoint->tpl->assign("xml", $files_list[0]);
-            } else {
-                $message = $error_message;
@@ -338 +318 @@
-            $message = "Deleted!";
-        }
-        if(1 == 0) {
-            $file = $_REQUEST['temp_file'];
-
-            $sql = "SELECT cfg_dir,directory,config_files FROM endpointman_product_list,endpointman_brand_list WHERE endpointman_product_list.brand = endpointman_brand_list.id AND endpointman_product_list.id = '". $_REQUEST['product_select'] ."'";
-            $row =& $endpoint->db->getRow($sql, array(), DB_FETCHMODE_ASSOC);
-
-            $file=PHONE_MODULES_PATH.'endpoint/'.$row['directory']."/".$row['cfg_dir']."/".$file;
-
-            if(isset($_REQUEST['config_text'])) {
-                if(isset($_REQUEST['button_save'])) {
-                    $wfh=fopen($file,'w');
-                    fwrite($wfh,$_REQUEST['config_text']);
-                    fclose($wfh);
-                }
-            }
-
-            if(!file_exists($file)) {
-                $fp = fopen($file, 'w');
-                fwrite($fp, '
-<!--<template_data>
-    <item>
-            <description>General Settings</description>
-            <type>group</type>
-    </item>
-    <item>
-            <variable>$sip_digit_timeout</variable>
-            <default_value>4</default_value>
-            <description>SIP Digit Timeout</description>
-            <type>input</type>
-    </item>
-</template_data>-->
-                            ');
-                fclose($fp);
-            }
-            $handle = fopen($file, "rb");
-            $contents = fread($handle, filesize($file));
-            fclose($handle);
-            $endpoint->tpl->assign("location", $file);
-            $endpoint->tpl->assign("config_data", $contents);
-        }
-        if(isset($_REQUEST['file'])) {
-            $sql = "SELECT cfg_dir,directory,config_files FROM endpointman_product_list,endpointman_brand_list WHERE endpointman_product_list.brand = endpointman_brand_list.id AND endpointman_product_list.id = '". $_REQUEST['product_select'] ."'";
@@ -407 +347 @@
-
-            $endpoint->tpl->assign("save_as_name_value", $config_files[$_REQUEST['file']]);
+
+            $contents = $endpoint->display_htmlspecialchars($contents);
+
-            $endpoint->tpl->assign("config_data", $contents);
-            $endpoint->tpl->assign("filename", $config_files[$_REQUEST['file']]);
@@ -438 +381 @@
-            }
-
+            $row['data'] = $endpoint->display_htmlspecialchars($row['data']);
+
-            $endpoint->tpl->assign("save_as_name_value", $row['name']);
-            $endpoint->tpl->assign("filename", $row['original_name']);
@@ -574 +519 @@
-                $_POST['disable_help'] = 0;
-            }
+            if((isset($_POST['allow_dupext'])) AND ($_POST['allow_dupext'] == "on")) {
+                $_POST['allow_dupext'] = 1;
+            } else {
+                $_POST['allow_dupext'] = 0;
+            }
+
+            $sql="UPDATE endpointman_global_vars SET value='" . $_POST['allow_dupext'] . "' WHERE var_name='show_all_registrations'";
+            $endpoint->db->query($sql);
-
-            $sql="UPDATE endpointman_global_vars SET value='" . $_POST['enable_ari'] . "' WHERE var_name='enable_ari'";
@@ -606 +559 @@
-        $endpoint->global_cfg =& $db->getAssoc("SELECT var_name, value FROM endpointman_global_vars");
-
+        if($endpoint->global_cfg['show_all_registrations']) {
+            $dupext_selected= "checked";
+        } else {
+            $dupext_selected = "";
+        }
-
-        if($endpoint->global_cfg['enable_ari']) {
@@ -628 +586 @@
-        }
-        $endpoint->tpl->assign("help_selected", $help_selected);
+        $endpoint->tpl->assign("dupext_selected", $dupext_selected);
-
-        $endpoint->tpl->assign("ari_selected", $ari_selected);

modules/branches/2.9/endpointman/includes/brand_model_manager.inc

@@ -44 +44 @@
-  }
-} elseif(isset($_REQUEST['button_check_for_updates'])) {
-brand_
+
-        $endpoint->tpl->assign("update_check", 1);
-

modules/branches/2.9/endpointman/includes/functions.inc

@@ -29 +29 @@
-        $this->global_cfg = $this->endpoint_data->get_stored_globals();
-
+        $this->endpoint_data->global_cfg = $this->global_cfg;
+
-        $this->global_cfg['disable_epm'] = FALSE;
-
@@ -44 +46 @@
-            $this->amp_conf = $amp_conf;
-        } else {
-"The Global Variable $amp_conf is empty or not set! Can't connect to the database."
+'The Global Variable $amp_conf is empty or not set! Can\'t connect to the database.'
-            $this->global_cfg['disable_epm'] = TRUE;
-        }
@@ -53 +55 @@
-        //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
@@ -108 +110 @@
-            $this->tpl->assign("disable_help", 1);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  
-
@@ -218 +234 @@
-        //Find the matching brand model to the oui
-        $oui_sql = "SELECT endpointman_brand_list.name, endpointman_brand_list.id FROM endpointman_oui_list, endpointman_brand_list WHERE oui LIKE '%". $oui ."%' AND endpointman_brand_list.id = endpointman_oui_list.brand AND endpointman_brand_list.installed = 1 LIMIT 1";
-&
-
-&
+
+
+
-        $brand_count = $res->numRows();
-
@@ -250 +266 @@
-    function delete_line($lineid,$allow_device_remove=FALSE) {
-        $sql = 'SELECT mac_id FROM endpointman_line_list WHERE luid = '.$lineid ;
-&
+
-        $row = $this->get_phone_info($mac_id);
-
-        $sql = 'SELECT COUNT(*) FROM endpointman_line_list WHERE mac_id = '.$mac_id;
-&
+
-        if($num_lines > 1) {
-            $sql = "DELETE FROM endpointman_line_list WHERE luid=".$lineid;
@@ -344 +360 @@
-        $sql = "SELECT id FROM endpointman_mac_list WHERE model > 0 AND id =".$mac_id;
-
-&
+
-        if($res->numRows()) {
-            //Returns Brand Name, Brand Directory, Model Name, Mac Address, Extension (FreePBX), Custom Configuration Template, Custom Configuration Data, Product Name, Product ID, Product Configuration Directory, Product Configuration Version, Product XML name,
-            $sql = "SELECT endpointman_mac_list.config_files_override, endpointman_mac_list.global_user_cfg_data, endpointman_model_list.id as model_id, endpointman_brand_list.id as brand_id, endpointman_brand_list.name, endpointman_brand_list.directory, endpointman_model_list.model, endpointman_mac_list.mac, endpointman_mac_list.template_id, endpointman_mac_list.global_custom_cfg_data, endpointman_product_list.long_name, endpointman_product_list.id as product_id, endpointman_product_list.cfg_dir, endpointman_product_list.cfg_ver, endpointman_model_list.template_data, endpointman_model_list.enabled FROM endpointman_line_list, endpointman_mac_list, endpointman_model_list, endpointman_brand_list, endpointman_product_list WHERE endpointman_mac_list.model = endpointman_model_list.id AND endpointman_brand_list.id = endpointman_model_list.brand AND endpointman_product_list.id = endpointman_model_list.product_id AND endpointman_mac_list.id = endpointman_line_list.mac_id AND endpointman_mac_list.id = ". $mac_id;
-
-&
+
-
-            if(!$phone_info) {
@@ -359 +375 @@
-                $sql = "SELECT name, global_custom_cfg_data, config_files_override FROM endpointman_template_list WHERE id = ".$phone_info['template_id'];
-
-&
+
-
-            }
-
-            $sql = "SELECT endpointman_line_list.*, sip.data as secret, devices.* FROM endpointman_line_list, sip, devices WHERE endpointman_line_list.ext = devices.id AND endpointman_line_list.ext = sip.id AND sip.keyword = 'secret' AND mac_id = ".$mac_id." ORDER BY endpointman_line_list.line ASC";
-&
+
-            foreach($lines_info as $line) {
-                $phone_info['line'][$line['line']] = $line;
@@ -373 +389 @@
-            $sql = "SELECT id, mac, ext FROM endpointman_mac_list WHERE id =".$mac_id;
-            //Phone is unknown, we need to display this to the end user so that they can make corrections
-&
+
-
-            $brand = $this->get_brand_from_mac($row['mac']);
@@ -390 +406 @@
-            $phone_info['mac'] = $row['mac'];
-            $sql = "SELECT endpointman_line_list.*, sip.data as secret, devices.* FROM endpointman_line_list, sip, devices WHERE endpointman_line_list.ext = devices.id AND endpointman_line_list.ext = sip.id AND sip.keyword = 'secret' AND mac_id = ".$mac_id;
-&
+
-            foreach($lines_info as $line) {
-                $phone_info['line'][$line['line']] = $line;
@@ -431 +447 @@
-        }
-
-&
+
-
-        $this->tpl->assign("template_editor_display", 1);
@@ -471 +487 @@
-        foreach($config_files_list as $files) {
-            $sql = "SELECT * FROM  endpointman_custom_configs WHERE product_id = '".$row['product_id']."' AND original_name = '".$files."'";
-&
+
-            if($alt_configs_list_count->numRows() > 0) {
-&
+
-                $alt_configs[$i]['name'] = $files;
-                $files = str_replace(".","_",$files);
@@ -498 +514 @@
-        $this->tpl->assign("alt", $alt);
-        if(!isset($_REQUEST['maxlines'])) {
-$row['max_lines']
+3
-        } else {
-            $maxlines = $_REQUEST['maxlines'];
@@ -832 +848 @@
-
-        //Load template data
-&
+
-
-        $cfg_data = unserialize($row['template_data']);
@@ -1015 +1031 @@
-                        foreach($temp as $list) {
-                            $sql = "SELECT original_name,data FROM endpointman_custom_configs WHERE id = ".$list;
-&
+
-                            if($res->numRows()) {
-                                $data = $this->db->getRow($sql, array(),DB_FETCHMODE_ASSOC);
@@ -1029 +1045 @@
-                        foreach($temp as $list) {
-                            $sql = "SELECT original_name,data FROM endpointman_custom_configs WHERE id = ".$list;
-&
+
-                            if($res->numRows()) {
-                                $data = $this->db->getRow($sql, array(),DB_FETCHMODE_ASSOC);
@@ -1196 +1212 @@
-    function firmware_update_check($id=NULL) {
-        $sql = "SELECT * FROM  endpointman_product_list WHERE  id ='". $id."'";
-&
+
-
-        $sql = "SELECT directory FROM  endpointman_brand_list WHERE id =". $row['brand'];
-&
+
-
-        //config drive unknown!
@@ -1226 +1242 @@
-    function firmware_local_check($id=NULL) {
-        $sql = "SELECT * FROM  endpointman_product_list WHERE hidden = 0 AND id ='". $id ."'";
-&
+
-
-        if($res->numRows()) {
-&
+
-
-            $sql = "SELECT directory FROM  endpointman_brand_list WHERE hidden = 0 AND id =". $row['brand'];
-&
+
-
-            //config drive unknown!
@@ -1280 +1296 @@
-    function install_firmware($product_id) {
-        $sql = 'SELECT endpointman_product_list.*, endpointman_brand_list.directory FROM endpointman_product_list, endpointman_brand_list WHERE endpointman_product_list.brand = endpointman_brand_list.id AND endpointman_product_list.id = '.$product_id;
-&
+
-        $temp = $this->xml2array(PHONE_MODULES_PATH."endpoint/".$row['directory']."/".$row['cfg_dir']."/family_data.xml");
-        if($temp['data']['firmware_ver'] > $row['firmware_vers']) {
@@ -1350 +1366 @@
-        if(!isset($directory)) {
-            $destination_file = PHONE_MODULES_PATH.'master.xml';
-     
+            
-        } else {
-            if(!file_exists(PHONE_MODULES_PATH.'/'.$directory)) {
-
-
+,TRUE
+ 
-            $destination_file = PHONE_MODULES_PATH.'/'.$directory.'/brand_data.xml';
-        }
-        $temp_file = PHONE_MODULES_PATH.'temp/'.$directory.'.xml';
+        @mkdir(dirname($temp_file));
-        if($this->download_xml_file($location, $temp_file)) {
-            $handle = fopen($temp_file, "rb");
@@ -1382 +1399 @@
-     * @return array An array of all the brands/products/models and information about what's  enabled, installed or otherwise
-     */
-brand_
+
-        $master_result = $this->download_xml(UPDATE_PATH . "master.xml");
-
@@ -1396 +1413 @@
-
-        $sql = "SELECT value FROM endpointman_global_vars WHERE var_name LIKE 'endpoint_vers'";
-&
+
-
-        if(($data == "") OR ($data <= $endpoint_last_mod)) {
@@ -1421 +1438 @@
-        //Assume that if we can't connect and find the master.xml file then why should we try to find every other file.
-        if($master_result) {
-&
+
-
-            foreach($out as $data) {
-
-
-
-
+
+
+
+
+
+
+
+
-                }
-
@@ -1498 +1519 @@
-     */
-    function download_brand($id) {
-&
+
-        echo "Downloading Brand XML.....";
-        $result = $this->download_xml(UPDATE_PATH .$row[0]['directory']. "/".$row[0]['directory'].".xml","endpoint/".$row[0]['directory']);
+
-        if($result) {
-            echo "Done!<br/>";
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-            echo "<br/>Error Connecting to the Package Repository. Module not installed. Please Try again later.<br/>You Can Also Manually Update The Repository By Downloading Files here: <a href='http://www.provisioner.net/releases3' target='_blank'>Release Repo</a><br />Then Use Manual Upload in Advanced Settings";
@@ -1513 +1555 @@
-     * This will install or updated a brand package (which is the same thing to this)
-     * Still needs way to determine when models move...perhaps another function?
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                            }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                            }
-                        }
-final_data = array()
-final_data['data'] = $new_data
-final_data['ari'] = $new_ari
-$final_data = serialize($final_data);
-$sql = "UPDATE endpointman_mac_list SET  global_custom_cfg_data =  '".$final_data."' WHERE  id =".$data['id']
-$this->db->query($sql);
-echo "Done!<br/>
-}
-
-$global_user_cfg_data = unserialize($data['global_user_cfg_data']);
-$old_check = FALSE;
-if(is_array($global_user_cfg_data)) {
-foreach($global_user_cfg_data as $stuff)
-if(is_array($stuff)) {
-if(array_key_exists('value', $stuff)) {
-$old_check = TRUE;
-break;
-} else {
-break;
+old_data = NULL
+sql = 'SELECT id, global_custom_cfg_data FROM endpointman_template_list WHERE model_id = '.$model_final_id
+old_data = $this->db->getAll($sql, array(), DB_FETCHMODE_ASSOC)
+foreach($old_data as $data) {
+    $global_custom_cfg_data = unserialize($data['global_custom_cfg_data'])
+    if((is_array($global_custom_cfg_data)) AND (!array_key_exists('data', $global_custom_cfg_data))) {
+        echo "Old Data Detected! Migrating......
+            $new_data = array();
+
+            foreach($global_custom_cfg_data as $key => $old_keys) {
+                if(array_key_exists('value', $old_keys)) {
+                    $new_data[$key] = $old_keys['value'];
+            } else
+            $breaks = explode("_", $key);
+        $new_data["loop|".$key] = $old_keys[$breaks[2]];
+}
+if(array_key_exists('ari', $old_keys)) {
+        $new_ari[$key] = 1;
+}
-                                }
-
-
+
+
+
+
+
+
+
-                            }
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                        }
-                        $final_data = serialize($new_data);
-                        $sql = "UPDATE endpointman_mac_list SET  global_user_cfg_data =  '".$final_data."' WHERE  id =".$data['id'];
-                        $this->db->query($sql);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**
@@ -1704 +1774 @@
-     */
-    function remove_brand($id=NULL) {
-&
+
-        $this->rmrf(PHONE_MODULES_PATH."endpoint/".$brand_dir);
-
@@ -1731 +1801 @@
-            $sql = "SELECT * FROM  endpointman_model_list WHERE id='".$model."'";
-
-&
+
-
-            $sql = "SELECT * FROM  endpointman_product_list WHERE id='".$model_row['product_id']."'";
-
-&
+
-
-            $sql = "SELECT * FROM  endpointman_brand_list WHERE id=".$model_row['brand'];
-
-
-&
+
-
-            $family_line_xml = $this->xml2array(PHONE_MODULES_PATH.'/endpoint/'.$brand_row['directory'].'/'.$product_row['cfg_dir'].'/family_data.xml');
@@ -2246 +2316 @@
-                $oui_sql = "SELECT endpointman_brand_list.name, endpointman_brand_list.id FROM endpointman_oui_list, endpointman_brand_list WHERE oui LIKE '%". $oui ."%' AND endpointman_brand_list.id = endpointman_oui_list.brand AND endpointman_brand_list.installed = 1 LIMIT 1";
-
-&
+
-                
-&
+
-                $brand_count = $res->numRows();
-                
@@ -2259 +2329 @@
-                //Find out if endpoint has already been configured for this mac address
-                $epm_sql = "SELECT * FROM endpointman_mac_list WHERE mac LIKE  '%". $mac_strip ."%'";
-&
-
-&
+
+
+
-                $epm_count = $res->numRows();
-
@@ -2289 +2359 @@
-        $count = $this->db->getOne($sql);
-
-        //TODO: FIX this
-        /**
-        if($count == 0) {
-           $this->sync_model($model);
-           $sql = "SELECT max_lines FROM endpointman_model_list WHERE id = '". $model."'";
-           $count = $this->db->getOne($sql);
-           if($count == 0) {
-               die("Can't Reset Lines to more than 0! ['areaAvailble']");
-           }
-        }
-         * 
-         */
-        for($z=0;$z<$count;$z++) {
-            $result[$z]['id'] = $z + 1;
@@ -2333 +2391 @@
-        
-        if ((!isset($oui)) && (!isset($brand)) && (!isset($model))) {
-&
+
-        }elseif((isset($brand)) && ($brand !=0)) {
-&
+
-        }elseif((isset($product)) && ($product !=0)) {
-&
-
-&
+
+
+
-        }
-
@@ -2383 +2441 @@
-
-            $sql_l = "SELECT line, mac_id FROM `endpointman_line_list` WHERE luid = ".$lineid;
-&
+
-
-            $sql_lu = "SELECT line FROM endpointman_line_list WHERE mac_id = ".$line['mac_id'];
@@ -2394 +2452 @@
-
-        $max_lines = $this->db->getOne($sql);
-&
+
-
-        for($i = 1; $i <= $max_lines; $i++) {    
@@ -2422 +2480 @@
-
-        if(isset($line_id)) {
-&
-&
-
-&
+
+
+
+
-            $line_data = NULL;
-        }
@@ -2452 +2510 @@
-     */
-    function brands_available ($selected = NULL,$show_blank=TRUE) {
-&
+
-        if($show_blank) {
-            $temp[0]['value'] = "";
@@ -2477 +2535 @@
-        $sql="SELECT id FROM  endpointman_product_list WHERE endpointman_product_list.id ='".$product_id."'";
-
-&
+
-
-        $sql="SELECT * FROM  endpointman_template_list WHERE  product_id = '".$id."'";
-
-&
+
-        foreach($data as $row) {
-            $temp[$i]['value'] = $row['id'];
@@ -2503 +2561 @@
-    function listTZ($selected) {
-        $sql="SELECT tz FROM endpointman_time_zones";
-&
+
-        $i = 0;
-        foreach($data as $row) {

modules/branches/2.9/endpointman/includes/installer.php

@@ -73 +73 @@
-            break;
-        case "upload_brand":
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-            break;

modules/branches/2.9/endpointman/includes/popup.php

@@ -45 +45 @@
-                $endpoint->tpl->assign("save_as_name_value", $row['name']);
-                $endpoint->tpl->assign("filename", $row['original_name']);
+                $row['data'] = $endpoint->display_htmlspecialchars($row['data']);
-                $endpoint->tpl->assign("config_data", $row['data']);
-            } else {
@@ -62 +63 @@
-                $contents = fread($handle, filesize($file));
-                fclose($handle);
+                $contents = $endpoint->display_htmlspecialchars($contents);
-                $endpoint->tpl->assign("config_data", $contents);
-            }
@@ -76 +78 @@
-                $endpoint->tpl->assign("save_as_name_value", $row['name']);
-                $endpoint->tpl->assign("filename", $row['original_name']);
+                $row['data'] = $endpoint->display_htmlspecialchars($row['data']);
-                $endpoint->tpl->assign("config_data", $row['data']);
-            } else {
@@ -93 +96 @@
-                $contents = fread($handle, filesize($file));
-                fclose($handle);
+                $contents = $endpoint->display_htmlspecialchars($contents);
-                $endpoint->tpl->assign("config_data", $contents);
-            }

modules/branches/2.9/endpointman/install.php

@@ -92 +92 @@
-}
-
-4
+6
-
-if(ep_table_exists("endpointman_global_vars")) {
@@ -900 +900 @@
-    }
-
+    if($ver <= "2.9.0.4") {
+        $sql = 'ALTER TABLE  `endpointman_brand_list` ADD  `local` INT( 1 ) NOT NULL DEFAULT  \'0\' AFTER  `cfg_ver`';
+        $db->query($sql);
+    }
+
+    if($ver <= "2.9.0.5") {
+        $sql = "INSERT INTO  `asterisk`.`endpointman_global_vars` (`idnum` ,`var_name` ,`value`)VALUES (NULL ,  'show_all_registrations',  '0')";
+        $db->query($sql);
+    }
+
-}
-
@@ -912 +922 @@
-                  `cfg_ver` varchar(255) NOT NULL,
-                  `installed` int(1) NOT NULL DEFAULT '0',
+                    `local` int(1) NOT NULL DEFAULT '0',
-                  `hidden` int(1) NOT NULL DEFAULT '0',
-                  PRIMARY KEY (`id`)
@@ -963 +974 @@
-            (15, 'disable_htaccess', ''),
-            (16, 'endpoint_vers', '0'),
-
+
+
-    $db->query($sql);
-

modules/branches/2.9/endpointman/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>PBX End Point Manager</name>
-5
+7
-  <type>tool</type>
-  <category>End Point Manager</category>
@@ -16 +16 @@
-   <description>PBX End Point Manager supports automated deployment of multiple manufacturers IP telephones.</description>
-   <changelog>
+                *2.9.0.3RC6* Fixed Device & User Mode (http://www.freepbx.org/forum/freepbx/users/device-user-mode), #4792
-    *2.9.0.0* bumped for 2.9, removed errors in module.xml causing erors for online xml parsing
-                *2.3.2* Various Bug Fixes
@@ -22 +23 @@
-        </changelog>
-  <info>http://projects.colsolgrp.net/projects/show/endpointman</info>
-5
+2
-
-ecd0e63c2947a7b1e6eaa678a6e09d76
+f4aed8221b1398a65438454786ce8089
-</module>

modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_iedl.html

@@ -5 +5 @@
-  <br>
-  <a href="{$exporter_address}"><?=_('Export CSV')?></a></p>
-{$web_vars}
+?type=tool
-  <label>
-  <input type="hidden" name="MAX_FILE_SIZE" value="30000" />

modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_manual_upload.html

@@ -17 +17 @@
-  freepbx_modal_hide('moduleBox');
-  if (goback) {
-display=epm_advanced&
+amp;display=epm_advanced&
-  }
-}
@@ -35 +35 @@
-</form>
-    <br /><br />
-{if condition="1 == 0"}
-<form action="" method="post" enctype="multipart/form-data" name="form1">
-    <label>Master List File (.xml):
-        <input type="file" name="xml" id="fileField">
-    </label> Local Date Last Modified: {$master_ver}
-        <br/>
-    <input type="submit" name="upload_master_xml" value="<?=_('Upload')?>">
-</form>
-    <br /><br />
-{/if}
-<form action="" method="post" enctype="multipart/form-data" name="form1">
-    <label>Brand XML File (.xml):
-        <input type="file" name="xml" id="fileField">
-    </label>
-    <br />
-    <label>Brand Package (.tgz):
-        <input type="file" name="package" id="fileField">
-    </label>
-    <br
+<br /><font style="font-size: small">Note: The Brand XML File is no longer needed as it is contained within the Brand Package.<br /><br />Learn How to Create your own brand package here: <a target="_blank" href="http://www.provisioner.net/adding_new_phones">http://www.provisioner.net/adding_new_phones</a></font><br 
-    <input type="submit" name="upload_brand" value="<?=_('Upload')?>">
-</form>

modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_oui.html

@@ -12 +12 @@
-  {loop name="oui_list_custom"}
-  </tr><tr>
-{$web_vars}&display=epm_advanced&subpage=oui_manager&delete=yes&
+?type=tool&amp;display=epm_advanced&amp;subpage=oui_manager&amp;delete=yes&amp;
-  </tr><tr>
-  {/loop}
@@ -19 +19 @@
-    <td colspan="2" align='center'><h3><?=_('Add Custom')?> OUI</h3></td>
-</form>
-{$web_vars}&display=epm_advanced&
+?type=tool&amp;display=epm_advanced&amp;
-  </tr><tr>
-  <td align='center'><input name="oui" type="text"  maxlength="6"/></td><td align='center'> <select name="rb_brand">

modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_poce.html

@@ -2 +2 @@
-    {include="message_box"}
-{/if}
-{$web_vars}&display=epm_advanced&
+?type=tool&display=epm_advanced&
-  <?=_("Select Product")?>
-  <select name="product_select" id="product_select">
@@ -15 +15 @@
-</center>
-<hr width="30%">
-{$web_vars}&display=epm_advanced&subpage=poce&product_select={$product_selected}&
+?type=tool&amp;display=epm_advanced&amp;subpage=poce&amp;product_select={$product_selected}&amp;
-{if condition="isset($options)"}  
-{$options}
@@ -35 +35 @@
-  <u><?=_("Local File Configs")?></u><br />
-  {loop name="file_list"}
-{$web_vars}&display=epm_advanced&subpage=poce&product_select={$product_selected}&
+?type=tool&amp;display=epm_advanced&amp;subpage=poce&amp;product_select={$product_selected}&amp;
-  {/loop}
-  <hr>
@@ -41 +41 @@
-  {if condition="isset($sql_file_list)"}
-    {loop name="sql_file_list"}
-{$web_vars}&display=epm_advanced&subpage=poce&product_select={$product_selected}&sql={$value.value}">{$value.text}</a> [{$value.ref}] <a href="{$web_vars}&display=epm_advanced&subpage=poce&product_select={$product_selected}&sql={$value.value}&
+?type=tool&display=epm_advanced&subpage=poce&product_select={$product_selected}&sql={$value.value}">{$value.text}</a> [{$value.ref}] <a href="config.php?type=tool&amp;display=epm_advanced&amp;subpage=poce&product_select={$product_selected}&amp;sql={$value.value}&amp;
-    <br />
-    {/loop}
@@ -59 +59 @@
-  <label>
-    <input type="text" name="save_as_name" id="save_as_name" value="{if condition="isset($save_as_name_value)"}{$save_as_name_value}{/if}">
-{$web_vars}&display=epm_advanced&subpage=poce&sendid={$sendid}&filename={$filename}&product_select={$product_selected}&
+?type=tool&amp;display=epm_advanced&amp;subpage=poce&sendid={$sendid}&amp;filename={$filename}&amp;product_select={$product_selected}&amp;
-        </form><div style="font-size: 13px">(Note: 'Save' Saves to the local hard drive, if the phone module is ever updated this file will be over-written, 'Save As' Saves to the database and is not over-written on updates)</div></td>
-    

modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_settings.html

@@ -2 +2 @@
-    {include="message_box"}
-{/if}
-{$web_vars}&display=epm_advanced&
+?type=tool&display=epm_advanced&
-<table width='90%' align='center'>
-<tr>
-<td width='50%' align='right'><?=_("IP address of phone server")?>:</td>
-<td width='50%' align='left'><input type='text' id='srvip' name='srvip' value='{$srvip}'><a href='#' onclick="document.getElementById('srvip').value = '{$ip}'; "><?=_("Determine for me")?></a></td>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<td width='50%' align='right'><?=_("Time Zone")?> (<?=_('like')?> USA-5)</td>
-<td width='50%' align='left'><select name="tz" id="tz">
@@ -16 +32 @@
-
-</td>
-</tr>
-<!-- Future
-<tr>
-<td width='50%' align='right'><?=_("Language")?> (<?=_('like')?> EN_US)</td>
-<td width='50%' align='left'><select name="tz" id="tz">
-  {loop name="list_tz"}
-  <option value="{$value.value}" {if condition="$value.selected == 1"}selected='selected'{/if}>{$value.text}</option>
-  {/loop}
-</select>
-</td>
-</tr>
--->
-<tr>
-  <td align='right'><?=_("Default Final Configuration Directory")?></td>
-  <td align='left'><label>
-    <input type="text" name="config_loc" value="{$config_location}">
-  </label></td>
-</tr>
-<tr>
@@ -71 +70 @@
-</tr>
-<tr>
+  <td align='right'><?=_("Allow Duplicate Extensions")?></td>
+  <td align='left'><label>
+    <input type=checkbox name="allow_dupext" {$dupext_selected}>
+  </label></td>
+</tr>
+<tr>
-<td colspan='2' align='center'><input type='Submit' name='button_update_globals' value='<?=_('Update Globals')?>'></td>
-</tr>

modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_sh_manager.html

@@ -21 +21 @@
-<table width="100%" class="brand" border="0" cellspacing="0" cellpadding="0">
-  <tr>
-<td colspan="2">{$value.name}<form action='config.php{$web_vars}&display=epm_advanced&
+  <td colspan="2">{$value.name}<form action='config.php?type=tool&amp;display=epm_advanced&amp;
-  </tr>
-  <tr>
@@ -28 +28 @@
-  <table width="100%" class="product" border="0" cellspacing="0" cellpadding="0">
-      <tr>
-<td colspan="2">{$value.long_name}<form action='config.php{$web_vars}&display=epm_advanced&
+  <td colspan="2">{$value.long_name}<form action='config.php?type=tool&amp;display=epm_advanced&amp;
-      </tr>
-      <tr>
@@ -35 +35 @@
-    <table width="100%" class="model" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-{$web_vars}&display=epm_advanced&
+?type=tool&amp;display=epm_advanced&amp;
-          </tr>
-        </table>{/loop}</td>

modules/branches/2.9/endpointman/templates/freepbx/advanced_subheader.html

@@ -1 +1 @@
-<table align='center' width='90%'>
-<tr>
-{$web_vars}&display=epm_advanced&
-{$web_vars}&display=epm_advanced&
-{$web_vars}&display=epm_advanced&
+config.php?type=tool&amp;display=epm_advanced&amp;
+config.php?type=tool&amp;display=epm_advanced&amp;
+config.php?type=tool&amp;display=epm_advanced&amp;
-</tr>
-<tr>
-{$web_vars}&display=epm_advanced&
-{$web_vars}&display=epm_advanced&
-{$web_vars}&display=epm_advanced&
+config.php?type=tool&amp;display=epm_advanced&amp;
+config.php?type=tool&amp;display=epm_advanced&amp;
+config.php?type=tool&amp;display=epm_advanced&amp;
-</tr>
-</table>

modules/branches/2.9/endpointman/templates/freepbx/brand_model_manager.html

@@ -29 +29 @@
-</script>
-<center>
-{$web_var}&
+?type=tool&amp;
-  <input type="submit" name="button_check_for_updates" onclick="check();" value="<?=_('Check for Updates')?>">
-</form>
@@ -160 +160 @@
-        <table width="100%" class="brand" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-{$web_var}&
+?type=tool&amp;
-            </tr>
-            <tr>
@@ -167 +167 @@
-                    <table width="100%" class="product" border="0" cellspacing="0" cellpadding="0">
-                        <tr>
-{$web_var}&
+?type=tool&amp;
-                        </tr>
-                        <tr>
@@ -174 +174 @@
-                                <table width="100%" class="model" border="0" cellspacing="0" cellpadding="0">
-                                    <tr>
-{$web_var}&
+?type=tool&amp;
-                                    </tr>
-                                </table>{/loop}</td>

modules/branches/2.9/endpointman/templates/freepbx/devices_manager.html

@@ -60 +60 @@
-<center>
-    {if condition="$no_add == FALSE"}
-
+amp;
-        <label><?=_('Search for new devices in netmask')?>
-            <input name="netmask" type="text" value="{$srvip}/24">
@@ -84 +84 @@
-        <td align='center'></td>
-    </tr>
-
+amp;
-
-  {if condition="$no_add == FALSE"}
@@ -304 +304 @@
-        <td align='center'><h3>Delete</h3></td>
-    </tr>
-
+amp;
-  {loop name="list"}
-        <tr class="headerRow">

modules/branches/2.9/endpointman/templates/freepbx/global_footer.html

@@ -1 @@
-
+!--<
-<h6 align='center'>The Endpoint Configuration Manager is currently maintained by <a target="_blank" href=http://www.andrewsnagy.com/>Andrew Nagy</a>
-<br/><?=_("The Endpoint Configuration Manager was originally written by")?> <a target="_blank" href=http://www.mymcs.us>Ed Macri</a>, <a target="_blank" href=http://www.cohutta.com> John Mullinix.</a> and <a target="_blank" href=http://www.colsolgrp.com>Tony Shiffer</a>
@@ -5 +5 @@
-<br> <?=_("The project is maintained at")?> 
-<a target="_blank" href="http://projects.colsolgrp.net/projects/show/endpointman"> CSG Software Projects.</a>
-
-
+

modules/branches/2.9/endpointman/templates/freepbx/global_header.html

@@ -2 +2 @@
-    <head>
-        <title>PBX Endpoint Configuration Manager</title>
+        {if condition="isset($silent_mode)"}
+        <script type="text/javascript" src="common/libfreepbx.javascripts.js" language="javascript"></script>
-        <script type="text/javascript" src="assets/endpointman/js/jquery.tools.min.js"></script>
-{if condition="isset($silent_mode)"}
--1.3.2.min
+<script type="text/javascript" src="assets/endpointman/js/jquery.easing.1.3.js"></script>
+.coda-slider-2.0
-        <link href="common/mainstyle.css" rel="stylesheet" type="text/css" />
+        {/if}
+        {if condition="$amp_ver < 2.9"}
+        <script type="text/javascript" src="assets/endpointman/js/jquery.tools.min.js"></script>
+        <script type="text/javascript" src="assets/endpointman/js/jquery.easing.1.3.js"></script>
+        <script type="text/javascript" src="assets/endpointman/js/jquery.coda-slider-2.0.js"></script>
-        {/if}
-        <style>
@@ -40 +47 @@
-        <link href="assets/endpointman/theme/coda-slider-2.0a.css" media="screen, projection" rel="stylesheet" type="text/css" />
-
-
-        <!-- Begin JavaScript -->
-        <script type="text/javascript" src="assets/endpointman/js/jquery.easing.1.3.js"></script>
-        <script type="text/javascript" src="assets/endpointman/js/jquery.coda-slider-2.0.js"></script>
-        <script type="text/javascript">
-            $().ready(function() {
@@ -51 +54 @@
-            });
-        </script>
-        <!-- End JavaScript -->
-  {/if}
-  {if condition="isset($amp_conf_serial)"}

modules/branches/2.9/endpointman/templates/freepbx/message_box.html

@@ -1 @@
-?=debug_print_backtrace(
+u>Backtrace</u><br /><?=debug_print_backtrace();?><br /><u>Extended Backtrace</u><br /><?=var_dump(debug_backtrace());?><br /><u>Last Error</u><br /><?=print_r(error_get_last()

modules/branches/2.9/endpointman/templates/freepbx/template_editor.html

@@ -37 +37 @@
-        <strong><?=_('Clone of Model')?>:</strong> {$model}<br />
-        <strong><?=_('Display')?></strong>
+        {if condition="isset($silent_mode)"}
+        <select name="area_list" onchange="window.location.href='config.php?display=epm_config&quietmode=1&handler=file&file=popup.html.php&module=endpointman&pop_type=edit_template&edit_id={$hidden_id}&model_list=126&template_list=0&rand='+ new Date().getTime() + '&maxlines='+this.options[this.selectedIndex].value">
+        {else}
-        <select name="area_list" onchange="window.location.href='config.php?type=tool&edit_template=true&display=epm_templates&custom='+ document.getElementById('custom').value +'&id='+ document.getElementById('id').value +'&maxlines='+this.options[this.selectedIndex].value">
+        {/if}
-        {loop name="area_ava"}
-        <option value="{$value.value}" {if condition="!empty($value.selected)"}selected{/if}>{$value.text}</option>
@@ -58 +62 @@
-        </select><br/>
-        <strong><?=_('Display')?></strong>
+        {if condition="isset($silent_mode)"}
+        <select name="area_list" onchange="window.location.href='config.php?display=epm_config&quietmode=1&handler=file&file=popup.html.php&module=endpointman&pop_type=edit_template&edit_id={$hidden_id}&model_list=126&template_list=0&rand='+ new Date().getTime() + '&maxlines='+this.options[this.selectedIndex].value">
+        {else}
-        <select name="area_list" onchange="window.location.href='config.php?type=tool&edit_template=true&display=epm_templates&custom='+ document.getElementById('custom').value +'&id='+ document.getElementById('id').value +'&maxlines='+this.options[this.selectedIndex].value">
+        {/if}
-        {loop name="area_ava"}
-        <option value="{$value.value}" {if condition="!empty($value.selected)"}selected{/if}>{$value.text}</option>

modules/branches/2.9/endpointman/templates/freepbx/template_manager.html

@@ -5 +5 @@
-{if condition="$no_add == FALSE"}
-<center>
-display=epm_templates&
+type=tool&amp;display=epm_templates&amp;
-    <?=_('Template Name')?>:
-    <label>
@@ -42 +42 @@
-    <td>{$value.model_clone}</td>
-
-edit_template=true&display=epm_templates&custom={$value.custom}&
+amp;edit_template=true&amp;display=epm_templates&amp;custom={$value.custom}&amp;
-  <td align='center' width='5%'>{if condition="$value.custom == 0"}
-delete_template=true&display=epm_templates&
+amp;delete_template=true&amp;display=epm_templates&amp;
-  </tr>
-{/loop}