backup only active domains

Florian Schaal

2014-01-08 f2f790184ca7c5bcf7afc6510538f02559d1c903

backup only active domains

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

@@ -72,7 +72,7 @@
                chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
            }

            $sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain')";
            $sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y'";
            $records = $app->db->queryAllRecords($sql);
            if(is_array($records)) {
                foreach($records as $rec) {

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

@@ -56,7 +56,6 @@
        $backup_dir_permissions =0750;

        if($backup_dir != '') {
/*
            //* mount backup directory, if necessary
            $run_backups = true;
            $server_config['backup_dir_mount_cmd'] = trim($server_config['backup_dir_mount_cmd']);
@@ -67,7 +66,6 @@
                    if(!$app->system->is_mounted($backup_dir)) $run_backups = false;
                }
            }
*/

            $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
            
@@ -77,18 +75,13 @@
                chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
            }

            $sql = "SELECT * FROM mail_user WHERE server_id = '".$conf['server_id']."' AND maildir <> ''";
            $sql="SELECT * FROM mail_user JOIN mail_domain ON (mail_domain.active='y' AND mail_user.email like concat('%',mail_domain.domain)) WHERE mail_user.server_id=".$conf['server_id']." AND maildir <> '' ORDER BY mail_domain.domain_id";
            $records = $app->db->queryAllRecords($sql);
/*
            if(is_array($records) && $run_backups) {
*/
            if(is_array($records)) {
                foreach($records as $rec) {
                    //* Do the mailbox backup
                    if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {
                        $sql="SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
                        $domain_rec=$app->db->queryOneRecord($sql);
                        $mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];
                        $mail_backup_dir = $backup_dir.'/mail'.$rec['domain_id'];

                        if(!is_dir($mail_backup_dir)) mkdir($mail_backup_dir, 0750);
                        chmod($mail_backup_dir, $backup_dir_permissions);
@@ -113,7 +106,7 @@
                            chgrp($mail_backup_dir.'/'.$mail_backup_file, 'root');
                            chmod($mail_backup_dir.'/'.$mail_backup_file, 0640);
                            /* Insert mail backup record in database */
                            $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))."')";
                            $sql = "INSERT INTO mail_backup (server_id,parent_domain_id,mailuser_id,backup_mode,tstamp,filename,filesize) VALUES (".$conf['server_id'].",".$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))."')";
                            $app->db->query($sql);    
                            if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
                        } else {
@@ -135,7 +128,7 @@
                        for ($n = $backup_copies; $n <= 10; $n++) {
                            if(isset($files[$n]) && is_file($mail_backup_dir.'/'.$files[$n])) {
                                unlink($mail_backup_dir.'/'.$files[$n]);
                                $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])."'";
                                $sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$rec['domain_id']." AND filename = '".$app->db->quote($files[$n])."'";
                                $app->db->query($sql);
                                if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
                            }
@@ -145,14 +138,12 @@
                    }
                    /* Remove inactive backups */
                    if($rec['backup_interval'] == 'none') {
                        $sql="SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
                        $domain_rec=$app->db->queryOneRecord($sql);
                        /* remove backups from db */
                        $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'];
                        $sql = "DELETE FROM mail_backup WHERE server_id = ".$conf['server_id']." AND parent_domain_id = ".$rec['domain_id']." AND mailuser_id = ".$rec['mailuser_id'];
                        $app->db->query($sql);
                        if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
                        /* remove archives */
                        $mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];	
                        $mail_backup_dir = $backup_dir.'/mail'.$rec['domain_id'];	
                        $mail_backup_file = 'mail'.$rec['mailuser_id'].'_*';
                        if(is_dir($mail_backup_dir)) {
                            foreach (glob($mail_backup_dir.'/'.$mail_backup_file) as $filename) {