diff options
Diffstat (limited to 'config/lcdproc-dev')
| -rw-r--r-- | config/lcdproc-dev/lcdproc.inc | 13 | ||||
| -rw-r--r-- | config/lcdproc-dev/lcdproc.xml | 8 | ||||
| -rw-r--r-- | config/lcdproc-dev/lcdproc_client.php | 7 | ||||
| -rw-r--r-- | config/lcdproc-dev/lcdproc_screens.xml | 4 |
4 files changed, 17 insertions, 15 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index 8b3ce28f..73827721 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -58,17 +58,17 @@ fclose($handle); chmod($file, 0755); } - function before_form_lcdproc($pkg) { + function before_form_lcdproc(&$pkg) { global $config; config_lock(); config_unlock(); } - function before_form_lcdproc_screens($pkg) { + function before_form_lcdproc_screens(&$pkg) { global $config; config_lock(); config_unlock(); } - function validate_form_lcdproc($post, $input_errors) { + function validate_form_lcdproc($post, &$input_errors) { if($post['comport']) { switch($post['comport']) { case "none": @@ -126,7 +126,7 @@ } } } - function validate_form_lcdproc_screens($post, $input_errors) { + function validate_form_lcdproc_screens($post, &$input_errors) { // No validation required ?! } function sync_package_lcdproc_screens() { @@ -308,7 +308,8 @@ $config_text .= "[{$lcdproc_config['driver']}]\n"; $config_text .= "driverpath=/usr/local/lib/lcdproc/\n"; $config_text .= "ConnectionType={$lcdproc_config['connection_type']}\n"; - $config_text .= "Device={$realport}\n"; + if($lcdproc_config['comport'] != "none") + $config_text .= "Device={$realport}\n"; $config_text .= "Port=0x378\n"; $config_text .= "Speed=0\n"; $config_text .= "Keypad=yes\n"; @@ -502,7 +503,7 @@ EOD; restart_service(LCDPROC_SERVICE_NAME); } } - if((! $lcdproc_config['driver']) || ($lcdproc_config['comport'] == "none")) { + if((! $lcdproc_config['driver']) || (! $lcdproc_config['comport'])) { /* no parameters user does not want lcdproc running */ /* lets stop the service and remove the rc file */ if(file_exists(LCDPROC_RCFILE)) { diff --git a/config/lcdproc-dev/lcdproc.xml b/config/lcdproc-dev/lcdproc.xml index cf816d53..588b898b 100644 --- a/config/lcdproc-dev/lcdproc.xml +++ b/config/lcdproc-dev/lcdproc.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <packagegui> - <title>Services: LCDproc 0.5.6 pkg v. 0.9.7</title> + <title>Services: LCDproc 0.5.6 pkg v. 0.9.9</title> <name>lcdproc</name> - <version>0.5.6 pkg v. 0.9.7</version> + <version>0.5.6 pkg v. 0.9.9</version> <savetext>Save</savetext> <include_file>/usr/local/pkg/lcdproc.inc</include_file> <tabs> @@ -658,10 +658,10 @@ </field> </fields> <custom_php_command_before_form> - before_form_lcdproc(&$pkg); + before_form_lcdproc($pkg); </custom_php_command_before_form> <custom_php_validation_command> - validate_form_lcdproc($_POST, &$input_errors); + validate_form_lcdproc($_POST, $input_errors); </custom_php_validation_command> <custom_php_resync_config_command> sync_package_lcdproc(); diff --git a/config/lcdproc-dev/lcdproc_client.php b/config/lcdproc-dev/lcdproc_client.php index 3337052c..922ed14e 100644 --- a/config/lcdproc-dev/lcdproc_client.php +++ b/config/lcdproc-dev/lcdproc_client.php @@ -513,6 +513,7 @@ 1 = All gateway up */ global $g; global $config; + $a_gateways = return_gateways_array(); $gateways_status = array(); $gateways_status = return_gateways_status(true); foreach ($a_gateways as $gname => $gateway) @@ -553,11 +554,11 @@ /* format speed in bits/sec, input: bytes/sec Code from: graph.php ported to PHP*/ if ($speed < 125000) - {return sprintf("%3d.1 Kbps", $speed / 125);} + {return sprintf("%5.1f Kbps", $speed / 125);} if ($speed < 125000000) - {return sprintf("%3d.1 Mbps", $speed / 125000);} + {return sprintf("%5.1f Mbps", $speed / 125000);} // else - return sprintf("%3d.1 Gbps", $speed / 125000000); + return sprintf("%5.1f Gbps", $speed / 125000000); } function add_summary_declaration(&$lcd_cmds, $name) { diff --git a/config/lcdproc-dev/lcdproc_screens.xml b/config/lcdproc-dev/lcdproc_screens.xml index f7c70086..9f4a8e2e 100644 --- a/config/lcdproc-dev/lcdproc_screens.xml +++ b/config/lcdproc-dev/lcdproc_screens.xml @@ -106,10 +106,10 @@ </field> </fields> <custom_php_command_before_form> - before_form_lcdproc_screens(&$pkg); + before_form_lcdproc_screens($pkg); </custom_php_command_before_form> <custom_php_validation_command> - validate_form_lcdproc_screens($_POST, &$input_errors); + validate_form_lcdproc_screens($_POST, $input_errors); </custom_php_validation_command> <custom_php_resync_config_command> sync_package_lcdproc_screens(); |