@@ -116,9 +116,9 @@ |
||
| 116 | 116 | try { |
| 117 | 117 | /** @var \ObjectStorage_Container $container */ |
| 118 | 118 | $container = $objectStorage->with($this->container . $targetPath) |
| 119 | - ->setLocalFile($sourcePath) |
|
| 120 | - ->setMeta('description', 'PHPBU Backup: ' . date('r', time())) |
|
| 121 | - ->setHeader('Content-Type', $target->getMimeType()); |
|
| 119 | + ->setLocalFile($sourcePath) |
|
| 120 | + ->setMeta('description', 'PHPBU Backup: ' . date('r', time())) |
|
| 121 | + ->setHeader('Content-Type', $target->getMimeType()); |
|
| 122 | 122 | $container->create(); |
| 123 | 123 | } catch (\Exception $e) { |
| 124 | 124 | throw new Exception($e->getMessage(), null, $e); |
@@ -177,12 +177,12 @@ discard block |
||
| 177 | 177 | $info = $this->getInfoHtml($result); |
| 178 | 178 | $footer = $this->getFooterHtml(); |
| 179 | 179 | $body = '<html><body '. TPL::getSnippet('sBody') . '>' |
| 180 | - . $header |
|
| 181 | - . $status |
|
| 182 | - . $errors |
|
| 183 | - . $info |
|
| 184 | - . $footer |
|
| 185 | - . '</body></html>'; |
|
| 180 | + . $header |
|
| 181 | + . $status |
|
| 182 | + . $errors |
|
| 183 | + . $info |
|
| 184 | + . $footer |
|
| 185 | + . '</body></html>'; |
|
| 186 | 186 | $sent = null; |
| 187 | 187 | |
| 188 | 188 | try { |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | |
| 314 | 314 | if ($username && $password) { |
| 315 | 315 | $transport->setUsername($username) |
| 316 | - ->setPassword($password); |
|
| 316 | + ->setPassword($password); |
|
| 317 | 317 | } |
| 318 | 318 | if ($encryption) { |
| 319 | 319 | $transport->setEncryption($encryption); |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | protected function getHeaderHtml() |
| 351 | 351 | { |
| 352 | 352 | return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
| 353 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 353 | + '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | /** |
@@ -388,11 +388,11 @@ discard block |
||
| 388 | 388 | Str::appendPluralS('cleanup', $this->numCleanups) |
| 389 | 389 | ); |
| 390 | 390 | $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' . |
| 391 | - '<tr><td>' . |
|
| 392 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 393 | - '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 394 | - '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 395 | - '</td></tr>' . |
|
| 391 | + '<tr><td>' . |
|
| 392 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' . |
|
| 393 | + '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' . |
|
| 394 | + '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' . |
|
| 395 | + '</td></tr>' . |
|
| 396 | 396 | '</table>'; |
| 397 | 397 | |
| 398 | 398 | return $html; |
@@ -453,65 +453,65 @@ discard block |
||
| 453 | 453 | $status = 'FAILURE'; |
| 454 | 454 | } |
| 455 | 455 | $html .= '<tr>' . |
| 456 | - '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 457 | - sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 458 | - ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
| 459 | - '</td>' . |
|
| 460 | - '</tr>' . |
|
| 461 | - '<tr>' . |
|
| 462 | - '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 463 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 464 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 465 | - '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 466 | - '</tr>'; |
|
| 456 | + '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' . |
|
| 457 | + sprintf('backup <em>%s</em>', $backup->getName()) . |
|
| 458 | + ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'. |
|
| 459 | + '</td>' . |
|
| 460 | + '</tr>' . |
|
| 461 | + '<tr>' . |
|
| 462 | + '<td ' . TPL::getSnippet('sRowHead') . '> </td>' . |
|
| 463 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' . |
|
| 464 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' . |
|
| 465 | + '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' . |
|
| 466 | + '</tr>'; |
|
| 467 | 467 | |
| 468 | 468 | $html .= '<tr>' . |
| 469 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 470 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 469 | + '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
| 470 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 471 | 471 | $backup->checkCount() . ' |
| 472 | 472 | </td>' . |
| 473 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 473 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right"> |
|
| 474 | 474 | |
| 475 | 475 | </td>' . |
| 476 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 476 | + '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
| 477 | 477 | $backup->checkCountFailed() . |
| 478 | - '</td>' . |
|
| 479 | - '</tr>' . |
|
| 480 | - '<tr>' . |
|
| 481 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 482 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 478 | + '</td>' . |
|
| 479 | + '</tr>' . |
|
| 480 | + '<tr>' . |
|
| 481 | + '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
| 482 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 483 | 483 | $backup->cryptCount() . |
| 484 | - '</td>' . |
|
| 485 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 484 | + '</td>' . |
|
| 485 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 486 | 486 | $backup->cryptCountSkipped() . |
| 487 | - '</td>' . |
|
| 488 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 487 | + '</td>' . |
|
| 488 | + '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
| 489 | 489 | $backup->cryptCountFailed() . |
| 490 | - '</td>' . |
|
| 491 | - '</tr>' . |
|
| 492 | - '<tr>' . |
|
| 493 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 494 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 490 | + '</td>' . |
|
| 491 | + '</tr>' . |
|
| 492 | + '<tr>' . |
|
| 493 | + '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
| 494 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 495 | 495 | $backup->syncCount() . '</td>' . |
| 496 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 496 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 497 | 497 | $backup->syncCountSkipped() . |
| 498 | - '</td>' . |
|
| 499 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 498 | + '</td>' . |
|
| 499 | + '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
| 500 | 500 | $backup->syncCountFailed() . |
| 501 | - '</td>' . |
|
| 502 | - '</tr>' . |
|
| 503 | - '<tr>' . |
|
| 504 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 505 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 501 | + '</td>' . |
|
| 502 | + '</tr>' . |
|
| 503 | + '<tr>' . |
|
| 504 | + '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
| 505 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 506 | 506 | $backup->cleanupCount() . |
| 507 | - '</td>' . |
|
| 508 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 507 | + '</td>' . |
|
| 508 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 509 | 509 | $backup->cleanupCountSkipped() . |
| 510 | - '</td>' . |
|
| 511 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 510 | + '</td>' . |
|
| 511 | + '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
| 512 | 512 | $backup->cleanupCountFailed() . |
| 513 | - '</td>' . |
|
| 514 | - '</tr>'; |
|
| 513 | + '</td>' . |
|
| 514 | + '</tr>'; |
|
| 515 | 515 | |
| 516 | 516 | } |
| 517 | 517 | $html .= '</table>'; |
@@ -527,6 +527,6 @@ discard block |
||
| 527 | 527 | protected function getFooterHtml() |
| 528 | 528 | { |
| 529 | 529 | return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
| 530 | - '</td></tr></table>'; |
|
| 530 | + '</td></tr></table>'; |
|
| 531 | 531 | } |
| 532 | 532 | } |
@@ -112,7 +112,7 @@ |
||
| 112 | 112 | { |
| 113 | 113 | // remove leading slash |
| 114 | 114 | return (substr($this->path, 0, 1) == '/' ? substr($this->path, 1) : $this->path) |
| 115 | - . (substr($this->path, -1, 1) == '/' ? '' : '/') |
|
| 116 | - . $target->getFilename(); |
|
| 115 | + . (substr($this->path, -1, 1) == '/' ? '' : '/') |
|
| 116 | + . $target->getFilename(); |
|
| 117 | 117 | } |
| 118 | 118 | } |
@@ -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:380px; ' . |
| 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;"', |
@@ -105,10 +105,10 @@ |
||
| 105 | 105 | $executable->useSSLCert($this->certFile); |
| 106 | 106 | } else { |
| 107 | 107 | $executable->usePassword($this->password) |
| 108 | - ->encodeBase64(true); |
|
| 108 | + ->encodeBase64(true); |
|
| 109 | 109 | } |
| 110 | 110 | $executable->useAlgorithm($this->algorithm) |
| 111 | - ->deleteUncrypted(!$this->keepUncrypted); |
|
| 111 | + ->deleteUncrypted(!$this->keepUncrypted); |
|
| 112 | 112 | return $executable; |
| 113 | 113 | } |
| 114 | 114 | } |
@@ -115,12 +115,12 @@ |
||
| 115 | 115 | { |
| 116 | 116 | $executable = new Executable\Mcrypt((string)$this->pathToMcrypt); |
| 117 | 117 | $executable->useAlgorithm($this->algorithm) |
| 118 | - ->useKey($this->key) |
|
| 119 | - ->useKeyFile($this->keyFile) |
|
| 120 | - ->useConfig($this->config) |
|
| 121 | - ->useHash($this->hash) |
|
| 122 | - ->saveAt($target->getPathname()) |
|
| 123 | - ->deleteUncrypted(!$this->keepUncrypted); |
|
| 118 | + ->useKey($this->key) |
|
| 119 | + ->useKeyFile($this->keyFile) |
|
| 120 | + ->useConfig($this->config) |
|
| 121 | + ->useHash($this->hash) |
|
| 122 | + ->saveAt($target->getPathname()) |
|
| 123 | + ->deleteUncrypted(!$this->keepUncrypted); |
|
| 124 | 124 | return $executable; |
| 125 | 125 | } |
| 126 | 126 | } |
@@ -176,13 +176,13 @@ |
||
| 176 | 176 | { |
| 177 | 177 | $executable = new Executable\Mongodump($this->pathToMongodump); |
| 178 | 178 | $executable->dumpToDirectory($this->getDumpDir($target)) |
| 179 | - ->useIpv6($this->useIPv6) |
|
| 180 | - ->useHost($this->host) |
|
| 181 | - ->credentials($this->user, $this->password, $this->authenticationDatabase) |
|
| 182 | - ->dumpDatabases($this->databases) |
|
| 183 | - ->dumpCollections($this->collections) |
|
| 184 | - ->excludeCollections($this->excludeCollections) |
|
| 185 | - ->excludeCollectionsWithPrefix($this->excludeCollectionsWithPrefix); |
|
| 179 | + ->useIpv6($this->useIPv6) |
|
| 180 | + ->useHost($this->host) |
|
| 181 | + ->credentials($this->user, $this->password, $this->authenticationDatabase) |
|
| 182 | + ->dumpDatabases($this->databases) |
|
| 183 | + ->dumpCollections($this->collections) |
|
| 184 | + ->excludeCollections($this->excludeCollections) |
|
| 185 | + ->excludeCollectionsWithPrefix($this->excludeCollectionsWithPrefix); |
|
| 186 | 186 | return $executable; |
| 187 | 187 | } |
| 188 | 188 | |
@@ -126,10 +126,10 @@ |
||
| 126 | 126 | { |
| 127 | 127 | $executable = new Executable\Elasticdump($this->pathToElasticdump); |
| 128 | 128 | $executable->useHost($this->host) |
| 129 | - ->credentials($this->user, $this->password) |
|
| 130 | - ->dumpIndex($this->index) |
|
| 131 | - ->dumpType($this->type) |
|
| 132 | - ->dumpTo($target->getPathnamePlain()); |
|
| 129 | + ->credentials($this->user, $this->password) |
|
| 130 | + ->dumpIndex($this->index) |
|
| 131 | + ->dumpType($this->type) |
|
| 132 | + ->dumpTo($target->getPathnamePlain()); |
|
| 133 | 133 | return $executable; |
| 134 | 134 | } |
| 135 | 135 | |
@@ -74,11 +74,11 @@ |
||
| 74 | 74 | ); |
| 75 | 75 | } else { |
| 76 | 76 | $executable->fromHost($this->host) |
| 77 | - ->fromUser($this->user) |
|
| 78 | - ->fromPath($this->path) |
|
| 79 | - ->toPath($this->getRsyncLocation($target, true)) |
|
| 80 | - ->removeDeleted($this->delete) |
|
| 81 | - ->exclude($this->excludes); |
|
| 77 | + ->fromUser($this->user) |
|
| 78 | + ->fromPath($this->path) |
|
| 79 | + ->toPath($this->getRsyncLocation($target, true)) |
|
| 80 | + ->removeDeleted($this->delete) |
|
| 81 | + ->exclude($this->excludes); |
|
| 82 | 82 | } |
| 83 | 83 | return $executable; |
| 84 | 84 | } |