sebastianfeldmann /
phpbu
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | { |
| 24 | 24 | $this->sftp = $sftp; |
| 25 | 25 | $this->filename = $fileInfo['filename']; |
| 26 | - $this->pathname = $remotePath . '/' . $fileInfo['filename']; |
|
| 26 | + $this->pathname = $remotePath.'/'.$fileInfo['filename']; |
|
| 27 | 27 | $this->size = $fileInfo['size']; |
| 28 | 28 | $this->lastModified = $fileInfo['mtime']; |
| 29 | 29 | } |
@@ -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 | } |
@@ -163,8 +163,8 @@ discard block |
||
| 163 | 163 | $server = gethostname(); |
| 164 | 164 | $this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false); |
| 165 | 165 | $this->sendSimulating = Str::toBoolean(Arr::getValue($options, 'sendOnSimulation'), true); |
| 166 | - $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server); |
|
| 167 | - $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server); |
|
| 166 | + $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server); |
|
| 167 | + $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server); |
|
| 168 | 168 | $this->senderName = Arr::getValue($options, 'sender.name'); |
| 169 | 169 | $this->transportType = Arr::getValue($options, 'transport', 'mail'); |
| 170 | 170 | $this->recipients = array_map('trim', explode(';', $mails)); |
@@ -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 |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | try { |
| 205 | 205 | /** @var \Swift_Message $message */ |
| 206 | 206 | $message = new Swift_Message(); |
| 207 | - $message->setSubject($this->subject . ' [' . $state . ']') |
|
| 207 | + $message->setSubject($this->subject.' ['.$state.']') |
|
| 208 | 208 | ->setFrom($this->senderMail, $this->senderName) |
| 209 | 209 | ->setTo($this->recipients) |
| 210 | 210 | ->setBody($body, 'text/html'); |
@@ -358,9 +358,9 @@ discard block |
||
| 358 | 358 | { |
| 359 | 359 | if (isset($options['sendmail.path'])) { |
| 360 | 360 | $path = $options['sendmail.path']; |
| 361 | - $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : ''; |
|
| 361 | + $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : ''; |
|
| 362 | 362 | /* @var $transport \Swift_SendmailTransport */ |
| 363 | - return new \Swift_SendmailTransport($path . $options); |
|
| 363 | + return new \Swift_SendmailTransport($path.$options); |
|
| 364 | 364 | } |
| 365 | 365 | return new \Swift_SendmailTransport(); |
| 366 | 366 | } |
@@ -372,8 +372,8 @@ discard block |
||
| 372 | 372 | */ |
| 373 | 373 | protected function getHeaderHtml() |
| 374 | 374 | { |
| 375 | - return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
|
| 376 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 375 | + return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'. |
|
| 376 | + '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | /** |
@@ -410,12 +410,12 @@ discard block |
||
| 410 | 410 | $this->numCleanups, |
| 411 | 411 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 412 | 412 | ); |
| 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>' . |
|
| 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>'. |
|
| 419 | 419 | '</table>'; |
| 420 | 420 | |
| 421 | 421 | return $html; |
@@ -432,17 +432,17 @@ discard block |
||
| 432 | 432 | $html = ''; |
| 433 | 433 | $errors = $result->getErrors(); |
| 434 | 434 | if (count($errors)) { |
| 435 | - $html .= '<table ' . TPL::getSnippet('sTableError') . '>'; |
|
| 435 | + $html .= '<table '.TPL::getSnippet('sTableError').'>'; |
|
| 436 | 436 | /* @var $e Exception */ |
| 437 | 437 | foreach ($errors as $e) { |
| 438 | - $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' . |
|
| 438 | + $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'. |
|
| 439 | 439 | sprintf( |
| 440 | 440 | "Exception '%s' with message '%s' in %s:%d", |
| 441 | 441 | get_class($e), |
| 442 | 442 | $e->getMessage(), |
| 443 | 443 | $e->getFile(), |
| 444 | 444 | $e->getLine() |
| 445 | - ) . |
|
| 445 | + ). |
|
| 446 | 446 | '</td></tr>'; |
| 447 | 447 | |
| 448 | 448 | } |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | $html = ''; |
| 463 | 463 | $backups = $result->getBackups(); |
| 464 | 464 | if (count($backups)) { |
| 465 | - $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>'; |
|
| 465 | + $html .= '<table '.TPL::getSnippet('sTableBackup').'>'; |
|
| 466 | 466 | /** @var \phpbu\App\Result\Backup $backup */ |
| 467 | 467 | foreach ($backups as $backup) { |
| 468 | 468 | if ($backup->allOk()) { |
@@ -475,65 +475,65 @@ discard block |
||
| 475 | 475 | $color = TPL::getSnippet('cStatusFAIL'); |
| 476 | 476 | $status = 'FAILURE'; |
| 477 | 477 | } |
| 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>' . |
|
| 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 | 489 | '</tr>'; |
| 490 | 490 | |
| 491 | - $html .= '<tr>' . |
|
| 492 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 493 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 494 | - $backup->checkCount() . ' |
|
| 491 | + $html .= '<tr>'. |
|
| 492 | + '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'. |
|
| 493 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 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">' . |
|
| 500 | - $backup->checkCountFailed() . |
|
| 501 | - '</td>' . |
|
| 502 | - '</tr>' . |
|
| 503 | - '<tr>' . |
|
| 504 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 505 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 506 | - $backup->cryptCount() . |
|
| 507 | - '</td>' . |
|
| 508 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 509 | - $backup->cryptCountSkipped() . |
|
| 510 | - '</td>' . |
|
| 511 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 512 | - $backup->cryptCountFailed() . |
|
| 513 | - '</td>' . |
|
| 514 | - '</tr>' . |
|
| 515 | - '<tr>' . |
|
| 516 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 517 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 518 | - $backup->syncCount() . '</td>' . |
|
| 519 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 520 | - $backup->syncCountSkipped() . |
|
| 521 | - '</td>' . |
|
| 522 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 523 | - $backup->syncCountFailed() . |
|
| 524 | - '</td>' . |
|
| 525 | - '</tr>' . |
|
| 526 | - '<tr>' . |
|
| 527 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 528 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 529 | - $backup->cleanupCount() . |
|
| 530 | - '</td>' . |
|
| 531 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 532 | - $backup->cleanupCountSkipped() . |
|
| 533 | - '</td>' . |
|
| 534 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 535 | - $backup->cleanupCountFailed() . |
|
| 536 | - '</td>' . |
|
| 499 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
| 500 | + $backup->checkCountFailed(). |
|
| 501 | + '</td>'. |
|
| 502 | + '</tr>'. |
|
| 503 | + '<tr>'. |
|
| 504 | + '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'. |
|
| 505 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 506 | + $backup->cryptCount(). |
|
| 507 | + '</td>'. |
|
| 508 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 509 | + $backup->cryptCountSkipped(). |
|
| 510 | + '</td>'. |
|
| 511 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
| 512 | + $backup->cryptCountFailed(). |
|
| 513 | + '</td>'. |
|
| 514 | + '</tr>'. |
|
| 515 | + '<tr>'. |
|
| 516 | + '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'. |
|
| 517 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 518 | + $backup->syncCount().'</td>'. |
|
| 519 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 520 | + $backup->syncCountSkipped(). |
|
| 521 | + '</td>'. |
|
| 522 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
| 523 | + $backup->syncCountFailed(). |
|
| 524 | + '</td>'. |
|
| 525 | + '</tr>'. |
|
| 526 | + '<tr>'. |
|
| 527 | + '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'. |
|
| 528 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 529 | + $backup->cleanupCount(). |
|
| 530 | + '</td>'. |
|
| 531 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 532 | + $backup->cleanupCountSkipped(). |
|
| 533 | + '</td>'. |
|
| 534 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
| 535 | + $backup->cleanupCountFailed(). |
|
| 536 | + '</td>'. |
|
| 537 | 537 | '</tr>'; |
| 538 | 538 | |
| 539 | 539 | } |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | */ |
| 550 | 550 | protected function getFooterHtml() |
| 551 | 551 | { |
| 552 | - return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
|
| 552 | + return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'. |
|
| 553 | 553 | '</td></tr></table>'; |
| 554 | 554 | } |
| 555 | 555 | } |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | */ |
| 52 | 52 | public function simulate(Target $target, $value, Local $collector, Result $result) : bool |
| 53 | 53 | { |
| 54 | - $result->debug('checking size to be at least ' . $value . PHP_EOL); |
|
| 54 | + $result->debug('checking size to be at least '.$value.PHP_EOL); |
|
| 55 | 55 | return true; |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | */ |
| 65 | 65 | public function simulate(Target $target, $value, Local $collector, Result $result): bool |
| 66 | 66 | { |
| 67 | - $result->debug('checking size difference ' . $value . '%' . PHP_EOL); |
|
| 67 | + $result->debug('checking size difference '.$value.'%'.PHP_EOL); |
|
| 68 | 68 | return true; |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | { |
| 136 | 136 | foreach (['auth_url', 'region', 'username', 'password', 'container_name'] as $option) { |
| 137 | 137 | if (!Arr::isSetAndNotEmptyString($config, $option)) { |
| 138 | - throw new Exception($option . ' is mandatory'); |
|
| 138 | + throw new Exception($option.' is mandatory'); |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | } |
@@ -188,12 +188,12 @@ discard block |
||
| 188 | 188 | public function simulate(Target $target, Result $result) |
| 189 | 189 | { |
| 190 | 190 | $result->debug( |
| 191 | - 'sync backup to OpenStack' . PHP_EOL |
|
| 192 | - . ' region: ' . $this->region . PHP_EOL |
|
| 193 | - . ' key: ' . $this->username . PHP_EOL |
|
| 194 | - . ' password: ********' . PHP_EOL |
|
| 195 | - . ' container: ' . $this->containerName |
|
| 196 | - . ' path: "' . $this->path . '"' . PHP_EOL |
|
| 191 | + 'sync backup to OpenStack'.PHP_EOL |
|
| 192 | + . ' region: '.$this->region.PHP_EOL |
|
| 193 | + . ' key: '.$this->username.PHP_EOL |
|
| 194 | + . ' password: ********'.PHP_EOL |
|
| 195 | + . ' container: '.$this->containerName |
|
| 196 | + . ' path: "'.$this->path.'"'.PHP_EOL |
|
| 197 | 197 | ); |
| 198 | 198 | |
| 199 | 199 | $this->simulateRemoteCleanup($target, $result); |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | public function getUploadPath(Target $target) |
| 239 | 239 | { |
| 240 | - return $this->path . $target->getFilename(); |
|
| 240 | + return $this->path.$target->getFilename(); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
@@ -99,11 +99,11 @@ |
||
| 99 | 99 | public function simulate(Target $target, Result $result) |
| 100 | 100 | { |
| 101 | 101 | $result->debug( |
| 102 | - 'sync backup to ' . $this->getProtocolName() . ' server' . PHP_EOL |
|
| 103 | - . ' host: ' . $this->host . PHP_EOL |
|
| 104 | - . ' user: ' . $this->user . PHP_EOL |
|
| 105 | - . ' password: ********' . PHP_EOL |
|
| 106 | - . ' path: ' . $this->remotePath . PHP_EOL |
|
| 102 | + 'sync backup to '.$this->getProtocolName().' server'.PHP_EOL |
|
| 103 | + . ' host: '.$this->host.PHP_EOL |
|
| 104 | + . ' user: '.$this->user.PHP_EOL |
|
| 105 | + . ' password: ********'.PHP_EOL |
|
| 106 | + . ' path: '.$this->remotePath.PHP_EOL |
|
| 107 | 107 | ); |
| 108 | 108 | |
| 109 | 109 | $this->simulateRemoteCleanup($target, $result); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | public function sync(Target $target, Result $result) |
| 91 | 91 | { |
| 92 | 92 | $sourcePath = $target->getPathname(); |
| 93 | - $dropboxPath = $this->path . $target->getFilename(); |
|
| 93 | + $dropboxPath = $this->path.$target->getFilename(); |
|
| 94 | 94 | if (!$this->client) { |
| 95 | 95 | $this->connect(); |
| 96 | 96 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | // run remote cleanup |
| 104 | 104 | $this->cleanup($target, $result); |
| 105 | - $result->debug('upload: done (' . $meta->getSize() . ')'); |
|
| 105 | + $result->debug('upload: done ('.$meta->getSize().')'); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
@@ -114,9 +114,9 @@ discard block |
||
| 114 | 114 | public function simulate(Target $target, Result $result) |
| 115 | 115 | { |
| 116 | 116 | $result->debug( |
| 117 | - 'sync backup to dropbox' . PHP_EOL |
|
| 118 | - . ' token: ********' . PHP_EOL |
|
| 119 | - . ' location: ' . $this->path . PHP_EOL |
|
| 117 | + 'sync backup to dropbox'.PHP_EOL |
|
| 118 | + . ' token: ********'.PHP_EOL |
|
| 119 | + . ' location: '.$this->path.PHP_EOL |
|
| 120 | 120 | ); |
| 121 | 121 | |
| 122 | 122 | $this->simulateRemoteCleanup($target, $result); |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | */ |
| 47 | 47 | protected function isFilenameMatch(string $filename): bool |
| 48 | 48 | { |
| 49 | - return preg_match('#'.$this->fileRegex . '#i', $filename); |
|
| 49 | + return preg_match('#'.$this->fileRegex.'#i', $filename); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | |
| 62 | 62 | foreach ($result['Contents'] as $object) { |
| 63 | 63 | // skip currently created backup |
| 64 | - if ($object['Key'] == $this->path . $this->target->getFilename()) { |
|
| 64 | + if ($object['Key'] == $this->path.$this->target->getFilename()) { |
|
| 65 | 65 | continue; |
| 66 | 66 | } |
| 67 | 67 | if ($this->isFilenameMatch(basename($object['Key']))) { |
