From cc8909e4a5dbd5f49be5bebd71981e4cb57afbfd Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
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')

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 <notordoktor@gmail.com>
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')

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


From 9e3a4e827ff4abb6a7fdc6d8b61aec185d7e0d4e Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 11 Aug 2015 14:37:13 +0200
Subject: lcdproc-dev remove useless config_(un)lock calls

---
 config/lcdproc-dev/lcdproc.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'config/lcdproc-dev')

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>
-- 
cgit v1.2.3


From 6e135c04444a5d2fd7e74b4e3fc1b0ef4f815d96 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 11 Aug 2015 14:38:28 +0200
Subject: lcdproc-dev - remove useless config_(un)lock calls

---
 config/lcdproc-dev/lcdproc_screens.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'config/lcdproc-dev')

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>
-- 
cgit v1.2.3