* More license declarations

[citadel.git] / citadel / modules / imap / imap_misc.c

diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index be350a5721c572294e8b34363bc58927875c4baf..c5c7dfbbd03acda001efb2317ee0e2a2f176c292 100644 (file)
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -2,6 +2,22 @@
  * $Id$
  *
  *
+ *
+ * Copyright (c) 2001-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 
@@ -69,7 +85,7 @@ int imap_do_copy(char *destination_folder) {
                return(0);
        }
 
-       i = imap_grabroom(roomname, destination_folder, 0);
+       i = imap_grabroom(roomname, destination_folder, 1);
        if (i != 0) return(i);
 
        /*
@@ -85,7 +101,7 @@ int imap_do_copy(char *destination_folder) {
        }
 
        if (num_selected > 0) {
-               CtdlCopyMsgsToRoom(selected_msgs, num_selected, roomname);
+               CtdlSaveMsgPointersInRoom(roomname, selected_msgs, num_selected, 1, NULL);
        }
        free(selected_msgs);
 
@@ -233,77 +249,6 @@ void imap_uidcopy(int num_parms, char *parms[]) {
 }
 
 
-/*
- * Poll for instant messages (yeah, we can do this in IMAP ... I think)
- */
-void imap_print_instant_messages(void) {
-       struct ExpressMessage *ptr, *holdptr;
-       char *dumpomatic = NULL;
-       char tmp[SIZ];
-       int i;
-       size_t size, size2;
-       struct tm stamp;
-
-       if (CC->FirstExpressMessage == NULL) {
-               return;
-       }
-       begin_critical_section(S_SESSION_TABLE);
-       ptr = CC->FirstExpressMessage;
-       CC->FirstExpressMessage = NULL;
-       end_critical_section(S_SESSION_TABLE);
-
-       while (ptr != NULL) {
-               localtime_r(&(ptr->timestamp), &stamp);
-               size = strlen(ptr->text) + SIZ;
-               dumpomatic = malloc(size);
-               strcpy(dumpomatic, "");
-               if (ptr->flags && EM_BROADCAST)
-                       strcat(dumpomatic, "Broadcast message ");
-               else if (ptr->flags && EM_CHAT)
-                       strcat(dumpomatic, "Chat request ");
-               else if (ptr->flags && EM_GO_AWAY)
-                       strcat(dumpomatic, "Please logoff now, as requested ");
-               else
-                       strcat(dumpomatic, "Message ");
-
-               /* Timestamp.  Can this be improved? */
-               if (stamp.tm_hour == 0 || stamp.tm_hour == 12)
-                       sprintf(tmp, "at 12:%02d%cm",
-                               stamp.tm_min, 
-                               stamp.tm_hour ? 'p' : 'a');
-               else if (stamp.tm_hour > 12)            /* pm */
-                       sprintf(tmp, "at %d:%02dpm",
-                               stamp.tm_hour - 12,
-                               stamp.tm_min);
-               else                                    /* am */
-                       sprintf(tmp, "at %d:%02dam",
-                               stamp.tm_hour, stamp.tm_min);
-               strcat(dumpomatic, tmp);
-
-               size2 = strlen(dumpomatic);
-               snprintf(&dumpomatic[size2], size - size2,
-                       " from %s:\n", ptr->sender);
-               if (ptr->text != NULL)
-                       strcat(dumpomatic, ptr->text);
-
-               holdptr = ptr->next;
-               if (ptr->text != NULL) free(ptr->text);
-               free(ptr);
-               ptr = holdptr;
-
-               for (i=0; dumpomatic[i]; ++i) {
-                       if (!isprint(dumpomatic[i])) dumpomatic[i] = ' ';
-                       if (dumpomatic[i]=='\\') dumpomatic[i]='/';
-                       if (dumpomatic[i]=='\"') dumpomatic[i]='\'';
-               }
-
-               cprintf("* OK [ALERT] %s\r\n", dumpomatic);
-               free(dumpomatic);
-       }
-       cprintf("000\n");
-}
-
-
 /*
  * imap_do_append_flags() is called by imap_append() to set any flags that
  * the client specified at append time.
@@ -430,7 +375,7 @@ void imap_append(int num_parms, char *parms[]) {
        Imap->transmitted_message = NULL;
        Imap->transmitted_length = 0;
 
-       ret = imap_grabroom(roomname, parms[2], 0);
+       ret = imap_grabroom(roomname, parms[2], 1);
        if (ret != 0) {
                cprintf("%s NO Invalid mailbox name or access denied\r\n",
                        parms[0]);