aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2014-05-09 14:19:08 -0400
committerjim-p <jimp@pfsense.org>2014-05-09 14:19:08 -0400
commitd4b90b36268048a2c1c90512ce4087f4bd574b14 (patch)
tree7e88d1f6ae801c26b1061c743407a88c09293554
parent547c0359e269624884f702e06512d6755109d364 (diff)
downloadpfsense-packages-d4b90b36268048a2c1c90512ce4087f4bd574b14.tar.gz
pfsense-packages-d4b90b36268048a2c1c90512ce4087f4bd574b14.tar.bz2
pfsense-packages-d4b90b36268048a2c1c90512ce4087f4bd574b14.zip
Fix call-time pass-by-reference in lcdproc
-rw-r--r--config/lcdproc/lcdproc.inc8
-rw-r--r--config/lcdproc/lcdproc.xml6
-rw-r--r--config/lcdproc/lcdproc_screens.xml4
-rw-r--r--pkg_config.10.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
6 files changed, 12 insertions, 12 deletions
diff --git a/config/lcdproc/lcdproc.inc b/config/lcdproc/lcdproc.inc
index 1c628c6a..760732df 100644
--- a/config/lcdproc/lcdproc.inc
+++ b/config/lcdproc/lcdproc.inc
@@ -72,7 +72,7 @@
chmod($file, 0755);
}
- function before_form_lcdproc($pkg) {
+ function before_form_lcdproc(&$pkg) {
global $config;
config_lock();
@@ -80,7 +80,7 @@
config_unlock();
}
- function before_form_lcdproc_screens($pkg) {
+ function before_form_lcdproc_screens(&$pkg) {
global $config;
config_lock();
@@ -88,7 +88,7 @@
config_unlock();
}
- function validate_form_lcdproc($post, $input_errors) {
+ function validate_form_lcdproc($post, &$input_errors) {
if($post['comport']) {
switch($post['comport']) {
case "none":
@@ -155,7 +155,7 @@
}
}
}
- function validate_form_lcdproc_screens($post, $input_errors) {
+ function validate_form_lcdproc_screens($post, &$input_errors) {
// No validation required ?!
}
diff --git a/config/lcdproc/lcdproc.xml b/config/lcdproc/lcdproc.xml
index ba46e941..8f268b49 100644
--- a/config/lcdproc/lcdproc.xml
+++ b/config/lcdproc/lcdproc.xml
@@ -2,7 +2,7 @@
<packagegui>
<title>Services: LCDproc</title>
<name>lcdproc</name>
- <version>0.5.2_1-p12</version>
+ <version>0.5.5 pkg.v.1.0.1</version>
<savetext>Save</savetext>
<include_file>/usr/local/pkg/lcdproc.inc</include_file>
<tabs>
@@ -363,10 +363,10 @@
</field>
</fields>
<custom_php_command_before_form>
- before_form_lcdproc(&amp;$pkg);
+ before_form_lcdproc($pkg);
</custom_php_command_before_form>
<custom_php_validation_command>
- validate_form_lcdproc($_POST, &amp;$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/lcdproc_screens.xml b/config/lcdproc/lcdproc_screens.xml
index b807d9f0..d8cc2382 100644
--- a/config/lcdproc/lcdproc_screens.xml
+++ b/config/lcdproc/lcdproc_screens.xml
@@ -90,10 +90,10 @@
</field>
</fields>
<custom_php_command_before_form>
- before_form_lcdproc_screens(&amp;$pkg);
+ before_form_lcdproc_screens($pkg);
</custom_php_command_before_form>
<custom_php_validation_command>
- validate_form_lcdproc_screens($_POST, &amp;$input_errors);
+ validate_form_lcdproc_screens($_POST, $input_errors);
</custom_php_validation_command>
<custom_php_resync_config_command>
sync_package_lcdproc_screens();
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 11ff93ea..531f37cb 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -982,7 +982,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5</version>
+ <version>lcdproc-0.5.5 pkg.v.1.0.1</version>
<status>BETA</status>
<required_version>2.2</required_version>
<maintainer>seth.mos@dds.nl</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e5f13d38..3e1a7c0e 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1287,7 +1287,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5</version>
+ <version>lcdproc-0.5.5 pkg.v.1.0.1</version>
<status>BETA</status>
<required_version>1.2.1</required_version>
<maintainer>seth.mos@dds.nl</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 5d5cfa84..6ad058cc 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1274,7 +1274,7 @@
<descr>LCD display driver</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.5</version>
+ <version>lcdproc-0.5.5 pkg.v.1.0.1</version>
<status>BETA</status>
<required_version>1.2.1</required_version>
<maintainer>seth.mos@dds.nl</maintainer>