#ifdef HAVE_UTMPX_H
#include <utmpx.h>
#endif
+#include "citadel.h"
+#include "citadel_ipc.h"
#include "screen.h"
#ifndef HAVE_GETUTLINE
extern unsigned userflags;
extern char *axdefs[7];
extern char sigcaught;
-extern struct CtdlServInfo serv_info;
extern char rc_floor_mode;
extern int rc_ansi_color;
extern int rc_prompt_control;
}
}
-void hit_any_key(void) { /* hit any key to continue */
+void hit_any_key(CtdlIPC *ipc) { /* hit any key to continue */
int a,b;
color(COLOR_PUSH);
color(DIM_RED);
- scr_printf("%s\r",serv_info.serv_moreprompt);
+ scr_printf("%s\r", ipc->ServInfo.moreprompt);
color(COLOR_POP);
- sttybbs(0);
+ stty_ctdl(0);
b=inkey();
- for (a=0; a<strlen(serv_info.serv_moreprompt); ++a)
+ for (a=0; a<strlen(ipc->ServInfo.moreprompt); ++a)
scr_putc(' ');
scr_putc(13);
- sttybbs(1);
+ stty_ctdl(1);
if ( (rc_prompt_control == 1)
|| ((rc_prompt_control == 3) && (userflags & US_PROMPTCTL)) ) {
if (b == 'q' || b == 'Q' || b == 's' || b == 'S')
}
/*
- * change a user's access level
+ * Edit or delete a user (cmd=25 to edit/create, 96 to delete)
*/
-void edituser(void)
+void edituser(CtdlIPC *ipc, int cmd)
{
char buf[SIZ];
- char who[SIZ];
- char pass[SIZ];
- int flags;
- int timescalled;
- int posted;
- int axlevel;
- long usernum;
- time_t lastcall;
- int userpurge;
+ char who[USERNAME_SIZE];
+ struct ctdluser *user = NULL;
int newnow = 0;
-
- newprompt("User name: ",who,25);
-AGUP: snprintf(buf, sizeof buf, "AGUP %s",who);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0]!='2') {
- scr_printf("%s\n",&buf[4]);
- scr_printf("Do you want to create this user? ");
- if (yesno()) {
- snprintf(buf, sizeof buf, "CREU %s", who);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] == '2') {
- newnow = 1;
- goto AGUP;
+ int r; /* IPC response code */
+
+ newprompt("User name: ", who, 29);
+ while ((r = CtdlIPCAideGetUserParameters(ipc, who, &user, buf)) / 100 != 2) {
+ scr_printf("%s\n", buf);
+ if (cmd == 25) {
+ scr_printf("Do you want to create this user? ");
+ if (yesno()) {
+ r = CtdlIPCCreateUser(ipc, who, 0, buf);
+ if (r / 100 == 2) {
+ newnow = 1;
+ continue;
+ }
+ scr_printf("%s\n",&buf[4]);
}
- scr_printf("%s\n",&buf[4]);
- return;
}
+ free(user);
return;
}
- extract(who, &buf[4], 0);
- extract(pass, &buf[4], 1);
- flags = extract_int(&buf[4], 2);
- timescalled = extract_int(&buf[4], 3);
- posted = extract_int(&buf[4], 4);
- axlevel = extract_int(&buf[4], 5);
- usernum = extract_long(&buf[4], 6);
- lastcall = extract_long(&buf[4], 7);
- userpurge = extract_int(&buf[4], 8);
-
- val_user(who, 0); /* Display registration */
-
- if (newnow) {
- newprompt("Password: ", pass, -19);
- }
- else if (boolprompt("Change password", 0)) {
- strprompt("Password", pass, -19);
+
+ if (cmd == 25) {
+ val_user(ipc, user->fullname, 0); /* Display registration */
+
+ if (newnow || boolprompt("Change password", 0)) {
+ strprompt("Password", user->password, -19);
+ }
+
+ user->axlevel = intprompt("Access level", user->axlevel, 0, 6);
+/* user->flags = set_attr(ipc, user->flags,
+ "Permission to send Internet mail",
+ US_INTERNET, 0); */
+ if (boolprompt("Permission to send Internet mail", (user->flags & US_INTERNET)))
+ user->flags |= US_INTERNET;
+ else
+ user->flags &= ~US_INTERNET;
+ if (boolprompt("Ask user to register again", !(user->flags & US_REGIS)))
+ user->flags &= ~US_REGIS;
+ else
+ user->flags |= US_REGIS;
+ user->timescalled = intprompt("Times called",
+ user->timescalled, 0, INT_MAX);
+ user->posted = intprompt("Messages posted",
+ user->posted, 0, INT_MAX);
+ user->lastcall = boolprompt("Set last call to now", 0) ?
+ time(NULL) : user->lastcall;
+ user->USuserpurge = intprompt("Purge time (in days, 0 for system default",
+ user->USuserpurge, 0, INT_MAX);
}
- axlevel = intprompt("Access level", axlevel, 0, 6);
- if (boolprompt("Ask user to register again", !(flags & US_REGIS)))
- flags &= ~US_REGIS;
- else
- flags |= US_REGIS;
- timescalled = intprompt("Times called", timescalled, 0, INT_MAX);
- posted = intprompt("Messages posted", posted, 0, INT_MAX);
- lastcall = (boolprompt("Set last call to now", 0)?time(NULL):lastcall);
- userpurge = intprompt("Purge time (in days, 0 for system default",
- userpurge, 0, INT_MAX);
-
- snprintf(buf, sizeof buf, "ASUP %s|%s|%d|%d|%d|%d|%ld|%ld|%d",
- who, pass, flags, timescalled, posted, axlevel, usernum,
- (long)lastcall, userpurge);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0]!='2') {
- scr_printf("%s\n",&buf[4]);
+ if (cmd == 96) {
+ scr_printf("Do you want to delete this user? ");
+ if (!yesno()) return;
+ user->axlevel = 0;
}
+
+ r = CtdlIPCAideSetUserParameters(ipc, user, buf);
+ if (r / 100 != 2) {
+ scr_printf("%s\n", buf);
+ }
+ free(user);
}
-int set_attr(int sval, char *prompt, unsigned int sbit)
+/* Display a prompt and flip a bit based on whether the user answers
+ * yes or no. Yes=1 and No=0, unless 'backwards' is set to a nonzero value
+ * in which case No=1 and Yes=0.
+ */
+int set_attr(CtdlIPC *ipc, unsigned int sval, char *prompt, unsigned int sbit, int backwards)
{
int a;
int temp;
temp = sval;
color(DIM_WHITE);
- scr_printf("%45s ", prompt);
+ scr_printf("%50s ", prompt);
color(DIM_MAGENTA);
scr_printf("[");
color(BRIGHT_MAGENTA);
- scr_printf("%3s", ((temp&sbit) ? "Yes":"No"));
+
+ if (backwards) {
+ scr_printf("%3s", ((temp&sbit) ? "No":"Yes"));
+ }
+ else {
+ scr_printf("%3s", ((temp&sbit) ? "Yes":"No"));
+ }
+
color(DIM_MAGENTA);
scr_printf("]? ");
color(BRIGHT_CYAN);
- a=yesno_d(temp&sbit);
+ a = (temp & sbit);
+ if (a != 0) a = 1;
+ if (backwards) a = 1 - a;
+ a = yesno_d(a);
+ if (backwards) a = 1 - a;
color(DIM_WHITE);
- temp=(temp|sbit);
- if (!a) temp=(temp^sbit);
+ temp = (temp|sbit);
+ if (!a) temp = (temp^sbit);
return(temp);
}
* modes are: 0 - .EC command, 1 - .EC for new user,
* 2 - toggle Xpert mode 3 - toggle floor mode
*/
-void enter_config(int mode)
+void enter_config(CtdlIPC *ipc, int mode)
{
- int width, height, flags, filter;
- char buf[128];
-
- snprintf(buf, sizeof buf, "GETU");
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0]!='2') {
- scr_printf("%s\n",&buf[4]);
+ char buf[SIZ];
+ struct ctdluser *user = NULL;
+ int r; /* IPC response code */
+
+ r = CtdlIPCGetConfig(ipc, &user, buf);
+ if (r / 100 != 2) {
+ scr_printf("%s\n", buf);
+ free(user);
return;
}
- width = extract_int(&buf[4],0);
- height = extract_int(&buf[4],1);
- flags = extract_int(&buf[4],2);
- filter = extract_int(&buf[4],3);
-
- if ((mode==0)||(mode==1)) {
-
- width = intprompt("Enter your screen width",width,20,255);
- height = intprompt("Enter your screen height",height,3,255);
+ if (mode == 0 || mode == 1) {
+
+ /* Does anyone still use dialup connections with manual
+ * screen dimensions setting anymore? For now we'll keep
+ * the system's ability to set these, but remove the prompts
+ * because they're spurious for nearly everyone.
+ *
+ user->USscreenwidth = intprompt("Enter your screen width",
+ user->USscreenwidth, 20, 255);
+ user->USscreenheight = intprompt("Enter your screen height",
+ user->USscreenheight, 3, 255);
+ */
- flags = set_attr(flags,
- "Are you an experienced Citadel user",US_EXPERT);
- if ( ((flags&US_EXPERT)==0) && (mode==1))
- return;
- flags = set_attr(flags,
- "Print last old message on New message request",US_LASTOLD);
- if ((flags&US_EXPERT)==0) formout("unlisted");
- flags = set_attr(flags,"Be unlisted in userlog",US_UNLISTED);
- flags = set_attr(flags,"Suppress message prompts",US_NOPROMPT);
- if ((flags & US_NOPROMPT)==0)
- flags = set_attr(flags,"Use 'disappearing' prompts",US_DISAPPEAR);
- flags = set_attr(flags,
- "Pause after each screenful of text",US_PAGINATOR);
- if ( (rc_prompt_control == 3) && (flags & US_PAGINATOR) ) {
- flags = set_attr(flags,
- "<N>ext and <S>top work at paginator prompt", US_PROMPTCTL);
- }
- if (rc_floor_mode == RC_DEFAULT) {
- flags = set_attr(flags,
- "View rooms by floor",US_FLOORS);
- }
- if (rc_ansi_color == 3) {
- flags = set_attr(flags,
- "Enable color support",US_COLOR);
- }
-
- }
-
- if (mode==2) {
- if (flags & US_EXPERT) {
- flags = (flags ^ US_EXPERT);
- scr_printf("Expert mode now OFF\n");
+ user->flags = set_attr(ipc, user->flags,
+ "Are you an experienced Citadel user",
+ US_EXPERT, 0);
+ if ((user->flags & US_EXPERT) == 0 && mode == 1) {
+ free(user);
+ return;
}
- else {
- flags = (flags | US_EXPERT);
- scr_printf("Expert mode now ON\n");
+
+ user->flags = set_attr(ipc, user->flags,
+ "Print last old message on New message request",
+ US_LASTOLD, 0);
+
+ user->flags = set_attr(ipc, user->flags,
+ "Prompt after each message",
+ US_NOPROMPT, 1);
+
+ if ((user->flags & US_NOPROMPT) == 0)
+ user->flags = set_attr(ipc, user->flags,
+ "Use 'disappearing' prompts",
+ US_DISAPPEAR, 0);
+
+ user->flags = set_attr(ipc, user->flags,
+ "Pause after each screenful of text",
+ US_PAGINATOR, 0);
+
+ if (rc_prompt_control == 3 && (user->flags & US_PAGINATOR))
+ user->flags = set_attr(ipc, user->flags,
+ "<N>ext and <S>top work at paginator prompt",
+ US_PROMPTCTL, 0);
+
+ if (rc_floor_mode == RC_DEFAULT)
+ user->flags = set_attr(ipc, user->flags,
+ "View rooms by floor",
+ US_FLOORS, 0);
+
+ if (rc_ansi_color == 3)
+ user->flags = set_attr(ipc, user->flags,
+ "Enable color support",
+ US_COLOR, 0);
+
+ if ((user->flags & US_EXPERT) == 0)
+ formout(ipc, "unlisted");
+
+ user->flags = set_attr(ipc, user->flags,
+ "Be unlisted in userlog",
+ US_UNLISTED, 0);
+
+ if (!IsEmptyStr(editor_paths[0])) {
+ user->flags = set_attr(ipc, user->flags,
+ "Always enter messages with the full-screen editor",
+ US_EXTEDIT, 0);
}
- }
- if (mode==3) {
- if (flags & US_FLOORS) {
- flags = (flags ^ US_FLOORS);
- scr_printf("Floor mode now OFF\n");
+ }
+
+ if (mode == 2) {
+ if (user->flags & US_EXPERT) {
+ user->flags ^= US_EXPERT;
+ scr_printf("Expert mode now OFF\n");
+ } else {
+ user->flags |= US_EXPERT;
+ scr_printf("Expert mode now ON\n");
}
- else {
- flags = (flags | US_FLOORS);
- scr_printf("Floor mode now ON\n");
+ }
+
+ if (mode == 3) {
+ if (user->flags & US_FLOORS) {
+ user->flags ^= US_FLOORS;
+ scr_printf("Floor mode now OFF\n");
+ } else {
+ user->flags |= US_FLOORS;
+ scr_printf("Floor mode now ON\n");
}
- }
+ }
- snprintf(buf, sizeof buf, "SETU %d|%d|%d|%d",width,height,flags,filter);
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0]!='2') scr_printf("%s\n",&buf[4]);
- userflags = flags;
+ r = CtdlIPCSetConfig(ipc, user, buf);
+ if (r / 100 != 2) scr_printf("%s\n", buf);
+ userflags = user->flags;
+ free(user);
}
/*
}
-/* display internal error as defined in errmsgs */
-void interr(int errnum) {
- scr_printf("*** INTERNAL ERROR %d\n"
- "(Press any key to continue)\n", errnum);
- inkey();
- logoff(errnum);
-}
-
void strproc(char *string)
{
int a;
- if (strlen(string)==0) return;
+ if (IsEmptyStr(string)) return;
/* Convert non-printable characters to blanks */
for (a=0; a<strlen(string); ++a) {
#endif
-void progress(long int curr, long int cmax)
+void progress(CtdlIPC* ipc, unsigned long curr, unsigned long cmax)
{
- static long dots_printed;
- long a;
-
- if (curr==0) {
- scr_printf(".......................................");
- scr_printf(".......................................\r");
- scr_flush();
- dots_printed = 0;
- }
- else if (curr==cmax) {
- scr_printf("\r%79s\n","");
- }
- else {
- a=(curr * 100) / cmax;
- a=a*78; a=a/100;
- while (dots_printed < a) {
- scr_printf("*");
- ++dots_printed;
- scr_flush();
- }
+ static char dots[] =
+ "**************************************************";
+ char dots_printed[51];
+ char fmt[42];
+ unsigned long a;
+
+ if (curr >= cmax) {
+ sln_printf("\r%79s\r","");
+ status_line(ipc->ServInfo.humannode, ipc->ServInfo.site_location,
+ room_name, secure, 0);
+ } else {
+ /* a will be range 0-50 rather than 0-100 */
+ a=(curr * 50) / cmax;
+ sprintf(fmt, "[%%s%%%lds] %%3ld%%%% %%10ld/%%10ld\r", 50 - a);
+ strncpy(dots_printed, dots, a);
+ dots_printed[a] = 0;
+ sln_printf(fmt, dots_printed, "",
+ curr * 100 / cmax, curr, cmax);
+ sln_flush();
}
}
* NOT the same locate_host() in locate_host.c. This one just does a
* 'who am i' to try to discover where the user is...
*/
-void locate_host(char *hbuf)
+void locate_host(CtdlIPC* ipc, char *hbuf)
{
#ifndef HAVE_UTMP_H
char buf[SIZ];
who = (FILE *)popen("who am i","r");
if (who==NULL) {
- strcpy(hbuf,serv_info.serv_fqdn);
+ strcpy(hbuf, ipc->ServInfo.fqdn);
return;
}
fgets(buf,sizeof buf,who);
if ((buf[a]=='(')||(buf[a]==')')) ++b;
}
if (b<2) {
- strcpy(hbuf,serv_info.serv_fqdn);
+ strcpy(hbuf, ipc->ServInfo.fqdn);
return;
}
if (buf[a]==')') buf[a] = 0;
}
- if (strlen(buf)==0) strcpy(hbuf,serv_info.serv_fqdn);
+ if (IsEmptyStr(buf)) strcpy(hbuf, ipc->ServInfo.fqdn);
else strncpy(hbuf,buf,24);
#else
char *tty = ttyname(0);
if (tty == NULL) {
fail:
- safestrncpy(hbuf, serv_info.serv_fqdn, 24);
+ safestrncpy(hbuf, ipc->ServInfo.fqdn, 24);
return;
}
/*
* miscellaneous server commands (testing, etc.)
*/
-void misc_server_cmd(char *cmd) {
+void misc_server_cmd(CtdlIPC *ipc, char *cmd) {
char buf[SIZ];
- serv_puts(cmd);
- serv_gets(buf);
+ CtdlIPC_chat_send(ipc, cmd);
+ CtdlIPC_chat_recv(ipc, buf);
scr_printf("%s\n",buf);
if (buf[0]=='1') {
set_keepalives(KA_HALF);
- while (serv_gets(buf), strcmp(buf,"000")) {
+ while (CtdlIPC_chat_recv(ipc, buf), strcmp(buf,"000")) {
scr_printf("%s\n",buf);
}
set_keepalives(KA_YES);
if (buf[0]=='4') {
do {
newprompt("> ",buf,255);
- serv_puts(buf);
+ CtdlIPC_chat_send(ipc, buf);
} while(strcmp(buf,"000"));
return;
}
projects / citadel.git / blobdiff