Merge branch 'stable-3.0.5'

Marius Cramer

2015-11-17 a5714c39c76695af5b2220e93a4ac3121a9d83a1

 server/plugins-available/backup_plugin.inc.php

@@ -71,7 +71,9 @@

         $web = $app->dbmaster->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $backup['parent_domain_id']);
         $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
         $backup_dir = $server_config['backup_dir'].'/web'.$web['domain_id'];
         $backup_dir = trim($server_config['backup_dir']);
         if($backup_dir == '') return;
         $backup_dir .= '/web'.$web['domain_id'];
         
         $backup_dir_is_ready = true;
            //* mount backup directory, if necessary
@@ -135,6 +137,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');
@@ -155,6 +158,7 @@
                     $app->log('Restored Web backup '.$backup_dir.'/'.$backup['filename'], LOGLEVEL_DEBUG);
                  }
               }
               $app->system->web_folder_protection($web['document_root'], true);
            }
            if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
         } else {
@@ -178,7 +182,10 @@
         $app->uses('ini_parser,file,getconf');
   
         $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
         $backup_dir = $server_config['backup_dir'];
         $backup_dir = trim($server_config['backup_dir']);

            if($backup_dir == '') return;

         $backup_dir_is_ready = true;
   
         //* mount backup directory, if necessary