From 53af875b0b74b48f98d8a43bd5fa9f95a3614049 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 5 Jan 2009 21:30:46 +0000
Subject: [PATCH] * locate_user_vcard() wasn't using either of its supplied
 parameters.  Removed the parameters and renamed the function to
 locate_user_vcard_in_this_room()

---
 webcit/auth.c     |  2 +-
 webcit/useredit.c | 10 ++++------
 webcit/webcit.h   |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/webcit/auth.c b/webcit/auth.c
index 77c2d457f..93480d86b 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -722,7 +722,7 @@ void display_reg(int during_login)
 		return;
 	}
 
-	vcard_msgnum = locate_user_vcard(WC->wc_fullname, -1);
+	vcard_msgnum = locate_user_vcard_in_this_room();
 	if (vcard_msgnum < 0L) {
 		if (during_login) do_welcome();
 		else display_main_menu();
diff --git a/webcit/useredit.c b/webcit/useredit.c
index 728580dcd..6228f7508 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -364,13 +364,11 @@ int ConditionalUserAccess(WCTemplateToken *Tokens, void *Context, int ContextTyp
 		return 0;
 }
 
-/**
+/*
  *  Locate the message number of a user's vCard in the current room
- *  username the plaintext name of the user
- *  usernum the number of the user on the citadel server
- * \return the message id of his vcard
+ *  Returns the message id of his vcard
  */
-long locate_user_vcard(char *username, long usernum) {
+long locate_user_vcard_in_this_room() {
 	char buf[SIZ];
 	long vcard_msgnum = (-1L);
 	char content_type[SIZ];
@@ -466,7 +464,7 @@ void display_edit_address_book_entry(char *username, long usernum) {
 		}
 	}
 
-	vcard_msgnum = locate_user_vcard(username, usernum);
+	vcard_msgnum = locate_user_vcard_in_this_room();
 
 	if (vcard_msgnum < 0) {
 		sprintf(error_message,
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 8c6104a99..c1a589dd1 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -664,7 +664,7 @@ int read_server_binary(StrBuf *Ret, size_t total_len);
 int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize);
 int read_server_text(StrBuf *Buf, long *nLines);
 int goto_config_room(void);
-long locate_user_vcard(char *username, long usernum);
+long locate_user_vcard_in_this_room(void);
 void sleeeeeeeeeep(int);
 void http_transmit_thing(const char *content_type, int is_static);
 long unescape_input(char *buf);
-- 
2.30.2