[Xfce4-commits] <forum:master> Update to Fluxbb 1.5.0.
Nick Schermer
noreply at xfce.org
Fri Aug 3 17:46:02 CEST 2012
Updating branch refs/heads/master
to cef9d8c7f70dbe6c65f2c02133ed5b88c4844569 (commit)
from b71f8089a00b123d1bc95851b6c70e15396b32f2 (commit)
commit cef9d8c7f70dbe6c65f2c02133ed5b88c4844569
Author: Nick Schermer <nick at xfce.org>
Date: Fri Aug 3 17:44:13 2012 +0200
Update to Fluxbb 1.5.0.
admin_groups.php | 153 ++++++++++++++++++++++++++--------------
admin_options.php | 8 --
db_update.php | 39 +++++------
edit.php | 3 +-
help.php | 2 +-
include/cache.php | 28 -------
include/common.php | 4 +-
include/common_admin.php | 1 -
include/functions.php | 35 +--------
include/parser.php | 19 +++++-
lang/English/admin_common.php | 1 -
lang/English/admin_groups.php | 7 ++-
lang/English/admin_index.php | 2 +-
lang/English/admin_options.php | 4 +-
lang/English/common.php | 3 +
lang/English/profile.php | 3 +-
lang/English/update.php | 1 -
post.php | 11 +++-
profile.php | 30 ++++++---
style/Air/base_admin.css | 2 +-
style/Earth/base_admin.css | 2 +-
style/Fire/base_admin.css | 2 +-
style/imports/base_admin.css | 2 +-
viewtopic.php | 1 +
24 files changed, 192 insertions(+), 171 deletions(-)
diff --git a/admin_groups.php b/admin_groups.php
index 888befc..f403efd 100644
--- a/admin_groups.php
+++ b/admin_groups.php
@@ -20,29 +20,30 @@ if ($pun_user['g_id'] != PUN_ADMIN)
// Load the admin_censoring.php language file
require PUN_ROOT.'lang/'.$admin_language.'/admin_groups.php';
+
+// Fetch all groups
+$result = $db->query('SELECT * FROM '.$db->prefix.'groups ORDER BY g_id') or error('Unable to fetch user groups', __FILE__, __LINE__, $db->error());
+$groups = array();
+while ($cur_group = $db->fetch_assoc($result))
+ $groups[$cur_group['g_id']] = $cur_group;
+
// Add/edit a group (stage 1)
if (isset($_POST['add_group']) || isset($_GET['edit_group']))
{
if (isset($_POST['add_group']))
{
$base_group = intval($_POST['base_group']);
-
- $result = $db->query('SELECT * FROM '.$db->prefix.'groups WHERE g_id='.$base_group) or error('Unable to fetch user group info', __FILE__, __LINE__, $db->error());
- $group = $db->fetch_assoc($result);
+ $group = $groups[$base_group];
$mode = 'add';
}
else // We are editing a group
{
$group_id = intval($_GET['edit_group']);
- if ($group_id < 1)
- message($lang_common['Bad request']);
-
- $result = $db->query('SELECT * FROM '.$db->prefix.'groups WHERE g_id='.$group_id) or error('Unable to fetch user group info', __FILE__, __LINE__, $db->error());
- if (!$db->num_rows($result))
+ if ($group_id < 1 || !isset($groups[$group_id]))
message($lang_common['Bad request']);
- $group = $db->fetch_assoc($result);
+ $group = $groups[$group_id];
$mode = 'edit';
}
@@ -81,146 +82,177 @@ if (isset($_POST['add_group']) || isset($_GET['edit_group']))
<th scope="row"><?php echo $lang_admin_groups['User title label'] ?></th>
<td>
<input type="text" name="user_title" size="25" maxlength="50" value="<?php echo pun_htmlspecialchars($group['g_user_title']) ?>" tabindex="2" />
- <span><?php echo $lang_admin_groups['User title help'] ?></span>
+ <span><?php printf($lang_admin_groups['User title help'], $lang_common['Member']) ?></span>
+ </td>
+ </tr>
+<?php if ($group['g_id'] != PUN_ADMIN): if ($group['g_id'] != PUN_GUEST): ?> <tr>
+ <th scope="row"><?php echo $lang_admin_groups['Promote users label'] ?></th>
+ <td>
+ <select name="promote_next_group" tabindex="3">
+ <option value="0"><?php echo $lang_admin_groups['Disable promotion'] ?></option>
+<?php
+
+foreach ($groups as $cur_group)
+{
+ if (($cur_group['g_id'] != $group['g_id'] || $mode == 'add') && $cur_group['g_id'] != PUN_ADMIN && $cur_group['g_id'] != PUN_GUEST)
+ {
+ if ($cur_group['g_id'] == $group['g_promote_next_group'])
+ echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ else
+ echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ }
+}
+
+?>
+ </select>
+ <input type="text" name="promote_min_posts" size="5" maxlength="10" value="<?php echo pun_htmlspecialchars($group['g_promote_min_posts']) ?>" tabindex="4" />
+ <span><?php printf($lang_admin_groups['Promote users help'], $lang_admin_groups['Disable promotion']) ?></span>
</td>
</tr>
-<?php if ($group['g_id'] != PUN_ADMIN): if ($group['g_id'] != PUN_GUEST): if ($mode != 'edit' || $pun_config['o_default_user_group'] != $group['g_id']): ?> <tr>
+<?php if ($mode != 'edit' || $pun_config['o_default_user_group'] != $group['g_id']): ?> <tr>
<th scope="row"> <?php echo $lang_admin_groups['Mod privileges label'] ?></th>
<td>
- <input type="radio" name="moderator" value="1"<?php if ($group['g_moderator'] == '1') echo ' checked="checked"' ?> tabindex="3" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="moderator" value="0"<?php if ($group['g_moderator'] == '0') echo ' checked="checked"' ?> tabindex="4" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="moderator" value="1"<?php if ($group['g_moderator'] == '1') echo ' checked="checked"' ?> tabindex="5" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="moderator" value="0"<?php if ($group['g_moderator'] == '0') echo ' checked="checked"' ?> tabindex="6" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Mod privileges help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Edit profile label'] ?></th>
<td>
- <input type="radio" name="mod_edit_users" value="1"<?php if ($group['g_mod_edit_users'] == '1') echo ' checked="checked"' ?> tabindex="5" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="mod_edit_users" value="0"<?php if ($group['g_mod_edit_users'] == '0') echo ' checked="checked"' ?> tabindex="6" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="mod_edit_users" value="1"<?php if ($group['g_mod_edit_users'] == '1') echo ' checked="checked"' ?> tabindex="7" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="mod_edit_users" value="0"<?php if ($group['g_mod_edit_users'] == '0') echo ' checked="checked"' ?> tabindex="8" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Edit profile help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Rename users label'] ?></th>
<td>
- <input type="radio" name="mod_rename_users" value="1"<?php if ($group['g_mod_rename_users'] == '1') echo ' checked="checked"' ?> tabindex="7" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="mod_rename_users" value="0"<?php if ($group['g_mod_rename_users'] == '0') echo ' checked="checked"' ?> tabindex="8" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="mod_rename_users" value="1"<?php if ($group['g_mod_rename_users'] == '1') echo ' checked="checked"' ?> tabindex="9" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="mod_rename_users" value="0"<?php if ($group['g_mod_rename_users'] == '0') echo ' checked="checked"' ?> tabindex="10" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Rename users help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Change passwords label'] ?></th>
<td>
- <input type="radio" name="mod_change_passwords" value="1"<?php if ($group['g_mod_change_passwords'] == '1') echo ' checked="checked"' ?> tabindex="9" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="mod_change_passwords" value="0"<?php if ($group['g_mod_change_passwords'] == '0') echo ' checked="checked"' ?> tabindex="10" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="mod_change_passwords" value="1"<?php if ($group['g_mod_change_passwords'] == '1') echo ' checked="checked"' ?> tabindex="11" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="mod_change_passwords" value="0"<?php if ($group['g_mod_change_passwords'] == '0') echo ' checked="checked"' ?> tabindex="12" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Change passwords help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Ban users label'] ?></th>
<td>
- <input type="radio" name="mod_ban_users" value="1"<?php if ($group['g_mod_ban_users'] == '1') echo ' checked="checked"' ?> tabindex="11" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="mod_ban_users" value="0"<?php if ($group['g_mod_ban_users'] == '0') echo ' checked="checked"' ?> tabindex="12" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="mod_ban_users" value="1"<?php if ($group['g_mod_ban_users'] == '1') echo ' checked="checked"' ?> tabindex="13" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="mod_ban_users" value="0"<?php if ($group['g_mod_ban_users'] == '0') echo ' checked="checked"' ?> tabindex="14" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Ban users help'] ?></span>
</td>
</tr>
<?php endif; endif; ?> <tr>
<th scope="row"><?php echo $lang_admin_groups['Read board label'] ?></th>
<td>
- <input type="radio" name="read_board" value="1"<?php if ($group['g_read_board'] == '1') echo ' checked="checked"' ?> tabindex="13" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="read_board" value="0"<?php if ($group['g_read_board'] == '0') echo ' checked="checked"' ?> tabindex="14" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="read_board" value="1"<?php if ($group['g_read_board'] == '1') echo ' checked="checked"' ?> tabindex="15" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="read_board" value="0"<?php if ($group['g_read_board'] == '0') echo ' checked="checked"' ?> tabindex="16" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Read board help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['View user info label'] ?></th>
<td>
- <input type="radio" name="view_users" value="1"<?php if ($group['g_view_users'] == '1') echo ' checked="checked"' ?> tabindex="15" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="view_users" value="0"<?php if ($group['g_view_users'] == '0') echo ' checked="checked"' ?> tabindex="16" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="view_users" value="1"<?php if ($group['g_view_users'] == '1') echo ' checked="checked"' ?> tabindex="17" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="view_users" value="0"<?php if ($group['g_view_users'] == '0') echo ' checked="checked"' ?> tabindex="18" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['View user info help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Post replies label'] ?></th>
<td>
- <input type="radio" name="post_replies" value="1"<?php if ($group['g_post_replies'] == '1') echo ' checked="checked"' ?> tabindex="17" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="post_replies" value="0"<?php if ($group['g_post_replies'] == '0') echo ' checked="checked"' ?> tabindex="18" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="post_replies" value="1"<?php if ($group['g_post_replies'] == '1') echo ' checked="checked"' ?> tabindex="19" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="post_replies" value="0"<?php if ($group['g_post_replies'] == '0') echo ' checked="checked"' ?> tabindex="20" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Post replies help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Post topics label'] ?></th>
<td>
- <input type="radio" name="post_topics" value="1"<?php if ($group['g_post_topics'] == '1') echo ' checked="checked"' ?> tabindex="19" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="post_topics" value="0"<?php if ($group['g_post_topics'] == '0') echo ' checked="checked"' ?> tabindex="20" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="post_topics" value="1"<?php if ($group['g_post_topics'] == '1') echo ' checked="checked"' ?> tabindex="21" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="post_topics" value="0"<?php if ($group['g_post_topics'] == '0') echo ' checked="checked"' ?> tabindex="22" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Post topics help'] ?></span>
</td>
</tr>
<?php if ($group['g_id'] != PUN_GUEST): ?> <tr>
<th scope="row"><?php echo $lang_admin_groups['Edit posts label'] ?></th>
<td>
- <input type="radio" name="edit_posts" value="1"<?php if ($group['g_edit_posts'] == '1') echo ' checked="checked"' ?> tabindex="21" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="edit_posts" value="0"<?php if ($group['g_edit_posts'] == '0') echo ' checked="checked"' ?> tabindex="22" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="edit_posts" value="1"<?php if ($group['g_edit_posts'] == '1') echo ' checked="checked"' ?> tabindex="23" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="edit_posts" value="0"<?php if ($group['g_edit_posts'] == '0') echo ' checked="checked"' ?> tabindex="24" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Edit posts help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Delete posts label'] ?></th>
<td>
- <input type="radio" name="delete_posts" value="1"<?php if ($group['g_delete_posts'] == '1') echo ' checked="checked"' ?> tabindex="23" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="delete_posts" value="0"<?php if ($group['g_delete_posts'] == '0') echo ' checked="checked"' ?> tabindex="24" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="delete_posts" value="1"<?php if ($group['g_delete_posts'] == '1') echo ' checked="checked"' ?> tabindex="25" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="delete_posts" value="0"<?php if ($group['g_delete_posts'] == '0') echo ' checked="checked"' ?> tabindex="26" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Delete posts help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Delete topics label'] ?></th>
<td>
- <input type="radio" name="delete_topics" value="1"<?php if ($group['g_delete_topics'] == '1') echo ' checked="checked"' ?> tabindex="25" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="delete_topics" value="0"<?php if ($group['g_delete_topics'] == '0') echo ' checked="checked"' ?> tabindex="26" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="delete_topics" value="1"<?php if ($group['g_delete_topics'] == '1') echo ' checked="checked"' ?> tabindex="27" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="delete_topics" value="0"<?php if ($group['g_delete_topics'] == '0') echo ' checked="checked"' ?> tabindex="28" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Delete topics help'] ?></span>
</td>
</tr>
- <tr>
+<?php endif; ?> <tr>
+ <th scope="row"><?php echo $lang_admin_groups['Post links label'] ?></th>
+ <td>
+ <input type="radio" name="post_links" value="1"<?php if ($group['g_post_links'] == '1') echo ' checked="checked"' ?> tabindex="29" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="post_links" value="0"<?php if ($group['g_post_links'] == '0') echo ' checked="checked"' ?> tabindex="30" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <span><?php echo $lang_admin_groups['Post links help'] ?></span>
+ </td>
+ </tr>
+<?php if ($group['g_id'] != PUN_GUEST): ?> <tr>
<th scope="row"><?php echo $lang_admin_groups['Set own title label'] ?></th>
<td>
- <input type="radio" name="set_title" value="1"<?php if ($group['g_set_title'] == '1') echo ' checked="checked"' ?> tabindex="27" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="set_title" value="0"<?php if ($group['g_set_title'] == '0') echo ' checked="checked"' ?> tabindex="28" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="set_title" value="1"<?php if ($group['g_set_title'] == '1') echo ' checked="checked"' ?> tabindex="31" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="set_title" value="0"<?php if ($group['g_set_title'] == '0') echo ' checked="checked"' ?> tabindex="32" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Set own title help'] ?></span>
</td>
</tr>
<?php endif; ?> <tr>
<th scope="row"><?php echo $lang_admin_groups['User search label'] ?></th>
<td>
- <input type="radio" name="search" value="1"<?php if ($group['g_search'] == '1') echo ' checked="checked"' ?> tabindex="29" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="search" value="0"<?php if ($group['g_search'] == '0') echo ' checked="checked"' ?> tabindex="30" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="search" value="1"<?php if ($group['g_search'] == '1') echo ' checked="checked"' ?> tabindex="33" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="search" value="0"<?php if ($group['g_search'] == '0') echo ' checked="checked"' ?> tabindex="34" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['User search help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['User list search label'] ?></th>
<td>
- <input type="radio" name="search_users" value="1"<?php if ($group['g_search_users'] == '1') echo ' checked="checked"' ?> tabindex="31" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="search_users" value="0"<?php if ($group['g_search_users'] == '0') echo ' checked="checked"' ?> tabindex="32" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="search_users" value="1"<?php if ($group['g_search_users'] == '1') echo ' checked="checked"' ?> tabindex="35" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="search_users" value="0"<?php if ($group['g_search_users'] == '0') echo ' checked="checked"' ?> tabindex="36" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['User list search help'] ?></span>
</td>
</tr>
<?php if ($group['g_id'] != PUN_GUEST): ?> <tr>
<th scope="row"><?php echo $lang_admin_groups['Send e-mails label'] ?></th>
<td>
- <input type="radio" name="send_email" value="1"<?php if ($group['g_send_email'] == '1') echo ' checked="checked"' ?> tabindex="33" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="send_email" value="0"<?php if ($group['g_send_email'] == '0') echo ' checked="checked"' ?> tabindex="34" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
+ <input type="radio" name="send_email" value="1"<?php if ($group['g_send_email'] == '1') echo ' checked="checked"' ?> tabindex="37" /> <strong><?php echo $lang_admin_common['Yes'] ?></strong> <input type="radio" name="send_email" value="0"<?php if ($group['g_send_email'] == '0') echo ' checked="checked"' ?> tabindex="38" /> <strong><?php echo $lang_admin_common['No'] ?></strong>
<span><?php echo $lang_admin_groups['Send e-mails help'] ?></span>
</td>
</tr>
<?php endif; ?> <tr>
<th scope="row"><?php echo $lang_admin_groups['Post flood label'] ?></th>
<td>
- <input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['g_post_flood'] ?>" tabindex="35" />
+ <input type="text" name="post_flood" size="5" maxlength="4" value="<?php echo $group['g_post_flood'] ?>" tabindex="39" />
<span><?php echo $lang_admin_groups['Post flood help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Search flood label'] ?></th>
<td>
- <input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['g_search_flood'] ?>" tabindex="36" />
+ <input type="text" name="search_flood" size="5" maxlength="4" value="<?php echo $group['g_search_flood'] ?>" tabindex="40" />
<span><?php echo $lang_admin_groups['Search flood help'] ?></span>
</td>
</tr>
<?php if ($group['g_id'] != PUN_GUEST): ?> <tr>
<th scope="row"><?php echo $lang_admin_groups['E-mail flood label'] ?></th>
<td>
- <input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['g_email_flood'] ?>" tabindex="37" />
+ <input type="text" name="email_flood" size="5" maxlength="4" value="<?php echo $group['g_email_flood'] ?>" tabindex="41" />
<span><?php echo $lang_admin_groups['E-mail flood help'] ?></span>
</td>
</tr>
<tr>
<th scope="row"><?php echo $lang_admin_groups['Report flood label'] ?></th>
<td>
- <input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['g_report_flood'] ?>" tabindex="38" />
+ <input type="text" name="report_flood" size="5" maxlength="4" value="<?php echo $group['g_report_flood'] ?>" tabindex="42" />
<span><?php echo $lang_admin_groups['Report flood help'] ?></span>
</td>
</tr>
@@ -229,7 +261,7 @@ if (isset($_POST['add_group']) || isset($_GET['edit_group']))
<?php endif; ?> </div>
</fieldset>
</div>
- <p class="submitend"><input type="submit" name="add_edit_group" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="39" /></p>
+ <p class="submitend"><input type="submit" name="add_edit_group" value="<?php echo $lang_admin_common['Save'] ?>" tabindex="43" /></p>
</form>
</div>
</div>
@@ -251,6 +283,16 @@ else if (isset($_POST['add_edit_group']))
$title = pun_trim($_POST['req_title']);
$user_title = pun_trim($_POST['user_title']);
+
+ $promote_min_posts = isset($_POST['promote_min_posts']) ? intval($_POST['promote_min_posts']) : '0';
+ if (isset($_POST['promote_next_group']) &&
+ isset($groups[$_POST['promote_next_group']]) &&
+ !in_array($_POST['promote_next_group'], array(PUN_ADMIN, PUN_GUEST)) &&
+ (!isset($_POST['group_id']) || $_POST['promote_next_group'] != $_POST['group_id']))
+ $promote_next_group = $_POST['promote_next_group'];
+ else
+ $promote_next_group = '0';
+
$moderator = isset($_POST['moderator']) && $_POST['moderator'] == '1' ? '1' : '0';
$mod_edit_users = $moderator == '1' && isset($_POST['mod_edit_users']) && $_POST['mod_edit_users'] == '1' ? '1' : '0';
$mod_rename_users = $moderator == '1' && isset($_POST['mod_rename_users']) && $_POST['mod_rename_users'] == '1' ? '1' : '0';
@@ -263,6 +305,7 @@ else if (isset($_POST['add_edit_group']))
$edit_posts = isset($_POST['edit_posts']) ? intval($_POST['edit_posts']) : ($is_admin_group) ? '1' : '0';
$delete_posts = isset($_POST['delete_posts']) ? intval($_POST['delete_posts']) : ($is_admin_group) ? '1' : '0';
$delete_topics = isset($_POST['delete_topics']) ? intval($_POST['delete_topics']) : ($is_admin_group) ? '1' : '0';
+ $post_links = isset($_POST['post_links']) ? intval($_POST['post_links']) : '1';
$set_title = isset($_POST['set_title']) ? intval($_POST['set_title']) : ($is_admin_group) ? '1' : '0';
$search = isset($_POST['search']) ? intval($_POST['search']) : '1';
$search_users = isset($_POST['search_users']) ? intval($_POST['search_users']) : '1';
@@ -283,7 +326,7 @@ else if (isset($_POST['add_edit_group']))
if ($db->num_rows($result))
message(sprintf($lang_admin_groups['Title already exists message'], pun_htmlspecialchars($title)));
- $db->query('INSERT INTO '.$db->prefix.'groups (g_title, g_user_title, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES(\''.$db->escape($title).'\', '.$user_title.', '.$moderator.', '.$mod_edit_users.', '.$mod_rename_users.', '.$mod_change_passwords.', '.$mod_ban_users.', '.$read_board.', '.$view_users.', '.$post_replies.', '.$post_topics.', '.$edit_posts.', '.$delete_posts.', '.$delete_topics.', '.$set_title.', '.$search.', '.$search_users.', '.$send_email.', '.$post_flood.', '.$search_flood.', '.$email_flood.', '.$report_flood.')') or error('Unable to add group', __FILE__, __LINE__, $db->error());
+ $db->query('INSERT INTO '.$db->prefix.'groups (g_title, g_user_title, g_promote_min_posts, g_promote_next_group, g_moderator, g_mod_edit_users, g_mod_rename_users, g_mod_change_passwords, g_mod_ban_users, g_read_board, g_view_users, g_post_replies, g_post_topics, g_edit_posts, g_delete_posts, g_delete_topics, g_post_links, g_set_title, g_search, g_search_users, g_send_email, g_post_flood, g_search_flood, g_email_flood, g_report_flood) VALUES(\''.$db->escape($title).'\', '.$user_title.', '.$promote_min_posts.', '.$promote_next_group.', '.$moderator.', '.$mod_edit_users.', '.$mod_rename_users.', '.$mod_change_passwords.', '.$mod_ban_users.', '.$read_board.', '.$view_users.', '.$post_replies.', '.$post_topics.', '.$edit_posts.', '.$delete_posts.', '.$delete_topics.', '.$post_links.', '.$set_title.', '.$search.', '.$search_users.', '.$send_email.', '.$post_flood.', '.$search_flood.', '.$email_flood.', '.$report_flood.')') or error('Unable to add group', __FILE__, __LINE__, $db
->error());
$new_group_id = $db->insert_id();
// Now lets copy the forum specific permissions from the group which this group is based on
@@ -297,7 +340,7 @@ else if (isset($_POST['add_edit_group']))
if ($db->num_rows($result))
message(sprintf($lang_admin_groups['Title already exists message'], pun_htmlspecialchars($title)));
- $db->query('UPDATE '.$db->prefix.'groups SET g_title=\''.$db->escape($title).'\', g_user_title='.$user_title.', g_moderator='.$moderator.', g_mod_edit_users='.$mod_edit_users.', g_mod_rename_users='.$mod_rename_users.', g_mod_change_passwords='.$mod_change_passwords.', g_mod_ban_users='.$mod_ban_users.', g_read_board='.$read_board.', g_view_users='.$view_users.', g_post_replies='.$post_replies.', g_post_topics='.$post_topics.', g_edit_posts='.$edit_posts.', g_delete_posts='.$delete_posts.', g_delete_topics='.$delete_topics.', g_set_title='.$set_title.', g_search='.$search.', g_search_users='.$search_users.', g_send_email='.$send_email.', g_post_flood='.$post_flood.', g_search_flood='.$search_flood.', g_email_flood='.$email_flood.', g_report_flood='.$report_flood.' WHERE g_id='.intval($_POST['group_id'])) or error('Unable to update group', __FILE__, __LINE__, $db->error());
+ $db->query('UPDATE '.$db->prefix.'groups SET g_title=\''.$db->escape($title).'\', g_user_title='.$user_title.', g_promote_min_posts='.$promote_min_posts.', g_promote_next_group='.$promote_next_group.', g_moderator='.$moderator.', g_mod_edit_users='.$mod_edit_users.', g_mod_rename_users='.$mod_rename_users.', g_mod_change_passwords='.$mod_change_passwords.', g_mod_ban_users='.$mod_ban_users.', g_read_board='.$read_board.', g_view_users='.$view_users.', g_post_replies='.$post_replies.', g_post_topics='.$post_topics.', g_edit_posts='.$edit_posts.', g_delete_posts='.$delete_posts.', g_delete_topics='.$delete_topics.', g_post_links='.$post_links.', g_set_title='.$set_title.', g_search='.$search.', g_search_users='.$search_users.', g_send_email='.$send_email.', g_post_flood='.$post_flood.', g_search_flood='.$search_flood.', g_email_flood='.$email_flood.', g_report_flood='.$report_flood.' WHERE g_id='.intval($_POST['group_id'])) or error('Unable to update group', __FILE__, __LINE
__, $db->error());
}
// Regenerate the quick jump cache
@@ -326,8 +369,7 @@ else if (isset($_POST['set_default_group']))
message($lang_common['Bad request']);
// Make sure it's not a moderator group
- $result = $db->query('SELECT 1 FROM '.$db->prefix.'groups WHERE g_id='.$group_id.' AND g_moderator=0') or error('Unable to check group moderator status', __FILE__, __LINE__, $db->error());
- if (!$db->num_rows($result))
+ if ($groups[$group_id]['g_moderator'] != 0)
message($lang_common['Bad request']);
$db->query('UPDATE '.$db->prefix.'config SET conf_value='.$group_id.' WHERE conf_name=\'o_default_user_group\'') or error('Unable to update board config', __FILE__, __LINE__, $db->error());
@@ -373,6 +415,9 @@ else if (isset($_GET['del_group']))
$db->query('DELETE FROM '.$db->prefix.'groups WHERE g_id='.$group_id) or error('Unable to delete group', __FILE__, __LINE__, $db->error());
$db->query('DELETE FROM '.$db->prefix.'forum_perms WHERE group_id='.$group_id) or error('Unable to delete group forum permissions', __FILE__, __LINE__, $db->error());
+ // Don't let users be promoted to this group
+ $db->query('UPDATE '.$db->prefix.'groups SET g_promote_next_group=0 WHERE g_promote_next_group='.$group_id) or error('Unable to remove group as promotion target', __FILE__, __LINE__, $db->error());
+
redirect('admin_groups.php', $lang_admin_groups['Group removed redirect']);
}
else
@@ -485,14 +530,15 @@ generate_admin_menu('groups');
<select id="base_group" name="base_group" tabindex="1">
<?php
-$result = $db->query('SELECT g_id, g_title FROM '.$db->prefix.'groups WHERE g_id!='.PUN_ADMIN.' AND g_id!='.PUN_GUEST.' ORDER BY g_title') or error('Unable to fetch user group list', __FILE__, __LINE__, $db->error());
-
-while ($cur_group = $db->fetch_assoc($result))
+foreach ($groups as $cur_group)
{
- if ($cur_group['g_id'] == $pun_config['o_default_user_group'])
- echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
- else
- echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ if ($cur_group['g_id'] != PUN_ADMIN && $cur_group['g_id'] != PUN_GUEST)
+ {
+ if ($cur_group['g_id'] == $pun_config['o_default_user_group'])
+ echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ else
+ echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ }
}
?>
@@ -515,14 +561,15 @@ while ($cur_group = $db->fetch_assoc($result))
<select id="default_group" name="default_group" tabindex="3">
<?php
-$result = $db->query('SELECT g_id, g_title FROM '.$db->prefix.'groups WHERE g_id>'.PUN_GUEST.' AND g_moderator=0 ORDER BY g_title') or error('Unable to fetch user group list', __FILE__, __LINE__, $db->error());
-
-while ($cur_group = $db->fetch_assoc($result))
+foreach ($groups as $cur_group)
{
- if ($cur_group['g_id'] == $pun_config['o_default_user_group'])
- echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
- else
- echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ if ($cur_group['g_id'] > PUN_GUEST && $cur_group['g_moderator'] == 0)
+ {
+ if ($cur_group['g_id'] == $pun_config['o_default_user_group'])
+ echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'" selected="selected">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ else
+ echo "\t\t\t\t\t\t\t\t\t\t\t".'<option value="'.$cur_group['g_id'].'">'.pun_htmlspecialchars($cur_group['g_title']).'</option>'."\n";
+ }
}
?>
@@ -550,9 +597,7 @@ while ($cur_group = $db->fetch_assoc($result))
$cur_index = 5;
-$result = $db->query('SELECT g_id, g_title FROM '.$db->prefix.'groups ORDER BY g_id') or error('Unable to fetch user group list', __FILE__, __LINE__, $db->error());
-
-while ($cur_group = $db->fetch_assoc($result))
+foreach ($groups as $cur_group)
echo "\t\t\t\t\t\t\t\t".'<tr><th scope="row"><a href="admin_groups.php?edit_group='.$cur_group['g_id'].'" tabindex="'.$cur_index++.'">'.$lang_admin_groups['Edit link'].'</a>'.(($cur_group['g_id'] > PUN_MEMBER) ? ' | <a href="admin_groups.php?del_group='.$cur_group['g_id'].'" tabindex="'.$cur_index++.'">'.$lang_admin_groups['Delete link'].'</a>' : '').'</th><td>'.pun_htmlspecialchars($cur_group['g_title']).'</td></tr>'."\n";
?>
diff --git a/admin_options.php b/admin_options.php
index 48e2244..deea52c 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -52,7 +52,6 @@ if (isset($_POST['form_sent']))
'users_online' => $_POST['form']['users_online'] != '1' ? '0' : '1',
'censoring' => $_POST['form']['censoring'] != '1' ? '0' : '1',
'signatures' => $_POST['form']['signatures'] != '1' ? '0' : '1',
- 'ranks' => $_POST['form']['ranks'] != '1' ? '0' : '1',
'show_dot' => $_POST['form']['show_dot'] != '1' ? '0' : '1',
'topic_views' => $_POST['form']['topic_views'] != '1' ? '0' : '1',
'quickjump' => $_POST['form']['quickjump'] != '1' ? '0' : '1',
@@ -523,13 +522,6 @@ generate_admin_menu('options');
</td>
</tr>
<tr>
- <th scope="row"><a name="ranks"></a><?php echo $lang_admin_options['User ranks label'] ?></th>
- <td>
- <input type="radio" name="form[ranks]" id="form_ranks_1" value="1"<?php if ($pun_config['o_ranks'] == '1') echo ' checked="checked"' ?> /> <label class="conl" for="form_ranks_1"><strong><?php echo $lang_admin_common['Yes'] ?></strong></label> <input type="radio" name="form[ranks]" id="form_ranks_0" value="0"<?php if ($pun_config['o_ranks'] == '0') echo ' checked="checked"' ?> /> <label class="conl" for="form_ranks_0"><strong><?php echo $lang_admin_common['No'] ?></strong></label>
- <span><?php printf($lang_admin_options['User ranks help'], '<a href="admin_ranks.php">'.$lang_admin_common['Ranks'].'</a>') ?></span>
- </td>
- </tr>
- <tr>
<th scope="row"><?php echo $lang_admin_options['User has posted label'] ?></th>
<td>
<input type="radio" name="form[show_dot]" id="form_show_dot_1" value="1"<?php if ($pun_config['o_show_dot'] == '1') echo ' checked="checked"' ?> /> <label class="conl" for="form_show_dot_1"><strong><?php echo $lang_admin_common['Yes'] ?></strong></label> <input type="radio" name="form[show_dot]" id="form_show_dot_0" value="0"<?php if ($pun_config['o_show_dot'] == '0') echo ' checked="checked"' ?> /> <label class="conl" for="form_show_dot_0"><strong><?php echo $lang_admin_common['No'] ?></strong></label>
diff --git a/db_update.php b/db_update.php
index 51f4ff9..7ebc989 100644
--- a/db_update.php
+++ b/db_update.php
@@ -7,9 +7,9 @@
*/
// The FluxBB version this script updates to
-define('UPDATE_TO', '1.4.9');
+define('UPDATE_TO', '1.5.0');
-define('UPDATE_TO_DB_REVISION', 15);
+define('UPDATE_TO_DB_REVISION', 18);
define('UPDATE_TO_SI_REVISION', 2);
define('UPDATE_TO_PARSER_REVISION', 2);
@@ -1022,6 +1022,13 @@ switch ($stage)
// Change the search_data field to mediumtext
$db->alter_field('search_cache', 'search_data', 'MEDIUMTEXT', true) or error('Unable to alter search_data field', __FILE__, __LINE__, $db->error());
+ // Add the group promotion fields to the groups table
+ $db->add_field('groups', 'g_promote_min_posts', 'INT(10) UNSIGNED', false, 0, 'g_user_title') or error('Unable to add g_promote_min_posts field', __FILE__, __LINE__, $db->error());
+ $db->add_field('groups', 'g_promote_next_group', 'INT(10) UNSIGNED', false, 0, 'g_promote_min_posts') or error('Unable to add g_promote_next_group field', __FILE__, __LINE__, $db->error());
+
+ // Add a field for the per-group permission to post links
+ $db->add_field('groups', 'g_post_links', 'TINYINT(1)', false, 1, 'g_delete_topics') or error('Unable to add per-group permission to post links', __FILE__, __LINE__, $db->error());
+
// Incase we had the fulltext search extension installed (1.3-legacy), remove it
$db->drop_index('topics', 'subject_idx') or error('Unable to drop subject_idx index', __FILE__, __LINE__, $db->error());
$db->drop_index('posts', 'message_idx') or error('Unable to drop message_idx index', __FILE__, __LINE__, $db->error());
@@ -1163,6 +1170,14 @@ switch ($stage)
if ($db_type == 'mysql' || $db_type == 'mysqli')
$db->query('ALTER TABLE '.$db->prefix.'online ENGINE = MyISAM') or error('Unable to change engine type of online table to MyISAM', __FILE__, __LINE__, $db->error());
+ // Remove config option o_ranks
+ if (array_key_exists('o_ranks', $pun_config))
+ $db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name=\'o_ranks\'') or error('Unable to remove config value \'o_ranks\'', __FILE__, __LINE__, $db->error());
+
+ // Remove the ranks table
+ if ($db->table_exists('ranks'))
+ $db->drop_table('ranks') or error('Unable to drop ranks table', __FILE__, __LINE__, $db->error());
+
// Should we do charset conversion or not?
if (strpos($cur_version, '1.2') === 0 && isset($_POST['convert_charset']))
$query_str = '?stage=conv_bans&req_old_charset='.$old_charset;
@@ -1321,7 +1336,7 @@ switch ($stage)
// Convert posts
case 'conv_posts':
- $query_str = '?stage=conv_ranks&req_old_charset='.$old_charset;
+ $query_str = '?stage=conv_reports&req_old_charset='.$old_charset;
function _conv_posts($cur_item, $old_charset)
{
@@ -1344,24 +1359,6 @@ switch ($stage)
break;
- // Convert ranks
- case 'conv_ranks':
- $query_str = '?stage=conv_reports&req_old_charset='.$old_charset;
-
- echo sprintf($lang_update['Converting'], $lang_update['ranks']).'<br />'."\n";
-
- function _conv_ranks($cur_item, $old_charset)
- {
- convert_to_utf8($cur_item['rank'], $old_charset);
-
- return $cur_item;
- }
-
- convert_table_utf8($db->prefix.'ranks', '_conv_ranks', $old_charset, 'id');
-
- break;
-
-
// Convert reports
case 'conv_reports':
$query_str = '?stage=conv_search_cache&req_old_charset='.$old_charset;
diff --git a/edit.php b/edit.php
index f9b036b..b2f3e50 100644
--- a/edit.php
+++ b/edit.php
@@ -108,7 +108,7 @@ if (isset($_POST['form_sent']))
$stick_topic = isset($_POST['stick_topic']) ? '1' : '0';
if (!$is_admmod)
$stick_topic = $cur_post['sticky'];
-
+
// Replace four-byte characters (MySQL cannot handle them)
$message = strip_bad_multibyte_chars($message);
@@ -226,6 +226,7 @@ else if (isset($_POST['preview']))
<textarea name="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo pun_htmlspecialchars(isset($_POST['req_message']) ? $message : $cur_post['message']) ?></textarea><br /></label>
<ul class="bblinks">
<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+ <li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_user['g_post_links'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span>
<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo ($pun_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
</ul>
diff --git a/help.php b/help.php
index caa7c23..d6e367d 100644
--- a/help.php
+++ b/help.php
@@ -53,7 +53,7 @@ require PUN_ROOT.'header.php';
<div class="box">
<div class="inbox">
<p><?php echo $lang_help['Links info'] ?></p>
- <p><code>[url=<?php echo pun_htmlspecialchars(get_base_url(true).'/') ?>]<?php echo pun_htmlspecialchars($pun_config['o_board_title']) ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo pun_htmlspecialchars(get_base_url(true).'/') ?>"><?php echo pun_htmlspecialchars($pun_config['o_board_title']) ?></a></samp></p>
+ <p><a name="url"></a><code>[url=<?php echo pun_htmlspecialchars(get_base_url(true).'/') ?>]<?php echo pun_htmlspecialchars($pun_config['o_board_title']) ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo pun_htmlspecialchars(get_base_url(true).'/') ?>"><?php echo pun_htmlspecialchars($pun_config['o_board_title']) ?></a></samp></p>
<p><code>[url]<?php echo pun_htmlspecialchars(get_base_url(true).'/') ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo pun_htmlspecialchars(get_base_url(true).'/') ?>"><?php echo pun_htmlspecialchars(get_base_url(true).'/') ?></a></samp></p>
<p><code>[url=/help.php]<?php echo $lang_help['This help page'] ?>[/url]</code> <?php echo $lang_help['produces'] ?> <samp><a href="<?php echo pun_htmlspecialchars(get_base_url(true).'/help.php') ?>"><?php echo $lang_help['This help page'] ?></a></samp></p>
<p><code>[email]myname at mydomain.com[/email]</code> <?php echo $lang_help['produces'] ?> <samp><a href="mailto:myname at mydomain.com">myname at mydomain.com</a></samp></p>
diff --git a/include/cache.php b/include/cache.php
index e4b9112..276aaa4 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -68,34 +68,6 @@ function generate_bans_cache()
//
-// Generate the ranks cache PHP script
-//
-function generate_ranks_cache()
-{
- global $db;
-
- // Get the rank list from the DB
- $result = $db->query('SELECT * FROM '.$db->prefix.'ranks ORDER BY min_posts', true) or error('Unable to fetch rank list', __FILE__, __LINE__, $db->error());
-
- $output = array();
- while ($cur_rank = $db->fetch_assoc($result))
- $output[] = $cur_rank;
-
- // Output ranks list as PHP code
- $fh = @fopen(FORUM_CACHE_DIR.'cache_ranks.php', 'wb');
- if (!$fh)
- error('Unable to write ranks cache file to cache directory. Please make sure PHP has write access to the directory \''.pun_htmlspecialchars(FORUM_CACHE_DIR).'\'', __FILE__, __LINE__);
-
- fwrite($fh, '<?php'."\n\n".'define(\'PUN_RANKS_LOADED\', 1);'."\n\n".'$pun_ranks = '.var_export($output, true).';'."\n\n".'?>');
-
- fclose($fh);
-
- if (function_exists('apc_delete_file'))
- @apc_delete_file(FORUM_CACHE_DIR.'cache_ranks.php');
-}
-
-
-//
// Generate quick jump cache PHP scripts
//
function generate_quickjump_cache($group_id = false)
diff --git a/include/common.php b/include/common.php
index 92cef00..fe7c817 100644
--- a/include/common.php
+++ b/include/common.php
@@ -10,9 +10,9 @@ if (!defined('PUN_ROOT'))
exit('The constant PUN_ROOT must be defined and point to a valid FluxBB installation root directory.');
// Define the version and database revision that this code was written for
-define('FORUM_VERSION', '1.4.9');
+define('FORUM_VERSION', '1.5.0');
-define('FORUM_DB_REVISION', 15);
+define('FORUM_DB_REVISION', 18);
define('FORUM_SI_REVISION', 2);
define('FORUM_PARSER_REVISION', 2);
diff --git a/include/common_admin.php b/include/common_admin.php
index 594b401..7bbcb59 100644
--- a/include/common_admin.php
+++ b/include/common_admin.php
@@ -60,7 +60,6 @@ function generate_admin_menu($page = '')
<li<?php if ($page == 'forums') echo ' class="isactive"'; ?>><a href="admin_forums.php"><?php echo $lang_admin_common['Forums'] ?></a></li>
<li<?php if ($page == 'groups') echo ' class="isactive"'; ?>><a href="admin_groups.php"><?php echo $lang_admin_common['User groups'] ?></a></li>
<li<?php if ($page == 'censoring') echo ' class="isactive"'; ?>><a href="admin_censoring.php"><?php echo $lang_admin_common['Censoring'] ?></a></li>
- <li<?php if ($page == 'ranks') echo ' class="isactive"'; ?>><a href="admin_ranks.php"><?php echo $lang_admin_common['Ranks'] ?></a></li>
<li<?php if ($page == 'maintenance') echo ' class="isactive"'; ?>><a href="admin_maintenance.php"><?php echo $lang_admin_common['Maintenance'] ?></a></li>
</ul>
</div>
diff --git a/include/functions.php b/include/functions.php
index 855eb9f..b443116 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -822,7 +822,7 @@ function censor_words($text)
function get_title($user)
{
global $db, $pun_config, $pun_bans, $lang_common;
- static $ban_list, $pun_ranks;
+ static $ban_list;
// If not already built in a previous call, build an array of lowercase banned usernames
if (empty($ban_list))
@@ -833,22 +833,6 @@ function get_title($user)
$ban_list[] = strtolower($cur_ban['username']);
}
- // If not already loaded in a previous call, load the cached ranks
- if ($pun_config['o_ranks'] == '1' && !defined('PUN_RANKS_LOADED'))
- {
- if (file_exists(FORUM_CACHE_DIR.'cache_ranks.php'))
- include FORUM_CACHE_DIR.'cache_ranks.php';
-
- if (!defined('PUN_RANKS_LOADED'))
- {
- if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
- require PUN_ROOT.'include/cache.php';
-
- generate_ranks_cache();
- require FORUM_CACHE_DIR.'cache_ranks.php';
- }
- }
-
// If the user has a custom title
if ($user['title'] != '')
$user_title = pun_htmlspecialchars($user['title']);
@@ -861,22 +845,9 @@ function get_title($user)
// If the user is a guest
else if ($user['g_id'] == PUN_GUEST)
$user_title = $lang_common['Guest'];
+ // If nothing else helps, we assign the default
else
- {
- // Are there any ranks?
- if ($pun_config['o_ranks'] == '1' && !empty($pun_ranks))
- {
- foreach ($pun_ranks as $cur_rank)
- {
- if ($user['num_posts'] >= $cur_rank['min_posts'])
- $user_title = pun_htmlspecialchars($cur_rank['rank']);
- }
- }
-
- // If the user didn't "reach" any rank (or if ranks are disabled), we assign the default
- if (!isset($user_title))
- $user_title = $lang_common['Member'];
- }
+ $user_title = $lang_common['Member'];
return $user_title;
}
diff --git a/include/parser.php b/include/parser.php
index 238932d..9ba708b 100644
--- a/include/parser.php
+++ b/include/parser.php
@@ -183,7 +183,7 @@ function strip_empty_bbcode($text)
//
function preparse_tags($text, &$errors, $is_signature = false)
{
- global $lang_common, $pun_config;
+ global $lang_common, $pun_config, $pun_user;
// Start off by making some arrays of bbcode tags and what we need to do with each one
@@ -197,6 +197,8 @@ function preparse_tags($text, &$errors, $is_signature = false)
$tags_nested = array('quote' => $pun_config['o_quote_depth'], 'list' => 5, '*' => 5);
// Tags to ignore the contents of completely (just code)
$tags_ignore = array('code');
+ // Tags not allowed
+ $tags_forbidden = array();
// Block tags, block tags can only go within another block tag, they cannot be in a normal tag
$tags_block = array('quote', 'code', 'list', 'h', '*');
// Inline tags, we do not allow new lines in these
@@ -221,6 +223,10 @@ function preparse_tags($text, &$errors, $is_signature = false)
// Tags we can automatically fix bad nesting
$tags_fix = array('quote', 'b', 'i', 'u', 's', 'ins', 'del', 'em', 'color', 'colour', 'url', 'email', 'h', 'topic', 'post', 'forum', 'user');
+ // Disallow URL tags
+ if ($pun_user['g_post_links'] != '1')
+ $tags_forbidden[] = 'url';
+
$split_text = preg_split('%(\[[\*a-zA-Z0-9-/]*?(?:=.*?)?\])%', $text, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
$open_tags = array('fluxbb-bbcode');
@@ -378,6 +384,17 @@ function preparse_tags($text, &$errors, $is_signature = false)
continue;
}
+ // Is the tag forbidden?
+ if (in_array($current_tag, $tags_forbidden))
+ {
+ if (isset($lang_common['BBCode error tag '.$current_tag.' not allowed']))
+ $errors[] = sprintf($lang_common['BBCode error tag '.$current_tag.' not allowed']);
+ else
+ $errors[] = sprintf($lang_common['BBCode error tag not allowed'], $current_tag);
+
+ return false;
+ }
+
if ($current_nest)
{
// We are currently too deeply nested so lets see if we are closing the tag or not
diff --git a/lang/English/admin_common.php b/lang/English/admin_common.php
index a87616c..7172658 100644
--- a/lang/English/admin_common.php
+++ b/lang/English/admin_common.php
@@ -15,7 +15,6 @@ $lang_admin_common = array(
'Options' => 'Options',
'Permissions' => 'Permissions',
'Censoring' => 'Censoring',
-'Ranks' => 'Ranks',
'Bans' => 'Bans',
'Prune' => 'Prune',
'Maintenance' => 'Maintenance',
diff --git a/lang/English/admin_groups.php b/lang/English/admin_groups.php
index 4b1b4ad..55d2f50 100644
--- a/lang/English/admin_groups.php
+++ b/lang/English/admin_groups.php
@@ -38,7 +38,10 @@ $lang_admin_groups = array(
'Group settings info' => 'Below options and permissions are the default permissions for the user group. These options apply if no forum specific permissions are in effect.',
'Group title label' => 'Group title',
'User title label' => 'User title',
-'User title help' => 'This title will override any rank users in this group have attained. Leave blank to use default title or rank.',
+'User title help' => 'The rank users in this group have attained. Leave blank to use default title ("%s").',
+'Promote users label' => 'Promote users',
+'Promote users help' => 'You can promote users to a new group automatically if they reach a certain number of posts. Select "%s" to disable. For security reasons, you are not allowed to select an administrator group here. Also note that group changes for users affected by this setting may only take effect after their next post.',
+'Disable promotion' => 'Disable promoting',
'Mod privileges label' => 'Allow users moderator privileges',
'Mod privileges help' => 'In order for a user in this group to have moderator abilities, he/she must be assigned to moderate one or more forums. This is done via the user administration page of the user\'s profile.',
'Edit profile label' => 'Allow moderators to edit user profiles',
@@ -63,6 +66,8 @@ $lang_admin_groups = array(
'Delete posts help' => 'Allow users in this group to delete their own posts.',
'Delete topics label' => 'Delete topics',
'Delete topics help' => 'Allow users in this group to delete their own topics (including any replies).',
+'Post links label' => 'Post links',
+'Post links help' => 'Allow users in this group to include links in their posts. This setting also applies to signatures and the website field in users\' profiles.',
'Set own title label' => 'Set own user title',
'Set own title help' => 'Allow users in this group to set their own user title.',
'User search label' => 'Use search',
diff --git a/lang/English/admin_index.php b/lang/English/admin_index.php
index bd2cd97..4b0a5d8 100644
--- a/lang/English/admin_index.php
+++ b/lang/English/admin_index.php
@@ -18,7 +18,7 @@ $lang_admin_index = array(
'Welcome 4' => 'View IP statistics for users.',
'Welcome 5' => 'Ban users.',
'Welcome 6' => 'Censor words.',
-'Welcome 7' => 'Set up user ranks.',
+'Welcome 7' => 'Set up user groups and promotions.',
'Welcome 8' => 'Prune old posts.',
'Welcome 9' => 'Handle post reports.',
'Statistics head' => 'Statistics',
diff --git a/lang/English/admin_options.php b/lang/English/admin_options.php
index 0274bdf..0d5f211 100644
--- a/lang/English/admin_options.php
+++ b/lang/English/admin_options.php
@@ -123,8 +123,6 @@ $lang_admin_options = array(
'Censor words help' => 'Enable this to censor specific words in the board. See %s for more info.',
'Signatures label' => 'Signatures',
'Signatures help' => 'Allow users to attach a signature to their posts.',
-'User ranks label' => 'User ranks',
-'User ranks help' => 'Enable this to use user ranks. See %s for more info.',
'User has posted label' => 'User has posted earlier',
'User has posted help' => 'This feature displays a dot in front of topics in viewforum.php in case the currently logged in user has posted in that topic earlier. Disable if you are experiencing high server load.',
'Topic views label' => 'Topic views',
@@ -163,7 +161,7 @@ $lang_admin_options = array(
// Avatars section
'Avatars subhead' => 'Avatars',
'Use avatars label' => 'Use avatars',
-'Use avatars help' => 'When enabled, users will be able to upload an avatar which will be displayed under their title/rank.',
+'Use avatars help' => 'When enabled, users will be able to upload an avatar which will be displayed under their title.',
'Upload directory label' => 'Upload directory',
'Upload directory help' => 'The upload directory for avatars (relative to the FluxBB root directory). PHP must have write permissions to this directory.',
'Max width label' => 'Max width',
diff --git a/lang/English/common.php b/lang/English/common.php
index 6a0c85e..626ea95 100644
--- a/lang/English/common.php
+++ b/lang/English/common.php
@@ -59,6 +59,7 @@ $lang_common = array(
'Pages' => 'Pages:',
'Page' => 'Page %s',
'BBCode' => 'BBCode:', // You probably shouldn't change this
+'url tag' => '[url] tag:',
'img tag' => '[img] tag:',
'Smilies' => 'Smilies:',
'and' => 'and',
@@ -85,6 +86,8 @@ $lang_common = array(
'BBCode error invalid self-nesting' => '[%s] was opened within itself, this is not allowed',
'BBCode error no closing tag' => '[%1$s] was found without a matching [/%1$s]',
'BBCode error empty attribute' => '[%s] tag had an empty attribute section',
+'BBCode error tag not allowed' => 'You are not allowed to use [%s] tags',
+'BBCode error tag url not allowed' => 'You are not allowed to post links',
'BBCode code problem' => 'There is a problem with your [code] tags',
'BBCode list size error' => 'Your list was too long to parse, please make it smaller!',
diff --git a/lang/English/profile.php b/lang/English/profile.php
index 5687e35..bca8141 100644
--- a/lang/English/profile.php
+++ b/lang/English/profile.php
@@ -81,7 +81,8 @@ $lang_profile = array(
'Realname' => 'Real name',
'Location' => 'Location',
'Website' => 'Website',
-'Invalid website URL' => 'The website URL you entered is invalid.',
+'Invalid website URL' => 'The website URL you entered is invalid.',
+'Website not allowed' => 'You are not allowed to add a website to your profile yet.',
'Jabber' => 'Jabber',
'ICQ' => 'ICQ',
'MSN' => 'MSN Messenger',
diff --git a/lang/English/update.php b/lang/English/update.php
index 437e7fe..c6073e5 100644
--- a/lang/English/update.php
+++ b/lang/English/update.php
@@ -59,7 +59,6 @@ $lang_update = array(
'forums' => 'forums',
'groups' => 'groups',
'post' => 'post',
-'ranks' => 'ranks',
'report' => 'report',
'topic' => 'topic',
'user' => 'user',
diff --git a/post.php b/post.php
index a01fc1c..f2c2d65 100644
--- a/post.php
+++ b/post.php
@@ -152,7 +152,7 @@ if (isset($_POST['form_sent']))
$hide_smilies = isset($_POST['hide_smilies']) ? '1' : '0';
$subscribe = isset($_POST['subscribe']) ? '1' : '0';
$stick_topic = isset($_POST['stick_topic']) && $is_admmod ? '1' : '0';
-
+
// Replace four-byte characters (MySQL cannot handle them)
$message = strip_bad_multibyte_chars($message);
@@ -414,6 +414,14 @@ if (isset($_POST['form_sent']))
{
$db->query('UPDATE '.$db->prefix.'users SET num_posts=num_posts+1, last_post='.$now.' WHERE id='.$pun_user['id']) or error('Unable to update user', __FILE__, __LINE__, $db->error());
+ // Promote this user to a new group if enabled
+ if ($pun_user['g_promote_next_group'] != 0 && $pun_user['num_posts'] + 1 >= $pun_user['g_promote_min_posts'])
+ {
+ $new_group_id = $pun_user['g_promote_next_group'];
+ $db->query('UPDATE '.$db->prefix.'users SET group_id='.$new_group_id.' WHERE id='.$pun_user['id']) or error('Unable to promote user to new group', __FILE__, __LINE__, $db->error());
+ }
+
+ // Topic tracking stuff...
$tracked_topics = get_tracked_topics();
$tracked_topics['topics'][$new_tid] = time();
set_tracked_topics($tracked_topics);
@@ -630,6 +638,7 @@ if ($fid): ?>
<textarea name="req_message" rows="20" cols="95" tabindex="<?php echo $cur_index++ ?>"><?php echo isset($_POST['req_message']) ? pun_htmlspecialchars($orig_message) : (isset($quote) ? $quote : ''); ?></textarea><br /></label>
<ul class="bblinks">
<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+ <li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_user['g_post_links'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span>
<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo ($pun_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
</ul>
diff --git a/profile.php b/profile.php
index cd43c7e..fd02ba9 100644
--- a/profile.php
+++ b/profile.php
@@ -761,20 +761,30 @@ else if (isset($_POST['form_sent']))
case 'personal':
{
$form = array(
- 'realname' => pun_trim($_POST['form']['realname']),
- 'url' => pun_trim($_POST['form']['url']),
- 'location' => pun_trim($_POST['form']['location']),
+ 'realname' => isset($_POST['form']['realname']) ? pun_trim($_POST['form']['realname']) : '',
+ 'url' => isset($_POST['form']['url']) ? pun_trim($_POST['form']['url']) : '',
+ 'location' => isset($_POST['form']['location']) ? pun_trim($_POST['form']['location']) : '',
);
// Add http:// if the URL doesn't contain it already (while allowing https://, too)
- if ($form['url'] != '')
+ if ($pun_user['g_post_links'] == '1')
{
- $url = url_valid($form['url']);
+ if ($form['url'] != '')
+ {
+ $url = url_valid($form['url']);
- if ($url === false)
- message($lang_profile['Invalid website URL']);
+ if ($url === false)
+ message($lang_profile['Invalid website URL']);
- $form['url'] = $url['url'];
+ $form['url'] = $url['url'];
+ }
+ }
+ else
+ {
+ if (!empty($form['url']))
+ message($lang_profile['Website not allowed']);
+
+ $form['url'] = '';
}
if ($pun_user['g_id'] == PUN_ADMIN)
@@ -1427,7 +1437,8 @@ else
<label><?php echo $lang_profile['Realname'] ?><br /><input type="text" name="form[realname]" value="<?php echo pun_htmlspecialchars($user['realname']) ?>" size="40" maxlength="40" /><br /></label>
<?php if (isset($title_field)): ?> <?php echo $title_field ?>
<?php endif; ?> <label><?php echo $lang_profile['Location'] ?><br /><input type="text" name="form[location]" value="<?php echo pun_htmlspecialchars($user['location']) ?>" size="30" maxlength="30" /><br /></label>
- <label><?php echo $lang_profile['Website'] ?><br /><input type="text" name="form[url]" value="<?php echo pun_htmlspecialchars($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php if ($pun_user['g_post_links'] == '1' || $pun_user['g_id'] == PUN_ADMIN) : ?> <label><?php echo $lang_profile['Website'] ?><br /><input type="text" name="form[url]" value="<?php echo pun_htmlspecialchars($user['url']) ?>" size="50" maxlength="80" /><br /></label>
+<?php endif; ?>
</div>
</fieldset>
</div>
@@ -1532,6 +1543,7 @@ else
</div>
<ul class="bblinks">
<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo ($pun_config['p_sig_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+ <li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo ($pun_config['p_sig_bbcode'] == '1' && $pun_user['g_post_links'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span>
<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo ($pun_config['p_sig_bbcode'] == '1' && $pun_config['p_sig_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo ($pun_config['o_smilies_sig'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
</ul>
diff --git a/style/Air/base_admin.css b/style/Air/base_admin.css
index 2948b81..8a1c33f 100644
--- a/style/Air/base_admin.css
+++ b/style/Air/base_admin.css
@@ -82,7 +82,7 @@
width: 25%;
}
-#censoring .tcl, #censoring .tc2, #ranks .tcl, #ranks .tc2 {
+#censoring .tcl, #censoring .tc2 {
width: 20%;
}
diff --git a/style/Earth/base_admin.css b/style/Earth/base_admin.css
index 2948b81..8a1c33f 100644
--- a/style/Earth/base_admin.css
+++ b/style/Earth/base_admin.css
@@ -82,7 +82,7 @@
width: 25%;
}
-#censoring .tcl, #censoring .tc2, #ranks .tcl, #ranks .tc2 {
+#censoring .tcl, #censoring .tc2 {
width: 20%;
}
diff --git a/style/Fire/base_admin.css b/style/Fire/base_admin.css
index 2948b81..8a1c33f 100644
--- a/style/Fire/base_admin.css
+++ b/style/Fire/base_admin.css
@@ -82,7 +82,7 @@
width: 25%;
}
-#censoring .tcl, #censoring .tc2, #ranks .tcl, #ranks .tc2 {
+#censoring .tcl, #censoring .tc2 {
width: 20%;
}
diff --git a/style/imports/base_admin.css b/style/imports/base_admin.css
index 26a29c4..a6ef40c 100644
--- a/style/imports/base_admin.css
+++ b/style/imports/base_admin.css
@@ -27,7 +27,7 @@
/*** Particular table settings ***/
#categoryedit .tcl {WIDTH: 25%}
-#censoring .tcl, #censoring .tc2, #ranks .tcl, #ranks .tc2 {WIDTH: 20%}
+#censoring .tcl, #censoring .tc2 {WIDTH: 20%}
#edforum .tcl, #edforum .tc2 {WIDTH: 8%}
#edforum .tc2 {WIDTH: 6%}
diff --git a/viewtopic.php b/viewtopic.php
index dd47aaa..bce3757 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -504,6 +504,7 @@ else
<textarea name="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
<ul class="bblinks">
<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
+ <li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_user['g_post_links'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span>
<li><span><a href="help.php#img" onclick="window.open(this.href); return false;"><?php echo $lang_common['img tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_config['p_message_img_tag'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
<li><span><a href="help.php#smilies" onclick="window.open(this.href); return false;"><?php echo $lang_common['Smilies'] ?></a> <?php echo ($pun_config['o_smilies'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
</ul>
More information about the Xfce4-commits
mailing list