Skip to content

Commit bc0ad02

Browse files
author
Florian Schaal
committed
updated db-queries to the new query form
1 parent 28a1dcf commit bc0ad02

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

server/lib/classes/cron.d/500-backup_mail.inc.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ public function onRunJob() {
7474
}
7575
}
7676

77-
$sql = "SELECT * FROM mail_user WHERE server_id = '".intval($conf['server_id'])."' AND maildir <> ''";
78-
$records = $app->db->queryAllRecords($sql);
77+
$records = $app->db->queryAllRecords("SELECT * FROM mail_user WHERE server_id = ? AND maildir <> ''", intval($conf['server_id']));
7978

8079
if(is_array($records) && $run_backups) {
8180
if(!is_dir($backup_dir)) {
@@ -89,8 +88,7 @@ public function onRunJob() {
8988
if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {
9089
$email = $rec['email'];
9190
$email=explode("@",$email)[1];
92-
$sql="SELECT * FROM mail_domain WHERE domain = '" . $app->db->quote($email)."'";
93-
$domain_rec=$app->db->queryOneRecord($sql);
91+
$domain_rec=$app->db->queryOneRecord("SELECT * FROM mail_domain WHERE domain = ?", $email);
9492
unset($email);
9593

9694
$mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];
@@ -121,9 +119,9 @@ public function onRunJob() {
121119
chgrp($mail_backup_dir.'/'.$mail_backup_file, 'root');
122120
chmod($mail_backup_dir.'/'.$mail_backup_file, 0640);
123121
/* Insert mail backup record in database */
124-
$sql = "INSERT INTO mail_backup (server_id,parent_domain_id,mailuser_id,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",".$domain_rec['domain_id'].",".$rec['mailuser_id'].",'".$backup_mode."',".time().",'".$app->db->quote($mail_backup_file)."','".$app->functions->formatBytes(filesize($mail_backup_dir.'/'.$mail_backup_file))."')";
125-
$app->db->query($sql);
126-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
122+
$sql = "INSERT INTO mail_backup (server_id, parent_domain_id, mailuser_id, backup_mode, tstamp, filename, filesize) VALUES (?, ?, ?, ?, ?, ?, ?)";
123+
$app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id'], $backup_mode, time(), $mail_backup_file, $app->functions->formatBytes(filesize($mail_backup_dir.'/'.$mail_backup_file)));
124+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id'], $backup_mode, time(), $mail_backup_file, $app->functions->formatBytes(filesize($mail_backup_dir.'/'.$mail_backup_file)));
127125
} else {
128126
/* Backup failed - remove archive */
129127
if(is_file($mail_backup_dir.'/'.$mail_backup_file)) unlink($mail_backup_dir.'/'.$mail_backup_file);
@@ -143,9 +141,9 @@ public function onRunJob() {
143141
for ($n = $backup_copies; $n <= 10; $n++) {
144142
if(isset($files[$n]) && is_file($mail_backup_dir.'/'.$files[$n])) {
145143
unlink($mail_backup_dir.'/'.$files[$n]);
146-
$sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$domain_rec['domain_id']." AND filename = '".$app->db->quote($files[$n])."'";
147-
$app->db->query($sql);
148-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
144+
$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
145+
$app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $files[$n]);
146+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $files[$n]);
149147
}
150148
}
151149
unset($files);
@@ -154,9 +152,9 @@ public function onRunJob() {
154152
/* Remove inactive backups */
155153
if($rec['backup_interval'] == 'none') {
156154
/* remove backups from db */
157-
$sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$domain_rec['domain_id']." AND mailuser_id = ".$rec['mailuser_id'];
158-
$app->db->query($sql);
159-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
155+
$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?";
156+
$app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id']);
157+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id']);
160158
/* remove archives */
161159
$mail_backup_dir = $backup_dir.'/mail'.$rec['domain_id'];
162160
$mail_backup_file = 'mail'.$rec['mailuser_id'].'_*';

0 commit comments

Comments
 (0)