Changeset 11816

Timestamp:

03/15/11 03:52:52 (2 years ago)

Author:

tm1000

Message:

Updates Endpoint Manager to RC9

Files:

• modules/branches/2.9/endpointman/functions.inc.php (modified) (2 diffs)
• modules/branches/2.9/endpointman/includes/advanced.inc (modified) (18 diffs)
• modules/branches/2.9/endpointman/includes/devices_manager.inc (modified) (4 diffs)
• modules/branches/2.9/endpointman/includes/functions.inc (modified) (6 diffs)
• modules/branches/2.9/endpointman/includes/template_manager.inc (modified) (5 diffs)
• modules/branches/2.9/endpointman/install.php (modified) (3 diffs)
• modules/branches/2.9/endpointman/module.xml (modified) (2 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_oui.html (modified) (1 diff)

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

@@ -108 +108 @@
-                            if(($lines_list) AND (isset($model)) AND (isset($line)) AND (!isset($delete)) AND (isset($temp))) {
-                                //Modifying line already in the database
-
-
-
-
-
+
-
-                                $row = $endpoint->get_phone_info($macid);
@@ -122 +118 @@
-                            } elseif((isset($model)) AND (!isset($delete)) AND (isset($line)) AND (isset($temp))) {
-                                //Add line to the database
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-                                $row = $endpoint->get_phone_info($macid);

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

@@ -7 +7 @@
- * @package Provisioner
- */
-
-//Set the message variable to nothing, however we can set it later and it will show up on the page
-$message = NULL;
-$error_message = NULL;
-$endpoint->tpl->assign("message", $message);
-$endpoint->tpl->assign("web_vars", "?type=$type");
-
-echo $endpoint->tpl->draw( 'global_header' );
-if(!isset($_REQUEST['subpage'])) {
@@ -34 +27 @@
-                if ($file['tmp_name'] > '') {
-                    if (!in_array(end(explode(".", strtolower($file['name']))), $allowedExtensions)) {
-tpl->assign("message", "We support only CVS and TXT files")
+message['iedl'] =  "We support only CVS and TXT files"
-                    } else {
-                        $uploaddir = LOCAL_PATH;
@@ -71 +64 @@
-                                                    $ext = $ext['extension'];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                                                } else {
-= 'Invalid Extension Specified'
+.= "Invalid Extension Specified on line ". $i. "<br />"
-                                                }
-                                            } else {
-= 'Invalid Model Specified'
+.= "Invalid Model Specified on line ". $i. "<br />"
-                                            }
-                                        } else {
-= 'Invalid Brand Specified'
+.= "Invalid Brand Specified on line ". $i. "<br />"
-                                        }
-                                    } else {
-
+.
-                                    }
-                                }
@@ -104 +82 @@
-                            fclose($handle);
-                            unlink(LOCAL_PATH.$_FILES['import_csv']['name']);
-message .
+endpoint->message['file_upload'] 
-                        } else {
-this
+endpoint
-
-                        }
@@ -112 +90 @@
-                }
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-        echo $endpoint->tpl->draw( 'advanced_settings_iedl' );
-        break;
@@ -185 +152 @@
-                $endpoint->tpl->assign("package", $files_list[0]);
-                $endpoint->tpl->assign("type", "upload_brand");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        echo $endpoint->tpl->draw( 'advanced_settings_manual_upload' );
-        break;
@@ -253 +203 @@
-        }
-        $endpoint->tpl->assign("brand2_list", $row_out);
+        $endpoint->prepare_message_box();
-        echo $endpoint->tpl->draw( 'advanced_settings_sh_manager' );
-        break;
@@ -259 +210 @@
-            $sql = "INSERT INTO  endpointman_oui_list (oui, brand, custom) VALUES ('".$_REQUEST['oui']."',  '".$_REQUEST['rb_brand']."',  '1')";
-            $endpoint->db->query($sql);
+            $endpoint->message['oui_manager'] = "Added!";
+        } elseif(isset($_REQUEST['oui_sub'])) {
+            $endpoint->error['oui_manager'] = "No OUI Set!";
-        }
-        if((isset($_REQUEST['delete'])) AND ($_REQUEST['id'] > 0)) {
-            $sql = "DELETE FROM endpointman_oui_list WHERE id = ". $_REQUEST['id'];
-            $endpoint->db->query($sql);
+            $endpoint->message['oui_manager'] = "Deleted!";
-        }
-        $sql = 'SELECT endpointman_oui_list.id, endpointman_oui_list.oui , endpointman_brand_list.name FROM endpointman_oui_list , endpointman_brand_list WHERE endpointman_oui_list.brand = endpointman_brand_list.id AND endpointman_oui_list.custom = 0';
@@ -283 +238 @@
-        $endpoint->tpl->assign("oui_list_custom", $row_out_custom);
-        $endpoint->tpl->assign("brand_ava", $endpoint->brands_available());
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        echo $endpoint->tpl->draw( 'advanced_settings_oui' );
-        break;
@@ -316 +256 @@
-            $sql = "DELETE FROM endpointman_custom_configs WHERE id =". $_REQUEST['sql'];
-            $endpoint->db->query($sql);
-message
+endpoint->message['poce']
-        }
-        if(isset($_REQUEST['file'])) {
@@ -329 +269 @@
-                    fwrite($wfh,$_REQUEST['config_text']);
-                    fclose($wfh);
-message
+endpoint->message['poce']
-                }elseif(isset($_REQUEST['button_save_as'])) {
-                    $sql = 'INSERT INTO endpointman_custom_configs (name, original_name, product_id, data) VALUES ("'.addslashes($_REQUEST['save_as_name']).'","'.addslashes($config_files[$_REQUEST['file']]).'","'.$_REQUEST['product_select'].'","'.addslashes($_REQUEST['config_text']).'")';
-                    $endpoint->db->query($sql);
-message
+endpoint->message['poce']
-                }
-            }
@@ -343 +283 @@
-            if(isset($_REQUEST['sendid'])) {
-                $error = $endpoint->submit_config($row['directory'],$row['cfg_dir'],$config_files[$_REQUEST['file']],$contents);
-message
+endpoint->message['poce']
-            }
-
@@ -361 +301 @@
-                    $sql = "UPDATE endpointman_custom_configs SET data = '".addslashes($_REQUEST['config_text'])."' WHERE id = ".$_REQUEST['sql'];
-                    $endpoint->db->query($sql);
-message
+endpoint->message['poce']
-                }elseif(isset($_REQUEST['button_save_as'])) {
-                    $sql = 'SELECT original_name FROM endpointman_custom_configs WHERE id = '.$_REQUEST['sql'];
@@ -368 +308 @@
-                    $sql = "INSERT INTO endpointman_custom_configs (name, original_name, product_id, data) VALUES ('".addslashes($_REQUEST['save_as_name'])."','".addslashes($file_name)."','".$_REQUEST['product_select']."','".addslashes($_REQUEST['config_text'])."')";
-                    $endpoint->db->query($sql);
-message
+endpoint->message['poce']
-                }
-            }
@@ -378 +318 @@
-                $row22 =& $endpoint->db->getRow($sql, array(), DB_FETCHMODE_ASSOC);
-                $endpoint->submit_config($row22['directory'],$row22['cfg_dir'],$row['original_name'],$row['data']);
-message
+endpoint->message['poce']
-            }
-
@@ -454 +394 @@
-        }
-        $endpoint->tpl->assign("product_list", $product_list);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        echo $endpoint->tpl->draw( 'advanced_settings_poce' );
-        break;
@@ -554 +479 @@
-            $endpoint->db->query($sql);
-
-message .
+endpoint->message['advanced_settings'] 
-        }
-        //Because we are working with global variables we probably updated them, so lets refresh those variables
@@ -601 +526 @@
-        $endpoint->tpl->assign("brand_list", $endpoint->brands_available());
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        echo $endpoint->tpl->draw( 'advanced_settings_settings' );

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

@@ -55 +55 @@
-            case "add_line_x":
-                $_REQUEST['id'] = $_REQUEST['edit_id'];
-
+mac_id = $
-                break;
-            case "button_edit":
@@ -74 +74 @@
-                $sql = 'SELECT * FROM endpointman_line_list WHERE mac_id = '. $_REQUEST['edit_id'];
-
-&
+
-
-                foreach($lines_list as $row) {
-                    $sql = "SELECT description FROM devices WHERE id = ".$_REQUEST['ext_list_'.$row['luid']];
-=
+ = 
-
-                    $sql = "UPDATE endpointman_line_list SET line = '".$_REQUEST['line_list_'.$row['luid']]."', ext = ".$_REQUEST['ext_list_'.$row['luid']].", description = '".$name."' WHERE luid =  ". $row['luid'];
@@ -94 +94 @@
-            case "delete":
-                $sql = 'SELECT mac_id FROM endpointman_line_list WHERE luid = '.$_REQUEST['edit_id'] ;
-&
+
-                $row = $endpoint->get_phone_info($mac_id);
-
@@ -107 +107 @@
-    case "add" :
-        $mac_id = $endpoint->add_device($_REQUEST['mac'],$_REQUEST['model_list'],$_REQUEST['ext_list'],$_REQUEST['template_list'],$_REQUEST['line_list']);
-
-
+
+
+
+
-        break;
-    case "edit_template" :

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

@@ -280 +280 @@
-    function add_device($mac,$model,$ext,$template=NULL,$line=NULL,$displayname=NULL) {
-        $mac = $this->mac_check_clean($mac);
-
-        if($mac) {
-
-
-
-
-
+
+
+
+
+
+
-            } else {
-                if($this->sync_model($model)) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    } else {
-                        if(!isset($template)) {
@@ -325 +334 @@
-                        $ext_id =& $this->db->getOne($sql);
-
-$line > 1
-this->message['add_device'] = "You can't add a phone without the first line set!"
+empty($line)
+line = 1
-                        }
-                        $line = 1;
-
-                        $sql = "INSERT INTO `endpointman_line_list` (`mac_id`, `ext`, `line`, `description`) VALUES ('".$ext_id."', '".$ext."', '".$line."', '".$name."')";
-                        $this->db->query($sql);
-
-!"
+ ".$name." to line ".$line
-                        return($ext_id);
-                    }
@@ -342 +350 @@
-            }
-        } else {
-message
+error
-            return(FALSE);
-        }
@@ -369 +377 @@
-
-                    $sql = "INSERT INTO `endpointman_line_list` (`mac_id`, `ext`, `line`, `description`) VALUES ('".$mac_id."', '".$reg[0]['value']."', '".$lines[0]['value']."', '".$name."')";
+                    $this->db->query($sql);
+
+                    $this->message['add_line'] = "Added '<i>".$name."</i>' to line '<i>".$lines[0]['value']."</i>' on device '<i>".$reg[0]['value']."</i>' <br/> Configuration Files will not be Generated until you click Save!";
+                    return($mac_id);
+                } else {
+                    $this->error['add_line'] = _("No Devices/Extensions Left to Add")."!";
+                    return(FALSE);
+                }
+            } else {
+                $this->error['add_line'] = _("No Lines Left to Add")."!";
+                return(FALSE);
+            }
+        } elseif((!isset($line)) AND (isset($ext))) {
+            if($this->linesAvailable(NULL,$mac_id)) {
+                if($this->endpoint_data->all_unused_registrations()) {
+                    $lines = array_values($this->linesAvailable(NULL,$mac_id));
+
+                    $sql = "INSERT INTO `endpointman_line_list` (`mac_id`, `ext`, `line`, `description`) VALUES ('".$mac_id."', '".$ext."', '".$lines[0]['value']."', '".$displayname."')";
-                    $this->db->query($sql);
-
@@ -397 +423 @@
-                $sql = "INSERT INTO `endpointman_line_list` (`mac_id`, `ext`, `line`, `description`) VALUES ('".$mac_id."', '".$ext."', '".$line."', '".$name."')";
-                $this->db->query($sql);
-= "Added ".$name." to line ".$line
+.= "Added ".$name." to line ".$line . "<br/>"
-                return($mac_id);
-            }
@@ -404 +430 @@
-    }
-
-_id,$model,$ext,$template,$line=NULL,$name=NULL
+id,$model,$template,$luid=NULL,$name=NULL,$line=NULL,$update_lines=TRUE
-        $sql = "UPDATE endpointman_mac_list SET model = ".$model.", template_id =  ".$temp." WHERE id = ".$macid;
-        $this->db->query($sql);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if(isset($luid)) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            $this->db->query($sql);
-            return(TRUE);
-        } else {
-
-
+
+
+
+
+
+
+
+
+
-            return(TRUE);
-        }

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

@@ -7 +7 @@
- * @package Provisioner
- */
-$message = NULL;
-$error_message = NULL;
-
-$no_add = FALSE;
-$default_display = FALSE;
@@ -20 +17 @@
-
-if((!$product_list) && (!$mac_list)) {
-message
+endpoint->message['general']
-    $no_add = TRUE;
-} elseif(!$product_list) {
-message
+endpoint->message['general']
-    $no_add = TRUE;
-}
@@ -31 +28 @@
-} elseif(isset($_REQUEST['button_save'])) {
-    if(($_REQUEST['model_class'] == 0) OR (empty($_REQUEST['template_name'])) OR ($_REQUEST['model_clone'] == 0)) {
-message
+endpoint->error['general']
-        $default_display = TRUE;
-    } else {
@@ -46 +43 @@
-    $endpoint->db->query($sql);
-    $default_display = TRUE;
-message
+endpoint->message['general']
-} elseif((isset($_REQUEST['button_save_template'])) AND (isset($_REQUEST['custom']))) {
-    $endpoint->save_template($_REQUEST['id'],$_REQUEST['custom'],$_REQUEST);
-    $default_display = TRUE;
-    if(empty($endpoint->error)) {
-message
+endpoint->message['general']
-    }
-} else {
@@ -108 +105 @@
-    $endpoint->tpl->assign("no_add", $no_add);
-    $endpoint->tpl->assign("debug", $debug);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    echo $endpoint->tpl->draw( 'template_manager' );
-}

modules/branches/2.9/endpointman/install.php

@@ -92 +92 @@
-}
-
-6
+7
-
-if(ep_table_exists("endpointman_global_vars")) {
@@ -180 +180 @@
-} elseif($global_cfg['version'] == '2.9.0.5') {
-    $ver = "2.9.0.5";
+} elseif($global_cfg['version'] == '2.9.0.6') {
+    $ver = "2.9.0.6";
+} elseif($global_cfg['version'] == '2.9.0.7') {
+    $ver = "2.9.0.7";
+} elseif($global_cfg['version'] == '2.9.0.8') {
+    $ver = "2.9.0.8";
+} elseif($global_cfg['version'] == '2.9.0.9') {
+    $ver = "2.9.0.9";
+} elseif($global_cfg['version'] == '2.9.1.0') {
+    $ver = "2.9.1.0";
+} elseif($global_cfg['version'] == '2.9.1.1') {
+    $ver = "2.9.1.1";
+} elseif($global_cfg['version'] == '2.9.1.2') {
+    $ver = "2.9.1.2";
+} elseif($global_cfg['version'] == '2.9.1.3') {
+    $ver = "2.9.1.3";
+} elseif($global_cfg['version'] == '2.9.1.4') {
+    $ver = "2.9.1.4";
+} elseif($global_cfg['version'] == '2.9.1.5') {
+    $ver = "2.9.1.5";
-} else {
-    $ver = "1000";
@@ -901 +921 @@
-
-    if($ver <= "2.9.0.4") {
+        out("Adding 'local' column to brand_list");
-        $sql = 'ALTER TABLE  `endpointman_brand_list` ADD  `local` INT( 1 ) NOT NULL DEFAULT  \'0\' AFTER  `cfg_ver`';
-        $db->query($sql);
-    }
-
-
-
+
+
+
+
+
+
+
-        $db->query($sql);
-    }

modules/branches/2.9/endpointman/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>PBX End Point Manager</name>
-7
+9
-  <type>tool</type>
-  <category>End Point Manager</category>
@@ -16 +16 @@
-   <description>PBX End Point Manager supports automated deployment of multiple manufacturers IP telephones.</description>
-   <changelog>
-       *2.9.0.3RC8* Fixes #4946,#495
+                *2.9.0.3RC9* Fixed #4878, #4956, #494
-                *2.9.0.3RC6* Fixed Device + User Mode (http://www.freepbx.org/forum/freepbx/users/device-user-mode), #4792
-   
+
-                *2.3.2* Various Bug Fixes
-                *2.3.1* Install directory case corrections

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

@@ +1 @@
+{if condition="isset($show_error_box)"}
+    {include="message_box"}
+{/if}
-<table align='center' width='30%'>
-<tr>