@@ -48,7 +48,7 @@ |
||
48 | 48 | { |
49 | 49 | try { |
50 | 50 | $param = $this->constructXOAuth2Params($email, $token); |
51 | - $agent->executeCommand('AUTH XOAUTH2 ' . $param . "\r\n", array(235)); |
|
51 | + $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235)); |
|
52 | 52 | |
53 | 53 | return true; |
54 | 54 | } catch (Swift_TransportException $e) { |
@@ -37,7 +37,7 @@ |
||
37 | 37 | public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password) |
38 | 38 | { |
39 | 39 | try { |
40 | - $message = base64_encode($username . chr(0) . $username . chr(0) . $password); |
|
40 | + $message = base64_encode($username.chr(0).$username.chr(0).$password); |
|
41 | 41 | $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235)); |
42 | 42 | |
43 | 43 | return true; |
@@ -95,14 +95,14 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function setSignCertificate($certificate, $privateKey = null, $signOptions = PKCS7_DETACHED, $extraCerts = null) |
97 | 97 | { |
98 | - $this->signCertificate = 'file://' . str_replace('\\', '/', realpath($certificate)); |
|
98 | + $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate)); |
|
99 | 99 | |
100 | 100 | if (null !== $privateKey) { |
101 | 101 | if (is_array($privateKey)) { |
102 | 102 | $this->signPrivateKey = $privateKey; |
103 | - $this->signPrivateKey[0] = 'file://' . str_replace('\\', '/', realpath($privateKey[0])); |
|
103 | + $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0])); |
|
104 | 104 | } else { |
105 | - $this->signPrivateKey = 'file://' . str_replace('\\', '/', realpath($privateKey)); |
|
105 | + $this->signPrivateKey = 'file://'.str_replace('\\', '/', realpath($privateKey)); |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | |
@@ -131,10 +131,10 @@ discard block |
||
131 | 131 | $this->encryptCert = array(); |
132 | 132 | |
133 | 133 | foreach ($recipientCerts as $cert) { |
134 | - $this->encryptCert[] = 'file://' . str_replace('\\', '/', realpath($cert)); |
|
134 | + $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert)); |
|
135 | 135 | } |
136 | 136 | } else { |
137 | - $this->encryptCert = 'file://' . str_replace('\\', '/', realpath($recipientCerts)); |
|
137 | + $this->encryptCert = 'file://'.str_replace('\\', '/', realpath($recipientCerts)); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | if (null !== $cipher) { |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | foreach ($headerLines as $headerLine) { |
381 | 381 | // Line separated |
382 | 382 | if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) { |
383 | - $headers[$currentHeaderName] .= ' ' . trim($headerLine); |
|
383 | + $headers[$currentHeaderName] .= ' '.trim($headerLine); |
|
384 | 384 | continue; |
385 | 385 | } |
386 | 386 |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature'); |
80 | 80 | $headerVal = $this->_dkimHandler->getSignatureHeader(); |
81 | 81 | if (!$headerVal) { |
82 | - throw new Swift_SwiftException('OpenDKIM Error: ' . $this->_dkimHandler->getError()); |
|
82 | + throw new Swift_SwiftException('OpenDKIM Error: '.$this->_dkimHandler->getError()); |
|
83 | 83 | } |
84 | 84 | $header->setValue($headerVal); |
85 | 85 | $headers->set($header); |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, time()); |
113 | 113 | } else { |
114 | 114 | if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->_signatureTimestamp)) { |
115 | - throw new Swift_SwiftException('Unable to force signature timestamp [' . openssl_error_string() . ']'); |
|
115 | + throw new Swift_SwiftException('Unable to force signature timestamp ['.openssl_error_string().']'); |
|
116 | 116 | } |
117 | 117 | } |
118 | 118 |
@@ -134,7 +134,7 @@ |
||
134 | 134 | $code = $e->getCode(); |
135 | 135 | $this->_logger->add(sprintf('!! %s (code: %s)', $message, $code)); |
136 | 136 | $message .= PHP_EOL; |
137 | - $message .= 'Log data:' . PHP_EOL; |
|
137 | + $message .= 'Log data:'.PHP_EOL; |
|
138 | 138 | $message .= $this->_logger->dump(); |
139 | 139 | $evt->cancelBubble(); |
140 | 140 | throw new Swift_TransportException($message, $code, $e->getPrevious()); |
@@ -25,14 +25,14 @@ |
||
25 | 25 | public function notify(Swift_Mime_Message $message, $address, $result) |
26 | 26 | { |
27 | 27 | if (self::RESULT_PASS === $result) { |
28 | - echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">' . PHP_EOL; |
|
29 | - echo 'PASS ' . $address . PHP_EOL; |
|
30 | - echo '</div>' . PHP_EOL; |
|
28 | + echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">'.PHP_EOL; |
|
29 | + echo 'PASS '.$address.PHP_EOL; |
|
30 | + echo '</div>'.PHP_EOL; |
|
31 | 31 | flush(); |
32 | 32 | } else { |
33 | - echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">' . PHP_EOL; |
|
34 | - echo 'FAIL ' . $address . PHP_EOL; |
|
35 | - echo '</div>' . PHP_EOL; |
|
33 | + echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">'.PHP_EOL; |
|
34 | + echo 'FAIL '.$address.PHP_EOL; |
|
35 | + echo '</div>'.PHP_EOL; |
|
36 | 36 | flush(); |
37 | 37 | } |
38 | 38 | } |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | break; |
68 | 68 | default: |
69 | 69 | throw new Swift_SwiftException( |
70 | - 'Invalid mode [' . $mode . '] used to set nsKey=' . |
|
71 | - $nsKey . ', itemKey=' . $itemKey |
|
70 | + 'Invalid mode ['.$mode.'] used to set nsKey='. |
|
71 | + $nsKey.', itemKey='.$itemKey |
|
72 | 72 | ); |
73 | 73 | } |
74 | 74 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | break; |
102 | 102 | default: |
103 | 103 | throw new Swift_SwiftException( |
104 | - 'Invalid mode [' . $mode . '] used to set nsKey=' . $nsKey . ', itemKey=' . $itemKey |
|
104 | + 'Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey |
|
105 | 105 | ); |
106 | 106 | } |
107 | 107 | } |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | break; |
96 | 96 | default: |
97 | 97 | throw new Swift_SwiftException( |
98 | - 'Invalid mode [' . $mode . '] used to set nsKey=' . |
|
99 | - $nsKey . ', itemKey=' . $itemKey |
|
98 | + 'Invalid mode ['.$mode.'] used to set nsKey='. |
|
99 | + $nsKey.', itemKey='.$itemKey |
|
100 | 100 | ); |
101 | 101 | break; |
102 | 102 | } |
@@ -129,8 +129,8 @@ discard block |
||
129 | 129 | break; |
130 | 130 | default: |
131 | 131 | throw new Swift_SwiftException( |
132 | - 'Invalid mode [' . $mode . '] used to set nsKey=' . |
|
133 | - $nsKey . ', itemKey=' . $itemKey |
|
132 | + 'Invalid mode ['.$mode.'] used to set nsKey='. |
|
133 | + $nsKey.', itemKey='.$itemKey |
|
134 | 134 | ); |
135 | 135 | break; |
136 | 136 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | */ |
241 | 241 | public function hasKey($nsKey, $itemKey) |
242 | 242 | { |
243 | - return is_file($this->_path . '/' . $nsKey . '/' . $itemKey); |
|
243 | + return is_file($this->_path.'/'.$nsKey.'/'.$itemKey); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | { |
254 | 254 | if ($this->hasKey($nsKey, $itemKey)) { |
255 | 255 | $this->_freeHandle($nsKey, $itemKey); |
256 | - unlink($this->_path . '/' . $nsKey . '/' . $itemKey); |
|
256 | + unlink($this->_path.'/'.$nsKey.'/'.$itemKey); |
|
257 | 257 | } |
258 | 258 | } |
259 | 259 | |
@@ -269,8 +269,8 @@ discard block |
||
269 | 269 | $this->clearKey($nsKey, $itemKey); |
270 | 270 | } |
271 | 271 | |
272 | - if (is_dir($this->_path . '/' . $nsKey)) { |
|
273 | - rmdir($this->_path . '/' . $nsKey); |
|
272 | + if (is_dir($this->_path.'/'.$nsKey)) { |
|
273 | + rmdir($this->_path.'/'.$nsKey); |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | unset($this->_keys[$nsKey]); |
@@ -284,10 +284,10 @@ discard block |
||
284 | 284 | */ |
285 | 285 | private function _prepareCache($nsKey) |
286 | 286 | { |
287 | - $cacheDir = $this->_path . '/' . $nsKey; |
|
287 | + $cacheDir = $this->_path.'/'.$nsKey; |
|
288 | 288 | if (!is_dir($cacheDir)) { |
289 | 289 | if (!mkdir($cacheDir)) { |
290 | - throw new Swift_IoException('Failed to create cache directory ' . $cacheDir); |
|
290 | + throw new Swift_IoException('Failed to create cache directory '.$cacheDir); |
|
291 | 291 | } |
292 | 292 | $this->_keys[$nsKey] = array(); |
293 | 293 | } |
@@ -304,11 +304,11 @@ discard block |
||
304 | 304 | */ |
305 | 305 | private function _getHandle($nsKey, $itemKey, $position) |
306 | 306 | { |
307 | - $position = (int)$position; |
|
307 | + $position = (int) $position; |
|
308 | 308 | |
309 | 309 | if (!isset($this->_keys[$nsKey][$itemKey])) { |
310 | 310 | $openMode = $this->hasKey($nsKey, $itemKey) ? 'r+b' : 'w+b'; |
311 | - $fp = fopen($this->_path . '/' . $nsKey . '/' . $itemKey, $openMode); |
|
311 | + $fp = fopen($this->_path.'/'.$nsKey.'/'.$itemKey, $openMode); |
|
312 | 312 | $this->_keys[$nsKey][$itemKey] = $fp; |
313 | 313 | } |
314 | 314 |
@@ -178,14 +178,14 @@ |
||
178 | 178 | { |
179 | 179 | $this->_prepareCache($nsKey); |
180 | 180 | if ($this->hasKey($nsKey, $itemKey)) { |
181 | - $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START); |
|
182 | - $str = ''; |
|
183 | - while (!feof($fp) && false !== $bytes = fread($fp, 8192)) { |
|
181 | + $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START); |
|
182 | + $str = ''; |
|
183 | + while (!feof($fp) && false !== $bytes = fread($fp, 8192)) { |
|
184 | 184 | $str .= $bytes; |
185 | - } |
|
186 | - $this->_freeHandle($nsKey, $itemKey); |
|
185 | + } |
|
186 | + $this->_freeHandle($nsKey, $itemKey); |
|
187 | 187 | |
188 | - return $str; |
|
188 | + return $str; |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | return ''; |
@@ -116,7 +116,7 @@ |
||
116 | 116 | { |
117 | 117 | if (!$this->has($itemName)) { |
118 | 118 | throw new Swift_DependencyException( |
119 | - 'Cannot lookup dependency "' . $itemName . '" since it is not registered.' |
|
119 | + 'Cannot lookup dependency "'.$itemName.'" since it is not registered.' |
|
120 | 120 | ); |
121 | 121 | } |
122 | 122 |