X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgraphics.c;h=8dbad904387810272212b1bcfcc30349dca6646f;hb=HEAD;hp=a79cb0f3b1aa045b7af69a7d94b62efbcba833a3;hpb=fcb8c4169baa629eb3c1a4979c7c8c32f1560389;p=citadel.git diff --git a/webcit/graphics.c b/webcit/graphics.c index a79cb0f3b..98b063115 100644 --- a/webcit/graphics.c +++ b/webcit/graphics.c @@ -1,195 +1,184 @@ -/* - * Handles HTTP upload of graphics files into the system. - * - * Copyright (c) 1996-2010 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 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 - */ +// Handles HTTP upload of graphics files into the system. +// +// Copyright (c) 1996-2022 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, version 3. +// +// 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. #include "webcit.h" -void display_graphics_upload(char *description, char *filename, char *uplurl) -{ - WCTemplputParams SubTP; - StrBuf *Buf; - char buf[SIZ]; +extern void output_static(const char* What); + + +// display the picture (icon, photo, whatever) associated with the current room +void display_roompic(void) { + off_t bytes; + StrBuf *Buf = NewStrBuf(); + serv_printf("DLRI"); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 6) { + StrBufCutLeft(Buf, 4); + bytes = StrBufExtract_long(Buf, 0, '|'); + StrBuf *content_type = NewStrBuf(); + StrBufExtract_token(content_type, Buf, 3, '|'); + WC->WBuf = NewStrBuf(); + StrBuf_ServGetBLOBBuffered(WC->WBuf, bytes); + http_transmit_thing(ChrPtr(content_type), 0); + FreeStrBuf(&content_type); + } + else { + output_error_pic("", ""); + } + FreeStrBuf(&Buf); +} - snprintf(buf, SIZ, "UIMG 0||%s", filename); - serv_puts(buf); - serv_getln(buf, sizeof buf); - if (buf[0] != '2') { - strcpy(WC->ImportantMessage, &buf[4]); +// upload the picture (icon, photo, whatever) associated with the current room +void common_code_for_editroompic_and_editpic(char *servcmd) { + if (havebstr("cancel_button")) { + AppendImportantMessage(_("Graphics upload has been cancelled."), -1); display_main_menu(); return; } - /*output_headers(1, 1, 0, 0, 0, 0); */ - - output_headers(1, 1, 1, 0, 0, 0); - - Buf = NewStrBufPlain(_("Image upload"), -1); - memset(&SubTP, 0, sizeof(WCTemplputParams)); - SubTP.Filter.ContextType = CTX_STRBUF; - SubTP.Context = Buf; - DoTemplate(HKEY("beginbox"), NULL, &SubTP); - - FreeStrBuf(&Buf); - - wc_printf("
\n", uplurl); - - wc_printf("\n", WC->nonce); - wc_printf("\n"); - wc_printf(_("You can upload an image directly from your computer")); - wc_printf("

\n"); + if (WC->upload_length == 0) { + AppendImportantMessage(_("You didn't upload a file."), -1); + display_main_menu(); + return; + } + + serv_printf("%s %ld|%s", servcmd, (long)WC->upload_length, GuessMimeType(ChrPtr(WC->upload), WC->upload_length)); + StrBuf *Line = NewStrBuf(); + StrBuf_ServGetln(Line); + if (GetServerStatusMsg(Line, NULL, 0, 0) == 7) { + serv_write(ChrPtr(WC->upload), WC->upload_length); + display_success(ChrPtr(Line) + 4); + } + else { + AppendImportantMessage((ChrPtr(Line) + 4), -1); + display_main_menu(); + } + FreeStrBuf(&Line); +} - wc_printf(_("Please select a file to upload:")); - wc_printf("\n"); - wc_printf("
\n", filename); +// upload the picture (icon, photo, whatever) associated with the current room +void editroompic(void) { + common_code_for_editroompic_and_editpic("ULRI"); +} - wc_printf("
"); - wc_printf("\n", _("Upload")); - wc_printf(" "); - wc_printf("\n", _("Reset form")); - wc_printf(" "); - wc_printf("\n", _("Cancel")); - wc_printf("
\n"); - wc_printf("
\n"); + +// upload the picture (icon, photo, whatever) associated with the current user +void editpic(void) { + common_code_for_editroompic_and_editpic("ULUI"); +} - do_template("endbox", NULL); - wDumpContent(1); +// display the screen for uploading graphics to the server +void display_graphics_upload(char *filename) { + output_headers(1, 0, 0, 0, 1, 0); + do_template("files_graphicsupload"); + end_burst(); } -void do_graphics_upload(char *filename) -{ + +void do_graphics_upload(char *filename) { + StrBuf *Line; const char *MimeType; wcsession *WCC = WC; - char buf[SIZ]; int bytes_remaining; int pos = 0; int thisblock; bytes_remaining = WCC->upload_length; if (havebstr("cancel_button")) { - strcpy(WC->ImportantMessage, - _("Graphics upload has been cancelled.")); + AppendImportantMessage(_("Graphics upload has been cancelled."), -1); display_main_menu(); return; } if (WCC->upload_length == 0) { - strcpy(WC->ImportantMessage, - _("You didn't upload a file.")); + AppendImportantMessage(_("You didn't upload a file."), -1); display_main_menu(); return; } MimeType = GuessMimeType(ChrPtr(WCC->upload), bytes_remaining); - snprintf(buf, SIZ, "UIMG 1|%s|%s", MimeType, filename); - serv_puts(buf); + serv_printf("UIMG 1|%s|%s", MimeType, filename); - serv_getln(buf, sizeof buf); - if (buf[0] != '2') { - strcpy(WCC->ImportantMessage, &buf[4]); + Line = NewStrBuf(); + StrBuf_ServGetln(Line); + if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) { display_main_menu(); + FreeStrBuf(&Line); return; } while (bytes_remaining) { thisblock = ((bytes_remaining > 4096) ? 4096 : bytes_remaining); serv_printf("WRIT %d", thisblock); - serv_getln(buf, sizeof buf); - if (buf[0] != '7') { - strcpy(WCC->ImportantMessage, &buf[4]); + StrBuf_ServGetln(Line); + if (GetServerStatusMsg(Line, NULL, 1, 7) != 7) { serv_puts("UCLS 0"); - serv_getln(buf, sizeof buf); + StrBuf_ServGetln(Line); display_main_menu(); + FreeStrBuf(&Line); return; } - thisblock = extract_int(&buf[4], 0); + thisblock = extract_int(ChrPtr(Line) +4, 0); serv_write(&ChrPtr(WCC->upload)[pos], thisblock); - pos = pos + thisblock; - bytes_remaining = bytes_remaining - thisblock; + pos += thisblock; + bytes_remaining -= thisblock; } serv_puts("UCLS 1"); - serv_getln(buf, sizeof buf); - if (buf[0] != 'x') { - display_success(&buf[4]); - return; + StrBuf_ServGetln(Line); + if (*ChrPtr(Line) != 'x') { + display_success(ChrPtr(Line) + 4); + } + FreeStrBuf(&Line); + } void edithellopic(void) { do_graphics_upload("hello"); } -void editpic(void) { do_graphics_upload("_userpic_"); } -void editgoodbuyepic(void) { do_graphics_upload("UIMG 1|%s|goodbuye"); } +void editgoodbyepic(void) { do_graphics_upload("UIMG 1|%s|goodbye"); } -/* The users photo display / upload facility */ +// The user's photo display / upload facility void display_editpic(void) { - display_graphics_upload(_("your photo"), - "_userpic_", - "editpic"); + putbstr("__PICDESC", NewStrBufPlain(_("your photo"), -1)); + putbstr("__UPLURL", NewStrBufPlain(HKEY("editpic"))); + display_graphics_upload("editpic"); } -/* room picture dispay / upload facility */ + +// room picture dispay / upload facility void display_editroompic(void) { - display_graphics_upload(_("the icon for this room"), - "_roompic_", - "editroompic"); + putbstr("__PICDESC", NewStrBufPlain(_("the icon for this room"), -1)); + putbstr("__UPLURL", NewStrBufPlain(HKEY("editroompic"))); + display_graphics_upload("editroompic"); } -/* the greetingpage hello pic */ +// the login page graphics void display_edithello(void) { - display_graphics_upload(_("the Greetingpicture for the login prompt"), - "hello", - "edithellopic"); + putbstr("__WHICHPIC", NewStrBufPlain(HKEY("hello"))); + putbstr("__PICDESC", NewStrBufPlain(_("graphics to be displayed on the login screen"), -1)); + putbstr("__UPLURL", NewStrBufPlain(HKEY("edithellopic"))); + display_graphics_upload("edithellopic"); } -/* the logoff banner */ +// the logoff banner void display_editgoodbyepic(void) { - display_graphics_upload(_("the Logoff banner picture"), - "UIMG 0|%s|goodbuye", - "editgoodbuyepic"); -} - -void display_editfloorpic(void) { - char buf[SIZ]; - snprintf(buf, SIZ, "_floorpic_|%s", - bstr("which_floor")); - display_graphics_upload(_("the icon for this floor"), - buf, - "editfloorpic"); + putbstr("__WHICHPIC", NewStrBufPlain(HKEY("UIMG 0|%s|goodbye"))); + putbstr("__PICDESC", NewStrBufPlain(_("the Logoff banner picture"), -1)); + putbstr("__UPLURL", NewStrBufPlain(HKEY("editgoodbyepic"))); + display_graphics_upload("editgoodbyepic"); } -void editroompic(void) { - char buf[SIZ]; - snprintf(buf, SIZ, "_roompic_|%s", - bstr("which_room")); - do_graphics_upload(buf); -} - -void editfloorpic(void){ - char buf[SIZ]; - snprintf(buf, SIZ, "_floorpic_|%s", - bstr("which_floor")); - do_graphics_upload(buf); -} void InitModule_GRAPHICS @@ -201,8 +190,7 @@ InitModule_GRAPHICS WebcitAddUrlHandler(HKEY("editroompic"), "", 0, editroompic, 0); WebcitAddUrlHandler(HKEY("display_edithello"), "", 0, display_edithello, 0); WebcitAddUrlHandler(HKEY("edithellopic"), "", 0, edithellopic, 0); - WebcitAddUrlHandler(HKEY("display_editgoodbuye"), "", 0, display_editgoodbyepic, 0); - WebcitAddUrlHandler(HKEY("editgoodbuyepic"), "", 0, editgoodbuyepic, 0); - WebcitAddUrlHandler(HKEY("display_editfloorpic"), "", 0, display_editfloorpic, 0); - WebcitAddUrlHandler(HKEY("editfloorpic"), "", 0, editfloorpic, 0); + WebcitAddUrlHandler(HKEY("display_editgoodbye"), "", 0, display_editgoodbyepic, 0); + WebcitAddUrlHandler(HKEY("editgoodbyepic"), "", 0, editgoodbyepic, 0); + WebcitAddUrlHandler(HKEY("roompic"), "", 0, display_roompic, 0); }