@@ -48,39 +48,39 @@ |
||
48 | 48 | { |
49 | 49 | self::setSnippets([ |
50 | 50 | 'sBody' => 'style="font-family: Arial, Helvetica, sans-serif; ' . |
51 | - 'background-color:#343b43; ' . |
|
52 | - 'font-size: 15px; margin:0; ' . |
|
53 | - 'padding:0;"', |
|
51 | + 'background-color:#343b43; ' . |
|
52 | + 'font-size: 15px; margin:0; ' . |
|
53 | + 'padding:0;"', |
|
54 | 54 | 'sTableHeader' => 'style="width:100%; ' . |
55 | - 'font-family: Arial, Helvetica, sans-serif; ' . |
|
56 | - 'margin:0; color:#e6e6e6;" ' . |
|
57 | - 'align="center" cellpadding="5" cellspacing="0"', |
|
55 | + 'font-family: Arial, Helvetica, sans-serif; ' . |
|
56 | + 'margin:0; color:#e6e6e6;" ' . |
|
57 | + 'align="center" cellpadding="5" cellspacing="0"', |
|
58 | 58 | 'sTableError' => 'style="width:100%; ' . |
59 | - 'background-color:#e6e6e6; ' . |
|
60 | - 'margin:0 auto 15px; ' . |
|
61 | - 'border:1px solid #011516;" ' . |
|
62 | - 'align="center" cellpadding="5" cellspacing="0"', |
|
59 | + 'background-color:#e6e6e6; ' . |
|
60 | + 'margin:0 auto 15px; ' . |
|
61 | + 'border:1px solid #011516;" ' . |
|
62 | + 'align="center" cellpadding="5" cellspacing="0"', |
|
63 | 63 | 'sTableErrorCol' => 'style="border-top: 1px solid #f6f6f6; ' . |
64 | - 'border-bottom: 1px solid #c9c9c9;"', |
|
64 | + 'border-bottom: 1px solid #c9c9c9;"', |
|
65 | 65 | 'sTableContent' => 'style="width:420px; ' . |
66 | - 'font-family: Arial, Helvetica, sans-serif; ' . |
|
67 | - 'margin:0 auto;" ' . |
|
68 | - 'align="center" cellpadding="0" cellspacing="0"', |
|
66 | + 'font-family: Arial, Helvetica, sans-serif; ' . |
|
67 | + 'margin:0 auto;" ' . |
|
68 | + 'align="center" cellpadding="0" cellspacing="0"', |
|
69 | 69 | 'sTableContentCol' => 'style="padding:0 10px;"', |
70 | 70 | 'sTableStatus' => 'style="background-color:#%s; ' . |
71 | - 'width:100%%; ' . |
|
72 | - 'margin:0 auto 15px; ' . |
|
73 | - 'border:1px solid #011516;" ' . |
|
74 | - 'align="center" cellpadding="10" cellspacing="0"', |
|
71 | + 'width:100%%; ' . |
|
72 | + 'margin:0 auto 15px; ' . |
|
73 | + 'border:1px solid #011516;" ' . |
|
74 | + 'align="center" cellpadding="10" cellspacing="0"', |
|
75 | 75 | 'sTableStatusHead' => 'style="margin:0;"', |
76 | 76 | 'sTableStatusText' => 'style="font-size:16px;"', |
77 | 77 | 'sTableBackup' => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; ' . |
78 | - 'background-color:#e6e6e6; ' . |
|
79 | - 'margin:0 0 15px; ' . |
|
80 | - 'border:1px solid #011516;" ' . |
|
81 | - 'align="center" cellpadding="5" cellspacing="0" width="100%"', |
|
78 | + 'background-color:#e6e6e6; ' . |
|
79 | + 'margin:0 0 15px; ' . |
|
80 | + 'border:1px solid #011516;" ' . |
|
81 | + 'align="center" cellpadding="5" cellspacing="0" width="100%"', |
|
82 | 82 | 'sTableBackupStatusColumn' => 'style="background-color:#%s; ' . |
83 | - 'border-bottom:1px solid #747474;"', |
|
83 | + 'border-bottom:1px solid #747474;"', |
|
84 | 84 | 'sTableBackupStatusText' => 'style="float:right;"', |
85 | 85 | 'sRowHead' => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"', |
86 | 86 | 'sRowCheck' => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"', |
@@ -194,14 +194,14 @@ |
||
194 | 194 | |
195 | 195 | $executable = new Executable\Tar($this->pathToTar); |
196 | 196 | $executable->archiveDirectory($this->path) |
197 | - ->useCompression($this->compression) |
|
198 | - ->useCompressProgram($this->compressProgram) |
|
199 | - ->forceLocal($this->forceLocal) |
|
200 | - ->ignoreFailedRead($this->ignoreFailedRead) |
|
201 | - ->removeSourceDirectory($this->removeSourceDir) |
|
202 | - ->throttle($this->throttle) |
|
203 | - ->archiveTo($this->pathToArchive) |
|
204 | - ->dereference($this->dereference); |
|
197 | + ->useCompression($this->compression) |
|
198 | + ->useCompressProgram($this->compressProgram) |
|
199 | + ->forceLocal($this->forceLocal) |
|
200 | + ->ignoreFailedRead($this->ignoreFailedRead) |
|
201 | + ->removeSourceDirectory($this->removeSourceDir) |
|
202 | + ->throttle($this->throttle) |
|
203 | + ->archiveTo($this->pathToArchive) |
|
204 | + ->dereference($this->dereference); |
|
205 | 205 | // add paths to exclude |
206 | 206 | foreach ($this->excludes as $path) { |
207 | 207 | $executable->addExclude($path); |
@@ -194,7 +194,7 @@ |
||
194 | 194 | |
195 | 195 | if ($configLoader->hasValidationErrors()) { |
196 | 196 | echo " Warning - The configuration file did not pass validation!" . \PHP_EOL . |
197 | - " The following problems have been detected:" . \PHP_EOL; |
|
197 | + " The following problems have been detected:" . \PHP_EOL; |
|
198 | 198 | |
199 | 199 | foreach ($configLoader->getValidationErrors() as $line => $errors) { |
200 | 200 | echo \sprintf("\n Line %d:\n", $line); |
@@ -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 |
@@ -79,7 +79,7 @@ |
||
79 | 79 | { |
80 | 80 | if (!class_exists('\\MicrosoftAzure\\Storage\\Blob\\BlobRestProxy')) { |
81 | 81 | throw new Exception('Azure Bob Storage SDK not loaded: use composer to install ' . |
82 | - '"microsoft/azure-storage-blob"'); |
|
82 | + '"microsoft/azure-storage-blob"'); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | // check for mandatory options |
@@ -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 | $state = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR'); |
202 | 202 | |
203 | 203 | $this->mailer->Subject = $this->subject . ' [' . ($this->isSimulation ? 'SIMULATION' : $state) . ']'; |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | protected function getHeaderHtml() |
377 | 377 | { |
378 | 378 | return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
379 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
379 | + '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
380 | 380 | } |
381 | 381 | |
382 | 382 | /** |
@@ -415,11 +415,11 @@ discard block |
||
415 | 415 | Str::appendPluralS('cleanup', $this->numCleanups) |
416 | 416 | ); |
417 | 417 | $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) . '>' . |
418 | - '<tr><td>' . |
|
419 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
420 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
421 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
422 | - '</td></tr>' . |
|
418 | + '<tr><td>' . |
|
419 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
420 | + '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
421 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
422 | + '</td></tr>' . |
|
423 | 423 | '</table>'; |
424 | 424 | |
425 | 425 | return $html; |
@@ -481,65 +481,65 @@ discard block |
||
481 | 481 | $status = 'FAILURE'; |
482 | 482 | } |
483 | 483 | $html .= '<tr>' . |
484 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
485 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
486 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
487 | - '</td>' . |
|
488 | - '</tr>' . |
|
489 | - '<tr>' . |
|
490 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
491 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
492 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
493 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
494 | - '</tr>'; |
|
484 | + '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
485 | + sprintf('backup <em>%s</em>', $backup->getName()) . |
|
486 | + ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status . '</span>' . |
|
487 | + '</td>' . |
|
488 | + '</tr>' . |
|
489 | + '<tr>' . |
|
490 | + '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
491 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
492 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
493 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
494 | + '</tr>'; |
|
495 | 495 | |
496 | 496 | $html .= '<tr>' . |
497 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
498 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
497 | + '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
498 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
499 | 499 | $backup->checkCount() . ' |
500 | 500 | </td>' . |
501 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
501 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
502 | 502 | |
503 | 503 | </td>' . |
504 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
504 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
505 | 505 | $backup->checkCountFailed() . |
506 | - '</td>' . |
|
507 | - '</tr>' . |
|
508 | - '<tr>' . |
|
509 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
510 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
506 | + '</td>' . |
|
507 | + '</tr>' . |
|
508 | + '<tr>' . |
|
509 | + '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
510 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
511 | 511 | $backup->cryptCount() . |
512 | - '</td>' . |
|
513 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
512 | + '</td>' . |
|
513 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
514 | 514 | $backup->cryptCountSkipped() . |
515 | - '</td>' . |
|
516 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
515 | + '</td>' . |
|
516 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
517 | 517 | $backup->cryptCountFailed() . |
518 | - '</td>' . |
|
519 | - '</tr>' . |
|
520 | - '<tr>' . |
|
521 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
522 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
518 | + '</td>' . |
|
519 | + '</tr>' . |
|
520 | + '<tr>' . |
|
521 | + '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
522 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
523 | 523 | $backup->syncCount() . '</td>' . |
524 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
524 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
525 | 525 | $backup->syncCountSkipped() . |
526 | - '</td>' . |
|
527 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
526 | + '</td>' . |
|
527 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
528 | 528 | $backup->syncCountFailed() . |
529 | - '</td>' . |
|
530 | - '</tr>' . |
|
531 | - '<tr>' . |
|
532 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
533 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
529 | + '</td>' . |
|
530 | + '</tr>' . |
|
531 | + '<tr>' . |
|
532 | + '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
533 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
534 | 534 | $backup->cleanupCount() . |
535 | - '</td>' . |
|
536 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
535 | + '</td>' . |
|
536 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
537 | 537 | $backup->cleanupCountSkipped() . |
538 | - '</td>' . |
|
539 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
538 | + '</td>' . |
|
539 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
540 | 540 | $backup->cleanupCountFailed() . |
541 | - '</td>' . |
|
542 | - '</tr>'; |
|
541 | + '</td>' . |
|
542 | + '</tr>'; |
|
543 | 543 | } |
544 | 544 | $html .= '</table>'; |
545 | 545 | } |
@@ -555,6 +555,6 @@ discard block |
||
555 | 555 | protected function getFooterHtml() |
556 | 556 | { |
557 | 557 | return '<p ' . TPL::getSnippet('sStats') . '>' . Statistics::resourceUsage() . '</p>' . |
558 | - '</td></tr></table>'; |
|
558 | + '</td></tr></table>'; |
|
559 | 559 | } |
560 | 560 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | { |
126 | 126 | $executable = $this->createOpenSSL($target); |
127 | 127 | $executable->encryptFile($target->getPathname()) |
128 | - ->deleteSource(!$this->keepUncrypted); |
|
128 | + ->deleteSource(!$this->keepUncrypted); |
|
129 | 129 | |
130 | 130 | return $executable; |
131 | 131 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | { |
142 | 142 | $executable = $this->createOpenSSL($target); |
143 | 143 | $executable->decryptFile($target->getPathname()) |
144 | - ->deleteSource(false); |
|
144 | + ->deleteSource(false); |
|
145 | 145 | |
146 | 146 | return $executable; |
147 | 147 | } |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | $executable->useSSLCert($this->certFile); |
162 | 162 | } else { |
163 | 163 | $executable->usePassword($this->password) |
164 | - ->encodeBase64(true); |
|
164 | + ->encodeBase64(true); |
|
165 | 165 | } |
166 | 166 | $executable->useAlgorithm($this->algorithm); |
167 | 167 |
@@ -39,7 +39,7 @@ |
||
39 | 39 | "vlucas/phpdotenv", |
40 | 40 | |
41 | 41 | ])) { |
42 | - continue; |
|
42 | + continue; |
|
43 | 43 | } |
44 | 44 | echo $package->name . ': ' . $package->version; |
45 | 45 | if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) { |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | { |
103 | 103 | $executable = $this->createGpg($target); |
104 | 104 | $executable->encryptFile($target->getPathname()) |
105 | - ->deleteSource(!$this->keepUncrypted); |
|
105 | + ->deleteSource(!$this->keepUncrypted); |
|
106 | 106 | |
107 | 107 | return $executable; |
108 | 108 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | { |
118 | 118 | $executable = $this->createGpg($target); |
119 | 119 | $executable->decryptFile($target->getPathname()) |
120 | - ->deleteSource(false); |
|
120 | + ->deleteSource(false); |
|
121 | 121 | |
122 | 122 | return $executable; |
123 | 123 | } |