Changeset 10240

Timestamp:

09/05/10 03:17:11 (3 years ago)

Author:

tm1000

Message:

EPM 2.2.7

Files:

• contributed_modules/modules/endpointman/.htaccess (deleted)
• contributed_modules/modules/endpointman/config.php (modified) (1 diff)
• contributed_modules/modules/endpointman/includes/advanced.inc (modified) (2 diffs)
• contributed_modules/modules/endpointman/includes/ajax_select.php (modified) (2 diffs)
• contributed_modules/modules/endpointman/includes/devices_manager.inc (modified) (9 diffs)
• contributed_modules/modules/endpointman/includes/export.php (modified) (1 diff)
• contributed_modules/modules/endpointman/includes/functions.inc (modified) (16 diffs)
• contributed_modules/modules/endpointman/includes/template_manager.inc (modified) (1 diff)
• contributed_modules/modules/endpointman/install.php (modified) (6 diffs)
• contributed_modules/modules/endpointman/module.xml (modified) (1 diff)
• contributed_modules/modules/endpointman/templates/devices_manager.html (modified) (9 diffs)
• contributed_modules/modules/endpointman/templates/global_header.html (modified) (2 diffs)
• contributed_modules/modules/endpointman/templates/template_editor.html (modified) (3 diffs)
• contributed_modules/modules/endpointman/uninstall.php (modified) (1 diff)

contributed_modules/modules/endpointman/config.php

@@ -13 +13 @@
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-

contributed_modules/modules/endpointman/includes/advanced.inc

@@ -23 +23 @@
-switch($_REQUEST['subpage']) {
-    case "iedl":
-        $amp_serial = base64_encode(serialize($amp_conf));
-        $amp_serial = base64_encode(serialize($amp_conf));
-        $temp_amp['amp_serial'] = $amp_serial;
-        $temp_amp = base64_encode(serialize($temp_amp));
-
-        $tpl->assign("exporter_address", "config.php?type=tool&display=epm_config&quietmode=1&handler=file&file=export.html.php&module=endpointman&rand=".rand());
-        //Dave B's Q&D file upload security code (http://us2.php.net/manual/en/features.file-upload.php)
@@ -73 +68 @@
-                                            $description = '';
-                                        }
-, ext, description) VALUES ('".$mac."','".$model_id."','".$ext."','".$description
+) VALUES ('".$mac."','".$model_id
-                                        $endpoint->db->query($sql);
+
+                                        $sql = 'SELECT last_insert_id()';
+                                        $ext_id =& $endpoint->db->getOne($sql);
+
+                                        $sql = "INSERT INTO `endpointman_line_list` (`mac_id`, `ext`, `line`, `description`) VALUES ('".$ext_id."', '".$ext."', '1','".$description."')";
+                                        $endpoint->db->query($sql);
+                                        
-                                        $message .= "Inserted Mac Address ".$mac."<br/>";
-                                    } else {

contributed_modules/modules/endpointman/includes/ajax_select.php

@@ -24 +24 @@
-} 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']."'";
+}   elseif ($_REQUEST['atype'] == "lines") {
+        $sql = "SELECT max_lines FROM endpointman_model_list WHERE id = '". $_GET['id']."'";
-}
-
@@ -38 +40 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
-
-foreach($result as $row) {

contributed_modules/modules/endpointman/includes/devices_manager.inc

@@ -68 +68 @@
-        }
-
-ext`, `description`, `custom_cfg_data`, `custom_cfg_template`) VALUES ('".$mac."', '".$_REQUEST['model_list']."', '".$_REQUEST['ext_list']."', '".$name
+global_custom_cfg_data`, `template_id`) VALUES ('".$mac."', '".$_REQUEST['model_list']
-        $endpoint->db->query($sql);
-
-id FROM endpointman_mac_list WHERE ext ='. $_REQUEST['ext_list']
+last_insert_id()'
-        $ext_id =& $endpoint->db->getOne($sql);
+
+        if(!isset($_REQUEST['line_list'])) {
+            $_REQUEST['line_list'] = 1;
+        }
+
+        $sql = "INSERT INTO `endpointman_line_list` (`mac_id`, `ext`, `line`, `description`) VALUES ('".$ext_id."', '".$_REQUEST['ext_list']."', '".$_REQUEST['line_list']."', '".$name."')";
+        $endpoint->db->query($sql);
-
-        $mac_id = $endpoint->get_phone_info($ext_id);
@@ -104 +111 @@
-    $name=$endpoint->db->getOne($sql);
-
-
+
+
+
+
-    $endpoint->db->query($sql);
-
@@ -116 +126 @@
-
-    $sql = "DELETE FROM endpointman_mac_list WHERE id=".$_REQUEST['id'];
+    $endpoint->db->query($sql);
+    $sql = "DELETE FROM endpointman_line_list WHERE mac_id=".$_REQUEST['id'];
-    $endpoint->db->query($sql);
-} elseif((isset($_REQUEST['button_add_selected_phones'])) AND (isset($_REQUEST['add']))) {
@@ -122 +134 @@
-        $num = $_REQUEST['add'][$i];
-        if($mac = $endpoint->mac_check_clean($_REQUEST['mac_'.$num])) {
-mac
+line
-            $res =& $endpoint->db->query($sql);
-            $count_macs = $res->numRows();
@@ -130 +142 @@
-
-
-
-
-
-
-ext`, `description`) VALUES ('".$mac."', '".$_REQUEST['model_list_'.$num]."', '".$_REQUEST['ext_list_'.$num]."', '".$name."
+//
+//
+
+
+template_id`) VALUES ('".$mac."', '".$_REQUEST['model_list_'.$num]."', '0
-                $endpoint->db->query($sql);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                $endpoint->prepare_configs($row_new);
- 
@@ -170 +189 @@
-        foreach($_REQUEST['selected'] as $key => $data) {
-            $sql = "DELETE FROM endpointman_mac_list WHERE id=".$_REQUEST['selected'][$key];
+            $endpoint->db->query($sql);
+            $sql = "DELETE FROM endpointman_line_list WHERE mac_id=".$_REQUEST['selected'][$key];
-            $endpoint->db->query($sql);
-        }
@@ -283 +304 @@
-}
-
-mac_list.ext , endpointman_mac_list.description , endpointman_brand_list.name, endpointman_mac_list.custom_cfg_data, endpointman_mac_list.custom_cfg_template
+brand_list.name, endpointman_mac_list.global_custom_cfg_data, endpointman_mac_list.template_id
-
-$devices_list =& $endpoint->db->getAll($sql,array(),DB_FETCHMODE_ASSOC);
@@ -290 +311 @@
-$i = 0;
-$list = array();
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    $i++;
@@ -375 +405 @@
-            $tpl->assign("models_ava", $ma);
-            $tpl->assign("display_ext", $endpoint->displayExtension($edit_row['ext']));
-custom_cfg_template
+template_id
-            $tpl->assign("edit_id", $edit_row['id']);
-        } else {

contributed_modules/modules/endpointman/includes/export.php

@@ -18 +18 @@
-$outstream = fopen("php://output",'w');
-
-mac_list.ext FROM endpointman_mac_list, endpointman_model_list, endpointman_brand_list WHERE
+line_list.ext FROM endpointman_mac_list, endpointman_model_list, endpointman_brand_list, endpointman_line_list WHERE endpointman_line_list.mac_id = endpointman_mac_list.id AND
-
-$result = $endpoint->db->getAll($sql,array(),DB_FETCHMODE_ASSOC);

contributed_modules/modules/endpointman/includes/functions.inc

@@ -157 +157 @@
-        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,
-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.ext, endpointman_mac_list.custom_cfg_template, endpointman_mac_list.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, users.name as description, sip.data as secret FROM endpointman_mac_list, endpointman_model_list, endpointman_brand_list, endpointman_product_list, sip, users WHERE endpointman_mac_list.id = ".$mac_id." AND 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.ext = sip.id AND sip.keyword = 'secret' AND endpointman_mac_list.ext = users.extension"
+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_line_list.ext, 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, users.name as description, sip.data as secret FROM endpointman_line_list, endpointman_mac_list, endpointman_model_list, endpointman_brand_list, endpointman_product_list, sip, users 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_line_list.ext = sip.id AND sip.keyword = 'secret' AND endpointman_line_list.ext = users.extension AND endpointman_mac_list.id = endpointman_line_list.mac_id AND endpointman_mac_list.id = ". $mac_id
-
-            $phone_info =& $this->db->getRow($sql, array(), DB_FETCHMODE_ASSOC);
@@ -166 +166 @@
-
-            //If there is a template associated with this phone then pull that information and put it into the array
-custom_cfg_template
-custom_cfg_data, config_files_override FROM endpointman_template_list WHERE id = ".$phone_info['custom_cfg_template
+template_id
+global_custom_cfg_data, config_files_override FROM endpointman_template_list WHERE id = ".$phone_info['template_id
-
-                $phone_info['template_data'] =& $this->db->getRow($sql, array(), DB_FETCHMODE_ASSOC);
@@ -217 +217 @@
-        //Determine if we are dealing with a general template or a specific [for that phone only] template (custom =0 means general)
-        if($custom == 0) {
-
-
-product_list.config_files, endpointman_mac_list.*, endpointman_model_list.id as model_id, endpointman_model_list.template_data, endpointman_product_list.id as product_id, endpointman_product_list.short_name, endpointman_product_list.cfg_dir, endpointman_brand_list.directory FROM endpointman_brand_list, endpointman_mac_list, endpointman_model_list, endpointman_product_list WHERE endpointman_mac_list.id=".$id."
+template_list.global_custom_cfg_data,  endpointman_
+
+mac_list.global_custom_cfg_data, endpointman_product_list.config_files, endpointman_mac_list.*, endpointman_line_list.*, endpointman_model_list.id as model_id, endpointman_model_list.template_data, endpointman_product_list.id as product_id, endpointman_product_list.short_name, endpointman_product_list.cfg_dir, endpointman_brand_list.directory FROM endpointman_brand_list, endpointman_mac_list, endpointman_model_list, endpointman_product_list, endpointman_line_list WHERE endpointman_mac_list.id=".$id." AND endpointman_mac_list.id = endpointman_line_list.mac_id
-        }
-
@@ -241 +241 @@
-            $tpl->assign("models_ava", $ma);
-        }
+
+        $tpl->assign("area_ava", $this->areaAvailable($row['model_id']));
-        //Start the display of the html file in the product folder
-        if($row['config_files_override'] == "") {
@@ -278 +280 @@
-
-        if($row['template_data'] != "") {
-
+global_
-        } else {
-            echo "No Template Data has been defined for this Product<br />";
@@ -312 +314 @@
-            //No custom template so let's pull the default values for this model into the custom_cfg_data array and populate it from there so that we won't have to make two completely different functions below
-            foreach($cfg_data as $key => $data) {
-
+ && ($data['type'] != 'loop')
-                    $key_default = str_replace('$','',$data['variable']);
-                    if(!is_array($data['default_value'])) {
@@ -350 +352 @@
-                    $template_variables_array[$group_count]['title'] = $cfg_data[$i]['description'];
-                    $variables_count = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            }
-        }
-        return($template_variables_array);
-    }
+
+function generate_form_data ($i,$cfg_data,$key,$custom_cfg_data) {
+    $admin = TRUE;
+    if ($cfg_data[$i]['type'] == "input") {
+        if((!$admin) && (isset($user_cfg_data[$key]['value']))) {
+            $custom_cfg_data[$key]['value'] = $user_cfg_data[$key]['value'];
+        }
+        $template_variables_array['type'] = "input";
+        $template_variables_array['key'] = $key;
+        $template_variables_array['value'] = $custom_cfg_data[$key]['value'];
+        $template_variables_array['description'] = $cfg_data[$i]['description'];
+    } elseif ($cfg_data[$i]['type'] == "radio") {
+        if((!$admin) && (isset($user_cfg_data[$key]['value']))) {
+            $custom_cfg_data[$key]['value'] = $user_cfg_data[$key]['value'];
+        }
+        $num = $custom_cfg_data[$key]['value'];
+        $template_variables_array['type'] = "radio";
+        $template_variables_array['key'] = $key;
+        $template_variables_array['description'] = $cfg_data[$i]['description'];
+        $z = 0;
+        while($z < count($cfg_data[$i]['data'])) {
+            $template_variables_array['data'][$z]['key'] = $key;
+            $template_variables_array['data'][$z]['value'] = $cfg_data[$i]['data'][$z]['value'];
+            $template_variables_array['data'][$z]['description'] = $cfg_data[$i]['data'][$z]['text'];
+            if ($cfg_data[$i]['data'][$z]['value'] == $num) {
+                $template_variables_array['data'][$z]['checked'] = 'checked';
+            }
+            $z++;
+        }
+    } elseif ($cfg_data[$i]['type'] == "list") {
+        if((!$admin) && (isset($user_cfg_data[$key]['value']))) {
+            $custom_cfg_data[$key]['value'] = $user_cfg_data[$key]['value'];
+        }
+        $num = $custom_cfg_data[$key]['value'];
+        $template_variables_array['type'] = "list";
+        $template_variables_array['key'] = $key;
+        $template_variables_array['description'] = $cfg_data[$i]['description'];
+        $z = 0;
+        while($z < count($cfg_data[$i]['data'])) {
+            $template_variables_array['data'][$z]['value'] = $cfg_data[$i]['data'][$z]['value'];
+            $template_variables_array['data'][$z]['description'] = $cfg_data[$i]['data'][$z]['text'];
+            if ($cfg_data[$i]['data'][$z]['value'] == $num) {
+                $template_variables_array['data'][$z]['selected'] = 'selected';
+            }
+            $z++;
+        }
+    } elseif ($cfg_data[$i]['type'] == "break") {
+        $template_variables_array['type'] = "break";
+    }
+    if(($this->global_cfg['enable_ari']) AND ($admin) AND ($cfg_data[$i]['type'] != "break") AND ($cfg_data[$i]['type'] != "group")) {
+        $template_variables_array['aried'] = 1;
+        $template_variables_array['ari']['key'] = $key;
+        if(isset($custom_cfg_data[$key]['ari'])) {
+            $template_variables_array['ari']['checked'] = "checked";
+        }
+    }
+    return($template_variables_array);
+}
-
-    function save_template($id, $custom, $variables) {
-        //Custom Means specific to that MAC
-
+
+
+
+
-            $sql = "SELECT endpointman_brand_list.directory, endpointman_product_list.cfg_dir, endpointman_product_list.config_files, endpointman_product_list.long_name, endpointman_model_list.template_data, endpointman_model_list.id as model_id, endpointman_template_list.* FROM endpointman_brand_list, endpointman_product_list, endpointman_model_list, endpointman_template_list WHERE endpointman_product_list.id = endpointman_template_list.product_id AND endpointman_brand_list.id = endpointman_product_list.brand AND endpointman_template_list.model_id = endpointman_model_list.id AND endpointman_template_list.id = ".$id;
-        } else {
-            $sql = "SELECT endpointman_product_list.config_files, endpointman_mac_list.*, endpointman_product_list.id as product_id, endpointman_product_list.long_name, endpointman_model_list.template_data, endpointman_product_list.cfg_dir, endpointman_brand_list.directory FROM endpointman_brand_list, endpointman_mac_list, endpointman_model_list, endpointman_product_list WHERE endpointman_mac_list.id=".$id." AND endpointman_mac_list.model = endpointman_model_list.id AND endpointman_model_list.brand = endpointman_brand_list.id AND endpointman_model_list.product_id = endpointman_product_list.id";
-        }
-
@@ -434 +468 @@
-                    }
-                }
+            } elseif ($cfg_data[$i]['type'] == 'loop') {
+                $loop_start = $cfg_data[$i]['loop_start'];
+                $loop_end = $cfg_data[$i]['loop_end'];
+                $variables_count = 0;
+                for($a=$loop_start;$a<=$loop_end;$a++) {
+                    foreach($cfg_data[$i]['data']['item'] as $items) {
+                        if(isset($items['description'])) {
+                            $items['description'] = str_replace('{$count}',$a,$items['description']);
+                            $temping = str_replace('$','',$items['variable'])."_".$a;
+                            $temping_ari = "ari_" . $temping;
+                            if(array_key_exists($temping, $_REQUEST)) {
+                                $custom_cfg_data[$temping][$a] = $_REQUEST[$temping];
+                                if(array_key_exists($temping_ari, $_REQUEST)) {
+                                    if($_REQUEST[$temping_ari] == "on") {
+                                        $custom_cfg_data[$temping]['ari'] = 1;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
-            }
-        }
@@ -456 +511 @@
-
-        if($custom == "0") {
-
+global_
-            $location = "template_manager";
-        } else {
-custom_cfg_template = 0, 
+template_id = 0, global_
-            $location = "devices_manager";
-        }
+  
-        $this->db->query($sql);
-
@@ -471 +527 @@
-
-        } else {
-custom_cfg_template
+template_id
-            $phones = $this->db->getAll($sql, array(), DB_FETCHMODE_ASSOC);
-            foreach($phones as $data) {
@@ -535 +591 @@
-
-        if(is_array($phone_info['template_data'])) {
-
-
-
-
-
+
+
+
+
-        $new_template_data = array();
-        if(is_array($template_data)) {
-            foreach($template_data as $key => $data) {
-
+
+
+
+
+
+
-            }
-        }
@@ -616 +676 @@
-                fwrite($fp, $data);
-                fclose($fp);
+                if(!file_exists($this->global_cfg['config_location'].$key)) {
+                    $this->error['parse_configs'] = "File not written to hard drive!";
+                }
-            }
-        }
-        $provisioner_lib->reboot();
-
-    }
-
@@ -939 +1001 @@
-                $short_name = preg_replace("/\[(.*?)\]/si", "", $family_line_xml['data']['name']);
-                if($data) {
-, hidden = '0'
+
-                } else {
-                    $sql = "INSERT INTO endpointman_product_list (`id`, `brand`, `short_name`, `long_name`, `cfg_dir`, `cfg_ver`, `config_files`, `hidden`) VALUES ('".$brand_id.$family_line_xml['data']['id']."', '".$brand_id."', '".$short_name."', '".$family_line_xml['data']['name']."', '".$family_line_xml['data']['directory']."', '".$family_line_xml['data']['version']."','".$family_line_xml['data']['configuration_files']."', '0')";
@@ -953 +1015 @@
-                        $template_list = $model_list['template_data']['files'];
-                    }
-"-".
+
-                    if($m_data) {
-odel = '".$model_list['model']."', template_list = '".$template_list."', enabled = '0', hidden = '0' WHERE id = '".$brand_id.$family_line_xml['data']
+ax_lines = '".$model_list['lines']."', model = '".$model_list['model']."', template_list = '".$template_list."' WHERE id = '".$brand_id.$family_line_xml['data']['id'].$model_list
-                    } else {
-product_id`, `template_list`, `enabled`, `hidden`) VALUES ('".$brand_id.$family_line_xml['data']['id'].$model_list['id']."', '".$brand_id."', '".$model_list['model
+max_lines`, `product_id`, `template_list`, `enabled`, `hidden`) VALUES ('".$brand_id.$family_line_xml['data']['id'].$model_list['id']."', '".$brand_id."', '".$model_list['model']."', '".$model_list['lines
-                    }
-                    $this->db->query($sql);
@@ -1495 +1557 @@
-        }
-    }
+    function areaAvailable($model,$area=NULL) {
+
+        $temp[0]['value'] = 'GLOBAL';
+        $temp[0]['text'] = 'GLOBAL';
+        $temp[0]['selected'] = 0;
+
+        $temp[1]['value'] = 'ALL';
+        $temp[1]['text'] = 'ALL LINES';
+        $temp[1]['selected'] = 0;
+
+        $sql = "SELECT max_lines FROM endpointman_model_list WHERE id = '". $model."'";
+
+        $count = $this->db->getOne($sql);
+        for($z=0;$z<$count;$z++) {
+            $result[$z]['id'] = $z + 1;
+            $result[$z]['model'] = $z + 1;
+        }
+
+        $i = 2;
+        foreach($result as $row) {
+            if ($row['id'] == $model) {
+                $temp[$i]['value'] = $row['id'];
+                $temp[$i]['text'] = 'Line '.$row['model'];
+                $temp[$i]['selected'] = 'selected';
+            }else {
+                $temp[$i]['value'] = $row['id'];
+                $temp[$i]['text'] = 'Line '.$row['model'];
+                $temp[$i]['selected'] = 0;
+            }
+            $i++;
+        }
+
+        return($temp);
+    }
-
-    function modelsAvailable($model=NULL, $macAdd=NULL, $brand=NULL, $product=NULL) {
@@ -1535 +1631 @@
-    }
-
+    function linesAvailable($model=NULL, $macid=NULL) {
+
+        if(isset($model)) {
+            $sql="SELECT  `max_lines` FROM  `endpointman_model_list` WHERE  `id` LIKE";
+        }
+
+
+        $result1 =& $this->db->getAll($sql, array(),DB_FETCHMODE_ASSOC);
+
+        $i = 1;
+        foreach($result1 as $row) {
+            if ($row['id'] == $model) {
+                $temp[$i]['value'] = $row['id'];
+                $temp[$i]['text'] = $row['model'];
+                $temp[$i]['selected'] = 'selected';
+            }else {
+                $temp[$i]['value'] = $row['id'];
+                $temp[$i]['text'] = $row['model'];
+                $temp[$i]['selected'] = 0;
+            }
+            $i++;
+        }
+
+        if(!isset($temp)) {
+            $this->error['modelsAvailable'] = "You need to enable at least ONE model";
+            return(FALSE);
+        } else {
+            return($temp);
+        }
+    }
+
-    function displayExtension($ext = NULL) {
-        if(!isset($ext)) {
-mac_list WHERE tech='sip' AND devices.id = endpointman_mac
-
-mac_list WHERE tech='sip' AND devices.id = endpointman_mac_list.ext AND endpointman_mac
+line_list WHERE tech='sip' AND devices.id = endpointman_line
+
+line_list WHERE tech='sip' AND devices.id = endpointman_line_list.ext AND endpointman_line
-        }
-        $result =& $this->db->getAll($not_added,array(), DB_FETCHMODE_ASSOC);

contributed_modules/modules/endpointman/includes/template_manager.inc

@@ -69 +69 @@
-    }
-
-endpointman_mac_list.mac,endpointman_mac_list.model,endpointman_mac_list.description, endpointman_model_list.model as model_clone, endpointman_product_list.short_name as model_class FROM endpointman_mac_list, endpointman_model_list, endpointman_product_list WHERE endpointman_product_list.id = endpointman_model_list.product_id AND endpointman_mac_list.custom_cfg_data IS NOT NULL AND endpointman_model_list.id = endpointman_mac_list.model AND endpointman_mac_list.custom_cfg_template
+ endpointman_mac_list.mac, endpointman_mac_list.model, endpointman_line_list.description, endpointman_model_list.model as model_clone, endpointman_product_list.short_name as model_class FROM endpointman_mac_list, endpointman_model_list, endpointman_product_list, endpointman_line_list WHERE endpointman_mac_list.id = endpointman_line_list.mac_id AND endpointman_product_list.id = endpointman_model_list.product_id AND endpointman_mac_list.global_custom_cfg_data IS NOT NULL AND endpointman_model_list.id = endpointman_mac_list.model AND endpointman_mac_list.template_id
-    $template_list =& $db->getAll($sql, array(), DB_FETCHMODE_ASSOC);
-    foreach($template_list as $row) {

contributed_modules/modules/endpointman/install.php

@@ -93 +93 @@
-}
-
-6
+7
-
-if(ep_table_exists("endpointman_global_vars")) {
@@ -139 +139 @@
-} elseif($global_cfg['version'] == '2.2.6') {
-    $ver = "2.2.6";
+} elseif($global_cfg['version'] == '2.2.7') {
+    $ver = "2.2.7";
-} else {
-    $ver = "1000";
@@ -785 +787 @@
-}
-
+if ($ver <= "2.2.6") {
+    $sql = "CREATE TABLE IF NOT EXISTS `endpointman_line_list` (
+  `luid` int(11) NOT NULL AUTO_INCREMENT,
+  `mac_id` int(11) NOT NULL,
+  `line` smallint(2) NOT NULL,
+  `ext` varchar(15) NOT NULL,
+  `description` varchar(20) NOT NULL,
+  `custom_cfg_data` longblob NOT NULL,
+  `user_cfg_data` longblob NOT NULL,
+  PRIMARY KEY (`luid`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;";
+    $db->query($sql);
+
+    $data = array();
+    $data =& $db->getAll("SELECT * FROM endpointman_mac_list",array(), DB_FETCHMODE_ASSOC);
+    foreach($data as $list) {
+        $sql = "INSERT INTO endpointman_line_list (mac_id, line, ext, description) VALUES ('".$list['id']."', '1', '".$list['ext']."', '".$list['description']."')";
+        $db->query($sql);
+    }
+
+    $sql = 'ALTER TABLE `endpointman_custom_configs` CHANGE `data` `data` LONGBLOB NOT NULL';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_mac_list` DROP `description`';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_mac_list` DROP `ext`';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_mac_list` CHANGE `custom_cfg_template` `template_id` INT(11) NOT NULL';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_mac_list` CHANGE `cfg_template_data` `global_template_id` LONGBLOB NOT NULL';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_mac_list` CHANGE `user_cfg_data` `global_user_cfg_data` LONGBLOB NOT NULL';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_model_list` ADD `max_lines` SMALLINT(2) NOT NULL AFTER `model`;';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_model_list` CHANGE `template_data` `template_data` LONGBLOB NOT NULL';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_template_list` CHANGE `custom_cfg_data` `global_custom_cfg_data` LONGBLOB NULL DEFAULT NULL';
+    $db->query($sql);
+
+    $sql = 'ALTER TABLE `endpointman_mac_list` CHANGE `custom_cfg_data` `global_custom_cfg_data` LONGBLOB NOT NULL';
+    $db->query($sql);
+
+}
+
+if ($ver <= "2.2.7") {
+
+}
+
-
-
@@ -800 +858 @@
-                ) ENGINE=MyISAM DEFAULT CHARSET=latin1";
-        $db->query($sql);
+
+        out("Creating Line List Table");
+
+        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_line_list` (
+  `luid` int(11) NOT NULL AUTO_INCREMENT,
+  `mac_id` int(11) NOT NULL,
+  `line` smallint(2) NOT NULL,
+  `ext` varchar(15) NOT NULL,
+  `description` varchar(20) NOT NULL,
+  `custom_cfg_data` longblob NOT NULL,
+  `user_cfg_data` longblob NOT NULL,
+  PRIMARY KEY (`luid`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;";
+    $db->query($sql);
-
-        out("Creating Global Variables Table");
@@ -837 +909 @@
-        out("Creating mac list Table");
-        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_mac_list` (
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        $db->query($sql);
-
-        out("Creating model List Table");
-        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_model_list` (
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        $db->query($sql);
-
@@ -878 +949 @@
-        out("Creating product List Table");
-        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_product_list` (
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        
-        ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+
+
+
+
+
+
+
+
+
+
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
-        $db->query($sql);
-
-        out("Creating Template List Table");
-        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_template_list` (
-        
-        
-        
-        
-        `custom_cfg_data` 
-        
-        
-        
+
+
+
+
+`global_custom_cfg_data` long
+
+
+
-        $db->query($sql);
-

contributed_modules/modules/endpointman/module.xml

@@ -19 +19 @@
-        </changelog>
-  <info>http://projects.colsolgrp.net/projects/show/endpointman</info>
-2.6
+0.0
-
-cc4c2f4d8ce1eb5ddcfffd000449dd4
+b1341a35ef60d0fad17348803a0a783
-</module>

contributed_modules/modules/endpointman/templates/devices_manager.html

@@ -23 +23 @@
-<table align='center' width='90%'>
-  <tr>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-</tr><tr>
-  {if condition="$no_add == FALSE"}
-  <form action='config.php{$web_var}&display=epm_devices' method='POST'>
-   <td align='center' width='5px'><input type="checkbox" name="checkbox" id="checkbox" disabled>
-
+            <td align='center' width='2%'>&nbsp;
+
-<td align='center'>
-  {if condition="$mode == 'EDIT'"}
@@ -53 +54 @@
-  {/if}
-</td>
-  
+
-  <label>
-  {if condition="$mode == 'EDIT'"}
@@ -64 +65 @@
-    </select>
-  {else}
- 
- 
+        
+
-  </label></td>
-
+
+
+
+
+
+
+
+
+
+
+
-    <select name="ext_list" id="select">
-    {loop name="display_ext"}
@@ -89 +100 @@
-</td>
-{$edit}
-width="5%" 
+
-</tr>
-</table>
@@ -99 +110 @@
-    <td align='center'>&nbsp;</td>
-    <td align='center'>&nbsp;</td>
- 
-2
+        
+3
-    <td align='center'>&nbsp;</td>
-    <td align='center'>&nbsp;</td>
@@ -111 +122 @@
-    <input name="mac_{$value.id}" type="hidden" value="{$value.mac_strip}">
-    <tr>
-5px
-1%
-3%
-5%
-
+20
+48
+88
+16
+
-    <select name="model_list_{$value.id}">
-
+
-      {loop name="value.list"}
-
+
-      <option value="{$value.id}">{$value.model}</option>
-
+
-        {/loop}
-
+
-      </select></td>
-
+
+
+
+
+
+
+
-      <select name="ext_list_{$value.id}" id="ext">
-
+
-      {loop name="display_ext"}
-
+
-      <option value="{$value.value}">{$value.text}</option>
-
+
-        {/loop}
-
+
-      </select></td>
-18%
-9%
-5%
+220
+154
+73
-    </tr>
-    {/loop}
@@ -154 +171 @@
-<table width='90%' align='center'>
-  <tr>
-
-
-
-2
- 
+width="2%" 
+
+
+3
+        
-    <td align='center'><h3>Edit</h3></td>
-    <td align='center'><h3>Delete</h3></td>
@@ -165 +182 @@
-  {loop name="list"}
-  <tr>
-width='5px'
+
-  <td align='center' width='11%'>{$value.mac}</td>
-  <td width="13%" align='center'>{$value.name}</td>
-
+
+
-  <td width="19%" align='center'>{$value.ext} - {$value.description}</td>
-8
+5
-  <td align='center' width='9%'><a href=config.php?type=tool&display=epm_devices&editready=true&display=epm_devices&id={$value.id}><img src='{$web_path}templates/images/edit.gif' ALT='<?=_('Edit')?>' border='0'></a></td>
-5
+7
-  </tr>
-  {/loop}
-</table>
+
-<hr>
-<center>
@@ -211 +230 @@
-  <option value="{$value.value}">{$value.text}</option>
-  {/loop}
-  
+
-  <label>
-    <select name="template_selector" id="template_selector">
-      <option></option>
- 
+
-    <input type="submit" name="button_rebuild_reboot" value="<?=_('Rebuild & Reboot')?>">
-  </label></td>

contributed_modules/modules/endpointman/templates/global_header.html

@@ -62 +62 @@
-          $("#template_list").html(options);
-          $('#template_list option:first').attr('selected', 'selected');
-
+
+
+
+
+
+
+
+
+
+
-      })      
-    })
+
-    $(function(){
-      $("select#brand_list_selected").change(function(){
@@ -94 +104 @@
-  {/if}
-</head>
- onload="focus();displaymac.mac.focus()"
+
-<br>
-<h1><face="Arial"><center><?=_('End Point Configuration Manager')?></center></h1>

contributed_modules/modules/endpointman/templates/template_editor.html

@@ -20 +20 @@
-        <strong><?=_('Template Name')?>:</strong> <i>Custom Template: Extension {$ext}</i><br />
-        <strong><?=_('Product Line')?>:</strong> {$product}<br />
-
+
+
+
+
+
+
+
-  {/if}
-  {if condition="$custom == 0"}
@@ -28 +34 @@
-        <select name="model_list">
-        {loop name="models_ava"}
+        <option value="{$value.value}" {if condition="!empty($value.selected)"}selected{/if}>{$value.text}</option>
+        {/loop}
+        </select>
+        <strong><?=_('Area')?>:</strong>
+        <select name="area_list">
+        {loop name="area_ava"}
-        <option value="{$value.value}" {if condition="!empty($value.selected)"}selected{/if}>{$value.text}</option>
-        {/loop}
@@ -63 +75 @@
-                                    <td nowrap>
-            {if condition="$value.type == 'input'"}
+                                                
-                                        <label>{$value.description}: <input type='text' name='{$value.key}' value='{$value.value}' size="40"></label>
-            {elseif condition="$value.type == 'radio'"}

contributed_modules/modules/endpointman/uninstall.php

@@ -54 +54 @@
-$result = $db->query($sql);
-
+$sql = "DROP TABLE `endpointman_line_list`";
+$result = $db->query($sql);
+
-$sql = "DROP TABLE `endpointman_model_list`";
-$result = $db->query($sql);