/*
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2018 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "ctdl_module.h"
#include "config.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
+/*
+ * DownLoad Room Image (see its icon or whatever)
+ * If this command succeeds, it follows the same protocol as the DLAT command.
+ */
+void cmd_dlri(char *cmdbuf)
+{
+ if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
+ if (CC->room.msgnum_pic < 1) {
+ cprintf("%d No image found.\n", ERROR + FILE_NOT_FOUND);
+ return;
+ }
+
+ struct CtdlMessage *msg = CtdlFetchMessage(CC->room.msgnum_pic, 1, 1);
+ if (msg != NULL) {
+ // The call to CtdlOutputPreLoadedMsg() with MT_SPEW_SECTION will cause the DLRI command
+ // to have the same output format as the DLAT command, because it calls the same code.
+ // For example: 600 402132|-1||image/gif|
+ safestrncpy(CC->download_desired_section, "1", sizeof CC->download_desired_section);
+ CtdlOutputPreLoadedMsg(msg, MT_SPEW_SECTION, HEADERS_NONE, 1, 0, 0);
+ CM_Free(msg);
+ }
+ else {
+ cprintf("%d No image found.\n", ERROR + MESSAGE_NOT_FOUND);
+ return;
+ }
+}
+
+
+/*
+ * UpLoad Room Image (avatar or photo or whatever)
+ */
+void cmd_ulri(char *cmdbuf)
+{
+ long data_length;
+ char mimetype[SIZ];
+
+ if (CtdlAccessCheck(ac_room_aide)) return;
+
+ data_length = extract_long(cmdbuf, 0);
+ extract_token(mimetype, cmdbuf, 1, '|', sizeof mimetype);
+
+ if (data_length < 20) {
+ cprintf("%d That's an awfully small file. Try again.\n", ERROR + ILLEGAL_VALUE);
+ return;
+ }
+
+ if (strncasecmp(mimetype, "image/", 6)) {
+ cprintf("%d Only image files are permitted.\n", ERROR + ILLEGAL_VALUE);
+ return;
+ }
+
+ char *unencoded_data = malloc(data_length + 1);
+ if (!unencoded_data) {
+ cprintf("%d Could not allocate %ld bytes of memory\n", ERROR + INTERNAL_ERROR , data_length);
+ return;
+ }
+
+ cprintf("%d %ld\n", SEND_BINARY, data_length);
+ client_read(unencoded_data, data_length);
+
+ // We've got the data read from the client, now save it.
+ char *encoded_data = malloc((data_length * 2) + 100);
+ if (encoded_data) {
+ sprintf(encoded_data, "Content-type: %s\nContent-transfer-encoding: base64\n\n", mimetype);
+ CtdlEncodeBase64(&encoded_data[strlen(encoded_data)], unencoded_data, data_length, 1);
+ long new_msgnum = quickie_message("Citadel", NULL, NULL, SYSCONFIGROOM, encoded_data, FMT_RFC822, "Image uploaded by admin user");
+
+ if (CtdlGetRoomLock(&CC->room, CC->room.QRname) == 0) {
+ long old_msgnum = CC->room.msgnum_pic;
+ syslog(LOG_DEBUG, "Message %ld is now the photo for %s", new_msgnum, CC->room.QRname);
+ CC->room.msgnum_pic = new_msgnum;
+ CtdlPutRoomLock(&CC->room);
+ if (old_msgnum > 0) {
+ syslog(LOG_DEBUG, "Deleting old message %ld from %s", old_msgnum, SYSCONFIGROOM);
+ CtdlDeleteMessages(SYSCONFIGROOM, &old_msgnum, 1, "");
+ }
+ }
+ free(encoded_data);
+ }
+
+ free(unencoded_data);
+}
+
/*
* DownLoad User Image (see their avatar or photo or whatever)
/*
- * DownLoad User Image (avatar or photo or whatever)
+ * UpLoad User Image (avatar or photo or whatever)
*/
void cmd_ului(char *cmdbuf)
{
+ long data_length;
+ char mimetype[SIZ];
+ char username[USERNAME_SIZE];
+ char userconfigroomname[ROOMNAMELEN];
+
if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
- cprintf("500 FIXME not finished\n");
+ if (num_parms(cmdbuf) < 2)
+ {
+ cprintf("%d Usage error\n", ERROR + ILLEGAL_VALUE);
+ return;
+ }
+
+ data_length = extract_long(cmdbuf, 0);
+ extract_token(mimetype, cmdbuf, 1, '|', sizeof mimetype);
+ extract_token(username, cmdbuf, 2, '|', sizeof username);
+
+ if (data_length < 20) {
+ cprintf("%d That's an awfully small file. Try again.\n", ERROR + ILLEGAL_VALUE);
+ return;
+ }
+
+ if (strncasecmp(mimetype, "image/", 6)) {
+ cprintf("%d Only image files are permitted.\n", ERROR + ILLEGAL_VALUE);
+ return;
+ }
+
+ if (IsEmptyStr(username)) {
+ safestrncpy(username, CC->curr_user, sizeof username);
+ }
+
+ // Normal users can only change their own photo
+ if ( (strcasecmp(username, CC->curr_user)) && (CC->user.axlevel < AxAideU) && (!CC->internal_pgm) ) {
+ cprintf("%d Higher access required to change another user's photo.\n", ERROR + HIGHER_ACCESS_REQUIRED);
+ }
+
+ // Check to make sure the user exists
+ struct ctdluser usbuf;
+ if (CtdlGetUser(&usbuf, username) != 0) { // check for existing user, don't lock it yet
+ cprintf("%d %s not found.\n", ERROR + NO_SUCH_USER , username);
+ return;
+ }
+ CtdlMailboxName(userconfigroomname, sizeof userconfigroomname, &usbuf, USERCONFIGROOM);
+
+ char *unencoded_data = malloc(data_length + 1);
+ if (!unencoded_data) {
+ cprintf("%d Could not allocate %ld bytes of memory\n", ERROR + INTERNAL_ERROR , data_length);
+ return;
+ }
+
+ cprintf("%d %ld\n", SEND_BINARY, data_length);
+ client_read(unencoded_data, data_length);
+
+ // We've got the data read from the client, now save it.
+ char *encoded_data = malloc((data_length * 2) + 100);
+ if (encoded_data) {
+ sprintf(encoded_data, "Content-type: %s\nContent-transfer-encoding: base64\n\n", mimetype);
+ CtdlEncodeBase64(&encoded_data[strlen(encoded_data)], unencoded_data, data_length, 1);
+ long new_msgnum = quickie_message("Citadel", NULL, NULL, userconfigroomname, encoded_data, FMT_RFC822, "Photo uploaded by user");
+
+ if (CtdlGetUserLock(&usbuf, username) == 0) { // lock it this time
+ long old_msgnum = usbuf.msgnum_pic;
+ syslog(LOG_DEBUG, "Message %ld is now the photo for %s", new_msgnum, username);
+ usbuf.msgnum_pic = new_msgnum;
+ CtdlPutUserLock(&usbuf);
+ if (old_msgnum > 0) {
+ syslog(LOG_DEBUG, "Deleting old message %ld from %s", old_msgnum, userconfigroomname);
+ CtdlDeleteMessages(userconfigroomname, &old_msgnum, 1, "");
+ }
+ }
+
+ free(encoded_data);
+ }
+
+ free(unencoded_data);
}
fread(unencoded_data, data_length, 1, fp);
char *encoded_data = malloc((data_length * 2) + 100);
if (encoded_data) {
- // FIXME try to guess the content-type based on the filename, don't assume GIF
- sprintf(encoded_data, "Content-type: image/gif\nContent-transfer-encoding: base64\n\n");
+ sprintf(encoded_data, "Content-type: %s\nContent-transfer-encoding: base64\n\n", GuessMimeByFilename(path, strlen(path)));
CtdlEncodeBase64(&encoded_data[strlen(encoded_data)], unencoded_data, data_length, 1);
char userconfigroomname[ROOMNAMELEN];
long old_msgnum = usbuf.msgnum_pic;
CtdlMailboxName(userconfigroomname, sizeof userconfigroomname, &usbuf, USERCONFIGROOM);
long new_msgnum = quickie_message("Citadel", NULL, NULL, userconfigroomname, encoded_data, FMT_RFC822, "Photo imported from file");
- syslog(LOG_DEBUG, "Message %ld is now the profile for %s", new_msgnum, username);
+ syslog(LOG_DEBUG, "Message %ld is now the photo for %s", new_msgnum, username);
usbuf.msgnum_pic = new_msgnum;
CtdlPutUser(&usbuf);
unlink(path); // delete the old file , it's in the database now
{
DIR *filedir = NULL;
struct dirent *filedir_entry;
- struct dirent *d;
size_t d_namelen;
struct ctdluser usbuf;
long usernum = 0;
syslog(LOG_DEBUG, "Importing old style userpic files into the message base");
- d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 2);
- if (d == NULL) {
- return;
- }
-
filedir = opendir (ctdl_usrpic_dir);
if (filedir == NULL) {
- free(d);
return;
}
- while ((readdir_r(filedir, d, &filedir_entry) == 0) &&
- (filedir_entry != NULL))
+ while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL))
{
#ifdef _DIRENT_HAVE_D_NAMLEN
d_namelen = filedir_entry->d_namlen;
}
}
}
- free(d);
closedir(filedir);
rmdir(ctdl_usrpic_dir);
}
if (!threading)
{
import_old_userpic_files();
+ CtdlRegisterProtoHook(cmd_dlri, "DLRI", "DownLoad Room Image");
+ CtdlRegisterProtoHook(cmd_ulri, "ULRI", "UpLoad Room Image");
CtdlRegisterProtoHook(cmd_dlui, "DLUI", "DownLoad User Image");
CtdlRegisterProtoHook(cmd_ului, "ULUI", "UpLoad User Image");
}
projects / citadel.git / blobdiff