maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/0.9.31'

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-16 13:37:01 +01:00
parent dc886c9fc5 41d33ae538
commit 6a8cd15456
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customer_email.php
View File

@@ -379,7 +379,7 @@ if ($page == 'overview') {
standard_error('youhavealreadyacatchallforthisdomain'); standard_error('youhavealreadyacatchallforthisdomain');
exit; exit;
} else { } else {
$stmt = Database::pexecute("UPDATE `" . TABLE_MAIL_VIRTUAL . "` $stmt = Database::prepare("UPDATE `" . TABLE_MAIL_VIRTUAL . "`
SET `email` = :email , `iscatchall` = '1' SET `email` = :email , `iscatchall` = '1'
WHERE `customerid`= :cid WHERE `customerid`= :cid
AND `id`= :id" AND `id`= :id"

6
lib/classes/ticket/class.ticket.php
View File

@@ -398,11 +398,11 @@ class ticket {
} }
$upd_stmt = Database::prepare(" $upd_stmt = Database::prepare("
UPDATE `' . TABLE_PANEL_TICKET_CATS . '` SET UPDATE `" . TABLE_PANEL_TICKET_CATS . "` SET
`name` = :name, `name` = :name,
`logicalorder` = :lo `logicalorder` = :lo
WHERE `id` = :id" WHERE `id` = :id
); ");
Database::pexecute($upd_stmt, array('name' => $_category, 'lo' => $_order, 'id' => $_id)); Database::pexecute($upd_stmt, array('name' => $_category, 'lo' => $_order, 'id' => $_id));
return true; return true;
} }

2
scripts/jobs/cron_tasks.inc.dns.10.bind.php
View File

@@ -301,7 +301,7 @@ class bind {
// Check whether to add a www.-prefix // Check whether to add a www.-prefix
if ($domain['wwwserveralias'] == '1') { if ($domain['wwwserveralias'] == '1') {
$records[] = str_replace('.' . $domain['domain'], '', $subdomain['domain']); $records[] = 'www.'.str_replace('.' . $domain['domain'], '', $subdomain['domain']);
} }
} }