projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
[citadel.git]
/
textclient
/
src
/
rooms.c
diff --git
a/textclient/src/rooms.c
b/textclient/src/rooms.c
index 732661e5783b8568a4941c8d6a65509f78f87b78..b58db20ae57142d20088c478e498562d3cdae5cb 100644
(file)
--- a/
textclient/src/rooms.c
+++ b/
textclient/src/rooms.c
@@
-501,7
+501,7
@@
int select_floor(CtdlIPC *ipc, int rfloor)
void editthisroom(CtdlIPC *ipc)
{
int rbump = 0;
void editthisroom(CtdlIPC *ipc)
{
int rbump = 0;
- char r
aid
e[USERNAME_SIZE];
+ char r
oom_admin_nam
e[USERNAME_SIZE];
char buf[SIZ];
struct ctdlroom *attr = NULL;
struct ExpirePolicy *eptr = NULL;
char buf[SIZ];
struct ctdlroom *attr = NULL;
struct ExpirePolicy *eptr = NULL;
@@
-515,15
+515,15
@@
void editthisroom(CtdlIPC *ipc)
}
eptr = &(attr->QRep);
}
eptr = &(attr->QRep);
- /* Fetch the name of the current room a
ide
*/
+ /* Fetch the name of the current room a
dmin
*/
r = CtdlIPCGetRoomAide(ipc, buf);
if (r / 100 == 2) {
r = CtdlIPCGetRoomAide(ipc, buf);
if (r / 100 == 2) {
- safestrncpy(r
aide, buf, sizeof raid
e);
+ safestrncpy(r
oom_admin_name, buf, sizeof room_admin_nam
e);
} else {
} else {
- strcpy(r
aid
e, "");
+ strcpy(r
oom_admin_nam
e, "");
}
}
- if (IsEmptyStr(r
aid
e)) {
- strcpy(r
aid
e, "none");
+ if (IsEmptyStr(r
oom_admin_nam
e)) {
+ strcpy(r
oom_admin_nam
e, "none");
}
/* Fetch the expire policy (this will silently fail on old servers,
}
/* Fetch the expire policy (this will silently fail on old servers,
@@
-616,14
+616,14
@@
void editthisroom(CtdlIPC *ipc)
}
attr->QRorder = intprompt("Listing order", attr->QRorder, 0, 127);
}
attr->QRorder = intprompt("Listing order", attr->QRorder, 0, 127);
- /* Ask about the room a
ide
*/
+ /* Ask about the room a
dmin
*/
do {
do {
- strprompt("Room a
ide (or 'none')", raid
e, 29);
- if (!strcasecmp(r
aid
e, "none")) {
- strcpy(r
aid
e, "");
+ strprompt("Room a
dmin (or 'none')", room_admin_nam
e, 29);
+ if (!strcasecmp(r
oom_admin_nam
e, "none")) {
+ strcpy(r
oom_admin_nam
e, "");
break;
} else {
break;
} else {
- r = CtdlIPCQueryUsername(ipc, r
aid
e, buf);
+ r = CtdlIPCQueryUsername(ipc, r
oom_admin_nam
e, buf);
if (r / 100 != 2)
scr_printf("%s\n", buf);
}
if (r / 100 != 2)
scr_printf("%s\n", buf);
}
@@
-660,7
+660,7
@@
void editthisroom(CtdlIPC *ipc)
scr_printf("Save changes (y/n)? ");
if (yesno() == 1) {
scr_printf("Save changes (y/n)? ");
if (yesno() == 1) {
- r = CtdlIPCSetRoomAide(ipc, r
aid
e, buf);
+ r = CtdlIPCSetRoomAide(ipc, r
oom_admin_nam
e, buf);
if (r / 100 != 2) {
scr_printf("%s\n", buf);
}
if (r / 100 != 2) {
scr_printf("%s\n", buf);
}
@@
-1077,7
+1077,7
@@
void entroom(CtdlIPC *ipc)
"<1>Public room (shown to all users by default)\n"
"<2>Hidden room (accessible to anyone who knows the room name)\n"
"<3>Passworded room (hidden, plus requires a password to enter)\n"
"<1>Public room (shown to all users by default)\n"
"<2>Hidden room (accessible to anyone who knows the room name)\n"
"<3>Passworded room (hidden, plus requires a password to enter)\n"
- "<4>Invitation-only room (requires access to be granted by an A
ide
)\n"
+ "<4>Invitation-only room (requires access to be granted by an A
dmin
)\n"
"<5>Personal room (accessible to you only)\n"
"Enter room type: "
);
"<5>Personal room (accessible to you only)\n"
"Enter room type: "
);
@@
-1133,19
+1133,19
@@
void entroom(CtdlIPC *ipc)
void readinfo(CtdlIPC *ipc)
{ /* read info file for current room */
char buf[SIZ];
void readinfo(CtdlIPC *ipc)
{ /* read info file for current room */
char buf[SIZ];
- char r
aid
e[64];
+ char r
oom_admin_nam
e[64];
int r; /* IPC response code */
char *text = NULL;
int r; /* IPC response code */
char *text = NULL;
- /* Name of currernt room a
ide
*/
+ /* Name of currernt room a
dmin
*/
r = CtdlIPCGetRoomAide(ipc, buf);
if (r / 100 == 2)
r = CtdlIPCGetRoomAide(ipc, buf);
if (r / 100 == 2)
- safestrncpy(r
aide, buf, sizeof raid
e);
+ safestrncpy(r
oom_admin_name, buf, sizeof room_admin_nam
e);
else
else
- strcpy(r
aid
e, "");
+ strcpy(r
oom_admin_nam
e, "");
- if (!IsEmptyStr(r
aid
e))
- scr_printf("Room a
ide is %s.\n\n", raid
e);
+ if (!IsEmptyStr(r
oom_admin_nam
e))
+ scr_printf("Room a
dmin is %s.\n\n", room_admin_nam
e);
r = CtdlIPCRoomInfo(ipc, &text, buf);
if (r / 100 != 1)
r = CtdlIPCRoomInfo(ipc, &text, buf);
if (r / 100 != 1)