diff options
| author | Renato Botelho <renato@netgate.com> | 2015-08-11 11:55:08 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-08-11 11:55:08 -0300 |
| commit | 27be41aa2101993dbead8cc93bab246114af6ab3 (patch) | |
| tree | 15cd9637ec0501f05413facdd78112d4dc62a148 | |
| parent | 3faf4d8c63981742cf7d6a99c41c9e39d815db0d (diff) | |
| parent | 6e135c04444a5d2fd7e74b4e3fc1b0ef4f815d96 (diff) | |
| download | pfsense-packages-27be41aa2101993dbead8cc93bab246114af6ab3.tar.gz pfsense-packages-27be41aa2101993dbead8cc93bab246114af6ab3.tar.bz2 pfsense-packages-27be41aa2101993dbead8cc93bab246114af6ab3.zip | |
Merge pull request #988 from doktornotor/patch-5
| -rw-r--r-- | config/lcdproc-dev/lcdproc.inc | 15 | ||||
| -rw-r--r-- | config/lcdproc-dev/lcdproc.xml | 5 | ||||
| -rw-r--r-- | config/lcdproc-dev/lcdproc_screens.xml | 5 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
4 files changed, 4 insertions, 23 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index ebe3cc57..95561fb6 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -38,7 +38,7 @@ } else { define('LCDPROC_CONFIG','/usr/local/etc/LCDd.conf'); } - define('LCDPROC_HOST','localhost'); + define('LCDPROC_HOST','127.0.0.1'); define('LCDPROC_PORT','13666'); define('LCDPROC_SERVICE_NAME','lcdproc'); /* Functions */ @@ -63,16 +63,6 @@ fclose($handle); chmod($file, 0755); } - function before_form_lcdproc(&$pkg) { - global $config; - config_lock(); - config_unlock(); - } - function before_form_lcdproc_screens(&$pkg) { - global $config; - config_lock(); - config_unlock(); - } function validate_form_lcdproc($post, &$input_errors) { if($post['comport']) { switch($post['comport']) { @@ -150,7 +140,6 @@ #continue sync package lcdproc_notice("Sync: Begin package sync"); - config_lock(); $lcdproc_config = $config['installedpackages']['lcdproc']['config'][0]; $lcdproc_screens_config = $config['installedpackages']['lcdprocscreens']['config'][0]; /* since config is written before this file invoked we don't need to read post data */ @@ -191,7 +180,6 @@ break; default: lcdproc_warn("The selected com port is not valid!"); - config_unlock(); return; } $config_text = "[server]\n"; @@ -524,7 +512,6 @@ EOD; conf_mount_ro(); } } - config_unlock(); lcdproc_notice("Sync: End package sync"); } function set_lcd_value($fieldname, $max, $default_value) { diff --git a/config/lcdproc-dev/lcdproc.xml b/config/lcdproc-dev/lcdproc.xml index 588b898b..273aa1b1 100644 --- a/config/lcdproc-dev/lcdproc.xml +++ b/config/lcdproc-dev/lcdproc.xml @@ -2,7 +2,7 @@ <packagegui> <title>Services: LCDproc 0.5.6 pkg v. 0.9.9</title> <name>lcdproc</name> - <version>0.5.6 pkg v. 0.9.9</version> + <version>0.9.12</version> <savetext>Save</savetext> <include_file>/usr/local/pkg/lcdproc.inc</include_file> <tabs> @@ -657,9 +657,6 @@ <default_value>default</default_value> </field> </fields> - <custom_php_command_before_form> - before_form_lcdproc($pkg); - </custom_php_command_before_form> <custom_php_validation_command> validate_form_lcdproc($_POST, $input_errors); </custom_php_validation_command> diff --git a/config/lcdproc-dev/lcdproc_screens.xml b/config/lcdproc-dev/lcdproc_screens.xml index 9f4a8e2e..1e4e0857 100644 --- a/config/lcdproc-dev/lcdproc_screens.xml +++ b/config/lcdproc-dev/lcdproc_screens.xml @@ -2,7 +2,7 @@ <packagegui> <title>Services: LCDproc: Screens</title> <name>lcdproc_screens</name> - <version>0.5.5 pkg v. 0.9.4</version> + <version>0.9.12</version> <savetext>Save</savetext> <include_file>/usr/local/pkg/lcdproc.inc</include_file> <tabs> @@ -105,9 +105,6 @@ <description>If Interface Traffic is enabled, here you specify which interface to monitor</description> </field> </fields> - <custom_php_command_before_form> - before_form_lcdproc_screens($pkg); - </custom_php_command_before_form> <custom_php_validation_command> validate_form_lcdproc_screens($_POST, $input_errors); </custom_php_validation_command> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 8bb50707..c66d2b96 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1096,7 +1096,7 @@ <descr>LCD display driver - development version.</descr> <website>http://www.lcdproc.org/</website> <category>Utility</category> - <version>0.9.11</version> + <version>0.9.12</version> <status>BETA</status> <required_version>2.2</required_version> <maintainer>michele@nt2.it</maintainer> |