fixed bugs

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

diff --git a/ChangeLog b/ChangeLog
index 2823bd0dbce6be2e05013642f9d9af0d23aea0a9..70b5bf72cdeeb725654983bd79e8714b271c3469 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Version 0.4pre2 -- DEVELOPMENT
+Version 0.4 -- DEVELOPMENT
+--------------------------
+- Changed <? to <?php in a few places
+
+Version 0.4pre2 -- May 5, 2000
 ------------------------------
 - Replying sets the "Answered" flag on the original message
 - When message is sent, it sends you to the folder you were looking at.

diff --git a/config/conf.pl b/config/conf.pl
index 7a3215236cb3862ed1e2f1c13a171e83996b0e83..f9dce285837fed2f0c2112bef4e00d69cd9b4dc4 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1121,7 +1121,7 @@ sub command62 {
 sub save_data {
    open (FILE, ">config.php");
 
-   print FILE "<?\n\t/** SquirrelMail configuration\n";
+   print FILE "<?php\n\t/** SquirrelMail configuration\n";
    print FILE "\t ** Created using the configure script, conf.pl\n\t **/\n\n";
 
    print FILE "\t\$org_name   = \"$org_name\";\n";

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 809aa404ddf758ba60f4bfbda3bbbe3b7112cb38..78fe5453b5f3e40be3f02ae80fe125b9f0e073a4 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -194,9 +194,11 @@
 
       $boxes = sqimap_mailbox_list($imapConnection);
       for ($i = 0; $i < count($boxes); $i++) {
-         $box = $boxes[$i]["unformatted"];
-         $box2 = replace_spaces($boxes[$i]["formatted"]);
-         echo "         <OPTION VALUE=\"$box\">$box2\n";
+                       if ($boxes[$i]["flags"][0] != "noselect" && $boxes[$i]["flags"][1] != "noselect" && $boxes[$i]["flags"][2] != "noselect") {
+               $box = $boxes[$i]["unformatted"];
+               $box2 = replace_spaces($boxes[$i]["formatted"]);
+               echo "         <OPTION VALUE=\"$box\">$box2\n";
+                       }       
       }
       echo "         </SELECT></SMALL></TT>";
       echo "         <SMALL><INPUT TYPE=SUBMIT NAME=\"moveButton\" VALUE=\"". _("Move") ."\"></SMALL></NOBR>\n";