- ported some patches

Marius Cramer

2015-04-15 2c408f413fe7e1bd1b17763d0845d3726ed3ff2e

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

@@ -76,6 +76,8 @@
            //* mount backup directory, if necessary
            if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $run_backups = false;
         if($run_backups){
            $web_array = array();
				
            //* backup only active domains
            $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, $conf['server_id']);
@@ -89,6 +91,7 @@
                     $web_user = $rec['system_user'];
                     $web_group = $rec['system_group'];
                     $web_id = $rec['domain_id'];
                     if(!in_array($web_id, $web_array)) $web_array[] = $web_id;
                     $web_backup_dir = $backup_dir.'/web'.$web_id;
                     if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0750);
                     chmod($web_backup_dir, 0750);
@@ -157,10 +160,10 @@

                     for ($n = $backup_copies; $n <= 10; $n++) {
                        if(isset($files[$n]) && is_file($web_backup_dir.'/'.$files[$n])) {
                           unlink($web_backup_dir.'/'.$files[$n]);
                           $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
                           $app->db->query($sql, $conf['server_id'], $web_id, $files[$n]);
                           if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'],  $web_id, $files[$n]);
                           @unlink($web_backup_dir.'/'.$files[$n]);
                        }
                     }

@@ -209,6 +212,7 @@
                  if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {

                     $web_id = $rec['parent_domain_id'];
                     if(!in_array($web_id, $web_array)) $web_array[] = $web_id;
                     $db_backup_dir = $backup_dir.'/web'.$web_id;
                     if(!is_dir($db_backup_dir)) mkdir($db_backup_dir, 0750);
                     chmod($db_backup_dir, 0750);
@@ -260,7 +264,7 @@
                     $dir_handle = dir($db_backup_dir);
                     $files = array();
                     while (false !== ($entry = $dir_handle->read())) {
                        if($entry != '.' && $entry != '..' && preg_match('/^db_(.*?)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql.gz$/', $entry, $matches) && is_file($db_backup_dir.'/'.$entry)) {
                        if($entry != '.' && $entry != '..' && preg_match('/^db_('.$db_name.')_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql.gz$/', $entry, $matches) && is_file($db_backup_dir.'/'.$entry)) {
                           if(array_key_exists($matches[1], $files) == false) $files[$matches[1]] = array();
                           $files[$matches[1]][] = $entry;
                        }
@@ -272,10 +276,10 @@
                        rsort($filelist);
                        for ($n = $backup_copies; $n <= 10; $n++) {
                           if(isset($filelist[$n]) && is_file($db_backup_dir.'/'.$filelist[$n])) {
                              unlink($db_backup_dir.'/'.$filelist[$n]);
                              $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
                              $app->db->query($sql, $conf['server_id'], $web_id, $filelist[$n]);
                              if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $web_id, $filelist[$n]);
                              @unlink($db_backup_dir.'/'.$filelist[$n]);
                           }
                        }
                     }
@@ -299,7 +303,51 @@
                  if(!is_file($backup_file)){
                     $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
                     $app->db->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
                     if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
                  }
               }
            }
            if($app->db->dbHost != $app->dbmaster->dbHost){
               $backups = $app->dbmaster->queryAllRecords("SELECT * FROM web_backup WHERE server_id = ?", $conf['server_id']);
               if(is_array($backups) && !empty($backups)){
                  foreach($backups as $backup){
                     $backup_file = $backup_dir.'/web'.$backup['parent_domain_id'].'/'.$backup['filename'];
                     if(!is_file($backup_file)){
                        $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
                        $app->dbmaster->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
                     }
                  }
               }
            }
				
            // garbage collection (non-existing databases)
            if(is_array($web_array) && !empty($web_array)){
               foreach($web_array as $tmp_web_id){
                  $tmp_backup_dir = $backup_dir.'/web'.$tmp_web_id;
                  if(is_dir($tmp_backup_dir)){
                     $dir_handle = dir($tmp_backup_dir);
                     $files = array();
                     while (false !== ($entry = $dir_handle->read())) {
                        if($entry != '.' && $entry != '..' && preg_match('/^db_(.*?)_\d{4}-\d{2}-\d{2}_\d{2}-\d{2}\.sql.gz$/', $entry, $matches) && is_file($tmp_backup_dir.'/'.$entry)) {

                           $tmp_db_name = $matches[1];
                           $tmp_database = $app->db->queryOneRecord("SELECT * FROM web_database WHERE server_id = ? AND parent_domain_id = ? AND database_name = ?", $conf['server_id'], $tmp_web_id, $tmp_db_name);

                           if(is_array($tmp_database) && !empty($tmp_database)){
                              if($tmp_database['backup_interval'] == 'none' || intval($tmp_database['backup_copies']) == 0){
                                 @unlink($tmp_backup_dir.'/'.$entry);
                                 $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
                                 $app->db->query($sql, $conf['server_id'], $tmp_web_id, $entry);
                                 if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $tmp_web_id, $entry);
                              }
                           } else {
                              @unlink($tmp_backup_dir.'/'.$entry);
                              $sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
                              $app->db->query($sql, $conf['server_id'], $tmp_web_id, $entry);
                              if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $tmp_web_id, $entry);
                           }
                        }
                     }
                     $dir_handle->close();
                  }
               }
            }