X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fgraphics.c;h=8ccd6b0e14ff28f398f59075155d5dd134477450;hb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;hp=9e1170df66dbcfd3840cc8581881cdf387f0aab4;hpb=87d27288c8fbdde8783622917ae66659ae611e38;p=citadel.git

diff --git a/webcit/graphics.c b/webcit/graphics.c
index 9e1170df6..8ccd6b0e1 100644
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -67,11 +67,12 @@ void display_graphics_upload(char *description, char *filename, char *uplurl)
 void do_graphics_upload(char *filename)
 {
 	const char *MimeType;
+	wcsession *WCC = WC;
 	char buf[SIZ];
 	int bytes_remaining;
 	int pos = 0;
 	int thisblock;
-	bytes_remaining = WC->upload_length;
+	bytes_remaining = WCC->upload_length;
 
 	if (havebstr("cancel_button")) {
 		strcpy(WC->ImportantMessage,
@@ -80,20 +81,20 @@ void do_graphics_upload(char *filename)
 		return;
 	}
 
-	if (WC->upload_length == 0) {
+	if (WCC->upload_length == 0) {
 		strcpy(WC->ImportantMessage,
 			_("You didn't upload a file."));
 		display_main_menu();
 		return;
 	}
 	
-	MimeType = GuessMimeType(&WC->upload[0], bytes_remaining);
+	MimeType = GuessMimeType(ChrPtr(WCC->upload), bytes_remaining);
 	snprintf(buf, SIZ, "UIMG 1|%s|%s", MimeType, filename);
 	serv_puts(buf);
 
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '2') {
-		strcpy(WC->ImportantMessage, &buf[4]);
+		strcpy(WCC->ImportantMessage, &buf[4]);
 		display_main_menu();
 		return;
 	}
@@ -102,14 +103,14 @@ void do_graphics_upload(char *filename)
 		serv_printf("WRIT %d", thisblock);
 		serv_getln(buf, sizeof buf);
 		if (buf[0] != '7') {
-			strcpy(WC->ImportantMessage, &buf[4]);
+			strcpy(WCC->ImportantMessage, &buf[4]);
 			serv_puts("UCLS 0");
 			serv_getln(buf, sizeof buf);
 			display_main_menu();
 			return;
 		}
 		thisblock = extract_int(&buf[4], 0);
-		serv_write(&WC->upload[pos], thisblock);
+		serv_write(&ChrPtr(WCC->upload)[pos], thisblock);
 		pos = pos + thisblock;
 		bytes_remaining = bytes_remaining - thisblock;
 	}
@@ -156,16 +157,23 @@ void display_editgoodbyepic(void) {
 
 void display_editfloorpic(void) {
 	char buf[SIZ];
-	snprintf(buf, SIZ, "UIMG 0|_floorpic_|%s",
+	snprintf(buf, SIZ, "_floorpic_|%s",
 		 bstr("which_floor"));
 	display_graphics_upload(_("the icon for this floor"),
 				buf,
 				"editfloorpic");
 }
 
+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, "UIMG 1|_floorpic_|%s",
+	snprintf(buf, SIZ, "_floorpic_|%s",
 		 bstr("which_floor"));
 	do_graphics_upload(buf);
 }
@@ -174,13 +182,14 @@ void
 InitModule_GRAPHICS
 (void)
 {
-	WebcitAddUrlHandler(HKEY("display_editpic"), display_editpic, 0);
-	WebcitAddUrlHandler(HKEY("editpic"), editpic, 0);
-	WebcitAddUrlHandler(HKEY("display_editroompic"), display_editroompic, 0);
-	WebcitAddUrlHandler(HKEY("display_edithello"), display_edithello, 0);
-	WebcitAddUrlHandler(HKEY("edithellopic"), edithellopic, 0);
-	WebcitAddUrlHandler(HKEY("display_editgoodbyepic"), display_editgoodbyepic, 0);
-	WebcitAddUrlHandler(HKEY("editgoodbuyepic"), editgoodbuyepic, 0);
-	WebcitAddUrlHandler(HKEY("display_editfloorpic"), display_editfloorpic, 0);
-	WebcitAddUrlHandler(HKEY("editfloorpic"), editfloorpic, 0);
+	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_editfloorpic"), "", 0, display_editfloorpic, 0);
+	WebcitAddUrlHandler(HKEY("editfloorpic"), "", 0, editfloorpic, 0);
 }