forked from extern/egroupware
formatting
This commit is contained in:
parent
3861b64b16
commit
f8ee781c06
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/**************************************************************************\
|
||||
* phpGroupWare Email - POP3 Mail Wrapper for Imap Enabled PHP *
|
||||
* http://www.phpgroupware.org/ * *
|
||||
* http://www.phpgroupware.org/ *
|
||||
* -------------------------------------------------------------------------*
|
||||
* This library is part of phpGroupWare (http://www.phpgroupware.org) *
|
||||
* This library is free software; you can redistribute it and/or modify it *
|
||||
@ -248,5 +248,4 @@
|
||||
$folder_str = $GLOBALS['phpgw']->msg->get_folder_short($folder);
|
||||
return $folder_str;
|
||||
}
|
||||
|
||||
} // end of class msg
|
||||
|
@ -21,6 +21,8 @@
|
||||
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
|
||||
\**************************************************************************/
|
||||
|
||||
/* $Id$ */
|
||||
|
||||
/*!
|
||||
@class msg (sockets)
|
||||
@abstract part of mail Data Communications class
|
||||
@ -248,7 +250,6 @@
|
||||
return $return_num_msg;
|
||||
}
|
||||
|
||||
|
||||
/**************************************************************************\
|
||||
* Message Sorting
|
||||
\**************************************************************************/
|
||||
@ -1134,7 +1135,8 @@
|
||||
$info->ifparameters = true;
|
||||
break;
|
||||
*/
|
||||
default : break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1360,7 +1362,7 @@
|
||||
case 'image' : $type_int = TYPEIMAGE; break;
|
||||
case 'video' : $type_int = TYPEVIDEO; break;
|
||||
// this causes errors under php 4.0.6, but used to work before that, I think
|
||||
//defaut : $type_int = TYPEOTHER; break;
|
||||
//default : $type_int = TYPEOTHER; break;
|
||||
}
|
||||
return $type_int;
|
||||
}
|
||||
@ -1421,7 +1423,7 @@
|
||||
case '8bit' : $encoding_int = ENC8BIT; break;
|
||||
case 'binary' : $encoding_int = ENCBINARY; break;
|
||||
case 'base64' : $encoding_int = ENCBASE64; break;
|
||||
case 'quoted-printable' : $encoding_int = ENCQUOTEDPRINTABLE; break;
|
||||
case 'quoted-printable': $encoding_int = ENCQUOTEDPRINTABLE; break;
|
||||
case 'other' : $encoding_int = ENCOTHER; break;
|
||||
case 'uu' : $encoding_int = ENCUU; break;
|
||||
default : $encoding_int = ENCOTHER; break;
|
||||
@ -1489,12 +1491,12 @@
|
||||
$content = trim(substr($header_array[$i],$pos+1));
|
||||
switch ($keyword)
|
||||
{
|
||||
case 'date:' :
|
||||
case 'date:':
|
||||
$info->date = $content;
|
||||
$info->udate = $this->make_udate($content);
|
||||
break;
|
||||
case 'subject' :
|
||||
case 'subject:' :
|
||||
case 'subject':
|
||||
case 'subject:':
|
||||
$pos = strpos($header_array[$i+1],' ');
|
||||
if (is_int($pos) && !$pos)
|
||||
{
|
||||
@ -1503,59 +1505,59 @@
|
||||
$info->subject = htmlspecialchars($content);
|
||||
$info->Subject = htmlspecialchars($content);
|
||||
break;
|
||||
case 'in-reply-to:' :
|
||||
case 'in-reply-to:':
|
||||
$info->in_reply_to = htmlspecialchars($content);
|
||||
break;
|
||||
case 'message-id' :
|
||||
case 'message-id:' :
|
||||
case 'message-id':
|
||||
case 'message-id:':
|
||||
$info->message_id = htmlspecialchars($content);
|
||||
break;
|
||||
case 'newsgroups:' :
|
||||
case 'newsgroups:':
|
||||
$info->newsgroups = htmlspecialchars($content);
|
||||
break;
|
||||
case 'followup-to:' :
|
||||
case 'followup-to:':
|
||||
$info->follow_up_to = htmlspecialchars($content);
|
||||
break;
|
||||
case 'references:' :
|
||||
case 'references:':
|
||||
$info->references = htmlspecialchars($content);
|
||||
break;
|
||||
case 'to' :
|
||||
case 'to:' :
|
||||
case 'to':
|
||||
case 'to:':
|
||||
// following two lines need to be put into a loop!
|
||||
// NOTE: 3rd and 4th params to get_addr_details are REFERENCES
|
||||
$info->to = $this->get_addr_details('to',$content,&$header_array,&$i);
|
||||
break;
|
||||
case 'from' :
|
||||
case 'from:' :
|
||||
case 'from':
|
||||
case 'from:':
|
||||
// NOTE: 3rd and 4th params to get_addr_details are REFERENCES
|
||||
$info->from = $this->get_addr_details('from',$content,&$header_array,&$i);
|
||||
break;
|
||||
case 'cc' :
|
||||
case 'cc:' :
|
||||
case 'cc':
|
||||
case 'cc:':
|
||||
// NOTE: 3rd and 4th params to get_addr_details are REFERENCES
|
||||
$info->cc = $this->get_addr_details('cc',$content,&$header_array,&$i);
|
||||
break;
|
||||
case 'bcc' :
|
||||
case 'bcc:' :
|
||||
case 'bcc':
|
||||
case 'bcc:':
|
||||
// NOTE: 3rd and 4th params to get_addr_details are REFERENCES
|
||||
$info->bcc = $this->get_addr_details('bcc',$content,&$header_array,&$i);
|
||||
break;
|
||||
case 'reply-to' :
|
||||
case 'reply-to:' :
|
||||
case 'reply-to':
|
||||
case 'reply-to:':
|
||||
// NOTE: 3rd and 4th params to get_addr_details are REFERENCES
|
||||
$info->reply_to = $this->get_addr_details('reply_to',$content,&$header_array,&$i);
|
||||
break;
|
||||
case 'sender' :
|
||||
case 'sender:' :
|
||||
case 'sender':
|
||||
case 'sender:':
|
||||
// NOTE: 3rd and 4th params to get_addr_details are REFERENCES
|
||||
$info->sender = $this->get_addr_details('sender',$content,&$header_array,&$i);
|
||||
break;
|
||||
case 'return-path' :
|
||||
case 'return-path:' :
|
||||
case 'return-path':
|
||||
case 'return-path:':
|
||||
// NOTE: 3rd and 4th params to get_addr_details are REFERENCES
|
||||
$info->return_path = $this->get_addr_details('return_path',$content,&$header_array,&$i);
|
||||
break;
|
||||
default :
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user