@@ -83,7 +83,7 @@ |
||
83 | 83 | { |
84 | 84 | |
85 | 85 | // silence ftp errors |
86 | - $old = error_reporting(0); |
|
86 | + $old = error_reporting(0); |
|
87 | 87 | if (!$ftpConnection = ftp_connect($this->host)) { |
88 | 88 | throw new Exception( |
89 | 89 | sprintf( |
@@ -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); |
@@ -105,19 +105,19 @@ discard block |
||
105 | 105 | public function sync(Target $target, Result $result) |
106 | 106 | { |
107 | 107 | $sourcePath = $target->getPathname(); |
108 | - $targetPath = $this->path . $target->getFilename(); |
|
108 | + $targetPath = $this->path.$target->getFilename(); |
|
109 | 109 | |
110 | 110 | $options = array('adapter' => ObjectStorage_Http_Client::SOCKET, 'timeout' => 20); |
111 | 111 | $objectStorage = new ObjectStorage($this->host, $this->user, $this->secret, $options); |
112 | 112 | |
113 | - $result->debug('softlayer source: ' . $sourcePath); |
|
114 | - $result->debug('softlayer target: ' . $targetPath); |
|
113 | + $result->debug('softlayer source: '.$sourcePath); |
|
114 | + $result->debug('softlayer target: '.$targetPath); |
|
115 | 115 | |
116 | 116 | try { |
117 | 117 | /** @var \ObjectStorage_Container $container */ |
118 | - $container = $objectStorage->with($this->container . $targetPath) |
|
118 | + $container = $objectStorage->with($this->container.$targetPath) |
|
119 | 119 | ->setLocalFile($sourcePath) |
120 | - ->setMeta('description', 'PHPBU Backup: ' . date('r', time())) |
|
120 | + ->setMeta('description', 'PHPBU Backup: '.date('r', time())) |
|
121 | 121 | ->setHeader('Content-Type', $target->getMimeType()); |
122 | 122 | $container->create(); |
123 | 123 | } catch (\Exception $e) { |
@@ -136,12 +136,12 @@ discard block |
||
136 | 136 | public function simulate(Target $target, Result $result) |
137 | 137 | { |
138 | 138 | $result->debug( |
139 | - 'sync backup to SoftLayer' . PHP_EOL |
|
140 | - . ' host: ' . $this->host . PHP_EOL |
|
141 | - . ' user: ' . $this->user . PHP_EOL |
|
142 | - . ' secret: ********' . PHP_EOL |
|
143 | - . ' container: ' . $this->container . PHP_EOL |
|
144 | - . ' location: ' . $this->path |
|
139 | + 'sync backup to SoftLayer'.PHP_EOL |
|
140 | + . ' host: '.$this->host.PHP_EOL |
|
141 | + . ' user: '.$this->user.PHP_EOL |
|
142 | + . ' secret: ********'.PHP_EOL |
|
143 | + . ' container: '.$this->container.PHP_EOL |
|
144 | + . ' location: '.$this->path |
|
145 | 145 | ); |
146 | 146 | } |
147 | 147 | } |
@@ -351,7 +351,7 @@ |
||
351 | 351 | -v, --verbose Output more verbose information. |
352 | 352 | -V, --version Output version information and exit. |
353 | 353 | |
354 | -EOT; |
|
354 | +eot; |
|
355 | 355 | if ($this->isPhar) { |
356 | 356 | echo ' --self-update Update phpbu to the latest version.' . PHP_EOL; |
357 | 357 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | $ret = self::EXIT_EXCEPTION; |
109 | 109 | } |
110 | 110 | } catch (\Exception $e) { |
111 | - echo $e->getMessage() . PHP_EOL; |
|
111 | + echo $e->getMessage().PHP_EOL; |
|
112 | 112 | $ret = self::EXIT_EXCEPTION; |
113 | 113 | } |
114 | 114 | |
@@ -211,12 +211,12 @@ discard block |
||
211 | 211 | */ |
212 | 212 | protected function findConfigurationInDir() |
213 | 213 | { |
214 | - $configurationFile = $this->arguments['configuration'] . '/phpbu.xml'; |
|
214 | + $configurationFile = $this->arguments['configuration'].'/phpbu.xml'; |
|
215 | 215 | |
216 | 216 | if (file_exists($configurationFile)) { |
217 | 217 | $this->arguments['configuration'] = realpath($configurationFile); |
218 | - } elseif (file_exists($configurationFile . '.dist')) { |
|
219 | - $this->arguments['configuration'] = realpath($configurationFile . '.dist'); |
|
218 | + } elseif (file_exists($configurationFile.'.dist')) { |
|
219 | + $this->arguments['configuration'] = realpath($configurationFile.'.dist'); |
|
220 | 220 | } |
221 | 221 | } |
222 | 222 | |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | protected function overrideConfigWithArgument(Configuration $configuration, $value) |
277 | 277 | { |
278 | 278 | if (Arr::getValue($this->arguments, $value) === true) { |
279 | - $setter = 'set' . ucfirst($value); |
|
279 | + $setter = 'set'.ucfirst($value); |
|
280 | 280 | $configuration->{$setter}(true); |
281 | 281 | } |
282 | 282 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | |
291 | 291 | $remoteFilename = 'http://phar.phpbu.de/phpbu.phar'; |
292 | 292 | $localFilename = realpath($_SERVER['argv'][0]); |
293 | - $tempFilename = basename($localFilename, '.phar') . '-temp.phar'; |
|
293 | + $tempFilename = basename($localFilename, '.phar').'-temp.phar'; |
|
294 | 294 | |
295 | 295 | echo 'Updating the phpbu PHAR ... '; |
296 | 296 | |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | $phar = file_get_contents($remoteFilename); |
299 | 299 | error_reporting($old); |
300 | 300 | if (!$phar) { |
301 | - echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL; |
|
301 | + echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL; |
|
302 | 302 | exit(self::EXIT_EXCEPTION); |
303 | 303 | } |
304 | 304 | file_put_contents($tempFilename, $phar); |
@@ -314,11 +314,11 @@ discard block |
||
314 | 314 | } catch (Exception $e) { |
315 | 315 | // cleanup crappy phar |
316 | 316 | unlink($tempFilename); |
317 | - echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL; |
|
317 | + echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL; |
|
318 | 318 | exit(self::EXIT_EXCEPTION); |
319 | 319 | } |
320 | 320 | |
321 | - echo 'done' . PHP_EOL; |
|
321 | + echo 'done'.PHP_EOL; |
|
322 | 322 | exit(self::EXIT_SUCCESS); |
323 | 323 | } |
324 | 324 | |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | return; |
332 | 332 | } |
333 | 333 | |
334 | - echo Version::getVersionString() . PHP_EOL; |
|
334 | + echo Version::getVersionString().PHP_EOL; |
|
335 | 335 | $this->isVersionStringPrinted = true; |
336 | 336 | } |
337 | 337 | |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | */ |
341 | 341 | protected function printLogo() |
342 | 342 | { |
343 | - echo self::$logo . PHP_EOL; |
|
343 | + echo self::$logo.PHP_EOL; |
|
344 | 344 | } |
345 | 345 | |
346 | 346 | /** |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | |
365 | 365 | EOT; |
366 | 366 | if ($this->isPhar) { |
367 | - echo ' --self-update Update phpbu to the latest version.' . PHP_EOL; |
|
367 | + echo ' --self-update Update phpbu to the latest version.'.PHP_EOL; |
|
368 | 368 | } |
369 | 369 | } |
370 | 370 | |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | { |
379 | 379 | $help = $hint ? ', use "phpbu -h" for help' : ''; |
380 | 380 | $this->printVersionString(); |
381 | - echo $message . $help . PHP_EOL; |
|
381 | + echo $message.$help.PHP_EOL; |
|
382 | 382 | exit(self::EXIT_EXCEPTION); |
383 | 383 | } |
384 | 384 |
@@ -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 | } |
@@ -148,8 +148,8 @@ discard block |
||
148 | 148 | $mails = $options['recipients']; |
149 | 149 | $server = gethostname(); |
150 | 150 | $this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false); |
151 | - $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server); |
|
152 | - $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server); |
|
151 | + $this->subject = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server); |
|
152 | + $this->senderMail = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server); |
|
153 | 153 | $this->senderName = Arr::getValue($options, 'sender.name'); |
154 | 154 | $this->transportType = Arr::getValue($options, 'transport', 'mail'); |
155 | 155 | $this->recipients = array_map('trim', explode(';', $mails)); |
@@ -176,14 +176,14 @@ discard block |
||
176 | 176 | $errors = $this->getErrorHtml($result); |
177 | 177 | $info = $this->getInfoHtml($result); |
178 | 178 | $footer = $this->getFooterHtml(); |
179 | - $body = '<html><body '. TPL::getSnippet('sBody') . '>' |
|
179 | + $body = '<html><body '.TPL::getSnippet('sBody').'>' |
|
180 | 180 | . $header |
181 | 181 | . $status |
182 | 182 | . $errors |
183 | 183 | . $info |
184 | 184 | . $footer |
185 | 185 | . '</body></html>'; |
186 | - $sent = null; |
|
186 | + $sent = null; |
|
187 | 187 | |
188 | 188 | try { |
189 | 189 | /** @var \Swift_Message $message */ |
@@ -334,10 +334,10 @@ discard block |
||
334 | 334 | throw new Exception('option \'sendmail.path\' ist missing'); |
335 | 335 | } |
336 | 336 | $path = $options['sendmail.path']; |
337 | - $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : ''; |
|
337 | + $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : ''; |
|
338 | 338 | |
339 | 339 | /* @var $transport \Swift_SendmailTransport */ |
340 | - $transport = \Swift_SendmailTransport::newInstance($path . $options); |
|
340 | + $transport = \Swift_SendmailTransport::newInstance($path.$options); |
|
341 | 341 | |
342 | 342 | return $transport; |
343 | 343 | } |
@@ -349,8 +349,8 @@ discard block |
||
349 | 349 | */ |
350 | 350 | protected function getHeaderHtml() |
351 | 351 | { |
352 | - return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' . |
|
353 | - '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>'; |
|
352 | + return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'. |
|
353 | + '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>'; |
|
354 | 354 | } |
355 | 355 | |
356 | 356 | /** |
@@ -387,12 +387,12 @@ discard block |
||
387 | 387 | $this->numCleanups, |
388 | 388 | Str::appendPluralS('cleanup', $this->numCleanups) |
389 | 389 | ); |
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>' . |
|
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>'. |
|
396 | 396 | '</table>'; |
397 | 397 | |
398 | 398 | return $html; |
@@ -409,17 +409,17 @@ discard block |
||
409 | 409 | $html = ''; |
410 | 410 | $errors = $result->getErrors(); |
411 | 411 | if (count($errors)) { |
412 | - $html .= '<table ' . TPL::getSnippet('sTableError') . '>'; |
|
412 | + $html .= '<table '.TPL::getSnippet('sTableError').'>'; |
|
413 | 413 | /* @var $e Exception */ |
414 | 414 | foreach ($errors as $e) { |
415 | - $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' . |
|
415 | + $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'. |
|
416 | 416 | sprintf( |
417 | 417 | "Exception '%s' with message '%s' in %s:%d", |
418 | 418 | get_class($e), |
419 | 419 | $e->getMessage(), |
420 | 420 | $e->getFile(), |
421 | 421 | $e->getLine() |
422 | - ) . |
|
422 | + ). |
|
423 | 423 | '</td></tr>'; |
424 | 424 | |
425 | 425 | } |
@@ -439,78 +439,78 @@ discard block |
||
439 | 439 | $html = ''; |
440 | 440 | $backups = $result->getBackups(); |
441 | 441 | if (count($backups)) { |
442 | - $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>'; |
|
442 | + $html .= '<table '.TPL::getSnippet('sTableBackup').'>'; |
|
443 | 443 | /** @var \phpbu\App\Result\Backup $backup */ |
444 | 444 | foreach ($backups as $backup) { |
445 | 445 | if ($backup->allOk()) { |
446 | 446 | $color = TPL::getSnippet('cStatusOK'); |
447 | 447 | $status = 'OK'; |
448 | - } elseif($backup->okButSkipsOrFails()) { |
|
448 | + } elseif ($backup->okButSkipsOrFails()) { |
|
449 | 449 | $color = TPL::getSnippet('cStatusWARN'); |
450 | 450 | $status = 'WARNING'; |
451 | 451 | } else { |
452 | 452 | $color = TPL::getSnippet('cStatusFAIL'); |
453 | 453 | $status = 'FAILURE'; |
454 | 454 | } |
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>' . |
|
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 | 466 | '</tr>'; |
467 | 467 | |
468 | - $html .= '<tr>' . |
|
469 | - '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' . |
|
470 | - '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' . |
|
471 | - $backup->checkCount() . ' |
|
468 | + $html .= '<tr>'. |
|
469 | + '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'. |
|
470 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
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">' . |
|
477 | - $backup->checkCountFailed() . |
|
478 | - '</td>' . |
|
479 | - '</tr>' . |
|
480 | - '<tr>' . |
|
481 | - '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' . |
|
482 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
483 | - $backup->cryptCount() . |
|
484 | - '</td>' . |
|
485 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
486 | - $backup->cryptCountSkipped() . |
|
487 | - '</td>' . |
|
488 | - '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' . |
|
489 | - $backup->cryptCountFailed() . |
|
490 | - '</td>' . |
|
491 | - '</tr>' . |
|
492 | - '<tr>' . |
|
493 | - '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' . |
|
494 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
495 | - $backup->syncCount() . '</td>' . |
|
496 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
497 | - $backup->syncCountSkipped() . |
|
498 | - '</td>' . |
|
499 | - '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' . |
|
500 | - $backup->syncCountFailed() . |
|
501 | - '</td>' . |
|
502 | - '</tr>' . |
|
503 | - '<tr>' . |
|
504 | - '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' . |
|
505 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
506 | - $backup->cleanupCount() . |
|
507 | - '</td>' . |
|
508 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
509 | - $backup->cleanupCountSkipped() . |
|
510 | - '</td>' . |
|
511 | - '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' . |
|
512 | - $backup->cleanupCountFailed() . |
|
513 | - '</td>' . |
|
476 | + '<td '.TPL::getSnippet('sRowCheck').' align="right">'. |
|
477 | + $backup->checkCountFailed(). |
|
478 | + '</td>'. |
|
479 | + '</tr>'. |
|
480 | + '<tr>'. |
|
481 | + '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'. |
|
482 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
483 | + $backup->cryptCount(). |
|
484 | + '</td>'. |
|
485 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
486 | + $backup->cryptCountSkipped(). |
|
487 | + '</td>'. |
|
488 | + '<td '.TPL::getSnippet('sRowCrypt').' align="right">'. |
|
489 | + $backup->cryptCountFailed(). |
|
490 | + '</td>'. |
|
491 | + '</tr>'. |
|
492 | + '<tr>'. |
|
493 | + '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'. |
|
494 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
495 | + $backup->syncCount().'</td>'. |
|
496 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
497 | + $backup->syncCountSkipped(). |
|
498 | + '</td>'. |
|
499 | + '<td '.TPL::getSnippet('sRowSync').' align="right">'. |
|
500 | + $backup->syncCountFailed(). |
|
501 | + '</td>'. |
|
502 | + '</tr>'. |
|
503 | + '<tr>'. |
|
504 | + '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'. |
|
505 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
506 | + $backup->cleanupCount(). |
|
507 | + '</td>'. |
|
508 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
509 | + $backup->cleanupCountSkipped(). |
|
510 | + '</td>'. |
|
511 | + '<td '.TPL::getSnippet('sRowCleanup').' align="right">'. |
|
512 | + $backup->cleanupCountFailed(). |
|
513 | + '</td>'. |
|
514 | 514 | '</tr>'; |
515 | 515 | |
516 | 516 | } |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | */ |
527 | 527 | protected function getFooterHtml() |
528 | 528 | { |
529 | - return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' . |
|
529 | + return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'. |
|
530 | 530 | '</td></tr></table>'; |
531 | 531 | } |
532 | 532 | } |
@@ -48,39 +48,39 @@ |
||
48 | 48 | { |
49 | 49 | self::setSnippets(array( |
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;"', |
@@ -47,39 +47,39 @@ |
||
47 | 47 | public static function setDefaultSnippets() |
48 | 48 | { |
49 | 49 | self::setSnippets(array( |
50 | - 'sBody' => 'style="font-family: Arial, Helvetica, sans-serif; ' . |
|
51 | - 'background-color:#343b43; ' . |
|
52 | - 'font-size: 15px; margin:0; ' . |
|
50 | + 'sBody' => 'style="font-family: Arial, Helvetica, sans-serif; '. |
|
51 | + 'background-color:#343b43; '. |
|
52 | + 'font-size: 15px; margin:0; '. |
|
53 | 53 | 'padding:0;"', |
54 | - 'sTableHeader' => 'style="width:100%; ' . |
|
55 | - 'font-family: Arial, Helvetica, sans-serif; ' . |
|
56 | - 'margin:0; color:#e6e6e6;" ' . |
|
54 | + 'sTableHeader' => 'style="width:100%; '. |
|
55 | + 'font-family: Arial, Helvetica, sans-serif; '. |
|
56 | + 'margin:0; color:#e6e6e6;" '. |
|
57 | 57 | 'align="center" cellpadding="5" cellspacing="0"', |
58 | - 'sTableError' => 'style="width:100%; ' . |
|
59 | - 'background-color:#e6e6e6; ' . |
|
60 | - 'margin:0 auto 15px; ' . |
|
61 | - 'border:1px solid #011516;" ' . |
|
58 | + 'sTableError' => 'style="width:100%; '. |
|
59 | + 'background-color:#e6e6e6; '. |
|
60 | + 'margin:0 auto 15px; '. |
|
61 | + 'border:1px solid #011516;" '. |
|
62 | 62 | 'align="center" cellpadding="5" cellspacing="0"', |
63 | - 'sTableErrorCol' => 'style="border-top: 1px solid #f6f6f6; ' . |
|
63 | + 'sTableErrorCol' => 'style="border-top: 1px solid #f6f6f6; '. |
|
64 | 64 | 'border-bottom: 1px solid #c9c9c9;"', |
65 | - 'sTableContent' => 'style="width:380px; ' . |
|
66 | - 'font-family: Arial, Helvetica, sans-serif; ' . |
|
67 | - 'margin:0 auto;" ' . |
|
65 | + 'sTableContent' => 'style="width:380px; '. |
|
66 | + 'font-family: Arial, Helvetica, sans-serif; '. |
|
67 | + 'margin:0 auto;" '. |
|
68 | 68 | 'align="center" cellpadding="0" cellspacing="0"', |
69 | 69 | 'sTableContentCol' => 'style="padding:0 10px;"', |
70 | - 'sTableStatus' => 'style="background-color:#%s; ' . |
|
71 | - 'width:100%%; ' . |
|
72 | - 'margin:0 auto 15px; ' . |
|
73 | - 'border:1px solid #011516;" ' . |
|
70 | + 'sTableStatus' => 'style="background-color:#%s; '. |
|
71 | + 'width:100%%; '. |
|
72 | + 'margin:0 auto 15px; '. |
|
73 | + 'border:1px solid #011516;" '. |
|
74 | 74 | 'align="center" cellpadding="10" cellspacing="0"', |
75 | 75 | 'sTableStatusHead' => 'style="margin:0;"', |
76 | 76 | 'sTableStatusText' => 'style="font-size:16px;"', |
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;" ' . |
|
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 | 81 | 'align="center" cellpadding="5" cellspacing="0" width="100%"', |
82 | - 'sTableBackupStatusColumn' => 'style="background-color:#%s; ' . |
|
82 | + 'sTableBackupStatusColumn' => 'style="background-color:#%s; '. |
|
83 | 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;"', |
@@ -78,7 +78,7 @@ |
||
78 | 78 | */ |
79 | 79 | public function runCommand($command) |
80 | 80 | { |
81 | - if(!isset($this->availableCommands[$command])) { |
|
81 | + if (!isset($this->availableCommands[$command])) { |
|
82 | 82 | throw new Exception('Unknown redis-cli command'); |
83 | 83 | } |
84 | 84 | $this->command = $command; |
@@ -83,7 +83,7 @@ |
||
83 | 83 | throw new Exception('no command to execute'); |
84 | 84 | } |
85 | 85 | $cmd = ($amount > 1 ? '(' . implode(' && ', $this->commands) . ')' : $this->commands[0]) |
86 | - . (!empty($this->redirectOutput) ? ' > ' . $this->redirectOutput : ''); |
|
86 | + . (!empty($this->redirectOutput) ? ' > ' . $this->redirectOutput : ''); |
|
87 | 87 | |
88 | 88 | return $cmd; |
89 | 89 | } |
@@ -82,8 +82,8 @@ |
||
82 | 82 | if ($amount < 1) { |
83 | 83 | throw new Exception('no command to execute'); |
84 | 84 | } |
85 | - $cmd = ($amount > 1 ? '(' . implode(' && ', $this->commands) . ')' : $this->commands[0]) |
|
86 | - . (!empty($this->redirectOutput) ? ' > ' . $this->redirectOutput : ''); |
|
85 | + $cmd = ($amount > 1 ? '('.implode(' && ', $this->commands).')' : $this->commands[0]) |
|
86 | + . (!empty($this->redirectOutput) ? ' > '.$this->redirectOutput : ''); |
|
87 | 87 | |
88 | 88 | return $cmd; |
89 | 89 | } |
@@ -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; |