The new server API no longer uses upload_type. Removed it from CitContext.

diff --git a/citadel/context.c b/citadel/context.c
index fd8b43ac20a97501ce57cdffc727a9bf87d1722f..88ddbe21bd6581f3693bfafa0f52612e5e29c021 100644 (file)
--- a/citadel/context.c
+++ b/citadel/context.c
@@ -542,7 +542,6 @@ void begin_session(CitContext *con)
 #endif
        }
        con->cs_flags = 0;
 #endif
        }
        con->cs_flags = 0;

-       con->upload_type = UPL_FILE;

 
        con->nologin = 0;
        if (((CtdlGetConfigInt("c_maxsessions") > 0)&&(num_sessions > CtdlGetConfigInt("c_maxsessions"))) || CtdlWantSingleUser()) {
 
        con->nologin = 0;
        if (((CtdlGetConfigInt("c_maxsessions") > 0)&&(num_sessions > CtdlGetConfigInt("c_maxsessions"))) || CtdlWantSingleUser()) {

diff --git a/citadel/context.h b/citadel/context.h
index dacac07a267f08b7ffb7006f14c09c0a2a835087..fd486caa34a53e24b383633aa334cb6478f8a06d 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -114,7 +114,6 @@ struct CitContext {
        char upl_comment[256];
        char upl_filedir[PATH_MAX];
        char upl_mimetype[64];
        char upl_comment[256];
        char upl_filedir[PATH_MAX];
        char upl_mimetype[64];

-       char upload_type;

 
        struct ctdluser user;   /* Database record buffers */
        struct ctdlroom room;
 
        struct ctdluser user;   /* Database record buffers */
        struct ctdlroom room;

diff --git a/citadel/modules/ctdlproto/serv_file.c b/citadel/modules/ctdlproto/serv_file.c
index 29b54605646eca5e23aca48869c9fe317b9d4821..936b46b8ec0f4f5a6b47012c6a54d886e13d243e 100644 (file)
--- a/citadel/modules/ctdlproto/serv_file.c
+++ b/citadel/modules/ctdlproto/serv_file.c
@@ -347,7 +347,6 @@ void cmd_uimg(char *cmdbuf)
                return;
        }
        cprintf("%d Ok\n", CIT_OK);
                return;
        }
        cprintf("%d Ok\n", CIT_OK);

-       CC->upload_type = UPL_IMAGE;

 }
 
 
 }
 
 

diff --git a/citadel/server.h b/citadel/server.h
index c248691a63b0579d691910d7667863f6fb729398..572091636f7a3dcf21c46c713d22bfd9caded0a2 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -165,14 +165,6 @@ enum {
 };
 
 
 };
 
 

-/*
- * Upload types
- */
-#define UPL_FILE       0
-#define UPL_NET                1
-#define UPL_IMAGE      2
-
-

 /*
  * message transfer formats
  */
 /*
  * message transfer formats
  */