diff options
| -rw-r--r-- | packages/nut/nut.xml | 34 | ||||
| -rw-r--r-- | packages/nut/status_nut.php | 9 |
2 files changed, 37 insertions, 6 deletions
diff --git a/packages/nut/nut.xml b/packages/nut/nut.xml index 92d5ec09..f7a826d9 100644 --- a/packages/nut/nut.xml +++ b/packages/nut/nut.xml @@ -142,7 +142,7 @@ <value>bestups03</value> </option> <option> - <name>Best Power Patriot (Generic/Cable)</name> + <name>Best Power Patriot (Generic/Cable)</name> <value>genericups03</value> </option> <option> @@ -188,7 +188,11 @@ <option> <name>Cyber Power Systems 1500AVR</name> <value>cyberpower08</value> - </option> + </option> + <option> + <name>Inform GUARD Line Interactive</name> + <value>powercom00</value> + </option> <option> <name>Meta System HF Line</name> <value>metasys00</value> @@ -300,7 +304,23 @@ <option> <name>Mustek Powermust USB</name> <value>megatec02</value> - </option> + </option> + <option> + <name>Powercom SMK</name> + <value>megatec03</value> + </option> + <option> + <name>Powercom ULT</name> + <value>megatec04</value> + </option> + <option> + <name>Powercom Trust</name> + <value>powercom01</value> + </option> + <option> + <name>Powercom Various</name> + <value>powercom02</value> + </option> <option> <name>Tripp-Lite SmartUPS</name> <value>tripplite00</value> @@ -310,6 +330,14 @@ <value>tripplitesu00</value> </option> <option> + <name>Tripp-Lite AVR USB</name> + <value>newhidups13</value> + </option> + <option> + <name>Tripp-Lite OMNI USB</name> + <value>newhidups14</value> + </option> + <option> <name>Tripp-Lite OMNIVUS USB</name> <value>tripplite_usb00</value> </option> diff --git a/packages/nut/status_nut.php b/packages/nut/status_nut.php index c5afcdfe..8410406e 100644 --- a/packages/nut/status_nut.php +++ b/packages/nut/status_nut.php @@ -64,10 +64,10 @@ include("head.inc"); <table width="100%" class="tabcont" cellspacing="0" cellpadding="6"> <?php if($nut_config['monitor'] == 'local') { - print("<tr><td class=\"vncellreq\">Monitoring:</td><td class=\"vtable\">Local UPS</td><tr>\n"); + print("<tr><td width=\"100px\" class=\"vncellreq\">Monitoring:</td><td class=\"vtable\">Local UPS</td><tr>\n"); $handle = popen("upsc {$nut_config['name']}@localhost","r"); } elseif($nut_config['monitor'] == 'remote') { - print("<tr><td class=\"vncellreq\">Monitoring:</td><td class=\"vtable\">Remote UPS</td><tr>\n"); + print("<tr><td width=\"100px\" class=\"vncellreq\">Monitoring:</td><td class=\"vtable\">Remote UPS</td><tr>\n"); $handle = popen("upsc {$nut_config['remotename']}@{$nut_config['remoteaddr']}","r"); } @@ -85,7 +85,7 @@ include("head.inc"); print("<tr><td class=\"vncellreq\">Model:</td><td class=\"vtable\">{$ups['ups.model']}</td><tr>\n"); - print('<tr><td width="100px" class="vncellreq">Status:</td><td class="vtable">'); + print('<tr><td class="vncellreq">Status:</td><td class="vtable">'); $status = explode(' ',$ups['ups.status']); foreach($status as $condition) { switch ($condition) { @@ -98,6 +98,9 @@ include("head.inc"); case LB: print('Battery Low '); break; + default: + print("{$condition} "); + break; } } print("</td><tr>\n"); |