X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fmail_fetch%2Ffetch.php;h=d7085276eeef8f50480e853729715190dffbb269;hb=b4df37a525c34a317d5f6ff10baa518f75448703;hp=e5e3371bf17618f804f8461b8d093387c7b7616d;hpb=7b0ff4638517b07a777779087fe0db0ad99837fc;p=squirrelmail.git
diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index e5e3371b..d7085276 100644
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -1,290 +1,347 @@
';
-
- echo html_tag( 'table',
- html_tag( 'tr',
- html_tag( 'td', '' . _("Remote POP server Fetching Mail") . '', 'center', $color[0] )
- ) ,
- 'center', '', 'width="95%" cols="1"' );
-
- if (!isset( $server_to_fetch ) ) {
-
- echo '
' .
- "';
- exit();
+ $mailfetch[$i]['lmos'] = getPref($data_dir, $username, "mailfetch_lmos_$i");
+ $mailfetch[$i]['login'] = getPref($data_dir, $username, "mailfetch_login_$i");
+ $mailfetch[$i]['uidl'] = getPref($data_dir, $username, "mailfetch_uidl_$i");
+ $mailfetch[$i]['subfolder'] = getPref($data_dir, $username, "mailfetch_subfolder_$i");
+ if($mailfetch[$i]['alias'] == '') {
+ $mailfetch[$i]['alias'] == $mailfetch[$i]['server'];
+ }
+ // Authentication type (added in 1.5.2)
+ $mailfetch[$i]['auth'] = getPref($data_dir, $username, "mailfetch_auth_$i",MAIL_FETCH_AUTH_USER);
+ // Connection type (added in 1.5.2)
+ $mailfetch[$i]['type'] = getPref($data_dir, $username, "mailfetch_type_$i",MAIL_FETCH_USE_PLAIN);
}
+ return $mailfetch;
+}
- if ( $server_to_fetch == 'all' ) {
- $i_start = 0;
- $i_stop = $mailfetch_server_number;
- } else {
- $i_start = $server_to_fetch;
- $i_stop = $i_start+1;
+/**
+ * @param array $mailfetch
+ */
+function Mail_Fetch_Select_Server($mailfetch) {
+ global $PHP_SELF;
+
+ echo '
' .
+ '';
+}
+
+$mailfetch = Mail_Fetch_Servers();
+displayPageHeader($color);
+
+echo '
';
+
+echo html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Remote POP server Fetching Mail") . '', 'center', $color[0] )
+ ) ,
+ 'center', '', 'width="95%" cols="1"' );
+
+
+/* there are no servers defined yet... */
+if($mailfetch['server_number'] == 0) {
+//FIXME: do not echo directly to browser -- use templates only
+ echo '' . _("No POP3 servers configured yet.") . '
';
+ echo makeInternalLink('plugins/mail_fetch/options.php',
+ _("Click here to go to the options page.") );
+ $oTemplate->display('footer.tpl');
+ exit();
+}
+
+// get $server_to_fetch from globals, if not set display a choice to the user
+if (! sqgetGlobalVar('server_to_fetch', $server_to_fetch, SQ_POST) ) {
+ Mail_Fetch_Select_Server($mailfetch);
+ $oTemplate->display('footer.tpl');
+ exit();
+}
+
+if ( $server_to_fetch == 'all' ) {
+ $i_start = 0;
+ $i_stop = $mailfetch['server_number'];
+} else {
+ $i_start = $server_to_fetch;
+ $i_stop = $i_start+1;
+}
+
+for ($i_loop=$i_start;$i_loop<$i_stop;$i_loop++) {
+ $mailfetch_server = $mailfetch[$i_loop]['server'];
+ $mailfetch_port = $mailfetch[$i_loop]['port'];
+ $mailfetch_user = $mailfetch[$i_loop]['user'];
+ $mailfetch_pass = $mailfetch[$i_loop]['pass'];
+ $mailfetch_lmos = $mailfetch[$i_loop]['lmos'];
+ $mailfetch_login = $mailfetch[$i_loop]['login'];
+ $mailfetch_uidl = $mailfetch[$i_loop]['uidl'];
+ $mailfetch_subfolder = $mailfetch[$i_loop]['subfolder'];
+ $mailfetch_auth = $mailfetch[$i_loop]['auth'];
+ $mailfetch_type = $mailfetch[$i_loop]['type'];
+
+ echo '
' .
html_tag( 'table',
html_tag( 'tr',
- html_tag( 'td', '' . _("Fetching from ") .
- (($mailfetch_alias_[$i_loop] == '')?$mailfetch_server:$mailfetch_alias_[$i_loop]) .
+ html_tag( 'td', '' .
+ sprintf(_("Fetching from %s"),
+ htmlspecialchars($mailfetch[$i_loop]['alias'])) .
'',
'center' ) ,
'', $color[9] ) ,
'', '', 'width="90%"' );
-
- flush();
-
- if (!$pop3->connect($mailfetch_server)) {
- Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR );
- continue;
- }
-
- Mail_Fetch_Status(_("Opening IMAP server"));
- $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
-
- Mail_Fetch_Status(_("Opening POP server"));
- $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
- if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
- Mail_Fetch_Status(_("Login Failed:") . ' ' . $pop3->ERROR );
- continue;
+
+ flush();
+
+ $pop3 = new mail_fetch(array('host' => $mailfetch_server,
+ 'port' => $mailfetch_port,
+ 'auth' => $mailfetch_auth,
+ 'tls' => $mailfetch_type,
+ 'timeout' => 60));
+
+ if (!empty($pop3->error)) {
+ Mail_Fetch_Status($pop3->error);
+ continue;
+ }
+
+ Mail_Fetch_Status(_("Opening IMAP server"));
+ $imap_stream = sqimap_login($username, false, $imapServerAddress, $imapPort, 10);
+
+ // check if destination folder is not set, is not subscribed and is not \noselect folder
+ if($mailfetch_subfolder == '' ||
+ ! mail_fetch_check_folder($imap_stream,$mailfetch_subfolder)) {
+ $mailfetch_subfolder = 'INBOX';
+ }
+
+ Mail_Fetch_Status(_("Opening POP server"));
+
+ /* log into pop server*/
+ if (! $pop3->login($mailfetch_user, $mailfetch_pass)) {
+ Mail_Fetch_Status(_("Login Failed:") . ' ' . htmlspecialchars($pop3->error));
+ continue;
+ }
+
+ $aMsgStat = $pop3->command_stat();
+ if (is_bool($aMsgStat)) {
+ Mail_Fetch_Status(_("Can't get mailbox status:") . ' ' . htmlspecialchars($pop3->error) );
+ continue;
+ }
+
+ $Count = $aMsgStat['count'];
+
+ $i = 1;
+
+ if ($Count>0) {
+ // If we leave messages on server, try using UIDL
+ if ($mailfetch_lmos == 'on') {
+ Mail_Fetch_Status(_("Fetching UIDL..."));
+ $msglist = $pop3->command_uidl();
+ if (is_bool($msglist)) {
+ Mail_Fetch_Status(_("Server does not support UIDL.") . ' '.htmlspecialchars($pop3->error));
+ // User asked to leave messages on server, but we can't do that.
+ $pop3->command_quit();
+ continue;
+ // $mailfetch_lmos = 'off';
+ } else {
+ // calculate number of new messages
+ for ($j = 1; $j <= sizeof($msglist); $j++) {
+ // do strict comparison ('1111.10' should not be equal to '1111.100')
+ if ($msglist[$j] === $mailfetch_uidl) {
+ $i = $j+1;
+ break;
+ }
+ }
+ }
}
-
- // register_shutdown_function($pop3->quit());
-
- $msglist = $pop3->uidl();
-
- $i = 1;
- for ($j = 1; $j < sizeof($msglist); $j++) {
- if ($msglist["$j"] == $mailfetch_uidl) {
- $i = $j+1;
- break;
- }
+ // fetch list of messages with LIST
+ // we can use else control, but we can also set $mailfetch_lmos
+ // to off if server does not support UIDL.
+ if ($mailfetch_lmos != 'on') {
+ Mail_Fetch_Status(_("Fetching list of messages..."));
+ $msglist = $pop3->command_list();
}
+ }
- if ($Count < $i) {
- Mail_Fetch_Status(_("Login OK: No new messages"));
- $pop3->quit();
- continue;
- }
- if ($Count == 0) {
- Mail_Fetch_Status(_("Login OK: Inbox EMPTY"));
- $pop3->quit();
+ if ($Count < $i) {
+ Mail_Fetch_Status(_("Login OK: No new messages"));
+ $pop3->command_quit();
+ continue;
+ }
+ if ($Count == 0) {
+ Mail_Fetch_Status(_("Login OK: Inbox EMPTY"));
+ $pop3->command_quit();
+ continue;
+ } else {
+ $newmsgcount = $Count - $i + 1;
+ Mail_Fetch_Status(sprintf(ngettext("Login OK: Inbox contains %s message",
+ "Login OK: Inbox contains %s messages",$newmsgcount), $newmsgcount));
+ }
+
+ if ($mailfetch_lmos == 'on') {
+ Mail_Fetch_Status(_("Leaving mail on server..."));
+ } else {
+ Mail_Fetch_Status(_("Deleting messages from server..."));
+ }
+
+ for (; $i <= $Count; $i++) {
+ Mail_Fetch_Status(sprintf(_("Fetching message %s."), $i));
+
+ if (!ini_get('safe_mode'))
+ set_time_limit(20); // 20 seconds per message max
+
+ $Message = $pop3->command_retr($i);
+
+ if (is_bool($Message)) {
+ Mail_Fetch_Status(htmlspecialchars($pop3->error));
continue;
- } else {
- $newmsgcount = $Count - $i + 1;
- Mail_Fetch_Status(_("Login OK: Inbox contains [") . $newmsgcount . _("] messages"));
}
-
- Mail_Fetch_Status(_("Fetching UIDL..."));
- // Faster to get them all at once
- $mailfetch_uidl = $pop3->uidl();
-
- if (! is_array($mailfetch_uidl) && $mailfetch_lmos == 'on')
- Mail_Fetch_Status(_("Server does not support UIDL."));
- if ($mailfetch_lmos == 'on') {
- Mail_Fetch_Status(_("Leaving Mail on Server..."));
- } else {
- Mail_Fetch_Status(_("Deleting messages from server..."));
- }
-
- for (; $i <= $Count; $i++) {
- Mail_Fetch_Status(_("Fetching message ") . "$i" );
- set_time_limit(20); // 20 seconds per message max
- $Message = "";
- $MessArray = $pop3->get($i);
-
- while ( (!$MessArray) or (gettype($MessArray) != "array")) {
- Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR);
- // re-connect pop3
- Mail_Fetch_Status(_("Server error...Disconnect"));
- $pop3->quit();
- Mail_Fetch_Status(_("Re-connect from dead connection"));
- if (!$pop3->connect($mailfetch_server)) {
- Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR );
- Mail_Fetch_Status(_("Saving UIDL"));
- setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]);
-
- continue;
- }
- $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
- if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
- Mail_Fetch_Status(_("Login Failed:") . ' ' . $pop3->ERROR );
- Mail_Fetch_Status(_("Saving UIDL"));
- setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]);
-
- continue;
- }
- Mail_Fetch_Status(_("Re-fetching message ") . "$i" );
- $MessArray = $pop3->get($i);
-
- } // end while
-
- while (list($lineNum, $line) = each ($MessArray)) {
- $Message .= $line;
- }
-
- if ($mailfetch_subfolder=="") {
- fputs($imap_stream, "A3$i APPEND INBOX {" . (strlen($Message) - 1) . "}\r\n");
+ fputs($imap_stream, "A3$i APPEND \"$mailfetch_subfolder\" {" . strlen($Message) . "}\r\n");
+ $Line = fgets($imap_stream, 1024);
+ if (substr($Line, 0, 1) == '+') {
+ fputs($imap_stream, $Message);
+ fputs($imap_stream, "\r\n");
+ sqimap_read_data($imap_stream, "A3$i", false, $response, $message);
+ $response=(implode('',$response));
+ $message=(implode('',$message));
+ if ($response != 'OK') {
+ Mail_Fetch_Status(_("Error Appending Message!")." ".htmlspecialchars($message) );
+ Mail_Fetch_Status(_("Closing POP"));
+ $pop3->command_quit();
+ Mail_Fetch_Status(_("Logging out from IMAP"));
+ sqimap_logout($imap_stream);
+
+ if ($mailfetch_lmos == 'on') {
+ Mail_Fetch_Status(_("Saving UIDL"));
+ setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $msglist[$i-1]);
+ }
+ exit;
} else {
- fputs($imap_stream, "A3$i APPEND \"$mailfetch_subfolder\" {" . (strlen($Message) - 1) . "}\r\n");
+ Mail_Fetch_Status(_("Message appended to mailbox"));
}
- $Line = fgets($imap_stream, 1024);
- if (substr($Line, 0, 1) == '+') {
- fputs($imap_stream, $Message);
- sqimap_read_data($imap_stream, "A3$i", false, $response, $message);
- if ( $response <> 'OK' ) {
- Mail_Fetch_Status(_("Error Appending Message!")." ".$message );
- Mail_Fetch_Status(_("Closing POP"));
- $pop3->quit();
- Mail_Fetch_Status(_("Logging out from IMAP"));
- sqimap_logout($imap_stream);
- Mail_Fetch_Status(_("Saving UIDL"));
- setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]);
- exit;
+ if ($mailfetch_lmos != 'on') {
+ if( $pop3->command_dele($i) ) {
+ Mail_Fetch_Status(sprintf(_("Message %d deleted from remote server!"), $i));
} else {
- Mail_Fetch_Status(_("Message appended to mailbox"));
+ Mail_Fetch_Status(_("Delete failed:") . htmlspecialchars($pop3->error) );
}
-
- if ($mailfetch_lmos != 'on') {
- if( $pop3->delete($i) ) {
- Mail_Fetch_Status(_("Message ") . $i . _(" deleted from Remote Server!"));
- } else {
- Mail_Fetch_Status(_("Delete failed:") . $pop3->ERROR );
- }
- }
- } else {
- echo "$Line";
- Mail_Fetch_Status(_("Error Appending Message!"));
- Mail_Fetch_Status(_("Closing POP"));
- $pop3->quit();
- Mail_Fetch_Status(_("Logging out from IMAP"));
- sqimap_logout($imap_stream);
+ }
+ } else {
+ echo $Line;
+ Mail_Fetch_Status(_("Error Appending Message!"));
+ Mail_Fetch_Status(_("Closing POP"));
+ $pop3->command_quit();
+ Mail_Fetch_Status(_("Logging out from IMAP"));
+ sqimap_logout($imap_stream);
- // not gurantee corect!
+ // not gurantee corect!
+ if ($mailfetch_lmos == 'on') {
Mail_Fetch_Status(_("Saving UIDL"));
- setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $mailfetch_uidl[$i-1]);
- exit;
+ setPref($data_dir,$username,"mailfetch_uidl_$i_loop", $msglist[$i-1]);
}
+ exit;
}
-
- Mail_Fetch_Status(_("Closing POP"));
- $pop3->quit();
- Mail_Fetch_Status(_("Logging out from IMAP"));
- sqimap_logout($imap_stream);
- if (is_array($mailfetch_uidl)) {
- Mail_Fetch_Status(_("Saving UIDL"));
- setPref($data_dir,$username,"mailfetch_uidl_$i_loop", array_pop($mailfetch_uidl));
- }
-
- Mail_Fetch_Status(_("Done"));
+ }
+
+ Mail_Fetch_Status(_("Closing POP"));
+ $pop3->command_quit();
+ Mail_Fetch_Status(_("Logging out from IMAP"));
+ sqimap_logout($imap_stream);
+ if ($mailfetch_lmos == 'on' && is_array($msglist)) {
+ Mail_Fetch_Status(_("Saving UIDL"));
+ setPref($data_dir,$username,"mailfetch_uidl_$i_loop", array_pop($msglist));
+ }
+
+ Mail_Fetch_Status(_("Done"));
+}
- }
+$oTemplate->display('footer.tpl');
-?>
-
-