Index: default/category_list.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/category_list.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -b -u -r1.30 -r1.31
--- default/category_list.html 2 Mar 2002 02:32:13 -0000 1.30
+++ default/category_list.html 11 Apr 2002 00:56:17 -0000 1.31
@@ -41,7 +41,8 @@
<%if current_user_id%>
Welcome, <%nbsp current_user_username%>
<%else%>
- You are not logged in. <a href="gforum.cgi?do=login;<%hidden_query%>">Click here</a> to log in.
+ You are not logged in. <a href="gforum.cgi?do=login;<%hidden_query%>">Click here</a> to log in.<br>
+ If you are not a member, <a href="gforum.cgi?do=user_signup">Sign up here</a>!
<%endif%>
<br>
<%/body_font%>
Index: default/user_view.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/user_view.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -b -u -r1.30 -r1.31
--- default/user_view.html 29 Jan 2002 02:55:16 -0000 1.30
+++ default/user_view.html 12 Apr 2002 23:42:09 -0000 1.31
@@ -167,6 +167,30 @@
</td>
</tr>
+<%if current_user_id and current_user_status >= 3%>
+ <tr>
+ <td width="20%" align=right valign=top bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>; border-top:1px solid <%dark_beige%>">
+ <%body_font%><b>Email:</b><%/body_font%>
+ </td>
+ <td valign=top bgcolor="<%odd_color%>" style="border-top:1px solid <%dark_beige%>">
+ <%body_font%>
+ <a href="mailto:<%user_email%>"><%user_email%></a>
+ <%/body_font%>
+ </td>
+ </tr>
+
+ <tr>
+ <td width="20%" align=right valign=top bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>; border-top:1px solid <%dark_beige%>">
+ <%body_font%><b>Admin options:</b><%/body_font%>
+ </td>
+ <td valign=top bgcolor="<%odd_color%>" style="border-top:1px solid <%dark_beige%>">
+ <%body_font%>
+ <a href="admin/db.cgi?db=User;do=search_results;user_id=<%user_id%>;user_id-opt=%3D;display=details">Details</a> | <a href="admin/db.cgi?db=User;do=modify_search_results;user_id=<%user_id%>;user_id-opt=%3D">Modify</a> | <a href="admin/db.cgi?db=User;do=delete_search_results;user_id=<%user_id%>;user_id-opt=%3D">Delete</a>
+ <%/body_font%>
+ </td>
+ </tr>
+<%endif%>
+
<%if user_icq%>
<tr>
<td width="20%" align=right valign=top bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>;">
Index: default_top/include_post_display.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default_top/include_post_display.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -r1.10 -r1.11
--- default_top/include_post_display.html 4 Mar 2002 03:50:09 -0000 1.10
+++ default_top/include_post_display.html 23 Apr 2002 15:28:53 -0000 1.11
@@ -76,7 +76,7 @@
<a href="gforum.cgi?do=forum_ban_write;forum=<%forum_id%>;ban_type=ban_ip;ban_value=<%post_ip%>;<%hidden_query%>">IP</a>
<%if current_user_status = 3%><%-- An administrator --%>
|
- <a href="gforum.cgi?do=ban_ip;redo=<%this_do%>;so=<%so%>;sb=<%sb%>;ip=<%post_ip%>;<%hidden_query%>">Site IP</a>
+ <a href="gforum.cgi?do=ban_ip;redo=<%this_do%>;post=<%post_id%>;so=<%so%>;sb=<%sb%>;ip=<%post_ip%>;<%hidden_query%>">Site IP</a>
<big><b>|</b></big>
Index: admin/language.txt
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/language.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -r1.4 -r1.5
--- admin/language.txt 21 Mar 2002 04:57:47 -0000 1.4
+++ admin/language.txt 20 Apr 2002 09:29:49 -0000 1.5
@@ -102,7 +102,7 @@
'user_last_logon' => 'Last Logon',
'user_last_seen' => 'Last seen',
'user_location' => 'Location',
- 'user_message_notify' => undef,
+ 'user_message_notify' => 'Private message notification',
'user_msn' => 'MSN Identity',
'user_occupation' => 'Occupation',
'user_password' => 'Password',
Index: admin/setup_disabled.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/setup_disabled.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -r1.5 -r1.6
--- admin/setup_disabled.html 9 Nov 2001 20:56:04 -0000 1.5
+++ admin/setup_disabled.html 11 Apr 2002 20:09:25 -0000 1.6
@@ -8,23 +8,23 @@
<%set font_tag = '<font face="Tahoma,Arial,Helvetica" size=2>'%>
<%if disable_forum%>
-<%GForum::Utils::disable_forum($disabled_message)%>
-<%elsif enable_forum%>
-<%GForum::Utils::enable_forum%>
-<%elsif disabled_message%>
-<%GForum::Utils::disabled_message($disabled_message)%>
+<%GForum::Utils::disable_forum($forum_disabled, $disabled_message)%>
<%endif%>
<%GForum::Config::tpl_get(disabled, disabled_message)%>
<%if disabled%>
-<%set header_title = 'Enable Forum'%>
-<%set header_description = 'You can enable or change the disabled reason from this page'%>
-<%set error_message = 'The forum is currently disabled:<br>'%>
-<%set error_message_2 = $disabled_message%>
+ <%set header_title = 'Enable Forum'%>
+ <%set header_description = 'You can enable or change the disabled reason from this page'%>
+ <%if disabled == 2%>
+ <%set error_message = 'The forum is currently disabled for all users except admins:<br>'%>
+ <%else%>
+ <%set error_message = 'The forum is currently disabled for all users:<br>'%>
+ <%endif%>
+ <%set error_message_2 = $disabled_message%>
<%else%>
-<%set header_title = 'Disable Forum'%>
-<%set header_description = 'You can disable the forum from this page'%>
-<%set success_message = 'The forum is currently enabled'%>
+ <%set header_title = 'Disable Forum'%>
+ <%set header_description = 'You can disable the forum from this page'%>
+ <%set success_message = 'The forum is currently enabled'%>
<%endif%>
<%include admin_header.html%>
@@ -49,10 +49,20 @@
<tr>
<td colspan=2 align=center>
<%font_tag%>
-<%if disabled%> <input type=submit name="enable_forum=1" value="Enable forum">
- <input type=submit name="disable_forum=1" value="Change message">
-<%else%> <input type=submit name="disable_forum=1" value="Disable forum">
-<%endif%> </font>
+ <select name="forum_disabled" size="1">
+<%if disabled%>
+ <option value="0">Enable All</option>
+<%endif%>
+<%if disabled != 1%>
+ <option value="1">Disable All</option>
+<%endif%>
+<%if disabled != 2%>
+ <option value="2">Allow Admins</option>
+<%endif%>
+ <option value="<%disabled%>">Save Message</option>
+ </select>
+ <input type="submit" name="disable_forum" value="Submit">
+ </font>
</td>
</tr>
</table>
@@ -60,4 +70,3 @@
</tr>
</table>
</form>
-
Index: admin/setup_posts.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/setup_posts.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -r1.6 -r1.7
--- admin/setup_posts.html 4 Mar 2002 04:03:02 -0000 1.6
+++ admin/setup_posts.html 11 Apr 2002 02:14:40 -0000 1.7
@@ -76,6 +76,22 @@
</td>
</tr>
<tr>
+ <td width="100%" colspan="2"><font face="Tahoma,Arial,Helvetica" size="2">This option
+ controls the position of the 'Re:' text. You can specify either that 'Re:' (set in the
+ language variables) show up at the beginning (eg. Re: subject) or at the end of the subject
+ (eg. subject - Re). Note that setting this to "End" will alter the behaviour of the "After Re:"
+ setting above to make it come between the subject and the "Re:"</font></td>
+ </tr>
+ <tr>
+ <td width="16%"><font face="Tahoma,Arial,Helvetica" size="2"><b>post_reply_position</b></font></td>
+ <td width="84%"><font face="Tahoma,Arial,Helvetica" size="2">
+ <select name="post_reply_position" size=1>
+ <option value="beginning"<%if cfg_post_reply_position ne end%> selected<%endif%>>Beginning</option>
+ <option value="end"<% if cfg_post_reply_position eq end%> selected<%endif%>>End</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
<td width="100%" colspan="2"><font face="Tahoma,Arial,Helvetica" size="2">If set, users
will be forced to enter a subject when posting.</font></td>
</tr>
Index: admin/setup_users.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/setup_users.html,v
retrieving revision 1.12
retrieving revision 1.14
diff -b -u -r1.12 -r1.14
--- admin/setup_users.html 13 Mar 2002 01:23:56 -0000 1.12
+++ admin/setup_users.html 21 Apr 2002 01:11:19 -0000 1.14
@@ -19,7 +19,7 @@
<td width="100%">
<table border="0" cellpadding="2" cellspacing="3" width="100%">
<tr>
- <td width="100%" colspan="2" bgcolor="#DDDDDD"><b><font size="2" face="Verdana,Arial,Helvetica">Misc
+ <td width="100%" colspan="2" bgcolor="#DDDDDD"><b><font size="2" face="Verdana,Arial,Helvetica">User
Options:</font></b></td>
</tr>
<tr>
@@ -112,6 +112,21 @@
<tr>
<td width="16%"><b><font size="2" face="Tahoma,Arial,Helvetica">username_min_length</font></b></td>
<td width="84%"><font face="Tahoma,Arial,Helvetica" size="2"><input type="text" name="username_min_length" value="<%cfg_username_min_length%>" size="40"></font></td>
+ </tr>
+ <tr>
+ <td width="100%" colspan="2"><font face="Tahoma,Arial,Helvetica" size="2">By default, new users will be taken to the main page the first time they log in. You can, optionally, take them directly into one of the profile pages using this option.</font></td>
+ </tr>
+ <tr>
+ <td width="16%"><b><font size="2" face="Tahoma,Arial,Helvetica">user_first_action</font></b></td>
+ <td width="84%"><font face="Tahoma,Arial,Helvetica" size="2">
+ <select name="user_first_action" size="1">
+ <option value="cat_list"<%if cfg_user_first_action eq 'cat_list' or not cfg_user_first_action%> selected<%endif%>>Main category list page</option>
+ <option value="user_profile"<% if cfg_user_first_action eq 'user_profile'%> selected<%endif%>>Edit profile</option>
+ <option value="user_profile_basic"<% if cfg_user_first_action eq 'user_profile_basic'%> selected<%endif%>>Profile: User Profile</option>
+ <option value="user_profile_display"<%if cfg_user_first_action eq 'user_profile_display'%> selected<%endif%>>Profile: Display Settings</option>
+ <option value="user_profile_email"<% if cfg_user_first_action eq 'user_profile_email'%> selected<%endif%>>Profile: Subscriptions</option>
+ </select>
+ </font></td>
</tr>
<tr>
<td width="100%" colspan="2"><font face="Tahoma,Arial,Helvetica" size="2">This option, if enabled, allows users to change their username.</font></td>
Index: admin/templates_email.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/templates_email.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -r1.9 -r1.10
--- admin/templates_email.html 22 Mar 2002 02:55:42 -0000 1.9
+++ admin/templates_email.html 3 Apr 2002 00:35:23 -0000 1.10
@@ -99,6 +99,7 @@
<%loop dir_select%>
<option value="<%directory%>"<%if dir_selected%> selected<%endif%>><%directory%></option>
<%endloop%>
+ </select>
<input type=submit value=Change name=load_template>
</font></p>
Index: admin/templates_language.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/templates_language.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -r1.7 -r1.8
--- admin/templates_language.html 4 Mar 2002 19:00:15 -0000 1.7
+++ admin/templates_language.html 12 Apr 2002 23:19:25 -0000 1.8
@@ -41,7 +41,7 @@
<p><font size="2" face="Tahoma,Arial,Helvetica">
<%loop prefix_list%>
-<a href="admin.cgi?do=page;page=templates_language.html;prefix=<%prefix%>"><%prefix%> (<%num_vars%>)</a>
+<a href="admin.cgi?do=page;page=templates_language.html;prefix=<%prefix%>;tpl_dir=<%tpl_dir%>"><%prefix%> (<%num_vars%>)</a>
<%endloop%>
</font></p>
Index: admin/help/help_guide_modperl.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/help/help_guide_modperl.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- admin/help/help_guide_modperl.html 4 Mar 2002 19:00:15 -0000 1.2
+++ admin/help/help_guide_modperl.html 18 Apr 2002 23:24:18 -0000 1.3
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Links SQL Help: Plug Ins</title>
+<title>Gossamer Forum Help: Plug Ins</title>
</head>
<body>
Index: admin/help/help_templates_guide.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/help/help_templates_guide.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- admin/help/help_templates_guide.html 4 Mar 2002 19:00:15 -0000 1.2
+++ admin/help/help_templates_guide.html 18 Apr 2002 23:24:18 -0000 1.3
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Links SQL Help: Admin</title>
+<title>Gossamer Forum Help: Admin</title>
</head>
<body>
Index: admin/help/help_templates_syntax.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/help/help_templates_syntax.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- admin/help/help_templates_syntax.html 4 Mar 2002 19:00:15 -0000 1.2
+++ admin/help/help_templates_syntax.html 18 Apr 2002 23:24:18 -0000 1.3
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Links SQL Help: Admin</title>
+<title>Gossamer Forum Help: Admin</title>
</head>
<body>
Index: admin/help/help_templates_tags.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/help/help_templates_tags.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- admin/help/help_templates_tags.html 4 Mar 2002 19:00:15 -0000 1.2
+++ admin/help/help_templates_tags.html 18 Apr 2002 23:24:18 -0000 1.3
@@ -2,12 +2,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Links SQL Help: Admin</title>
+<title>Gossamer Forum Help: Admin</title>
</head>
<body>
-<H1><font face="Verdana, Arial, Helvetica">Links SQL Help</font></H1>
+<H1><font face="Verdana, Arial, Helvetica">Gossamer Forum Help</font></H1>
<TABLE width=100%>
<TR>