Changeset 13276

Timestamp:

01/30/12 13:55:32 (1 year ago)

Author:

tm1000

Message:

Bring Endpoint Manager version up to 2.10.2.4. Fixes #5486

Files:

• modules/branches/2.10/endpointman/ari/modules/phonesettings.module (modified) (4 diffs)
• modules/branches/2.10/endpointman/functions.inc.php (modified) (1 diff)
• modules/branches/2.10/endpointman/includes/advanced.inc (modified) (4 diffs)
• modules/branches/2.10/endpointman/includes/functions.inc (modified) (119 diffs)
• modules/branches/2.10/endpointman/includes/popup.inc (modified) (1 diff)
• modules/branches/2.10/endpointman/install.php (modified) (5 diffs)
• modules/branches/2.10/endpointman/module.xml (modified) (1 diff)
• modules/branches/2.10/endpointman/provisioning/p.php (modified) (1 diff)
• modules/branches/2.10/endpointman/templates/freepbx/advanced_settings_settings.html (modified) (1 diff)
• modules/branches/2.10/endpointman/templates/freepbx/devices_manager.html (modified) (4 diffs)
• modules/branches/2.10/endpointman/templates/freepbx/specifics_pop.html (modified) (2 diffs)
• modules/branches/2.10/endpointman/templates/freepbx/template_editor.html (modified) (2 diffs)
• modules/branches/2.10/endpointman/templates/freepbx/variables.html (added)

modules/branches/2.10/endpointman/ari/modules/phonesettings.module

@@ -72 +72 @@
-
-        $sql = "SELECT mac_id, line FROM endpointman_line_list WHERE ext = '".$_SESSION['ari_user']['extension']."' ";
-db->getRow($sql, array()
+eda->sql($sql, 'getrow'
-
-        $mac_id = $mac_row['mac_id'];
@@ -109 +109 @@
-
-        $sql = "UPDATE endpointman_mac_list SET global_user_cfg_data = '".$custom_cfg_data."' WHERE id = ". $mac_id;
-db->query
+eda->sql
-
-        $reboot = isset($_REQUEST['epm_reboot'])?$_REQUEST['epm_reboot']:null;
@@ -149 +149 @@
-            die('No Database?');
-        }
-
+
-  global $amp_conf;
-
@@ -156 +156 @@
-
-        $endpoint = new endpointmanager();
-
+
-        $sql = "SELECT mac_id, line FROM endpointman_line_list WHERE ext = '".$_SESSION['ari_user']['extension']."' ";
-
-db->query
+eda->sql
-        if($res->numRows()) {
-
-db->getRow($sql, array()
+eda->sql($sql, 'getrow'
-
-            $mac_id = $mac_row['mac_id'];

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

@@ -150 +150 @@
-                        }
-                    }
-                } else {
-                    //Mac not set so delete
-                    $sql = "SELECT mac_id,luid FROM endpointman_line_list WHERE ext = ". $extdisplay;
-                    $macid = $endpoint->eda->sql($sql,'getRow',DB_FETCHMODE_ASSOC);
-                    if($macid) {
-                        //$endpoint->delete_line($macid['luid'], TRUE);
-                    }
-                }
-            }

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

@@ -376 +376 @@
-            $phone_config = new $class();
-
-
-
-
-
-
-
-
-
-
-
-
+
-            $template_file_list[0]['value'] = "template_data_custom.xml";
-            $template_file_list[0]['text'] = "template_data_custom.xml";
@@ -448 +438 @@
-                $_POST['config_loc'] = $_POST['config_loc'] ."/";
-            }
-
+
+
-            if((isset($_POST['config_loc'])) AND ($_POST['config_loc'] != "")) {
-                if((file_exists($_POST['config_loc'])) AND (is_dir($_POST['config_loc']))) {
@@ -454 +445 @@
-                        $sql="UPDATE endpointman_global_vars SET value='" . $_POST['config_loc'] . "' WHERE var_name='config_location'";
-                        $endpoint->eda->sql($sql);
+                        $tftp_writable = TRUE;
-                    } else {
-                        $endpoint->error['config_dir'] = "Directory Not Writable!";
-                    }
-                } else {
-
+ <br /> Try to run 'mkdir ".$_POST['config_loc']."' as root
-                }
-            } else {
@@ -464 +456 @@
-            }
-
+            //Check tftp server to make sure it's functioning if we are using it
+            if(($_POST['cfg_type'] == 'file') AND ($tftp_writable)) {
+                $endpoint->tftp_check();
+            }
+            
-            if((isset($_POST['enable_ari'])) AND ($_POST['enable_ari'] == "on")) {
-                $_POST['enable_ari'] = 1;

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

@@ -1 +1 @@
-<?php
+
-/**
- * Endpoint Manager Functions File
@@ -8 +9 @@
- */
-class endpointmanager {
+
-    //Load this class upon construction of the class
-
@@ -23 +25 @@
-     * @global object $db Pear DB information, we move this into a public variable
-     */
+
-    function __construct() {
-        global $amp_conf;
-
+
+
-        $this->eda = new epm_data_abstraction();
-
@@ -46 +50 @@
-            $this->global_cfg['disable_epm'] = TRUE;
-        }
-
-
+
-        define("UPDATE_PATH", $this->global_cfg['update_server']);
-
-
-
-
-
+
+
-        //Determine if local path is correct!
-(file_exists(MODULES_PATH.
-.
+ (file_exists(MODULES_PATH . 
+ . 
-        } else {
-            die("Can't Load Local Endpoint Manager Directory!");
@@ -62 +62 @@
-
-        //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
-(file_exists(MODULES_PATH.
-.
- 
-.
+ (file_exists(MODULES_PATH . 
+ . 
+
+ . 
-            if (!file_exists(PHONE_MODULES_PATH)) {
-                mkdir(PHONE_MODULES_PATH, 0764);
@@ -77 +77 @@
-                mkdir(PHONE_MODULES_PATH . "temp/", 0764);
-            }
-(!file_exists(MODULES_PATH.
+ (!file_exists(MODULES_PATH . 
-                die('Endpoint Manager can not create the modules folder!');
-            }
@@ -83 +83 @@
-
-        //include the local template class
-
-
-
-
+
+
+
+
+
+
-        }
-
-        //Define error reporting
-
+ 
-            error_reporting(E_ALL);
-            ini_set('display_errors', 1);
@@ -98 +100 @@
-
-        //Check if config location is writable and/or exists!
-
-
-
+ 
+ 
+ 
-                    $user = exec('whoami');
-                    $group = exec("groups");
-
-"<br />Please change the location: <a href='config.php?type=tool&display=epm_advanced'>Here</a>"
-"<br />Or run this command on SSH: 'chown -R ".$user.":".$group." ".$this->global_cfg['config_location']."' then 'chmod -R 777 ".$this->global_cfg['config_location'].
+ 
+    "<br />Please change the location: <a href='config.php?type=tool&display=epm_advanced'>Here</a>" 
+    "<br />Or run this command on SSH: 'chown -hR root:" . $group . " " . $this->global_cfg['config_location'] . "' then 'chmod g+w " . $this->global_cfg['config_location'] . 
-                    $this->global_cfg['diable_epm'] = TRUE;
-                }
@@ -113 +115 @@
-            }
-        }
-
+
-        $sql = 'SELECT value FROM `admin` WHERE `variable` LIKE CONVERT(_utf8 \'version\' USING latin1) COLLATE latin1_swedish_ci';
-
+
-        preg_match('/^(\d*)\.(\d*)/', $this->eda->sql($sql, 'getone'), $versions);
-
@@ -121 +123 @@
-        $this->global_cfg['amp_ver']['minor'] = $versions[2];
-
-
-
-
-
+
+
+
-            $this->tpl->assign("disable_help", 1);
-        }
-
-        $this->tpl->assign("amp_ver", $this->global_cfg['amp_ver']['minor']);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -150 +220 @@
-     * @param <type> $data The config file's data
-     */
-$product,$orig_name,
+ $product, $orig_name, 
-        $posturl = 'http://www.provisioner.net/submit_config.php';
-
-.
+ . 
-        fwrite($fp, $data);
-        fclose($fp);
-.
-
- 'file_contents'=>'@'.
+ . 
+
+'file_contents' => '@' . 
-
-        $ch = curl_init($posturl);
@@ -170 +240 @@
-        ob_start();
-        header("Content-Type: text/html");
-=
+ = 
-        curl_close($ch);
-        unlink($file_name_with_full_path);
@@ -179 +249 @@
-    function prepare_message_box() {
-        $error_message = NULL;
-
+ 
-            $error_message .= $error;
-
-.$key.
+ 
+ . $key . 
-            }
-            $error_message .= "<br />";
-        }
-        $message = NULL;
-
-
-
+ 
+ 
+ 
-                    $message .= $sub_error;
-                    if ($this->global_cfg['debug']) {
@@ -199 +269 @@
-                $message .= $error;
-                if ($this->global_cfg['debug']) {
-    
+
-                }
-                $message .= "<br />";
@@ -205 +275 @@
-        }
-
-
-
-
-
-
-
+ 
+ 
+
+
+ 
+ 
-        }
-    }
@@ -258 +328 @@
-     * @return array
-     */
-
+ 
-        //Check for valid mac address first
-
+ 
-            return(FALSE);
-        }
-
-        //Get the OUI only
-0,
+ 0, 
-        //Find the matching brand model to the oui
-. $oui .
+ . $oui . 
-        $brand = $this->eda->sql($oui_sql, 'getRow', DB_FETCHMODE_ASSOC);
-
@@ -275 +345 @@
-        if (!$brand_count) {
-            //oui doesn't have a matching mysql reference, probably a PC/router/wap/printer of some sort.
-
-
-
-
-
+ 
+ 
+
+ 
+ 
-        }
-
@@ -285 +355 @@
-    }
-
-$model,$ext,$template=NULL,$line=NULL,
+ $model, $ext, $template=NULL, $line=NULL, 
-
-        $mac = $this->mac_check_clean($mac);
-
-
-.
+ 
+ 
+ . 
-                return(FALSE);
-
-.
+ 
+ . 
-                return(FALSE);
-            } else {
-
-.$mac.
-'getRow',
-
-
-
+ 
+ . $mac . 
+ 'getRow', 
+
+ 
+ 
-                            $template = $dup['template_id'];
-                        }
-
-.$model.", template_id =  ".$template." WHERE id = ".
+ . $model . ", template_id =  " . $template . " WHERE id = " . 
-                        $this->eda->sql($sql);
-                        $return = $this->add_line($dup['id'], $line, $ext);
-
+ 
-                            return($return);
-                        } else {
@@ -314 +384 @@
-                        }
-                    } else {
-
+ 
-                            $template = 0;
-                        }
-
-.
-
-
-
+ . 
+ 
+
+ 
-                            $this->error['add_device'] = "You can't assign the same user to multiple devices!";
-                            return(FALSE);
-                        }
-
-
-.
-& $this->eda->sql($sql,
+ 
+ . 
+ & $this->eda->sql($sql, 
-                        } else {
-                            $name = $displayname;
-                        }
-
-.$model.
-
-& $this->eda->sql($sql,'getRow',
-
-.$mac."', '".$model."', '".$template.
+ . $model . 
+
+ & $this->eda->sql($sql, 'getRow', 
+
+ . $mac . "', '" . $model . "', '" . $template . 
-                        $this->eda->sql($sql);
-
-                        $sql = 'SELECT last_insert_id()';
-& $this->eda->sql($sql,
-
-
+ & $this->eda->sql($sql, 
+
+ 
-                            $line = 1;
-                        }
-
-.$ext_id."', '".$ext."', '".$line."', '".addslashes($name).
+ . $ext_id . "', '" . $ext . "', '" . $line . "', '" . addslashes($name) . 
-                        $this->eda->sql($sql);
-
-.$name." to line ".
+ . $name . " to line " . 
-                        return($ext_id);
-                    }
-                } else {
-.
+ . 
-                    return(FALSE);
-                }
-            }
-        } else {
-.
+ . 
-            return(FALSE);
-        }
-    }
-
-$line=NULL,$ext=NULL,
-
-($this->linesAvailable(NULL,
-
-
-'getAll',
-
-
-.
-=$this->eda->sql($sql,
-
-.$row['line']."', ext = ".$row['ext'].", description = '".addslashes($name)."' WHERE luid =  "
+ $line=NULL, $ext=NULL, 
+ 
+ ($this->linesAvailable(NULL, 
+ 
+ 
+ 'getAll', 
+
+ 
+ . 
+ = $this->eda->sql($sql, 
+
+ . $row['line'] . "', ext = " . $row['ext'] . ", description = '" . addslashes($name) . "' WHERE luid =  " 
-                        $this->eda->sql($sql);
-                    }
-
-                    $reg = array_values($this->display_registration_list());
-
-
-.
-
-
-.$mac_id."', '".$reg[0]['value']."', '".$lines[0]['value']."', '".addslashes($name).
+ 
+
+ . 
+ 
+
+ . $mac_id . "', '" . $reg[0]['value'] . "', '" . $lines[0]['value'] . "', '" . addslashes($name) . 
-                    $this->eda->sql($sql);
-
-.$name."</i>' to line '<i>".$lines[0]['value']."</i>' on device '<i>".$reg[0]['value'].
+ . $name . "</i>' to line '<i>" . $lines[0]['value'] . "</i>' on device '<i>" . $reg[0]['value'] . 
-                    return($mac_id);
-                } else {
-.
+ . 
-                    return(FALSE);
-                }
-            } else {
-.
+ . 
-                return(FALSE);
-            }
-
-($this->linesAvailable(NULL,
-
-
-
-.$mac_id."', '".$ext."', '".$lines[0]['value']."', '".addslashes($displayname).
+ 
+ ($this->linesAvailable(NULL, 
+ 
+ 
+
+ . $mac_id . "', '" . $ext . "', '" . $lines[0]['value'] . "', '" . addslashes($displayname) . 
-                    $this->eda->sql($sql);
-
-.$name."</i>' to line '<i>".$lines[0]['value']."</i>' on device '<i>".$reg[0]['value'].
+ . $name . "</i>' to line '<i>" . $lines[0]['value'] . "</i>' on device '<i>" . $reg[0]['value'] . 
-                    return($mac_id);
-                } else {
-.
+ . 
-                    return(FALSE);
-                }
-            } else {
-.
+ . 
-                return(FALSE);
-            }
-
-.$line."' AND mac_id = ".
-
-
+ 
+ . $line . "' AND mac_id = " . 
+ 
+ 
-                $this->error['add_line'] = "This line has already been assigned!";
-                return(FALSE);
-            } else {
-
-.
-& $this->eda->sql($sql,
+ 
+ . 
+ & $this->eda->sql($sql, 
-                } else {
-                    $name = $displayname;
-                }
-
-.$mac_id."', '".$ext."', '".$line."', '".addslashes($name).
+ . $mac_id . "', '" . $ext . "', '" . $line . "', '" . addslashes($name) . 
-                $this->eda->sql($sql);
-.$name." to line ".
+ . $name . " to line " . 
-                return($mac_id);
-            }
-
-
-
-
-
-
+
+
+
+
+
-        $this->eda->sql($sql);
-
-
-
-NULL,$name,
+ 
+ 
+ NULL, $name, 
-                return(TRUE);
-            } else {
-
+ 
-                return(TRUE);
-            }
@@ -454 +523 @@
-    }
-
-$macid=NULL,$name=NULL,
-
-.
+ $macid=NULL, $name=NULL, 
+ 
+ . 
-            $row = $this->eda->sql($sql, 'getRow', DB_FETCHMODE_ASSOC);
-
-
-.
-=$this->eda->sql($sql,
-
-
-
+ 
+ . 
+ = $this->eda->sql($sql, 
+
+
+ 
-                $line = $row['line'];
-            }
-.$line."', ext = '".$row['ext']."', description = '".$name."' WHERE luid =  "
+ . $line . "', ext = '" . $row['ext'] . "', description = '" . $name . "' WHERE luid =  " 
-            $this->eda->sql($sql);
-            return(TRUE);
-        } else {
-.
+ . 
-            $lines_info = $this->eda->sql($sql, 'getAll', DB_FETCHMODE_ASSOC);
-
-.
-=$this->eda->sql($sql,
-
-.$row['line']."', ext = '".$row['ext']."', description = '".$name."' WHERE luid =  "
+ 
+ . 
+ = $this->eda->sql($sql, 
+
+ . $row['line'] . "', ext = '" . $row['ext'] . "', description = '" . $name . "' WHERE luid =  " 
-                $this->eda->sql($sql);
-            }
@@ -489 +558 @@
-     * @return <type>
-     */
-
-.$lineid 
-
+ 
+ . $lineid
+ 
-        $row = $this->get_phone_info($mac_id);
-
-.
-
-
-.
+ . 
+ 
+ 
+ . 
-            $this->eda->sql($sql);
-            $this->message['delete_line'] = "Deleted!";
-            return(TRUE);
-        } else {
-
-.
+ 
+ . 
-                $this->eda->sql($sql);
-
-
+ 
-                $this->eda->sql($sql);
-                $this->message['delete_line'] = "Deleted!";
-                return(TRUE);
-            } else {
-.
+ . 
-                return(FALSE);
-            }
@@ -518 +587 @@
-
-    function delete_device($mac_id) {
-.
+ . 
-        $this->eda->sql($sql);
-
-.
+ . 
-        $this->eda->sql($sql);
-        $this->message['delete_device'] = "Deleted!";
@@ -528 +597 @@
-
-    function get_message($function_name) {
-
+ 
-            return($this->message[$function_name]);
-        } else {
@@ -534 +603 @@
-        }
-    }
+
-    /**
-     * Send this function an ID from the mac devices list table and you'll get all the information we have on that particular phone
@@ -586 +656 @@
-            return(FALSE);
-        }
-.
+ . 
-
-        $res = $this->eda->sql($sql);
-
+ 
-            //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,
-
+ 
-
-            $phone_info = $this->eda->sql($sql, 'getRow', DB_FETCHMODE_ASSOC);
-
-
+ 
-                $this->error['get_phone_info'] = "Error with SQL Statement";
-            }
@@ -601 +671 @@
-            //If there is a template associated with this phone then pull that information and put it into the array
-            if ($phone_info['template_id'] > 0) {
-.
+ . 
-
-                $phone_info['template_data_info'] = $this->eda->sql($sql, 'getRow', DB_FETCHMODE_ASSOC);
-
-
-
-
+
+
+
-            $lines_info = $this->eda->sql($sql, 'getAll', DB_FETCHMODE_ASSOC);
-
+ 
-                $phone_info['line'][$line['line']] = $line;
-                $phone_info['line'][$line['line']]['description'] = $line['epm_description'];
-
-
-
-
-
+
+
+
-            //Phone is unknown, we need to display this to the end user so that they can make corrections
-            $row = $this->eda->sql($sql, 'getRow', DB_FETCHMODE_ASSOC);
-
-            $brand = $this->get_brand_from_mac($row['mac']);
-
+ 
-                $phone_info['brand_id'] = $brand['id'];
-                $phone_info['name'] = $brand['name'];
@@ -634 +701 @@
-            $phone_info['custom_cfg_template'] = 0;
-            $phone_info['mac'] = $row['mac'];
-.
+ . 
-            $lines_info = $this->eda->sql($sql, 'getAll', DB_FETCHMODE_ASSOC);
-
+ 
-                $phone_info['line'][$line['line']] = $line;
-            }
@@ -655 +722 @@
-        $alt_configs = NULL;
-
-
-.
-
-.
-
-
-
+ 
+ . 
+
+ . 
+
+
+ 
-
-        //Make sure the model data from the local confg files are stored in the database and vice-versa. Serious errors will occur if the database is not in sync with the local file
-
-
+ 
+ 
-        }
-
-
-        //Determine if we are dealing with a general template or a specific [for that phone only] template (custom =0 means general)
-
-.
-
-.$id.
+ 
+ . 
+
+ . $id . 
-        }
-
@@ -679 +746 @@
-
-        $this->tpl->assign("template_editor_display", 1);
- 'global_header' 
+'global_header'
-        //Let the template system know if we are working with a general template or a specific [for that phone only] template
-        $this->tpl->assign("custom", $custom);
-
+ 
-            $this->tpl->assign("ext", $row['ext']);
-        } else {
@@ -690 +757 @@
-        $this->tpl->assign("model", $row['model_name']);
-
-
+ 
-            $this->tpl->assign("models_ava", $ma);
-        }
-
-
-
+ 
+ 
-        } else {
-            $areas = $this->areaAvailable($row['model_id'], 3);
@@ -702 +769 @@
-        $this->tpl->assign("area_ava", $areas);
-        //Start the display of the html file in the product folder
-
+ 
-            $config_files_saved = "";
-        } else {
-            $config_files_saved = unserialize($row['config_files_override']);
-        }
-
+ 
-        $i = 0;
-        $alt = 0;
-
-=
-=
+ = 
+ = 
-        $only_configs = array();
-
-.$row['product_id']."' AND original_name = '".$files.
+ 
+ . $row['product_id'] . "' AND original_name = '" . $files . 
-            $alt_configs_list_count = $this->eda->sql($sql);
-
+ 
-                $alt_configs_list = $this->eda->sql($sql, 'getAll', DB_FETCHMODE_ASSOC);
-                $alt_configs[$i]['name'] = $files;
-"_",
-=
-
+ "_", 
+ = 
+ 
-                    $alt_configs[$i]['list'][$h]['id'] = $ccf['id'];
-                    $cf_key = $files;
-
+ 
-                        $alt_configs[$i]['list'][$h]['selected'] = 'selected';
-                    }
@@ -742 +809 @@
-        $this->tpl->assign("alt_configs", $alt_configs);
-        $this->tpl->assign("alt", $alt);
-
+ 
-            $maxlines = 3;
-        } else {
-            $maxlines = $_REQUEST['maxlines'];
-        }
-
-$row['global_custom_cfg_data'],
+ 
+ $row['global_custom_cfg_data'], 
-        } else {
-            echo "No Template Data has been defined for this Product<br />";
@@ -756 +823 @@
-        $this->tpl->assign("hidden_id", $row['id']);
-        $this->tpl->assign("hidden_custom", $custom);
- 'template_editor' 
+'template_editor'
-
-        $this->tpl->assign("debug", "");
-
-    }
-
@@ -770 +836 @@
-     * @return <type>
-     */
-$custom_cfg_data=NULL, $admin=FALSE, $user_cfg_data=NULL,$max_lines=3,
+ $custom_cfg_data=NULL, $admin=FALSE, $user_cfg_data=NULL, $max_lines=3, 
-        //take the data out of the database and turn it back into an array for use
-        $cfg_data = unserialize($cfg_data);
-
-
-
+
-        //Check to see if there is a custom template for this phone already listed in the endpointman_mac_list database
-        if (!empty($custom_cfg_data)) {
-            $custom_cfg_data = unserialize($custom_cfg_data);
-
-
+
+
+
+
+
+
+
-                $custom_cfg_data = $custom_cfg_data['data'];
-            } else {
-custom_cfg_data_ari
+extra_data
-            }
-        } else {
-            $custom_cfg_data = array();
-custom_cfg_data_ari
-
-
+extra_data
+
+ 
-            $user_cfg_data = unserialize($user_cfg_data);
-        }
@@ -797 +866 @@
-        $variables_count = 0;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    } else {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                $variables_count++;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                        $variables_count++;
-                                    }
-                                }
-break
+continue 2
-                        }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return($template_variables_array);
-    }
@@ -969 +987 @@
-     * @return array
-     */
- ($i,$cfg_data,$key=NULL,$custom_cfg_data=NULL,$admin=FALSE,$user_cfg_data=NULL,$custom_cfg_data_ari=NULL
+($i, $cfg_data, $key=NULL, $custom_cfg_data=NULL, $admin=FALSE, $user_cfg_data=NULL, $extra_data=NULL,$template_type='GENERAL'
-        switch ($cfg_data['type']) {
-            case "input":
-
+ 
-                    $custom_cfg_data[$key] = $user_cfg_data[$key];
-                }
-                $template_variables_array['type'] = "input";
-
+ 
-                    $template_variables_array['max_chars'] = $cfg_data['max_chars'];
-                }
-                $template_variables_array['key'] = $key;
-$custom_cfg_data[$key
+isset($custom_cfg_data[$key]) ? $custom_cfg_data[$key] : $cfg_data['default_value'
-                $template_variables_array['description'] = $cfg_data['description'];
-                break;
-            case "radio":
-
+ 
-                    $custom_cfg_data[$key] = $user_cfg_data[$key];
-                }
-$custom_cfg_data[$key
+isset($custom_cfg_data[$key]) ? $custom_cfg_data[$key] : $cfg_data['default_value'
-                $template_variables_array['type'] = "radio";
-                $template_variables_array['key'] = $key;
-                $template_variables_array['description'] = $cfg_data['description'];
-                $z = 0;
-
+ 
-                    $template_variables_array['data'][$z]['key'] = $key;
-                    $template_variables_array['data'][$z]['value'] = $cfg_data['data'][$z]['value'];
@@ -1003 +1021 @@
-                break;
-            case "list":
-
+ 
-                    $custom_cfg_data[$key] = $user_cfg_data[$key];
-                }
-$custom_cfg_data[$key
+isset($custom_cfg_data[$key]) ? $custom_cfg_data[$key] : $cfg_data['default_value'
-                $template_variables_array['type'] = "list";
-                $template_variables_array['key'] = $key;
-                $template_variables_array['description'] = $cfg_data['description'];
-                $z = 0;
-
+ 
-                    $template_variables_array['data'][$z]['value'] = $cfg_data['data'][$z]['value'];
-                    $template_variables_array['data'][$z]['description'] = $cfg_data['data'][$z]['text'];
@@ -1029 +1047 @@
-                break;
-            case "checkbox":
-
+ 
-                    $custom_cfg_data[$key] = $user_cfg_data[$key];
-                }
-$custom_cfg_data[$key
+isset($custom_cfg_data[$key]) ? $custom_cfg_data[$key] : $cfg_data['default_value'
-                $template_variables_array['type'] = "checkbox";
-                $template_variables_array['key'] = $key;
-                $template_variables_array['description'] = $cfg_data['description'];
-
-
-
-
-
-
-
-
-
-
+
+
-                break;
-            case "file";
-
+ 
-                    $custom_cfg_data[$key] = $user_cfg_data[$key];
-                }
-                $template_variables_array['type'] = "file";
-
+ 
-                    $template_variables_array['max_chars'] = $cfg_data['max_chars'];
-                }
@@ -1060 +1070 @@
-                break;
-            case "textarea":
-
+ 
-                    $custom_cfg_data[$key] = $user_cfg_data[$key];
-                }
-                $template_variables_array['type'] = "textarea";
-
+ 
-                    $template_variables_array['max_chars'] = $cfg_data['max_chars'];
-                }
-                $template_variables_array['key'] = $key;
-$custom_cfg_data[$key
+isset($custom_cfg_data[$key]) ? $custom_cfg_data[$key] : $cfg_data['default_value'
-                $template_variables_array['description'] = $cfg_data['description'];
-                break;
-            case "break":
-if
+ if 
-                    $template_variables_array['type'] = "break";
-
+ 
-                    $template_variables_array['type'] = "NA";
-
-
+ 
+ 
-            default:
-                $template_variables_array['type'] = "NA";
@@ -1083 +1093 @@
-        }
-
- if
- 
- 
-
-(($this->global_cfg['enable_ari']) AND ($admin) AND ($cfg_data['type'] != "break") AND ($cfg_data['type'] != "group"
-
+        if 
+        
+        
+
+ (($this->global_cfg['enable_ari']) AND ($admin) AND ($cfg_data['type'] != "break") AND ($cfg_data['type'] != "group") AND ($template_type == 'GENERAL'
+
-            $template_variables_array['aried'] = 1;
-            $template_variables_array['ari']['key'] = $key;
-
+
+
-                $template_variables_array['ari']['checked'] = "checked";
+            }
+        }
+        
+        if($template_type == 'GLOBAL') {
+            $template_variables_array['freepbxed'] = 1;
+            $template_variables_array['freepbx']['key'] = $key;
+            if(empty($extra_data)) {
+                $template_variables_array['freepbx']['checked'] = TRUE;
+            } elseif (isset($extra_data[$key])) {
+                $template_variables_array['freepbx']['checked'] = TRUE;
-            }
-        }
@@ -1108 +1129 @@
-        //Custom Means specific to that MAC
-        //This function is reversed. Not sure why
-
-.$id.
-
-.
+ 
+ . $id . 
+
+ . 
-        }
-
@@ -1122 +1143 @@
-        $custom_cfg_data_ari = array();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                    }
-                                }
-                            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                    }
-                                }
-                            }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        $i = 0;
-
-"_",
-
-
+ 
+ "_", 
+ 
+ 
-                $_REQUEST[$config_files[$i]] = $_REQUEST[$config_files[$i]][0];
-
+ 
-                    $config_files_selected[$config_files[$i]] = $_REQUEST[$config_files[$i]];
-                }
@@ -1200 +1218 @@
-        }
-
-
+ 
-            $config_files_selected = "";
-        } else {
@@ -1207 +1225 @@
-        $custom_cfg_data_temp['data'] = $custom_cfg_data;
-        $custom_cfg_data_temp['ari'] = $custom_cfg_data_ari;
+
-        $save = serialize($custom_cfg_data_temp);
-
-
-.addslashes($config_files_selected).'\', global_custom_cfg_data = \''.addslashes($save).'\' WHERE id ='.
+ 
+ . addslashes($config_files_selected) . '\', global_custom_cfg_data = \'' . addslashes($save) . '\' WHERE id =' . 
-            $location = "template_manager";
-        } else {
-.addslashes($config_files_selected).'\', template_id = 0, global_custom_cfg_data = \''.addslashes($save).'\' WHERE id ='.
+ . addslashes($config_files_selected) . '\', template_id = 0, global_custom_cfg_data = \'' . addslashes($save) . '\' WHERE id =' . 
-            $location = "devices_manager";
-        }
-
+
-        $this->eda->sql($sql);
-
-        $phone_info = array();
-
-
+ 
-            $phone_info = $this->get_phone_info($id);
-
+ 
-                $this->prepare_configs($phone_info);
-            } else {
-
-
-
-.
+ 
+
+
+ . 
-            $phones = $this->eda->sql($sql, 'getAll', DB_FETCHMODE_ASSOC);
-
+ 
-                $phone_info = $this->get_phone_info($data['id']);
-
+ 
-                    $this->prepare_configs($phone_info);
-                } else {
-
-
-
-
-
-
+ 
+
+
+
+
+ 
-            echo '<script language="javascript" type="text/javascript">window.close();</script>';
-        } else {
-            return($location);
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -1255 +1351 @@
-     * @param bool  $write  Write out Directory structure.
-     */
-$reboot=TRUE,
-
-(file_exists(PHONE_MODULES_PATH.
-
-.
+ $reboot=TRUE, 
+
+ (file_exists(PHONE_MODULES_PATH . 
+ 
+ . 
-            }
-
-            //Load Provisioner
-            $class = "endpoint_" . $phone_info['directory'] . "_" . $phone_info['cfg_dir'] . '_phone';
-
+ 
-            $master_class = "endpoint_base";
-
-
-
-
+
-                ProvisionerConfig::endpointsAutoload($master_class);
-            }
-
+ 
-                ProvisionerConfig::endpointsAutoload($base_class);
-            }
-
+ 
-                ProvisionerConfig::endpointsAutoload($class);
-            }
-
-
-
+
+
-                $provisioner_lib = new $class();
-
-                //Determine if global settings have been overridden
-
-
+ 
+ 
-                        $settings = unserialize($phone_info['template_data_info']['global_settings_override']);
-                    } else {
@@ -1294 +1386 @@
-                    }
-                } else {
-
+ 
-                        $settings = unserialize($phone_info['global_settings_override']);
-                    } else {
@@ -1316 +1408 @@
-                $provisioner_lib->family_line = $phone_info['cfg_dir'];
-
-
-
+
-
-                //Phone Model (Please reference family_data.xml in the family directory for a list of recognized models)
@@ -1327 +1418 @@
-                try {
-                    $provisioner_lib->DateTimeZone = new DateTimeZone($settings['tz']);
-
-Caught exception: '
+ 
+Error Returned From Timezone Library: ' 
-                    return(FALSE);
-                }
-
-                //Network Time Server
-                $provisioner_lib->ntp = $settings['ntp'];
-
-                //Server IP
-                $provisioner_lib->server[1]['ip'] = $settings['srvip'];
-                $provisioner_lib->server[1]['port'] = 5060;
-
-                $temp = "";
-                $template_data = unserialize($phone_info['template_data']);
-                $global_user_cfg_data = unserialize($phone_info['global_user_cfg_data']);
-
+ 
-                    $global_custom_cfg_data = unserialize($phone_info['template_data_info']['global_custom_cfg_data']);
-                    //Provide alternate Configuration file instead of the one from the hard drive
-
+ 
-                        $temp = unserialize($phone_info['template_data_info']['config_files_override']);
-
-.
+ 
+ . 
-                            $res = $this->eda->sql($sql);
-
-
+ 
+ 
-                                $provisioner_lib->config_files_override[$data['original_name']] = $data['data'];
-                            }
@@ -1359 +1443 @@
-                    $global_custom_cfg_data = unserialize($phone_info['global_custom_cfg_data']);
-                    //Provide alternate Configuration file instead of the one from the hard drive
-
+ 
-                        $temp = unserialize($phone_info['config_files_override']);
-
-.
+ 
+ . 
-                            $res = $this->eda->sql($sql);
-
-
+ 
+ 
-                                $provisioner_lib->config_files_override[$data['original_name']] = $data['data'];
-                            }
@@ -1373 +1457 @@
-
-                if (!empty($global_custom_cfg_data)) {
-
+ 
-                        $global_custom_cfg_ari = $global_custom_cfg_data['ari'];
-                        $global_custom_cfg_data = $global_custom_cfg_data['data'];
@@ -1384 +1468 @@
-                $new_template_data = array();
-                $line_ops = array();
-
-
+
+
+
-                        $full_key = $key;
-
+ 
-                        $count = count($key);
-
+ 
-                            case 1:
-
+ 
-                                    $new_template_data[$full_key] = $global_user_cfg_data[$full_key];
-                                } else {
@@ -1398 +1483 @@
-                                break;
-                            case 2:
-
-
-
+ 
+ 
+'loops'][
-                                } else {
-
+'loops'][
-                                }
-                                break;
-                            case 3:
-
+ 
-                                    $line_ops[$key[1]][$key[2]] = $global_user_cfg_data[$full_key];
-                                } else {
@@ -1416 +1501 @@
-                }
-
-                //Loop through Lines!
-                foreach($phone_info['line'] as $line) {
-                    $provisioner_lib->lines[$line['line']] = array('ext' => $line['ext'], 'secret' => $line['secret'], 'displayname' => $line['description']);
-                }
-
-        //testing this out
-                foreach ($line_ops as $key => $data) {
-                    if (isset($line_ops[$key])) {
-                        $provisioner_lib->lines[$key]['options'] = $line_ops[$key];
-                    }
-                }
-
-                if (!$write) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                //Set Variables according to the template_data files included. We can include different template.xml files within family_data.xml also one can create
-                //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
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                //Setting a line variable here...these aren't defined in the template_data.xml file yet. however they will still be parsed
-                //and if they have defaults assigned in a future template_data.xml or in the config file using pipes (|) those will be used, pipes take precedence
-.
+ . 
-
-                // Because every brand is an extension (eventually) of endpoint, you know this function will exist regardless of who it is
-                //Start timer
-                $time_start = microtime(true);
-
+
+
+
+
+
+
+
+
+
+
+
+
-                //End timer
-                $time_end = microtime(true);
-                $time = $time_end - $time_start;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                } else {
-
-
-
-
+
-                }
-                return(TRUE);
-            } else {
-.$class.
+ . $class . 
-                return(FALSE);
-            }
@@ -1547 +1623 @@
-     */
-    function firmware_update_check($id=NULL) {
-. $id.
-'getRow',
-
-
-
+ . $id . 
+ 'getRow', 
+
+ 
+ 
-
-        //config drive unknown!
@@ -1557 +1633 @@
-            return FALSE;
-        } else {
-xml2array(PHONE_MODULES_PATH."endpoint/".$brand_directory."/".$row['cfg_dir']."/family_data.xml
-((array_key_exists('data',
-
+file2json(PHONE_MODULES_PATH . "endpoint/" . $brand_directory . "/" . $row['cfg_dir'] . "/family_data.json
+ ((array_key_exists('data', 
+ 
-                    return $temp;
-                } else {
@@ -1568 +1644 @@
-            }
-        }
-
-    }
-
@@ -1577 +1652 @@
-     */
-    function firmware_local_check($id=NULL) {
-. $id .
+ . $id . 
-        $res = $this->eda->sql($sql);
-
-
-'getRow',
-
-
-
+ 
+ 'getRow', 
+
+ 
+ 
-
-            //config drive unknown!
@@ -1590 +1665 @@
-                return("nothing");
-            } else {
-xml2array(PHONE_MODULES_PATH."endpoint/".$brand_directory."/".$row['cfg_dir']."/family_data.xml
-
-((isset ($temp['data']['firmware_ver'])) AND (!is_array($temp['data']['firmware_ver']))
-
+file2json(PHONE_MODULES_PATH . "endpoint/" . $brand_directory . "/" . $row['cfg_dir'] . "/family_data.json
+
+ ($temp['data']['firmware_ver'] != NULL
+ 
-                        return("install");
-                    } else {
@@ -1612 +1687 @@
-     */
-    function remove_firmware($id) {
-
-
-
-
+ 
+ 
+
+ 
-        $i = 0;
-
-(file_exists($this->global_cfg['config_location'].
-.
-
-
-.
+ 
+ (file_exists($this->global_cfg['config_location'] . 
+ . 
+
+
+ . 
-        $this->eda->sql($sql);
-    }
@@ -1631 +1706 @@
-     */
-    function install_firmware($product_id) {
-.
+ . 
-        $row = $this->eda->sql($sql, 'getRow', DB_FETCHMODE_ASSOC);
-xml2array(PHONE_MODULES_PATH."endpoint/".$row['directory']."/".$row['cfg_dir']."/family_data.xml
-
+file2json(PHONE_MODULES_PATH . "endpoint/" . $row['directory'] . "/" . $row['cfg_dir'] . "/family_data.json
+ 
-            echo "<div style='float: left'>Downloading firmware...</div><div style='float: left' id=\"DivExample\">.</div>";
-.$row['directory']."/". $temp['data']['firmware_pkg'], PHONE_MODULES_PATH."temp/".
+ . $row['directory'] . "/" . $temp['data']['firmware_pkg'], PHONE_MODULES_PATH . "temp/" . 
-            echo "<script type='text/javascript'>document.getElementById('DivExample').innerHTML='Done!';</script><br />";
-            $md5_xml = $temp['data']['firmware_md5sum'];
-.'temp/'
+ . 'temp/' 
-            echo "Checking MD5sum of Package...";
-            if ($md5_xml == $md5_pkg) {
-                echo "Matches!<br />";
-(!file_exists(PHONE_MODULES_PATH."endpoint/".$row['directory']."/".$row['cfg_dir'].
-."endpoint/".$row['directory']."/".$row['cfg_dir'].
+ (!file_exists(PHONE_MODULES_PATH . "endpoint/" . $row['directory'] . "/" . $row['cfg_dir'] . 
+ . "endpoint/" . $row['directory'] . "/" . $row['cfg_dir'] . 
-                }
-                echo "Installing Firmware...";
-.PHONE_MODULES_PATH."endpoint/".$row['directory']."/".$row['cfg_dir'].
-."endpoint/".$row['directory']."/".$row['cfg_dir'].
-.PHONE_MODULES_PATH.'temp/'. $temp['data']['firmware_pkg'] ." -C ".PHONE_MODULES_PATH."endpoint/".$row['directory']."/".
+ . PHONE_MODULES_PATH . "endpoint/" . $row['directory'] . "/" . $row['cfg_dir'] . 
+ . "endpoint/" . $row['directory'] . "/" . $row['cfg_dir'] . 
+ . PHONE_MODULES_PATH . 'temp/' . $temp['data']['firmware_pkg'] . " -C " . PHONE_MODULES_PATH . "endpoint/" . $row['directory'] . "/" . 
-                $i = 0;
-."endpoint/".$row['directory']."/".$row['cfg_dir'].
+ . "endpoint/" . $row['directory'] . "/" . $row['cfg_dir'] . 
-                    $file = basename($filename);
-                    $list[$i] = $file;
-.
+ . 
-                        echo "<br />--Failed To Copy $file...";
-                        $copy_error = TRUE;
-
-.$file." to "
+ 
+ . $file . " to " 
-                    }
-                    $i++;
-                }
-                $list = implode(",", $list);
-.$temp['data']['firmware_ver']."', firmware_files = '".$list."' WHERE id = "
+ . $temp['data']['firmware_ver'] . "', firmware_files = '" . $list . "' WHERE id = " 
-                $this->eda->sql($sql);
-
+ 
-                    echo "<BR />Copy Error Detected! Aborting Install!";
-                    $this->remove_firmware($product_id);
@@ -1677 +1752 @@
-        } else {
-            echo "<BR />Your Firmware is already up to date";
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-            $directory = "master";
-        } else {
-(!file_exists(PHONE_MODULES_PATH.'/'.
-.'/'.$directory,0764,
- 
-.'/'.$directory.'/brand_data.xml
-
-.'temp/'.$directory.'.xml
+ (!file_exists(PHONE_MODULES_PATH . '/' . 
+ . '/' . $directory, 0764, 
+
+ . '/' . $directory . '/brand_data.json
+
+ . 'temp/' . $directory . '.json
-        file_exists(dirname($temp_file)) ? '' : mkdir(dirname($temp_file));
-
-($this->download_xml
+
+ ($this->download
-            $handle = fopen($temp_file, "rb");
-            $contents = fread($handle, filesize($temp_file));
-            fclose($handle);
-
-@$a = simplexml_load_string
-($a===
+
+$a = $this->validate_json
+ ($a === 
-                //Error with the internet....ABORRRTTTT THEEEEE DOWNLOAAAAADDDDDDDD! SCOTTYYYY!;
-                unlink($temp_file);
@@ -1734 +1780 @@
-            } else {
-                rename($temp_file, $destination_file);
-
+ 
-                return(TRUE);
-            }
@@ -1748 +1794 @@
-     */
-    function update_check() {
-
+
+
-        
-        
-
+ 
-            $this->error['brand_update_check_master'] = "Not able to connect to repository. Using local master file instead.";
-        }
-
-xml2array(PHONE_MODULES_PATH.'master.xml
+
+file2json(PHONE_MODULES_PATH . 'master.json
-        $endpoint_package = $temp['data']['package'];
-        $endpoint_last_mod = $temp['data']['last_modified'];
-
-        $sql = "SELECT value FROM endpointman_global_vars WHERE var_name LIKE 'endpoint_vers'";
-
-
-.
-
-
-
-
-((!$master_result) OR (!$this->download_file_no_progress_bar(UPDATE_PATH.'/'.$endpoint_package, PHONE_MODULES_PATH."temp/".
-xml
+ 
+
+ . 
+
+
+ 
+ 
+ ((!$master_result) OR (!$this->download_file(UPDATE_PATH . '/' . $endpoint_package, PHONE_MODULES_PATH . "temp/" . 
+json
-                } else {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                    $this->eda->sql($sql);
-                }
@@ -1788 +1837 @@
-
-            //Assume that if we can't connect and find the master.xml file then why should we try to find every other file.
-
+ 
-                $row = $this->eda->sql('SELECT * FROM  endpointman_brand_list WHERE id > 0', 'getAll', DB_FETCHMODE_ASSOC);
-
-
-
-.$data['directory']."'",
-
-
-xml(UPDATE_PATH .$data['directory']."/".$data['directory'].".xml","endpoint/".$data['directory']
-
-.$data['name'].
+ 
+
+ . $data['directory'] . "'", 
+
+ 
+file(UPDATE_PATH . $data['directory'] . "/" . $data['directory'] . ".json", PHONE_MODULES_PATH . "endpoint/" . $data['directory'] . "/brand_data.json"
+ 
+ . $data['name'] . 
-                        }
-                    }
-
-(file_exists(PHONE_MODULES_PATH."endpoint/".$data['directory']."/brand_data.xml
-xml2array(PHONE_MODULES_PATH."endpoint/".$data['directory']."/brand_data.xml
+ (file_exists(PHONE_MODULES_PATH . "endpoint/" . $data['directory'] . "/brand_data.json
+file2json(PHONE_MODULES_PATH . "endpoint/" . $data['directory'] . "/brand_data.json
-
-                        $temp = $temp['data']['brands'];
-
-
-
-
-
+
+
-                            $this->eda->sql($sql);
-
-                        }
-
@@ -1820 +1866 @@
-                        $last_mod = "";
-
-
-
-
+
-                            $last_mod = max($last_mod, $list['last_modified']);
-                        }
@@ -1829 +1873 @@
-                        $version[$brand_name] = $last_mod;
-
-
+ 
-                            //insert row
-.$temp['brand_id']."', '".$temp['name']."', '".$temp['directory']."', '".$version[$brand_name].
+ . $temp['brand_id'] . "', '" . $temp['name'] . "', '" . $temp['directory'] . "', '" . $version[$brand_name] . 
-                            $this->eda->sql($sql);
-                        } else {
@@ -1837 +1881 @@
-                        }
-                    } else {
-.$data['name']."!<br /><br />Learn how to manually upload packages here (it's easy!): <a href='http://projects.colsolgrp.net/documents/28
-
-
-
-
+ . $data['name'] . "!<br /><br />Learn how to manually upload packages here (it's easy!): <a href='http://wiki.provisioner.net/index.php/Endpoint_manager_manual_upload
+
+
+
+ 
-                    $key = $this->arraysearchrecursive($ava_brands['directory'], $out, 'directory');
-
+ 
-                        $this->remove_brand($ava_brands['id']);
-                    } else {
@@ -1850 +1894 @@
-                        $brand_name = $ava_brands['directory'];
-
-
+
+
-                            $out[$key]['update'] = 1;
-                            $out[$key]['update_vers'] = $version[$brand_name];
@@ -1859 +1904 @@
-                }
-            } else {
-projects.colsolgrp.net/documents/28
+wiki.provisioner.net/index.php/Endpoint_manager_manual_upload
-            }
-
@@ -1873 +1918 @@
-     */
-    function download_brand($id) {
-.
-XML
-xml(UPDATE_PATH .$row[0]['directory']. "/".$row[0]['directory'].".xml","endpoint/".$row[0]['directory']
-
-
+ . 
+JSON
+file(UPDATE_PATH . $row[0]['directory'] . "/" . $row[0]['directory'] . ".json", PHONE_MODULES_PATH . "endpoint/" . $row[0]['directory'] . "/brand_data.json"
+
+ 
-            echo "Done!<br/>";
-
-xml2array(PHONE_MODULES_PATH.'endpoint/'. $row[0]['directory'].'/brand_data.xml
+file2json(PHONE_MODULES_PATH . 'endpoint/' . $row[0]['directory'] . '/brand_data.json
-            $package = $temp['data']['brands']['package'];
-
-            echo "<div style='float: left'>Downloading Brand Package...</div><div style='float: left' id=\"DivExample\">.</div>";
-.$row[0]['directory'].'/'.$package, PHONE_MODULES_PATH."temp/".
+ . $row[0]['directory'] . '/' . $package, PHONE_MODULES_PATH . "temp/" . 
-            echo "<script type='text/javascript'>document.getElementById('DivExample').innerHTML='Done!';</script><br />";
-
-(file_exists(PHONE_MODULES_PATH.'temp/'
+ (file_exists(PHONE_MODULES_PATH . 'temp/' 
-                $md5_xml = $temp['data']['brands']['md5sum'];
-.'temp/'
+ . 'temp/' 
-
-                echo "Checking MD5sum of Package....";
-
+ 
-                    echo "Done!<br/>";
-                    echo "Extracting Tarball........";
-.PHONE_MODULES_PATH.'temp/'. $package ." -C ".PHONE_MODULES_PATH.
+ . PHONE_MODULES_PATH . 'temp/' . $package . " -C " . PHONE_MODULES_PATH . 
-                    echo "Done!<br />";
-
-
-
-
-
-
-
+
+
+
+
-                } else {
-                    echo "MD5 Did not match!";
@@ -1919 +1962 @@
-     * Still needs way to determine when models move...perhaps another function?
-     */
-
-(file_exists(PHONE_MODULES_PATH.'temp/'. $package.'/brand_data.xml
-xml2array(PHONE_MODULES_PATH.'temp/'. $package.'/brand_data.xml
-
-XML
+ 
+ (file_exists(PHONE_MODULES_PATH . 'temp/' . $package . '/brand_data.json
+file2json(PHONE_MODULES_PATH . 'temp/' . $package . '/brand_data.json
+ 
+JSON
-
-                //Pull in all variables
@@ -1929 +1972 @@
-                $brand_name = $temp['data']['brands']['name'];
-                $brand_id = $temp['data']['brands']['brand_id'];
-
-
+
-
-                //create directory structure and move files
-                echo "Creating Directory Structure/Moving Files..";
-
-
-
-
+
+
+
+
+
-                $iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST);
-                foreach ($iterator as $file) {
-
-."temp/".$directory.
-(!file_exists(PHONE_MODULES_PATH."endpoint/".$directory."/".
-."endpoint/".$directory."/".$dir,
+ 
+ . "temp/" . $directory . 
+ (!file_exists(PHONE_MODULES_PATH . "endpoint/" . $directory . "/" . 
+ . "endpoint/" . $directory . "/" . $dir, 
-                            echo ".";
-                        }
-                    } else {
-((basename($file) != "brand_data.xml
-."temp/".$directory.
-."endpoint/".$directory."/".
-
-
+ ((basename($file) != "brand_data.json
+ . "temp/" . $directory . 
+ . "endpoint/" . $directory . "/" . 
+ 
+ 
-                            }
-."endpoint/".$directory."/".$dir,
+ . "endpoint/" . $directory . "/" . $dir, 
-                            echo ".";
-                        }
@@ -1960 +2004 @@
-                echo "Done!<br />";
-
-
+ 
-                    $local = 0;
-                } else {
-                    $local = 1;
-                }
-
-
-
-
+
+
+
-                    echo "Updating data..........";
-.$local."', name = '".$brand_name."', cfg_ver = '".$brand_version."', installed = 1, hidden = 0 WHERE id = ".
+ . $local . "', name = '" . $brand_name . "', cfg_ver = '" . $brand_version . "', installed = 1, hidden = 0 WHERE id = " . 
-                    $this->eda->sql($sql);
-                } else {
-.$brand_id."', '".$brand_name."', '".$directory."', '".$brand_version.
+ . $brand_id . "', '" . $brand_name . "', '" . $directory . "', '" . $brand_version . 
-                    $this->eda->sql($sql);
-                }
-
-                $last_mod = "";
-
-
+
-                    echo "Updating Family Lines.................<br/>";
-
@@ -1985 +2027 @@
-                    $last_mod = max($last_mod, $family_list['last_modified']);
-
-
-
+
+
+
+
-                    $require_firmware = NULL;
-
+ 
-                        echo "Firmware Requirment Detected!..........<br/>";
-                        $this->install_firmware($family_line_xml['data']['id']);
-                    }
-
-.$brand_id.$family_line_xml['data']['id'].
+ . $brand_id . $family_line_xml['data']['id'] . 
-                    $short_name = preg_replace("/\[(.*?)\]/si", "", $family_line_xml['data']['name']);
-
-.$short_name."', long_name = '".$family_line_xml['data']['name']."', cfg_ver = '".$family_line_xml['data']['version']."', config_files='".$family_line_xml['data']['configuration_files']."' WHERE id = '".$brand_id.$family_line_xml['data']['id'].
+ 
+ . $short_name . "', long_name = '" . $family_line_xml['data']['name'] . "', cfg_ver = '" . $family_line_xml['data']['version'] . "', config_files='" . $family_line_xml['data']['configuration_files'] . "' WHERE id = '" . $brand_id . $family_line_xml['data']['id'] . 
-                    } else {
-.$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'].
+ . $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']['last_modified'] . "','" . $family_line_xml['data']['configuration_files'] . 
-                    }
-
-                    $this->eda->sql($sql);
-                    $family_line_xml['data']['model_list'] = $this->fix_single_array_keys($family_line_xml['data']['model_list']);
-                    echo "--Updating Model Lines................<br/>";
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        $old_data = NULL;
-                        $old_data = $this->eda->sql($sql, 'getAll', DB_FETCHMODE_ASSOC);
-
+ 
-                            $global_custom_cfg_data = unserialize($data['global_custom_cfg_data']);
-
+ 
-                                echo "----Old Data Detected! Migrating......";
-                                $new_data = array();
-                                $new_ari = array();
-
-
+ 
+ 
-                                        $new_data[$key] = $old_keys['value'];
-                                    } else {
-                                        $breaks = explode("_", $key);
-.
+ . 
-                                    }
-
+ 
-                                        $new_ari[$key] = 1;
-                                    }
@@ -2036 +2075 @@
-                                $final_data['ari'] = $new_ari;
-                                $final_data = serialize($final_data);
-.$final_data."' WHERE  id =".
+ . $final_data . "' WHERE  id =" . 
-                                $this->eda->sql($sql);
-                                echo "Done!<br/>";
@@ -2043 +2082 @@
-                            $global_user_cfg_data = unserialize($data['global_user_cfg_data']);
-                            $old_check = FALSE;
-
-
-
-
+ 
+ 
+ 
+ 
-                                            $old_check = TRUE;
-                                            break;
@@ -2057 +2096 @@
-                                }
-                            }
-
+ 
-                                echo "Old Data Detected! Migrating......";
-                                $new_data = array();
-
-
-
+ 
+ 
+ 
-                                        $counted = count($exploded);
-                                        $counted = $counted - 1;
-
-.
+ 
+ . 
-                                        }
-                                        $new_data[$key] = $old_keys['value'];
@@ -2072 +2111 @@
-                                }
-                                $final_data = serialize($new_data);
-.$final_data."' WHERE  id =".
+ . $final_data . "' WHERE  id =" . 
-                                $this->eda->sql($sql);
-                                echo "Done!<br/>";
@@ -2078 +2117 @@
-                        }
-                        $old_data = NULL;
-.
+ . 
-                        $old_data = $this->eda->sql($sql, 'getAll', DB_FETCHMODE_ASSOC);
-
+ 
-                            $global_custom_cfg_data = unserialize($data['global_custom_cfg_data']);
-
+ 
-                                echo "Old Data Detected! Migrating......";
-                                $new_data = array();
-                                $new_ari = array();
-
-
+ 
+ 
-                                        $new_data[$key] = $old_keys['value'];
-                                    } else {
-                                        $breaks = explode("_", $key);
-.
+ . 
-                                    }
-
+ 
-                                        $new_ari[$key] = 1;
-                                    }
@@ -2101 +2140 @@
-                                $final_data['ari'] = $new_ari;
-                                $final_data = serialize($final_data);
-.$final_data."' WHERE  id =".
-db->query
+ . $final_data . "' WHERE  id =" . 
+eda->sql
-                                echo "Done!<br/>";
-                            }
-                        }
-
-.$brand_id.$family_line_xml['data']['id'].$model_list['id'].
-
-.$model_list['lines']."', model = '".$model_list['model']."', template_list = '".$template_list."' WHERE id = '".$brand_id.$family_line_xml['data']['id'].$model_list['id'].
+ . $brand_id . $family_line_xml['data']['id'] . $model_list['id'] . 
+ 
+ . $model_list['lines'] . "', model = '" . $model_list['model'] . "', template_list = '" . $template_list . "' WHERE id = '" . $brand_id . $family_line_xml['data']['id'] . $model_list['id'] . 
-                        } else {
-.$brand_id.$family_line_xml['data']['id'].$model_list['id']."', '".$brand_id."', '".$model_list['model']."', '".$model_list['lines']."', '".$brand_id.$family_line_xml['data']['id']."', '".$template_list.
+ . $brand_id . $family_line_xml['data']['id'] . $model_list['id'] . "', '" . $brand_id . "', '" . $model_list['model'] . "', '" . $model_list['lines'] . "', '" . $brand_id . $family_line_xml['data']['id'] . "', '" . $template_list . 
-                        }
-                        $this->eda->sql($sql);
-
-
-(!$this->sync_model($brand_id.$family_line_xml['data']['id'].
+
+ (!$this->sync_model($brand_id . $family_line_xml['data']['id'] . 
-                            echo "System Error in Sync Model Function, Load Failure!<br />";
-                        }
@@ -2123 +2162 @@
-                }
-
-($temp['data']['brands']['oui_list']['oui
-.$oui."', '".$brand_id.
+ ($temp['data']['brands']['oui_list
+ . $oui . "', '" . $brand_id . 
-                    $this->eda->sql($sql);
-                }
@@ -2137 +2176 @@
-
-        echo "Removing Temporary Files..............";
-."temp/" .
+ . "temp/" . 
-        echo "Done!<br />";
-
-
-
+
-
-    /**
@@ -2147 +2184 @@
-     * @param int $id Brand ID
-     */
-
-.
+ 
+ . 
-        $products = $this->eda->sql($sql, 'getall', DB_FETCHMODE_ASSOC);
-
-
+ 
+ 
-                $this->remove_firmware($data['id']);
-            }
-        }
-
-.$id,
-."endpoint/".
-
-. $id.
+ . $id, 
+ . "endpoint/" . 
+
+ . $id . 
-        $this->eda->sql($sql);
-
-
+ 
-        $this->eda->sql($sql);
-
-
+ 
-        $this->eda->sql($sql);
-
-
-
+ 
+ 
-
-        $this->eda->sql($sql);
+    }
+
+    function merge_data($path, $template_list, $maxlines = 3) {
+        //TODO: fix
+        foreach ($template_list as $files_data) {
+            $full_path = $path . $files_data;
+            if (file_exists($full_path)) {
+                $temp_files_data = $this->file2json($full_path);
+                foreach ($temp_files_data['template_data']['category'] as $category) {
+                    $category_name = $category['name'];
+                    foreach ($category['subcategory'] as $subcategory) {
+                        $subcategory_name = $subcategory['name'];
+                        $items_fin = array();
+                        $items_loop = array();
+                        $break_count = 0;
+                        foreach ($subcategory['item'] as $item) {
+                            switch ($item['type']) {
+                                case 'loop_line_options':
+                                    for ($i = 1; $i <= $maxlines; $i++) {
+                                        $var_nam = "lineloop|line_" . $i;
+                                        foreach ($item['data']['item'] as $item_loop) {
+                                            if ($item_loop['type'] != 'break') {
+                                                $z = str_replace("\$", "", $item_loop['variable']);
+                                                $items_loop[$var_nam][$z] = $item_loop;
+                                                $items_loop[$var_nam][$z]['description'] = str_replace('{$count}', $i, $items_loop[$var_nam][$z]['description']);
+                                                $items_loop[$var_nam][$z]['default_value'] = $items_loop[$var_nam][$z]['default_value'];
+                                                $items_loop[$var_nam][$z]['default_value'] = str_replace('{$count}', $i, $items_loop[$var_nam][$z]['default_value']);
+                                                $items_loop[$var_nam][$z]['line_loop'] = TRUE;
+                                                $items_loop[$var_nam][$z]['line_count'] = $i;
+                                            } elseif ($item_loop['type'] == 'break') {
+                                                $items_loop[$var_nam]['break_' . $break_count]['type'] = 'break';
+                                                $break_count++;
+                                            }
+                                        }
+                                    }
+                                    $items_fin = array_merge($items_fin, $items_loop);
+                                    break;
+                                case 'loop':
+                                    for ($i = $item['loop_start']; $i <= $item['loop_end']; $i++) {
+                                        $name = explode("_", $item['data']['item'][0]['variable']);
+                                        $var_nam = "loop|" . str_replace("\$", "", $name[0]) . "_" . $i;
+                                        foreach ($item['data']['item'] as $item_loop) {
+                                            if ($item_loop['type'] != 'break') {
+                                                $z_tmp = explode("_", $item_loop['variable']);
+                                                $z = $z_tmp[1];
+                                                $items_loop[$var_nam][$z] = $item_loop;
+                                                $items_loop[$var_nam][$z]['description'] = str_replace('{$count}', $i, $items_loop[$var_nam][$z]['description']);
+                                                $items_loop[$var_nam][$z]['variable'] = str_replace('_', '_' . $i . '_', $items_loop[$var_nam][$z]['variable']);
+                                                $items_loop[$var_nam][$z]['default_value'] = isset($items_loop[$var_nam][$z]['default_value']) ? $items_loop[$var_nam][$z]['default_value'] : '';
+                                                $items_loop[$var_nam][$z]['loop'] = TRUE;
+                                                $items_loop[$var_nam][$z]['loop_count'] = $i;
+                                            } elseif ($item_loop['type'] == 'break') {
+                                                $items_loop[$var_nam]['break_' . $break_count]['type'] = 'break';
+                                                $break_count++;
+                                            }
+                                        }
+                                    }
+                                    $items_fin = array_merge($items_fin, $items_loop);
+                                    break;
+                                case 'break':
+                                    $items_fin['break|' . $break_count]['type'] = 'break';
+                                    $break_count++;
+                                    break;
+                                default:
+                                    $var_nam = "option|" . str_replace("\$", "", $item['variable']);
+                                    $items_fin[$var_nam] = $item;
+                                    break;
+                            }
+                        }
+                        if (isset($data['data'][$category_name][$subcategory_name])) {
+                            $old_sc = $data['data'][$category_name][$subcategory_name];
+                            $sub_cat_data[$category_name][$subcategory_name] = array();
+                            $sub_cat_data[$category_name][$subcategory_name] = array_merge($old_sc, $items_fin);
+                        } else {
+                            $sub_cat_data[$category_name][$subcategory_name] = $items_fin;
+                        }
+                    }
+                    if (isset($data['data'][$category_name])) {
+                        $old_c = $data['data'][$category_name];
+                        $new_c = $sub_cat_data[$category_name];
+                        $sub_cat_data[$category_name] = array();
+                        $data['data'][$category_name] = array_merge($old_c, $new_c);
+                    } else {
+                        $data['data'][$category_name] = $sub_cat_data[$category_name];
+                    }
+                }
+            }
+        }
+        return($data);
-    }
-
@@ -2203 +2329 @@
-            }
-
-xml
-xml
+json
+json
-                return(FALSE);
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            return(TRUE);
-        } else {
@@ -2300 +2387 @@
-     * @return array
-     */
-$Haystack,$NeedleKey="",$Strict=false,
-
+ $Haystack, $NeedleKey="", $Strict=false, 
+ 
-            return false;
-
-(is_array($Val)
-=$this->arraysearchrecursive($Needle,$Val,$NeedleKey,$Strict,
-=array_merge($Path,Array($Key),
+ 
+ (is_array($Val) 
+ = $this->arraysearchrecursive($Needle, $Val, $NeedleKey, $Strict, 
+ = array_merge($Path, Array($Key), 
-                return $Path;
-
-
-
-
-
-
+
+
+
+
+
-                return $Path;
-            }
@@ -2319 +2405 @@
-        return false;
-    }
-
+
-    function run_in_background($Command, $Priority = 0) {
-        if ($Priority)
@@ -2335 +2421 @@
-    function download_file_with_progress_bar($url_file, $destination_file) {
-        set_time_limit(0);
- 
- 
-
-
-
-
-($this->is_process_running($pid)) { 
-
-
-.$out.
+
+
+
+ 
+ 
+
+ ($this->is_process_running($pid)) {
+
+ 
+ . $out . 
-
-                usleep('500');
@@ -2357 +2443 @@
-    }
-
-_no_progress_bar
+
-        $contents = file_get_contents($url_file);
-
-
+
+
+
+
+
+
+
-            //check file placement
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                return false;
-            }
@@ -2387 +2464 @@
-    //This function looks in common linux directories for system executable files. Like ARP & NMAP
-    function find_exec($exec) {
-.
-.
-.
-.
-.
-
-.
-
-.
-
-.
-
-.
-
-.
+ . 
+ . 
+ . 
+ . 
+ . 
+ 
+ . 
+ 
+ . 
+ 
+ . 
+ 
+ . 
+ 
+ . 
-        } else {
-            return($exec);
@@ -2414 +2491 @@
-     */
-    function rmrf($dir) {
-
+ 
-            $iterator = new RecursiveDirectoryIterator($dir);
-            foreach (new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::CHILD_FIRST) as $file) {
@@ -2434 +2511 @@
-     */
-    function table_exists($table) {
- 
-.
-
-
-
+        
+ . 
+ 
+
+ 
-            if ($row[0] == $table) {
-                return TRUE;
@@ -2446 +2523 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -2577 +2541 @@
-        if ((strlen($mac) == "17") OR (strlen($mac) == "12")) {
-            //It might be better to use switch here instead of these IF statements...
-
-            //Is the mac separated by colons(:) or dashes(-)?
-
-"[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][:-]" 
+                "[0-9a-f][0-9a-f][:-]" 
+                "[0-9a-f][0-9a-f][:-]" 
+                
-                return(strtoupper(str_replace(":", "", str_replace("-", "", $mac))));
-                //Is the string exactly 12 characters?
-
+ 
-                //Now is the string a valid HEX mac address?
-
-"[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]" 
+                "[0-9a-f][0-9a-f]" 
+                "[0-9a-f][0-9a-f]" 
+                
-                    return(strtoupper($mac));
-                } else {
@@ -2600 +2563 @@
-                }
-                //Is the mac separated by whitespaces?
-(preg_match("/[0-9a-f][0-9a-f][\s]"
-"[0-9a-f][0-9a-f][\s]"
-"[0-9a-f][0-9a-f][\s]"
-"[0-9a-f][0-9a-f][\s]"
-"[0-9a-f][0-9a-f][\s]"
-
+ (preg_match("/[0-9a-f][0-9a-f][\s]" 
+                "[0-9a-f][0-9a-f][\s]" 
+                "[0-9a-f][0-9a-f][\s]" 
+                "[0-9a-f][0-9a-f][\s]" 
+                "[0-9a-f][0-9a-f][\s]" 
+                
-                return(strtoupper(str_replace(" ", "", $mac)));
-            } else {
@@ -2642 +2605 @@
-
-        if (($use_nmap) AND (file_exists($this->global_cfg['nmap_location'])) AND ($this->validate_netmask($netmask))) {
-.' -v -sP '
-
+ . ' -v -sP ' 
+ 
-            $this->error['discover_new'] = "Invalid Netmask";
-            return(FALSE);
-
+ 
-            $this->error['discover_new'] = "Could Not Find NMAP, Using ARP Only";
-            //return(FALSE);
@@ -2658 +2621 @@
-
-        //Find all references to active computers by searching out mac addresses.
-
-"[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][:-]" 
+                "[0-9a-f][0-9a-f][:-]" 
+                "[0-9a-f][0-9a-f][:-]" 
+                
-
-        //Go through each row of valid arp entries and pull out the information and add it into a nice array!
@@ -2670 +2633 @@
-
-            //Pull out the IP address from row. It's always the first entry in the row and it can only be a max of 15 characters with the delimiters
-$value,
+ $value, 
-            $ip = $matches[1];
-            $ip = $ip[0];
-
-            //Pull out the mac address by looking for the delimiter
-
+ 
-
-            //Get rid of the delimiter
@@ -2681 +2644 @@
-
-            //arp -n will return a MAC address of 000000000000 if no hardware was found, so we need to ignore it
-
+ 
-                //only use the first 6 characters for the oui: http://en.wikipedia.org/wiki/Organizationally_Unique_Identifier
-0,
+ 0, 
-
-                //Find the matching brand model to the oui
-. $oui .
+ . $oui . 
-
-                $brand = $this->eda->sql($oui_sql, 'getRow', DB_FETCHMODE_ASSOC);
-
+
-                $res = $this->eda->sql($oui_sql);
-                $brand_count = $res->numRows();
-
+
-                if (!$brand_count) {
-                    //oui doesn't have a matching mysql reference, probably a PC/router/wap/printer of some sort.
@@ -2700 +2663 @@
-
-                //Find out if endpoint has already been configured for this mac address
-. $mac_strip .
+ . $mac_strip . 
-                $epm_row = $this->eda->sql($epm_sql, 'getRow', DB_FETCHMODE_ASSOC);
-
@@ -2720 +2683 @@
-        //$final = array_values($final);
-
-
+ 
-            return(FALSE);
-        } else {
@@ -2727 +2690 @@
-    }
-
-
-. $model.
-
-
-($z=0;$z<$count;
+ 
+ . $model . 
+ 
+
+ ($z = 0; $z < $count; 
-            $result[$z]['id'] = $z + 1;
-            $result[$z]['model'] = $z + 1;
@@ -2737 +2700 @@
-
-        $i = 1;
-
+ 
-            if ($row['id'] == $area) {
-                $temp[$i]['value'] = $row['id'];
-                $temp[$i]['text'] = $row['model'];
-                $temp[$i]['selected'] = 'selected';
-
+ 
-                $temp[$i]['value'] = $row['id'];
-                $temp[$i]['text'] = $row['model'];
@@ -2761 +2724 @@
-     */
-    function models_available($model=NULL, $brand=NULL, $product=NULL) {
-
+
-        if ((!isset($oui)) && (!isset($brand)) && (!isset($model))) {
-            $result1 = $this->eda->all_models();
-elseif((isset($brand)) && ($brand !=
+ elseif ((isset($brand)) && ($brand != 
-            $result1 = $this->eda->all_models_by_brand($brand);
-elseif((isset($product)) && ($product !=
+ elseif ((isset($product)) && ($product != 
-            $result1 = $this->eda->all_models_by_product($product);
-        } else {
@@ -2773 +2736 @@
-
-        $i = 1;
-
+ 
-            if ($row['id'] == $model) {
-                $temp[$i]['value'] = $row['id'];
-                $temp[$i]['text'] = $row['model'];
-                $temp[$i]['selected'] = 'selected';
-
+ 
-                $temp[$i]['value'] = $row['id'];
-                $temp[$i]['text'] = $row['model'];
@@ -2786 +2749 @@
-        }
-
-
-
+ 
+ 
-                $this->error['modelsAvailable'] = "You need to enable at least ONE model";
-            }
@@ -2800 +2763 @@
-        $it = new RecursiveIteratorIterator(new RecursiveArrayIterator($haystack));
-
-
-
+ 
+ 
-                return TRUE;
-            }
- 
+
-        return FALSE;
-    }
-
-
-
-="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.
-
-.
+ 
+ 
+ = "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 . 
+
+ . 
-            $line = $this->eda->sql($sql_l, 'getRow', DB_FETCHMODE_ASSOC);
-
-.
-
-="SELECT max_lines FROM endpointman_model_list WHERE id = (SELECT model FROM endpointman_mac_list WHERE id =".$macid.
-.
-
+ . 
+ 
+ = "SELECT max_lines FROM endpointman_model_list WHERE id = (SELECT model FROM endpointman_mac_list WHERE id =" . $macid . 
+ . 
+
-            $line['line'] = 0;
-        }
-
-
-
-
-($i = 1; $i <= $max_lines; $i++) {    
-
+ 
+ 
+
+ ($i = 1; $i <= $max_lines; $i++) {
+ 
-                $temp[$i]['value'] = $i;
-                $temp[$i]['text'] = $i;
-                $temp[$i]['selected'] = "selected";
-            } else {
-(!$this->in_array_recursive($i,
+ (!$this->in_array_recursive($i, 
-                    $temp[$i]['value'] = $i;
-                    $temp[$i]['text'] = $i;
@@ -2838 +2801 @@
-            }
-        }
-
+ 
-            return($temp);
-        } else {
@@ -2851 +2814 @@
-    function display_registration_list($line_id=NULL) {
-
-
+ 
-            $result = $this->eda->all_unused_registrations();
-            $line_data = $this->eda->get_line_information($line_id);
@@ -2861 +2824 @@
-        $i = 1;
-        $temp = array();
-
+ 
-            $temp[$i]['value'] = $row['id'];
-            $temp[$i]['text'] = $row['id'] . " --- " . $row['description'];
@@ -2867 +2830 @@
-        }
-
-
+ 
-            $temp[$i]['value'] = $line_data['ext'];
-            $temp[$i]['text'] = $line_data['ext'] . " --- " . $line_data['description'];
@@ -2874 +2837 @@
-
-        return($temp);
-
-
+
+
-    /**
-     * Returns list of Brands that are installed and not hidden and that have at least one model enabled under them
@@ -2881 +2844 @@
-     * @return array Number array used to generate a select box
-     */
- ($selected = NULL,
+($selected = NULL, 
-        $data = $this->eda->all_active_brands();
-
+ 
-            $temp[0]['value'] = "";
-            $temp[0]['text'] = "";
@@ -2890 +2853 @@
-            $i = 0;
-        }
-
+ 
-            $temp[$i]['value'] = $row['id'];
-            $temp[$i]['text'] = $row['name'];
@@ -2903 +2866 @@
-    }
-
-
+ 
-        $i = 0;
-="SELECT id FROM  endpointman_product_list WHERE endpointman_product_list.id ='".$product_id.
-
-
-
-="SELECT * FROM  endpointman_template_list WHERE  product_id = '".$id.
-
-
-
+ = "SELECT id FROM  endpointman_product_list WHERE endpointman_product_list.id ='" . $product_id . 
+
+ 
+
+ = "SELECT * FROM  endpointman_template_list WHERE  product_id = '" . $id . 
+
+ 
+ 
-            $temp[$i]['value'] = $row['id'];
-            $temp[$i]['text'] = $row['name'];
@@ -2931 +2894 @@
-    }
-
-        
-        
+
+
-        $data = DateTimeZone::listIdentifiers();
-        $i = 0;
-
+ 
-            $temp[$i]['value'] = $row;
-            $temp[$i]['text'] = $row;
-            if ($temp[$i]['value'] == $selected) {
-                $temp[$i]['selected'] = 1;
-
+ 
-                $temp[$i]['selected'] = 0;
-            }
@@ -2948 +2911 @@
-        return($temp);
-    }
+
+    function validate_json($json) {
+        return(TRUE);
+    }
+
-}
-
-
+ 
-    ob_end_flush();
-    //ob_flush();
@@ -2958 +2926 @@
-
-function endpointman_update_progress_bar($out) {
-.$out.
+ . $out . 
-}
-
@@ -2966 +2934 @@
-    $regs = "";
-    preg_match("/(Content-Length:) (.*)/i", $string, $regs);
-
+ 
-        $file_size = intval($regs[2]);
-    }
@@ -2980 +2948 @@
-    $downloadProgress = round(100 * (1 - $downloaded / $file_size), 0);
-    $downloadProgress = 100 - $downloadProgress;
-
-
+ 
+ 
-            endpointman_update_progress_bar($downloadProgress);
-        }
-        $lastseen = $downloadProgress;
-    }
-
+ 
-        fwrite($fout, $string);
-    //ob_flush();

modules/branches/2.10/endpointman/includes/popup.inc

@@ -9 +9 @@
-
-if($_REQUEST['pop_type'] == 'edit_specifics') {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    $endpoint->prepare_message_box();
-display_name", $displayname
+html_array", $html_array
-    echo $endpoint->tpl->draw( 'specifics_pop' );
-}

modules/branches/2.10/endpointman/install.php

@@ -135 +135 @@
-    
-    out('Version Identified as '. $full_vers);
+    out('Internal Reference Number: '.$ver);
-} else {
-    $new_install = TRUE;
@@ -879 +880 @@
-        $db->query($sql);
-
-        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_time_zones_desc` (
-  `id` int(11) NOT NULL auto_increment,
-  `tid` int(11) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `description` varchar(255) NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=32";
-        $db->query($sql);
-
-        $sql = "INSERT INTO `endpointman_time_zones_desc` (`id`, `tid`, `name`, `description`) VALUES
-(1, 1, 'UTC', 'Universal Coordinated Time (and Greenwich Mean Time)'),
-(2, 2, 'ECT', 'European Central Time'),
-(3, 3, 'EET', 'Eastern European Time'),
-(4, 3, 'ART', '(Arabic) Egypt Standard Time'),
-(5, 4, 'EAT', 'Eastern African Time'),
-(6, 5, 'MET', 'Middle East Time'),
-(7, 6, 'NET', 'Near East Time'),
-(8, 7, 'PLT', 'Pakistan Lahore Time'),
-(9, 8, 'IST', 'India Standard Time'),
-(10, 9, 'BST', 'Bangladesh Standard Time'),
-(11, 10, 'VST', 'Vietnam Standard Time'),
-(12, 11, 'CTT', 'China Taiwan Time'),
-(13, 12, 'JST', 'Japan Standard Time'),
-(14, 13, 'ACT', 'Australia Central Time'),
-(15, 14, 'AET', 'Australia Eastern Time'),
-(16, 15, 'SST', 'Solomon Standard Time'),
-(17, 16, 'NST', 'New Zealand Standard Time'),
-(18, 17, 'MIT', 'Midway Islands Time'),
-(19, 18, 'HST', 'Hawaii Standard Time'),
-(20, 19, 'AST', 'Alaska Standard Time'),
-(21, 20, 'PST', 'Pacific Standard Time'),
-(22, 21, 'PNT', 'Phoenix Standard Time'),
-(23, 21, 'MST', 'Mountain Standard Time'),
-(24, 22, 'CST', 'Central Standard Time'),
-(25, 23, 'EST', 'Eastern Standard Time'),
-(26, 23, 'IET', 'Indiana Eastern Standard Time'),
-(27, 24, 'PRT', 'Puerto Rico and US Virgin Islands Time'),
-(28, 25, 'CNT', 'Canada Newfoundland Time'),
-(29, 26, 'AGT', 'Argentina Standard Time'),
-(30, 26, 'BET', 'Brazil Eastern Time'),
-(31, 27, 'CAT', 'Central African Time')";
-        $db->query($sql);
-
-        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_time_zones_new` (
-  `id` int(11) NOT NULL auto_increment,
-  `gmt` varchar(255) NOT NULL,
-  `offset` int(11) NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=28";
-        $db->query($sql);
-
-        $sql = "INSERT INTO `endpointman_time_zones_new` (`id`, `gmt`, `offset`) VALUES
-(1, 'GMT', 0),
-(2, 'GMT+1:00', 3600),
-(3, 'GMT+2:00', 7200),
-(4, 'GMT+3:00', 10800),
-(5, 'GMT+3:30', 12600),
-(6, 'GMT+4:00', 14400),
-(7, 'GMT+5:00', 18000),
-(8, 'GMT+5:30', 19800),
-(9, 'GMT+6:00', 21600),
-(10, 'GMT+7:00', 25200),
-(11, 'GMT+8:00', 28800),
-(12, 'GMT+9:00', 32400),
-(13, 'GMT+9:30', 34200),
-(14, 'GMT+10:00', 36000),
-(15, 'GMT+11:00', 39600),
-(16, 'GMT+12:00', 43200),
-(17, 'GMT-11:00', -39600),
-(18, 'GMT-10:00', -36000),
-(19, 'GMT-9:00', -32400),
-(20, 'GMT-8:00', -28800),
-(21, 'GMT-7:00', -25200),
-(22, 'GMT-6:00', -21600),
-(23, 'GMT-5:00', -18000),
-(24, 'GMT-4:00', -14400),
-(25, 'GMT-3:30', -12600),
-(26, 'GMT-3:00', -10800),
-(27, 'GMT-1:00', -3600)";
-        $db->query($sql);
-
-        out('Creating symlink to web provisioner');
-        if (!symlink(LOCAL_PATH . "provisioning", $amp_conf['AMPWEBROOT'] . "/provisioning")) {
@@ -981 +901 @@
-    }
-    
- ($ver <= "21002
+($ver <= "21021
-        out('Updating Mirror Location...again');
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $db->query($sql);
-    }
@@ -1040 +991 @@
-            (4, 'gmthr', ''),
-            (5, 'config_location', '/tftpboot/'),
-2.5
+3
-            (7, 'version', '".$xml_full_version."'),
-            (8, 'enable_ari', '0'),
@@ -1151 +1102 @@
-$db->query($sql);
-
-mirror.freepbx.org/provisioner/v2.5
+www.provisioner.net/release/v3
-$db->query($sql);
-

modules/branches/2.10/endpointman/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>PBX End Point Manager</name>
-1.3
+2.4
-  <type>setup</type>
-  <category>Connectivity</category>

modules/branches/2.10/endpointman/provisioning/p.php

@@ -52 +52 @@
-    if(preg_match('/[0-9A-Fa-f]{12}/i', $strip, $matches) && !(preg_match('/[0]{10}[0-9]{2}/i',$strip))) {
-        $mac_address = $matches[0];
-
+
-        $sql = 'SELECT id FROM `endpointman_mac_list` WHERE `mac` LIKE CONVERT(_utf8 \'%' . $mac_address . '%\' USING latin1) COLLATE latin1_swedish_ci';
-
-db->getOne($sql
+eda->sql($sql, 'getOne'
-        $phone_info = $endpoint->get_phone_info($mac_id);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            header("HTTP/1.0 500 Internal Server Error");
-            die();
-        }
+        
+        if (array_key_exists($filename, $files)) {
+            echo $files[$filename];
+        } else {
+            header("HTTP/1.0 404 Not Found");
+            die();
+        }
+
-    } else {
-        require_once (PROVISIONER_BASE.'endpoint/base.php');

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

@@ -79 +79 @@
-</tr>
-<tr>
-projects.colsolgrp.net/documents/29
+wiki.provisioner.net/index.php/Endpoint_manager_manual_ari
-  <td align='left'><label>
-    <input type=checkbox name="enable_ari" {$ari_selected}>

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

@@ -181 +181 @@
-    function popitup(url, name, id) {
-        if(id != '0') {
-
+,scrollbars=yes,location=no
-            if (window.focus) {newwindow.focus()}
-            return false;
@@ -188 +188 @@
-
-    function submit_stype(type,id) {
-
+,scrollbars=yes,location=no
-        if (window.focus) {newwindow.focus()}
-        return false;
@@ -441 +441 @@
-        <td align='center'><h3>Extension Number</h3></td>
-        <td align='center'><h3>Template</h3></td>
-!--<td align='center'><h3>Specific</h3></td>--
+td align='center'><h3>Specific</h3></td
-        <td align='center'><h3>Edit</h3></td>
-        <td align='center'><h3>Delete</h3></td>
@@ -454 +454 @@
-            <td width="19%" align='center'><div id="demo"><a><img src="assets/endpointman/images/expand.png" id="img3rowGroup{$value.master_id}" onclick="toggleDisplay(document.getElementById('devList'),'rowGroup{$value.master_id}')" title="Click to Expand Line Information"></a></div></td>
-            <td align='center' width='15%'>{$value.template_name}</td>
-!--<td align='center'><div id="demo"><a href="#" onclick="submit_stype('edit',{$value.id});"><img src='assets/endpointman/images/edit.png' ALT='<?php echo _('Edit')?>' title='Edit Device' border='0'></a></div></td>--
+td align='center'><div id="demo"><a href="#" onclick="submit_stype('edit',{$value.id});"><img src='assets/endpointman/images/edit.png' ALT='<?php echo _('Edit')?>' title='Edit Device' border='0'></a></div></td
-            <td align='center' width='9%'><div id="demo"><a href="#" onclick="submit_wtype('edit',{$value.id});"><img src='assets/endpointman/images/edit.png' ALT='<?php echo _('Edit')?>' title='Edit Device' border='0'></a></div></td>
-            <td align='center' width='7%'><div id="demo"><a href="#" onclick="delete_device({$value.id});"><img src='assets/endpointman/images/delete.png' ALT='<?php echo _('Delete')?>' title='Delete Device' border='0'></a></div></td>

modules/branches/2.10/endpointman/templates/freepbx/specifics_pop.html

@@ -11 +11 @@
-                $('#myform').append('<input type="hidden" name="button_save" value="Save"/>');
-                document.myform.submit();
-                setTimeout("opener.Reload()",100);
-            }
-        </script>
-    </head>
-    <body face="Arial">
-        <div id="spinner">
-        </div>
-        <br>
-        <h1><face="Arial"><center><?php echo _('End Point Configuration Manager')?></center></h1>
@@ -24 +21 @@
-  {include="message_box"}
-  {/if}
+        {include="variables"}
-      <form name="myform" id="myform" method="post" action=""><input type="hidden" id="value" name="value" value="{$value}" />
-    <table width="90%" border="0" cellspacing="0" cellpadding="0">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    </table>
-
+
+
-  </body>
-</html>

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

@@ -107 +107 @@
-        {/loop}
-            <br />
-
-
-
-
-
-
-
+
-            <br />
-            {/if}
@@ -144 +138 @@
-              {/loop}
-                                        </select>
+                                        {elseif condition="$value.type == 'checkbox'"}
+                                            <label>{if condition="isset($value.tooltip)"}<a href="#" class="info">{$value.description}<span>{$value.tooltip}</span></a>{else}{$value.description}{/if}: <input type='checkbox' name='{$value.key}' id='{$value.key}' value='{$value.value}'></label>
-          {/if}
-                                    </td><td width="90%">