Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop' of git://github.com/zendframework/zf2 into dev…
Browse files Browse the repository at this point in the history 
…elop
  • Loading branch information
@marc-mabe
marc-mabe committed Nov 26, 2012
119 parents 730f592 + 5e1c4bb + de6ba8b + 19c92ef + f5abdbd + a4b3fcc + e0d3e79 + eb7f4fc + f5f296f + c1bc89d + 2cfde08 + 5ed923d + 7bfa121 + 0b38f0b + 1914ec7 + 47650bd + b7f9c80 + d490dab + 0b235a6 + ea8420a + 806e429 + 14b8e16 + 2c9f881 + 1591173 + 3288109 + 6149722 + fb18be8 + 2f56d24 + 256686b + 3cc679d + da18011 + 93ac388 + 57ef4a3 + 2f2851a + 2ec1dbc + 9a48955 + b6b50b9 + a16c105 + a634561 + 779d017 + e998d74 + e0c0b66 + 677bd85 + bd0abb6 + 7e23a9b + 76e9a65 + 9666e65 + 0fb7a6e + b476244 + a566cb1 + 84a7972 + f6501d5 + 74b0454 + ea99bf1 + e2703e7 + 90db7ae + b2f5380 + d6ee2dd + 2dae9df + 15a2e1f + 00d7ef1 + 88e29ab + 04f5596 + d4b9187 + 83cb40e + e80536c + 8344c40 + 314ef07 + f8fe680 + 7d99158 + 5a453b7 + 16b512c + e13bb78 + f8c8e84 + 0e833f2 + 463bd0b + e23f919 + c0f3fe1 + 9af4d23 + fbdafd9 + 46c341e + 1fcdf03 + 9e5c38e + 41f8caa + f236745 + ab9047d + c7b4a3f + 5cbe79f + dc8268a + cbafbe9 + d2c6567 + 0cc6fdf + 09daef8 + df6fc46 + ba228cf + 67d18da + 48a0084 + c78da38 + 76f6205 + 02baf86 + 907dad9 + 56854a7 + 51b08b5 + 86f37cb + 5ecd1ed + a4cca36 + c6516da + 76770c7 + cfc46bf + a576736 + 0650b43 + 6fc76b3 + 2dcfeeb + 80461fa + db66f77 + 66790e4 + 167fdbf + 1510cfa + c208a5e commit cb43167
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/Header/GenericHeader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function setFieldName($fieldName)
// Validate what we have
if (!preg_match('/^[a-z][a-z0-9-]*$/i', $fieldName)) {
throw new Exception\InvalidArgumentException(
'Header name must start with a letter, and consist of only letters, numbers and dashes'
'Header name must start with a letter, and consists of only letters, numbers and dashes.'
);
}

Expand Down
26 changes: 20 additions & 6 deletions src/Protocol/Imap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,34 @@ public function __destruct()
*/
public function connect($host, $port = null, $ssl = false)
{
if ($ssl == 'SSL') {
$host = 'ssl://' . $host;
$isTls = false;

if ($ssl) {
$ssl = strtolower($ssl);
}

if ($port === null) {
$port = $ssl === 'SSL' ? 993 : 143;
switch ($ssl) {
case 'ssl':
$host = 'ssl://' . $host;
if (!$port) {
$port = 993;
}
break;
case 'tls':
$isTls = true;
// break intentionally omitted
default:
if (!$port) {
$port = 143;
}
}

ErrorHandler::start();
$this->socket = fsockopen($host, $port, $errno, $errstr, self::TIMEOUT_CONNECTION);
$error = ErrorHandler::stop();
if (!$this->socket) {
throw new Exception\RuntimeException(sprintf(
'cannot connect to host%s',
'cannot connect to host %s',
($error ? sprintf('; error = %s (errno = %d )', $error->getMessage(), $error->getCode()) : '')
), 0, $error);
}
Expand All @@ -92,7 +106,7 @@ public function connect($host, $port = null, $ssl = false)
throw new Exception\RuntimeException('host doesn\'t allow connection');
}

if ($ssl === 'TLS') {
if ($isTls) {
$result = $this->requestAndResponse('STARTTLS');
$result = $result && stream_socket_enable_crypto($this->socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
if (!$result) {
Expand Down
26 changes: 20 additions & 6 deletions src/Protocol/Pop3.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,34 @@ public function __destruct()
*/
public function connect($host, $port = null, $ssl = false)
{
if ($ssl == 'SSL') {
$host = 'ssl://' . $host;
$isTls = false;

if ($ssl) {
$ssl = strtolower($ssl);
}

if ($port === null) {
$port = $ssl == 'SSL' ? 995 : 110;
switch ($ssl) {
case 'ssl':
$host = 'ssl://' . $host;
if (!$port) {
$port = 995;
}
break;
case 'tls':
$isTls = true;
// break intentionally omitted
default:
if (!$port) {
$port = 110;
}
}

ErrorHandler::start();
$this->socket = fsockopen($host, $port, $errno, $errstr, self::TIMEOUT_CONNECTION);
$error = ErrorHandler::stop();
if (!$this->socket) {
throw new Exception\RuntimeException(sprintf(
'cannot connect to host%s',
'cannot connect to host %s',
($error ? sprintf('; error = %s (errno = %d )', $error->getMessage(), $error->getCode()) : '')
), 0, $error);
}
Expand All @@ -106,7 +120,7 @@ public function connect($host, $port = null, $ssl = false)
$this->timestamp = '<' . $this->timestamp . '>';
}

if ($ssl === 'TLS') {
if ($isTls) {
$this->request('STLS');
$result = stream_socket_enable_crypto($this->socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
if (!$result) {
Expand Down
6 changes: 3 additions & 3 deletions src/Storage/Imap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public function countMessages($flags = null)

$params = array();
foreach ((array) $flags as $flag) {
if (isset(self::$searchFlags[$flag])) {
$params[] = self::$searchFlags[$flag];
if (isset(static::$searchFlags[$flag])) {
$params[] = static::$searchFlags[$flag];
} else {
$params[] = 'KEYWORD';
$params[] = $this->protocol->escapeString($flag);
Expand Down Expand Up @@ -116,7 +116,7 @@ public function getMessage($id)

$flags = array();
foreach ($data['FLAGS'] as $flag) {
$flags[] = isset(self::$knownFlags[$flag]) ? self::$knownFlags[$flag] : $flag;
$flags[] = isset(static::$knownFlags[$flag]) ? static::$knownFlags[$flag] : $flag;
}

return new $this->messageClass(array('handler' => $this, 'id' => $id, 'headers' => $header, 'flags' => $flags));
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Maildir.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ protected function _getMaildirFiles($dh, $dirname, $default_flags = array())
$length = strlen($flags);
for ($i = 0; $i < $length; ++$i) {
$flag = $flags[$i];
$named_flags[$flag] = isset(self::$knownFlags[$flag]) ? self::$knownFlags[$flag] : $flag;
$named_flags[$flag] = isset(static::$knownFlags[$flag]) ? static::$knownFlags[$flag] : $flag;
}

$data = array('uniq' => $uniq,
Expand Down

0 comments on commit cb43167

Please sign in to comment.