1 files changed, 113 insertions, 11 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index ab20249..406c57c 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -1,5 +1,4 @@
-
 #include <stdlib.h>
-
 #include <libetpan/libetpan.h>
+#include <qpe/global.h>
 
@@ -73,3 +72,3 @@ void IMAPwrapper::login()
          err != MAILIMAP_NO_ERROR_NON_AUTHENTICATED ) {
-         qDebug("error connecting server: %s",m_imap->imap_response);
+         Global::statusMessage(tr("error connecting imap server: %1").arg(m_imap->imap_response));
          mailimap_free( m_imap );
@@ -82,3 +81,3 @@ void IMAPwrapper::login()
     if ( err != MAILIMAP_NO_ERROR ) {
-        qDebug("error logging in imap: %s",m_imap->imap_response);
+        Global::statusMessage(tr("error logging in imap server: %1").arg(m_imap->imap_response));
         err = mailimap_close( m_imap );
@@ -117,3 +116,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
     if ( err != MAILIMAP_NO_ERROR ) {
-        qDebug("error selecting mailbox: %s",m_imap->imap_response);
+        Global::statusMessage(tr("error selecting mailbox: %1").arg(m_imap->imap_response));
         return;
@@ -124,4 +123,6 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
     if (last == 0) {
-        qDebug("mailbox has no mails");
+        Global::statusMessage(tr("Mailbox has no mails"));
         return;
+    } else {
+        Global::statusMessage(tr("Mailbox has %1 mails").arg(last));
     }
@@ -157,3 +158,3 @@ void IMAPwrapper::listMessages(const QString&mailbox,QList<RecMail> &target )
     } else {
-        qDebug("Error fetching headers: %s",m_imap->imap_response);
+        Global::statusMessage(tr("Error fetching headers: %1").arg(m_imap->imap_response));
     }
@@ -168,2 +169,4 @@ QList<Folder>* IMAPwrapper::listFolders()
     clistcell *current = 0;
+    clistcell*cur_flag = 0;
+    mailimap_mbx_list_flags*bflags = 0;
 
@@ -186,2 +189,4 @@ QList<Folder>* IMAPwrapper::listFolders()
     QString del;
+    bool selectable = true;
+    bool no_inferiors = false;
     if ( err == MAILIMAP_NO_ERROR ) {
@@ -194,4 +199,13 @@ QList<Folder>* IMAPwrapper::listFolders()
             del = list->mb_delimiter;
-            folders->append( new IMAPFolder(temp,del,true,account->getPrefix()));
             current = current->next;
+            if ( (bflags = list->mb_flag) ) {
+                selectable = !(bflags->mbf_type==MAILIMAP_MBX_LIST_FLAGS_SFLAG&&
+                            bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
+                for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) {
+                    if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) {
+                        no_inferiors = true;
+                    }
+                }
+            }
+            folders->append( new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix()));
         }
@@ -209,4 +223,2 @@ QList<Folder>* IMAPwrapper::listFolders()
     qDebug(path);
-    bool selectable = true;
-    mailimap_mbx_list_flags*bflags;
     err = mailimap_list( m_imap, (char*)path, (char*)mask, &result );
@@ -215,2 +227,3 @@ QList<Folder>* IMAPwrapper::listFolders()
         for ( current=clist_begin(result);current!=NULL;current=clist_next(current)) {
+            no_inferiors = false;
             list = (mailimap_mailbox_list *) current->data;
@@ -226,5 +239,10 @@ QList<Folder>* IMAPwrapper::listFolders()
                             bflags->mbf_sflag==MAILIMAP_MBX_LIST_SFLAG_NOSELECT);
+                for(cur_flag=clist_begin(bflags->mbf_oflags);cur_flag;cur_flag=clist_next(cur_flag)) {
+                    if ( ((mailimap_mbx_list_oflag*)cur_flag->data)->of_type==MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS) {
+                        no_inferiors = true;
+                    }
+                }
             }
             del = list->mb_delimiter;
-            folders->append(new IMAPFolder(temp,del,selectable,account->getPrefix()));
+            folders->append(new IMAPFolder(temp,del,selectable,no_inferiors,account->getPrefix()));
         }
@@ -820 +838,85 @@ encodedString* IMAPwrapper::fetchRawPart(const RecMail&mail,const RecPart&part)
 }
+
+int IMAPwrapper::deleteAllMail(const Folder*folder)
+{
+    login();
+    if (!m_imap) {
+        return 0;
+    }
+    mailimap_flag_list*flist;
+    mailimap_set *set;
+    mailimap_store_att_flags * store_flags;
+    int err = mailimap_select( m_imap, folder->getName().latin1());
+    if ( err != MAILIMAP_NO_ERROR ) {
+        Global::statusMessage(tr("error selecting mailbox: %1").arg(m_imap->imap_response));
+        return 0;
+    }
+    int last = m_imap->imap_selection_info->sel_exists;
+    if (last == 0) {
+        Global::statusMessage(tr("Mailbox has no mails!"));
+        return 0;
+    }
+    flist = mailimap_flag_list_new_empty();
+    mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
+    store_flags = mailimap_store_att_flags_new_set_flags(flist);
+    set = mailimap_set_new_interval( 1, last );
+    err = mailimap_store(m_imap,set,store_flags);
+    mailimap_set_free( set );
+    mailimap_store_att_flags_free(store_flags);
+    if (err != MAILIMAP_NO_ERROR) {
+        Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+        return 0;
+    }
+    qDebug("deleting mail: %s",m_imap->imap_response);
+    /* should we realy do that at this moment? */
+    err = mailimap_expunge(m_imap);
+    if (err != MAILIMAP_NO_ERROR) {
+        Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+        return 0;
+    }
+    qDebug("Delete successfull %s",m_imap->imap_response);
+    return 1;
+}
+
+int IMAPwrapper::createMbox(const QString&folder,const Folder*parentfolder,const QString& delemiter,bool getsubfolder)
+{
+    if (folder.length()==0) return 0;
+    login();
+    if (!m_imap) {return 0;}
+    QString pre = account->getPrefix();
+    if (delemiter.length()>0 && pre.findRev(delemiter)!=pre.length()-1) {
+        pre+=delemiter;
+    }
+    if (parentfolder) {
+        pre += parentfolder->getDisplayName()+delemiter;
+    }
+    pre+=folder;
+    if (getsubfolder) {
+        if (delemiter.length()>0) {
+            pre+=delemiter;
+        } else {
+            Global::statusMessage(tr("Cannot create folder %1 for holding subfolders").arg(pre));
+            return 0;
+        }
+    }
+    qDebug("Creating %s",pre.latin1());
+    int res = mailimap_create(m_imap,pre.latin1());
+    if (res != MAILIMAP_NO_ERROR) {
+        Global::statusMessage(tr("%1").arg(m_imap->imap_response));
+        return 0;
+    }
+    return 1;
+}
+
+int IMAPwrapper::deleteMbox(const Folder*folder)
+{
+    if (!folder) return 0;
+    login();
+    if (!m_imap) {return 0;}
+    int res = mailimap_delete(m_imap,folder->getName());
+    if (res != MAILIMAP_NO_ERROR) {
+        Global::statusMessage(tr("%1").arg(m_imap->imap_response));
+        return 0;
+    }
+    return 1;
+}