amy/venice-main-classic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modifications to ensure that Venice can operate without certain personal

Browse Source 
information prompted for at registration time, if certain sites should elect
to omit that information
This commit is contained in:
Eric J. Bowersox
2004-07-10 22:54:15 +00:00
parent 5c0f841ab7
commit f0bf5e31ee
9 changed files with 431 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
web/format/sysadmin/find_user.jsp
View File

@@ -9,9 +9,9 @@
The Original Code is the Venice Web Communities System.
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@ricochet.com>,
for Silverwrist Design Studios. Portions created by Eric J. Bowersox are
Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Copyright (C) 2001-2004 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@@ -30,36 +30,36 @@ System Administration Menu</util:link></util:font><P>
<%-- Display the search form --%>
<util:comment>User Search Form</util:comment>
<util:form action="sysadmin/find_user.js.vs" type="servlet"><DIV CLASS="content">
<INPUT TYPE=HIDDEN NAME="ofs" VALUE="0">
<util:font color="content.fg" size="content-heading"><B>Find Users:</B></util:font><BR>
<util:form action="sysadmin/find_user.js.vs" type="servlet"><div class="content">
<input type="hidden" name="ofs" value="0" />
<util:font color="content.fg" size="content-heading"><b>Find Users:</b></util:font><br />
<util:font color="content.fg" size="content">
Display all users whose&nbsp;&nbsp;
<SELECT NAME="field" SIZE=1>
<OPTION VALUE="<%= SearchMode.FIELD_USER_NAME %>"
<% if (data.testField(SearchMode.FIELD_USER_NAME)) { %>SELECTED<% } %> >user name</OPTION>
<OPTION VALUE="<%= SearchMode.FIELD_USER_DESCRIPTION %>"
<% if (data.testField(SearchMode.FIELD_USER_DESCRIPTION)) { %>SELECTED<% } %> >description</OPTION>
<OPTION VALUE="<%= SearchMode.FIELD_USER_GIVEN_NAME %>"
<% if (data.testField(SearchMode.FIELD_USER_GIVEN_NAME)) { %>SELECTED<% } %> >first name</OPTION>
<OPTION VALUE="<%= SearchMode.FIELD_USER_FAMILY_NAME %>"
<% if (data.testField(SearchMode.FIELD_USER_FAMILY_NAME)) { %>SELECTED<% } %> >last name</OPTION>
</SELECT><BR>
<SELECT NAME="mode" SIZE=1>
<OPTION VALUE="<%= SearchMode.SEARCH_PREFIX %>"
<% if (data.testMode(SearchMode.SEARCH_PREFIX)) { %>SELECTED<% } %> >starts with the string</OPTION>
<OPTION VALUE="<%= SearchMode.SEARCH_SUBSTRING %>"
<% if (data.testMode(SearchMode.SEARCH_SUBSTRING)) { %>SELECTED<% } %> >contains the string</OPTION>
<OPTION VALUE="<%= SearchMode.SEARCH_REGEXP %>"
<% if (data.testMode(SearchMode.SEARCH_REGEXP)) { %>SELECTED<% } %> >matches the regular
expression</OPTION>
</SELECT>
<select name="field" size="1">
<option value="<%= SearchMode.FIELD_USER_NAME %>"
<% if (data.testField(SearchMode.FIELD_USER_NAME)) { %>selected="selected"<% } %> >user name</option>
<option value="<%= SearchMode.FIELD_USER_DESCRIPTION %>"
<% if (data.testField(SearchMode.FIELD_USER_DESCRIPTION)) { %>selected="selected"<% } %> >description</option>
<option value="<%= SearchMode.FIELD_USER_GIVEN_NAME %>"
<% if (data.testField(SearchMode.FIELD_USER_GIVEN_NAME)) { %>selected="selected"<% } %> >first name</option>
<option value="<%= SearchMode.FIELD_USER_FAMILY_NAME %>"
<% if (data.testField(SearchMode.FIELD_USER_FAMILY_NAME)) { %>selected="selected"<% } %> >last name</option>
</select><br />
<select name="mode" size="1">
<option value="<%= SearchMode.SEARCH_PREFIX %>"
<% if (data.testMode(SearchMode.SEARCH_PREFIX)) { %>selected="selected"<% } %> >starts with the string</option>
<option value="<%= SearchMode.SEARCH_SUBSTRING %>"
<% if (data.testMode(SearchMode.SEARCH_SUBSTRING)) { %>selected="selected"<% } %> >contains the string</option>
<option value="<%= SearchMode.SEARCH_REGEXP %>"
<% if (data.testMode(SearchMode.SEARCH_REGEXP)) { %>selected="selected"<% } %> >matches the regular
expression</option>
</select>
&nbsp;&nbsp;
<SPAN CLASS="cinput"><INPUT TYPE=TEXT CLASS="cinput" NAME="term" SIZE=32 MAXLENGTH=255
VALUE="<%= data.getTerm() %>"></SPAN><BR>
<util:button id="search" type="input"/><BR>
<span class="cinput"><input type="text" class="cinput" name="term" size="32" maxlength="255"
value="<%= data.getTerm() %>" /></span><br />
<util:button id="search" type="input"/><br />
</util:font>
</DIV></util:form>
</div></util:form>
<% List results = data.getResults(); %>
<% if (results!=null) { %>
@@ -75,26 +75,26 @@ System Administration Menu</util:link></util:font><P>
} // end if
%>
<HR>
<TABLE WIDTH="100%" BORDER=0 ALIGN=CENTER><TR VALIGN=MIDDLE>
<TD WIDTH="50%" ALIGN=LEFT CLASS="content"><util:font color="content.fg" size="subhead">
<hr />
<table width="100%" border="0" align="center"><tr valign="middle">
<td width="50%" align="left" class="content"><util:font color="content.fg" size="subhead">
<%-- The initial search results --%>
<B>Search Results</B>
<b>Search Results</b>
<% if (data.getFindCount()>0) { %>
(Displaying <%= data.getOffset() + 1 %>-<%= data.getOffset() + dcount %> of
<%= data.getFindCount() %>)
<% } else { %>(None)<% } %>
</util:font></TD>
<TD WIDTH="50%" ALIGN=RIGHT CLASS="content">
</util:font></td>
<td width="50%" align="right" class="content">
<% if (go_next || (data.getOffset()>0)) { %>
<%-- The navigational form that allows us to page through the results --%>
<util:comment>Navigational Form</util:comment>
<util:form action="sysadmin/find_user.js.vs" type="servlet"><DIV CLASS="content">
<INPUT TYPE=HIDDEN NAME="ofs" VALUE="<%= data.getOffset() %>">
<INPUT TYPE=HIDDEN NAME="field" VALUE="<%= data.getField() %>">
<INPUT TYPE=HIDDEN NAME="mode" VALUE="<%= data.getMode() %>">
<INPUT TYPE=HIDDEN NAME="term" VALUE="<%= data.getTerm() %>">
<INPUT TYPE=HIDDEN NAME="fcount" VALUE="<%= data.getFindCount() %>">
<util:form action="sysadmin/find_user.js.vs" type="servlet"><div class="content">
<input type="hidden" name="ofs" value="<%= data.getOffset() %>" />
<input type="hidden" name="field" value="<%= data.getField() %>" />
<input type="hidden" name="mode" value="<%= data.getMode() %>" />
<input type="hidden" name="term" value="<%= data.getTerm() %>" />
<input type="hidden" name="fcount" value="<%= data.getFindCount() %>" />
<% if (data.getOffset()>0) { %>
<util:button id="previous" type="input"/>
<% } else { %>
@@ -106,33 +106,52 @@ System Administration Menu</util:link></util:font><P>
<% } else { %>
<util:button id="_null_"/>
<% } // end if %>
</DIV></util:form>
</div></util:form>
<% } else { %>&nbsp;<% } %>
</TD>
</TR></TABLE><BR>
</td>
</tr></table><br />
<%-- Display the results of the search --%>
<TABLE BORDER=0 ALIGN=LEFT CELLPADDING=0 CELLSPACING=4>
<table border="0" align="left" cellpadding="0" cellspacing="4">
<% for (int i=0; i<dcount; i++) { %>
<TR VALIGN=TOP>
<TD ALIGN=CENTER WIDTH=14><util:stdbullet/></TD>
<TD ALIGN=LEFT CLASS="content"><util:font color="content.fg" size="content">
<% UserFound uf = (UserFound)(results.get(i)); %>
<tr valign="top">
<td align="center" width="14"><util:stdbullet/></td>
<td align="left" class="content"><util:font color="content.fg" size="content">
<%
UserFound uf = (UserFound)(results.get(i));
String fullname = uf.getGivenName() + " " + uf.getFamilyName();
fullname = fullname.trim();
if (StringUtil.isStringEmpty(fullname))
fullname = uf.getName();
String whence = "";
if (!(StringUtil.isStringEmpty(uf.getLocality())))
{ // combine locations
if (!(StringUtil.isStringEmpty(uf.getRegion())))
whence = uf.getLocality() + ", " + uf.getRegion();
else
whence = uf.getLocality();
} // end if
else if (!(StringUtil.isStringEmpty(uf.getRegion())))
whence = uf.getRegion();
%>
<util:xlink>
<util:href type="servlet">user/<%= uf.getName() %></util:href>
<util:text><%= uf.getName() %></util:text>
</util:xlink><BR>
<util:escape><%= uf.getGivenName() %> <%= uf.getFamilyName() %></util:escape>,
from <util:escape><%= uf.getLocality() %>, <%= uf.getRegion() %></util:escape> <%= uf.getCountry() %>
</util:xlink><br />
<util:escape><%= fullname %></util:escape>,
from <util:escape><%= whence %></util:escape>
<% if (!(uf.getCountry().equals("XX"))) { %><%= uf.getCountry() %><% } %>
<% if (!StringUtil.isStringEmpty(uf.getDescription())) { %>
<BR><EM><util:escape><%= uf.getDescription() %></util:escape></EM>
<br /><i><util:escape><%= uf.getDescription() %></util:escape></i>
<% } // end if %>
<BR><util:xlink>
<br /><util:xlink>
<util:href type="servlet">sysadmin/modify_user.js.vs?uid=<%= uf.getUID() %></util:href>
<util:text>[Modify User]</util:text>
</util:xlink>
</util:font></TD>
</TR>
</util:font></td>
</tr>
<% } // end for %>
</TABLE><BR CLEAR=LEFT>
</table><br clear="left" />
<% } // end if (results found) %>
<%-- EOF --%>