X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgraphics.c;h=8dbad904387810272212b1bcfcc30349dca6646f;hb=HEAD;hp=25dc451f9d6415cf0af5e918c02d189457a23f2a;hpb=c6aec42f213ec284e34648f3d69bcf927dccddb1;p=citadel.git

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 25dc451f9..98b063115 100644
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -1,21 +1,18 @@
-
-/*
- * Handles HTTP upload of graphics files into the system.
- *
- * Copyright (c) 1996-2016 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.
- */
+// 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"
 
-extern void output_static(const char *What);
+extern void output_static(const char* What);
 
 
 // display the picture (icon, photo, whatever) associated with the current room
@@ -54,8 +51,8 @@ void common_code_for_editroompic_and_editpic(char *servcmd) {
 		display_main_menu();
 		return;
 	}
-
-	serv_printf("%s %ld|%s", servcmd, (long) WC->upload_length, GuessMimeType(ChrPtr(WC->upload), WC->upload_length));
+	
+	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) {
@@ -75,7 +72,7 @@ void editroompic(void) {
 	common_code_for_editroompic_and_editpic("ULRI");
 }
 
-
+	
 // upload the picture (icon, photo, whatever) associated with the current user
 void editpic(void) {
 	common_code_for_editroompic_and_editpic("ULUI");
@@ -84,21 +81,9 @@ void editpic(void) {
 
 // display the screen for uploading graphics to the server
 void display_graphics_upload(char *filename) {
-	StrBuf *Line;
-
-	Line = NewStrBuf();
-	serv_printf("UIMG 0||%s", filename);
-	StrBuf_ServGetln(Line);
-	if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
-		display_main_menu();
-		return;
-	}
-	else {
-		output_headers(1, 0, 0, 0, 1, 0);
-		do_template("files_graphicsupload");
-		end_burst();
-	}
-	FreeStrBuf(&Line);
+	output_headers(1, 0, 0, 0, 1, 0);
+	do_template("files_graphicsupload");
+	end_burst();
 }
 
 
@@ -122,7 +107,7 @@ void do_graphics_upload(char *filename) {
 		display_main_menu();
 		return;
 	}
-
+	
 	MimeType = GuessMimeType(ChrPtr(WCC->upload), bytes_remaining);
 	serv_printf("UIMG 1|%s|%s", MimeType, filename);
 
@@ -144,7 +129,7 @@ void do_graphics_upload(char *filename) {
 			FreeStrBuf(&Line);
 			return;
 		}
-		thisblock = extract_int(ChrPtr(Line) + 4, 0);
+		thisblock = extract_int(ChrPtr(Line) +4, 0);
 		serv_write(&ChrPtr(WCC->upload)[pos], thisblock);
 		pos += thisblock;
 		bytes_remaining -= thisblock;
@@ -154,59 +139,58 @@ void do_graphics_upload(char *filename) {
 	StrBuf_ServGetln(Line);
 	if (*ChrPtr(Line) != 'x') {
 		display_success(ChrPtr(Line) + 4);
-
+	
 	}
 	FreeStrBuf(&Line);
 
 }
 
 
-void edithellopic(void) {
-	do_graphics_upload("hello");
-}
-void editgoodbuyepic(void) {
-	do_graphics_upload("UIMG 1|%s|goodbuye");
-}
+void edithellopic(void)    { do_graphics_upload("hello"); }
+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) {
 	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) {
 	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) {
 	putbstr("__WHICHPIC", NewStrBufPlain(HKEY("hello")));
-	putbstr("__PICDESC", NewStrBufPlain(_("the Greetingpicture for the login prompt"), -1));
+	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) {
-	putbstr("__WHICHPIC", NewStrBufPlain(HKEY("UIMG 0|%s|goodbuye")));
+	putbstr("__WHICHPIC", NewStrBufPlain(HKEY("UIMG 0|%s|goodbye")));
 	putbstr("__PICDESC", NewStrBufPlain(_("the Logoff banner picture"), -1));
-	putbstr("__UPLURL", NewStrBufPlain(HKEY("editgoodbuyepic")));
-	display_graphics_upload("editgoodbuyepic");
+	putbstr("__UPLURL", NewStrBufPlain(HKEY("editgoodbyepic")));
+	display_graphics_upload("editgoodbyepic");
 }
 
 
-void InitModule_GRAPHICS(void) {
+void 
+InitModule_GRAPHICS
+(void)
+{
 	WebcitAddUrlHandler(HKEY("display_editpic"), "", 0, display_editpic, 0);
 	WebcitAddUrlHandler(HKEY("editpic"), "", 0, editpic, 0);
 	WebcitAddUrlHandler(HKEY("display_editroompic"), "", 0, display_editroompic, 0);
 	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_editgoodbye"), "", 0, display_editgoodbyepic, 0);
+	WebcitAddUrlHandler(HKEY("editgoodbyepic"), "", 0, editgoodbyepic, 0);
 	WebcitAddUrlHandler(HKEY("roompic"), "", 0, display_roompic, 0);
 }