Changeset 10004

Show
Ignore:
Timestamp:
06/30/10 15:38:20 (3 years ago)
Author:
p_lindheimer
Message:

add alarm info to dahdiconfig_get_unused_trunk_options() so dahdiconfig_hook_core() can eventually use it to provide some feedback on the trunk page

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r9982 r10004  
    14441444    $grp = $port_details['group']; 
    14451445    $chan = (string) $port_details['port']; 
    1446     $avail_group["g$grp"] = array('identifier' => "g$grp", 'name' => "Group $grp Ascending",'selected'  => ($current_identifier == "g$grp")); 
    1447     $avail_group["G$grp"] = array('identifier' => "G$grp", 'name' => "Group $grp Descending",'selected' => ($current_identifier == "G$grp")); 
    1448     $analog_chan[$chan] = array('identifier' => $chan, 'name' => "Analog Channel $chan",'selected' => ($current_identifier == $chan)); 
     1446    $avail_group["g$grp"] = array('identifier' => "g$grp",'name' => "Group $grp Ascending",'alarms' => '','selected'  => ($current_identifier == "g$grp")); 
     1447    $avail_group["G$grp"] = array('identifier' => "G$grp",'name' => "Group $grp Descending",'alarms' => '','selected' => ($current_identifier == "G$grp")); 
     1448    $analog_chan[$chan] = array('identifier' => $chan, 'name' => "Analog Channel $chan",'alarms' => '','selected' => ($current_identifier == $chan)); 
    14491449  } 
    14501450  // Get Digital Groups and Channels. Channels are not that useful 
    …… 
    14571457    } 
    14581458    $grp = $span['group']; 
    1459     $avail_group["g$grp"] = array('identifier' => "g$grp", 'name' => "Group $grp Ascending",'selected'  => ($current_identifier == "g$grp")); 
    1460     $avail_group["G$grp"] = array('identifier' => "G$grp", 'name' => "Group $grp Descending",'selected' => ($current_identifier == "G$grp")); 
     1459    $alarms = $span['alarms']; 
     1460    if (!isset($avail_group["g$grp"])) { 
     1461      $avail_group["g$grp"] = array('identifier' => "g$grp",'name' => "Group $grp Ascending",'alarms' => $alarms,'selected'  => ($current_identifier == "g$grp")); 
     1462      $avail_group["G$grp"] = array('identifier' => "G$grp",'name' => "Group $grp Descending",'alarms' => $alarms,'selected' => ($current_identifier == "G$grp")); 
     1463    } else { 
     1464      //TODO: figure out the possible alarms and the create proper hiearchy of what to report 
     1465      // 
     1466      if ($alarms == 'RED' || $avail_group["g$grp"]['alarms'] == '') { 
     1467        $avail_group["g$grp"]['alarms'] = $alarms; 
     1468        $avail_group["G$grp"]['alarms'] = $alarms; 
     1469      } 
     1470    } 
    14611471    if ($show_digital_chans) { 
    14621472      $basechan = $span['basechan']; 
    …… 
    14641474      $topchan = $basechan + $definedchans; 
    14651475      for ($port = $basechan; $port < $topchan; $port++) { 
    1466         $digital_chan["$port"] = array('identifier' => "$port", 'name' => "Digital Channel $port",'selected' => ($current_identifier == "$port")); 
     1476        $digital_chan["$port"] = array('identifier' => "$port", 'name' => "Digital Channel $port",'alarms' => $alarms,'selected' => ($current_identifier == "$port")); 
    14671477      } 
    14681478    }