-/* More Citadel/UX routines...
- * unlike routines.c, some of these DO use global variables.
- * $Id$
+/* $Id$
+ *
+ * More client-side support functions.
+ * Unlike routines.c, some of these DO use global variables.
+ *
*/
#include "sysdep.h"
#include <stdio.h>
#include <ctype.h>
#include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <signal.h>
#include <pwd.h>
#include <setjmp.h>
void entregis(void)
{ /* register with name and address */
- char buf[256];
- char tmpname[256];
- char tmpaddr[256];
- char tmpcity[256];
- char tmpstate[256];
- char tmpzip[256];
- char tmpphone[256];
- char tmpemail[256];
+ char buf[SIZ];
+ char tmpname[SIZ];
+ char tmpaddr[SIZ];
+ char tmpcity[SIZ];
+ char tmpstate[SIZ];
+ char tmpzip[SIZ];
+ char tmpphone[SIZ];
+ char tmpemail[SIZ];
+ char tmpcountry[SIZ];
int a;
strcpy(tmpname, "");
strcpy(tmpzip, "");
strcpy(tmpphone, "");
strcpy(tmpemail, "");
+ strcpy(tmpcountry, "");
serv_puts("GREG _SELF_");
serv_gets(buf);
strcpy(tmpphone, buf);
if (a == 9)
strcpy(tmpemail, buf);
+ if (a == 10)
+ strcpy(tmpcountry, buf);
++a;
}
}
strprompt("REAL name", tmpname, 29);
strprompt("Address", tmpaddr, 24);
strprompt("City/town", tmpcity, 14);
- strprompt("State", tmpstate, 2);
- strprompt("ZIP Code", tmpzip, 10);
+ strprompt("State/province", tmpstate, 2);
+ strprompt("ZIP/Postal Code", tmpzip, 10);
+ strprompt("Country", tmpcountry, 31);
strprompt("Telephone number", tmpphone, 14);
strprompt("Email address", tmpemail, 31);
serv_puts(tmpzip);
serv_puts(tmpphone);
serv_puts(tmpemail);
+ serv_puts(tmpcountry);
serv_puts("000");
printf("\n");
}
void updatels(void)
{ /* make all messages old in current room */
- char buf[256];
+ char buf[SIZ];
serv_puts("SLRP HIGHEST");
serv_gets(buf);
if (buf[0] != '2')
*/
void updatelsa(void)
{
- char buf[256];
+ char buf[SIZ];
sprintf(buf, "SLRP %ld", highest_msg_read);
serv_puts(buf);
serv_gets(buf);
*/
void do_upload(int fd)
{
- char buf[256];
+ char buf[SIZ];
char tbuf[4096];
long transmitted_bytes, total_bytes;
int bytes_to_send;
*/
void cli_upload(void)
{
- char flnm[256];
+ char flnm[SIZ];
char desc[151];
- char buf[256];
- char tbuf[256];
+ char buf[SIZ];
+ char tbuf[SIZ];
int a;
int fd;
*/
void cli_image_upload(char *keyname)
{
- char flnm[256];
- char buf[256];
+ char flnm[SIZ];
+ char buf[SIZ];
int fd;
sprintf(buf, "UIMG 0|%s", keyname);
*/
void upload(int c)
{ /* c = upload mode */
- char flnm[256];
+ char flnm[SIZ];
char desc[151];
- char buf[256];
+ char buf[SIZ];
char tbuf[4096];
int xfer_pid;
int a, b;
sprintf(buf, "cd %s; ls", tempdir);
lsfp = popen(buf, "r");
if (lsfp != NULL) {
- while (fgets(flnm, 256, lsfp) != NULL) {
+ while (fgets(flnm, sizeof flnm, lsfp) != NULL) {
flnm[strlen(flnm) - 1] = 0;
sprintf(buf, "%s/%s", tempdir, flnm);
fd = open(buf, O_RDONLY);
void val_user(char *user, int do_validate)
{
int a;
- char cmd[256];
- char buf[256];
+ char cmd[SIZ];
+ char buf[SIZ];
int ax = 0;
sprintf(cmd, "GREG %s", user);
ax = atoi(buf);
if (a == 10)
printf("%s\n", buf);
+ if (a == 11)
+ printf("%s\n", buf);
} while (strcmp(buf, "000"));
printf("Current access level: %d (%s)\n", ax, axdefs[ax]);
} else {
void validate(void)
{ /* validate new users */
- char cmd[256];
- char buf[256];
+ char cmd[SIZ];
+ char buf[SIZ];
int finished = 0;
do {
void deletefile(void)
{
char filename[32];
- char cmd[256];
+ char cmd[SIZ];
newprompt("Filename: ", filename, 31);
if (strlen(filename) == 0)
*/
void netsendfile(void)
{
- char filename[32], destsys[20], cmd[256];
+ char filename[32], destsys[20], cmd[SIZ];
newprompt("Filename: ", filename, 31);
if (strlen(filename) == 0)
{
char filename[64];
char newroom[ROOMNAMELEN];
- char cmd[256];
+ char cmd[SIZ];
newprompt("Filename: ", filename, 63);
if (strlen(filename) == 0)
*/
void list_bio(void)
{
- char buf[256];
+ char buf[SIZ];
int pos = 1;
serv_puts("LBIO");
*/
void read_bio(void)
{
- char who[256];
- char buf[256];
+ char who[SIZ];
+ char buf[SIZ];
do {
newprompt("Read bio for who ('?' for list) : ", who, 25);
*/
void do_system_configuration(void)
{
- char buf[256];
- char sc[25][256];
+ char buf[SIZ];
+ char sc[28][SIZ];
int expire_mode = 0;
int expire_value = 0;
int a;
+ int logpages = 0;
/* Clear out the config buffers */
memset(&sc[0][0], 0, sizeof(sc));
if (buf[0] == '1') {
a = 0;
while (serv_gets(buf), strcmp(buf, "000")) {
- if (a < 25)
+ if (a < 28)
strcpy(&sc[a][0], buf);
++a;
}
strprompt("Geographic location of this system", &sc[12][0], 31);
strprompt("Name of system administrator", &sc[13][0], 25);
strprompt("Paginator prompt", &sc[10][0], 79);
-
+ /* strprompt("Default moderation filter for new users", &sc[25][0], 4); */
/* Security parameters */
sprintf(&sc[11][0], "%d", (boolprompt(
"Restrict Internet mail to only those with that privilege",
atoi(&sc[11][0]))));
-
- strprompt("Name of room to log pages", &sc[18][0], ROOMNAMELEN);
+ sprintf(&sc[26][0], "%d", (boolprompt(
+ "Allow Aides to Zap (forget) rooms",
+ atoi(&sc[26][0]))));
+
+ if (strlen(&sc[18][0]) > 0) logpages = 1;
+ else logpages = 0;
+ logpages = boolprompt("Log all pages", logpages);
+ if (logpages) {
+ strprompt("Name of logging room", &sc[18][0], ROOMNAMELEN);
+ }
+ else {
+ sc[18][0] = 0;
+ }
/* Server tuning */
strprompt("Minimum number of worker threads", &sc[21][0], 3);
strprompt("Maximum number of worker threads", &sc[22][0], 3);
strprompt("Server-to-server networking password", &sc[15][0], 19);
- strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
strprompt("SMTP server port (-1 to disable)", &sc[24][0], 5);
+ strprompt("POP3 server port (-1 to disable)", &sc[23][0], 5);
+ strprompt("IMAP server port (-1 to disable)", &sc[27][0], 5);
/* Expiry settings */
-
strprompt("Default user purge time (days)", &sc[16][0], 5);
strprompt("Default room purge time (days)", &sc[17][0], 5);
serv_puts("CONF set");
serv_gets(buf);
if (buf[0] == '4') {
- for (a = 0; a < 25; ++a)
+ for (a = 0; a < 28; ++a)
serv_puts(&sc[a][0]);
serv_puts("000");
}
* Internet mail configuration
*/
void do_internet_configuration(void) {
- char buf[256];
+ char buf[SIZ];
int num_recs = 0;
char **recs = NULL;
char ch;
++num_recs;
if (num_recs == 1) recs = malloc(sizeof(char *));
else recs = realloc(recs, (sizeof(char *)) * num_recs);
- recs[num_recs-1] = malloc(256);
+ recs[num_recs-1] = malloc(SIZ);
strcpy(recs[num_recs-1], buf);
}