Commit c8d077e4 authored by tbrehm's avatar tbrehm

Fixed: FS#2344 - Add table permissions in multiserver systems for new backup table

parent 6ed09894
...@@ -478,6 +478,14 @@ class installer_base { ...@@ -478,6 +478,14 @@ class installer_base {
if(!$this->dbmaster->query($query)) { if(!$this->dbmaster->query($query)) {
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage); $this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
} }
$query = "GRANT SELECT, INSERT, DELETE ON ".$value['db'].".`web_backup` TO '".$value['user']."'@'".$host."' ";
if ($verbose){
echo $query ."\n";
}
if(!$this->dbmaster->query($query)) {
$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
}
} }
......
...@@ -629,9 +629,12 @@ if($backup_dir != '') { ...@@ -629,9 +629,12 @@ if($backup_dir != '') {
chmod($web_backup_dir.'/'.$web_backup_file, 0750); chmod($web_backup_dir.'/'.$web_backup_file, 0750);
//* 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)."')";
$app->db->query($sql);
$app->dbmaster->query($sql);
//* Remove old backups //* Remove old backups
$backup_copies = intval($rec['backup_copies']); $backup_copies = intval($rec['backup_copies']);
...@@ -651,7 +654,10 @@ if($backup_dir != '') { ...@@ -651,7 +654,10 @@ if($backup_dir != '') {
unlink($web_backup_dir.'/'.$files[$n]); unlink($web_backup_dir.'/'.$files[$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($files[$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($files[$n])."'";
$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']);
$app->db->query($sql);
$app->dbmaster->query($sql);
} }
} }
...@@ -715,8 +721,11 @@ if($backup_dir != '') { ...@@ -715,8 +721,11 @@ if($backup_dir != '') {
chgrp($db_backup_dir.'/'.$db_backup_file.'.gz', filegroup($db_backup_dir)); chgrp($db_backup_dir.'/'.$db_backup_file.'.gz', filegroup($db_backup_dir));
//* 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')";
$app->db->query($sql);
$app->dbmaster->query($sql);
//* Remove the uncompressed file //* Remove the uncompressed file
unlink($db_backup_dir.'/'.$db_backup_file); unlink($db_backup_dir.'/'.$db_backup_file);
...@@ -740,7 +749,10 @@ if($backup_dir != '') { ...@@ -740,7 +749,10 @@ if($backup_dir != '') {
unlink($db_backup_dir.'/'.$files[$n]); unlink($db_backup_dir.'/'.$files[$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($files[$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($files[$n])."'";
$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']);
$app->db->query($sql);
$app->dbmaster->query($sql);
} }
} }
......
Markdown is supported
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