Changeset 10227

Timestamp:

08/25/10 00:48:05 (1 year ago)

Author:

tm1000

Message:

EPM 2.2.4
-Fixed several upgrade problems (if you upgraded from 2.0.0 to 2.2.x you'd have issues)
-Fixed remote repository location change on upgrade (I forgot! :-( )
-Added option to install firmwares back in
-Would fail if languages module wasn't installed [Fixed]
-Fixed Some cosmetic changes to template_editor/manager
-Updated global footer (not sure why it was removed)
-License change to MPL 1.1
-Disabled some template stuff that was causing some errors

Files:

• contributed_modules/modules/endpointman/functions.inc.php (modified) (2 diffs)
• contributed_modules/modules/endpointman/includes/advanced.inc (modified) (1 diff)
• contributed_modules/modules/endpointman/includes/brand_model_manager.inc (modified) (2 diffs)
• contributed_modules/modules/endpointman/includes/devices_manager.inc (modified) (2 diffs)
• contributed_modules/modules/endpointman/includes/functions.inc (modified) (14 diffs)
• contributed_modules/modules/endpointman/includes/installer.php (modified) (1 diff)
• contributed_modules/modules/endpointman/includes/template_manager.inc (modified) (2 diffs)
• contributed_modules/modules/endpointman/install.php (modified) (10 diffs)
• contributed_modules/modules/endpointman/module.xml (modified) (2 diffs)
• contributed_modules/modules/endpointman/templates/advanced_settings_poce.html (modified) (2 diffs)
• contributed_modules/modules/endpointman/templates/brand_model_manager.html (modified) (1 diff)
• contributed_modules/modules/endpointman/templates/devices_manager.html (modified) (1 diff)
• contributed_modules/modules/endpointman/templates/global_footer.html (modified) (1 diff)
• contributed_modules/modules/endpointman/templates/template_editor.html (modified) (3 diffs)
• contributed_modules/modules/endpointman/templates/template_manager.html (modified) (1 diff)

contributed_modules/modules/endpointman/functions.inc.php

@@ -27 +27 @@
-function endpointman_configpageinit($pagename) {
-  global $currentcomponent;
-
-
+
-}
-function endpointman_applyhooks() {
@@ -47 +46 @@
-  // Don't display this stuff it it's on a 'This xtn has been deleted' page.
-  if ($action != 'del') {
-    $langcode = languages_user_get($extdisplay);
-    $section = _('End Point Manager');
-    $msgInvalidLanguage = _('Please enter a valid Lajnguage Code');
-langcode
+brand
-    //$currentcomponent->addguielem($section, "",9);
-

contributed_modules/modules/endpointman/includes/advanced.inc

@@ -275 +275 @@
-            $endpoint->db->query($sql);
-        }
-isset($_REQUEST['temp_file'])
+1 == 0
-            $file = $_REQUEST['temp_file'];
-

contributed_modules/modules/endpointman/includes/brand_model_manager.inc

@@ -112 +112 @@
-}
-
-
-
-if (!isset($error)) {
-  $error = "";
@@ -128 +126 @@
-}
-
-
-$tpl->assign("error", $error);
-$tpl->assign("web_var", "?type=$type");

contributed_modules/modules/endpointman/includes/devices_manager.inc

@@ -282 +282 @@
-}
-
-
+, endpointman_model_list.enabled
-
-$devices_list =& $endpoint->db->getAll($sql,array(),DB_FETCHMODE_ASSOC);
@@ -300 +300 @@
-        $list[$i]['template_name'] = $row2;
-    }
+    if (!$row['enabled']) {
+        $list[$i]['model'] = $row['model']."<i>(Disabled)</i>";
+    }
-    $i++;
-    # End while
+
-
-

contributed_modules/modules/endpointman/includes/functions.inc

@@ -209 +209 @@
-        //Determine if we are dealing with a general template or a specific [for that phone only] template (custom =0 means general)
-        if($custom == 0) {
-product_list.config_files, endpointman_product_list.long
-
-product_list.config_files, endpointman_mac_list.*, endpointman_model_list.id as model_id, endpointman_model_list.template_data, endpointman_product_list.id as product_id, endpointman_product_list.long
+model_list.model as model_name, endpointman_product_list.config_files, endpointman_product_list.short
+
+model_list.model as model_name, endpointman_product_list.config_files, endpointman_mac_list.*, endpointman_model_list.id as model_id, endpointman_model_list.template_data, endpointman_product_list.id as product_id, endpointman_product_list.short
-        }
-
@@ -227 +227 @@
-            $tpl->assign("template_name", $row['name']);
-        }
-
-
+
+
+
+
+
+
-        //Start the display of the html file in the product folder
-        if($row['config_files_override'] == "") {
@@ -505 +509 @@
-        //Provide alternate Configuration file instead of the one from the hard drive
-        $temp = "";
-
+ 
-            $temp = unserialize($phone_info['config_files_override']);
-            foreach($temp as $list) {
@@ -545 +549 @@
-        $returned_data = $provisioner_lib->generate_config();
-
+        //Create Directory Structure (If needed)
+        if(isset($provisioner_lib->directory_structure)) {
+            foreach($provisioner_lib->directory_structure as $data) {
+                $dir = $this->global_cfg['config_location'] . $data;
+                if(!file_exists($dir)) {
+                    mkdir($dir);
+                }
+            }
+        }
+
+        //Copy Files/Directories (If needed)
+        if(isset($provisioner_lib->copy_files)) {
+            foreach($provisioner_lib->copy_files as $data) {
+                if(((file_exists($this->global_cfg['config_location'].$data)) AND (!in_array($data,$provisioner_lib->protected_files))) OR (!file_exists($this->global_cfg['config_location'].$data))) {
+                    if(is_dir(PHONE_MODULES_PATH."endpoint/".$phone_info['directory']."/".$phone_info['cfg_dir']."/".$data)) {
+                        if(!file_exists($this->global_cfg['config_location'].$data)) {
+                            mkdir($this->global_cfg['config_location'].$data);
+                        }
+                        $dir_iterator = new RecursiveDirectoryIterator(PHONE_MODULES_PATH."endpoint/".$phone_info['directory']."/".$phone_info['cfg_dir']."/".$data."/");
+                        $iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST);
+                        // could use CHILD_FIRST if you so wish
+                        foreach ($iterator as $file) {
+                            if(is_dir($file)) {
+                                $dir = str_replace(PHONE_MODULES_PATH."endpoint/".$phone_info['directory']."/".$phone_info['cfg_dir']."/".$data."/", "", $file);
+                                if(!file_exists($this->global_cfg['config_location'].$data."/".$dir)) {
+                                    mkdir($this->global_cfg['config_location'].$data."/".$dir);
+                                }
+                            } else {
+                                $dir = str_replace(PHONE_MODULES_PATH."endpoint/".$phone_info['directory']."/".$phone_info['cfg_dir']."/".$data."/", "", $file);
+                                copy($file, $this->global_cfg['config_location'].$data."/".$dir);
+                            }
+                        }
+                    } else {
+                        copy(PHONE_MODULES_PATH."endpoint/".$phone_info['directory']."/".$phone_info['cfg_dir']."/".$data,$this->global_cfg['config_location'].$data);
+                    }
+                }
+            }
+        }
+
+        $sql = 'SELECT `value` FROM `endpointman_global_vars` WHERE `var_name` LIKE CONVERT(_utf8 \'version\' USING latin1) COLLATE latin1_swedish_ci';
+        $epm_version = $this->db->getOne($sql);
+
+        $sql = 'SELECT `value` FROM `endpointman_global_vars` WHERE `var_name` LIKE CONVERT(_utf8 \'endpoint_vers\' USING latin1) COLLATE latin1_swedish_ci';
+        $prov_version = $this->db->getOne($sql);
+
+        $sql = 'SELECT `cfg_ver` FROM `endpointman_brand_list` WHERE `directory` LIKE CONVERT(_utf8 \'grandstream\' USING latin1) COLLATE latin1_swedish_ci';
+        $brand_version = $this->db->getOne($sql);
+
+        //Generate Files
-        foreach($returned_data as $key => $data) {
-
-
-
+
+
+
+
+
+
+
+
-        }
-        $provisioner_lib->reboot();
@@ -565 +623 @@
-            return FALSE;
-        } else {
-template
+family
-            if((array_key_exists('data',$temp)) AND (!is_array($temp['data']['firmware_ver']))) {
-                if($row['firmware_vers'] < $temp['data']['firmware_ver']) {
@@ -593 +651 @@
-                return("nothing");
-            } else {
-
+
+
-                if((isset ($temp['data']['firmware_ver'])) AND (!is_array($temp['data']['firmware_ver']))) {
-                    if($row['firmware_vers'] == "") {
@@ -610 +669 @@
-
-    function remove_firmware($id=NULL) {
-
-
-
-
-
-
+
+
+
+
-        $i = 0;
-        while($i < count($file_list)) {
-
+this->
-            $i++;
-        }
-        $sql = 'UPDATE endpointman_product_list SET firmware_files = "", firmware_vers = "" WHERE id = '.$id;
-mysql_
+$this->db->
-    }
-
-    function install_firmware($product_id) {
-        global $global_cfg, $debug;
-        $sql = 'SELECT endpointman_product_list.*, endpointman_brand_list.directory FROM endpointman_product_list, endpointman_brand_list WHERE endpointman_product_list.brand = endpointman_brand_list.id AND endpointman_product_list.id = '.$product_id;
-
-
-
+
+
-        if($temp['data']['firmware_ver'] > $row['firmware_vers']) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            $sql = "UPDATE endpointman_product_list SET firmware_vers = '".$temp['data']['firmware_ver']."', firmware_files = '".$list."' WHERE id = ". $row['id'];
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        }
-    }
@@ -989 +1038 @@
-            if (file_exists(PHONE_MODULES_PATH.'/endpoint/'.$brand_row['directory'].'/'.$product_row['cfg_dir'].'/template_data_custom.xml')) {
-                $template_data_multi = $this->xml2array(PHONE_MODULES_PATH.'/endpoint/'.$brand_row['directory'].'/'.$product_row['cfg_dir'].'/template_data_custom.xml');
-
-
+
+
+
+
-            }
-
-            if (file_exists(PHONE_MODULES_PATH.'/endpoint/'.$brand_row['directory'].'/'.$product_row['cfg_dir'].'/template_data_' . $model_row['model'] . '_custom.xml')) {
-                $template_data_multi = $this->xml2array(self::$modules_path . $this->brand_name . "/" . $this->family_line . "/template_data_" . $this->model . "_custom.xml");
-
-
+
+
+
+
-            }
-
@@ -1035 +1088 @@
-        $file_size  = 1;
-        $downloaded = 1;
+        echo "&nbsp;";
-        /* open destination file */
-        $fout = fopen($destination_file, "wb");
@@ -1423 +1477 @@
-    }
-
-
+, $product=NULL
-        if (isset($macAdd)) {
-            $oui=substr($macAdd,0,6);
@@ -1431 +1485 @@
-        }elseif((isset($brand)) && ($brand !=0)) {
-            $sql="SELECT endpointman_model_list.* FROM endpointman_model_list, endpointman_product_list WHERE endpointman_model_list.product_id = endpointman_product_list.id AND endpointman_model_list.enabled = 1 AND endpointman_product_list.hidden = 0 AND endpointman_model_list.brand = " . $brand;
+        }elseif((isset($product)) && ($product !=0)) {
+            $sql="SELECT * FROM endpointman_model_list WHERE product_id = ".$product;
-        } else {
-            $sql="SELECT endpointman_model_list.* FROM endpointman_model_list, endpointman_product_list WHERE endpointman_model_list.product_id = endpointman_product_list.id AND endpointman_model_list.enabled = 1 AND endpointman_product_list.hidden = 0";
@@ -1558 +1614 @@
-
-function endpointman_update_progress_bar($out) {
-    /*
-  echo "\n<script type=\"text/javascript\" language=\"javascript\">";
-  echo 'document.getElementById("tb").style.width = "'.$out.'%";';  
-  echo "\n</script>";
-    */
-    echo ".";
-}
@@ -1570 +1621 @@
-    $length = strlen($string);
-    $regs = "";
-    //ereg("(Content-Length:) (.*)", $string, $regs);
-    preg_match("/(Content-Length:) (.*)/i", $string, $regs);
-    if((isset($regs[2])) AND ($regs[2] <> "")) {
@@ -1580 +1630 @@
-
-function endpointmanager_read_body($ch, $string) {
-    //Andrew Nagy added the below echo, otherwise the progress bar never updated until the download was complete
-    //echo "&nbsp;";
-    //end Andrew code
-    global $fout, $file_size, $downloaded, $lastseen, $progress_bar;
-    $length = strlen($string);

contributed_modules/modules/endpointman/includes/installer.php

@@ -25 +25 @@
-    }
-} elseif($_REQUEST['type'] == "firmware") {
-data
+_REQUEST
-} elseif($_REQUEST['type'] == "manual_install") {
-    switch($_REQUEST['install_type']) {

contributed_modules/modules/endpointman/includes/template_manager.inc

@@ -54 +54 @@
-
-if($default_display) {
- FROM endpointman_template_list, endpointman_model_list, endpointman_product_list WHERE endpointman_model_list.enabled = 1 AND
+, endpointman_model_list.enabled FROM endpointman_template_list, endpointman_model_list, endpointman_product_list WHERE
-        $template_list =& $db->getAll($sql, array(), DB_FETCHMODE_ASSOC);
-  $i = 0;
@@ -61 +61 @@
-                $row_out[$i] = $row;
-    $row_out[$i]['custom'] = 0;
+                if(!$row['enabled']) {
+                    $row_out[$i]['model_clone'] = $row_out[$i]['model_clone']."<i>(Disabled)</i>";
+                }
-    $i++;
-  }

contributed_modules/modules/endpointman/install.php

@@ -93 +93 @@
-}
-
-3
+4
-
-if(ep_table_exists("endpointman_global_vars")) {
@@ -579 +579 @@
-            "3" => "1-2-10",
-            "4" => "1-2-9",
-
-
+4-2-3
+4-3-7
-            "8" => "6-1-1",
-            "9" => "6-1-2",
@@ -588 +588 @@
-            "13"  => "6-1-6",
-            "15" => "2-1-3",
-
+4-2-4
-            "23" => "2-1-2",
-            "24" => "2-1-1",
@@ -595 +595 @@
-            "27" => "2-2-1",
-            "28" => "2-2-2",
-
-
-
-
-
+4-2-1
+4-2-5
+4-2-6
+4-2-7
+4-2-2
-            "34" => "4-3-1",
-            "35" => "4-3-2",
@@ -611 +611 @@
-            "43" => "4-3-11",
-            "44" => "4-3-12",
-
-
+4-1-1
+4-1-2
-            "47" => "1-2-1",
-            "48" => "1-2-2",
@@ -641 +641 @@
-
-        foreach($data as $list) {
-id
+model
-            $db->query($sql);
-        }
@@ -652 +652 @@
-            "1" => array("product_id" => "2-1", "model_id" => "2-1-1"),
-            "2" => array("product_id" => "2-2", "model_id" => "2-2-1"),
-", "model_id" => "
-", "model_id" => "
+4-2", "model_id" => "4-2-1
+4-1", "model_id" => "4-1-1
-            "4" => array("product_id" => "4-3", "model_id" => "4-3-1"),
-            "8" => array("product_id" => "6-1", "model_id" => "6-1-1"),
@@ -671 +671 @@
-        $data =& $db->getAll("SELECT * FROM endpointman_template_list",array(), DB_FETCHMODE_ASSOC);
-        foreach($data as $list) {
-model
+product
-            $db->query($sql);
-        }
@@ -740 +740 @@
-        $new_model_id = str_replace("-", "", $list['model']);
-        $sql = "UPDATE endpointman_mac_list SET model = '".$new_model_id."' WHERE id = ". $list['id'];
-        
+   
-    }
-
@@ -759 +759 @@
-        $db->query($sql);
-    }
+} if ($ver <= "2.2.3") {
+  $sql = 'UPDATE `asterisk`.`endpointman_global_vars` SET `value` = \'http://www.provisioner.net/release/\' WHERE `endpointman_global_vars`.`idnum` = 6 LIMIT 1;';
+  $db->query($sql);
-}
-

contributed_modules/modules/endpointman/module.xml

@@ -2 +2 @@
-  <rawname>endpointman</rawname>
-  <name>PBX End Point Manager</name>
-3
+4
-  <type>tool</type>
-  <category>End Point Manager</category>
@@ -22 +22 @@
-        </changelog>
-  <info>http://projects.colsolgrp.net/projects/show/endpointman</info>
-2.3
+0.0
-
-db9b805ac2949ec0ee4b1c9d6920dd2
+1341a35ef60d0fad17348803a0a7833
-</module>

contributed_modules/modules/endpointman/templates/advanced_settings_poce.html

@@ -22 +22 @@
-  <tr>
-    <td valign="top">
+        <!--
-        <u><?=_("Custom Template Files")?></u><br />
-  {loop name="template_file_list"}
@@ -27 +28 @@
-  {/loop}
-  <hr>
+        -->
-  <u><?=_("Local File Configs")?></u><br />
-  {loop name="file_list"}

contributed_modules/modules/endpointman/templates/brand_model_manager.html

@@ -159 +159 @@
-{/if}
-
-
+
-
-  

contributed_modules/modules/endpointman/templates/devices_manager.html

@@ -221 +221 @@
-</table>
-</form>
+{include="global_footer"}

contributed_modules/modules/endpointman/templates/global_footer.html

@@ -1 +1 @@
-<hr>
-
+
+
+
-<br> <?=_("The project is maintained at")?> 
-
-
-
+
-</body>
-</html> 

contributed_modules/modules/endpointman/templates/template_editor.html

@@ -3 +3 @@
-    <head>
-        <link href="/recordings/theme/coda-slider-2.0a.css" rel="stylesheet" type="text/css" />
-
-
-        <!-- Begin JavaScript -->
-        <script type="text/javascript" src="/recordings/theme/js/jquery.easing.1.3.js"></script>
@@ -19 +17 @@
-    <body>
-        {else}
-        <?=_('You are currently editing')?>
-  {if condition="$custom != 0"}
-        <?=_('a custom config template for extension')?> {$ext}, <?=_('Model')?>: {$model}
-  {/if}
-  {if condition="$custom == 0"}
-
+
+
+
+
+
+
+
+
-  {/if}
-        <br />
@@ -93 +97 @@
-        </form>
-        {/if}
+{include="global_footer"}

contributed_modules/modules/endpointman/templates/template_manager.html

@@ -48 +48 @@
-</center>
-{/if}
+{include="global_footer"}