@@ -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); |
@@ -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 | } |
@@ -227,20 +227,20 @@ |
||
227 | 227 | { |
228 | 228 | $executable = new Executable\Mysqldump($this->pathToMysqldump); |
229 | 229 | $executable->credentials($this->user, $this->password) |
230 | - ->useHost($this->host) |
|
231 | - ->useQuickMode($this->quick) |
|
232 | - ->lockTables($this->lockTables) |
|
233 | - ->dumpBlobsHexadecimal($this->hexBlob) |
|
234 | - ->useCompression($this->compress) |
|
235 | - ->useExtendedInsert($this->extendedInsert) |
|
236 | - ->dumpTables($this->tables) |
|
237 | - ->singleTransaction($this->singleTransaction) |
|
238 | - ->dumpDatabases($this->databases) |
|
239 | - ->ignoreTables($this->ignoreTables) |
|
240 | - ->produceFilePerTable($this->filePerTable) |
|
241 | - ->dumpNoData($this->noData) |
|
242 | - ->dumpStructureOnly($this->structureOnly) |
|
243 | - ->dumpTo($this->getDumpTarget($target)); |
|
230 | + ->useHost($this->host) |
|
231 | + ->useQuickMode($this->quick) |
|
232 | + ->lockTables($this->lockTables) |
|
233 | + ->dumpBlobsHexadecimal($this->hexBlob) |
|
234 | + ->useCompression($this->compress) |
|
235 | + ->useExtendedInsert($this->extendedInsert) |
|
236 | + ->dumpTables($this->tables) |
|
237 | + ->singleTransaction($this->singleTransaction) |
|
238 | + ->dumpDatabases($this->databases) |
|
239 | + ->ignoreTables($this->ignoreTables) |
|
240 | + ->produceFilePerTable($this->filePerTable) |
|
241 | + ->dumpNoData($this->noData) |
|
242 | + ->dumpStructureOnly($this->structureOnly) |
|
243 | + ->dumpTo($this->getDumpTarget($target)); |
|
244 | 244 | // if compression is active and commands can be piped |
245 | 245 | if ($this->isHandlingCompression($target)) { |
246 | 246 | $executable->compressOutput($target->getCompression()); |