@@ -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); |
@@ -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 . ']'; |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | protected function getHeaderHtml() |
376 | 376 | { |
377 | 377 | return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
378 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
378 | + '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
379 | 379 | } |
380 | 380 | |
381 | 381 | /** |
@@ -414,11 +414,11 @@ discard block |
||
414 | 414 | Str::appendPluralS('cleanup', $this->numCleanups) |
415 | 415 | ); |
416 | 416 | $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) . '>' . |
417 | - '<tr><td>' . |
|
418 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
419 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
420 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
421 | - '</td></tr>' . |
|
417 | + '<tr><td>' . |
|
418 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
419 | + '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
420 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
421 | + '</td></tr>' . |
|
422 | 422 | '</table>'; |
423 | 423 | |
424 | 424 | return $html; |
@@ -480,65 +480,65 @@ discard block |
||
480 | 480 | $status = 'FAILURE'; |
481 | 481 | } |
482 | 482 | $html .= '<tr>' . |
483 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
484 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
485 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
486 | - '</td>' . |
|
487 | - '</tr>' . |
|
488 | - '<tr>' . |
|
489 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
490 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
491 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
492 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
493 | - '</tr>'; |
|
483 | + '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
484 | + sprintf('backup <em>%s</em>', $backup->getName()) . |
|
485 | + ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
486 | + '</td>' . |
|
487 | + '</tr>' . |
|
488 | + '<tr>' . |
|
489 | + '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
490 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
491 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
492 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
493 | + '</tr>'; |
|
494 | 494 | |
495 | 495 | $html .= '<tr>' . |
496 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
497 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
496 | + '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
497 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
498 | 498 | $backup->checkCount() . ' |
499 | 499 | </td>' . |
500 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
500 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
501 | 501 | |
502 | 502 | </td>' . |
503 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
503 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
504 | 504 | $backup->checkCountFailed() . |
505 | - '</td>' . |
|
506 | - '</tr>' . |
|
507 | - '<tr>' . |
|
508 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
509 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
505 | + '</td>' . |
|
506 | + '</tr>' . |
|
507 | + '<tr>' . |
|
508 | + '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
509 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
510 | 510 | $backup->cryptCount() . |
511 | - '</td>' . |
|
512 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
511 | + '</td>' . |
|
512 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
513 | 513 | $backup->cryptCountSkipped() . |
514 | - '</td>' . |
|
515 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
514 | + '</td>' . |
|
515 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
516 | 516 | $backup->cryptCountFailed() . |
517 | - '</td>' . |
|
518 | - '</tr>' . |
|
519 | - '<tr>' . |
|
520 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
521 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
517 | + '</td>' . |
|
518 | + '</tr>' . |
|
519 | + '<tr>' . |
|
520 | + '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
521 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
522 | 522 | $backup->syncCount() . '</td>' . |
523 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
523 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
524 | 524 | $backup->syncCountSkipped() . |
525 | - '</td>' . |
|
526 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
525 | + '</td>' . |
|
526 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
527 | 527 | $backup->syncCountFailed() . |
528 | - '</td>' . |
|
529 | - '</tr>' . |
|
530 | - '<tr>' . |
|
531 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
532 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
528 | + '</td>' . |
|
529 | + '</tr>' . |
|
530 | + '<tr>' . |
|
531 | + '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
532 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
533 | 533 | $backup->cleanupCount() . |
534 | - '</td>' . |
|
535 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
534 | + '</td>' . |
|
535 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
536 | 536 | $backup->cleanupCountSkipped() . |
537 | - '</td>' . |
|
538 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
537 | + '</td>' . |
|
538 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
539 | 539 | $backup->cleanupCountFailed() . |
540 | - '</td>' . |
|
541 | - '</tr>'; |
|
540 | + '</td>' . |
|
541 | + '</tr>'; |
|
542 | 542 | } |
543 | 543 | $html .= '</table>'; |
544 | 544 | } |
@@ -554,6 +554,6 @@ discard block |
||
554 | 554 | protected function getFooterHtml() |
555 | 555 | { |
556 | 556 | return '<p ' . TPL::getSnippet('sStats') . '>' . Statistics::resourceUsage() . '</p>' . |
557 | - '</td></tr></table>'; |
|
557 | + '</td></tr></table>'; |
|
558 | 558 | } |
559 | 559 | } |
@@ -123,10 +123,10 @@ |
||
123 | 123 | { |
124 | 124 | $executable = new Executable\Elasticdump($this->pathToElasticdump); |
125 | 125 | $executable->useHost($this->host) |
126 | - ->credentials($this->user, $this->password) |
|
127 | - ->dumpIndex($this->index) |
|
128 | - ->dumpType($this->type) |
|
129 | - ->dumpTo($target->getPathnamePlain()); |
|
126 | + ->credentials($this->user, $this->password) |
|
127 | + ->dumpIndex($this->index) |
|
128 | + ->dumpType($this->type) |
|
129 | + ->dumpTo($target->getPathnamePlain()); |
|
130 | 130 | return $executable; |
131 | 131 | } |
132 | 132 |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | 'mongodump' => [], |
44 | 44 | 'mysqldump' => [ |
45 | 45 | '/usr/local/mysql/bin', // Mac OS X |
46 | - '/usr/mysql/bin', // Linux |
|
46 | + '/usr/mysql/bin', // Linux |
|
47 | 47 | ], |
48 | 48 | 'tar' => [], |
49 | 49 | ]; |
@@ -82,20 +82,20 @@ discard block |
||
82 | 82 | public static function detectCmdLocation(string $cmd, string $path = '', array $optionalLocations = []) : string |
83 | 83 | { |
84 | 84 | $detectionSteps = [ |
85 | - function ($cmd) use ($path) { |
|
85 | + function($cmd) use ($path) { |
|
86 | 86 | if (!empty($path)) { |
87 | 87 | return self::detectCmdLocationInPath($cmd, $path); |
88 | 88 | } |
89 | 89 | return ''; |
90 | 90 | }, |
91 | - function ($cmd) { |
|
91 | + function($cmd) { |
|
92 | 92 | return self::detectCmdLocationWithWhich($cmd); |
93 | 93 | }, |
94 | - function ($cmd) { |
|
94 | + function($cmd) { |
|
95 | 95 | $paths = explode(PATH_SEPARATOR, self::getEnvPath()); |
96 | 96 | return self::detectCmdLocationInPaths($cmd, $paths); |
97 | 97 | }, |
98 | - function ($cmd) use ($optionalLocations) { |
|
98 | + function($cmd) use ($optionalLocations) { |
|
99 | 99 | return self::detectCmdLocationInPaths($cmd, $optionalLocations); |
100 | 100 | } |
101 | 101 | ]; |
@@ -27,7 +27,7 @@ |
||
27 | 27 | $time = $time === null ? time() : $time; |
28 | 28 | return preg_replace_callback( |
29 | 29 | '#%([a-zA-Z])#', |
30 | - function ($match) use ($time) { |
|
30 | + function($match) use ($time) { |
|
31 | 31 | return date($match[1], $time); |
32 | 32 | }, |
33 | 33 | $string |