From: Art Cancro <ajc@citadel.org>
Date: Wed, 19 Jun 2002 22:01:31 +0000 (+0000)
Subject: * When editing another user's vCard, do a "transient goto" to their config
X-Git-Tag: v7.86~6360
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=f5509157a0f7582b618687bb5913dbe628451d5d;p=citadel.git

* When editing another user's vCard, do a "transient goto" to their config
  room so you don't automatically gain access to their config room.
* When creating a user, go back to the "select user to edit" screen with the
  new user's account name pre-selected.
---

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 47bb566f4..3cccdd1f3 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,10 @@
 $Log$
+Revision 323.42  2002/06/19 22:01:31  ajc
+* When editing another user's vCard, do a "transient goto" to their config
+  room so you don't automatically gain access to their config room.
+* When creating a user, go back to the "select user to edit" screen with the
+  new user's account name pre-selected.
+
 Revision 323.41  2002/06/17 03:48:44  ajc
 * Finished the thing to edit other users' vCards.
 
@@ -842,3 +848,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
+
diff --git a/webcit/preferences.c b/webcit/preferences.c
index c3f23f1c1..916f55824 100644
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -36,7 +36,7 @@ void load_preferences(void) {
 
 	lprintf(9, "entering load_preferences()\n");
 
-	serv_printf("GOTO My Citadel Config");
+	serv_printf("GOTO %s", USERCONFIGROOM);
 	serv_gets(buf);
 	if (buf[0] != '2') return;
 	
@@ -88,12 +88,12 @@ void save_preferences(void) {
 	long msgnum = 0L;
 
 	lprintf(9, "entering save_preferences()\n");
-	serv_printf("GOTO My Citadel Config");
+	serv_printf("GOTO %s", USERCONFIGROOM);
 	serv_gets(buf);
 	if (buf[0] != '2') { /* try to create the config room if not there */
-		serv_printf("CRE8 1|My Citadel Config|4|0");
+		serv_printf("CRE8 1|%s|4|0", USERCONFIGROOM);
 		serv_gets(buf);
-		serv_printf("GOTO My Citadel Config");
+		serv_printf("GOTO %s", USERCONFIGROOM);
 		serv_gets(buf);
 		if (buf[0] != '2') return;	/* oh well. */
 	}
diff --git a/webcit/useredit.c b/webcit/useredit.c
index 540999254..0460848b6 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -30,7 +30,7 @@
 
 
 
-void select_user_to_edit(char *message)
+void select_user_to_edit(char *message, char *preselect)
 {
 	char buf[SIZ];
 	char username[SIZ];
@@ -55,7 +55,11 @@ void select_user_to_edit(char *message)
         if (buf[0] == '1') {
                 while (serv_gets(buf), strcmp(buf, "000")) {
                         extract(username, buf, 0);
-                        wprintf("<OPTION>");
+                        wprintf("<OPTION");
+			if (preselect != NULL)
+			   if (!strcasecmp(username, preselect))
+			      wprintf(" SELECTED");
+			wprintf(">");
                         escputs(username);
                         wprintf("\n");
                 }
@@ -105,19 +109,19 @@ void display_edit_address_book_entry(char *username, long usernum) {
 
 
 	/* Locate the user's config room, creating it if necessary */
-	sprintf(roomname, "%010ld.My Citadel Config", usernum);
-	serv_printf("GOTO %s", roomname);
+	sprintf(roomname, "%010ld.%s", usernum, USERCONFIGROOM);
+	serv_printf("GOTO %s||1", roomname);
 	serv_gets(buf);
 	if (buf[0] != '2') {
-		serv_printf("CRE8 1|%s|5|", roomname);
+		serv_printf("CRE8 1|%s|5|||1|", roomname);
 		serv_gets(buf);
-		serv_printf("GOTO %s", roomname);
+		serv_printf("GOTO %s||1", roomname);
 		serv_gets(buf);
 		if (buf[0] != '2') {
 			sprintf(error_message,
 				"<IMG SRC=\"static/error.gif\" VALIGN=CENTER>"
 				"%s<BR><BR>\n", &buf[4]);
-			select_user_to_edit(error_message);
+			select_user_to_edit(error_message, username);
 			return;
 		}
 	}
@@ -176,7 +180,7 @@ TRYAGAIN:
 		sprintf(error_message,
 			"<IMG SRC=\"static/error.gif\" VALIGN=CENTER>"
 			"Could not create/edit vCard<BR><BR>\n");
-		select_user_to_edit(error_message);
+		select_user_to_edit(error_message, username);
 		return;
 	}
 
@@ -219,7 +223,7 @@ void display_edituser(char *supplied_username) {
 		sprintf(error_message,
 			"<IMG SRC=\"static/error.gif\" VALIGN=CENTER>"
 			"%s<BR><BR>\n", &buf[4]);
-		select_user_to_edit(error_message);
+		select_user_to_edit(error_message, username);
 		return;
 	}
 
@@ -311,13 +315,7 @@ void display_edituser(char *supplied_username) {
 		"<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n"
 		"<BR><BR></FORM>\n");
 
-	wprintf("<A HREF=\"/dotgoto&room=%010ld.My%%20Citadel%%20Config\">",
-		usernum);
-	wprintf("Click here to access the configuration room for ");
-	escputs(username);
-	wprintf("</A><BR>\n"
-		"(Contact information, Internet e-mail addresses, etc.)<BR>"
-		"</CENTER>\n");
+	wprintf("</CENTER>\n");
 
 	wDumpContent(1);
 
@@ -357,7 +355,7 @@ void edituser(void) {
 		}
 	}
 
-	select_user_to_edit(message);
+	select_user_to_edit(message, bstr("username"));
 }
 
 
@@ -374,13 +372,14 @@ void create_user(void) {
 	serv_gets(buf);
 
 	if (buf[0] == '2') {
-		display_edituser(username);
+		sprintf(error_message, "<b>User has been created.</b>");
+		select_user_to_edit(error_message, username);
 	}
 	else {
 		sprintf(error_message,
 			"<IMG SRC=\"static/error.gif\" VALIGN=CENTER>"
 			"%s<BR><BR>\n", &buf[4]);
-		select_user_to_edit(error_message);
+		select_user_to_edit(error_message, NULL);
 	}
 
 }
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 1c156cce4..f1b6b201d 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -335,7 +335,7 @@ void submit_vcard(void) {
 	serv_puts("000");
 
 	if (!strcmp(bstr("return_to"), "/select_user_to_edit")) {
-		select_user_to_edit(NULL);
+		select_user_to_edit(NULL, NULL);
 	}
 	else {
 		readloop("readnew");
diff --git a/webcit/webcit.c b/webcit/webcit.c
index fb222755c..c20a98b07 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1053,7 +1053,7 @@ void session_loop(struct httprequest *req)
 	} else if (!strcasecmp(action, "submit_vcard")) {
 		submit_vcard();
 	} else if (!strcasecmp(action, "select_user_to_edit")) {
-		select_user_to_edit(NULL);
+		select_user_to_edit(NULL, NULL);
 	} else if (!strcasecmp(action, "display_edituser")) {
 		display_edituser(NULL);
 	} else if (!strcasecmp(action, "edituser")) {
diff --git a/webcit/webcit.h b/webcit/webcit.h
index b462c3c86..0fcbdee32 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -296,7 +296,7 @@ void do_edit_vcard(long, char *, char *);
 void edit_vcard(void);
 void submit_vcard(void);
 void striplt(char *);
-void select_user_to_edit(char *message);
+void select_user_to_edit(char *message, char *preselect);
 void display_edituser(char *who);
 void create_user(void);
 void edituser(void);