From 8ad3c795898d0445bd41373ac84187d0ef25fe00 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 16 Dec 2013 12:26:10 +0100 Subject: [PATCH 1/3] add actually a www-alias if set, fixes #1326 Signed-off-by: Michael Kaufmann (d00p) --- scripts/jobs/cron_tasks.inc.dns.10.bind.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/jobs/cron_tasks.inc.dns.10.bind.php b/scripts/jobs/cron_tasks.inc.dns.10.bind.php index 18b3d208..9f91864f 100644 --- a/scripts/jobs/cron_tasks.inc.dns.10.bind.php +++ b/scripts/jobs/cron_tasks.inc.dns.10.bind.php @@ -309,7 +309,7 @@ class bind // Check whether to add a www.-prefix if ($domain['wwwserveralias'] == '1') { - $records[] = str_replace('.' . $domain['domain'], '', $subdomain['domain']); + $records[] = 'www.'.str_replace('.' . $domain['domain'], '', $subdomain['domain']); } } From 5be5787afda383ed9e0fa795d0cf5c4a4015aea9 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 16 Dec 2013 13:28:03 +0100 Subject: [PATCH 2/3] fix wrong Database method-usage when toggling catchall for e-mail address Signed-off-by: Michael Kaufmann (d00p) --- customer_email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/customer_email.php b/customer_email.php index cb233425..c30e1670 100644 --- a/customer_email.php +++ b/customer_email.php @@ -379,7 +379,7 @@ if ($page == 'overview') { standard_error('youhavealreadyacatchallforthisdomain'); exit; } else { - $stmt = Database::pexecute("UPDATE `" . TABLE_MAIL_VIRTUAL . "` + $stmt = Database::prepare("UPDATE `" . TABLE_MAIL_VIRTUAL . "` SET `email` = :email , `iscatchall` = '1' WHERE `customerid`= :cid AND `id`= :id" From 41d33ae538d064acb3889ed98eb600a9c218f787 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 16 Dec 2013 13:34:08 +0100 Subject: [PATCH 3/3] use correct quoting-character in sql-query Signed-off-by: Michael Kaufmann (d00p) --- lib/classes/ticket/class.ticket.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/classes/ticket/class.ticket.php b/lib/classes/ticket/class.ticket.php index 5f742cae..55269cf0 100644 --- a/lib/classes/ticket/class.ticket.php +++ b/lib/classes/ticket/class.ticket.php @@ -407,11 +407,11 @@ class ticket { } $upd_stmt = Database::prepare(" - UPDATE `' . TABLE_PANEL_TICKET_CATS . '` SET + UPDATE `" . TABLE_PANEL_TICKET_CATS . "` SET `name` = :name, `logicalorder` = :lo - WHERE `id` = :id" - ); + WHERE `id` = :id + "); Database::pexecute($upd_stmt, array('name' => $_category, 'lo' => $_order, 'id' => $_id)); return true; }