From ea87de815434f4fe71388a967a93a22eb1c54cb6 Mon Sep 17 00:00:00 2001 From: jervfors Date: Wed, 9 Nov 2005 23:45:20 +0000 Subject: [PATCH] Formatting as in STABLE git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10320 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- class/deliver/Deliver.class.php | 10 ++++++---- class/deliver/Deliver_IMAP.class.php | 1 - class/helper/VCard.class.php | 1 + class/mime/Message.class.php | 29 ++++++++++++++-------------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php index 04e121ef..3dcf6114 100644 --- a/class/deliver/Deliver.class.php +++ b/class/deliver/Deliver.class.php @@ -427,7 +427,7 @@ class Deliver { * webmail installation does not prevent changes in user's email address. * See SquirrelMail bug tracker #847107 for more details about it. */ - if (isset($encode_header_key) && + if (isset($encode_header_key) && trim($encode_header_key)!='') { // use encoded headers, if encryption key is set and not empty $header[] = 'X-Squirrel-UserHash: '.OneTimePadEncrypt($username,base64_encode($encode_header_key)).$rn; @@ -445,7 +445,7 @@ class Deliver { /* Insert the rest of the header fields */ $header[] = 'Message-ID: '. $message_id . $rn; - if (is_object($reply_rfc822_header) && + if (is_object($reply_rfc822_header) && isset($reply_rfc822_header->message_id) && $reply_rfc822_header->message_id) { $rep_message_id = $reply_rfc822_header->message_id; @@ -458,7 +458,8 @@ class Deliver { $header[] = 'Subject: '.encodeHeader($rfc822_header->subject) . $rn; $header[] = 'From: '. $rfc822_header->getAddr_s('from',",$rn ",true) . $rn; - // folding address list [From|To|Cc|Bcc] happens by using ",$rn" as delimiter + // folding address list [From|To|Cc|Bcc] happens by using ",$rn" + // as delimiter // Do not use foldLine for that. // RFC2822 if from contains more then 1 address @@ -736,7 +737,7 @@ class Deliver { * Function is used to convert ipv4 and ipv6 addresses to hex strings. * It removes all delimiter symbols from ip addresses, converts decimal * ipv4 numbers to hex and pads strings in order to present full length - * address. ipv4 addresses are represented as 8 byte strings, ipv6 addresses + * address. ipv4 addresses are represented as 8 byte strings, ipv6 addresses * are represented as 32 byte string. * * If function fails to detect address format, it returns unprocessed string. @@ -791,4 +792,5 @@ class Deliver { return $ret; } } + ?> \ No newline at end of file diff --git a/class/deliver/Deliver_IMAP.class.php b/class/deliver/Deliver_IMAP.class.php index 4d5b1d29..1a2d98a9 100644 --- a/class/deliver/Deliver_IMAP.class.php +++ b/class/deliver/Deliver_IMAP.class.php @@ -29,5 +29,4 @@ class Deliver_IMAP extends Deliver { imap-class */ } - ?> \ No newline at end of file diff --git a/class/helper/VCard.class.php b/class/helper/VCard.class.php index d4bff440..2c5b7f4c 100644 --- a/class/helper/VCard.class.php +++ b/class/helper/VCard.class.php @@ -40,4 +40,5 @@ class VCard { return $array; } } + ?> \ No newline at end of file diff --git a/class/mime/Message.class.php b/class/mime/Message.class.php index 2d54b359..1e516d54 100644 --- a/class/mime/Message.class.php +++ b/class/mime/Message.class.php @@ -14,12 +14,12 @@ */ /** - * The object that contains a message + * The object that contains a message. * - * message is the object that contains messages. It is a recursive - * object in that through the $entities variable, it can contain - * more objects of type message. See documentation in mime.txt for - * a better description of how this works. + * message is the object that contains messages. It is a recursive object in + * that through the $entities variable, it can contain more objects of type + * message. See documentation in mime.txt for a better description of how this + * works. * @package squirrelmail * @subpackage mime * @since 1.3.0 @@ -119,9 +119,8 @@ class Message { */ var $length = 0; /** - * Local attachment filename - * location where the tempory attachment - * is stored. For use in delivery class. + * Local attachment filename location where the tempory attachment is + * stored. For use in delivery class. * @var string */ var $att_local_name = ''; @@ -896,9 +895,9 @@ class Message { } else { /* Treat as multipart/mixed */ foreach ($this->entities as $ent) { if(!(is_object($ent->header->disposition) && strtolower($ent->header->disposition->name) == 'attachment') && - (!isset($ent->header->parameters['filename'])) && - (!isset($ent->header->parameters['name'])) && - (($ent->type0 != 'message') && ($ent->type1 != 'rfc822'))) { + (!isset($ent->header->parameters['filename'])) && + (!isset($ent->header->parameters['name'])) && + (($ent->type0 != 'message') && ($ent->type1 != 'rfc822'))) { $entity = $ent->findDisplayEntity($entity, $alt_order, $strict); $found = true; } @@ -910,10 +909,10 @@ class Message { foreach ($alt_order as $alt) { if( ($alt == $type) && isset($this->entity_id) ) { if ((count($this->entities) == 0) && - (!isset($this->header->parameters['filename'])) && - (!isset($this->header->parameters['name'])) && - isset($this->header->disposition) && is_object($this->header->disposition) && - !(is_object($this->header->disposition) && strtolower($this->header->disposition->name) == 'attachment')) { + (!isset($this->header->parameters['filename'])) && + (!isset($this->header->parameters['name'])) && + isset($this->header->disposition) && is_object($this->header->disposition) && + !(is_object($this->header->disposition) && strtolower($this->header->disposition->name) == 'attachment')) { $entity[] = $this->entity_id; $found = true; } -- 2.25.1