Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added SSL verification skip and IMAP connection check, + bugfix in Maildir #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added SSL verification skip and IMAP connection check, + bugfix in Maildir #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions imap-move.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,22 @@
--fake to just list what would be copied
--wipe to remove messages after they are copied (move)
--copy to store copies of the messages in a path
--novalidate to skip validation of SSL certificates

*/

error_reporting(E_ALL | E_STRICT);

_args($argc,$argv);
$novalidate = isset($_ENV['novalidate']) && $_ENV['novalidate'];

echo "Connecting Source...\n";
$S = new IMAP($_ENV['src']);
$S = new IMAP($_ENV['src'],$novalidate);
$S->is_connected() || die('Could not connect to source server');

echo "Connecting Target...\n";
$T = new IMAP($_ENV['tgt']);
$T = new IMAP($_ENV['tgt'],$novalidate);
$T->is_connected() || die('Could not connect to target server');
//$tgt_path_list = $T->listPath();
//print_r($tgt_path_list);

Expand Down Expand Up @@ -127,7 +131,7 @@ class IMAP
/**
Connect to an IMAP
*/
function __construct($uri)
function __construct($uri,$novalidate)
{
$this->_c = null;
$this->_c_host = sprintf('{%s',$uri['host']);
Expand All @@ -137,6 +141,9 @@ function __construct($uri)
switch (strtolower(@$uri['scheme'])) {
case 'imap-ssl':
$this->_c_host.= '/ssl';
if($novalidate) {
$this->_c_host .= '/novalidate-cert';
}
break;
case 'imap-tls':
$this->_c_host.= '/tls';
Expand All @@ -158,6 +165,15 @@ function __construct($uri)
// echo implode(', ',imap_errors());
}

/**
* Checks if there is a working connection
* If imap_open returns a bool(False) instead of a resource, it failed
*/
function is_connected()
{
return is_resource($this->_c);
}

/**
List folders matching pattern
@param $pat * == all folders, % == folders at current level
Expand Down Expand Up @@ -240,7 +256,7 @@ function setPath($p,$make=false)
}

$buf = implode(', ',$buf);
if (preg_match('/NONEXISTENT/',$buf)) {
if (preg_match('/NONEXISTENT/',$buf) || preg_match('/SELECT failed/',$buf)) {
// Likley Couldn't Open on Gmail Side, So Create
$ret = imap_createmailbox($this->_c,$p);
$buf = imap_errors();
Expand Down Expand Up @@ -316,6 +332,9 @@ function _args($argc,$argv)
$i++;
}
break;
case '--novalidate':
$_ENV['novalidate'] = true;
break;
case '--fake':
$_ENV['fake'] = true;
break;
Expand Down