Changeset 12769

Timestamp:

10/05/11 17:39:05 (2 years ago)

Author:

tm1000

Message:

Updating Endpoint Manager 2.9 Branch to newest format.

Files:

• modules/branches/2.9/endpointman/config.php (modified) (1 diff)
• modules/branches/2.9/endpointman/functions.inc.php (modified) (1 diff)
• modules/branches/2.9/endpointman/i18n/endpointman.pot (modified) (2 diffs)
• modules/branches/2.9/endpointman/i18n/fr_FR/LC_MESSAGES/endpointman.mo (modified) (previous)
• modules/branches/2.9/endpointman/i18n/fr_FR/LC_MESSAGES/endpointman.po (modified) (2 diffs)
• modules/branches/2.9/endpointman/i18n/he_IL (added)
• modules/branches/2.9/endpointman/i18n/he_IL/LC_MESSAGES (added)
• modules/branches/2.9/endpointman/i18n/he_IL/LC_MESSAGES/endpointman.mo (added)
• modules/branches/2.9/endpointman/i18n/he_IL/LC_MESSAGES/endpointman.po (added)
• modules/branches/2.9/endpointman/includes/advanced.inc (modified) (3 diffs)
• modules/branches/2.9/endpointman/includes/brand_model_manager.inc (modified) (3 diffs)
• modules/branches/2.9/endpointman/includes/functions.inc (modified) (16 diffs)
• modules/branches/2.9/endpointman/includes/rain.tpl.class.php (modified) (3 diffs)
• modules/branches/2.9/endpointman/includes/timezone.php (added)
• modules/branches/2.9/endpointman/install.php (modified) (21 diffs)
• modules/branches/2.9/endpointman/module.xml (modified) (1 diff)
• modules/branches/2.9/endpointman/provisioning/index.php (modified) (2 diffs)
• modules/branches/2.9/endpointman/provisioning/provision_processing.php (added)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_settings_settings.html (modified) (1 diff)
• modules/branches/2.9/endpointman/templates/freepbx/advanced_subheader.html (modified) (1 diff)
• modules/branches/2.9/endpointman/templates/freepbx/brand_model_manager.html (modified) (3 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/devices_manager.html (modified) (5 diffs)
• modules/branches/2.9/endpointman/templates/freepbx/global_header.html (modified) (1 diff)

modules/branches/2.9/endpointman/config.php

@@ -53 +53 @@
-}
-
-
+
+
-  $debug .= "Request Variables: \n".print_r($_REQUEST, TRUE);
-}

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

@@ -180 +180 @@
-    $action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
-    $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
-
+
+
+
+
+
-    // Don't display this stuff it it's on a 'This xtn has been deleted' page.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-            $js = "
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            } else {
+
+                $js = "
+                        $.ajaxSetup({ cache: false });
+                        $.getJSON('config.php?type=tool&quietmode=1&handler=file&module=endpointman&file=ajax_select.html.php&atype=template2',{id: value}, function(j){
+                                var options = '';
+                                for (var i = 0; i < j.length; i++) {
+                                        options += '<option value=\"' + j[i].optionValue + '\">' + j[i].optionDisplay + '</option>';
+                                }
+                                $('#epm_temps').html(options);
+                                $('#epm_temps option:first').attr('selected', 'selected');
+                        }),
+                        $.ajaxSetup({ cache: false });
+                        $.getJSON('config.php?type=tool&quietmode=1&handler=file&module=endpointman&file=ajax_select.html.php&mac='+ mac +'&atype=lines',{id: value}, function(j){
+                                var options = '';
+                                for (var i = 0; i < j.length; i++) {
+                                        options += '<option value=\"' + j[i].optionValue + '\">' + j[i].optionDisplay + '</option>';
+                                }
+                                $('#epm_line').html(options);
+                                $('#epm_line option:first').attr('selected', 'selected');
+                        })
+                    ";
+                $currentcomponent->addjsfunc('model_change(value,mac)', $js);
+
+                $brand_list = $endpoint->brands_available(NULL, true);
-                $model_list = array();
-                $line_list = array();
-                $template_list = array();
+
+                $currentcomponent->addguielem($section, new gui_textbox('epm_mac', $info['mac'], 'MAC Address', 'The MAC Address of the Phone Assigned to this Extension/Device. <br />(Leave Blank to Remove from Endpoint Manager)', '', 'Please enter a valid MAC Address', true, 17, false),9);
+                $currentcomponent->addguielem($section, new gui_selectbox('epm_brand', $brand_list, $info['brand_id'], 'Brand', 'The Brand of this Phone.', false, 'frm_'.$display.'_brand_change(this.options[this.selectedIndex].value)', false),9);
+                $currentcomponent->addguielem($section, new gui_selectbox('epm_model', $model_list, $info['model_id'], 'Model', 'The Model of this Phone.', false, 'frm_'.$display.'_model_change(this.options[this.selectedIndex].value,document.getElementById(\'epm_mac\').value)', false),9);
+                $currentcomponent->addguielem($section, new gui_selectbox('epm_line', $line_list, $line_info['line'], 'Line', 'The Line of this Extension/Device.', false, '', false),9);
+                $currentcomponent->addguielem($section, new gui_selectbox('epm_temps', $template_list, $info['template_id'], 'Template', 'The Template of this Phone.', false, '', false),9);
+                $currentcomponent->addguielem($section, new guitext('epm_note','Note: This might reboot the phone if it\'s already registered to Asterisk'));
+
-            }
-
-            $checked = false;
-
-            $currentcomponent->addguielem($section, new gui_checkbox('epm_delete', $checked, 'Delete','Delete this Extension from Endpoint Manager'),9);
-            $currentcomponent->addguielem($section, new gui_textbox('epm_mac', $info['mac'], 'MAC Address', 'The MAC Address of the Phone Assigned to this Extension/Device. <br />(Leave Blank to Remove from Endpoint Manager)', '', 'Please enter a valid MAC Address', true, 17, false),9);
-            $currentcomponent->addguielem($section, new gui_selectbox('epm_brand', $brand_list, $info['brand_id'], 'Brand', 'The Brand of this Phone.', false, 'frm_'.$display.'_brand_change(this.options[this.selectedIndex].value)', false),9);
-            $currentcomponent->addguielem($section, new gui_selectbox('epm_model', $model_list, $info['model_id'], 'Model', 'The Model of this Phone.', false, 'frm_'.$display.'_model_change(this.options[this.selectedIndex].value,\''.$line_info['luid'].'\')', false),9);
-            $currentcomponent->addguielem($section, new gui_selectbox('epm_line', $line_list, $line_info['line'], 'Line', 'The Line of this Extension/Device.', false, '', false),9);
-            $currentcomponent->addguielem($section, new gui_selectbox('epm_temps', $template_list, $info['template_id'], 'Template', 'The Template of this Phone.', false, '', false),9);
-            $currentcomponent->addguielem($section, new gui_checkbox('epm_reboot', $checked, 'Reboot','Reboot this Phone on Submit'),9);
-
-        } else {
-
-            $js = "
-                    $.ajaxSetup({ cache: false });
-                    $.getJSON('config.php?type=tool&quietmode=1&handler=file&module=endpointman&file=ajax_select.html.php&atype=template2',{id: value}, function(j){
-                            var options = '';
-                            for (var i = 0; i < j.length; i++) {
-                                    options += '<option value=\"' + j[i].optionValue + '\">' + j[i].optionDisplay + '</option>';
-                            }
-                            $('#epm_temps').html(options);
-                            $('#epm_temps option:first').attr('selected', 'selected');
-                    }),
-                    $.ajaxSetup({ cache: false });
-                    $.getJSON('config.php?type=tool&quietmode=1&handler=file&module=endpointman&file=ajax_select.html.php&mac='+ mac +'&atype=lines',{id: value}, function(j){
-                            var options = '';
-                            for (var i = 0; i < j.length; i++) {
-                                    options += '<option value=\"' + j[i].optionValue + '\">' + j[i].optionDisplay + '</option>';
-                            }
-                            $('#epm_line').html(options);
-                            $('#epm_line option:first').attr('selected', 'selected');
-                    })
-                ";
-            $currentcomponent->addjsfunc('model_change(value,mac)', $js);
-
-            $brand_list = $endpoint->brands_available(NULL, true);
-            $model_list = array();
-            $line_list = array();
-            $template_list = array();
-
-            $currentcomponent->addguielem($section, new gui_textbox('epm_mac', $info['mac'], 'MAC Address', 'The MAC Address of the Phone Assigned to this Extension/Device. <br />(Leave Blank to Remove from Endpoint Manager)', '', 'Please enter a valid MAC Address', true, 17, false),9);
-            $currentcomponent->addguielem($section, new gui_selectbox('epm_brand', $brand_list, $info['brand_id'], 'Brand', 'The Brand of this Phone.', false, 'frm_'.$display.'_brand_change(this.options[this.selectedIndex].value)', false),9);
-            $currentcomponent->addguielem($section, new gui_selectbox('epm_model', $model_list, $info['model_id'], 'Model', 'The Model of this Phone.', false, 'frm_'.$display.'_model_change(this.options[this.selectedIndex].value,document.getElementById(\'epm_mac\').value)', false),9);
-            $currentcomponent->addguielem($section, new gui_selectbox('epm_line', $line_list, $line_info['line'], 'Line', 'The Line of this Extension/Device.', false, '', false),9);
-            $currentcomponent->addguielem($section, new gui_selectbox('epm_temps', $template_list, $info['template_id'], 'Template', 'The Template of this Phone.', false, '', false),9);
-            $currentcomponent->addguielem($section, new guitext('epm_note','Note: This might reboot the phone if it\'s already registered to Asterisk'));
-
-        }
-    }

modules/branches/2.9/endpointman/i18n/endpointman.pot

@@ -41 +41 @@
-msgstr ""
-
-msgid "End Point Manager"
-msgstr ""
-
-msgid ""
-"PBX End Point Manager supports automated deployment of multiple "
-"manufacturers IP telephones."
-msgstr ""
-
-msgid "End Point Device List"
-msgstr ""
@@ -60 +52 @@
-msgid "End Point Advanced Settings"
-msgstr ""
+
+msgid "End Point Manager"
+msgstr ""
+

modules/branches/2.9/endpointman/i18n/fr_FR/LC_MESSAGES/endpointman.po

@@ -21 +21 @@
-"Project-Id-Version: EndPointManager\n"
-"Report-Msgid-Bugs-To: \n"
-0-02-27 17:34+01
+1-09-23 09:52+00
-"PO-Revision-Date: 2010-06-26 21:40+0100\n"
-"Last-Translator: jouniaux <c.jouniaux@techtelecom.fr>\n"
@@ -31 +31 @@
-"X-Poedit-Country: FRANCE\n"
-
+# more new new new!
+msgid "Turn Off Safe Mode"
+msgstr "Arrêt du mode sécurisé"
+
+msgid "PHP Version MUST be greater than"
+msgstr ""
+
+msgid "Sorry, Only Asterisk is supported currently"
+msgstr "Désolé, seul Asterisk est supporté actuellement"
+
+msgid "PBX End Point Manager"
+msgstr ""
+
+msgid "Admin"
+msgstr ""
+
+msgid ""
+"PBX End Point Manager supports automated deployment of multiple "
+"manufacturers IP telephones."
+msgstr ""
+
+msgid "End Point Device List"
+msgstr ""
+
+msgid "End Point Template Manager"
+msgstr ""
+
+msgid "End Point Configuration"
+msgstr ""
+
+msgid "End Point Advanced Settings"
+msgstr ""
+
+msgid "End Point Manager"
+msgstr ""
+
+#~ msgid "My Devices List"
+#~ msgstr "Ma liste de terminaux"
+
+#~ msgid "Template Manager"
+#~ msgstr "Gestion des gabarits"
+
+#~ msgid "Brand Configurations/Setup"
+#~ msgstr "Configuration/ParamÚtres de la marque"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "ParamÚtres avancés"
+
+#~ msgid "IP address of phone server"
+#~ msgstr "Adresse IP du serveur de téléphonie"
+
+#~ msgid "Determine for me"
+#~ msgstr "Choisir à ma place"
+
+#~ msgid "Time Zone"
+#~ msgstr "Fuseau horaire"
+
+#~ msgid "Default Final Configuration Directory"
+#~ msgstr "Répertoire des configurations par défaut"
+
+#~ msgid "Enable FreePBX ARI Module"
+#~ msgstr "Activer le module ARI de FreePBX"
+
+#~ msgid "Enable Debug Mode"
+#~ msgstr "Activer mode debug"
+
+#~ msgid "Brand"
+#~ msgstr "Marque"
+
+#~ msgid "Select Product"
+#~ msgstr "Choisissez le produit"
+
+#~ msgid "File Configuration Editor"
+#~ msgstr "Editeur du fichier de configuration"
+
+#~ msgid "Local File Configs"
+#~ msgstr "Configuration en local"
+
+#~ msgid "User File Configs"
+#~ msgstr "Configuration utilisateur"
+
+#~ msgid "Settings"
+#~ msgstr "ParamÚtres"
+
+#~ msgid "OUI Manager"
+#~ msgstr "Gestion des OUI"
+
+#~ msgid "Product Options/Configuration Editor"
+#~ msgstr "Editeur de configuration/options du produit"
+
+#~ msgid "Show/Hide Brands/Models"
+#~ msgstr "Montrer/Cacher les marques/modÚles"
+
+#~ msgid ""
+#~ "Please wait for the progress bar to show below (this might take a minute "
+#~ "or two)"
+#~ msgstr ""
+#~ "Merci d'attendre la fin du traitement (Cela peut prendre une à deux "
+#~ "minutes)"
+
+#~ msgid "Version"
+#~ msgstr "Version"
+
+#~ msgid "Use NMAP"
+#~ msgstr "Utiliser NMAP"
+
+#~ msgid "Mac Address"
+#~ msgstr "Adresse MAC"
+
+#~ msgid "Model of Phone"
+#~ msgstr "ModÚle de téléphone"
+
+#~ msgid "Extension Number"
+#~ msgstr "Extension"
+
+#~ msgid "Template"
+#~ msgstr "Gabarit"
+
+#~ msgid "Unmanaged Extensions"
+#~ msgstr "Extensions non gérées"
+
+#~ msgid "Current Managed Extensions"
+#~ msgstr "Extensions gérées actuellement"
+
+#~ msgid "End Point Configuration Manager"
+#~ msgstr "Gestion de la configuration des terminaux"
+
+#~ msgid "You are currently editing"
+#~ msgstr "Vous êtes en train d'éditer"
+
+#~ msgid "a custom config template for extension"
+#~ msgstr "un gabarit de configuration personnalisé pour extension"
+
+#~ msgid "the template named"
+#~ msgstr "le gabarit appelé"
+
+#~ msgid "Select Alternative File Configurations"
+#~ msgstr "Choisissez des configurations dans d'autres fichiers"
+
+#~ msgid "You can also user certain variables in your configs"
+#~ msgstr "Vous pouvez aussi utilisez des variables dans vos configurations"
+
+#~ msgid "Server IP"
+#~ msgstr "IP du serveur"
+
+#~ msgid "Device's Mac Address"
+#~ msgstr "Adresse MAC du téléphone"
+
+#~ msgid "Device's Default Extension (Line 1 or Master)"
+#~ msgstr "Extension par défaut du téléphone (Ligne 1 ou maître)"
+
+#~ msgid "Device's Description in FreePBX (Usually the Full Name)"
+#~ msgstr "Description du téléphone dans FreePBX (en général le nom complet)"
+
+#~ msgid "for Model"
+#~ msgstr "pour modÚle"
+
+#~ msgid "Model"
+#~ msgstr "ModÚle"
+
+#~ msgid "Add New Template"
+#~ msgstr "Ajout d'un nouveau gabarit"
+
+#~ msgid "Template Name"
+#~ msgstr "Nom du gabarit"
+
+#~ msgid "Product Select"
+#~ msgstr "Choisir un produit"
+
+#~ msgid "Model Classification"
+#~ msgstr "Classification des modÚles"
+
+#~ msgid "Edit"
+#~ msgstr "Editer"
+
+#~ msgid "Delete"
+#~ msgstr "Supprimer"
+
+#~ msgid "Welcome to Endpoint Manager"
+#~ msgstr "Bienvenue dans Endpoint Manager"
+
+#~ msgid "here"
+#~ msgstr "ici"
+
+#~ msgid "to install some"
+#~ msgstr "pour installer quelques"
+
+#~ msgid "Saved"
+#~ msgstr "Enregistré"
+
+#~ msgid "Invalid MAC Address"
+#~ msgstr "Adresse MAC invalide"
+
+#~ msgid ""
+#~ "One or more selected phones had the same extension as a phone already "
+#~ "added, these devices were not added"
+#~ msgstr ""
+#~ "Un ou plusieurs téléphones sélectionnés ont la même extension qu'un "
+#~ "téléphone déjà ajouté. Ces terminaux ne seront pas ajoutés."
+
+#~ msgid "Please select a Brand and/or Model"
+#~ msgstr "Veuillez sélectionner une marque et/ou un modÚle"
+
+#~ msgid "No Phones Selected"
+#~ msgstr "Aucun téléphone sélectionné"
+
+#~ msgid "No Devices Found"
+#~ msgstr "Aucun terminal trouvé"
+
+#~ msgid "Please select a product"
+#~ msgstr "Veuillez choisir un produit"
+
+#~ msgid "Please select a template"
+#~ msgstr "Veuillez choisir un gabarit"
+
+#~ msgid "No Brand Selected for Reboot"
+#~ msgstr "Aucune marque sélectionnée pour la réinitialisation"
+
+#~ msgid "Unknown"
+#~ msgstr "Inconnu"
+
+#~ msgid ""
+#~ "You have disabled/removed all models that correspond to this brand. "
+#~ "Please enable them in 'Brand Configurations/Setup' before trying to edit "
+#~ "this phone"
+#~ msgstr ""
+#~ "Voys avez désactivé/retiré tous les modÚles correspondant à cette marque. "
+#~ "Veuillez les activer dans 'Configurations/ParamÚtres ded la marque' avant "
+#~ "d'éditer ce téléphone"
+
+#~ msgid "Go"
+#~ msgstr "Allez"
+
+#~ msgid "Save"
+#~ msgstr "Enregistrer"
+
+#~ msgid "Add"
+#~ msgstr "Ajouter"
+
+#~ msgid "Reset"
+#~ msgstr "Réinitialiser"
+
+#~ msgid "Add Selected Phones"
+#~ msgstr "Ajouter les téléphones sélectionnés"
+
+#~ msgid "Selected Phone(s) Options"
+#~ msgstr "Options pour les téléphones sélectionnés"
+
+#~ msgid "Change Selected Phones to"
+#~ msgstr "Changer les téléphones sélectionnés pour"
+
+#~ msgid "Global Phone Options"
+#~ msgstr "Options générales des téléphones"
+
+#~ msgid "Update Phones"
+#~ msgstr "Mis à jour des téléphones"
+
+#~ msgid "Delete Selected Phones"
+#~ msgstr "Suppression des téléphones sélectionnés"
+
+#~ msgid "Rebuild Configs for Selected Phones"
+#~ msgstr "Reconstruction des configurations des téléphones sélectionnés"
+
+#~ msgid "Rebuild Configs for All Phones"
+#~ msgstr "Reconstruction des configurations de tous les téléphones"
+
+#~ msgid "Rebuild & Reboot"
+#~ msgstr "Reconstruction et réinitialisation"
+
+#~ msgid "Reconfigure all"
+#~ msgstr "Tout reconfigurer"
+
+#~ msgid "with"
+#~ msgstr "avec"
+
+#~ msgid "Deleted"
+#~ msgstr "Supprimé"
+
+#~ msgid "Save Template"
+#~ msgstr "Sauvegarde du gabarit"
+
+#~ msgid "Check for Updates"
+#~ msgstr "Vérification des mises à jour"
+
+#~ msgid "Disable"
+#~ msgstr "Désactivé"
+
+#~ msgid "Enable"
+#~ msgstr "Activé"
+
+#~ msgid "Install"
+#~ msgstr "Installer"
+
+#~ msgid "Uninstall"
+#~ msgstr "Désinstaller"
+
+#~ msgid "Update"
+#~ msgstr "Mise à jour"
+
+#~ msgid "Install Firmware"
+#~ msgstr "Installation du firmware"
+
+#~ msgid "Remove Firmware"
+#~ msgstr "Retirer le firmware"
+
+#~ msgid "Update Firmware"
+#~ msgstr "Mettre à jour le firmware"
+
+#~ msgid "Import/Export Devices My Devices List"
+#~ msgstr "Importation/Exportation des terminaux Ma liste de terminaux"
+
+#~ msgid "Update Globals"
+#~ msgstr "Mise à jour des paramÚtres généraux"
+
+#~ msgid "like"
+#~ msgstr "comme"
+
+#~ msgid "Add Custom"
+#~ msgstr "Ajout d'une configuration personalisée"
+
+#~ msgid "Select"
+#~ msgstr "Sélectionner"
+
+#~ msgid "Save As"
+#~ msgstr "Enregistrer sous"
+
+#~ msgid "Export CSV file of devices"
+#~ msgstr "Exportation du fichier des terminaux au format CSV"
+
+#~ msgid "Export CSV"
+#~ msgstr "Exportation format CSV"
+
+#~ msgid "Import CSV file of devices"
+#~ msgstr "Importation du fichier des terminaux au format CSV"
+
+#~ msgid "Note: CSV file should look like this"
+#~ msgstr "Remarque : le fichier CSV doit ressembler à "
+
+#~ msgid "Extension"
+#~ msgstr "Extension"
+
+#~ msgid "Extension can be blank"
+#~ msgstr "Une extension ne peut être vide"
+
+#~ msgid "Show"
+#~ msgstr "Montrer"
+
+#~ msgid "Hide"
+#~ msgstr "Cacher"
+
+# more new
+#~ msgid "executable path"
+#~ msgstr "répertoire"
+
+#~ msgid "Search for new devices in netmask"
+#~ msgstr "Recherche de nouveaux terminaux dans le masque réseau"
+
+#~ msgid "Delete Selected phones"
+#~ msgstr "Supprime les téléphones sélectionnés"
+
+#~ msgid "Reboot This Brand"
+#~ msgstr "Redémarrer cette marque"
+
+#~ msgid "Import"
+#~ msgstr "Importation"
+
+#~ msgid "Enable Nightly Phone Module Updates Check"
+#~ msgstr "Activer la vérification du module téléphone la nuit"
+
+#~ msgid ""
+#~ "Note: This will show or hide Brands/Products/Models on the Brand "
+#~ "Configurations/Setup page ONLY!"
+#~ msgstr ""
+#~ "Note: ceci montrera ou cachera les Marques/Produits/ModÚles sur la page "
+#~ "Configurations/ParamÚtres SEULEMENT"
+
+#~ msgid "Welcome to Enpoint Manager!"
+#~ msgstr "Bienvenue dans Endpoint Manager!"
+
+#~ msgid "You have no products (Modules) installed, click"
+#~ msgstr "Vous n'avez aucun produit (Modules) installé, cliquez"
+
+#~ msgid "/tftpboot is not writable"
+#~ msgstr "Impossible d'écrire sur /tftpboot"
+
+#~ msgid "Please create /tftpboot, even if you won't use it"
+#~ msgstr "Veuillez créer /tftpboot même si vous ne l'utilisez pas"
+
+#~ msgid "End User Editable (Through ARI Module)"
+#~ msgstr "Modifiable par l'utilisateur(En utilisant le module ARI)"
+
+#~ msgid "Disable .htaccess (Might fix 'Internal Server Errors')"
+#~ msgstr "Désactivez .htaccess (Peut corriger 'Erreurs du serveur interne')"
+
+#~ msgid "The Endpoint Configuration Manager was written by"
+#~ msgstr "Endpoint Configuration Manager a été écrit par"
+
+#~ msgid "The project is maintained at"
+#~ msgstr "Le projet est maintenu par"
+
+#~ msgid "Debug Log"
+#~ msgstr "Log Debug"
+
+#~ msgid "Delete selected phone"
+#~ msgstr "Suppression des téléphones sélectionnés"
+=======
-msgid "My Devices List"
-msgstr "Ma liste de terminaux"

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

@@ -418 +418 @@
-        echo $endpoint->tpl->draw( 'advanced_settings_poce' );
-        break;
-    case "timezone_manager":
-        break;
-    case "settings":
-    default:
@@ -480 +478 @@
-                $_POST['allow_hdfiles'] = 0;
-            }
+            
+            $sql="UPDATE endpointman_global_vars SET value='" . $_POST['package_server'] . "' WHERE var_name='update_server'";
+            $endpoint->db->query($sql);
+            
-            $sql="UPDATE endpointman_global_vars SET value='" . $_POST['allow_hdfiles'] . "' WHERE var_name='allow_hdfiles'";
-            $endpoint->db->query($sql);
@@ -554 +556 @@
-            $debug_selected = "";
-        }
+        
+        
+        $endpoint->tpl->assign("package_server", $endpoint->global_cfg['update_server']);
+
-        $endpoint->tpl->assign("help_selected", $help_selected);
-        $endpoint->tpl->assign("dupext_selected", $dupext_selected);

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

@@ -7 +7 @@
- * @package Provisioner
- */
-
-$check_for_updates = FALSE;
-global $type;
@@ -44 +43 @@
-  }
-} elseif(isset($_REQUEST['button_check_for_updates'])) {
+    //die('hi');
-  $brand_up = $endpoint->update_check();
-        $endpoint->tpl->assign("update_check", 1);
@@ -146 +146 @@
-}
-
-
+
+
-echo $endpoint->tpl->draw( 'brand_model_manager' );

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

@@ -127 +127 @@
-
-        $sql = 'SELECT value FROM `admin` WHERE `variable` LIKE CONVERT(_utf8 \'version\' USING latin1) COLLATE latin1_swedish_ci';
-$this->db->getOne($sql
-(float)
+(int)substr(preg_replace('/[^0-9]*/i', '', $this->db->getOne($sql)),0,3
+
-
-    }
@@ -1314 +1314 @@
-
-                //Timezone
-
-
-
-
-
+
+
-
-                //Network Time Server
@@ -1407 +1404 @@
-                foreach($phone_info['line'] as $line) {
-                    $provisioner_lib->lines[$line['line']] = array('ext' => $line['ext'], 'secret' => $line['secret'], 'displayname' => $line['description']);
-          /***
-                    if(isset($line_ops[$line['line']])) {
-                        $provisioner_lib->lines[$line['line']]['options'] = $line_ops[$line['line']];
-                    }
-          */
-                }
-
-        //testing this out
-       foreach
-         if
-           
-         
-       
-
-       if
-         
-         
-         $new_template_data['provisioning_path'] = "provisioning
-       
+                foreach 
+                    if 
+                        
+                    
+                
+
+                if 
+                    
+                    
+                    $new_template_data['provisioning_path'] = $_SERVER["SERVER_ADDR"]."/provisioning/
+                
-
-                //Set Variables according to the template_data files included. We can include different template.xml files within family_data.xml also one can create
@@ -1713 +1705 @@
-        }
-        $temp_file = PHONE_MODULES_PATH.'temp/'.$directory.'.xml';
-
+
+
-        if($this->download_xml_file($location, $temp_file)) {
-            $handle = fopen($temp_file, "rb");
-            $contents = fread($handle, filesize($temp_file));
-            fclose($handle);
+            
-            @$a = simplexml_load_string($contents);
-            if($a===FALSE) {
@@ -1740 +1734 @@
-    function update_check() {
-        $master_result = $this->download_xml(UPDATE_PATH . "master.xml");
-
-
+
+
-        if(!$master_result) {
-            $this->error['brand_update_check_master'] = "Not able to connect to repository. Using local master file instead.";
-        }
-
+
-        $temp = $this->xml2array(PHONE_MODULES_PATH.'master.xml');
-
-        $endpoint_package = $temp['data']['package'];
-        $endpoint_last_mod = $temp['data']['last_modified'];
@@ -1753 +1746 @@
-        $sql = "SELECT value FROM endpointman_global_vars WHERE var_name LIKE 'endpoint_vers'";
-        $data = $this->db->getOne($sql);
-
-
-
-
-
+
+
+
+
-        if($contents != '1') {
-            if(($data == "") OR ($data <= $endpoint_last_mod)) {
@@ -2203 +2195 @@
-
-            if($product_row['cfg_ver'] <= $family_line_xml['data']['version']) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                } else {
-
-
-
+
+
+
+
-                    } else {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                $this->db->query($sql);
-
@@ -2300 +2303 @@
-        return false;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    function download_file_with_progress_bar($url_file, $destination_file) {
-        global $ch, $fout, $file_size, $downloaded, $pkg_interface, $progress_bar;
-        set_time_limit(0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    function download_file_no_progress_bar($url_file, $destination_file) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    function download_xml_file($url_file, $destination_file) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -2464 +2432 @@
-    /**
-     * xml2array() will convert the given XML text to an array in the XML structure.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        $contents = "";
-        if (!function_exists('xml_parser_create')) {
- 
+
-        }
-        $parser = xml_parser_create('');
-
- 
-
-
+ 
+
+
+ 
-            $contents .= fread($fp, 8192);
-        }
@@ -2488 +2457 @@
-        xml_parse_into_struct($parser, trim($contents), $xml_values);
-        xml_parser_free($parser);
-
+ 
-            return; //Hmm...
-        }
- 
- 
- 
- 
+
+
+
+
-        $current = & $xml_array;
- 
+
-        foreach ($xml_values as $data) {
- 
+
-            extract($data);
- 
- 
- 
-
+
+
+
+ 
-                    $result = $value;
-
-
+
-                    $result['value'] = $value;
-                }
-            }
-
-
-
+ 
+ 
+ 
-                        $attributes_data[$attr] = $val;
-
-
+
-                        $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
-                    }
@@ -2521 +2488 @@
-            }
-            if ($type == "open") {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
-                        $repeated_tag_index[$tag . '_' . $level]++;
-
-
-
+
+
-                        $repeated_tag_index[$tag . '_' . $level] = 2;
-
+ 
-                            $current[$tag]['0_attr'] = $current[$tag . '_attr'];
- 
+
-                        }
-                    }
@@ -2546 +2517 @@
-                    $current = & $current[$tag][$last_item_index];
-                }
-
-
-
+
+
-                    $current[$tag] = $result;
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
-
+ 
-                        $current[$tag . '_attr'] = $attributes_data;
-                    }
-
-
-
+
+
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
-                        if ($priority == 'tag' and $get_attributes and $attributes_data) {
@@ -2562 +2531 @@
-                        }
-                        $repeated_tag_index[$tag . '_' . $level]++;
-
-
-
+
+
-                        $repeated_tag_index[$tag . '_' . $level] = 1;
-                        if ($priority == 'tag' and $get_attributes) {
- 
+
-                                $current[$tag]['0_attr'] = $current[$tag . '_attr'];
- 
+
-                            }
-                            if ($attributes_data) {
@@ -2578 +2546 @@
-                    }
-                }
-
-
-
+
+
-            }
-        }
@@ -2955 +2922 @@
-         *
-         */
-
+
+
+
-        $i = 0;
-        foreach($data as $key => $row) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-
-        return($temp);
-    }
-
-    function timezone_array() {
-        $sql = "SELECT * FROM endpointman_time_zones_desc, endpointman_time_zones_new WHERE endpointman_time_zones_desc.tid = endpointman_time_zones_new.id";
-        $tz_list = $this->db->getAll($sql,array(),DB_FETCHMODE_ASSOC);
-
-        $tz_list2 = array();
-        foreach($tz_list as $key => $data) {
-            if(array_key_exists($data['tid'], $tz_list2)) {
-                $c++;
-                $tz_list2[$data['tid']]['info'][$c]['name'] = $data['name'];
-                $tz_list2[$data['tid']]['info'][$c]['description'] = $data['description'];
-            } else {
-                $c=0;
-                $tz_list2[$data['tid']]['gmt'] = $data['gmt'];
-                $tz_list2[$data['tid']]['offset'] = $data['offset'];
-                $tz_list2[$data['tid']]['info'][$c]['name'] = $data['name'];
-                $tz_list2[$data['tid']]['info'][$c]['description'] = $data['description'];
-            }
-        }
-        return($tz_list2);
-    }
-
-}
-
@@ -3002 +2947 @@
-    ob_start();
-}
-
-function endpointman_update_progress_bar($out) {
-    echo '<script type="text/javascript">document.getElementById(\'DivExample\').innerHTML="%'.$out.'";</script>';
-}
-
-function endpointmanager_read_header($ch, $string) {
-    global $file_size, $fout;
-    $length = strlen($string);
-    $regs = "";
-    preg_match("/(Content-Length:) (.*)/i", $string, $regs);
-    if((isset($regs[2])) AND ($regs[2] <> "")) {
-        $file_size = intval($regs[2]);
-    }
-    //ob_flush();
-    endpointman_flush_buffers();
-    return $length;
-}
-
-function endpointmanager_read_body($ch, $string) {
-    global $fout, $file_size, $downloaded, $lastseen, $progress_bar;
-    $length = strlen($string);
-    $downloaded += intval($length);
-    $downloadProgress = round(100 * (1 - $downloaded / $file_size), 0);
-    $downloadProgress = 100 - $downloadProgress;
-    if($lastseen <> $downloadProgress and $downloadProgress < 101) {
-        if($progress_bar) {
-            endpointman_update_progress_bar($downloadProgress);
-        }
-        $lastseen = $downloadProgress;
-    }
-    if($fout)
-        fwrite($fout, $string);
-    //ob_flush();
-    endpointman_flush_buffers();
-    return $length;
-}

modules/branches/2.9/endpointman/includes/rain.tpl.class.php

@@ -141 +141 @@
-  
-  function draw( $tpl_name, $return_string = false ){
-
-    if( count( $a = explode('/', $tpl_name) ) > 1 ){
-      $temp = $tpl_name;
@@ -182 +181 @@
-      $contents = ob_get_contents();
-      ob_end_clean();
-    
+
-    }
-    else
@@ -188 +187 @@
-    
-  }
-
-}
-
-
-
-?>

modules/branches/2.9/endpointman/install.php

@@ -98 +98 @@
-$sql = 'SELECT `version` FROM `modules` WHERE `modulename` = CONVERT(_utf8 \'endpointman\' USING latin1) COLLATE latin1_swedish_ci';
-
-
-
-
+
+
+
+
+
-    $global_cfg =& $db->getAssoc("SELECT var_name, value FROM endpointman_global_vars");
-    $global_cfg['version'] = $db_version;
@@ -117 +119 @@
-    out('New Installation Detected!');
-} else {
-ver
+full_vers
-}
-if(!$new_install) {
-
-.9.
+9
-        out("Please Wait While we upgrade your old setup");
-        //Expand the value option
@@ -296 +298 @@
-    }
-
-.9.
+9
-        out("Locating NMAP + ARP + ASTERISK Executables");
-
@@ -366 +368 @@
-        $db->query($sql);
-    }
-.9.
+9
-        out("Create Custom Configs Table");
-        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_custom_configs` (
@@ -421 +423 @@
-        $db->query($sql);
-    }
-.9.
+9
-        out('Updating Global Variables');
-    }
-
-.9.
+9
-        out("Adding Custom Field to OUI List");
-        $sql = 'ALTER TABLE `endpointman_oui_list` ADD `custom` INT(1) NOT NULL DEFAULT \'0\'';
@@ -469 +471 @@
-        $db->query($sql);
-    }
-.0.
+0
-        out("Locating NMAP + ARP + ASTERISK Executables");
-        $nmap = find_exec("nmap");
@@ -659 +661 @@
-        }
-    }
-.2.
-
-
-.2.
+2
+
+
+2
-
-        out("Remove all Dashes in IDs");
@@ -706 +708 @@
-        }
-    }
-.2.
+2
-        $sql = "UPDATE endpointman_global_vars SET value = 'http://www.provisioner.net/release/' WHERE var_name = 'update_server'";
-        $db->query($sql);
-    }
-
-.2.
-
-
-
-.2.
+2
+
+
+
+2
-        out("Fixing Permissions of Phone Modules Directory");
-        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(PHONE_MODULES_PATH), RecursiveIteratorIterator::SELF_FIRST);
@@ -727 +729 @@
-    }
-
-.2.
+2
-        $sql = "CREATE TABLE IF NOT EXISTS `endpointman_line_list` (
-              `luid` int(11) NOT NULL AUTO_INCREMENT,
@@ -779 +781 @@
-    }
-
-.2.
-
-
-
-.2.
+2
+
+
+
+2
-        out("Fix Debug Left on Error, this turns off debug.");
-        $sql = "UPDATE endpointman_global_vars SET value = '0' WHERE var_name = 'debug'";
@@ -792 +794 @@
-    }
-
-.4.
+4
-        out("Uninstalling All Installed Brands (You'll just simply have to update again, no loss of data)");
-        $db->query("UPDATE endpointman_brand_list SET  installed =  '0'");
@@ -819 +821 @@
-    }
-
-.9.0.
+90
-        $sql = 'INSERT INTO `endpointman_global_vars` (`idnum`, `var_name`, `value`) VALUES (NULL, \'disable_help\', \'0\');';
-        $db->query($sql);
-    }
-
-.9.0.
+90
-        $sql = 'ALTER TABLE  `endpointman_custom_configs` CHANGE  `data`  `data` LONGBLOB NOT NULL';
-        $db->query($sql);
-    }
-
-.9.0.
+90
-        out("Adding 'local' column to brand_list");
-        $sql = 'ALTER TABLE  `endpointman_brand_list` ADD  `local` INT( 1 ) NOT NULL DEFAULT  \'0\' AFTER  `cfg_ver`';
@@ -835 +837 @@
-    }
-
-.9.0.
+90
-        out("Adding UNIQUE key to table global_vars for var_name");
-        $sql = "ALTER TABLE `endpointman_global_vars` ADD UNIQUE `unique` (`var_name`)";
@@ -845 +847 @@
-    }
-
-.9.0.
+90
-        out("Successfully  Migrated to the new Installer!");
-        $sql = "UPDATE endpointman_global_vars SET value = 'http://mirror.freepbx.org/provisioner/' WHERE var_name ='update_server'";
@@ -852 +854 @@
-    }
-
-.9.1.
+91
-        out("Fix again to the 'Allow Duplicate Extensions' Error");
-        $sql = 'ALTER TABLE `endpointman_global_vars` ADD UNIQUE `var_name` (`var_name`)';
@@ -860 +862 @@
-    }
-
-($ver <= "2.9.2.
+ ($ver <= "292
-        out("Adding new Network Time Protocol Setting");
-.$_SERVER["SERVER_ADDR"].
+ . $_SERVER["SERVER_ADDR"] . 
-        $db->query($sql);
-        out("Upgrading all timezone data to new improved simplified system");
@@ -956 +958 @@
-
-        out('Creating symlink to web provisioner');
-(!symlink(LOCAL_PATH."provisioning",$amp_conf['AMPWEBROOT'].
-.$amp_conf['AMPWEBROOT'].
+ (!symlink(LOCAL_PATH . "provisioning", $amp_conf['AMPWEBROOT'] . 
+ . $amp_conf['AMPWEBROOT'] . 
-        }
-
@@ -963 +965 @@
-        $old_tz_gmt = $db->getOne($sql);
-
-.$old_tz_gmt.
+ . $old_tz_gmt . 
-        $new_tz_id = $db->getOne($sql);
-
-.$new_tz_id.
+ . $new_tz_id . 
-        $db->query($sql);
-
@@ -972 +974 @@
-        $db->query($sql);
-
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -1030 +1038 @@
-            (4, 'gmthr', ''),
-            (5, 'config_location', '/tftpboot/'),
-
+v2.5/
-            (7, 'version', '".$version."'),
-            (8, 'enable_ari', '0'),
@@ -1222 +1230 @@
-$db->query($sql);
-
-
+v2.5/
-$db->query($sql);
-

modules/branches/2.9/endpointman/module.xml

@@ -3 +3 @@
-  <repo>standard</repo>
-  <name>PBX End Point Manager</name>
-4
+9
-  <type>tool</type>
-  <category>End Point Manager</category>

modules/branches/2.9/endpointman/provisioning/index.php

@@ -3 +3 @@
-require('/etc/freepbx.conf');
-require('/var/www/html/admin/modules/endpointman/includes/functions.inc');
+require('/var/www/html/admin/modules/endpointman/includes/timezone.php');
+define("PHONE_MODULES_DIR", "/var/www/html/admin/modules/_ep_phone_modules/");
+require(PHONE_MODULES_DIR . 'endpoint/base.php');
-
-$endpoint = new endpointmanager();
-
-
+ 
-    header('HTTP/1.1 403 Forbidden');
-    die();
-}
-
-
- 
-
- 
+ 
+    
+ 
+    
-}
-
@@ -23 +26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-        header("HTTP/1.0 404 Not Found");
-
-
+
+
+

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

@@ -69 +69 @@
-</tr>
-<tr>
+  <td align='right'>Package Server:</td>
+  <td align='left'><label>
+    <input type="text" name="package_server" value="{$package_server}" size="50">
+  </label></td>
+</tr>
+<tr>
+  <td align='right'><br/></td>
+  <td align='left'></td>
+</tr>
+<tr>
-  <td align='right'><?php echo _("Enable FreePBX ARI Module")?> (<a href="http://projects.colsolgrp.net/documents/29" target="_blank">What?</a>)</td>
-  <td align='left'><label>

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

@@ -2 +2 @@
-<tr>
-    <td align='center'>{if condition="$subhead_area == 'settings'"}<h4 style="color:#ff9933;"><?php echo _('Settings')?></h4>{else}<h4><a href='config.php?type=tool&amp;display=epm_advanced&amp;subpage=settings'><?php echo _('Settings')?></a></h4>{/if}</td>
-    <td align='center'>{if condition="$subhead_area == 'timezone_manager'"}<h4 style="color:#ff9933;"><?php echo _('Timezone Manager')?></h4>{else}<h4><a href='config.php?type=tool&amp;display=epm_advanced&amp;subpage=timezone_manager'><?php echo _('Timezone Manager')?></a></h4>{/if}</td>
-    <td align='center'>{if condition="$subhead_area == 'oui_manager'"}<h4 style="color:#ff9933;"><?php echo _('OUI Manager')?></h4>{else}<h4><a href='config.php?type=tool&amp;display=epm_advanced&amp;subpage=oui_manager'><?php echo _('OUI Manager')?></a></h4>{/if}</td>
-    <td align='center'>{if condition="$subhead_area == 'poce'"}<h4 style="color:#ff9933;"><?php echo _('Product Options/Configuration Editor')?></h4>{else}<h4><a href='config.php?type=tool&amp;display=epm_advanced&amp;subpage=poce'><?php echo _('Product Options/Configuration Editor')?></a></h4>{/if}</td>

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

@@ -115 +115 @@
-{if condition="isset($installer)"}
-<script>
-
+
-function process_module_actions(actions) {
-        if ($.browser.msie) {
@@ -153 +153 @@
-}
-process_module_actions();
+{elseif condition="$amp_ver >= 210"}
+var box;
+function process_module_actions(actions) {
+    $(document).ready(function() {
+  urlStr = "config.php?display=epm_config&amp;quietmode=1&amp;handler=file&amp;file=installer.html.php&amp;module=endpointman&amp;type={$installer.type}&amp;id={$installer.id}";
+  urlStr += "&amp;rand="+Math.random ( );
+        for (var i in actions) {
+            urlStr += "&amp;moduleaction["+i+"]="+actions[i];
+        }
+        box = $('<div></div>')
+        .html('<iframe height="100%" frameBorder="0" src="'+urlStr+'"></iframe>')
+        .dialog({
+            title: 'Status - Please Wait',
+            resizable: false,
+            modal: true,
+            position: ['center', 50],
+            width: '400px',
+            height: 230,
+            close: function (e) {
+                close_module_actions(true);
+                $(e.target).dialog("destroy").remove();
+            }
+        });
+    });
+}
+function close_module_actions(goback) {
+        box.dialog("destroy").remove();
+        if (goback) {
+            location.href = 'config.php?display=epm_config';
+        }
+}
+process_module_actions();
+{/if}
-</script>
-<div id="moduleBox" style="display:none;"></div> 
@@ -185 +218 @@
-    {/loop}
-{/if}
-
+
+
-{include="global_footer"}
-

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

@@ -308 +308 @@
-        <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>
@@ -322 +322 @@
-            <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'),'headerRow','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>
@@ -352 +352 @@
-    <tr>
-        <td width="26%" align='center'><input type="submit" name="button_delete_selected_phones" onclick="submit_managed('delete_selected_phones');" value="<?php echo ('Delete Selected Phones')?>"></td>
- checked
+
-        <td width="32%" align='center'><?php echo _('Change Selected Phones to')?>: <br /><?php echo _('Brand')?>:<select name="brand_list_selected" id="brand_list_selected">
-                {loop name="brand_ava"}
-                <option value="{$value.value}" {if condition="isset($value.selected)"}selected{/if}>{$value.text}</option>
-                {/loop}
- checked
+
-    </tr>
-</table>
@@ -367 +367 @@
-<table width='90%' align='center'>
-    <tr>
- checked
+
-        <td width="32%" align='center'><form action='' name='globalmanaged2' id='globalmanaged2' method='POST'><select name="rb_brand">
-  {loop name="brand_ava"}
@@ -383 +383 @@
-                        <option></option>
-                    </select>
- checked
+
-                </label></td>
-    </tr>

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

@@ -9 +9 @@
-        <link href="common/mainstyle.css" rel="stylesheet" type="text/css" />
-        {/if}
-.
+
-        <script type="text/javascript" src="assets/endpointman/js/jquery.tools.min.js"></script>
-        <script type="text/javascript" src="assets/endpointman/js/jquery.easing.1.3.js"></script>