aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/posting.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-08-04 18:29:29 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-08-04 18:29:29 +0000
commit427cc1bf36f6a4a988b7ed53668266964a96746a (patch)
treee36dabde7f3ff420d7e8caa614e3c72023069f2d /phpBB/posting.php
parenteba921b51158152203a0d3b454a4ed6b342810d7 (diff)
downloadforums-427cc1bf36f6a4a988b7ed53668266964a96746a.tar
forums-427cc1bf36f6a4a988b7ed53668266964a96746a.tar.gz
forums-427cc1bf36f6a4a988b7ed53668266964a96746a.tar.bz2
forums-427cc1bf36f6a4a988b7ed53668266964a96746a.tar.xz
forums-427cc1bf36f6a4a988b7ed53668266964a96746a.zip
- fix time limit issue for moderators
- fixing redirection after posting git-svn-id: file:///svn/phpbb/trunk@4956 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/posting.php')
-rw-r--r--phpBB/posting.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php
index b08263a5a9..f0c3565702 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -277,7 +277,7 @@ if (($forum_status == ITEM_LOCKED || $topic_status == ITEM_LOCKED) && !$auth->ac
}
// Can we edit this post?
-if ($mode == 'edit' && !$preview && !$refresh && !$submit)
+if ($mode == 'edit' && !$preview && !$refresh && !$submit && !$auth->acl_get('m_edit', $forum_id))
{
if (!($post_time > time() - $config['edit_time'] || !$config['edit_time']))
{
@@ -1712,7 +1712,14 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
user_notification($mode, stripslashes($subject), stripslashes($data['topic_title']), stripslashes($data['forum_name']), $data['forum_id'], $data['topic_id'], $data['post_id']);
}
- $url = "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f={$data['forum_id']}&amp;t={$data['topic_id']}&amp;p={$data['post_id']}#{$data['post_id']}";
+ if ($mode == 'post')
+ {
+ $url = (!$auth->acl_get('f_moderate', $data['forum_id'])) ? "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=" . $data['forum_id'] . '&amp;t=' . $data['topic_id'] : "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=" . $data['forum_id'];
+ }
+ else
+ {
+ $url = (!$auth->acl_get('f_moderate', $data['forum_id'])) ? "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f={$data['forum_id']}&amp;t={$data['topic_id']}&amp;p={$data['post_id']}#{$data['post_id']}" : "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f={$data['forum_id']}&amp;t={$data['topic_id']}";
+ }
meta_refresh(3, $url);