From b2ab5629e81d4fa833ca0506af248e126b40dadf Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Thu, 26 Dec 2013 13:34:03 +0100 Subject: [PATCH 1/3] fix 'Invalid parameter number' error, thx to an anonymous report Signed-off-by: Michael Kaufmann (d00p) --- admin_customers.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/admin_customers.php b/admin_customers.php index 0cfa98e6..70054408 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -200,7 +200,11 @@ if ($page == 'customers' WHERE `customerid` = :id" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = :adminid") ); - $result = Database::pexecute_first($result_stmt, array('id' => $id, 'adminid' => $userinfo['adminid'])); + $result_data = array('id' => $id); + if ($userinfo['customers_see_all'] == '0') { + $result_data['adminid'] = $userinfo['adminid']; + } + $result = Database::pexecute_first($result_stmt, $result_data); if ($result['loginname'] != '') { From 9d5d60fa888d36dd0f6971c3cd606d51440e9248 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 27 Dec 2013 16:18:51 +0100 Subject: [PATCH 2/3] bugfix squeeze dovecot.conf and correct wheezy dovecot-15-lda.conf, fixes #1334 Signed-off-by: Michael Kaufmann (d00p) --- .../configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf | 2 +- .../debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf index 249b9280..8812759d 100644 --- a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf @@ -1,4 +1,4 @@ -#protocols = imap pop3 +protocols = imap pop3 listen = * mail_access_groups = vmail mail_debug = no diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf index 056da607..18f38058 100644 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf +++ b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf @@ -4,7 +4,7 @@ # Address to use when sending rejection mails. # Default is postmaster@. -#postmaster_address = postmaster@ +postmaster_address = postmaster@ # Hostname to use in various parts of sent mails, eg. in Message-Id. # Default is the system's real hostname. From 01d825fc2a56fcf77f9fa599cac41c0670afc9e4 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 27 Dec 2013 16:20:11 +0100 Subject: [PATCH 3/3] set version to 0.9.31.2 for bugfix release Signed-off-by: Michael Kaufmann (d00p) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 6 ++++++ lib/tables.inc.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 41ccdc86..6fa308e9 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -553,7 +553,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'phpconfigs_hidestdsubdomain', '0'), ('panel', 'allow_theme_change_admin', '1'), ('panel', 'allow_theme_change_customer', '1'), - ('panel', 'version', '0.9.31.1'); + ('panel', 'version', '0.9.31.2'); DROP TABLE IF EXISTS `panel_tasks`; diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 23fc6592..9dd6d9e3 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2576,3 +2576,9 @@ if (isFroxlorVersion('0.9.31')) { lastStepStatus(0); updateToVersion('0.9.31.1'); } + +if (isFroxlorVersion('0.9.31.1')) { + showUpdateStep("Updating from 0.9.31.1 to 0.9.31.2 final", true); + lastStepStatus(0); + updateToVersion('0.9.31.2'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 4b882f17..13526cb7 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,6 +72,6 @@ define('PACKAGE_LOCKED', 1); define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.31.1'; +$version = '0.9.31.2'; $dbversion = '2'; $branding = '';