Skip to content
Snippets Groups Projects
Commit 0269573d authored by Florian Schaal's avatar Florian Schaal
Browse files

updated db-queries to the new query form

parent bc0ad024
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
server/lib/classes/cron.d/500-backup.inc.php
+ 22
− 23
View file @ 0269573d
...@@ -89,8 +89,8 @@ class cronjob_backup extends cronjob { ...@@ -89,8 +89,8 @@ class cronjob_backup extends cronjob {
if($run_backups){ if($run_backups){
//* backup only active domains //* backup only active domains
$sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND active = 'y'"; $sql = "SELECT * FROM web_domain WHERE server_id = ? AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND active = 'y'";
$records = $app->db->queryAllRecords($sql); $records = $app->db->queryAllRecords($sql, $conf['server_id']);
if(is_array($records)) { if(is_array($records)) {
foreach($records as $rec) { foreach($records as $rec) {
...@@ -142,9 +142,9 @@ class cronjob_backup extends cronjob { ...@@ -142,9 +142,9 @@ class cronjob_backup extends cronjob {
//* Insert web backup record in database //* Insert web backup record in database
//$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)."')"; //$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)."')";
//$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id'); //$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
$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)."')"; $sql = "INSERT INTO web_backup (server_id, parent_domain_id, backup_type, backup_mode, tstamp, filename) VALUES (?, ?, ?, ?, ?, ?)";
$app->db->query($sql); $app->db->query($sql, $conf['server_id'], $web_id, 'web', $backup_mode, time(), $web_backup_file);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql); if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, 'web', $backup_mode, time(), $web_backup_file);
} }
} else { } else {
if(is_file($web_backup_dir.'/'.$web_backup_file)) unlink($web_backup_dir.'/'.$web_backup_file); if(is_file($web_backup_dir.'/'.$web_backup_file)) unlink($web_backup_dir.'/'.$web_backup_file);
...@@ -171,9 +171,9 @@ class cronjob_backup extends cronjob { ...@@ -171,9 +171,9 @@ class cronjob_backup extends cronjob {
//$tmp = $app->dbmaster->queryOneRecord($sql); //$tmp = $app->dbmaster->queryOneRecord($sql);
//$app->dbmaster->datalogDelete('web_backup', 'backup_id', $tmp['backup_id']); //$app->dbmaster->datalogDelete('web_backup', 'backup_id', $tmp['backup_id']);
//$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']); //$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
$sql = "DELETE FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($files[$n])."'"; $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
$app->db->query($sql); $app->db->query($sql, $conf['server_id'], $web_id, $files[$n]);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql); if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, $files[$n]);
} }
} }
...@@ -203,16 +203,15 @@ class cronjob_backup extends cronjob { ...@@ -203,16 +203,15 @@ class cronjob_backup extends cronjob {
$web_backup_dir = realpath($backup_dir.'/web'.$web_id); $web_backup_dir = realpath($backup_dir.'/web'.$web_id);
if(is_dir($web_backup_dir)) { if(is_dir($web_backup_dir)) {
exec('sudo -u '.escapeshellarg($web_user).' rm -f '.escapeshellarg($web_backup_dir.'/*')); exec('sudo -u '.escapeshellarg($web_user).' rm -f '.escapeshellarg($web_backup_dir.'/*'));
$sql = "DELETE FROM web_backup WHERE server_id = ".intval($conf['server_id'])." AND parent_domain_id = ".intval($web_id); $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ?";
$app->db->query($sql); $app->db->query($sql, $conf['server_id'], $web_id);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql); if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id);
} }
} }
} }
} }
$sql = "SELECT * FROM web_database WHERE server_id = ".$conf['server_id']." AND backup_interval != 'none' AND backup_interval != ''"; $records = $app->db->queryAllRecords("SELECT * FROM web_database WHERE server_id = ? AND backup_interval != 'none' AND backup_interval != ''", $conf['server_id']);
$records = $app->db->queryAllRecords($sql);
if(is_array($records)) { if(is_array($records)) {
include 'lib/mysql_clientdb.conf'; include 'lib/mysql_clientdb.conf';
...@@ -249,9 +248,9 @@ class cronjob_backup extends cronjob { ...@@ -249,9 +248,9 @@ class cronjob_backup extends cronjob {
//* Insert web backup record in database //* Insert web backup record in database
//$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')"; //$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')";
//$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id'); //$app->dbmaster->datalogInsert('web_backup', $insert_data, 'backup_id');
$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')"; $sql = "INSERT INTO web_backup (server_id, parent_domain_id, backup_type, backup_mode, tstamp, filename) VALUES (?, ?, ?, ?, ?, ?";
$app->db->query($sql); $app->db->query($sql, $conf['server_id'], $web_id, 'mysql', 'sqlgz', time(), $db_backup_file.'.gz');
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql); if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, 'mysql', 'sqlgz', time(), $db_backup_file.'.gz');
} }
} else { } else {
if(is_file($db_backup_dir.'/'.$db_backup_file.'.gz')) unlink($db_backup_dir.'/'.$db_backup_file.'.gz'); if(is_file($db_backup_dir.'/'.$db_backup_file.'.gz')) unlink($db_backup_dir.'/'.$db_backup_file.'.gz');
...@@ -281,9 +280,9 @@ class cronjob_backup extends cronjob { ...@@ -281,9 +280,9 @@ class cronjob_backup extends cronjob {
//$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])."'"; //$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])."'";
//$tmp = $app->dbmaster->queryOneRecord($sql); //$tmp = $app->dbmaster->queryOneRecord($sql);
//$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']); //$sql = "DELETE FROM web_backup WHERE backup_id = ".intval($tmp['backup_id']);
$sql = "DELETE FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = $web_id AND filename = '".$app->db->quote($filelist[$n])."'"; $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
$app->db->query($sql); $app->db->query($sql, $conf['server_id'], $web_id, $filelist[$n]);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql); if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, $filelist[$n]);
} }
} }
} }
...@@ -300,14 +299,14 @@ class cronjob_backup extends cronjob { ...@@ -300,14 +299,14 @@ class cronjob_backup extends cronjob {
} }
// remove non-existing backups from database // remove non-existing backups from database
$backups = $app->db->queryAllRecords("SELECT * FROM web_backup WHERE server_id = ".$conf['server_id']); $backups = $app->db->queryAllRecords("SELECT * FROM web_backup WHERE server_id = ?", $conf['server_id']);
if(is_array($backups) && !empty($backups)){ if(is_array($backups) && !empty($backups)){
foreach($backups as $backup){ foreach($backups as $backup){
$backup_file = $backup_dir.'/web'.$backup['parent_domain_id'].'/'.$backup['filename']; $backup_file = $backup_dir.'/web'.$backup['parent_domain_id'].'/'.$backup['filename'];
if(!is_file($backup_file)){ if(!is_file($backup_file)){
$sql = "DELETE FROM web_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$backup['parent_domain_id']." AND filename = '".$backup['filename']."'"; $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
$app->db->query($sql); $app->db->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql); if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
} }
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment