fixed some html errors, added endlines

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@687 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 81426acf3a18e996b0a56ddc96af0fdedf3f8eb3..67fe8b7f5a414898f8527519b91a2bb69c447bd7 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -40,18 +40,18 @@
 
       if ($handle_errors == true) {
          if ($response == "NO") {
-            echo "<br><b><font color=$color[2]>";
+            echo "<br><b><font color=$color[2]>\n";
             echo _("ERROR : Could not complete request.");
-            echo "</b><br>";
+            echo "</b><br>\n";
             echo _("Reason Given: ");
-            echo "$message</font><br>";
+            echo "$message</font><br>\n";
             exit;
          } else if ($response == "BAD") {
-            echo "<br><b><font color=$color[2]>";
+            echo "<br><b><font color=$color[2]>\n";
             echo _("ERROR : Bad or malformed request.");
-            echo "</b><br>";
+            echo "</b><br>\n";
             echo _("Server responded: ");
-            echo "$message</font><br>";
+            echo "$message</font><br>\n";
             exit;
          }
       }

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 66f6dda6fe7922b6322d5bf70ddce18943da4629..ee858ed5d9fdf8bd11387ee4dccd9bb1beda7a56 100755 (executable)
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -35,9 +35,17 @@
    /******************************************************************************
     **  Selects a mailbox
     ******************************************************************************/
-   function sqimap_mailbox_select ($imap_stream, $mailbox, $hide=true) {
+   function sqimap_mailbox_select ($imap_stream, $mailbox, $hide=true, $recent=false) {
       fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
        $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
+      if ($recent) {
+         for ($i=0; $i<count($read); $i++) {
+            if (strpos(strtolower($read[$i]), "recent")) {
+               $r = explode(" ", $read[$i]);
+            }
+         }
+         return $r[1];
+      }
    }
 
    

diff --git a/functions/mime.php b/functions/mime.php
index 3bc9b5640a5d4c184cbda952dceb10d26d7ac79f..3bae25afc97c7b25fac5f1b746c2161548e2c3b4 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -68,7 +68,7 @@
    //   $read = strtolower($bodystructure);
       $read = $bodystructure;
 
-      if ($debug_mime) echo "<tt>$read</tt><br><br>";
+      if ($debug_mime) echo "<tt>$read</tt><br><br>\n";
       // isolate the body structure and remove beginning and end parenthesis
       $read = trim(substr ($read, strpos(strtolower($read), "bodystructure") + 13));
       $read = trim(substr ($read, 0, -1));
@@ -79,7 +79,7 @@
          $end = mime_match_parenthesis(0, $read);
       }
 
-      if ($debug_mime) echo "<tt>$read</tt><br><br>";
+      if ($debug_mime) echo "<tt>$read</tt><br><br>\n";
 
       $msg = mime_parse_structure ($read, 0);
       $msg->header = $header;
@@ -95,7 +95,7 @@
    // to mime_get_elements()
    function mime_parse_structure ($structure, $ent_id) {
       global $debug_mime;
-      if ($debug_mime) echo "<font color=008800><tt>START: mime_parse_structure()</tt></font><br>";
+      if ($debug_mime) echo "<font color=008800><tt>START: mime_parse_structure()</tt></font><br>\n";
       $msg = new message();
       if (substr($structure, 0, 1) == "(") {
          $ent_id = mime_new_element_level($ent_id);

diff --git a/functions/page_header.php b/functions/page_header.php
index ee5c66524ef17fe94074723d093ab4d913c03d41..22a8e0b1eba1892cab595b0b8c59639afa93118f 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -53,7 +53,7 @@
       
       do_hook ("generic_header");
 
-      echo "<TITLE>$title</TITLE>";
+      echo "<TITLE>$title</TITLE>\n";
       echo "</HEAD>\n\n";
    }
 

diff --git a/src/compose.php b/src/compose.php
index a1e43f78b0b3eccf959d9ee767b98369b8ee3c71..e4039614cf387a01469ff768d60398dfc84ea663 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -152,8 +152,8 @@
          echo "// --></SCRIPT>\n\n";
       }
 
-      echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\">\n";
-      //echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST>\n";
+      //echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\">\n";
+      echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST>\n";
       if ($reply_id) {
          echo "<input type=hidden name=reply_id value=$reply_id>\n";
       }                 

diff --git a/src/help.php b/src/help.php
index 3ef81b7cb80e4c080aa9fe39d6dfae0344c135c4..884b8fdda06e0ad013ff1b4e433be6cace883dc0 100644 (file)
--- a/src/help.php
+++ b/src/help.php
@@ -171,14 +171,14 @@
          else echo "<a href=\"../src/help.php?chapter=".($chapter-1)."\">Previous</a> | ";
          echo "<a href=\"../src/help.php\">Table of Contents</a>";
          if ($chapter >= count($helpdir)) echo " | <font color=\"$color[9]\">Next</font>";
-         else echo " | <a href=\"../src/help.php?chapter=".($chapter+1)."\">Next</a>";
+         else echo " | <a href=\"../src/help.php?chapter=".($chapter+1)."\">Next</a>\n";
          echo "</center></small><br>\n";
 
          echo "<font size=5><b>$chapter - $help_info[0]</b></font><br><br>\n";
          if ($help_info[1])
-            echo "$help_info[1]";
+            echo "$help_info[1]\n";
          else   
-            echo "<p>$help_info[2]</p>";
+            echo "<p>$help_info[2]</p>\n";
 
          for ($n = $help_info[3]; $n < count($doc); $n++) {
             $section++;
@@ -190,7 +190,7 @@
             $n = $help_info[3];
          }
 
-         echo "<br><center><a href=\"#pagetop\">" . _("Top") . "</a></center>";
+         echo "<br><center><a href=\"#pagetop\">" . _("Top") . "</a></center>\n";
       }
    }
    do_hook("help_bottom"); 

diff --git a/src/left_main.php b/src/left_main.php
index d6de4f84339266187a97f684ffa6093cd65ef4e0..39382ea096619b015c5099d110c3991845a2884d 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -40,6 +40,7 @@
 
    displayHtmlHeader();
 
+
    function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $unseen) {
                global $folder_prefix, $trash_folder, $sent_folder;
                global $color, $move_to_sent, $move_to_trash;
@@ -112,7 +113,7 @@
       echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">\n";
    }
    
-   echo "\n<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">\n\n";
+   echo "\n<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" LINK=\"$color[6]\" VLINK=\"$color[6]\" ALINK=\"$color[6]\">\n";
 
    do_hook("left_main_before");
 
@@ -146,7 +147,7 @@
       } else {
          $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
       }
-      echo "\n$line<BR>\n";
+      echo "$line<BR>\n";
    }
    sqimap_logout($imapConnection);
    do_hook("left_main_after");

diff --git a/src/right_main.php b/src/right_main.php
index 8db65bc666fbaeef84aa1047d794ae6c086ef9c9..1827afa1a256b6c419a84fd88eb742bab7c8862d 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -77,13 +77,13 @@
    do_hook("right_main_after_header");
    
    if ($just_logged_in == 1 && strlen(trim($motd)) > 0) {
-      echo "<center><br>";
-      echo "<table width=70% cellpadding=0 cellspacing=0 border=0><tr><td bgcolor=\"$color[9]\">";
-      echo "<table width=100% cellpadding=5 cellspacing=1 border=0><tr><td bgcolor=\"$color[4]\">";
-      echo "$motd";
-      echo "</td></tr></table>";
-      echo "</td></tr></table>";
-      echo "</center><br>";
+      echo "<center><br>\n";
+      echo "<table width=70% cellpadding=0 cellspacing=0 border=0><tr><td bgcolor=\"$color[9]\">\n";
+      echo "<table width=100% cellpadding=5 cellspacing=1 border=0><tr><td bgcolor=\"$color[4]\">\n";
+      echo "$motd\n";
+      echo "</td></tr></table>\n";
+      echo "</td></tr></table>\n";
+      echo "</center><br>\n";
    }
 
        if (isset($newsort)) {