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-13 21:33:24 +01:00
parent 810399d337 83b615bc37
commit 296b8b36ab
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_customers.php
View File

@@ -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']);

2
admin_index.php
View File

@@ -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", "<br />", $mail_body);
$mail_html = nl2br($mail_body);
// send actual report to dev-team
if (isset($_POST['send'])

2
lib/classes/database/manager/class.DbManagerMySQL.php
View File

@@ -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."`");