[Hastymail-cvs] hastymail/lib html_functions.php,1.316,1.317 imap_2.php,1.89,1.90

[<sai...@us...>]

Update of /cvsroot/hastymail/hastymail/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13541/lib

Modified Files:
	html_functions.php imap_2.php 
Log Message:
disable the draft folder to: display reverting to the normal from: if a users draft folder is the inbox. Also fixed a bug with the inbox as a drafts folder creating multiple folder list entries


Index: html_functions.php
===================================================================
RCS file: /cvsroot/hastymail/hastymail/lib/html_functions.php,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -d -r1.316 -r1.317
--- html_functions.php	15 Nov 2004 20:23:47 -0000	1.316
+++ html_functions.php	16 Nov 2004 17:36:25 -0000	1.317
@@ -472,7 +472,8 @@
     if ((isset($_SESSION['settings']['sent_folder']) && 
        $_SESSION['settings']['sent_folder'] == urldecode($mailbox)) ||
        (isset($_SESSION['settings']['drafts_folder']) &&
-       $_SESSION['settings']['drafts_folder'] == urldecode($mailbox))) {
+       $_SESSION['settings']['drafts_folder'] == urldecode($mailbox) &&
+       $mailbox != 'INBOX')) {
         $col_3 .= "            &nbsp;&nbsp;<b><small>".$str[25]."</small></b>\n";
     }
     else {
@@ -736,7 +737,8 @@
     if ((isset($_SESSION['settings']['sent_folder']) &&
        $_SESSION['settings']['sent_folder'] == urldecode($mailbox)) ||
        (isset($_SESSION['settings']['drafts_folder']) &&
-       $_SESSION['settings']['drafts_folder'] == urldecode($mailbox))) {
+       $_SESSION['settings']['drafts_folder'] == urldecode($mailbox) &&
+       $mailbox != 'INBOX')) {
         $col_3 .= '           &nbsp;&nbsp;'.$start.'<font '.$font.'>'.$to.
                   '</font>'.$stop."\n";
     }

Index: imap_2.php
===================================================================
RCS file: /cvsroot/hastymail/hastymail/lib/imap_2.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- imap_2.php	12 Nov 2004 17:04:25 -0000	1.89
+++ imap_2.php	16 Nov 2004 17:36:34 -0000	1.90
@@ -103,7 +103,7 @@
             $folder = trim($parts[$count - 1]);
             foreach (array('sent_folder', 'drafts_folder', 'trash_folder') as $name) {
                 if (isset($_SESSION['settings'][$name]) && $_SESSION['settings'][$name] ==
-                    $folder) {
+                    $folder && $folder != 'INBOX') {
                     $specials[] = $folder;
                 }
             }