* All OS-level includes are now included from webcit.h instead of from

[citadel.git] / webcit / useredit.c

diff --git a/webcit/useredit.c b/webcit/useredit.c
index a1927f0d03a934991b82b9326672b8ee23889b94..64f4b428e4284727b3a8c7ee05713c5999c40af8 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -6,32 +6,10 @@
  */
 
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
 
-
-
-
 void select_user_to_edit(char *message, char *preselect)
 {
        char buf[SIZ];
@@ -42,7 +20,7 @@ void select_user_to_edit(char *message, char *preselect)
        wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
                "<td>"
                "<span class=\"titlebar\">"
-               "<img src=\"/static/users-icon.gif\">"
+               "<img src=\"/static/usermanag_48x.gif\">"
                "Edit or delete users"
                "</span></td></tr></table>\n"
                "</div>\n<div id=\"content\">\n"
@@ -78,10 +56,10 @@ void select_user_to_edit(char *message, char *preselect)
                "<FORM METHOD=\"POST\" ACTION=\"/display_edituser\">\n");
         wprintf("<SELECT NAME=\"username\" SIZE=10 STYLE=\"width:100%%\">\n");
         serv_puts("LIST");
-        serv_gets(buf);
+        serv_getln(buf, sizeof buf);
         if (buf[0] == '1') {
-                while (serv_gets(buf), strcmp(buf, "000")) {
-                        extract(username, buf, 0);
+                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                        extract_token(username, buf, 0, '|', sizeof username);
                         wprintf("<OPTION");
                        if (preselect != NULL)
                           if (!strcasecmp(username, preselect))
@@ -128,8 +106,8 @@ long locate_user_vcard(char *username, long usernum) {
 TRYAGAIN:
        /* Search for the user's vCard */
        serv_puts("MSGS ALL");
-       serv_gets(buf);
-       if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                ptr = malloc(sizeof(struct stuff_t));
                ptr->msgnum = atol(buf);
                ptr->next = stuff;
@@ -139,12 +117,12 @@ TRYAGAIN:
        /* Iterate through the message list looking for vCards */
        while (stuff != NULL) {
                serv_printf("MSG0 %ld|2", stuff->msgnum);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0]=='1') {
-                       while(serv_gets(buf), strcmp(buf, "000")) {
+                       while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                                if (!strncasecmp(buf, "part=", 5)) {
-                                       extract(partnum, &buf[5], 2);
-                                       extract(content_type, &buf[5], 4);
+                                       extract_token(partnum, &buf[5], 2, '|', sizeof partnum);
+                                       extract_token(content_type, &buf[5], 4, '|', sizeof content_type);
                                        if (!strcasecmp(content_type,
                                           "text/x-vcard")) {
                                                vcard_msgnum = stuff->msgnum;
@@ -162,7 +140,7 @@ TRYAGAIN:
        if (vcard_msgnum < 0) if (already_tried_creating_one == 0) {
                already_tried_creating_one = 1;
                serv_puts("ENT0 1|||4");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '4') {
                        serv_puts("Content-type: text/x-vcard");
                        serv_puts("");
@@ -189,12 +167,12 @@ void display_edit_address_book_entry(char *username, long usernum) {
        /* Locate the user's config room, creating it if necessary */
        sprintf(roomname, "%010ld.%s", usernum, USERCONFIGROOM);
        serv_printf("GOTO %s||1", roomname);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                serv_printf("CRE8 1|%s|5|||1|", roomname);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                serv_printf("GOTO %s||1", roomname);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
                        sprintf(error_message,
                                "<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
@@ -246,14 +224,14 @@ void display_edituser(char *supplied_username, int is_new) {
        int i;
 
        if (supplied_username != NULL) {
-               strcpy(username, supplied_username);
+               safestrncpy(username, supplied_username, sizeof username);
        }
        else {
-               strcpy(username, bstr("username") );
+               safestrncpy(username, bstr("username"), sizeof username);
        }
 
        serv_printf("AGUP %s", username);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                sprintf(error_message,
                        "<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
@@ -262,8 +240,8 @@ void display_edituser(char *supplied_username, int is_new) {
                return;
        }
 
-       extract(username, &buf[4], 0);
-       extract(password, &buf[4], 1);
+       extract_token(username, &buf[4], 0, '|', sizeof username);
+       extract_token(password, &buf[4], 1, '|', sizeof password);
        flags = extract_int(&buf[4], 2);
        timescalled = extract_int(&buf[4], 3);
        msgsposted = extract_int(&buf[4], 4);
@@ -291,7 +269,8 @@ void display_edituser(char *supplied_username, int is_new) {
        wprintf("</SPAN></TD></TR></TABLE>\n");
        wprintf("</div>\n<div id=\"content\">\n");
 
-       wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><tr><td>\n");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/edituser\">\n"
                "<INPUT TYPE=\"hidden\" NAME=\"username\" VALUE=\"");
        escputs(username);
@@ -363,8 +342,7 @@ void display_edituser(char *supplied_username, int is_new) {
                "<br /><br /></FORM>\n");
 
        wprintf("</CENTER>\n");
-       wprintf("</td></tr></table></center>\n");
-
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 
 }
@@ -379,7 +357,7 @@ void edituser(void) {
        is_new = atoi(bstr("is_new"));
 
        if (strcasecmp(bstr("action"), "OK")) {
-               strcpy(message, "Edit user cancelled.");
+               safestrncpy(message, "Edit user cancelled.", sizeof message);
        }
 
        else {
@@ -395,14 +373,14 @@ void edituser(void) {
                        bstr("lastcall"),
                        bstr("purgedays")
                );
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
                        sprintf(message,
                                "<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
                                "%s<br /><br />\n", &buf[4]);
                }
                else {
-                       strcpy(message, "");
+                       safestrncpy(message, "", sizeof message);
                }
        }
 
@@ -423,14 +401,14 @@ void delete_user(char *username) {
        char message[SIZ];
 
        serv_printf("ASUP %s|0|0|0|0|0|", username);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                sprintf(message,
                        "<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
                        "%s<br /><br />\n", &buf[4]);
        }
        else {
-               strcpy(message, "");
+               safestrncpy(message, "", sizeof message);
        }
        select_user_to_edit(message, bstr("username"));
 }
@@ -443,10 +421,10 @@ void create_user(void) {
        char error_message[SIZ];
        char username[SIZ];
 
-       strcpy(username, bstr("username"));
+       safestrncpy(username, bstr("username"), sizeof username);
 
        serv_printf("CREU %s", username);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
                /* sprintf(error_message, "<b>User has been created.</b>");