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

removed the automatic HTML escaping from content headers and moved it out

Browse Source 
to the JSPs and other classes as needed...this may speed up things a tiny bit,
but will definitely help in displaying topic names with HTML and escaped
characters correctly
This commit is contained in:
Eric J. Bowersox 2002-01-16 23:23:57 +00:00
parent 5bf40a92a1
commit 70b7b826a0
23 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/comm/category.js
View File

@ -10,7 +10,7 @@
//
// The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
//
// Contributor(s):
@ -37,7 +37,7 @@ rc = null;
if (rinput.hasParameter("set"))
{ // OK...they're actually setting the category here - change it and bail out
catid = rinput.getParameterInt("set",-1);
if (engine.isValidCategoryID(catid))
if (rinput.engine.isValidCategoryID(catid))
{ // try setting the category ID
try
{ // set the category ID and bounce back to the menu
@ -74,7 +74,7 @@ if (rinput.hasParameter("go"))
curr_catid = rinput.getParameterInt("go",-1);
else
curr_catid = comm.categoryID;
if (!(engine.isValidCategoryID(curr_catid)))
if (!(rinput.engine.isValidCategoryID(curr_catid)))
{ // this is not a valid category ID
vlib.output(new ErrorBox("Invalid Input","Invalid category ID passed to category browser.",
"comm/admin_menu.js.vs?cc=" + comm.communityID));

4
src/com/silverwrist/venice/ui/config/RootConfig.java
View File

@ -711,9 +711,9 @@ public class RootConfig implements LinkTypes, ColorSelectors
public final String getContentHeader(String primary, String secondary)
{
StringBuffer buf = new StringBuffer(content_hdr[0]);
buf.append(StringUtil.encodeHTML(primary)).append(content_hdr[1]);
buf.append(primary).append(content_hdr[1]);
if (secondary!=null)
buf.append(content_hdr[2]).append(StringUtil.encodeHTML(secondary)).append(content_hdr[3]);
buf.append(content_hdr[2]).append(secondary).append(content_hdr[3]);
buf.append(content_hdr[4]);
return buf.toString();

6
src/com/silverwrist/venice/ui/jsp/UtilHeaderTag.java
View File

@ -11,7 +11,7 @@
*
* The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
*
* Contributor(s):
*/
@ -106,7 +106,7 @@ public class UtilHeaderTag extends VeniceBodyTagSupport
public void setTitle(String s)
{
title = s;
title = s.trim();
} // end setTitle
@ -118,7 +118,7 @@ public class UtilHeaderTag extends VeniceBodyTagSupport
public void setSubtitle(String s)
{
subtitle = s;
subtitle = s.trim();
} // end setSubtitle

2
src/com/silverwrist/venice/ui/menus/CommunityMenu.java
View File

@ -57,7 +57,7 @@ public class CommunityMenu implements MenuComponent, ColorSelectors, LinkTypes
} // end catch
title = ctxt.getName();
title = StringUtil.encodeHTML(ctxt.getName());
items_list = items;
cid = ctxt.getCommunityID();
show_unjoin = ctxt.canUnjoin();

4
web/format/comm/category.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -25,7 +25,7 @@
%>
<util:comment>Category browser for community "<comm:name/>"</util:comment>
<util:header title="Set Community Category:">
<util:subtitle><comm:name/></util:subtitle>
<util:subtitle><util:escape><comm:name/></util:escape></util:subtitle>
</util:header>
<DIV ALIGN="LEFT"><util:xlink>

4
web/format/comm/email.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -19,7 +19,7 @@
<%@ taglib uri="/tlds/community" prefix="comm" %>
<util:comment>E-Mail to Community "<comm:name/>"</util:comment>
<util:header title="Community E-Mail:">
<util:subtitle><comm:name/></util:subtitle>
<util:subtitle><util:escape><comm:name/></util:escape></util:subtitle>
</util:header>
<util:form action="comm/email.js.vs" type="servlet"><DIV CLASS="content">

10
web/format/comm/invite.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -22,8 +22,12 @@
%>
<util:comment>Invitation form</util:comment>
<util:header>
<util:title><%= view.getRequestAttribute("invitation.title").toString() %></util:title>
<util:subtitle><%= view.getRequestAttribute("invitation.subtitle").toString() %></util:subtitle>
<util:title>
<util:escape><%= view.getRequestAttribute("invitation.title").toString() %></util:escape>
</util:title>
<util:subtitle>
<util:escape><%= view.getRequestAttribute("invitation.subtitle").toString() %></util:escape>
</util:subtitle>
</util:header>
<FORM METHOD=POST ACTION="<%= view.getRequestAttribute("invitation.action").toString() %>">
<DIV CLASS="content">

2
web/format/comm/members.jsp
View File

@ -26,7 +26,7 @@
%>
<util:comment>Members view for community <comm:name/></util:comment>
<util:header title="Members of Community:">
<util:subtitle><comm:name/></util:subtitle>
<util:subtitle><util:escape><comm:name/></util:escape></util:subtitle>
</util:header>
<util:font color="content.fg" size="subhead"><B>Find members of community "<comm:name/>":</B></util:font><P>
<util:form action="comm/members.js.vs" type="servlet"><DIV CLASS="content">

4
web/format/comm/profile.jsp
View File

@ -29,7 +29,9 @@
String tmp;
%>
<util:comment>Profile for community #<comm:ID/></util:comment>
<util:header title="Community Profile:" subtitle="<%= comm.getName() %>"/>
<util:header title="Community Profile:">
<util:subtitle><util:escape><%= comm.getName() %></util:escape></util:subtitle>
</util:header>
<TABLE BORDER=0 CELLPADDING=6 CELLSPACING=0><TR VALIGN=TOP>
<TD ALIGN=LEFT CLASS="c2"><util:font color="content.fg" size="profile-dates">
<%= view.getRequestAttribute("community.logo").toString() %><BR>

4
web/format/comm/set_member.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -27,7 +27,7 @@
%>
<util:comment>Set membership view for community <comm:name/></util:comment>
<util:header title="Set Community Membership:">
<util:subtitle><comm:name/></util:subtitle>
<util:subtitle><util:escape><comm:name/></util:escape></util:subtitle>
</util:header>
<util:font color="content.fg" size="content"><util:xlink>

10
web/format/conf/activity_report.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -29,8 +29,12 @@
Boolean.valueOf(view.getRequestAttribute("conference.activity.posters").toString()).booleanValue();
%>
<util:header>
<util:title><%= view.getRequestAttribute("conference.activity.title").toString() %></util:title>
<util:subtitle><%= view.getRequestAttribute("conference.activity.subtitle").toString() %></util:subtitle>
<util:title>
<util:escape><%= view.getRequestAttribute("conference.activity.title").toString() %></util:escape>
</util:title>
<util:subtitle>
<util:escape><%= view.getRequestAttribute("conference.activity.subtitle").toString() %></util:escape>
</util:subtitle>
</util:header>
<util:font color="content.fg" size="content"><util:xlink>

6
web/format/conf/aliases.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -29,14 +29,14 @@
%>
<util:comment>Managing aliases for conference "<conf:name/>"</util:comment>
<util:header title="Managing Conference Aliases:">
<util:subtitle><conf:name/></util:subtitle>
<util:subtitle><util:escape><conf:name/></util:escape></util:subtitle>
</util:header>
<util:font color="content.fg" size="content">
<util:xlink>
<util:href type="servlet">conf/manage_conf.js.vs?cc=<comm:ID/>&conf=<conf:ID/></util:href>
<util:text>Return to Manage Conference Menu</util:text>
</util:xlink>
</util:xlink><P>
<% Object errmsg = view.getRequestAttribute("conference.aliases.error_message"); %>
<% if (errmsg!=null) { %>

4
web/format/conf/conferences.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -28,7 +28,7 @@
%>
<util:comment>Conference list for community "<comm:name/>"</util:comment>
<util:header title="Conference List:">
<util:subtitle><comm:name/></util:subtitle>
<util:subtitle><util:escape><comm:name/></util:escape></util:subtitle>
</util:header>
<% if (confs.size()>0) { %>
<TABLE BORDER=0 ALIGN=LEFT>

4
web/format/conf/custom.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -27,7 +27,7 @@
%>
<util:comment>Custom blocks for conference "<conf:name/>"</util:comment>
<util:header title="Customize Conference:">
<util:subtitle><conf:name/></util:subtitle>
<util:subtitle><util:escape><conf:name/></util:escape></util:subtitle>
</util:header>
<util:form action="conf/custom.js.vs" type="servlet"><DIV CLASS="content">

4
web/format/conf/email.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -27,7 +27,7 @@
%>
<util:comment>E-mail to conference "<conf:name/>"</util:comment>
<util:header title="Conference E-Mail:">
<util:subtitle><conf:name/></util:subtitle>
<util:subtitle><util:escape><conf:name/></util:escape></util:subtitle>
</util:header>
<util:form action="conf/email.js.vs" type="servlet"><DIV>

10
web/format/conf/find.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -29,9 +29,13 @@
<% if (view.getTopic()!=null) { %>
<util:subtitle>in Topic: <%= view.getTopic().getName() %></util:subtitle>
<% } else if (view.getConference()!=null) { %>
<util:subtitle>in Conference: <%= view.getConference().getName() %></util:subtitle>
<util:subtitle>
in Conference: <util:escape><%= view.getConference().getName() %></util:escape>
</util:subtitle>
<% } else { %>
<util:subtitle>in Community: <%= view.getCommunity().getName() %></util:subtitle>
<util:subtitle>
in Community: <util:escape><%= view.getCommunity().getName() %></util:escape>
</util:subtitle>
<% } // end if %>
</util:header>
<util:font color="content.fg" size="content"><util:xlink>

4
web/format/conf/manage_conf.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -28,7 +28,7 @@
%>
<util:comment>Managing conference "<conf:name/>"</util:comment>
<util:header title="Manage Conference:">
<util:subtitle><conf:name/></util:subtitle>
<util:subtitle><util:escape><conf:name/></util:escape></util:subtitle>
</util:header>
<util:font color="content.fg" size="content"><util:xlink>

4
web/format/conf/manage_list.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -30,7 +30,7 @@
%>
<util:comment>Manage conference list for community "<comm:name/>"</util:comment>
<util:header title="Manage Conference List">
<util:subtitle>Community: <comm:name/></util:subtitle>
<util:subtitle>Community: <util:escape><comm:name/></util:escape></util:subtitle>
</util:header>
<util:font color="content.fg" size="content">

4
web/format/conf/membership.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -28,7 +28,7 @@
%>
<util:comment>Set membership view for conference <conf:name/></util:comment>
<util:header title="Set Conference Membership:">
<util:subtitle><conf:name/></util:subtitle>
<util:subtitle><util:escape><conf:name/></util:escape></util:subtitle>
</util:header>
<util:font color="content.fg" size="content"><util:xlink>

4
web/format/conf/new_topic.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -35,7 +35,7 @@
<% } else { %>
<util:title>Preview New Topic</util:title>
<% } // end if %>
<util:subtitle>in: <conf:name/></util:subtitle>
<util:subtitle>in: <util:escape><conf:name/></util:escape></util:subtitle>
</util:header>
<% if (preview_text!=null) { %>

4
web/format/conf/report_menu.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -27,7 +27,7 @@
%>
<util:comment>Reports for conference "<conf:name/>"</util:comment>
<util:header title="Conference Reports:">
<util:subtitle><conf:name/></util:subtitle>
<util:subtitle><util:escape><conf:name/></util:escape></util:subtitle>
</util:header>
<util:font color="content.fg" size="content"><util:xlink>

4
web/format/conf/topics.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -47,7 +47,7 @@
+ currc.getConference().getConfID();
%>
<util:comment>Topic list for conference "<conf:name/>"</util:comment>
<util:header><util:title>Topics in <conf:name/></util:title></util:header>
<util:header><util:title>Topics in <util:escape><conf:name/></util:escape></util:title></util:header>
<%= view.getRequestAttribute("conference.custom.top").toString() %>
<util:font color="content.fg" size="content">

6
web/format/photo_upload.jsp
View File

@ -11,7 +11,7 @@
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.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-02 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
Contributor(s):
--%>
@ -19,7 +19,9 @@
<%@ taglib uri="/tlds/util" prefix="util" %>
<% PhotoUploader view = PhotoUploader.get(request); %>
<util:comment>Photo uploading page</util:comment>
<util:header title="<%= view.getPageTitle() %>"/>
<util:header/>
<util:title><util:escape><%= view.getPageTitle() %></util:escape></util:title>
</util:header>
<FORM METHOD="POST" ENCTYPE="multipart/form-data" ACTION="<%= view.getAction() %>">
<%= view.getHiddenParams() %>
<TABLE ALIGN="LEFT" CLASS="content" BORDER=0 CELLPADDING=0 CELLSPACING=2><TR VALIGN=TOP>