@@ -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 | } |
@@ -126,10 +126,10 @@ |
||
| 126 | 126 | $this->executable->useSSLCert($this->certFile); |
| 127 | 127 | } else { |
| 128 | 128 | $this->executable->usePassword($this->password) |
| 129 | - ->encodeBase64(true); |
|
| 129 | + ->encodeBase64(true); |
|
| 130 | 130 | } |
| 131 | 131 | $this->executable->useAlgorithm($this->algorithm) |
| 132 | - ->deleteUncrypted(!$this->keepUncrypted); |
|
| 132 | + ->deleteUncrypted(!$this->keepUncrypted); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | return $this->executable; |
@@ -136,12 +136,12 @@ |
||
| 136 | 136 | if (null == $this->executable) { |
| 137 | 137 | $this->executable = new Executable\Mcrypt($this->pathToMcrypt); |
| 138 | 138 | $this->executable->useAlgorithm($this->algorithm) |
| 139 | - ->useKey($this->key) |
|
| 140 | - ->useKeyFile($this->keyFile) |
|
| 141 | - ->useConfig($this->config) |
|
| 142 | - ->useHash($this->hash) |
|
| 143 | - ->saveAt($target->getPathname()) |
|
| 144 | - ->deleteUncrypted(!$this->keepUncrypted); |
|
| 139 | + ->useKey($this->key) |
|
| 140 | + ->useKeyFile($this->keyFile) |
|
| 141 | + ->useConfig($this->config) |
|
| 142 | + ->useHash($this->hash) |
|
| 143 | + ->saveAt($target->getPathname()) |
|
| 144 | + ->deleteUncrypted(!$this->keepUncrypted); |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | return $this->executable; |
@@ -142,11 +142,11 @@ |
||
| 142 | 142 | if (null == $this->executable) { |
| 143 | 143 | $this->executable = new Executable\Innobackupex($this->pathToXtraBackup); |
| 144 | 144 | $this->executable->useHost($this->host) |
| 145 | - ->credentials($this->user, $this->password) |
|
| 146 | - ->dumpDatabases($this->databases) |
|
| 147 | - ->including($this->include) |
|
| 148 | - ->dumpFrom($this->dataDir) |
|
| 149 | - ->dumpTo($this->getDumpDir($target)); |
|
| 145 | + ->credentials($this->user, $this->password) |
|
| 146 | + ->dumpDatabases($this->databases) |
|
| 147 | + ->including($this->include) |
|
| 148 | + ->dumpFrom($this->dataDir) |
|
| 149 | + ->dumpTo($this->getDumpDir($target)); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | return $this->executable; |
@@ -160,13 +160,13 @@ |
||
| 160 | 160 | if (null == $this->executable) { |
| 161 | 161 | $this->executable = new Executable\Arangodump($this->pathToArangodump); |
| 162 | 162 | $this->executable->useEndpoint($this->endpoint) |
| 163 | - ->credentials($this->username, $this->password) |
|
| 164 | - ->dumpDatabase($this->database) |
|
| 165 | - ->dumpCollections($this->collections) |
|
| 166 | - ->disableAuthentication($this->disableAuthentication) |
|
| 167 | - ->includeSystemCollections($this->includeSystemCollections) |
|
| 168 | - ->dumpData($this->dumpData) |
|
| 169 | - ->dumpTo($this->getDumpDir($target)); |
|
| 163 | + ->credentials($this->username, $this->password) |
|
| 164 | + ->dumpDatabase($this->database) |
|
| 165 | + ->dumpCollections($this->collections) |
|
| 166 | + ->disableAuthentication($this->disableAuthentication) |
|
| 167 | + ->includeSystemCollections($this->includeSystemCollections) |
|
| 168 | + ->dumpData($this->dumpData) |
|
| 169 | + ->dumpTo($this->getDumpDir($target)); |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | return $this->executable; |
@@ -130,10 +130,10 @@ |
||
| 130 | 130 | if (null == $this->executable) { |
| 131 | 131 | $this->executable = new Executable\Elasticdump($this->pathToElasticdump); |
| 132 | 132 | $this->executable->useHost($this->host) |
| 133 | - ->credentials($this->user, $this->password) |
|
| 134 | - ->dumpIndex($this->index) |
|
| 135 | - ->dumpType($this->type) |
|
| 136 | - ->dumpTo($target->getPathnamePlain()); |
|
| 133 | + ->credentials($this->user, $this->password) |
|
| 134 | + ->dumpIndex($this->index) |
|
| 135 | + ->dumpType($this->type) |
|
| 136 | + ->dumpTo($target->getPathnamePlain()); |
|
| 137 | 137 | } |
| 138 | 138 | return $this->executable; |
| 139 | 139 | } |
@@ -178,13 +178,13 @@ |
||
| 178 | 178 | if (null == $this->executable) { |
| 179 | 179 | $this->executable = new Executable\Mongodump($this->pathToMongodump); |
| 180 | 180 | $this->executable->dumpToDirectory($this->getDumpDir($target)) |
| 181 | - ->useIpv6($this->useIPv6) |
|
| 182 | - ->useHost($this->host) |
|
| 183 | - ->credentials($this->user, $this->password, $this->authenticationDatabase) |
|
| 184 | - ->dumpDatabases($this->databases) |
|
| 185 | - ->dumpCollections($this->collections) |
|
| 186 | - ->excludeCollections($this->excludeCollections) |
|
| 187 | - ->excludeCollectionsWithPrefix($this->excludeCollectionsWithPrefix); |
|
| 181 | + ->useIpv6($this->useIPv6) |
|
| 182 | + ->useHost($this->host) |
|
| 183 | + ->credentials($this->user, $this->password, $this->authenticationDatabase) |
|
| 184 | + ->dumpDatabases($this->databases) |
|
| 185 | + ->dumpCollections($this->collections) |
|
| 186 | + ->excludeCollections($this->excludeCollections) |
|
| 187 | + ->excludeCollectionsWithPrefix($this->excludeCollectionsWithPrefix); |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | return $this->executable; |
@@ -127,9 +127,9 @@ |
||
| 127 | 127 | if (null == $this->executable) { |
| 128 | 128 | $this->executable = new Executable\RedisCli($this->pathToRedisCli); |
| 129 | 129 | $this->executable->backup() |
| 130 | - ->useHost($this->host) |
|
| 131 | - ->usePort($this->port) |
|
| 132 | - ->usePassword($this->password); |
|
| 130 | + ->useHost($this->host) |
|
| 131 | + ->usePort($this->port) |
|
| 132 | + ->usePassword($this->password); |
|
| 133 | 133 | } |
| 134 | 134 | return $this->executable; |
| 135 | 135 | } |