sebastianfeldmann /
phpbu
@@ -192,12 +192,12 @@ discard block |
||
| 192 | 192 | $info = $this->getInfoHtml($result); |
| 193 | 193 | $footer = $this->getFooterHtml(); |
| 194 | 194 | $body = '<html><body '. TPL::getSnippet('sBody') . '>' |
| 195 | - . $header |
|
| 196 | - . $status |
|
| 197 | - . $errors |
|
| 198 | - . $info |
|
| 199 | - . $footer |
|
| 200 | - . '</body></html>'; |
|
| 195 | + . $header |
|
| 196 | + . $status |
|
| 197 | + . $errors |
|
| 198 | + . $info |
|
| 199 | + . $footer |
|
| 200 | + . '</body></html>'; |
|
| 201 | 201 | $sent = null; |
| 202 | 202 | $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
| 203 | 203 | |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | |
| 341 | 341 | if ($username && $password) { |
| 342 | 342 | $transport->setUsername($username) |
| 343 | - ->setPassword($password); |
|
| 343 | + ->setPassword($password); |
|
| 344 | 344 | } |
| 345 | 345 | if ($encryption) { |
| 346 | 346 | $transport->setEncryption($encryption); |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | protected function getHeaderHtml() |
| 374 | 374 | { |
| 375 | 375 | return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
| 376 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 376 | + '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | /** |
@@ -411,11 +411,11 @@ discard block |
||
| 411 | 411 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 412 | 412 | ); |
| 413 | 413 | $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' . |
| 414 | - '<tr><td>' . |
|
| 415 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 416 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 417 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 418 | - '</td></tr>' . |
|
| 414 | + '<tr><td>' . |
|
| 415 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 416 | + '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 417 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 418 | + '</td></tr>' . |
|
| 419 | 419 | '</table>'; |
| 420 | 420 | |
| 421 | 421 | return $html; |
@@ -476,65 +476,65 @@ discard block |
||
| 476 | 476 | $status = 'FAILURE'; |
| 477 | 477 | } |
| 478 | 478 | $html .= '<tr>' . |
| 479 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 480 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 481 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
| 482 | - '</td>' . |
|
| 483 | - '</tr>' . |
|
| 484 | - '<tr>' . |
|
| 485 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 486 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 487 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 488 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 489 | - '</tr>'; |
|
| 479 | + '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 480 | + sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 481 | + ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
| 482 | + '</td>' . |
|
| 483 | + '</tr>' . |
|
| 484 | + '<tr>' . |
|
| 485 | + '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 486 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 487 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 488 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 489 | + '</tr>'; |
|
| 490 | 490 | |
| 491 | 491 | $html .= '<tr>' . |
| 492 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 493 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 492 | + '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 493 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 494 | 494 | $backup->checkCount() . ' |
| 495 | 495 | </td>' . |
| 496 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 496 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 497 | 497 | |
| 498 | 498 | </td>' . |
| 499 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 499 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 500 | 500 | $backup->checkCountFailed() . |
| 501 | - '</td>' . |
|
| 502 | - '</tr>' . |
|
| 503 | - '<tr>' . |
|
| 504 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 505 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 501 | + '</td>' . |
|
| 502 | + '</tr>' . |
|
| 503 | + '<tr>' . |
|
| 504 | + '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 505 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 506 | 506 | $backup->cryptCount() . |
| 507 | - '</td>' . |
|
| 508 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 507 | + '</td>' . |
|
| 508 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 509 | 509 | $backup->cryptCountSkipped() . |
| 510 | - '</td>' . |
|
| 511 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 510 | + '</td>' . |
|
| 511 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 512 | 512 | $backup->cryptCountFailed() . |
| 513 | - '</td>' . |
|
| 514 | - '</tr>' . |
|
| 515 | - '<tr>' . |
|
| 516 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 517 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 513 | + '</td>' . |
|
| 514 | + '</tr>' . |
|
| 515 | + '<tr>' . |
|
| 516 | + '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 517 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 518 | 518 | $backup->syncCount() . '</td>' . |
| 519 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 519 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 520 | 520 | $backup->syncCountSkipped() . |
| 521 | - '</td>' . |
|
| 522 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 521 | + '</td>' . |
|
| 522 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 523 | 523 | $backup->syncCountFailed() . |
| 524 | - '</td>' . |
|
| 525 | - '</tr>' . |
|
| 526 | - '<tr>' . |
|
| 527 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 528 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 524 | + '</td>' . |
|
| 525 | + '</tr>' . |
|
| 526 | + '<tr>' . |
|
| 527 | + '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 528 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 529 | 529 | $backup->cleanupCount() . |
| 530 | - '</td>' . |
|
| 531 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 530 | + '</td>' . |
|
| 531 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 532 | 532 | $backup->cleanupCountSkipped() . |
| 533 | - '</td>' . |
|
| 534 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 533 | + '</td>' . |
|
| 534 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 535 | 535 | $backup->cleanupCountFailed() . |
| 536 | - '</td>' . |
|
| 537 | - '</tr>'; |
|
| 536 | + '</td>' . |
|
| 537 | + '</tr>'; |
|
| 538 | 538 | |
| 539 | 539 | } |
| 540 | 540 | $html .= '</table>'; |
@@ -550,6 +550,6 @@ discard block |
||
| 550 | 550 | protected function getFooterHtml() |
| 551 | 551 | { |
| 552 | 552 | return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
| 553 | - '</td></tr></table>'; |
|
| 553 | + '</td></tr></table>'; |
|
| 554 | 554 | } |
| 555 | 555 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | */ |
| 184 | 184 | public function onPhpbuEnd(Event\App\End $event) |
| 185 | 185 | { |
| 186 | - $result = $event->getResult(); |
|
| 186 | + $result = $event->getResult(); |
|
| 187 | 187 | |
| 188 | 188 | if ($this->shouldMailBeSend($result)) { |
| 189 | 189 | $header = $this->getHeaderHtml(); |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $errors = $this->getErrorHtml($result); |
| 192 | 192 | $info = $this->getInfoHtml($result); |
| 193 | 193 | $footer = $this->getFooterHtml(); |
| 194 | - $body = '<html><body '. TPL::getSnippet('sBody') . '>' |
|
| 194 | + $body = '<html><body ' . TPL::getSnippet('sBody') . '>' |
|
| 195 | 195 | . $header |
| 196 | 196 | . $status |
| 197 | 197 | . $errors |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | $this->numCleanups, |
| 411 | 411 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 412 | 412 | ); |
| 413 | - $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' . |
|
| 413 | + $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) . '>' . |
|
| 414 | 414 | '<tr><td>' . |
| 415 | 415 | '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
| 416 | 416 | '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | $html .= '<tr>' . |
| 479 | 479 | '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
| 480 | 480 | sprintf('backup <em>%s</em>', $backup->getName()) . |
| 481 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
| 481 | + ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
| 482 | 482 | '</td>' . |
| 483 | 483 | '</tr>' . |
| 484 | 484 | '<tr>' . |
@@ -86,7 +86,7 @@ |
||
| 86 | 86 | public function sync(Target $target, Result $result) |
| 87 | 87 | { |
| 88 | 88 | // silence ftp errors |
| 89 | - $old = error_reporting(0); |
|
| 89 | + $old = error_reporting(0); |
|
| 90 | 90 | if (!$this->ftpConnection = ftp_connect($this->host)) { |
| 91 | 91 | throw new Exception( |
| 92 | 92 | sprintf( |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | $this->container = $container; |
| 36 | 36 | $this->filename = basename($object->name); |
| 37 | 37 | $this->pathname = $object->name; |
| 38 | - $this->size = (int)$object->contentLength; |
|
| 38 | + $this->size = (int) $object->contentLength; |
|
| 39 | 39 | $this->lastModified = $object->lastModified->getTimestamp(); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | public static function getClassName($name) |
| 57 | 57 | { |
| 58 | 58 | if (!isset(self::$availableCompressors[$name])) { |
| 59 | - throw new Exception('Invalid compressor: ' .$name); |
|
| 59 | + throw new Exception('Invalid compressor: ' . $name); |
|
| 60 | 60 | } |
| 61 | 61 | $class = self::$availableCompressors[$name]; |
| 62 | 62 | return '\\phpbu\\App\\Backup\\Target\\Compression\\' . $class; |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | */ |
| 59 | 59 | protected function isFilenameMatch(string $filename): bool |
| 60 | 60 | { |
| 61 | - return preg_match('#'.$this->fileRegex . '#i', $filename); |
|
| 61 | + return preg_match('#' . $this->fileRegex . '#i', $filename); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /** |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | $markup = ''; |
| 134 | 134 | /* @var $e \Exception */ |
| 135 | 135 | foreach ($errors as $e) { |
| 136 | - $data = [ |
|
| 136 | + $data = [ |
|
| 137 | 137 | 'class' => get_class($e), |
| 138 | 138 | 'message' => $e->getMessage(), |
| 139 | 139 | 'file' => $e->getFile(), |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | $markup = ''; |
| 157 | 157 | /* @var $b \phpbu\App\Result\Backup */ |
| 158 | 158 | foreach ($backups as $b) { |
| 159 | - $data = [ |
|
| 159 | + $data = [ |
|
| 160 | 160 | 'name' => $b->getName(), |
| 161 | 161 | 'status' => $b->allOk() ? 0 : 1, |
| 162 | 162 | 'checkCount' => $b->checkCount(), |
