From cc8909e4a5dbd5f49be5bebd71981e4cb57afbfd Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 11 Aug 2015 13:56:37 +0200 Subject: lcdproc-dev localhost fix Get fix from #945 into the -dev version as well. (Planning to do a code style cleanup for this one as well, but it takes some time.) --- config/lcdproc-dev/lcdproc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/lcdproc-dev/lcdproc.inc') diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index ebe3cc57..5cb99324 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 */ -- cgit v1.2.3 From cfc617faebcd50dd539148c7016b759a26dae740 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Tue, 11 Aug 2015 14:34:41 +0200 Subject: lcdproc-dev - remove useless config_(un)lock calls --- config/lcdproc-dev/lcdproc.inc | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'config/lcdproc-dev/lcdproc.inc') diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc index 5cb99324..95561fb6 100644 --- a/config/lcdproc-dev/lcdproc.inc +++ b/config/lcdproc-dev/lcdproc.inc @@ -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) { -- cgit v1.2.3