@@ -152,16 +152,16 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | public $Timelimit = 300; |
| 154 | 154 | |
| 155 | - /** |
|
| 156 | - * @var array patterns to extract smtp transaction id from smtp reply |
|
| 157 | - * Only first capture group will be use, use non-capturing group to deal with it |
|
| 158 | - * Extend this class to override this property to fulfil your needs. |
|
| 159 | - */ |
|
| 160 | - protected $smtp_transaction_id_patterns = array( |
|
| 161 | - 'exim' => '/[0-9]{3} OK id=(.*)/', |
|
| 162 | - 'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/', |
|
| 163 | - 'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/' |
|
| 164 | - ); |
|
| 155 | + /** |
|
| 156 | + * @var array patterns to extract smtp transaction id from smtp reply |
|
| 157 | + * Only first capture group will be use, use non-capturing group to deal with it |
|
| 158 | + * Extend this class to override this property to fulfil your needs. |
|
| 159 | + */ |
|
| 160 | + protected $smtp_transaction_id_patterns = array( |
|
| 161 | + 'exim' => '/[0-9]{3} OK id=(.*)/', |
|
| 162 | + 'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/', |
|
| 163 | + 'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/' |
|
| 164 | + ); |
|
| 165 | 165 | |
| 166 | 166 | /** |
| 167 | 167 | * The socket for the server connection. |
@@ -1225,27 +1225,27 @@ discard block |
||
| 1225 | 1225 | ); |
| 1226 | 1226 | } |
| 1227 | 1227 | |
| 1228 | - /** |
|
| 1229 | - * Will return the ID of the last smtp transaction based on a list of patterns provided |
|
| 1230 | - * in SMTP::$smtp_transaction_id_patterns. |
|
| 1231 | - * If no reply has been received yet, it will return null. |
|
| 1232 | - * If no pattern has been matched, it will return false. |
|
| 1233 | - * @return bool|null|string |
|
| 1234 | - */ |
|
| 1235 | - public function getLastTransactionID() |
|
| 1236 | - { |
|
| 1237 | - $reply = $this->getLastReply(); |
|
| 1238 | - |
|
| 1239 | - if (empty($reply)) { |
|
| 1240 | - return null; |
|
| 1241 | - } |
|
| 1242 | - |
|
| 1243 | - foreach($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) { |
|
| 1244 | - if(preg_match($smtp_transaction_id_pattern, $reply, $matches)) { |
|
| 1245 | - return $matches[1]; |
|
| 1246 | - } |
|
| 1247 | - } |
|
| 1248 | - |
|
| 1249 | - return false; |
|
| 1228 | + /** |
|
| 1229 | + * Will return the ID of the last smtp transaction based on a list of patterns provided |
|
| 1230 | + * in SMTP::$smtp_transaction_id_patterns. |
|
| 1231 | + * If no reply has been received yet, it will return null. |
|
| 1232 | + * If no pattern has been matched, it will return false. |
|
| 1233 | + * @return bool|null|string |
|
| 1234 | + */ |
|
| 1235 | + public function getLastTransactionID() |
|
| 1236 | + { |
|
| 1237 | + $reply = $this->getLastReply(); |
|
| 1238 | + |
|
| 1239 | + if (empty($reply)) { |
|
| 1240 | + return null; |
|
| 1241 | + } |
|
| 1242 | + |
|
| 1243 | + foreach($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) { |
|
| 1244 | + if(preg_match($smtp_transaction_id_pattern, $reply, $matches)) { |
|
| 1245 | + return $matches[1]; |
|
| 1246 | + } |
|
| 1247 | + } |
|
| 1248 | + |
|
| 1249 | + return false; |
|
| 1250 | 1250 | } |
| 1251 | 1251 | } |
@@ -50,25 +50,25 @@ discard block |
||
| 50 | 50 | { |
| 51 | 51 | if (Core::ourStrlen($ctr) !== Core::BLOCK_BYTE_SIZE) { |
| 52 | 52 | throw new Ex\EnvironmentIsBrokenException( |
| 53 | - 'Trying to increment a nonce of the wrong size.' |
|
| 53 | + 'Trying to increment a nonce of the wrong size.' |
|
| 54 | 54 | ); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | if (! \is_int($inc)) { |
| 58 | 58 | throw new Ex\EnvironmentIsBrokenException( |
| 59 | - 'Trying to increment nonce by a non-integer.' |
|
| 59 | + 'Trying to increment nonce by a non-integer.' |
|
| 60 | 60 | ); |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | if ($inc < 0) { |
| 64 | 64 | throw new Ex\EnvironmentIsBrokenException( |
| 65 | - 'Trying to increment nonce by a negative amount.' |
|
| 65 | + 'Trying to increment nonce by a negative amount.' |
|
| 66 | 66 | ); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | if ($inc > PHP_INT_MAX - 255) { |
| 70 | 70 | throw new Ex\EnvironmentIsBrokenException( |
| 71 | - 'Integer overflow may occur.' |
|
| 71 | + 'Integer overflow may occur.' |
|
| 72 | 72 | ); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | /* Detect integer overflow and fail. */ |
| 83 | 83 | if (! \is_int($sum)) { |
| 84 | 84 | throw new Ex\EnvironmentIsBrokenException( |
| 85 | - 'Integer overflow in CTR mode nonce increment.' |
|
| 85 | + 'Integer overflow in CTR mode nonce increment.' |
|
| 86 | 86 | ); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -123,7 +123,7 @@ |
||
| 123 | 123 | */ |
| 124 | 124 | while ($range > 0) { |
| 125 | 125 | if ($bits % 8 === 0) { |
| 126 | - ++$bytes; |
|
| 126 | + ++$bytes; |
|
| 127 | 127 | } |
| 128 | 128 | ++$bits; |
| 129 | 129 | $range >>= 1; |