Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2015-12-21 b25f400cd6bc255b01e05ac274f050ba4039a411

 server/plugins-available/backup_plugin.inc.php

@@ -53,9 +53,10 @@
      //* Register for actions
      $app->plugins->registerAction('backup_download', $this->plugin_name, 'backup_action');
      $app->plugins->registerAction('backup_restore', $this->plugin_name, 'backup_action');
      $app->plugins->registerAction('backup_delete', $this->plugin_name, 'backup_action');
      //$app->plugins->registerAction('backup_download_mail', $this->plugin_name, 'backup_action_mail');
      $app->plugins->registerAction('backup_restore_mail', $this->plugin_name, 'backup_action_mail');
		
      $app->plugins->registerAction('backup_delete_mail', $this->plugin_name, 'backup_action_mail');
   }

   //* Do a backup action
@@ -137,6 +138,7 @@

            //* Restore a web backup
            if($action_name == 'backup_restore' && $backup['backup_type'] == 'web') {
               $app->system->web_folder_protection($web['document_root'], false);
               if($backup['backup_mode'] == 'userzip') {
                  if(file_exists($backup_dir.'/'.$backup['filename']) && $web['document_root'] != '' && $web['document_root'] != '/' && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
                     if(file_exists($web['document_root'].'/backup/'.$backup['filename'])) rename($web['document_root'].'/backup/'.$backup['filename'], $web['document_root'].'/backup/'.$backup['filename'].'.bak');
@@ -157,7 +159,20 @@
                     $app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
                  }
               }
               $app->system->web_folder_protection($web['document_root'], true);
            }
				
            if($action_name == 'backup_delete') {
               if(file_exists($backup_dir.'/'.$backup['filename']) && !stristr($backup_dir.'/'.$backup['filename'], '..') && !stristr($backup_dir.'/'.$backup['filename'], 'etc')) {
                  unlink($backup_dir.'/'.$backup['filename']);
						
                  $sql = "DELETE FROM mail_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);
                  $app->log('unlink '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
               }
            }

            if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
         } else {
            $app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
@@ -176,14 +191,11 @@
      $backup_id = intval($data);
      $mail_backup = $app->dbmaster->queryOneRecord("SELECT * FROM mail_backup WHERE backup_id = ?", $backup_id);
   
      if (is_array($mail_backup) && $action_name == 'backup_restore_mail') {
      if (is_array($mail_backup)) {
         $app->uses('ini_parser,file,getconf');
   
         $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
         $backup_dir = trim($server_config['backup_dir']);

            if($backup_dir == '') return;

         $backup_dir = $server_config['backup_dir'];
         $backup_dir_is_ready = true;
   
         //* mount backup directory, if necessary
@@ -215,6 +227,7 @@
               chgrp($record['maildir'], $mail_config['mailuser_group']);
            }
         
            if ($action_name == 'backup_restore_mail') {
            if(file_exists($mail_backup_file) && $record['homedir'] != '' && $record['homedir'] != '/' && !stristr($mail_backup_file,'..') && !stristr($mail_backup_file,'etc') && $mail_config['homedir_path'] == $record['homedir'] && is_dir($domain_dir) && is_dir($record['maildir'])) {
               if ($record['maildir_format'] == 'mdbox') {
                  $retval = -1;
@@ -274,6 +287,18 @@
                  }
               }
            }
            }
				
            if($action_name == 'backup_delete_mail') {
               if(file_exists($mail_backup_file) && !stristr($mail_backup_file, '..') && !stristr($mail_backup_file, 'etc')) {
                  unlink($mail_backup_file);
                  $sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
                  $app->db->query($sql, $conf['server_id'], $mail_backup['parent_domain_id'], $mail_backup['filename']);
                  if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql);
                  $app->log('unlink '.$backup_dir.'/'.$mail_backup['filename'], LOGLEVEL_DEBUG);
               }
            }
				
            if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
         } else {
            $app->log('Backup directory not ready.', LOGLEVEL_DEBUG);