Changeset 10229

Show
Ignore:
Timestamp:
08/26/10 23:58:40 (1 year ago)
Author:
tm1000
Message:

EPM 2.2.5
-Fixed problem with xml downloader not being able to download all files when libcurl was used on a machine with multi-threading
-Fixed small issue with floats in install.php
-disabled some more functions.inc.php unless you have version 2.8.0+
-Disabled debug mode, it was confusing users

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • contributed_modules/modules/endpointman/functions.inc.php

    r10227 r10229  
    11<?PHP 
     2 
    23function endpointman_get_config($engine) { 
    34  global $db; 
    …… 
    67 
    78  $sql = 'SELECT value FROM `admin` WHERE `variable` LIKE CONVERT(_utf8 \'version\' USING latin1) COLLATE latin1_swedish_ci'; 
    8   $version = $db->getOne($sql); 
     9  $amp_version = $db->getOne($sql); 
    910 
    1011  switch($engine) { 
    1112    case "asterisk": 
    12     if (isset($core_conf) && is_a($core_conf, "core_conf") && ($version >= "2.8.0")) { 
     13    if (isset($core_conf) && is_a($core_conf, "core_conf") && ($amp_version >= "2.8.0")) { 
    1314        $core_conf->addSipNotify('polycom-check-cfg',array('Event' => 'check-sync','Content-Length' => '0')); 
    1415        $core_conf->addSipNotify('polycom-reboot',array('Event' => 'check-sync','Content-Length' => '0')); 
    …… 
    3435  // Add the 'process' function - this gets called when the page is loaded, to hook into 
    3536  // displaying stuff on the page. 
    36   $currentcomponent->addguifunc('endpointman_configpageload'); 
     37  //$currentcomponent->addguifunc('endpointman_configpageload'); 
    3738} 
    3839// This is called before the page is actually displayed, so we can use addguielem(). 
    …… 
    4142 
    4243  // Init vars from $_REQUEST[] 
    43   $action = isset($_REQUEST['action'])?$_REQUEST['action']:null; 
    44   $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null; 
     44  //$action = isset($_REQUEST['action'])?$_REQUEST['action']:null; 
     45  //$extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null; 
    4546 
    4647  // Don't display this stuff it it's on a 'This xtn has been deleted' page. 
    4748  if ($action != 'del') { 
    48     $section = _('End Point Manager'); 
    49     $msgInvalidLanguage = _('Please enter a valid Lajnguage Code'); 
     49    //$section = _('End Point Manager'); 
     50    //$msgInvalidLanguage = _('Please enter a valid Lajnguage Code'); 
    5051    //$currentcomponent->addguielem($section, new gui_textbox('brand', $langcode, _('Language Code'), _('This will cause all messages and voice prompts to use the selected language if installed.'), "!isFilename()", $msgInvalidLanguage, true),9); 
    5152    //$currentcomponent->addguielem($section, "",9); 

  • contributed_modules/modules/endpointman/includes/functions.inc

    r10227 r10229  
    728728        if(!isset($directory)) { 
    729729            $destination_file = PHONE_MODULES_PATH.'master.xml'; 
     730      $directory = "master"; 
    730731        } else { 
    731732            if(!file_exists(PHONE_MODULES_PATH.'/'.$directory)) { 
    …… 
    734735            $destination_file = PHONE_MODULES_PATH.'/'.$directory.'/brand_data.xml'; 
    735736        } 
    736         $temp_file = PHONE_MODULES_PATH.'temp/temp.xml'; 
     737        $temp_file = PHONE_MODULES_PATH.'temp/'.$directory.'.xml'; 
    737738        if($this->download_xml_file($location, $temp_file)) { 
    738739            $handle = fopen($temp_file, "rb"); 

  • contributed_modules/modules/endpointman/install.php

    r10227 r10229  
    11<?PHP 
    2 ini_set('display_errors', 1); 
    3 error_reporting(E_ALL); 
     2//ini_set('display_errors', 1); 
     3//error_reporting(E_ALL); 
    44/* 
    55Endpoint Manager V2 
    …… 
    9393} 
    9494 
    95 $version = "2.2.4"; 
     95$version = "2.2.5"; 
    9696 
    9797if(ep_table_exists("endpointman_global_vars")) { 
    …… 
    131131} elseif($global_cfg['version'] == '2.2.2') { 
    132132    $ver = "2.2.2"; 
     133} elseif($global_cfg['version'] == '2.2.3') { 
     134    $ver = "2.2.3"; 
     135} elseif($global_cfg['version'] == '2.2.4') { 
     136    $ver = "2.2.4"; 
    133137} else { 
    134138    $ver = "1000"; 
    135139    $new_install = TRUE; 
    136140} 
    137  
    138 $ver = (float) $ver; 
    139141 
    140142if($new_install) { 
    …… 
    675677        } 
    676678 
    677  
    678  
    679  
    680679        $data = array(); 
    681680        $data =& $db->getAll("SELECT * FROM  endpointman_custom_configs",array(), DB_FETCHMODE_ASSOC); 
    …… 
    764763} 
    765764 
    766  
     765if ($ver <= "2.2.4") { 
     766} 
     767 
     768if ($ver <= "2.2.5") {   
     769    out("Fix Debug Left on Error, this turns off debug."); 
     770    $sql = 'UPDATE `asterisk`.`endpointman_global_vars` SET `value` = \'1\' WHERE `endpointman_global_vars`.`idnum` = 9 LIMIT 1;'; 
     771    $db->query($sql); 
     772 
     773} 
    767774 
    768775if ($new_install) { 
    …… 
    803810            (6, 'update_server', 'http://www.provisioner.net/release/'), 
    804811            (7, 'version', '".$version."'), 
    805             (8, 'enable_ari', '1'), 
    806             (9, 'debug', '1'), 
     812            (8, 'enable_ari', '0'), 
     813            (9, 'debug', '0'), 
    807814            (10, 'arp_location', '".$arp."'), 
    808815            (11, 'nmap_location', '".$nmap."'), 
    809816            (12, 'asterisk_location', '".$asterisk."'), 
    810817            (13, 'language', ''), 
    811             (14, 'check_updates', '1'), 
     818            (14, 'check_updates', '0'), 
    812819            (15, 'disable_htaccess', ''), 
    813820            (16, 'endpoint_vers', '0')"; 

  • contributed_modules/modules/endpointman/module.xml

    r10228 r10229  
    22  <rawname>endpointman</rawname> 
    33  <name>PBX End Point Manager</name> 
    4   <version>2.2.4</version> 
     4  <version>2.2.5</version> 
    55  <type>tool</type> 
    66  <category>End Point Manager</category> 
    …… 
    1515   <description>PBX End Point Manager supports automated deployment of multiple manufacturers IP telephones.</description> 
    1616   <changelog> 
    17     *2.0.0* #264, #115, #107, #110, #111, #112, #119, #127, #128, #174, #261, #270, #280, #124, #126, #272, #281 (http://projects.colsolgrp.net/projects/endpointman/issues) 
    18     *1.0.3* Bug Fix Aastra.cfg #142, #143 (http://projects.colsolgrp.net/projects/endpointman/issues)(6/16/09) 
    19     *1.0.2* Bug Fix Polycom No sip_custom.cfg #125 (http://projects.colsolgrp.net/projects/endpointman/issues) 
    20     *1.0.1* Bug Fix Polycom Ticket: #125 (http://projects.colsolgrp.net/projects/endpointman/issues) 
    21     *1.0.0* Initial release (5.26.2009). 
     17    *2.2.5* Fixed Debug Always on Error &amp File download errors &amp Fix float error on install 
    2218        </changelog> 
    2319  <info>http://projects.colsolgrp.net/projects/show/endpointman</info> 
    24   <location>contributed_modules/release/endpointman-2.2.4.tgz</location> 
     20  <location>contributed_modules/release/endpointman-2.0.0.tgz</location> 
    2521 
    26 <md5sum>6c18b4259e79b593ed4da8c70bd2e2e7</md5sum> 
     22<md5sum>b1341a35ef60d0fad17348803a0a7833</md5sum> 
    2723</module>