Index: default/category_list.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/category_list.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -b -u -r1.32 -r1.33
--- default/category_list.html 27 Apr 2002 00:20:45 -0000 1.32
+++ default/category_list.html 29 May 2002 06:13:38 -0000 1.33
@@ -84,7 +84,7 @@
<%header_font%>
<%if cat_depth%><img src="<%image_url%>/clear_shim.gif" height=1 width="<%cat_depth * 25%>"><%endif%><a href="gforum.cgi?category=<%cat_id%>;<%hidden_query%>"><%cat_name%></a>
<%if current_user_id and cat_show_forums and main_page%><a href="gforum.cgi?<%if cat_hidden%>un<%endif%>hide_cat=<%cat_id%>;<%hidden_query%>" title="<%if cat_hidden%>Expand<%else%>Collapse<%endif%> this category"><small><%if cat_hidden%>[+]<%else%>[-]<%endif%></small></a><%endif%>
- <%if cat_desc%> - <%cat_desc%><%endif%>
+ <%if cat_desc%> - <%unescape_html cat_desc%><%endif%>
<%/header_font%>
</td>
</tr>
Index: default/include_message_display.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/include_message_display.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -r1.11 -r1.12
--- default/include_message_display.html 15 Mar 2002 00:47:22 -0000 1.11
+++ default/include_message_display.html 31 May 2002 04:26:01 -0000 1.12
@@ -32,7 +32,8 @@
<%if preview%>
<b>To:</b> <%nbsp user_username%><br>
<% if user_icon%>
- <img src="<%image_url%>/<%user_icon%>" border=0>
+<%GForum::User::icon_dimensions($user_icon)%>
+ <img src="<%image_url%>/<%user_icon%>" border=0 width="<%icon_width%>" height="<%icon_height%>">
<% endif%>
<%else%>
<% if message_display_sent%>
@@ -44,9 +45,8 @@
<%nbsp msg_username%>
</a>
<% if user_icon%>
- <center>
- <img src="<%image_url%>/<%user_icon%>" border=0>
- </center>
+<%GForum::User::icon_dimensions($user_icon)%>
+ <img src="<%image_url%>/<%user_icon%>" border=0 width="<%icon_width%>" height="<%icon_height%>">
<% endif%>
<%endif%>
<br>
Index: default/include_post_display.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/include_post_display.html,v
retrieving revision 1.39
retrieving revision 1.41
diff -b -u -r1.39 -r1.41
--- default/include_post_display.html 4 Mar 2002 03:50:09 -0000 1.39
+++ default/include_post_display.html 5 Jun 2002 07:47:32 -0000 1.41
@@ -41,9 +41,12 @@
<br>
<%endif%>
-<%if user_icon%>
- <center><img src="<%image_url%>/<%user_icon%>" border=0></center><br>
-<%endif%>
+<%if user_icon%><%if not current_user_id or current_user_show_user_icons%>
+<%-- The person viewing this page is either a guest or hasn't turned off viewing user icons --%>
+<%GForum::User::icon_dimensions($user_icon)%>
+ <img src="<%image_url%>/<%user_icon%>" width="<%icon_width%>" height="<%icon_height%>" border=0><br>
+<%endif%><%endif%>
+
<br>
<%nbsp post_date%>
<br><br>
Index: default/language.txt
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/language.txt,v
retrieving revision 1.35
retrieving revision 1.37
diff -b -u -r1.35 -r1.37
--- default/language.txt 4 Mar 2002 03:54:43 -0000 1.35
+++ default/language.txt 5 Jun 2002 07:47:55 -0000 1.37
@@ -122,6 +122,10 @@
'USER_BANNED' => 'You have been banned',
'USER_DELETED' => '<i>Deleted</i>',
'USER_DOES_NOT_EXIST' => 'The username you attempted to access does not exist',
+ 'USER_ICON_BAD_TYPE' => 'You attempted to upload of type \'%s\', but only the following image types are allowed: %s',
+ 'USER_ICON_CURRENT' => 'Current custom image',
+ 'USER_ICON_SYSTEM_ERROR' => 'A system error occured while attempting to upload your image: %s',
+ 'USER_ICON_TOO_LARGE' => 'The image you attempted to upload exceeds the maximum attachment size (%s)',
'USER_INVALID_USERNAME' => '%s is not a valid username',
'USER_NEVER_LOGGED_IN' => 'User has never logged in',
'USER_NO_PRIVMSG' => '%s has chosen not to receive private messages',
Index: default/redirect.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/redirect.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -r1.3 -r1.4
--- default/redirect.html 22 Aug 2001 18:01:36 -0000 1.3
+++ default/redirect.html 13 Jun 2002 18:44:28 -0000 1.4
@@ -11,7 +11,8 @@
new web site. If an offending web site looked at the URL you
were coming from, and you were using parameter-based
sessions, a malicious user could "hack" your Gossamer Forum
-account.
+account. Note: As of 1.1.6, this redirect is only used for
+people logging in without cookies.
--%>
<html>
Index: default/user_profile_basic.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/user_profile_basic.html,v
retrieving revision 1.32
retrieving revision 1.34
diff -b -u -r1.32 -r1.34
--- default/user_profile_basic.html 7 May 2002 00:52:40 -0000 1.32
+++ default/user_profile_basic.html 5 Jun 2002 07:47:06 -0000 1.34
@@ -34,7 +34,7 @@
<%include include_logo.html%>
</td>
</tr>
-<form action="gforum.cgi" method=post>
+<form action="gforum.cgi" method="post" enctype="multipart/form-data">
<tr>
<td colspan="2">
<%hidden_form%>
@@ -62,7 +62,7 @@
<%body_font%>Username:<%/body_font%>
</td>
<td>
-<%GForum::Config::tpl_get(username_allow_change)%>
+<%GForum::Config::tpl_get(username_allow_change, user_icon_allow_upload)%>
<%if username_allow_change%>
<input type=text name=user_username value="<%user_username%>" size=20 maxlength=50 class="button">
<input type="hidden" name="old_username" value="<%user_username%>">
@@ -167,8 +167,7 @@
</select>
</td>
</tr>
-<%-- The following section of code should be uncommented if you want users to be able to select icons. Be sure to delete the ending comment if you delete this one, 41 lines down
-<%GForum::User::icons('with blank')%>
+<%GForum::User::icons('with_leading_blank', $user_icon_allow_upload)%>
<tr>
<td align=right valign=top>
<%body_font%>Icon:<%/body_font%>
@@ -182,15 +181,15 @@
<table border=0 cellspacing=0 cellpadding=0>
<tr valign=center align=left>
<td>
- <%if first%> <%else%><img src="<%image_url%>/<%icon_filename%>" align=middle><%endif%>
+ <%if first%> <%elsif last and user_icon_allow_upload%><input type="file" class="button" name="user_icon_upload" onClick="document.getElementById('upload_radio').checked = 1"><%else%><img src="<%image_url%>/<%icon_filename%>" align="middle" width="<%icon_width%>" height="<%icon_height%>"><%endif%>
</td>
<td>
- <input type=radio name=user_icon value="<%if first%><%else%><%icon_filename%><%endif%>"<%if user_icon eq $icon_filename%> checked<%endif%>>
+ <input type="radio" name="user_icon" value="<%if first%><%elsif user_icon_allow_upload and last%>" id="upload_radio<%else%><%icon_filename%><%endif%>"<%if user_icon eq $icon_filename and not last%> checked<%endif%>>
</td>
</tr>
<tr>
<td colspan=2 align=center>
- <%body_font%><%if first%>None<%else%><%icon_name%><%endif%><%/body_font%>
+ <%body_font%><%if first%>None<%elsif last and user_icon_allow_upload%>Upload new image<%else%><%icon_name%><%endif%><%/body_font%>
</td>
</tr>
</table>
@@ -208,7 +207,17 @@
</table>
</td>
</tr>
---%>
+ <tr>
+ <td align=right>
+ <%body_font%>Show other users' icons:<%/body_font%>
+ </td>
+ <td>
+ <select class="button" name="user_show_user_icons" size="1">
+ <option value="1"<%if user_show_user_icons%> selected<%endif%>>Yes</option>
+ <option value="0"<%ifnot user_show_user_icons%> selected<%endifnot%>>No</option>
+ </select>
+ </td>
+ </tr>
<tr>
<td align=right>
<%body_font%>Real Name:<%/body_font%>
Index: default/user_view.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/user_view.html,v
retrieving revision 1.33
retrieving revision 1.36
diff -b -u -r1.33 -r1.36
--- default/user_view.html 17 May 2002 19:53:19 -0000 1.33
+++ default/user_view.html 1 Jun 2002 03:47:07 -0000 1.36
@@ -42,14 +42,12 @@
<%list_table%>
<tr>
<td bgcolor="<%even_color%>" align=center style="border-right:1px solid <%dark_beige%>">
-<%-- If you are using user icons, you should uncomment the section below. --%>
-<%--
<%if user_icon%>
- <img src="<%image_url%>/<%user_icon%>" border=0>
+<%GForum::User::icon_dimensions($user_icon)%>
+ <img src="<%image_url%>/<%user_icon%>" border=0 width="<%icon_width%>" height="<%icon_height%>">
<%else%>
<%endif%>
---%>
</td>
<td bgcolor="<%medium_green%>" align=left>
<%body_font%><font size=7><b><i><%nbsp user_username%></i></b></font><%/body_font%>
@@ -83,6 +81,7 @@
</td>
</tr>
+<%if not user_invisible or current_user_status == 3%><%-- Don't show the last logon if the user is invisible, unless the person viewing the page is an admin --%>
<tr>
<td width="20%" align=right bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>;">
<%body_font%><b>Last Logon:</b><%/body_font%>
@@ -91,6 +90,7 @@
<%body_font%><%user_last_logon_date%><%/body_font%>
</td>
</tr>
+<%endif%>
<tr>
<td width="20%" align=right bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>;">