@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | } |
172 | 172 | |
173 | 173 | public function update_hash( $schedule_id, $hash ) { |
174 | - $schedule = array(); |
|
174 | + $schedule = array(); |
|
175 | 175 | |
176 | 176 | $schedule['hash'] = $hash; |
177 | 177 | |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | |
191 | 191 | public function update_last_backup( $schedule_id, $last_backup ) { |
192 | 192 | |
193 | - $this->logger->info(sprintf('Updating last backup %s for schedule id #%s', $last_backup, $schedule_id)); |
|
193 | + $this->logger->info(sprintf('Updating last backup %s for schedule id #%s', $last_backup, $schedule_id)); |
|
194 | 194 | |
195 | 195 | $schedule['last_backup'] = $last_backup; |
196 | 196 | |
@@ -284,56 +284,56 @@ discard block |
||
284 | 284 | } |
285 | 285 | $this->logger->info( sprintf( "File archive process FINISHED." ), array( "CRON" ) ); |
286 | 286 | |
287 | - //getting the last backup archive file |
|
288 | - $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension(); |
|
287 | + //getting the last backup archive file |
|
288 | + $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_with_extension(); |
|
289 | 289 | if ( $this->xcloner_file_system->is_part( $this->archive_system->get_archive_name_with_extension() ) ) { |
290 | 290 | $return['extra']['backup_parent'] = $this->archive_system->get_archive_name_multipart(); |
291 | 291 | } |
292 | 292 | |
293 | 293 | //Updating schedule last backup archive |
294 | - $this->update_last_backup( $schedule['id'], $return['extra']['backup_parent'] ); |
|
294 | + $this->update_last_backup( $schedule['id'], $return['extra']['backup_parent'] ); |
|
295 | 295 | |
296 | 296 | //Encrypting the backup archive |
297 | - $return_encrypted['finished'] = 0; |
|
298 | - $return_encrypted['start'] = 0; |
|
299 | - $return_encrypted['iv'] = ''; |
|
300 | - $return_encrypted['target_file'] = ''; |
|
301 | - $part = 0; |
|
302 | - $backup_parts = array(); |
|
303 | - |
|
304 | - if( $schedule['backup_params']->backup_encrypt){ |
|
305 | - $this->logger->info( sprintf( "Encrypting backup archive %s.", $return['extra']['backup_parent'] ), array( "CRON" ) ); |
|
306 | - |
|
307 | - $backup_file = $return['extra']['backup_parent']; |
|
308 | - |
|
309 | - if ($this->xcloner_file_system->is_multipart($return['extra']['backup_parent'])) { |
|
310 | - $backup_parts = $this->xcloner_file_system->get_multipart_files($return['extra']['backup_parent']); |
|
311 | - $backup_file = $backup_parts[$part]; |
|
312 | - } |
|
313 | - |
|
314 | - while ( ! $return_encrypted['finished'] ) { |
|
315 | - $return_encrypted = $this->xcloner_encryption->encrypt_file( |
|
316 | - $backup_file, |
|
317 | - "", |
|
318 | - "", |
|
319 | - "", |
|
320 | - "", |
|
321 | - true, |
|
322 | - true |
|
323 | - ); |
|
324 | - |
|
325 | - if($return_encrypted['finished']) { |
|
326 | - ++$part; |
|
327 | - |
|
328 | - if ($part < sizeof($backup_parts)) { |
|
329 | - $return_encrypted['finished'] = 0; |
|
330 | - $backup_file = $backup_parts[$part]; |
|
331 | - } |
|
332 | - } |
|
333 | - } |
|
334 | - } |
|
335 | - |
|
336 | - //Sending backup to remote storage |
|
297 | + $return_encrypted['finished'] = 0; |
|
298 | + $return_encrypted['start'] = 0; |
|
299 | + $return_encrypted['iv'] = ''; |
|
300 | + $return_encrypted['target_file'] = ''; |
|
301 | + $part = 0; |
|
302 | + $backup_parts = array(); |
|
303 | + |
|
304 | + if( $schedule['backup_params']->backup_encrypt){ |
|
305 | + $this->logger->info( sprintf( "Encrypting backup archive %s.", $return['extra']['backup_parent'] ), array( "CRON" ) ); |
|
306 | + |
|
307 | + $backup_file = $return['extra']['backup_parent']; |
|
308 | + |
|
309 | + if ($this->xcloner_file_system->is_multipart($return['extra']['backup_parent'])) { |
|
310 | + $backup_parts = $this->xcloner_file_system->get_multipart_files($return['extra']['backup_parent']); |
|
311 | + $backup_file = $backup_parts[$part]; |
|
312 | + } |
|
313 | + |
|
314 | + while ( ! $return_encrypted['finished'] ) { |
|
315 | + $return_encrypted = $this->xcloner_encryption->encrypt_file( |
|
316 | + $backup_file, |
|
317 | + "", |
|
318 | + "", |
|
319 | + "", |
|
320 | + "", |
|
321 | + true, |
|
322 | + true |
|
323 | + ); |
|
324 | + |
|
325 | + if($return_encrypted['finished']) { |
|
326 | + ++$part; |
|
327 | + |
|
328 | + if ($part < sizeof($backup_parts)) { |
|
329 | + $return_encrypted['finished'] = 0; |
|
330 | + $backup_file = $backup_parts[$part]; |
|
331 | + } |
|
332 | + } |
|
333 | + } |
|
334 | + } |
|
335 | + |
|
336 | + //Sending backup to remote storage |
|
337 | 337 | if ( isset( $schedule['remote_storage'] ) && $schedule['remote_storage'] && array_key_exists( $schedule['remote_storage'], $this->xcloner_remote_storage->get_available_storages() ) ) { |
338 | 338 | $backup_file = $return['extra']['backup_parent']; |
339 | 339 | |
@@ -384,10 +384,10 @@ discard block |
||
384 | 384 | } |
385 | 385 | |
386 | 386 | try { |
387 | - if( get_option('xcloner_disable_email_notification') ) { |
|
388 | - //we disable email notifications |
|
389 | - $schedule['backup_params']->email_notification = ""; |
|
390 | - } |
|
387 | + if( get_option('xcloner_disable_email_notification') ) { |
|
388 | + //we disable email notifications |
|
389 | + $schedule['backup_params']->email_notification = ""; |
|
390 | + } |
|
391 | 391 | $this->_xcloner_scheduler_callback( $id, $schedule ); |
392 | 392 | |
393 | 393 | } catch ( Exception $e ) { |