/**
* mail_fetch/fetch.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Fetch code.
*
- * $Id$
+ * @version $Id$
* @package plugins
* @subpackage mail_fetch
*/
require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
require_once(SM_PATH . 'functions/html.php' );
-/* globals */
+/* globals */
sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
function Mail_Fetch_Select_Server($mailfetch) {
global $PHP_SELF;
- echo '<font size=-5><br></font>' .
- "<form action=\"$PHP_SELF\" method=\"post\" target=\"_self\">" .
+ echo '<font size="-5"><br /></font>' .
+ '<form action="'.$PHP_SELF.'" method="post" target="_self">' .
html_tag( 'table', '', 'center', '', 'width="70%" cols="2"' ) .
html_tag( 'tr' ) .
html_tag( 'td', _("Select Server:") . ' ', 'right' ) .
html_tag( 'td', '', 'left' ) .
'<select name="server_to_fetch" size="1">' .
- '<option value="all" selected>..' . _("All") . "...\n";
+ '<option value="all" selected="selected">..' . _("All") . "...\n";
for ($i = 0;$i < $mailfetch['server_number'];$i++) {
echo "<option value=\"$i\">" .
htmlspecialchars($mailfetch[$i]['alias']) .
'</option>' . "\n";
- }
+ }
echo '</select>' .
'</td>' .
'</tr>';
htmlspecialchars($mailfetch[$i]['alias']) .
'</b>: ',
'right' ) .
- html_tag( 'td', '<input type="password" name="pass_' . $i . '">', 'left' )
+ html_tag( 'td', '<input type="password" name="pass_' . $i . '" />', 'left' )
);
}
}
echo html_tag( 'tr',
html_tag( 'td', ' ' ) .
- html_tag( 'td', '<input type=submit name=submit_mailfetch value="' . _("Fetch Mail"). '">', 'left' )
+ html_tag( 'td', '<input type="submit" name="submit_mailfetch" value="' . _("Fetch Mail"). '" />', 'left' )
) .
'</table></form>';
}
$mailfetch = Mail_Fetch_Servers();
displayPageHeader($color, 'None');
- echo '<br><center>';
+ echo '<br /><center>';
echo html_tag( 'table',
html_tag( 'tr',
$mailfetch_login = $mailfetch[$i_loop]['login'];
$mailfetch_uidl = $mailfetch[$i_loop]['uidl'];
$mailfetch_subfolder = $mailfetch[$i_loop]['subfolder'];
- if($mailfetch_subfolder == '') {
- $mailfetch_subfolder == 'INBOX';
- }
$pop3 = new POP3($mailfetch_server, 60);
- echo '<br>' .
+ echo '<br />' .
html_tag( 'table',
html_tag( 'tr',
- html_tag( 'td', '<b>' . _("Fetching from ") .
- htmlspecialchars($mailfetch[$i_loop]['alias']) .
+ html_tag( 'td', '<b>' . _("Fetching from ") .
+ htmlspecialchars($mailfetch[$i_loop]['alias']) .
'</b>',
'center' ) ,
'', $color[9] ) ,
Mail_Fetch_Status(_("Opening IMAP server"));
$imap_stream = sqimap_login($username, $key, $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"));
$Count = $pop3->login($mailfetch_user, $mailfetch_pass);
if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
continue;
} else {
$newmsgcount = $Count - $i + 1;
- Mail_Fetch_Status(_("Login OK: Inbox contains [") . $newmsgcount . _("] messages"));
+ Mail_Fetch_Status(sprintf(ngettext("Login OK: Inbox contains %s message",
+ "Login OK: Inbox contains %s messages",$newmsgcount), $newmsgcount));
}
Mail_Fetch_Status(_("Fetching UIDL..."));
Mail_Fetch_Status(_("Server does not support UIDL."));
if ($mailfetch_lmos == 'on') {
- Mail_Fetch_Status(_("Leaving Mail on Server..."));
+ Mail_Fetch_Status(_("Leaving mail on server..."));
} else {
Mail_Fetch_Status(_("Deleting messages from server..."));
}
while ( (!$MessArray) or (gettype($MessArray) != "array")) {
Mail_Fetch_Status(_("Oops, ") . $pop3->ERROR);
// re-connect pop3
- Mail_Fetch_Status(_("Server error...Disconnect"));
+ Mail_Fetch_Status(_("Server error. Disconnect"));
$pop3->quit();
Mail_Fetch_Status(_("Reconnect from dead connection"));
if (!$pop3->connect($mailfetch_server)) {
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));
+ $response=(implode('',$response));
+ $message=(implode('',$message));
if ($response != 'OK') {
Mail_Fetch_Status(_("Error Appending Message!")." ".htmlspecialchars($message) );
Mail_Fetch_Status(_("Closing POP"));
if ($mailfetch_lmos != 'on') {
if( $pop3->delete($i) ) {
- Mail_Fetch_Status(_("Message ") . $i . _(" deleted from Remote Server!"));
+ Mail_Fetch_Status(sprintf(_("Message %d deleted from remote server!"), $i));
} else {
Mail_Fetch_Status(_("Delete failed:") . htmlspecialchars($pop3->ERROR) );
}
?>
</center>
</body>
-</html>
+</html>
\ No newline at end of file