diff --git a/admin_customers.php b/admin_customers.php index 9c61b490..9cd0f5eb 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -294,7 +294,7 @@ if ($page == 'customers' DELETE FROM `" . TABLE_PANEL_TASKS . "` WHERE `type` = '2' AND `data` LIKE :loginname" ); - Database::pexecute($del_stmt, array(':loginname' => "%:{$result['loginname']};%")); + Database::pexecute($del_stmt, array('loginname' => "%:{$result['loginname']};%")); $admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` - 1 "; $admin_update_query.= ", `domains_used` = `domains_used` - 0" . (int)($domains_deleted - $result['subdomains_used']); diff --git a/admin_index.php b/admin_index.php index 81c77582..51795a58 100644 --- a/admin_index.php +++ b/admin_index.php @@ -362,7 +362,7 @@ if ($page == 'overview') { $mail_body .= "-------------------------------------------------------------\n\n"; $mail_body .= "Froxlor-version: ".$version."\n\n"; $mail_body .= "End of report"; - $mail_html = str_replace("\n", "
", $mail_body); + $mail_html = nl2br($mail_body); // send actual report to dev-team if (isset($_POST['send']) diff --git a/lib/classes/database/manager/class.DbManagerMySQL.php b/lib/classes/database/manager/class.DbManagerMySQL.php index 08bf554b..ddf2cb5c 100644 --- a/lib/classes/database/manager/class.DbManagerMySQL.php +++ b/lib/classes/database/manager/class.DbManagerMySQL.php @@ -106,7 +106,7 @@ class DbManagerMySQL { while ($host = $host_res_stmt->fetch(PDO::FETCH_ASSOC)) { // as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+) $drop_stmt = Database::prepare("DROP USER :dbname@:host"); - Database::pexecute($drop_stmt, array(':dbname' => $dbname, ':host' => $host['Host']), false); + Database::pexecute($drop_stmt, array('dbname' => $dbname, 'host' => $host['Host']), false); } $drop_stmt = Database::prepare("DROP DATABASE IF EXISTS `".$dbname."`");