projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb6f6fa
)
Removed er_flags and er_flags2 from editroom(). These were being set and then never...
author
Art Cancro
<ajc@uncensored.citadel.org>
Tue, 15 May 2012 16:13:09 +0000
(12:13 -0400)
committer
Art Cancro
<ajc@uncensored.citadel.org>
Tue, 15 May 2012 16:13:09 +0000
(12:13 -0400)
webcit/roomops.c
patch
|
blob
|
history
diff --git
a/webcit/roomops.c
b/webcit/roomops.c
index 2cba1abb615945ff4a6e9f2ba315958e2adf7124..0c264b6460fc5d2a8f32573bb0f3831506629446 100644
(file)
--- a/
webcit/roomops.c
+++ b/
webcit/roomops.c
@@
-687,8
+687,10
@@
void toggle_self_service(void) {
WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
SetCurrentRoomFlags (&WCC->CurRoom);
WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
SetCurrentRoomFlags (&WCC->CurRoom);
-
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
}
@@
-704,114
+706,109
@@
void editroom(void)
const StrBuf *er_password;
const StrBuf *er_dirname;
const StrBuf *er_roomaide;
const StrBuf *er_password;
const StrBuf *er_dirname;
const StrBuf *er_roomaide;
- unsigned er_flags;
- unsigned er_flags2;
int succ1, succ2;
if (!havebstr("ok_button")) {
AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
int succ1, succ2;
if (!havebstr("ok_button")) {
AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
return;
}
+
if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
if (GetCurrentRoomFlags (&WCC->CurRoom, 1) == 0) {
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
LoadRoomAide();
return;
}
LoadRoomAide();
-
- er_flags = WCC->CurRoom.QRFlags;
- er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
-
- er_flags2 = WCC->CurRoom.QRFlags2;
+ WCC->CurRoom.QRFlags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
Ptr = sbstr("type");
if (!strcmp(ChrPtr(Ptr), "invonly")) {
Ptr = sbstr("type");
if (!strcmp(ChrPtr(Ptr), "invonly")) {
-
er_f
lags |= (QR_PRIVATE);
+
WCC->CurRoom.QRF
lags |= (QR_PRIVATE);
}
if (!strcmp(ChrPtr(Ptr), "hidden")) {
}
if (!strcmp(ChrPtr(Ptr), "hidden")) {
-
er_f
lags |= (QR_PRIVATE | QR_GUESSNAME);
+
WCC->CurRoom.QRF
lags |= (QR_PRIVATE | QR_GUESSNAME);
}
if (!strcmp(ChrPtr(Ptr), "passworded")) {
}
if (!strcmp(ChrPtr(Ptr), "passworded")) {
-
er_f
lags |= (QR_PRIVATE | QR_PASSWORDED);
+
WCC->CurRoom.QRF
lags |= (QR_PRIVATE | QR_PASSWORDED);
}
if (!strcmp(ChrPtr(Ptr), "personal")) {
}
if (!strcmp(ChrPtr(Ptr), "personal")) {
-
er_f
lags |= QR_MAILBOX;
+
WCC->CurRoom.QRF
lags |= QR_MAILBOX;
} else {
} else {
-
er_f
lags &= ~QR_MAILBOX;
+
WCC->CurRoom.QRF
lags &= ~QR_MAILBOX;
}
}
-
-
if (yesbstr("prefonly")) {
if (yesbstr("prefonly")) {
-
er_f
lags |= QR_PREFONLY;
+
WCC->CurRoom.QRF
lags |= QR_PREFONLY;
} else {
} else {
-
er_f
lags &= ~QR_PREFONLY;
+
WCC->CurRoom.QRF
lags &= ~QR_PREFONLY;
}
if (yesbstr("readonly")) {
}
if (yesbstr("readonly")) {
-
er_f
lags |= QR_READONLY;
+
WCC->CurRoom.QRF
lags |= QR_READONLY;
} else {
} else {
-
er_f
lags &= ~QR_READONLY;
+
WCC->CurRoom.QRF
lags &= ~QR_READONLY;
}
}
-
if (yesbstr("collabdel")) {
if (yesbstr("collabdel")) {
-
er_f
lags2 |= QR2_COLLABDEL;
+
WCC->CurRoom.QRF
lags2 |= QR2_COLLABDEL;
} else {
} else {
-
er_f
lags2 &= ~QR2_COLLABDEL;
+
WCC->CurRoom.QRF
lags2 &= ~QR2_COLLABDEL;
}
if (yesbstr("permanent")) {
}
if (yesbstr("permanent")) {
-
er_f
lags |= QR_PERMANENT;
+
WCC->CurRoom.QRF
lags |= QR_PERMANENT;
} else {
} else {
-
er_f
lags &= ~QR_PERMANENT;
+
WCC->CurRoom.QRF
lags &= ~QR_PERMANENT;
}
if (yesbstr("subjectreq")) {
}
if (yesbstr("subjectreq")) {
-
er_f
lags2 |= QR2_SUBJECTREQ;
+
WCC->CurRoom.QRF
lags2 |= QR2_SUBJECTREQ;
} else {
} else {
-
er_f
lags2 &= ~QR2_SUBJECTREQ;
+
WCC->CurRoom.QRF
lags2 &= ~QR2_SUBJECTREQ;
}
if (yesbstr("network")) {
}
if (yesbstr("network")) {
-
er_f
lags |= QR_NETWORK;
+
WCC->CurRoom.QRF
lags |= QR_NETWORK;
} else {
} else {
-
er_f
lags &= ~QR_NETWORK;
+
WCC->CurRoom.QRF
lags &= ~QR_NETWORK;
}
if (yesbstr("directory")) {
}
if (yesbstr("directory")) {
-
er_f
lags |= QR_DIRECTORY;
+
WCC->CurRoom.QRF
lags |= QR_DIRECTORY;
} else {
} else {
-
er_f
lags &= ~QR_DIRECTORY;
+
WCC->CurRoom.QRF
lags &= ~QR_DIRECTORY;
}
if (yesbstr("ulallowed")) {
}
if (yesbstr("ulallowed")) {
-
er_f
lags |= QR_UPLOAD;
+
WCC->CurRoom.QRF
lags |= QR_UPLOAD;
} else {
} else {
-
er_f
lags &= ~QR_UPLOAD;
+
WCC->CurRoom.QRF
lags &= ~QR_UPLOAD;
}
if (yesbstr("dlallowed")) {
}
if (yesbstr("dlallowed")) {
-
er_f
lags |= QR_DOWNLOAD;
+
WCC->CurRoom.QRF
lags |= QR_DOWNLOAD;
} else {
} else {
-
er_f
lags &= ~QR_DOWNLOAD;
+
WCC->CurRoom.QRF
lags &= ~QR_DOWNLOAD;
}
if (yesbstr("visdir")) {
}
if (yesbstr("visdir")) {
-
er_f
lags |= QR_VISDIR;
+
WCC->CurRoom.QRF
lags |= QR_VISDIR;
} else {
} else {
-
er_f
lags &= ~QR_VISDIR;
+
WCC->CurRoom.QRF
lags &= ~QR_VISDIR;
}
}
-
Ptr = sbstr("anon");
Ptr = sbstr("anon");
-
er_f
lags &= ~(QR_ANONONLY | QR_ANONOPT);
+
WCC->CurRoom.QRF
lags &= ~(QR_ANONONLY | QR_ANONOPT);
if (!strcmp(ChrPtr(Ptr), "anononly"))
if (!strcmp(ChrPtr(Ptr), "anononly"))
-
er_f
lags |= QR_ANONONLY;
+
WCC->CurRoom.QRF
lags |= QR_ANONONLY;
if (!strcmp(ChrPtr(Ptr), "anon2"))
if (!strcmp(ChrPtr(Ptr), "anon2"))
-
er_f
lags |= QR_ANONOPT;
+
WCC->CurRoom.QRF
lags |= QR_ANONOPT;
er_name = sbstr("er_name");
er_dirname = sbstr("er_dirname");
er_name = sbstr("er_name");
er_dirname = sbstr("er_dirname");
@@
-838,9
+835,12
@@
void editroom(void)
succ2 = SaveRoomAide (&WCC->CurRoom);
succ2 = SaveRoomAide (&WCC->CurRoom);
- if (succ1 + succ2 == 0)
+ if (succ1 + succ2 == 0)
{
AppendImportantMessage (_("Your changes have been saved."), -1);
AppendImportantMessage (_("Your changes have been saved."), -1);
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ }
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
return;
}
@@
-909,7
+909,9
@@
void do_invt_kick(void)
}
}
}
}
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
}
@@
-972,7
+974,9
@@
void entroom(void)
WCC->CurRoom.view = er_view;
if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ) {
WCC->CurRoom.view = er_view;
if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ) {
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
} else {
smart_goto(WCC->CurRoom.name);
}
} else {
smart_goto(WCC->CurRoom.name);
}
@@
-1007,7
+1011,9
@@
void set_room_policy(void) {
if (!havebstr("ok_button")) {
AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
if (!havebstr("ok_button")) {
AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
Line = NewStrBuf();
return;
}
Line = NewStrBuf();
@@
-1022,7
+1028,9
@@
void set_room_policy(void) {
}
FreeStrBuf(&Line);
ReloadCurrentRoom();
}
FreeStrBuf(&Line);
ReloadCurrentRoom();
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
}
@@
-1065,7
+1073,9
@@
void netedit(void) {
strcat(line, bstr("suffix"));
}
else {
strcat(line, bstr("suffix"));
}
else {
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
return;
}
@@
-1076,7
+1086,9
@@
void netedit(void) {
if (GetServerStatus(Line, NULL) != 1) {
AppendImportantMessage(SRV_STATUS_MSG(Line));
FreeStrBuf(&Line);
if (GetServerStatus(Line, NULL) != 1) {
AppendImportantMessage(SRV_STATUS_MSG(Line));
FreeStrBuf(&Line);
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
return;
}
return;
}
@@
-1107,7
+1119,9
@@
void netedit(void) {
if (GetServerStatus(Line, NULL) != 4) {
AppendImportantMessage(SRV_STATUS_MSG(Line));
if (GetServerStatus(Line, NULL) != 4) {
AppendImportantMessage(SRV_STATUS_MSG(Line));
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
FreeStrBuf(&Line);
FreeStrBuf(&TmpBuf);
return;
FreeStrBuf(&Line);
FreeStrBuf(&TmpBuf);
return;
@@
-1139,7
+1153,9
@@
void netedit(void) {
FlushIgnetCfgs(&WC->CurRoom);
FreeStrBuf(&Line);
FlushIgnetCfgs(&WC->CurRoom);
FreeStrBuf(&Line);
- http_transmit_thing(ChrPtr(do_template("room_edit")), 0);
+ output_headers(1, 1, 1, 0, 0, 0);
+ do_template("room_edit");
+ wDumpContent(1);
}
/*
}
/*
@@
-1299,7
+1315,6
@@
InitModule_ROOMOPS
NULL);
RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
NULL);
RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
-
WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
WebcitAddUrlHandler(HKEY("delete_floor"), "", 0, delete_floor, 0);
WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
WebcitAddUrlHandler(HKEY("delete_floor"), "", 0, delete_floor, 0);