sebastianfeldmann /
phpbu
@@ -195,12 +195,12 @@ discard block |
||
| 195 | 195 | $info = $this->getInfoHtml($result); |
| 196 | 196 | $footer = $this->getFooterHtml(); |
| 197 | 197 | $body = '<html><body ' . TPL::getSnippet('sBody') . '>' |
| 198 | - . $header |
|
| 199 | - . $status |
|
| 200 | - . $errors |
|
| 201 | - . $info |
|
| 202 | - . $footer |
|
| 203 | - . '</body></html>'; |
|
| 198 | + . $header |
|
| 199 | + . $status |
|
| 200 | + . $errors |
|
| 201 | + . $info |
|
| 202 | + . $footer |
|
| 203 | + . '</body></html>'; |
|
| 204 | 204 | $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
| 205 | 205 | |
| 206 | 206 | $this->mailer->Subject = $this->subject . ' [' . ($this->isSimulation ? 'SIMULATION' : $state) . ']'; |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | protected function getHeaderHtml() |
| 379 | 379 | { |
| 380 | 380 | return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
| 381 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 381 | + '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 382 | 382 | } |
| 383 | 383 | |
| 384 | 384 | /** |
@@ -417,11 +417,11 @@ discard block |
||
| 417 | 417 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 418 | 418 | ); |
| 419 | 419 | $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) . '>' . |
| 420 | - '<tr><td>' . |
|
| 421 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 422 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 423 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 424 | - '</td></tr>' . |
|
| 420 | + '<tr><td>' . |
|
| 421 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 422 | + '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 423 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 424 | + '</td></tr>' . |
|
| 425 | 425 | '</table>'; |
| 426 | 426 | |
| 427 | 427 | return $html; |
@@ -491,65 +491,65 @@ discard block |
||
| 491 | 491 | $status = 'FAILURE'; |
| 492 | 492 | } |
| 493 | 493 | $html .= '<tr>' . |
| 494 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 495 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 496 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
| 497 | - '</td>' . |
|
| 498 | - '</tr>' . |
|
| 499 | - '<tr>' . |
|
| 500 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 501 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 502 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 503 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 504 | - '</tr>'; |
|
| 494 | + '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 495 | + sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 496 | + ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
| 497 | + '</td>' . |
|
| 498 | + '</tr>' . |
|
| 499 | + '<tr>' . |
|
| 500 | + '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 501 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 502 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 503 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 504 | + '</tr>'; |
|
| 505 | 505 | |
| 506 | 506 | $html .= '<tr>' . |
| 507 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 508 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 507 | + '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 508 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 509 | 509 | $backup->checkCount() . ' |
| 510 | 510 | </td>' . |
| 511 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 511 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 512 | 512 | |
| 513 | 513 | </td>' . |
| 514 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 514 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 515 | 515 | $backup->checkCountFailed() . |
| 516 | - '</td>' . |
|
| 517 | - '</tr>' . |
|
| 518 | - '<tr>' . |
|
| 519 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 520 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 516 | + '</td>' . |
|
| 517 | + '</tr>' . |
|
| 518 | + '<tr>' . |
|
| 519 | + '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 520 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 521 | 521 | $backup->cryptCount() . |
| 522 | - '</td>' . |
|
| 523 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 522 | + '</td>' . |
|
| 523 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 524 | 524 | $backup->cryptCountSkipped() . |
| 525 | - '</td>' . |
|
| 526 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 525 | + '</td>' . |
|
| 526 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 527 | 527 | $backup->cryptCountFailed() . |
| 528 | - '</td>' . |
|
| 529 | - '</tr>' . |
|
| 530 | - '<tr>' . |
|
| 531 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 532 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 528 | + '</td>' . |
|
| 529 | + '</tr>' . |
|
| 530 | + '<tr>' . |
|
| 531 | + '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 532 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 533 | 533 | $backup->syncCount() . '</td>' . |
| 534 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 534 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 535 | 535 | $backup->syncCountSkipped() . |
| 536 | - '</td>' . |
|
| 537 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 536 | + '</td>' . |
|
| 537 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 538 | 538 | $backup->syncCountFailed() . |
| 539 | - '</td>' . |
|
| 540 | - '</tr>' . |
|
| 541 | - '<tr>' . |
|
| 542 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 543 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 539 | + '</td>' . |
|
| 540 | + '</tr>' . |
|
| 541 | + '<tr>' . |
|
| 542 | + '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 543 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 544 | 544 | $backup->cleanupCount() . |
| 545 | - '</td>' . |
|
| 546 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 545 | + '</td>' . |
|
| 546 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 547 | 547 | $backup->cleanupCountSkipped() . |
| 548 | - '</td>' . |
|
| 549 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 548 | + '</td>' . |
|
| 549 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 550 | 550 | $backup->cleanupCountFailed() . |
| 551 | - '</td>' . |
|
| 552 | - '</tr>'; |
|
| 551 | + '</td>' . |
|
| 552 | + '</tr>'; |
|
| 553 | 553 | } |
| 554 | 554 | $html .= '</table>'; |
| 555 | 555 | |
@@ -565,6 +565,6 @@ discard block |
||
| 565 | 565 | protected function getFooterHtml() |
| 566 | 566 | { |
| 567 | 567 | return '<p ' . TPL::getSnippet('sStats') . '>' . Statistics::resourceUsage() . '</p>' . |
| 568 | - '</td></tr></table>'; |
|
| 568 | + '</td></tr></table>'; |
|
| 569 | 569 | } |
| 570 | 570 | } |
@@ -201,7 +201,7 @@ |
||
| 201 | 201 | . $info |
| 202 | 202 | . $footer |
| 203 | 203 | . '</body></html>'; |
| 204 | - $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
|
| 204 | + $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
|
| 205 | 205 | |
| 206 | 206 | $this->mailer->Subject = $this->subject . ' [' . ($this->isSimulation ? 'SIMULATION' : $state) . ']'; |
| 207 | 207 | $this->mailer->setFrom($this->senderMail, $this->senderName); |
