From a9bad541ddc7b4a31b7b4479461e7903d841383d Mon Sep 17 00:00:00 2001 From: fidian Date: Wed, 31 Jan 2001 17:13:11 +0000 Subject: [PATCH] All strings that have an escape sequence must not be 'string' \n, \r, \209 are all escape sequences. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1005 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/abook_local_file.php | 6 +++--- functions/url_parser.php | 4 ++-- src/compose.php | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php index 12e588e3..09446765 100644 --- a/functions/abook_local_file.php +++ b/functions/abook_local_file.php @@ -132,7 +132,7 @@ for($i = 0 ; $i < sizeof($rows) ; $i++) { if(is_array($rows[$i])) - fwrite($newfh, join('|', $rows[$i]) . '\n'); + fwrite($newfh, join('|', $rows[$i]) . "\n"); } fclose($newfh); @@ -237,9 +237,9 @@ $userdata['lastname'] . '|' . $userdata['email'] . '|' . $userdata['label']; // Strip linefeeds - $data = ereg_replace('[\r\n]', ' ', $data); + $data = ereg_replace("[\r\n]", ' ', $data); // Add linefeed at end - $data = $data . '\n'; + $data = $data . "\n"; // Reopen file, just to be sure $this->open(true); diff --git a/functions/url_parser.php b/functions/url_parser.php index cf6fc3d9..f7ab7e56 100644 --- a/functions/url_parser.php +++ b/functions/url_parser.php @@ -63,9 +63,9 @@ 'gopher://', 'news://'); - $poss_ends = array(' ', '\n', '\r', '<', '>', '.\r', '.\n', '. ', + $poss_ends = array(' ', "\n", "\r", '<', '>', ".\r", ".\n", '. ', ' ', ')', '(', '"', '<', '>', '.<', ']', '[', '{', - '}', '\240'); + '}', "\240"); $start = 0; $target_pos = strlen($body); diff --git a/src/compose.php b/src/compose.php index 3a37f54f..33e7d0fc 100644 --- a/src/compose.php +++ b/src/compose.php @@ -176,11 +176,6 @@ // Write Attachment to file $fp = fopen ($attachment_dir.$localfilename, "w"); fputs ($fp, decodeBody(mime_fetch_body($imapConnection, $forward_id, $message->header->entity_id), $message->header->encoding)); - -// Don't know why these lines were included -// fgets($imapConnection, 256); -// fgets($imapConnection, 256); - fclose ($fp); $attachments[$localfilename] = $filename; -- 2.25.1