function sqimap_session_id($unique_id = false) {
global $data_dir, $username, $sqimap_session_id;
if (!$unique_id) {
- return( sprintf("A%03d", $sqimap_session_id++) );
+ return( sprintf("A%03d", $sqimap_session_id++) );
} else {
- return( sprintf("A%03d", $sqimap_session_id++) . ' UID' );
+ return( sprintf("A%03d", $sqimap_session_id++) . ' UID' );
}
}
*/
function sqimap_run_command_list ($imap_stream, $query, $handle_errors, &$response, &$message, $unique_id = false) {
if ($imap_stream) {
- $sid = sqimap_session_id($unique_id);
- fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
- $read = sqimap_read_data_list ($imap_stream, $sid, $handle_errors, $response, $message, $query );
- return $read;
+ $sid = sqimap_session_id($unique_id);
+ fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
+ $read = sqimap_read_data_list ($imap_stream, $sid, $handle_errors, $response, $message, $query );
+ return $read;
} else {
global $squirrelmail_language, $color;
set_up_language($squirrelmail_language);
_("ERROR : No available imapstream.") .
"</b></font>\n";
error_box($string,$color);
- return false;
+ return false;
}
}
function sqimap_run_command ($imap_stream, $query, $handle_errors, &$response, &$message, $unique_id = false) {
if ($imap_stream) {
$sid = sqimap_session_id($unique_id);
- fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
- $read = sqimap_read_data ($imap_stream, $sid, $handle_errors, $response, $message, $query);
- return $read;
+ fputs ($imap_stream, $sid . ' ' . $query . "\r\n");
+ $read = sqimap_read_data ($imap_stream, $sid, $handle_errors, $response, $message, $query);
+ return $read;
} else {
global $squirrelmail_language, $color;
set_up_language($squirrelmail_language);
_("ERROR : No available imapstream.") .
"</b></font>\n";
error_box($string,$color);
- return false;
+ return false;
}
}
/* ignore this error from M$ exchange, it is not fatal (aka bug) */
if (strstr($message, 'command resulted in') === false) {
set_up_language($squirrelmail_language);
- require_once(SM_PATH . 'functions/display_messages.php');
- $string = "<b><font color=$color[2]>\n" .
+ require_once(SM_PATH . 'functions/display_messages.php');
+ $string = "<b><font color=$color[2]>\n" .
_("ERROR : Could not complete request.") .
"</b><br>\n" .
_("Query:") . ' ' .
htmlspecialchars($query) . '<br>' .
_("Reason Given: ") .
htmlspecialchars($message) . "</font><br>\n";
- error_box($string,$color);
+ error_box($string,$color);
exit;
}
}
elseif ($response == 'BAD') {
set_up_language($squirrelmail_language);
- require_once(SM_PATH . 'functions/display_messages.php');
+ require_once(SM_PATH . 'functions/display_messages.php');
$string = "<b><font color=$color[2]>\n" .
_("ERROR : Bad or malformed request.") .
"</b><br>\n" .
htmlspecialchars($query) . '<br>' .
_("Server responded: ") .
htmlspecialchars($message) . "</font><br>\n";
- error_box($string,$color);
+ error_box($string,$color);
exit;
}
else {
sqgetglobalvar('onetimepad' , $onetimepad , SQ_SESSION );
}
$imap_server_address = sqimap_get_user_server($imap_server_address, $username);
- $host=$imap_server_address;
-
- if (($use_imap_tls == true) and (check_php_version(4,3)) and (extension_loaded('openssl'))) {
- /* Use TLS by prefixing "tls://" to the hostname */
- $imap_server_address = 'tls://' . $imap_server_address;
- }
+ $host=$imap_server_address;
+
+ if (($use_imap_tls == true) and (check_php_version(4,3)) and (extension_loaded('openssl'))) {
+ /* Use TLS by prefixing "tls://" to the hostname */
+ $imap_server_address = 'tls://' . $imap_server_address;
+ }
$imap_stream = fsockopen ( $imap_server_address, $imap_port, $error_number, $error_string, 15);
if (!$imap_stream) {
if (!$hide) {
set_up_language($squirrelmail_language, true);
- require_once(SM_PATH . 'functions/display_messages.php');
- $string = sprintf (_("Error connecting to IMAP server: %s.") .
- "<br>\r\n", $imap_server_address) .
+ require_once(SM_PATH . 'functions/display_messages.php');
+ $string = sprintf (_("Error connecting to IMAP server: %s.") .
+ "<br>\r\n", $imap_server_address) .
"$error_number : $error_string<br>\r\n";
- logout_error($string,$color);
+ logout_error($string,$color);
}
exit;
}
/* Decrypt the password */
$password = OneTimePadDecrypt($password, $onetimepad);
- if (($imap_auth_mech == 'cram-md5') OR ($imap_auth_mech == 'digest-md5')) {
+ if (($imap_auth_mech == 'cram-md5') OR ($imap_auth_mech == 'digest-md5')) {
// We're using some sort of authentication OTHER than plain or login
- $tag=sqimap_session_id(false);
- if ($imap_auth_mech == 'digest-md5') {
- $query = $tag . " AUTHENTICATE DIGEST-MD5\r\n";
- } elseif ($imap_auth_mech == 'cram-md5') {
- $query = $tag . " AUTHENTICATE CRAM-MD5\r\n";
- }
- fputs($imap_stream,$query);
- $answer=sqimap_fgets($imap_stream);
- // Trim the "+ " off the front
- $response=explode(" ",$answer,3);
- if ($response[0] == '+') {
- // Got a challenge back
- $challenge=$response[1];
- if ($imap_auth_mech == 'digest-md5') {
- $reply = digest_md5_response($username,$password,$challenge,'imap',$host);
- } elseif ($imap_auth_mech == 'cram-md5') {
- $reply = cram_md5_response($username,$password,$challenge);
- }
- fputs($imap_stream,$reply);
- $read=sqimap_fgets($imap_stream);
- if ($imap_auth_mech == 'digest-md5') {
- // DIGEST-MD5 has an extra step..
- if (substr($read,0,1) == '+') { // OK so far..
- fputs($imap_stream,"\r\n");
- $read=sqimap_fgets($imap_stream);
- }
- }
- $results=explode(" ",$read,3);
- $response=$results[1];
- $message=$results[2];
+ $tag=sqimap_session_id(false);
+ if ($imap_auth_mech == 'digest-md5') {
+ $query = $tag . " AUTHENTICATE DIGEST-MD5\r\n";
+ } elseif ($imap_auth_mech == 'cram-md5') {
+ $query = $tag . " AUTHENTICATE CRAM-MD5\r\n";
+ }
+ fputs($imap_stream,$query);
+ $answer=sqimap_fgets($imap_stream);
+ // Trim the "+ " off the front
+ $response=explode(" ",$answer,3);
+ if ($response[0] == '+') {
+ // Got a challenge back
+ $challenge=$response[1];
+ if ($imap_auth_mech == 'digest-md5') {
+ $reply = digest_md5_response($username,$password,$challenge,'imap',$host);
+ } elseif ($imap_auth_mech == 'cram-md5') {
+ $reply = cram_md5_response($username,$password,$challenge);
+ }
+ fputs($imap_stream,$reply);
+ $read=sqimap_fgets($imap_stream);
+ if ($imap_auth_mech == 'digest-md5') {
+ // DIGEST-MD5 has an extra step..
+ if (substr($read,0,1) == '+') { // OK so far..
+ fputs($imap_stream,"\r\n");
+ $read=sqimap_fgets($imap_stream);
+ }
+ }
+ $results=explode(" ",$read,3);
+ $response=$results[1];
+ $message=$results[2];
} else {
- // Fake the response, so the error trap at the bottom will work
- $response="BAD";
- $message='IMAP server does not appear to support the authentication method selected.';
- $message .= ' Please contact your system administrator.';
+ // Fake the response, so the error trap at the bottom will work
+ $response="BAD";
+ $message='IMAP server does not appear to support the authentication method selected.';
+ $message .= ' Please contact your system administrator.';
}
} elseif ($imap_auth_mech == 'login') {
- // Original IMAP login code
+ // Original IMAP login code
$query = 'LOGIN "' . quoteIMAP($username) . '" "' . quoteIMAP($password) . '"';
$read = sqimap_run_command ($imap_stream, $query, false, $response, $message);
} elseif ($imap_auth_mech == 'plain') {
- /* Replace this with SASL PLAIN if it ever gets implemented */
- $response="BAD";
- $message='SquirrelMail does not support SASL PLAIN yet. Rerun conf.pl and use login instead.';
- } else {
- $response="BAD";
- $message="Internal SquirrelMail error - unknown IMAP authentication method chosen. Please contact the developers.";
- }
+ /* Replace this with SASL PLAIN if it ever gets implemented */
+ $response="BAD";
+ $message='SquirrelMail does not support SASL PLAIN yet. Rerun conf.pl and use login instead.';
+ } else {
+ $response="BAD";
+ $message="Internal SquirrelMail error - unknown IMAP authentication method chosen. Please contact the developers.";
+ }
- /* If the connection was not successful, lets see why */
+ /* If the connection was not successful, lets see why */
if ($response != 'OK') {
if (!$hide) {
if ($response != 'NO') {
/* "BAD" and anything else gets reported here. */
- $message = htmlspecialchars($message);
+ $message = htmlspecialchars($message);
set_up_language($squirrelmail_language, true);
- require_once(SM_PATH . 'functions/display_messages.php');
+ require_once(SM_PATH . 'functions/display_messages.php');
if ($response == 'BAD') {
$string = sprintf (_("Bad request: %s")."<br>\r\n", $message);
} else {
$string = sprintf (_("Unknown error: %s") . "<br>\n", $message);
}
if (isset($read) && is_array($read)) {
- $string .= '<br>' . _("Read data:") . "<br>\n";
+ $string .= '<br>' . _("Read data:") . "<br>\n";
foreach ($read as $line) {
$string .= htmlspecialchars($line) . "<br>\n";
}
}
- error_box($string,$color);
+ error_box($string,$color);
exit;
} else {
/*
set_up_language($squirrelmail_language, true);
include_once(SM_PATH . 'functions/display_messages.php' );
- sqsession_destroy();
+ sqsession_destroy();
logout_error( _("Unknown user or password incorrect.") );
exit;
}
}
}
if ($capability) {
- if (isset($sqimap_capabilities[$capability])) {
- return $sqimap_capabilities[$capability];
- } else {
- return false;
- }
+ if (isset($sqimap_capabilities[$capability])) {
+ return $sqimap_capabilities[$capability];
+ } else {
+ return false;
+ }
}
return $sqimap_capabilities;
}
return false; //"BUG! Couldn't get number of messages in $mailbox!";
}
-
-/* Returns a displayable email address.
- * Luke Ehresman <lehresma@css.tayloru.edu>
- * "Luke Ehresman" <lehresma@css.tayloru.edu>
- * <lehresma@css.tayloru.edu>
- * lehresma@css.tayloru.edu (Luke Ehresman)
- * lehresma@css.tayloru.edu
- * becomes: lehresma@css.tayloru.edu
- */
-function sqimap_find_email ($string) {
- if (ereg("<([^>]+)>", $string, $regs)) {
- $string = $regs[1];
- } else if (ereg("([^ ]+@[^ ]+)", $string, $regs)) {
- $string = $regs[1];
+function parseAddress($address, $max=0, $addr_ar = array(), $group = '', $host='') {
+ $pos = 0;
+ $j = strlen($address);
+ $personal = '';
+ $addr = '';
+ $comment = '';
+ if ($max && $max = count($addr_ar)) {
+ return $addr_ar;
}
- return trim($string);
-}
-
-
-/*
- * Takes the From: field and creates a displayable name.
- * Luke Ehresman <lkehresman@yahoo.com>
- * "Luke Ehresman" <lkehresman@yahoo.com>
- * lkehresman@yahoo.com (Luke Ehresman)
- * becomes: Luke Ehresman
- * <lkehresman@yahoo.com>
- * becomes: lkehresman@yahoo.com
- */
-function sqimap_find_displayable_name ($string) {
- $string = trim($string);
-
- if ( ereg('^(.+)<.*>', $string, $regs) ) {
- $orig_string = $string;
- $string = str_replace ('"', '', $regs[1] );
- if (trim($string) == '') {
- $string = sqimap_find_email($orig_string);
+ while ($pos < $j) {
+ if ($max && $max = count($addr_ar)) {
+ return $addr_ar;
}
- if( $string == '' || $string == ' ' ){
- $string = ' ';
+ $char = $address{$pos};
+ switch ($char) {
+ case '=':
+ if (preg_match('/^(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',substr($address,$pos),$reg)) {
+ $personal = $reg[1];
+ $pos += strlen($personal);
+ }
+ ++$pos;
+ break;
+ case '"': /* get the personal name */
+ ++$pos;
+ if ($address{$pos} == '"') {
+ ++$pos;
+ } else {
+ $personal_start = $personal_end = $pos;
+ while ($pos < $j) {
+ $personal_end = strpos($address,'"',$pos);
+ if (($personal_end-2)>0 && (substr($address,$personal_end-2,2) === '\\"' ||
+ substr($address,$personal_end-2,2) === '\\\\')) {
+ $pos = $personal_end+1;
+ } else {
+ $personal = substr($address,$personal_start,$personal_end-$personal_start);
+ break;
+ }
+ }
+ if ($personal_end) { /* prohibit endless loops due to very wrong addresses */
+ $pos = $personal_end+1;
+ } else {
+ $pos = $j;
+ }
+ }
+ break;
+ case '<': /* get email address */
+ $addr_start = $pos;
+ $addr_end = strpos($address,'>',$addr_start);
+ $addr = substr($address,$addr_start+1,$addr_end-$addr_start-1);
+ $pos = $addr_end+1;
+ break;
+ case '(': /* rip off comments */
+ $addr_start = $pos;
+ $pos = strpos($address,')');
+ if ($pos !== false) {
+ $comment = substr($address, $addr_start+1,($pos-$addr_start-1));
+ $address_start = substr($address, 0, $addr_start);
+ $address_end = substr($address, $pos + 1);
+ $address = $address_start . $address_end;
+ }
+ $j = strlen($address);
+ $pos = $addr_start + 1;
+ break;
+ case ',': /* we reached a delimiter */
+ if ($addr == '') {
+ $addr = substr($address, 0, $pos);
+ } else if ($personal == '') {
+ $personal = trim(substr($address, 0, $addr_start));
+ }
+ if (!$personal && $comment) $personal = $comment;
+ if ($personal) $personal = decodeHeader($personal);
+ $addr_ar[] = array($addr,$personal);
+ $address = trim(substr($address, $pos+1));
+ $j = strlen($address);
+ $pos = 0;
+ $personal = '';
+ $addr = '';
+ break;
+ case ':': /* process the group addresses */
+ /* group marker */
+ $group = substr($address, 0, $pos);
+ $address = substr($address, $pos+1);
+ $result = parseAddress($address, $max, $addr_ar, $group);
+ $addr_ar = $result[0];
+ $pos = $result[1];
+ $address = substr($address, $pos++);
+ $j = strlen($address);
+ $group = '';
+ break;
+ case ';':
+ if ($group) {
+ $address = substr($address, 0, $pos - 1);
+ }
+ ++$pos;
+ break;
+ default:
+ ++$pos;
+ break;
}
}
- elseif ( ereg('\((.*)\)', $string, $regs) ) {
- if( ( $regs[1] == '' ) || ( $regs[1] == ' ' ) ){
- if ( ereg('^(.+) \(', $string, $regs) ) {
- $string = ereg_replace( ' \(\)$', '', $string );
- } else {
- $string = ' ';
- }
- } else {
- $string = $regs[1];
- }
+ if ($addr == '') {
+ $addr = substr($address, 0, $pos);
+ } else if ($personal == '') {
+ $personal = trim(substr($address, 0, $addr_start));
}
- else {
- $string = str_replace ('"', '', sqimap_find_email($string));
+ if (!$personal && $comment) $personal = $comment;
+ $email = $addr;
+ if ($group && $addr == '') { /* no addresses found in group */
+ $personal = $group;
+ $addr_ar[] = array('',$personal);
+ return (array($addr_ar,$pos+1 ));
+ } elseif ($group) {
+ $addr_ar[] = array($addr,$personal);
+ return (array($addr_ar,$pos+1 ));
+ } else {
+ if ($personal || $addr) {
+ $addr_ar[] = array($addr, $personal);
+ }
}
-
- return trim($string);
+ return ($addr_ar);
}
/*
$regs = array(false,false);
while (isset($read_ary[$i])) {
if (preg_match('/UNSEEN\s+([0-9]+)/i', $read_ary[$i], $regs)) {
- $unseen = $regs[1];
- }
+ $unseen = $regs[1];
+ }
if (preg_match('/MESSAGES\s+([0-9]+)/i', $read_ary[$i], $regs)) {
- $messages = $regs[1];
- }
+ $messages = $regs[1];
+ }
if (preg_match('/RECENT\s+([0-9]+)/i', $read_ary[$i], $regs)) {
- $recent = $regs[1];
- }
+ $recent = $regs[1];
+ }
$i++;
}
return array('MESSAGES' => $messages, 'UNSEEN'=>$unseen, 'RECENT' => $recent);
if (preg_match("/(.*)(BAD|NO)(.*)$/", $tmp, $regs)) {
set_up_language($squirrelmail_language);
require_once(SM_PATH . 'functions/display_messages.php');
- $reason = $regs[3];
- if ($regs[2] == 'NO') {
- $string = "<b><font color=$color[2]>\n" .
- _("ERROR : Could not append message to") ." $folder." .
- "</b><br>\n" .
- _("Server responded: ") .
- $reason . "<br>\n";
- if (preg_match("/(.*)(quota)(.*)$/i", $reason, $regs)) {
- $string .= _("Solution: ") .
- _("Remove unneccessary messages from your folder and start with your Trash folder.")
- ."<br>\n";
- }
- $string .= "</font>\n";
- error_box($string,$color);
- } else {
+ $reason = $regs[3];
+ if ($regs[2] == 'NO') {
+ $string = "<b><font color=$color[2]>\n" .
+ _("ERROR : Could not append message to") ." $folder." .
+ "</b><br>\n" .
+ _("Server responded: ") .
+ $reason . "<br>\n";
+ if (preg_match("/(.*)(quota)(.*)$/i", $reason, $regs)) {
+ $string .= _("Solution: ") .
+ _("Remove unneccessary messages from your folder and start with your Trash folder.")
+ ."<br>\n";
+ }
+ $string .= "</font>\n";
+ error_box($string,$color);
+ } else {
$string = "<b><font color=$color[2]>\n" .
- _("ERROR : Bad or malformed request.") .
- "</b><br>\n" .
- _("Server responded: ") .
- $tmp . "</font><br>\n";
- error_box($string,$color);
+ _("ERROR : Bad or malformed request.") .
+ "</b><br>\n" .
+ _("Server responded: ") .
+ $tmp . "</font><br>\n";
+ error_box($string,$color);
exit;
- }
+ }
}
}
$read = sqimap_run_command ($imap_stream, "STORE $msgs_id ".$set_string."FLAGS ($flag)", $handle_errors, $response, $message, $uid_support);
}
-
-/* Returns some general header information -- FROM, DATE, and SUBJECT */
-class small_header {
- var $from = '', $subject = '', $date = '', $to = '',
- $priority = 0, $message_id = 0, $cc = '', $uid = '';
-}
-
function sqimap_get_small_header ($imap_stream, $id, $sent) {
- $res = sqimap_get_small_header_list($imap_stream, array($id), $sent);
+ $res = sqimap_get_small_header_list($imap_stream, $id, $sent);
return $res[0];
}
if ($uid_support) {
if (isset($mbxresponse['UIDNEXT']) && $mbxresponse['UIDNEXT']) {
- $uidnext = $mbxresponse['UIDNEXT']-1;
- } else {
- $uidnext = '*';
- }
+ $uidnext = $mbxresponse['UIDNEXT']-1;
+ } else {
+ $uidnext = '*';
+ }
$uid_query = "$sid SEARCH UID 1:$uidnext\r\n";
fputs($imap_stream, $uid_query);
$uids = sqimap_read_data($imap_stream, $sid, true ,$response, $message);
$sid = sqimap_session_id($uid_support);
$maxmsg = sizeof($msg_list);
+
$msgs_str = sqimap_message_list_squisher($msg_list);
$messages = array();
$read_list = array();
$internaldate = getPref($data_dir, $username, 'internal_date_sort');
if ($internaldate) {
- $query = "$sid FETCH $msgs_str (FLAGS UID RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject X-Priority Content-Type)])\r\n";
+ $query = "$sid FETCH $msgs_str (FLAGS UID RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Content-Type)])\r\n";
} else {
- $query = "$sid FETCH $msgs_str (FLAGS UID RFC822.SIZE BODY.PEEK[HEADER.FIELDS (Date To From Cc Subject X-Priority Content-Type)])\r\n";
+ $query = "$sid FETCH $msgs_str (FLAGS UID RFC822.SIZE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Content-Type)])\r\n";
}
fputs ($imap_stream, $query);
$readin_list = sqimap_read_data_list($imap_stream, $sid, false, $response, $message);
if (preg_match ($regpattern, $read_part, $regs)) {
switch ($id) {
case 1:
- $to = $regs[1];
+ $to = trim($regs[1]);
break;
case 2:
- $from = $regs[1];
+ $from = trim($regs[1]);
break;
case 3:
$priority = $regs[1];
break;
case 4:
- $cc = $regs[1];
+ $cc = trim($regs[1]);
break;
case 5:
$date = $regs[1];
break;
case 6:
- $subject = htmlspecialchars(trim($regs[1]));
+ $subject = trim($regs[1]);
if ($subject == "") {
$subject = _("(no subject)");
}
$messages[$msgi]['TIME_STAMP'] = getTimeStamp($tmpdate);
$messages[$msgi]['DATE_STRING'] = getDateString($messages[$msgi]['TIME_STAMP']);
- $messages[$msgi]['FROM'] = decodeHeader($from);
- $messages[$msgi]['SUBJECT'] = decodeHeader($subject);
- $messages[$msgi]['TO'] = decodeHeader($to);
+ $messages[$msgi]['FROM'] = parseAddress($from);
+ $messages[$msgi]['SUBJECT'] = $subject;
+// if (handleAsSent($mailbox)) {
+ $messages[$msgi]['TO'] = parseAddress($to);
+// }
$messages[$msgi]['PRIORITY'] = $priority;
- $messages[$msgi]['CC'] = $cc;
+ $messages[$msgi]['CC'] = parseAddress($cc);
$messages[$msgi]['SIZE'] = $size;
$messages[$msgi]['TYPE0'] = $type[0];
$messages[$msgi]['FLAG_DELETED'] = $flag_deleted;
/* non server sort stuff */
if (!$allow_server_sort) {
- $messages[$msgi]['FROM-SORT'] = strtolower(sqimap_find_displayable_name(decodeHeader($from)));
+ $from = parseAddress($from);
+ if ($from[0][1]) {
+ $from = decodeHeader($from[0][1]);
+ } else {
+ $from = $from[0][0];
+ }
+ $messages[$msgi]['FROM-SORT'] = $from;
$subject_sort = strtolower(decodeHeader($subject));
if (preg_match("/^(vedr|sv|re|aw):\s*(.*)$/si", $subject_sort, $matches)){
$messages[$msgi]['SUBJECT-SORT'] = $matches[2];
foreach ($readin_list as $r) {
$r = implode('',$r);
/* first we unfold the header */
- $r = str_replace(array("\r\n\t","\r\n\s"),array('',''),$r);
- /*
- * now we can make a new header array with each element representing
- * a headerline
- */
- $r = explode("\r\n" , $r);
+ $r = str_replace(array("\r\n\t","\r\n\s"),array('',''),$r);
+ /*
+ * now we can make a new header array with each element representing
+ * a headerline
+ */
+ $r = explode("\r\n" , $r);
if (!$uid_support) {
if (!preg_match("/^\\*\s+([0-9]+)\s+FETCH/iAU",$r[0], $regs)) {
set_up_language($squirrelmail_language);
_("Unknown response from IMAP server: ") . ' 1.' .
$r[0] . "</font><br>\n";
} else {
- $id = $regs[2];
+ $id = $regs[2];
}
}
- $field = $r[1];
- $field = substr($field,strlen($field)+2);
- $result[] = array($id,$field);
+ $field = $r[1];
+ $field = substr($field,strlen($field)+2);
+ $result[] = array($id,$field);
}
return $result;
}
return $header;
}
-
-/* Wrapper function that returns entity headers for use by decodeMime */
-/*
-function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bound, &$encoding, &$charset, &$filename) {
- $header = sqimap_get_header($imap_stream, $read);
- $type0 = $header["TYPE0"];
- $type1 = $header["TYPE1"];
- $bound = $header["BOUNDARY"];
- $encoding = $header["ENCODING"];
- $charset = $header["CHARSET"];
- $filename = $header["FILENAME"];
-}
-
/* function to get the mime headers */
function sqimap_get_mime_ent_header ($imap_stream, $id, $mailbox, $ent) {
global $uid_support;
return $header;
}
-/* Returns the body of a message. */
-function sqimap_get_message_body ($imap_stream, &$header) {
-// return decodeMime($imap_stream, $header->id);
-}
-
?>
/* Default value for page_selector_max. */
define('PG_SEL_MAX', 10);
+function elapsed($start)
+{
+ $end = microtime();
+ list($start2, $start1) = explode(" ", $start);
+ list($end2, $end1) = explode(" ", $end);
+ $diff1 = $end1 - $start1;
+ $diff2 = $end2 - $start2;
+ if( $diff2 < 0 ){
+ $diff1 -= 1;
+ $diff2 += 1.0;
+ }
+ return $diff2 + $diff1;
+}
+
function printMessageInfo($imapConnection, $t, $not_last=true, $key, $mailbox,
$start_msg, $where, $what) {
global $checkall,
if (handleAsSent($mailbox)) {
$msg['FROM'] = $msg['TO'];
+ }
/*
* This is done in case you're looking into Sent folders,
* because you can have multiple receivers.
*/
- $senderNames = explode(',', $msg['FROM']);
- $senderName = '';
- if (sizeof($senderNames)){
- foreach ($senderNames as $senderNames_part) {
+
+ $senderNames = $msg['FROM'];
+ $senderName = '';
+ if (sizeof($senderNames)){
+ foreach ($senderNames as $senderNames_part) {
if ($senderName != '') {
$senderName .= ', ';
}
- $senderName .= sqimap_find_displayable_name($senderNames_part);
- }
- }
- } else {
- $senderName = sqimap_find_displayable_name($msg['FROM']);
- }
+ if ($senderNames_part[1]) {
+ $senderName .= decodeHeader($senderNames_part[1]);
+ } else {
+ $senderName .= htmlspecialchars($senderNames_part[0]);
+ }
+ }
+ }
+
- $subject = processSubject($msg['SUBJECT'], $indent_array[$msg['ID']]);
+ $subject = processSubject(decodeHeader($msg['SUBJECT']), $indent_array[$msg['ID']]);
echo html_tag( 'tr','','','','VALIGN="top"') . "\n";
$high_val = strtolower($message_highlight_list_part['value']);
$match_type = strtoupper($message_highlight_list_part['match_type']);
if ($match_type == 'TO_CC') {
- if (strstr('^^' . strtolower($msg['TO']), $high_val) ||
- strstr('^^' . strtolower($msg['CC']), $high_val)) {
- $hlt_color = $message_highlight_list_part['color'];
- continue;
+ foreach ($msg['TO'] as $address) {
+ if (strstr('^^' . strtolower($address[0]), $high_val) ||
+ strstr('^^' . strtolower($address[1]), $high_val)) {
+ $hlt_color = $message_highlight_list_part['color'];
+ continue;
+ }
+ }
+ foreach ($msg['CC'] as $address) {
+ if( strstr('^^' . strtolower($address[0]), $high_val) ||
+ strstr('^^' . strtolower($address[1]), $high_val)) {
+ $hlt_color = $message_highlight_list_part['color'];
+ continue;
+ }
}
} else {
if (strstr('^^' . strtolower($msg[$match_type]), $high_val)) {
break;
case 2: /* from */
echo html_tag( 'td',
- $italic . $bold . $flag . $fontstr . htmlentities($senderName) .
+ $italic . $bold . $flag . $fontstr . $senderName .
$fontstr_end . $flag_end . $bold_end . $italic_end,
'left',
$hlt_color );
$td_str .= '<a href="read_body.php?mailbox='.$urlMailbox
. '&passed_id='. $msg["ID"]
. '&startMessage='.$start_msg.$searchstr.'"';
- $td_str .= ' ' .concat_hook_function('subject_link');
+ do_hook("subject_link");
if ($subject != $msg['SUBJECT']) {
$title = get_html_translation_table(HTML_SPECIALCHARS);
$title = array_flip($title);
function getServerMessages($imapConnection, $start_msg, $show_num, $num_msgs, $id) {
if ($id != 'no') {
- if ($start_msg + ($show_num - 1) < $num_msgs) {
- $end_msg = $start_msg + ($show_num-1);
- } else {
- $end_msg = $num_msgs;
- }
- $id = array_slice($id, ($start_msg-1), ($end_msg));
-
+ $id = array_slice($id, ($start_msg-1), $show_num);
$end = $start_msg + $show_num - 1;
if ($num_msgs < $show_num) {
$end_loop = $num_msgs;
$start_msg = 1;
}
}
- $id = array_slice(array_reverse($id), ($start_msg-1), ($end_msg));
+ $id = array_slice(array_reverse($id), ($start_msg-1), $show_num);
$end = $start_msg + $show_num - 1;
if ($num_msgs < $show_num) {
$end_loop = $num_msgs;
$end_loop = $show_num;
}
}
- $msgs = fillMessageArray($imapConnection,$id,$end_loop);
+ $msgs = fillMessageArray($imapConnection,$id,$end_loop, $mailbox);
}
return $msgs;
}
global $msgs, $msort, $auto_expunge, $thread_sort_messages,
$allow_server_sort, $server_sort_order;
+ $start = microtime();
/* If autoexpunge is turned on, then do it now. */
$mbxresponse = sqimap_mailbox_select($imapConnection, $mailbox);
$srt = $sort;
mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color);
echo '</td></tr></table>';
+ $t = elapsed($start);
+ echo("elapsed time = $t seconds\n");
}
function calc_msort($msgs, $sort) {
sqWordWrap($line, $wrap_at);
}
$line = charset_decode($charset, $line);
- $line = htmlspecialchars($line);
$line = str_replace("\t", ' ', $line);
parseUrl ($line);
$body = '<pre>' . implode("\n", $body_ary) . '</pre>';
}
-
/* This returns a parsed string called $body. That string can then
* be displayed as the actual message in the HTML. It contains
* everything needed, including HTML Tags, Attachments at the
if ($type0 =='message' && $type1 == 'rfc822') {
$default_page = '../src/read_body.php';
$rfc822_header = $att->rfc822_header;
- $filename = decodeHeader($rfc822_header->subject);
+ $filename = $rfc822_header->subject;
if (trim( $filename ) == '') {
$filename = 'untitled-[' . $ent . ']' ;
}
} else {
$from_name = _("Unknown sender");
}
- $from_name = decodeHeader(htmlspecialchars($from_name));
+ $from_name = decodeHeader(($from_name));
$description = $from_name;
} else {
$default_page = '../src/download.php';
if (is_object($header->disposition)) {
- $filename = decodeHeader($header->disposition->getProperty('filename'));
+ $filename = $header->disposition->getProperty('filename');
if (trim($filename) == '') {
$name = decodeHeader($header->disposition->getProperty('name'));
if (trim($name) == '') {
- $name = decodeHeader($header->getParameter('name'));
+ $name = $header->getParameter('name');
if(trim($name) == '') {
if (trim( $header->id ) == '') {
$filename = 'untitled-[' . $ent . ']' ;
}
}
} else {
- $filename = decodeHeader($header->getParameter('name'));
+ $filename = $header->getParameter('name');
if (!trim($filename)) {
if (trim( $header->id ) == '') {
$filename = 'untitled-[' . $ent . ']' ;
}
}
if ($header->description) {
- $description = htmlspecialchars($header->description);
+ $description = decodeHeader($header->description);
} else {
$description = '';
}
$defaultlink = $hookresults[6];
$attachments .= '<TR><TD>' .
- '<A HREF="'.$defaultlink.'">'.htmlspecialchars($display_filename).'</A> </TD>' .
+ '<A HREF="'.$defaultlink.'">'.decodeHeader($display_filename).'</A> </TD>' .
'<TD><SMALL><b>' . show_readable_size($header->size) .
'</b> </small></TD>' .
"<TD><SMALL>[ $type0/$type1 ] </SMALL></TD>" .
* RFC1522 (MIME Part Two: Message Header Extensions for Non-ASCII Text).
* Patched by Christian Schmidt <christian@ostenfeld.dk> 23/03/2002
*/
-function decodeHeader ($string, $utfencode=true) {
+function decodeHeader ($string, $utfencode=true,$htmlsave=true) {
global $languages, $squirrelmail_language;
if (is_array($string)) {
$string = implode("\n", $string);
}
$i = 0;
- while (preg_match('/^(.{' . $i . '})(.*)=\?([^?]*)\?(Q|B)\?([^?]*)\?=/Ui',
- $string, $res)) {
- $prefix = $res[1];
- /* Ignore white-space between consecutive encoded-words. */
- if (strspn($res[2], " \t") != strlen($res[2])) {
- $prefix .= $res[2];
- }
-
- if (ucfirst($res[4]) == 'B') {
- $replace = base64_decode($res[5]);
- $replace = charset_decode($res[3],$replace);
-
- } else {
- $replace = str_replace('_', ' ', $res[5]);
- $replace = preg_replace('/=([0-9a-f]{2})/ie', 'chr(hexdec("\1"))',
+ $aString = explode(' ',$string);
+ foreach ($aString as $chunk) {
+ $encoded = false;
+ $aString[$i] = '';
+ while (preg_match('/^(.*)=\?([^?]*)\?(Q|B)\?([^?]*)\?=(.*)$/Ui',$chunk,$res)) {
+ $aString[$i] .= $res[1];
+ $encoding = ucfirst($res[3]);
+ switch ($encoding)
+ {
+ case 'B':
+ $replace = base64_decode($res[4]);
+ $aString[$i] .= charset_decode($res[2],$replace);
+ break;
+ case 'Q':
+
+ $replace = str_replace('_', ' ', $res[4]);
+ $replace = preg_replace('/=([0-9a-f]{2})/ie', 'chr(hexdec("\1"))',
$replace);
- /* Only encode into entities by default. Some places
- * don't need the encoding, like the compose form.
- */
- if ($utfencode) {
- $replace = charset_decode($res[3], $replace);
+ /* Only encode into entities by default. Some places
+ * don't need the encoding, like the compose form.
+ */
+ if ($utfencode) {
+ $replace = charset_decode($res[2], $replace);
+ } else {
+ if ($htmlsave) {
+ $replace = htmlspecialchars($res[4]);
+ }
+ }
+ $aString[$i] .= $replace;
+ break;
+ default:
+ break;
}
+ $chunk = $res[5];
+ $encoded = true;
+ }
+ if (!$encoded && $htmlsave) {
+ $aString[$i] = htmlspecialchars($chunk);
+ } else {
+ $aString[$i] .= $chunk;
}
- $string = $prefix . $replace . substr($string, strlen($res[0]));
- $i = strlen($prefix) + strlen($replace);
+ ++$i;
+ }
+ if (!$htmlsave) {
+ return implode(' ',$aString);
+ } else {
+ return implode(' ',$aString);
}
- return $string;
}
/*
// Encode only if the string contains 8-bit characters or =?
$j = strlen($string);
$l = strstr($string, '=?'); // Must be encoded ?
+ $max_l = 75 - strlen($default_charset) - 7;
+ $aRet = array();
$ret = '';
+ $cur_l = 0;
for($i = 0; $i < $j; ++$i) {
switch($string{$i}) {
case '=':
+ $cur_l+=3;
+ if ($cur_l > $max_l) {
+ $aRet[] = "=?$default_charset?Q?$ret?=";
+ $cur_l = 3;
+ $ret = '';
+ }
$ret .= '=3D';
break;
case '?':
+ $cur_l+=3;
+ if ($cur_l > $max_l) {
+ $aRet[] = "=?$default_charset?Q?$ret?=";
+ $cur_l = 3;
+ $ret = '';
+ }
$ret .= '=3F';
break;
case '_':
+ $cur_l+=3;
+ if ($cur_l > $max_l) {
+ $aRet[] = "=?$default_charset?Q?$ret?=";
+ $cur_l = 3;
+ $ret = '';
+ }
$ret .= '=5F';
break;
case ' ':
+ $cur_l++;
+ if ($cur_l > $max_l) {
+ $aRet[] = "=?$default_charset?Q?$ret?=";
+ $cur_l = 1;
+ $ret = '';
+ }
$ret .= '_';
break;
default:
$k = ord($string{$i});
if ($k > 126) {
- $ret .= sprintf("=%02X", $k);
+ $s = sprintf("=%02X", $k);
+ $cur_l += strlen($s);
+ if ($cur_l > $max_l) {
+ $aRet[] = "=?$default_charset?Q?$ret?=";
+ $cur_l = strlen($s);
+ $ret = '';
+ }
+ $ret .= $s;
$l = TRUE;
} else {
+ $cur_l++;
+ if ($cur_l > $max_l) {
+ $aRet[] = "=?$default_charset?Q?$ret?=";
+ $cur_l = 1;
+ $ret = '';
+ }
$ret .= $string{$i};
}
break;
}
if ($l) {
- $string = "=?$default_charset?Q?$ret?=";
+ $string = implode('',$aRet) . "=?$default_charset?Q?$ret?=";
}
return $string;
$content = preg_replace("|url\(([\'\"])\s*https*:.*?([\'\"])\)|si",
"url(\\1$secremoveimg\\2)", $content);
}
-
+
/**
* Fix urls that refer to cid:
*/
projects / squirrelmail.git / commitdiff