[FLASH] BBCode tag in posts',
'ALLOW_POST_FLASH_EXPLAIN' => 'If disallowed the [FLASH] BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the [FLASH] BBCode tag.',
+ 'ENABLE_QUEUE_TRIGGER' => 'Enable queued posts',
+ 'ENABLE_QUEUE_TRIGGER_EXPLAIN' => 'Ability to put registered users posts to post approval if their post count is lower than the specified value below. This setting has no effect on the permission setting for post/topic approval.',
+ 'QUEUE_TRIGGER_POSTS' => 'Maximum post count for queued posts',
+ 'QUEUE_TRIGGER_POSTS_EXPLAIN' => 'If queued posts is enabled, this is the post count the user need to reach in order to post without post approval. If the users post count is below this number, the post is stored in the queue automatically.',
+
'BUMP_INTERVAL' => 'Bump interval',
'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
'CHAR_LIMIT' => 'Maximum characters per post',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e62afdb199..de9f8695f8 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -390,6 +390,13 @@ $lang = array_merge($lang, array(
'NO_USERS' => 'The requested users do not exist.',
'NO_USER_SPECIFIED' => 'No username was specified.',
+ // Nullar/Singular/Plural language entry. The key numbers define the number range in which a certain grammatical expression is valid.
+ 'NUM_POSTS_IN_QUEUE' => array(
+ 0 => 'No posts in queue', // 0
+ 1 => '1 post in queue', // 1
+ 2 => '%d posts in queue', // 2+
+ ),
+
'OCCUPATION' => 'Occupation',
'OFFLINE' => 'Offline',
'ONLINE' => 'Online',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 5d7ab62712..c24072935a 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -129,7 +129,7 @@ switch ($mode)
$admin_memberships = group_memberships($admin_group_id, $admin_id_ary);
$admin_user_ids = array();
-
+
if (!empty($admin_memberships))
{
// ok, we only need the user ids...
@@ -527,13 +527,32 @@ switch ($mode)
unset($module);
}
+ // If the user has m_approve permission or a_user permission, then list then display unapproved posts
+ if ($auth->acl_getf_global('m_approve') || $auth->acl_get('a_user'))
+ {
+ $sql = 'SELECT COUNT(post_id) as posts_in_queue
+ FROM ' . POSTS_TABLE . '
+ WHERE poster_id = ' . $user_id . '
+ AND post_approved = 0';
+ $result = $db->sql_query($sql);
+ $member['posts_in_queue'] = (int) $db->sql_fetchfield('posts_in_queue');
+ $db->sql_freeresult($result);
+ }
+ else
+ {
+ $member['posts_in_queue'] = 0;
+ }
+
$template->assign_vars(array(
+ 'L_POSTS_IN_QUEUE' => $user->lang('NUM_POSTS_IN_QUEUE', $member['posts_in_queue']),
+
'POSTS_DAY' => sprintf($user->lang['POST_DAY'], $posts_per_day),
'POSTS_PCT' => sprintf($user->lang['POST_PCT'], $percentage),
'OCCUPATION' => (!empty($member['user_occ'])) ? censor_text($member['user_occ']) : '',
'INTERESTS' => (!empty($member['user_interests'])) ? censor_text($member['user_interests']) : '',
'SIGNATURE' => $member['user_sig'],
+ 'POSTS_IN_QUEUE'=> $member['posts_in_queue'],
'AVATAR_IMG' => $poster_avatar,
'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
@@ -553,6 +572,7 @@ switch ($mode)
'U_USER_ADMIN' => ($auth->acl_get('a_user')) ? append_sid(CONFIG_ADM_FOLDER . '/index', 'i=users&mode=overview&u=' . $user_id, true, $user->session_id) : '',
'U_USER_BAN' => ($auth->acl_get('m_ban')) ? append_sid('mcp', 'i=ban&mode=user&u=' . $user_id, true, $user->session_id) : '',
'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_id) ? append_sid('ucp', "mode=switch_perm&u={$user_id}") : '',
+ 'U_MCP_QUEUE' => ($auth->acl_getf_global('m_approve')) ? append_sid('mcp', 'i=queue', true, $user->session_id) : '',
'S_ZEBRA' => ($user->data['user_id'] != $user_id && $user->data['is_registered'] && $zebra_enabled) ? true : false,
'U_ADD_FRIEND' => (!$friend) ? append_sid('ucp', 'i=zebra&add=' . urlencode(htmlspecialchars_decode($member['username']))) : '',
@@ -1146,7 +1166,7 @@ switch ($mode)
$sql_where .= " AND ug.user_pending = 0 AND u.user_id = ug.user_id AND ug.group_id = $group_id";
$sql_where_data = " AND u.user_id = ug.user_id AND ug.group_id = $group_id";
}
-
+
// Sorting and order
if (!isset($sort_key_sql[$sort_key]))
{
@@ -1597,9 +1617,9 @@ function show_profile($data)
function _sort_last_active($first, $second)
{
global $id_cache, $sort_dir;
-
+
$lesser_than = ($sort_dir === 'a') ? -1 : 1;
-
+
if (isset($id_cache[$first]['group_leader']) && $id_cache[$first]['group_leader'] && (!isset($id_cache[$second]['group_leader']) || !$id_cache[$second]['group_leader']))
{
return 1;
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 27e465974c..973ff4c52f 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -999,10 +999,9 @@ if ($submit || $preview || $refresh)
}
$redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message);
- $post_need_approval = (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? true : false;
- // If the post need approval we will wait a lot longer.
- if ($post_need_approval)
+ // Check the permissions for post approval, as well as the queue trigger where users are put on approval with a post count lower than specified. Moderators are not affected.
+ if (($config['enable_queue_trigger'] && $user->data['user_posts'] < $config['queue_trigger_posts'] && !$auth->acl_get('m_approve', $data['forum_id'])) || !$auth->acl_get('f_noapprove', $data['forum_id']))
{
meta_refresh(10, $redirect_url);
$message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD'];
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 7df3eb6a91..23f87d6bbe 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -5,7 +5,7 @@