* The 'delete' button on sticky notes now works.

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 38298f799037e03e22915760d49aaa5aae88c8d5..212734d237bef082d6c77e1793107c5a68d90fce 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -400,12 +400,14 @@ void url(char *buf, size_t bufsize)
        }
 
        TrailerLen = len - (end - start);
-       memcpy(outbuf + Offset + outpos, end, TrailerLen);
-       if ( Offset + TrailerLen + outpos > bufsize) {
+       if (TrailerLen > 0)
+               memcpy(outbuf + Offset + outpos, end, TrailerLen);
+       if (Offset + outpos + TrailerLen > bufsize) {
                lprintf(1, "URL: content longer than buffer!");
                return;
        }
-       memcpy (buf, outbuf, Offset + TrailerLen + outpos);
+       memcpy (buf, outbuf, Offset + outpos + TrailerLen);
+       *(buf + Offset + outpos + TrailerLen) = '\0';
 }
 
 
@@ -487,8 +489,9 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) {
  * understand in a simple two-column name/value format.
  * \param v the vCard to display
  * \param full display all items of the vcard?
+ * \param msgnum Citadel message pointer
  */
-void display_parsed_vcard(struct vCard *v, int full) {
+void display_parsed_vcard(struct vCard *v, int full, long msgnum) {
        int i, j;
        char buf[SIZ];
        char *name;
@@ -657,6 +660,14 @@ void display_parsed_vcard(struct vCard *v, int full) {
                                        wprintf("</TD></TR>\n");
                                }
                        }
+                       else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) { 
+                               // Only output on second pass
+                               wprintf("<tr><td>");
+                               wprintf(_("Photo:"));
+                               wprintf("</td><td>");
+                               wprintf("<img src=\"/vcardphoto/%d/\" alt=\"Contact photo\"/>",msgnum);
+                               wprintf("</td></tr>\n");
+                       }
                        else if (!strcasecmp(firsttoken, "version")) {
                                /* ignore */
                        }
@@ -731,8 +742,10 @@ void display_parsed_vcard(struct vCard *v, int full) {
  * \param alpha what???
  * \param full should we usse all lines?
  * \param storename where to store???
+ * \param msgnum Citadel message pointer
  */
-void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
+void display_vcard(char *vcard_source, char alpha, int full, char *storename, 
+       long msgnum) {
        struct vCard *v;
        char *name;
        char buf[SIZ];
@@ -755,7 +768,7 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
                        || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
                        || ((!isalpha(alpha)) && (!isalpha(this_alpha)))
                ) {
-               display_parsed_vcard(v, full);
+               display_parsed_vcard(v, full,msgnum);
        }
 
        vcard_free(v);
@@ -1334,7 +1347,7 @@ ENDBODY:  /* If there are attached submessages, display them now... */
                        }
 
                        /** In all cases, display the full card */
-                       display_vcard(part_source, 0, 1, NULL);
+                       display_vcard(part_source, 0, 1, NULL,msgnum);
                }
        }
 
@@ -1857,7 +1870,7 @@ void display_addressbook(long msgnum, char alpha) {
                if (vcard_source != NULL) {
 
                        /** Display the summary line */
-                       display_vcard(vcard_source, alpha, 0, NULL);
+                       display_vcard(vcard_source, alpha, 0, NULL,msgnum);
 
                        /** If it's my vCard I can edit it */
                        if (    (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
@@ -1948,7 +1961,7 @@ void fetch_ab_name(long msgnum, char *namebuf) {
                if (vcard_source != NULL) {
 
                        /* Grab the name off the card */
-                       display_vcard(vcard_source, 0, 0, namebuf);
+                       display_vcard(vcard_source, 0, 0, namebuf,msgnum);
 
                        free(vcard_source);
                }
@@ -2458,7 +2471,6 @@ void readloop(char *oper)
        }
 
        if (is_notes) {
-               wprintf("<div align=center>%s</div>\n", _("Click on any note to edit it."));
                wprintf("<div id=\"new_notes_here\"></div>\n");
        }
 
@@ -2699,13 +2711,6 @@ void readloop(char *oper)
                /** end bbview scroller */
        }
 
-       if (is_notes)
-       {
-               wprintf ("<script src=\"/static/dragdrop.js\" type=\"text/javascript\"></script>\n");
-       }
-
-
-
        for (a = 0; a < nummsgs; ++a) {
                if ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
 
@@ -2869,40 +2874,6 @@ void readloop(char *oper)
                /** end bbview scroller */
        }
        
-       if (is_notes)
-       {
-//             wprintf ("</div>\n");
-               wprintf ("<div id=\"wastebin\" align=middle>Drop notes here to remove them.</div>\n");
-               wprintf ("<script type=\"text/javascript\">\n");
-//             wprintf ("//<![CDATA[\n");
-               wprintf ("Droppables.add(\"wastebin\",\n");
-               wprintf ("\t{\n");
-               wprintf ("\t\taccept:'notes',\n");
-               wprintf ("\t\tonDrop:function(element)\n");
-               wprintf ("\t\t{\n");
-               wprintf ("\t\t\tElement.hide(element);\n");
-               wprintf ("\t\t\tnew Ajax.Updater('notes', 'delnote',\n");
-               wprintf ("\t\t\t{\n");
-               wprintf ("\t\t\t\tasynchronous:true,\n");
-               wprintf ("\t\t\t\tevalScripts:true,\n");
-               wprintf ("\t\t\t\tonComplete:function(request)\n");
-               wprintf ("\t\t\t\t{\n");
-               wprintf ("\t\t\t\t\tElement.hide('indicator')\n");
-               wprintf ("\t\t\t\t},\n");
-               wprintf ("\t\t\t\tonLoading:function(request)\n");
-               wprintf ("\t\t\t\t{\n");
-               wprintf ("\t\t\t\t\tElement.show('indicator')\n");
-               wprintf ("\t\t\t\t},\n");
-               wprintf ("\t\t\t\tparameters:'id=' + encodeURIComponent(element.id)\n");
-               wprintf ("\t\t\t})\n");
-               wprintf ("\t\t}\n");
-               wprintf ("\t})\n");
-//             wprintf ("//]]>\n");
-               wprintf ("</script>\n");
-       }
-
-
-
 DONE:
        if (is_tasks) {
                do_tasks_view();        /** Render the task list */
@@ -3052,7 +3023,7 @@ void post_message(void)
                gotoroom(bstr("force_room"));
        }
 
-       if (GetHash(WCC->urlstrings, HKEY("display_name"), &U)) {
+       if (GetHash(WC->urlstrings, HKEY("display_name"), &U)) {
                u = (urlcontent*) U;
                display_name = u->url_data;
                dpLen = u->url_data_size;