Skip to content

Commit 0269573

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

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

‎server/lib/classes/cron.d/500-backup.inc.php‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public function onRunJob() {
8989

9090
if($run_backups){
9191
//* backup only active domains
92-
$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND active = 'y'";
93-
$records = $app->db->queryAllRecords($sql);
92+
$sql = "SELECT * FROM web_domain WHERE server_id = ? AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND active = 'y'";
93+
$records = $app->db->queryAllRecords($sql, $conf['server_id']);
9494
if(is_array($records)) {
9595
foreach($records as $rec) {
9696

@@ -142,9 +142,9 @@ public function onRunJob() {
142142
//* Insert web backup record in database
143143
//$insert_data = "(server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
144144
//$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
145-
$sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",".$web_id.",'web','".$backup_mode."',".time().",'".$app->db->quote($web_backup_file)."')";
146-
$app->db->query($sql);
147-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
145+
$sql = "INSERT INTO web_backup (server_id, parent_domain_id, backup_type, backup_mode, tstamp, filename) VALUES (?, ?, ?, ?, ?, ?)";
146+
$app->db->query($sql, $conf['server_id'], $web_id, 'web', $backup_mode, time(), $web_backup_file);
147+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, 'web', $backup_mode, time(), $web_backup_file);
148148
}
149149
} else {
150150
if(is_file($web_backup_dir.'/'.$web_backup_file)) unlink($web_backup_dir.'/'.$web_backup_file);
@@ -171,9 +171,9 @@ public function onRunJob() {
171171
//$tmp = $app->dbmaster->queryOneRecord($sql);
172172
//$app->dbmaster->datalogDelete('web_backup', 'backup_id', $tmp['backup_id']);
173173
//$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
174-
$sql = "DELETE FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($files[$n])."'";
175-
$app->db->query($sql);
176-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
174+
$sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
175+
$app->db->query($sql, $conf['server_id'], $web_id, $files[$n]);
176+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, $files[$n]);
177177
}
178178
}
179179

@@ -203,16 +203,15 @@ public function onRunJob() {
203203
$web_backup_dir = realpath($backup_dir.'/web'.$web_id);
204204
if(is_dir($web_backup_dir)) {
205205
exec('sudo -u '.escapeshellarg($web_user).' rm -f '.escapeshellarg($web_backup_dir.'/*'));
206-
$sql = "DELETE FROM web_backup WHERE server_id = ".intval($conf['server_id'])." AND parent_domain_id = ".intval($web_id);
207-
$app->db->query($sql);
208-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
206+
$sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ?";
207+
$app->db->query($sql, $conf['server_id'], $web_id);
208+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id);
209209
}
210210
}
211211
}
212212
}
213213

214-
$sql = "SELECT * FROM web_database WHERE server_id = ".$conf['server_id']." AND backup_interval != 'none' AND backup_interval != ''";
215-
$records = $app->db->queryAllRecords($sql);
214+
$records = $app->db->queryAllRecords("SELECT * FROM web_database WHERE server_id = ? AND backup_interval != 'none' AND backup_interval != ''", $conf['server_id']);
216215
if(is_array($records)) {
217216

218217
include 'lib/mysql_clientdb.conf';
@@ -249,9 +248,9 @@ public function onRunJob() {
249248
//* Insert web backup record in database
250249
//$insert_data = "(server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",$web_id,'mysql','sqlgz',".time().",'".$app->db->quote($db_backup_file).".gz')";
251250
//$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
252-
$sql = "INSERT INTO web_backup (server_id,parent_domain_id,backup_type,backup_mode,tstamp,filename) VALUES (".$conf['server_id'].",$web_id,'mysql','sqlgz',".time().",'".$app->db->quote($db_backup_file).".gz')";
253-
$app->db->query($sql);
254-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
251+
$sql = "INSERT INTO web_backup (server_id, parent_domain_id, backup_type, backup_mode, tstamp, filename) VALUES (?, ?, ?, ?, ?, ?";
252+
$app->db->query($sql, $conf['server_id'], $web_id, 'mysql', 'sqlgz', time(), $db_backup_file.'.gz');
253+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, 'mysql', 'sqlgz', time(), $db_backup_file.'.gz');
255254
}
256255
} else {
257256
if(is_file($db_backup_dir.'/'.$db_backup_file.'.gz')) unlink($db_backup_dir.'/'.$db_backup_file.'.gz');
@@ -281,9 +280,9 @@ public function onRunJob() {
281280
//$sql = "SELECT backup_id FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($filelist[$n])."'";
282281
//$tmp = $app->dbmaster->queryOneRecord($sql);
283282
//$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
284-
$sql = "DELETE FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($filelist[$n])."'";
285-
$app->db->query($sql);
286-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
283+
$sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
284+
$app->db->query($sql, $conf['server_id'], $web_id, $filelist[$n]);
285+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, $filelist[$n]);
287286
}
288287
}
289288
}
@@ -300,14 +299,14 @@ public function onRunJob() {
300299
}
301300

302301
// remove non-existing backups from database
303-
$backups = $app->db->queryAllRecords("SELECT * FROM web_backup WHERE server_id = ".$conf['server_id']);
302+
$backups = $app->db->queryAllRecords("SELECT * FROM web_backup WHERE server_id = ?", $conf['server_id']);
304303
if(is_array($backups) && !empty($backups)){
305304
foreach($backups as $backup){
306305
$backup_file = $backup_dir.'/web'.$backup['parent_domain_id'].'/'.$backup['filename'];
307306
if(!is_file($backup_file)){
308-
$sql = "DELETE FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$backup['parent_domain_id']." AND filename = '".$backup['filename']."'";
309-
$app->db->query($sql);
310-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
307+
$sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
308+
$app->db->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
309+
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
311310
}
312311
}
313312
}

0 commit comments

Comments
 (0)