Changeset 14120

Show
Ignore:
Timestamp:
05/30/12 07:07:00 (1 year ago)
Author:
mbrevda
Message:

remove directory feature code (was for legacy directory); fix/improve sip notify; fix undefined var

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/findmefollow/functions.inc.php

    r13934 r14120  
    544544// extensions and users. 
    545545// 
    546 if ($amp_conf['FOLLOWME_AUTO_CREATE']) { 
     546if (isset($amp_conf['FOLLOWME_AUTO_CREATE']) && $amp_conf['FOLLOWME_AUTO_CREATE']) { 
    547547  function findmefollow_configprocess() { 
    548548    global $amp_conf; 

  • modules/branches/2.10/infoservices/install.php

    r13091 r14120  
    1212 
    1313$fcc = new featurecode('infoservices', 'directory'); 
    14 $fcc->setDescription('Directory'); 
    15 $fcc->setDefault('#'); 
    16 $fcc->setProvideDest(); 
    17 $fcc->update(); 
     14if ($fcc->getCode()) { 
     15  $fcc->delete(); 
     16} 
    1817unset($fcc); 
    1918 

  • modules/branches/2.10/paging/functions.inc.php

    r14059 r14120  
    1212 
    1313function paging_get_config($engine) { 
    14   global $db, $ext, $chan_dahdi, $version, $amp_conf; 
    15   global $conferences_conf; 
     14  global $db, $ext, $chan_dahdi, $version, $amp_conf, $conferences_conf; 
    1615  switch($engine) { 
    1716    case "asterisk": 

  • modules/branches/2.10/paging/install.php

    r13919 r14120  
    114114$sql = "INSERT INTO paging_autoanswer (useragent, var, setting) VALUES ('Panasonic', 'ALERTINFO', 'Alert-Info: Intercom')"; 
    115115$result = $db->query($sql); 
     116$sql = "INSERT INTO paging_autoanswer (useragent, var, setting) VALUES ('Polycom', 'ALERTINFO', 'Alert-Info: info-Auto Answer')"; 
     117$result = $db->query($sql); 
    116118 
    117119// Add dulex field 

  • modules/branches/2.10/restart/functions.inc.php

    r13956 r14120  
    2424                        $core_conf->addSipNotify('polycom-check-cfg',array('Event' => 'check-sync')); 
    2525                        $core_conf->addSipNotify('sipura-check-cfg',array('Event' => 'resync')); 
    26                         $core_conf->addSipNotify('grandstream-check-cfg',array('Event' => 'sys-control')); 
     26                        $core_conf->addSipNotify('grandstream-check-cfg',array('Event' => 'check-sync')); 
    2727                        $core_conf->addSipNotify('cisco-check-cfg',array('Event' => 'check-sync')); 
    2828                        $core_conf->addSipNotify('reboot-snom',array('Event' => 'reboot')); 
    …… 
    3333                        $core_conf->addSipNotify('linksys-warm-restart',array('Event' => 'restart_now')); 
    3434                        $core_conf->addSipNotify('reboot-yealink',array('Event' => 'check-sync\;reboot=true')); 
    35  
     35            $core_conf->addSipNotify('panasonic-check-cfg',array('Event' => 'check-sync')); 
     36            $core_conf->addSipNotify('audiocodes-check-cfg',array('Event' => 'check-sync')); 
     37            $core_conf->addSipNotify('algo-check-cfg',array('Event' => 'check-sync')); 
     38            $core_conf->addSipNotify('cyberdata-check-cfg',array('Event' => 'check-sync'));  
     39       
    3640        } 
    3741