Removed the _floorpic_ infrastructure entirely -- we don't use those anymore.

diff --git a/citadel/modules/ctdlproto/serv_file.c b/citadel/modules/ctdlproto/serv_file.c
index e780a703a3a4a0e55a379f7c2ff39f8b0e79451b..2358507995be413a249c2d876c28332f00fd25ed 100644 (file)
--- a/citadel/modules/ctdlproto/serv_file.c
+++ b/citadel/modules/ctdlproto/serv_file.c
@@ -1,7 +1,7 @@
 /* 
  * Server functions which handle file transfers and room directories.
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-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.
@@ -226,7 +226,6 @@ void cmd_oimg(char *cmdbuf)
        char filename[PATH_MAX];
        char pathname[PATH_MAX];
        char MimeTestBuf[32];
-       int which_floor;
        int a;
        int rv;
 
@@ -244,11 +243,7 @@ void cmd_oimg(char *cmdbuf)
                return;
        }
 
-       if (!strcasecmp(filename, "_floorpic_")) {
-               which_floor = extract_int(cmdbuf, 1);
-               snprintf(pathname, sizeof pathname, "%s/floor.%d", ctdl_image_dir, which_floor);
-       }
-       else if (!strcasecmp(filename, "_roompic_")) {
+       if (!strcasecmp(filename, "_roompic_")) {
                assoc_file_name(pathname, sizeof pathname, &CC->room, ctdl_image_dir);
        }
        else {
@@ -365,7 +360,6 @@ void cmd_uimg(char *cmdbuf)
 {
        int is_this_for_real;
        char basenm[256];
-       int which_floor;
        int a;
 
        if (num_parms(cmdbuf) < 2) {
@@ -398,15 +392,6 @@ void cmd_uimg(char *cmdbuf)
                                 basenm);
        }
 
-       if ((!strcasecmp(basenm, "_floorpic_"))
-           && (CC->user.axlevel >= AxAideU)) {
-               which_floor = extract_int(cmdbuf, 2);
-               snprintf(CC->upl_path, sizeof CC->upl_path,
-                                "%s/floor.%d.gif",
-                                ctdl_image_dir,
-                                which_floor);
-       }
-
        if ((!strcasecmp(basenm, "_roompic_")) && (is_room_aide())) {
                assoc_file_name(CC->upl_path, sizeof CC->upl_path, &CC->room, ctdl_image_dir);
        }

diff --git a/textclient/citadel.rc b/textclient/citadel.rc
index cdf46c9e141db2a3c5fb21ab1bb776e0523d3c95..19e248719eb447c7d1e0421faf9af00f82ba38b5 100644 (file)
--- a/textclient/citadel.rc
+++ b/textclient/citadel.rc
@@ -286,12 +286,11 @@ cmd=77,0,&.,&Enter,&Username
 # cmd=44,0,&.,&Enter,file using &Zmodem
 #
 # Command 57 is the local-file-upload command for users with their own
-# copy of the clientware.  Commands 72-74 are for image uploads.
+# copy of the clientware.  Commands 72-73 are for image uploads.
 #
 #cmd=57,0,&.,&Enter,&File
 #cmd=72,0,&.,&Enter,&Image,user &Picture
 #cmd=73,0,&.,&Enter,&Image,&Room banner
-#cmd=74,0,&.,&Enter,&Image,&Floor label
 #
 cmd=41,0,&.,&Enter,re&Gistration
 cmd=4,0,&.,&Enter,&Message

diff --git a/textclient/src/citadel.c b/textclient/src/citadel.c
index c06f9ff0570e0434a8f56777e7875412d8f862fa..bd6f88cbddc8491c81ff3684d977df85a5aa4256 100644 (file)
--- a/textclient/src/citadel.c
+++ b/textclient/src/citadel.c
@@ -1934,12 +1934,6 @@ NEWUSR:  if (IsEmptyStr(rc_password)) {
                        case 73:
                                cli_image_upload(ipc, "_roompic_");
                                break;
-
-                       case 74:
-                               snprintf(aaa, sizeof aaa, "_floorpic_|%d", curr_floor);
-                               cli_image_upload(ipc, aaa);
-                               break;
-
                        case 75:
                                enternew(ipc, "roomname", aaa, 20);
                                r = CtdlIPCChangeRoomname(ipc, aaa, bbb);

diff --git a/webcit/graphics.c b/webcit/graphics.c
index ae7c65550864b97c60b3960273953d3ea0a6d7ae..863242f810bb84609043e749e404ce18515462b0 100644 (file)
--- a/webcit/graphics.c
+++ b/webcit/graphics.c
@@ -161,17 +161,6 @@ void display_editgoodbyepic(void) {
        display_graphics_upload("editgoodbuyepic");
 }
 
-void display_editfloorpic(void) {
-       StrBuf *PicAction;
-
-       PicAction = NewStrBuf();
-       StrBufPrintf(PicAction, "_floorpic_|%s", bstr("which_floor"));
-       putbstr("__WHICHPIC", PicAction);
-       putbstr("__PICDESC", NewStrBufPlain(_("the icon for this floor"), -1));
-       putbstr("__UPLURL", NewStrBufPlain(HKEY("editfloorpic")));
-       display_graphics_upload("editfloorpic");
-}
-
 void editroompic(void) {
        char buf[SIZ];
        snprintf(buf, SIZ, "_roompic_|%s",
@@ -179,13 +168,6 @@ void editroompic(void) {
        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
 (void)
@@ -198,6 +180,4 @@ InitModule_GRAPHICS
        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);
 }

diff --git a/webcit/static/t/floors_edit_one.html b/webcit/static/t/floors_edit_one.html
index f05f1a1a60761e165d26f53a06755cb145ea5a14..03faeb06710f63823016fa5767987979484b5758 100644 (file)
--- a/webcit/static/t/floors_edit_one.html
+++ b/webcit/static/t/floors_edit_one.html
@@ -10,7 +10,6 @@
                                                <td>
                                                        <a href="delete_floor?floornum=<?FLOOR:ID>" style="font-size: -1"><?_("(delete floor)")></a><br>
                                        <??("X",20)>
-                                                       <a href="display_editfloorpic?which_floor=<?FLOOR:ID>" style="font-size: -1"><?_("(edit graphic)")></a>
                                                </td>
                                        </tr>
                                </table>