Changeset 10797

Timestamp:

01/06/11 04:42:13 (2 years ago)

Author:

tm1000

Message:

Fixed everything on the Endpoint Manager Plugin for the Extensions Page. Cleaned up the EPM Directory. Added a bunch of Reboot Options. Version is now 2.9.0.3RC1.

Gettin' Close! :-)

Files:

• modules/branches/2.9/endpointman/functions.inc.php (modified) (6 diffs)
• modules/branches/2.9/endpointman/includes/advanced.inc (modified) (4 diffs)
• modules/branches/2.9/endpointman/includes/ajax_select.php (modified) (5 diffs)
• modules/branches/2.9/endpointman/includes/devices_manager.inc (modified) (2 diffs)
• modules/branches/2.9/endpointman/includes/functions.inc (modified) (21 diffs)
• modules/branches/2.9/endpointman/includes/template_manager.inc (modified) (1 diff)
• modules/branches/2.9/endpointman/install.php (modified) (7 diffs)
• modules/branches/2.9/endpointman/module.xml (modified) (2 diffs)
• modules/branches/2.9/endpointman/templates/compiled (deleted)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_settings.html (modified) (1 diff)
• modules/branches/2.9/endpointman/templates/freepbx/devices_manager.html (modified) (2 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/global_header.html (modified) (1 diff)
• modules/branches/2.9/endpointman/templates/freepbx/template_editor.html (modified) (3 diffs)
• modules/branches/2.9/endpointman/templates/javascript (deleted)
• modules/branches/2.9/endpointman/templates/stylesheets (deleted)
• modules/branches/2.9/endpointman/uninstall.php (modified) (1 diff)

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

@@ -37 +37 @@
-
-        $display = isset($_REQUEST['display'])?$_REQUEST['display']:null;
-
+
+
+
+
+
-            global $endpoint;
-
@@ -46 +50 @@
-            ini_set('display_errors', 0);
-
+            if($action == "edit") {
+
+                if(isset($delete)) {
+                    $sql = "SELECT mac_id,line FROM endpointman_line_list WHERE ext = ". $extdisplay;
+                    $macid = $endpoint->db->getRow($sql,array(),DB_FETCHMODE_ASSOC);
+
+                    if($macid) {
+                        $sql = "SELECT * FROM endpointman_line_list WHERE mac_id = ".$macid['mac_id'];
+                        $list = $endpoint->db->getAll($sql,array(),DB_FETCHMODE_ASSOC);
+
+                        $count = count($list);
+
+                        if($count == 1) {
+                            $sql = "DELETE FROM endpointman_mac_list WHERE id = ".$macid['mac_id'];
+                            $endpoint->db->query($sql);
+                        }
+
+                        $sql = "DELETE FROM endpointman_line_list WHERE mac_id = ".$macid['mac_id']." AND line = ".$macid['line'];
+                        $endpoint->db->query($sql);
+                    }
+                }
+
+                $mac = isset($_REQUEST['epm_mac'])?$_REQUEST['epm_mac']:null;
+
+                if(!empty($mac)) {
+                    //Mac is set
+                    $brand = isset($_REQUEST['epm_brand'])?$_REQUEST['epm_brand']:null;
+                    $model = isset($_REQUEST['epm_model'])?$_REQUEST['epm_model']:null;
+                    $line = isset($_REQUEST['epm_line'])?$_REQUEST['epm_line']:null;
+                    $temp = isset($_REQUEST['epm_temps'])?$_REQUEST['epm_temps']:null;
+                    $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
+                    $name = isset($_REQUEST['name'])?$_REQUEST['name']:null;
+                    $reboot = isset($_REQUEST['epm_reboot'])?$_REQUEST['epm_reboot']:null;
+
+                    if($endpoint->mac_check_clean($mac)) {
+                        $sql = "SELECT id FROM endpointman_mac_list WHERE mac = '".$endpoint->mac_check_clean($mac)."'";
+                        $macid = $endpoint->db->getOne($sql);
+                        if($macid) {
+                            //In Database already
+                            $sql = 'SELECT * FROM endpointman_line_list WHERE ext = '.$extdisplay.' AND mac_id = '. $macid;
+                            $lines_list =& $endpoint->db->getRow($sql,array(),DB_FETCHMODE_ASSOC);
+                            if(($lines_list) AND (isset($model)) AND (isset($line)) AND (!isset($delete)) AND (isset($temp))) {
+                                //Modifying line already in the database
+                                $sql = "UPDATE endpointman_line_list SET line = ".$lines_list['line'].", description =  '".$name."' WHERE  luid =" . $lines_list['luid'];
+                                $endpoint->db->query($sql);
+
+                                $sql = "UPDATE  endpointman_mac_list SET model = ".$model.", template_id =  ".$temp." WHERE id = ".$macid;
+                                $endpoint->db->query($sql);
+
+                                $row = $endpoint->get_phone_info($macid);
+                                if(isset($reboot)) {
+                                    $endpoint->prepare_configs($row);
+                                } else {
+                                    $endpoint->prepare_configs($row,FALSE);
+                                }
+                            } elseif((isset($model)) AND (!isset($delete)) AND (isset($line)) AND (isset($temp))) {
+                                //Add line to the database
+                                $sql = "INSERT INTO endpointman_line_list (mac_id, line, ext, description) VALUES (".$macid.",  ".$line.",  ".$extdisplay.",  '".$name."')";
+                                $endpoint->db->query($sql);
+
+                                $sql = "UPDATE  endpointman_mac_list SET model = ".$model.", template_id =  ".$temp." WHERE id = ".$macid;
+                                $endpoint->db->query($sql);
+                            }
+                        } elseif(!isset($delete)) {
+                            //Add Extension/Phone to database
+                            $mac = $endpoint->mac_check_clean($mac);
+                            $sql = "INSERT INTO `endpointman_mac_list` (`mac`, `model`, `template_id`) VALUES ('".$mac."', '".$model."', '".$temp."')";
+                            $endpoint->db->query($sql);
+
+                            $sql = 'SELECT last_insert_id()';
+                            $ext_id =& $endpoint->db->getOne($sql);
+
+                            if(!isset($line)) {
+                                $line = 1;
+                            }
+
+                            $sql = "INSERT INTO `endpointman_line_list` (`mac_id`, `ext`, `line`, `description`) VALUES ('".$ext_id."', '".$extdisplay."', '".$line."', '".$name."')";
+                            $endpoint->db->query($sql);
+                        }
+                    }
+                } else {
+                    //Mac not set so delete
+                    $sql = "SELECT mac_id,line FROM endpointman_line_list WHERE ext = ". $extdisplay;
+                    $macid = $endpoint->db->getRow($sql,array(),DB_FETCHMODE_ASSOC);
+
+                    if($macid) {
+                        $sql = "SELECT * FROM endpointman_line_list WHERE mac_id = ".$macid['mac_id'];
+                        $list = $endpoint->db->getAll($sql,array(),DB_FETCHMODE_ASSOC);
+                        $count = count($list);
+
+                        if($count == 1) {
+                            $sql = "DELETE FROM endpointman_mac_list WHERE id = ".$macid['mac_id'];
+                            $endpoint->db->query($sql);
+                        }
+
+                        $sql = "DELETE FROM endpointman_line_list WHERE mac_id = ".$macid['mac_id']." AND line = ".$macid['line'];
+                        $endpoint->db->query($sql);
+                    }
+                }
+            }
-            endpointman_applyhooks();
-        }
@@ -66 +170 @@
-  // Don't display this stuff it it's on a 'This xtn has been deleted' page.
-  if ($action != 'del') {
-
-
-
-
-
-
-
+
+
-                    $.ajaxSetup({ cache: false });
-
@@ -88 +187 @@
-                    })
-                ";
-
+
+
+
+
+
+
+
-
-                $js = "
@@ -112 +217 @@
-                $currentcomponent->addjsfunc('model_change(value,macid)', $js);
-
-
-
+
-                
-                $brand_list = $endpoint->brands_available($info['brand_id'], true);
@@ -126 +230 @@
-                }
-
-
+
+
+
+
-                $currentcomponent->addguielem($section, new gui_selectbox('epm_brand', $brand_list, $info['brand_id'], 'Brand', 'The Brand of this Phone.', false, 'frm_extensions_brand_change(this.options[this.selectedIndex].value)', false),9);
-                $currentcomponent->addguielem($section, new gui_selectbox('epm_model', $model_list, $info['model_id'], 'Model', 'The Model of this Phone.', false, 'frm_extensions_model_change(this.options[this.selectedIndex].value,\''.$line_info['luid'].'\')', false),9);
-                $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);
+                $currentcomponent->addguielem($section, new gui_checkbox('epm_reboot', $checked, 'Reboot','Reboot this Phone on Submit'),9);
+                
+            } else {
+
+                $js = "
+                    $.ajaxSetup({ cache: false });
+                    $.getJSON('config.php?type=tool&quietmode=1&handler=file&module=endpointman&file=ajax_select.html.php&atype=template2',{id: value}, function(j){
+                            var options = '';
+                            for (var i = 0; i < j.length; i++) {
+                                    options += '<option value=\"' + j[i].optionValue + '\">' + j[i].optionDisplay + '</option>';
+                            }
+                            $('#epm_temps').html(options);
+                            $('#epm_temps option:first').attr('selected', 'selected');
+                    }),
+                    $.ajaxSetup({ cache: false });
+                    $.getJSON('config.php?type=tool&quietmode=1&handler=file&module=endpointman&file=ajax_select.html.php&mac='+ mac +'&atype=lines',{id: value}, function(j){
+                            var options = '';
+                            for (var i = 0; i < j.length; i++) {
+                                    options += '<option value=\"' + j[i].optionValue + '\">' + j[i].optionDisplay + '</option>';
+                            }
+                            $('#epm_line').html(options);
+                            $('#epm_line option:first').attr('selected', 'selected');
+                    })
+                ";
+                $currentcomponent->addjsfunc('model_change(value,mac)', $js);
+
+                $brand_list = $endpoint->brands_available(NULL, true);
+                $model_list = array();
+                $line_list = array();
+                $template_list = array();
+
+                $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);
+                $currentcomponent->addguielem($section, new gui_selectbox('epm_brand', $brand_list, $info['brand_id'], 'Brand', 'The Brand of this Phone.', false, 'frm_extensions_brand_change(this.options[this.selectedIndex].value)', false),9);
+                $currentcomponent->addguielem($section, new gui_selectbox('epm_model', $model_list, $info['model_id'], 'Model', 'The Model of this Phone.', false, 'frm_extensions_model_change(this.options[this.selectedIndex].value,document.getElementById(\'epm_mac\').value)', false),9);
+                $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/advanced.inc

@@ -567 +567 @@
-                $_POST['enable_debug'] = 0;
-            }
-
-
-
-
-
-
-
-
+
+
+
+
-            }
-
@@ -594 +590 @@
-            $endpoint->db->query($sql);
-
-            $sql="UPDATE endpointman_global_vars SET value='" . $_POST['enable_updates'] . "' WHERE var_name='check_updates'";
-            $endpoint->db->query($sql);
-
-            $sql="UPDATE endpointman_global_vars SET value='" . $_POST['nmap_loc'] . "' WHERE var_name='nmap_location'";
-            $endpoint->db->query($sql);
-
-            $sql="UPDATE endpointman_global_vars SET value='" . $_POST['arp_loc'] . "' WHERE var_name='arp_location'";
+            $endpoint->db->query($sql);
+
+            $sql="UPDATE endpointman_global_vars SET value='" . $_POST['disable_help'] . "' WHERE var_name='disable_help'";
-            $endpoint->db->query($sql);
-
@@ -614 +610 @@
-            $ari_selected = "";
-        }
-
-taccess
-taccess
+
+elp
+elp
-        } else {
-
-
-
-
-
-
-
-
+
+
+
-        if($endpoint->global_cfg['debug']) {
-            $debug_selected = "checked";
@@ -634 +625 @@
-            $debug_selected = "";
-        }
-
+
+
-        $endpoint->tpl->assign("ari_selected", $ari_selected);
-        $endpoint->tpl->assign("updates_selected", $updates_selected);
-        $endpoint->tpl->assign("debug_selected", $debug_selected);
-

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

@@ -7 +7 @@
- * @package Provisioner
- */
+
+require 'functions.inc';
+$endpoint = new endpointmanager();
+
-include 'jsonwrapper.php';
-//ini_set('display_errors', 1);
-function in_array_recursive($needle, $haystack) {
-
@@ -19 +22 @@
-    } 
-    return FALSE;
-}
-
-function linesAvailable($lineid=NULL,$macid=NULL) {
-    global $db;
-    if(isset($lineid)) {
-        $sql="SELECT max_lines FROM endpointman_model_list WHERE id = (SELECT endpointman_mac_list.model FROM endpointman_mac_list, endpointman_line_list WHERE endpointman_line_list.luid = ".$lineid." AND endpointman_line_list.mac_id = endpointman_mac_list.id)";
-
-        $sql_l = "SELECT line, mac_id FROM `endpointman_line_list` WHERE luid = ".$lineid;
-        $line =& $db->getRow($sql_l, array(), DB_FETCHMODE_ASSOC);
-
-        $sql_lu = "SELECT line FROM endpointman_line_list WHERE mac_id = ".$line['mac_id'];
-    } elseif(isset($macid)) {
-        $sql="SELECT max_lines FROM endpointman_model_list WHERE id = (SELECT model FROM endpointman_mac_list WHERE id =".$macid.")";
-        $sql_lu = "SELECT line FROM endpointman_line_list WHERE mac_id = ".$macid;
-
-        $line['line'] = 0;
-    }
-    $max_lines = $db->getOne($sql);
-    $lines_used =& $db->getAll($sql_lu);
-
-    for($i = 1; $i <= $max_lines; $i++) {
-        if($i == $line['line']) {
-            $temp[$i]['value'] = $i;
-            $temp[$i]['text'] = $i;
-            $temp[$i]['selected'] = "selected";
-        } else {
-            if(!in_array_recursive($i,$lines_used)) {
-                $temp[$i]['value'] = $i;
-                $temp[$i]['text'] = $i;
-            }
-        }
-    }
-    if(isset($temp)) {
-        return($temp);
-    } else {
-        return FALSE;
-    }
-}
-
@@ -73 +39 @@
-} elseif ($_REQUEST['atype'] == "model_clone") {
-        $sql = "SELECT endpointman_model_list.id, endpointman_model_list.model as model FROM endpointman_model_list, endpointman_product_list WHERE endpointman_product_list.id = endpointman_model_list.product_id AND endpointman_model_list.enabled = 1 AND endpointman_model_list.hidden = 0 AND product_id = '". $_GET['id']."'";
-
-
-
-
+
+
+
+
+
+
+
+
+
-        } else {
+            unset($_REQUEST['mac']);
-            $sql = "SELECT max_lines FROM endpointman_model_list WHERE id = '". $_GET['id']."'";
-        }
+    } else {
+        $sql = "SELECT max_lines FROM endpointman_model_list WHERE id = '". $_GET['id']."'";
+    }
-}
-
@@ -94 +69 @@
-}
-
-
-
+'])) && (!isset($_REQUEST['mac
+endpoint->
-    for($z=0;$z<$count;$z++) {
-        $result[$z]['id'] = $z + 1;
@@ -101 +76 @@
-    }
-} elseif(isset($_REQUEST['macid'])) {
-
+
+
+
-} else {
-
+endpoint->
-}
-
-foreach($result as $row) {
-isset($_REQUEST['macid']
+(isset($_REQUEST['macid'])) OR (isset($_REQUEST['mac'])
-            $out[$i]['optionValue'] = $row['value'];
-            $out[$i]['optionDisplay'] = $row['text'];

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

@@ -144 +144 @@
-            $row =& $endpoint->db->getRow($sql,array(),DB_FETCHMODE_ASSOC);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            $endpoint->db->query($sql);
-
@@ -549 +527 @@
-        $endpoint->tpl->assign("models_ava", $ma);
-    }
-    $endpoint->tpl->assign("web_path", WEB_PATH);
-    $endpoint->tpl->assign("product_list", $product_list);
-    $endpoint->tpl->assign("display_ext", $endpoint->display_registration_list());

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

@@ -33 +33 @@
-        date_default_timezone_set('America/Los_Angeles');
-
-        
+
-        $this->amp_conf = $amp_conf;
-
@@ -52 +52 @@
-
-        //Define error reporting
-$this->global_cfg['debug']
+($this->global_cfg['debug']) AND (!isset($_REQUEST['quietmode']))
-            error_reporting(E_ALL);
-            ini_set('display_errors', 1);
@@ -78 +78 @@
-        $this->tpl = new RainTPL( LOCAL_PATH.'templates/freepbx', LOCAL_PATH.'templates/freepbx/compiled', '/admin/modules/endpointman/templates/images' );
-
+        if($this->global_cfg['disable_help']) {
+            $this->tpl->assign("disable_help", 1);
+        }
+        
+        $this->tpl->assign("web_path", WEB_PATH);
-    }
-
@@ -119 +124 @@
-        $tpl->assign("fatal_error", $fatal_error);
-        $tpl->assign("error_message", $message);
-    }
-
-    /**
-     * A hacky way to add notifications into freepbx
-     * @deprecated Supposed to remove
-     * @param <type> $id
-     * @param <type> $type
-     * @param <type> $display_text
-     * @param <type> $text
-     * @param <type> $link
-     */
-    function add_freepbx_notification($id, $type, $display_text, $text, $link) {
-        $sql = "INSERT INTO notifications (module, id, level, display_text, link, candelete, timestamp, extended_text) VALUES ('endpointman', '".$id."', '500', '".$display_text."', '".$link."', '1', '".time()."', '".$text."')";
-        mysql_query($sql);
-    }
-
@@ -168 +159 @@
-    function get_brand_from_mac($mac){
-        //Check for valid mac address first
-preg_match("/[0-9a-f][0-9a-f][:-][0-9a-f][0-9a-f][:-][0-9a-f][0-9a-f][:-][0-9a-f][0-9a-f][:-][0-9a-f][0-9a-f][:-][0-9a-f][0-9a-f]/i",
+$this->mac_check_clean(
-            return(FALSE);
-        }
-
-        //Get the OUI only
-mac
+this->mac_check_clean($mac)
-        //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";
@@ -193 +184 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -238 +203 @@
-     * Send this function an ID from the mac devices list table and you'll get all the information we have on that particular phone
-     * @param integer $mac_id ID number reference from the MySQL database referencing the table endpointman_mac_list
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     */
-    function get_phone_info($mac_id=NULL) {
@@ -299 +305 @@
-            }
-        }
-
-        //Final Output will look something similar to this
-        /**Array
-            (
-                [config_files_override] =>
-                [global_user_cfg_data] => N;
-                [model_id] => 213
-                [brand_id] => 2
-                [name] => Grandstream
-                [directory] => grandstream
-                [model] => GXP2000
-                [mac] => 000B820D0050
-                [template_id] => 0
-                [global_custom_cfg_data] => Serialized Data (Changed Template Values)
-                [long_name] => GXP Enterprise IP series [280,1200,2000,2010,2020]
-                [product_id] => 21
-                [cfg_dir] => gxp
-                [cfg_ver] => 1.5
-                [template_data] => Serialized Data (The default Template Values)
-                [enabled] => 1
-                [line] => Array
-                    (
-                        [1] => Array
-                            (
-                                [luid] => 2
-                                [mac_id] => 2
-                                [line] => 1
-                                [ext] => 1000
-                                [description] => Description
-                                [custom_cfg_data] =>
-                                [user_cfg_data] =>
-                                [secret] => secret
-                                [id] => 1000
-                                [tech] => sip
-                                [dial] => SIP/1000
-                                [devicetype] => fixed
-                                [user] => 1000
-                                [emergency_cid] =>
-                            )
-
-                    )
-
-            )
-        */
-        return $phone_info;
-    }
@@ -455 +417 @@
-            echo "No Template Data has been defined for this Product<br />";
-        }
-        $this->tpl->assign("web_path", WEB_PATH);
-
-        $this->tpl->assign("template_editor", $out);
@@ -741 +702 @@
-                $template_variables_array['type'] = "NA";
-                break;
-            case "file":
-                $template_variables_array['type'] = "NA";
-                break;
-            case "break":
-               if($admin) {
@@ -778 +736 @@
-        //This function is reversed. Not sure why
-        if($custom != "0") {
-
-
-
+model_list.max_lines, endpointman_
+
+model_list.max_lines, endpointman_
-        }
-
@@ -831 +789 @@
-                            }
-                        } elseif ($config_options['type'] == 'loop_line_options') {
-3
+$row['max_lines']
-                                foreach($config_options['data']['item'] as $items) {
-                                    if(isset($items['description'])) {
@@ -888 +846 @@
-        $this->db->query($sql);
-
-""
+array()
-
-        if($custom != 0) {
-            $phone_info = $this->get_phone_info($id);
-
-
+
+
+
+
+
-        } else {
-            $sql = 'SELECT id FROM endpointman_mac_list WHERE template_id = '.$id;
@@ -899 +860 @@
-            foreach($phones as $data) {
-                $phone_info = $this->get_phone_info($data['id']);
-
+
+
+
+
+
-            }
-        }
@@ -1036 +1001 @@
-        //template_data_custom.xml which will get included or template_data_<model_name>_custom.xml which will also get included
-        //line 'global' will set variables that aren't line dependant
-
-        $provisioner_lib->options = $new_template_data;
-
@@ -1051 +1015 @@
-        $time = $time_end - $time_start;
-        if($time > 360) {
-'s taking a
+ took an
-        }
-        //Create Directory Structure (If needed)
@@ -1260 +1224 @@
-        } elseif(!empty($array)) {
-            return($array);
+        //This is so stupid?! PHP gets confused.
+        } elseif($array == '0') {
+            return($array);
-        } else {
-            return("");
@@ -1418 +1385 @@
-    }
-
+    /**
+     * This will download the xml & brand package remotely
+     * @param integer $id Brand ID
+     */
-    function download_brand($id) {
-        $row =& $this->db->getAll('SELECT * FROM  endpointman_brand_list WHERE id ='.$id, array(), DB_FETCHMODE_ASSOC);
@@ -1474 +1445 @@
-
-        echo "Removing Temporary Files..............";
-deltree
+rmrf
-        unlink(PHONE_MODULES_PATH.'temp/'. $package);
-        echo "Done!<br />";
@@ -1633 +1604 @@
-        $this->db->query($sql);
-
-deltree
+rmrf
-        $sql = "DELETE FROM endpointman_brand_list WHERE id = ". $id;
-
@@ -1879 +1850 @@
-            return($exec);
-        }
-    }
-
-    /**
-     * Delete Directory Tree.
-     * @deprecated In favor of rmrf
-     * @param string $dir Full Directory path to delete
-     */
-    function deltree($dir) {
-        $this->rmrf($dir);
-    }
-

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

@@ -106 +106 @@
-    $endpoint->tpl->assign("no_add", $no_add);
-    $endpoint->tpl->assign("debug", $debug);
-    $endpoint->tpl->assign("web_path", WEB_PATH);
-
-    foreach($endpoint->error as $key => $error) {

modules/branches/2.9/endpointman/install.php

@@ -92 +92 @@
-}
-
-4.1
+9.0.3
-
-if(ep_table_exists("endpointman_global_vars")) {
@@ -168 +168 @@
-} elseif($global_cfg['version'] == '2.4.2') {
-    $ver = "2.4.2";
+} elseif($global_cfg['version'] == '2.9.0.0') {
+    $ver = "2.9.0.0";
+} elseif($global_cfg['version'] == '2.9.0.1') {
+    $ver = "2.9.0.1";
+} elseif($global_cfg['version'] == '2.9.0.2') {
+    $ver = "2.9.0.2";
+} elseif($global_cfg['version'] == '2.9.0.3') {
+    $ver = "2.9.0.3";
+} elseif($global_cfg['version'] == '2.9.0.4') {
+    $ver = "2.9.0.4";
+} elseif($global_cfg['version'] == '2.9.0.5') {
+    $ver = "2.9.0.5";
-} else {
-    $ver = "1000";
@@ -206 +218 @@
-                (14, 'check_updates', '1'),
-                (15, 'disable_htaccess', ''),
-
+
+
-        $db->query($sql_update_vars);
-
@@ -877 +890 @@
-    }
-
+    if ($ver <= "2.9.0.2") {
+        $sql = 'INSERT INTO `asterisk`.`endpointman_global_vars` (`idnum`, `var_name`, `value`) VALUES (NULL, \'disable_help\', \'0\');';
+        $db->query($sql);
+    }
+
-}
-
@@ -939 +957 @@
-            (14, 'check_updates', '0'),
-            (15, 'disable_htaccess', ''),
-
+
+
-        $db->query($sql);
-
@@ -1157 +1176 @@
-        mkdir($amp_conf['AMPWEBROOT']."/recordings/theme/js/");
-
-
-
-
-
-
+freepbx/
+
+freepbx/
+
+freepbx/
-
-
@@ -1181 +1200 @@
-        }
-
-
-
-
+freepbx/
+
+freepbx/
-        
-
+freepbx/
-
-

modules/branches/2.9/endpointman/module.xml

@@ -2 +2 @@
-  <rawname>endpointman</rawname>
-  <name>PBX End Point Manager</name>
-
+3RC
-  <type>tool</type>
-  <category>End Point Manager</category>
@@ -21 +21 @@
-        </changelog>
-  <info>http://projects.colsolgrp.net/projects/show/endpointman</info>
-release/2.9/endpointman-2.9.0.1
+contributed_modules/release/endpointman-2.3.2
-
-ff802d5bfae951860d0efe69b9079ddb
+b0e3a14a20449b0441d1a9f432f19559
-</module>

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

@@ -64 +64 @@
-  </label></td>
-</tr>
-<!--
-<tr>
-Enable Nightly Phone Module Updates Check
+Disable Tooltips
-  <td align='left'><label>
-enable_updates" {$updates
+disable_help" {$help
-  </label></td>
-</tr>
--->
-<tr>
-<td colspan='2' align='center'><input type='Submit' name='button_update_globals' value='<?=_('Update Globals')?>'></td>

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

@@ -301 +301 @@
-  {loop name="list"}
-        <tr class="headerRow">
-img src="{$web_path}templates/images/bullet_plus.png" id="imgrowGroup{$value.master_id}" alt="" onclick="toggleDisplay(document.getElementById('devList'),'headerRow','rowGroup{$value.master_id}')" title="Expand Line Information"><input type="checkbox" name="selected[]" value="{$value.id}"
+a href="#"><img src="{$web_path}templates/images/bullet_plus.png" id="imgrowGroup{$value.master_id}" alt="" onclick="toggleDisplay(document.getElementById('devList'),'headerRow','rowGroup{$value.master_id}')" title="Expanded Line Information"><input type="checkbox" name="selected[]" value="{$value.id}"></a
-            <td align='center' width='11%'>{$value.mac}</td>
-            <td width="13%" align='center'>{$value.name}</td>
-            <td width="14%" align='center'>{$value.model}</td>
-
-
+div id="demo"><a href="#"><img src="{$web_path}templates/images/expand.png" id="img2rowGroup{$value.master_id}" onclick="toggleDisplay(document.getElementById('devList'),'headerRow','rowGroup{$value.master_id}')" title="Expanded Line Information"></a></div><
+div id="demo"><a href="#"><img src="{$web_path}templates/images/expand.png" id="img3rowGroup{$value.master_id}" onclick="toggleDisplay(document.getElementById('devList'),'headerRow','rowGroup{$value.master_id}')" title="Expanded Line Information"></a></div><
-            <td align='center' width='15%'>{$value.template_name}</td>
-            <td align='center' width='9%'><div id="demo"><a href='javascript:submit_wtype("edit",{$value.id});'><img src='{$web_path}templates/images/edit.png' ALT='<?=_('Edit')?>' title='Edit Device' border='0'></a></div></td>
@@ -373 +373 @@
-</form>
-
+{if condition="!isset($disable_help)"}
-<script>
-    $("#demo img[title]").tooltip();
-
+
+
-{include="global_footer"}

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

@@ -126 +126 @@
-                                tblRows[i].style.display = '';
-                                document.getElementById("img"+rowClass).src= '{$web_path}templates/images/bullet_minus.png';
+                                document.getElementById("img2"+rowClass).src= '{$web_path}templates/images/collapse.png';
+                                document.getElementById("img3"+rowClass).src= '{$web_path}templates/images/collapse.png';
-                            }else{
-                                tblRows[i].style.display = 'none';
-                                document.getElementById("img"+rowClass).src= '{$web_path}templates/images/bullet_plus.png';
+                                document.getElementById("img2"+rowClass).src= '{$web_path}templates/images/expand.png';
+                                document.getElementById("img3"+rowClass).src= '{$web_path}templates/images/expand.png';
-                            }
-                        }

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

@@ -17 +17 @@
-    <body>
-{else}
+<script type="text/javascript" src="<?=WEB_PATH?>templates/freepbx/javascript/jquery.tooltip.v.1.1.js"></script>
+<script type="text/javascript" src="<?=WEB_PATH?>templates/freepbx/javascript/jquery.tooltip.execute.js"></script>
+<link href="<?=WEB_PATH?>templates/freepbx/stylesheets/simpletooltip.css" rel="stylesheet" type="text/css" />
-<script language="javascript" type="text/javascript">
-        function popitup(url, name) {
@@ -113 +116 @@
-              {/loop}
-            {elseif condition="$value.type == 'list'"}
-
+:
-              {loop name="value.data"}
-                                            <option value='{$value.value}' {if condition="array_key_exists('selected',$value)"}{$value.selected}{/if}>{$value.description}</option>
@@ -141 +144 @@
-            <input name="custom" id="custom" type="hidden" value="{$hidden_custom}">
-            {if condition="!isset($in_ari)"}
+            Reboot Phone(s) <input type='checkbox' name='epm_reboot'><br />
-            <input type="submit" name="button_save_template" value="<?=_('Save Template');?>">
-        </form>

modules/branches/2.9/endpointman/uninstall.php

@@ -28 +28 @@
-
-out("Removing Phone Modules Directory");
-deltree
+rmrf
-exec("rm -R ". PHONE_MODULES_PATH);
-