sebastianfeldmann /
phpbu
@@ -148,8 +148,8 @@ discard block |
||
| 148 | 148 | $mails = $options['recipients']; |
| 149 | 149 | $server = gethostname(); |
| 150 | 150 | $this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false); |
| 151 | - $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server); |
|
| 152 | - $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server); |
|
| 151 | + $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server); |
|
| 152 | + $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server); |
|
| 153 | 153 | $this->senderName = Arr::getValue($options, 'sender.name'); |
| 154 | 154 | $this->transportType = Arr::getValue($options, 'transport', 'mail'); |
| 155 | 155 | $this->recipients = array_map('trim', explode(';', $mails)); |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | $errors = $this->getErrorHtml($result); |
| 177 | 177 | $info = $this->getInfoHtml($result); |
| 178 | 178 | $footer = $this->getFooterHtml(); |
| 179 | - $body = '<html><body '. TPL::getSnippet('sBody') . '>' |
|
| 179 | + $body = '<html><body '.TPL::getSnippet('sBody').'>' |
|
| 180 | 180 | . $header |
| 181 | 181 | . $status |
| 182 | 182 | . $errors |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | try { |
| 190 | 190 | /** @var \Swift_Message $message */ |
| 191 | 191 | $message = new Swift_Message(); |
| 192 | - $message->setSubject($this->subject . ' [' . $state . ']') |
|
| 192 | + $message->setSubject($this->subject.' ['.$state.']') |
|
| 193 | 193 | ->setFrom($this->senderMail, $this->senderName) |
| 194 | 194 | ->setTo($this->recipients) |
| 195 | 195 | ->setBody($body, 'text/html'); |
@@ -328,9 +328,9 @@ discard block |
||
| 328 | 328 | { |
| 329 | 329 | if (isset($options['sendmail.path'])) { |
| 330 | 330 | $path = $options['sendmail.path']; |
| 331 | - $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : ''; |
|
| 331 | + $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : ''; |
|
| 332 | 332 | /* @var $transport \Swift_SendmailTransport */ |
| 333 | - return new \Swift_SendmailTransport($path . $options); |
|
| 333 | + return new \Swift_SendmailTransport($path.$options); |
|
| 334 | 334 | } |
| 335 | 335 | return new \Swift_SendmailTransport(); |
| 336 | 336 | } |
@@ -342,8 +342,8 @@ discard block |
||
| 342 | 342 | */ |
| 343 | 343 | protected function getHeaderHtml() |
| 344 | 344 | { |
| 345 | - return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
|
| 346 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 345 | + return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'. |
|
| 346 | + '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | /** |
@@ -380,12 +380,12 @@ discard block |
||
| 380 | 380 | $this->numCleanups, |
| 381 | 381 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 382 | 382 | ); |
| 383 | - $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' . |
|
| 384 | - '<tr><td>' . |
|
| 385 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 386 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 387 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 388 | - '</td></tr>' . |
|
| 383 | + $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'. |
|
| 384 | + '<tr><td>'. |
|
| 385 | + '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'. |
|
| 386 | + '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'. |
|
| 387 | + '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'. |
|
| 388 | + '</td></tr>'. |
|
| 389 | 389 | '</table>'; |
| 390 | 390 | |
| 391 | 391 | return $html; |
@@ -402,17 +402,17 @@ discard block |
||
| 402 | 402 | $html = ''; |
| 403 | 403 | $errors = $result->getErrors(); |
| 404 | 404 | if (count($errors)) { |
| 405 | - $html .= '<table ' . TPL::getSnippet('sTableError') . '>'; |
|
| 405 | + $html .= '<table '.TPL::getSnippet('sTableError').'>'; |
|
| 406 | 406 | /* @var $e Exception */ |
| 407 | 407 | foreach ($errors as $e) { |
| 408 | - $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' . |
|
| 408 | + $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'. |
|
| 409 | 409 | sprintf( |
| 410 | 410 | "Exception '%s' with message '%s' in %s:%d", |
| 411 | 411 | get_class($e), |
| 412 | 412 | $e->getMessage(), |
| 413 | 413 | $e->getFile(), |
| 414 | 414 | $e->getLine() |
| 415 | - ) . |
|
| 415 | + ). |
|
| 416 | 416 | '</td></tr>'; |
| 417 | 417 | |
| 418 | 418 | } |
@@ -432,78 +432,78 @@ discard block |
||
| 432 | 432 | $html = ''; |
| 433 | 433 | $backups = $result->getBackups(); |
| 434 | 434 | if (count($backups)) { |
| 435 | - $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>'; |
|
| 435 | + $html .= '<table '.TPL::getSnippet('sTableBackup').'>'; |
|
| 436 | 436 | /** @var \phpbu\App\Result\Backup $backup */ |
| 437 | 437 | foreach ($backups as $backup) { |
| 438 | 438 | if ($backup->allOk()) { |
| 439 | 439 | $color = TPL::getSnippet('cStatusOK'); |
| 440 | 440 | $status = 'OK'; |
| 441 | - } elseif($backup->okButSkipsOrFails()) { |
|
| 441 | + } elseif ($backup->okButSkipsOrFails()) { |
|
| 442 | 442 | $color = TPL::getSnippet('cStatusWARN'); |
| 443 | 443 | $status = 'WARNING'; |
| 444 | 444 | } else { |
| 445 | 445 | $color = TPL::getSnippet('cStatusFAIL'); |
| 446 | 446 | $status = 'FAILURE'; |
| 447 | 447 | } |
| 448 | - $html .= '<tr>' . |
|
| 449 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 450 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 451 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
| 452 | - '</td>' . |
|
| 453 | - '</tr>' . |
|
| 454 | - '<tr>' . |
|
| 455 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 456 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 457 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 458 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 448 | + $html .= '<tr>'. |
|
| 449 | + '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'. |
|
| 450 | + sprintf('backup <em>%s</em>', $backup->getName()). |
|
| 451 | + ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'. |
|
| 452 | + '</td>'. |
|
| 453 | + '</tr>'. |
|
| 454 | + '<tr>'. |
|
| 455 | + '<td '.TPL::getSnippet('sRowHead').'> </td>'. |
|
| 456 | + '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'. |
|
| 457 | + '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'. |
|
| 458 | + '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'. |
|
| 459 | 459 | '</tr>'; |
| 460 | 460 | |
| 461 | - $html .= '<tr>' . |
|
| 462 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 463 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 464 | - $backup->checkCount() . ' |
|
| 461 | + $html .= '<tr>'. |
|
| 462 | + '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'. |
|
| 463 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 464 | + $backup->checkCount().' |
|
| 465 | 465 | </td>' . |
| 466 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 466 | + '<td '.TPL::getSnippet('sRowCheck').' align="right"> |
|
| 467 | 467 | |
| 468 | 468 | </td>' . |
| 469 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 470 | - $backup->checkCountFailed() . |
|
| 471 | - '</td>' . |
|
| 472 | - '</tr>' . |
|
| 473 | - '<tr>' . |
|
| 474 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 475 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 476 | - $backup->cryptCount() . |
|
| 477 | - '</td>' . |
|
| 478 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 479 | - $backup->cryptCountSkipped() . |
|
| 480 | - '</td>' . |
|
| 481 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 482 | - $backup->cryptCountFailed() . |
|
| 483 | - '</td>' . |
|
| 484 | - '</tr>' . |
|
| 485 | - '<tr>' . |
|
| 486 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 487 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 488 | - $backup->syncCount() . '</td>' . |
|
| 489 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 490 | - $backup->syncCountSkipped() . |
|
| 491 | - '</td>' . |
|
| 492 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 493 | - $backup->syncCountFailed() . |
|
| 494 | - '</td>' . |
|
| 495 | - '</tr>' . |
|
| 496 | - '<tr>' . |
|
| 497 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 498 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 499 | - $backup->cleanupCount() . |
|
| 500 | - '</td>' . |
|
| 501 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 502 | - $backup->cleanupCountSkipped() . |
|
| 503 | - '</td>' . |
|
| 504 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 505 | - $backup->cleanupCountFailed() . |
|
| 506 | - '</td>' . |
|
| 469 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 470 | + $backup->checkCountFailed(). |
|
| 471 | + '</td>'. |
|
| 472 | + '</tr>'. |
|
| 473 | + '<tr>'. |
|
| 474 | + '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'. |
|
| 475 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 476 | + $backup->cryptCount(). |
|
| 477 | + '</td>'. |
|
| 478 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 479 | + $backup->cryptCountSkipped(). |
|
| 480 | + '</td>'. |
|
| 481 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 482 | + $backup->cryptCountFailed(). |
|
| 483 | + '</td>'. |
|
| 484 | + '</tr>'. |
|
| 485 | + '<tr>'. |
|
| 486 | + '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'. |
|
| 487 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 488 | + $backup->syncCount().'</td>'. |
|
| 489 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 490 | + $backup->syncCountSkipped(). |
|
| 491 | + '</td>'. |
|
| 492 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 493 | + $backup->syncCountFailed(). |
|
| 494 | + '</td>'. |
|
| 495 | + '</tr>'. |
|
| 496 | + '<tr>'. |
|
| 497 | + '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'. |
|
| 498 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 499 | + $backup->cleanupCount(). |
|
| 500 | + '</td>'. |
|
| 501 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 502 | + $backup->cleanupCountSkipped(). |
|
| 503 | + '</td>'. |
|
| 504 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 505 | + $backup->cleanupCountFailed(). |
|
| 506 | + '</td>'. |
|
| 507 | 507 | '</tr>'; |
| 508 | 508 | |
| 509 | 509 | } |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | */ |
| 520 | 520 | protected function getFooterHtml() |
| 521 | 521 | { |
| 522 | - return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
|
| 522 | + return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'. |
|
| 523 | 523 | '</td></tr></table>'; |
| 524 | 524 | } |
| 525 | 525 | } |
