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

diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php
index 12e588e32c051ec5aa68c15b406d6ab8f6610db4..094467650af3daa73e04628a12373390fd7fd958 100644 (file)
--- 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 cf6fc3d9fb5e9d187a014fde0990f28d027acf78..f7ab7e567ff38b1b0638aff977adaad0093d60c3 100644 (file)
--- a/functions/url_parser.php
+++ b/functions/url_parser.php
@@ -63,9 +63,9 @@
          'gopher://',
          'news://');
 
-      $poss_ends = array(' ', '\n', '\r', '<', '>', '.\r', '.\n', '.&nbsp;', 
+      $poss_ends = array(' ', "\n", "\r", '<', '>', ".\r", ".\n", '.&nbsp;', 
          '&nbsp;', ')', '(', '&quot;', '&lt;', '&gt;', '.<', ']', '[', '{', 
-         '}', '\240');
+         '}', "\240");
 
       $start = 0;
       $target_pos = strlen($body);

diff --git a/src/compose.php b/src/compose.php
index 3a37f54f958a10e2f2958ebd1efb589e1c6846d6..33e7d0fc0c9c37a1ab5554ca2af99367b25dcc8b 100644 (file)
--- 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;