Changeset 12311

Show
Ignore:
Timestamp:
07/21/11 18:11:44 (2 years ago)
Author:
mickecarlsson
Message:

Closes #5281, adds ConfBridge? to Asterisk Info

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.10/asteriskinfo/page.asteriskinfo.php

    r11955 r12311  
    5050    $zapteldriverinfo = _("Zaptel driver info"); 
    5151  } 
    52   $conferenceinfo = _("Conference Info"); 
     52        $conf_meetme = _("MeetMe Conference Info"); 
     53        $conf_confbridge = _("Conference Bridge Info"); 
    5354  $queuesinfo = _("Queues Info"); 
    5455  $voicemailusers = _("Voicemail Users"); 
     
    8283  $subscribenotify => "show hints", 
    8384  $zapteldriverinfo => "zap show channels", 
    84   $conferenceinfo => "meetme", 
     85        $conf_meetme => "", 
     86        $conf_confbridge => "", 
    8587  $voicemailusers => "show voicemail users", 
    8688  $queuesinfo => "queue show", 
     
    110112); 
    111113$arr_conferences = array( 
    112   $conferenceinfo => "meetme", 
     114        $conf_meetme => "", 
     115        $conf_confbridge => "", 
    113116); 
    114117$arr_subscriptions = array( 
     
    124127$engineinfo = engine_getinfo(); 
    125128$astver =  $engineinfo['version']; 
     129 
     130if (version_compare($astver, '1.8', 'ge')) { 
     131    $meetme_check = $astman->send_request('Command', array('Command' => 
     132    'module show like meetme')); 
     133    $confbridge_check = $astman->send_request('Command', array('Command' => 
     134    'module show like confbridge')); 
     135    $meetme_module = preg_match('/[1-9] modules loaded/', $meetme_check['data']); 
     136    $confbridge_module = preg_match('/[1-9] modules loaded/', $confbridge_check['data']); 
     137    if ($meetme_module) { 
     138        $arr_conferences[$conf_meetme]="meetme list"; 
     139        $arr_all[$conf_meetme]="meetme list"; 
     140    } 
     141    if ($confbridge_module) { 
     142        $arr_conferences[$conf_confbridge]="confbridge list"; 
     143        $arr_all[$conf_confbridge]="confbridge list"; 
     144    } 
     145} 
    126146 
    127147if (version_compare($astver, '1.4', 'ge')) { 
     
    153173} 
    154174 
    155 if (version_compare($astver, '1.6', 'ge')) { 
    156   $arr_conferences[$conferenceinfo]="meetme list"; 
    157 } 
    158  
    159175if (version_compare($astver, '1.8', 'ge')) {  
    160176  if ($jabber_module) { 
     
    164180} 
    165181 
    166 if ($chan_dahdi){ 
    167   $arr_all[$zapteldriverinfo]="dahdi show channels"; 
    168 } 
    169182if ($chan_dahdi){ 
    170183  $arr_all[$zapteldriverinfo]="dahdi show channels";