sebastianfeldmann /
phpbu
@@ -194,14 +194,14 @@ |
||
| 194 | 194 | |
| 195 | 195 | $executable = new Executable\Tar($this->pathToTar); |
| 196 | 196 | $executable->archiveDirectory($this->path) |
| 197 | - ->useCompression($this->compression) |
|
| 198 | - ->useCompressProgram($this->compressProgram) |
|
| 199 | - ->forceLocal($this->forceLocal) |
|
| 200 | - ->ignoreFailedRead($this->ignoreFailedRead) |
|
| 201 | - ->removeSourceDirectory($this->removeSourceDir) |
|
| 202 | - ->throttle($this->throttle) |
|
| 203 | - ->archiveTo($this->pathToArchive) |
|
| 204 | - ->dereference($this->dereference); |
|
| 197 | + ->useCompression($this->compression) |
|
| 198 | + ->useCompressProgram($this->compressProgram) |
|
| 199 | + ->forceLocal($this->forceLocal) |
|
| 200 | + ->ignoreFailedRead($this->ignoreFailedRead) |
|
| 201 | + ->removeSourceDirectory($this->removeSourceDir) |
|
| 202 | + ->throttle($this->throttle) |
|
| 203 | + ->archiveTo($this->pathToArchive) |
|
| 204 | + ->dereference($this->dereference); |
|
| 205 | 205 | // add paths to exclude |
| 206 | 206 | foreach ($this->excludes as $path) { |
| 207 | 207 | $executable->addExclude($path); |
@@ -222,7 +222,7 @@ |
||
| 222 | 222 | throw new Exception('backup requires a target config'); |
| 223 | 223 | } |
| 224 | 224 | $compress = Arr::getValue($json['target'], 'compress'); |
| 225 | - $filename = $this->getAdapterizedValue(Arr::getValue($json['target'], 'filename','')); |
|
| 225 | + $filename = $this->getAdapterizedValue(Arr::getValue($json['target'], 'filename', '')); |
|
| 226 | 226 | $dirname = $this->getAdapterizedValue(Arr::getValue($json['target'], 'dirname', '')); |
| 227 | 227 | |
| 228 | 228 | if ($dirname) { |
@@ -191,12 +191,12 @@ discard block |
||
| 191 | 191 | $info = $this->getInfoHtml($result); |
| 192 | 192 | $footer = $this->getFooterHtml(); |
| 193 | 193 | $body = '<html><body ' . TPL::getSnippet('sBody') . '>' |
| 194 | - . $header |
|
| 195 | - . $status |
|
| 196 | - . $errors |
|
| 197 | - . $info |
|
| 198 | - . $footer |
|
| 199 | - . '</body></html>'; |
|
| 194 | + . $header |
|
| 195 | + . $status |
|
| 196 | + . $errors |
|
| 197 | + . $info |
|
| 198 | + . $footer |
|
| 199 | + . '</body></html>'; |
|
| 200 | 200 | $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
| 201 | 201 | |
| 202 | 202 | $this->mailer->Subject = $this->subject . ' [' . $state . ']'; |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | protected function getHeaderHtml() |
| 360 | 360 | { |
| 361 | 361 | return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
| 362 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 362 | + '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 363 | 363 | } |
| 364 | 364 | |
| 365 | 365 | /** |
@@ -398,11 +398,11 @@ discard block |
||
| 398 | 398 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 399 | 399 | ); |
| 400 | 400 | $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) . '>' . |
| 401 | - '<tr><td>' . |
|
| 402 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 403 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 404 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 405 | - '</td></tr>' . |
|
| 401 | + '<tr><td>' . |
|
| 402 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 403 | + '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 404 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 405 | + '</td></tr>' . |
|
| 406 | 406 | '</table>'; |
| 407 | 407 | |
| 408 | 408 | return $html; |
@@ -465,65 +465,65 @@ discard block |
||
| 465 | 465 | $status = 'FAILURE'; |
| 466 | 466 | } |
| 467 | 467 | $html .= '<tr>' . |
| 468 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 469 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 470 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
| 471 | - '</td>' . |
|
| 472 | - '</tr>' . |
|
| 473 | - '<tr>' . |
|
| 474 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 475 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 476 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 477 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 478 | - '</tr>'; |
|
| 468 | + '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 469 | + sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 470 | + ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
| 471 | + '</td>' . |
|
| 472 | + '</tr>' . |
|
| 473 | + '<tr>' . |
|
| 474 | + '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 475 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 476 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 477 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 478 | + '</tr>'; |
|
| 479 | 479 | |
| 480 | 480 | $html .= '<tr>' . |
| 481 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 482 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 481 | + '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 482 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 483 | 483 | $backup->checkCount() . ' |
| 484 | 484 | </td>' . |
| 485 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 485 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 486 | 486 | |
| 487 | 487 | </td>' . |
| 488 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 488 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 489 | 489 | $backup->checkCountFailed() . |
| 490 | - '</td>' . |
|
| 491 | - '</tr>' . |
|
| 492 | - '<tr>' . |
|
| 493 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 494 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 490 | + '</td>' . |
|
| 491 | + '</tr>' . |
|
| 492 | + '<tr>' . |
|
| 493 | + '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 494 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 495 | 495 | $backup->cryptCount() . |
| 496 | - '</td>' . |
|
| 497 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 496 | + '</td>' . |
|
| 497 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 498 | 498 | $backup->cryptCountSkipped() . |
| 499 | - '</td>' . |
|
| 500 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 499 | + '</td>' . |
|
| 500 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 501 | 501 | $backup->cryptCountFailed() . |
| 502 | - '</td>' . |
|
| 503 | - '</tr>' . |
|
| 504 | - '<tr>' . |
|
| 505 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 506 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 502 | + '</td>' . |
|
| 503 | + '</tr>' . |
|
| 504 | + '<tr>' . |
|
| 505 | + '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 506 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 507 | 507 | $backup->syncCount() . '</td>' . |
| 508 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 508 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 509 | 509 | $backup->syncCountSkipped() . |
| 510 | - '</td>' . |
|
| 511 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 510 | + '</td>' . |
|
| 511 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 512 | 512 | $backup->syncCountFailed() . |
| 513 | - '</td>' . |
|
| 514 | - '</tr>' . |
|
| 515 | - '<tr>' . |
|
| 516 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 517 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 513 | + '</td>' . |
|
| 514 | + '</tr>' . |
|
| 515 | + '<tr>' . |
|
| 516 | + '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 517 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 518 | 518 | $backup->cleanupCount() . |
| 519 | - '</td>' . |
|
| 520 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 519 | + '</td>' . |
|
| 520 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 521 | 521 | $backup->cleanupCountSkipped() . |
| 522 | - '</td>' . |
|
| 523 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 522 | + '</td>' . |
|
| 523 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 524 | 524 | $backup->cleanupCountFailed() . |
| 525 | - '</td>' . |
|
| 526 | - '</tr>'; |
|
| 525 | + '</td>' . |
|
| 526 | + '</tr>'; |
|
| 527 | 527 | |
| 528 | 528 | } |
| 529 | 529 | $html .= '</table>'; |
@@ -540,6 +540,6 @@ discard block |
||
| 540 | 540 | protected function getFooterHtml() |
| 541 | 541 | { |
| 542 | 542 | return '<p ' . TPL::getSnippet('sStats') . '>' . Statistics::resourceUsage() . '</p>' . |
| 543 | - '</td></tr></table>'; |
|
| 543 | + '</td></tr></table>'; |
|
| 544 | 544 | } |
| 545 | 545 | } |
@@ -197,7 +197,7 @@ |
||
| 197 | 197 | . $info |
| 198 | 198 | . $footer |
| 199 | 199 | . '</body></html>'; |
| 200 | - $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
|
| 200 | + $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
|
| 201 | 201 | |
| 202 | 202 | $this->mailer->Subject = $this->subject . ' [' . $state . ']'; |
| 203 | 203 | $this->mailer->setFrom($this->senderMail, $this->senderName); |
