makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Forum locking now implemented + some updates for future functionality

Browse source 
git-svn-id: file:///svn/phpbb/trunk@746 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-07-24 17:51:21 +00:00
parent 28aaa8f6b0
commit cfa724410a
2 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
phpBB/posting.php
View file

@ -103,18 +103,20 @@ if( $mode != "newtopic" )
{ {
if($mode == "reply" && !empty($topic_id) ) if($mode == "reply" && !empty($topic_id) )
{ {
$sql = "SELECT forum_id, topic_status $sql = "SELECT f.forum_id, f.forum_status, t.topic_status
FROM " . TOPICS_TABLE . " t FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t
WHERE topic_id = $topic_id"; WHERE t.topic_id = $topic_id
AND f.forum_id = t.forum_id";
$msg = $lang['No_topic_id']; $msg = $lang['No_topic_id'];
} }
else if( !empty($post_id) ) else if( !empty($post_id) )
{ {
$sql = "SELECT t.topic_id, t.forum_id, t.topic_status $sql = "SELECT f.forum_id, f.forum_status, t.topic_id, t.topic_status
FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
WHERE p.post_id = $post_id WHERE p.post_id = $post_id
AND t.topic_id = p.topic_id"; AND t.topic_id = p.topic_id
AND f.forum_id = t.forum_id";
$msg = $lang['No_post_id']; $msg = $lang['No_post_id'];
} }
@ -127,7 +129,7 @@ if( $mode != "newtopic" )
{ {
if( isset($post_id) ) if( isset($post_id) )
{ {
$sql = "SELECT p.post_id, t.forum_id, t.topic_status, t.topic_last_post_id, f.forum_last_post_id $sql = "SELECT p.post_id, t.forum_id, t.topic_status, t.topic_last_post_id, f.forum_last_post_id, f.forum_status
FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id WHERE t.topic_id = $topic_id
AND p.topic_id = t.topic_id AND p.topic_id = t.topic_id
@ -151,6 +153,7 @@ if( $mode != "newtopic" )
$forum_id = $check_row['forum_id']; $forum_id = $check_row['forum_id'];
$topic_status = $check_row['topic_status']; $topic_status = $check_row['topic_status'];
$forum_status = $check_row['forum_status'];
if( $mode == "editpost" ) if( $mode == "editpost" )
{ {
@ -171,20 +174,37 @@ if( $mode != "newtopic" )
} }
else else
{ {
message_die(GENERAL_ERROR, $lang['No_such_post'], "", __LINE__, __FILE__, $sql); message_die(GENERAL_MESSAGE, $lang['No_such_post']);
} }
} }
else else
{ {
$is_first_post = TRUE; $sql = "SELECT forum_status
$is_last_post = FALSE; FROM " . FORUMS_TABLE . " f
$topic_status = TOPIC_UNLOCKED; WHERE forum_id = $forum_id";
if($result = $db->sql_query($sql))
{
$check_row = $db->sql_fetchrow($result);
$is_first_post = TRUE;
$is_last_post = FALSE;
$topic_status = TOPIC_UNLOCKED;
$forum_status = $check_row['forum_status'];
}
else
{
message_die(GENERAL_MESSAGE, $lang['Forum_not_exist']);
}
} }
// //
// Is topic locked? // Is topic locked?
// //
if($topic_status == TOPIC_LOCKED) if($forum_status == FORUM_LOCKED)
{
message_die(GENERAL_MESSAGE, $lang['Forum_locked']);
}
else if($topic_status == TOPIC_LOCKED)
{ {
message_die(GENERAL_MESSAGE, $lang['Topic_locked']); message_die(GENERAL_MESSAGE, $lang['Topic_locked']);
} }
@ -487,7 +507,7 @@ if( ($mode == "newtopic" || $mode == "reply") && $topic_status == TOPIC_UNLOCKED
if($db->sql_query($sql, END_TRANSACTION)) if($db->sql_query($sql, END_TRANSACTION))
{ {
setcookie('phpbb2_' . $forum_id . '_' . $new_topic_id, '', 0, $cookiepath, $cookiedomain, $cookiesecure); setcookie('phpbb2_' . $forum_id . '_' . $new_topic_id, '', time() - 1, $cookiepath, $cookiedomain, $cookiesecure);
// //
// If we get here the post has been inserted successfully. // If we get here the post has been inserted successfully.
// //
@ -998,9 +1018,8 @@ if($preview && !$error)
break; break;
} }
$preview_message = $message;
$bbcode_uid = make_bbcode_uid(); $bbcode_uid = make_bbcode_uid();
$preview_message = prepare_message($preview_message, TRUE, TRUE, TRUE, $bbcode_uid); $preview_message = prepare_message($message, TRUE, TRUE, TRUE, $bbcode_uid);
$preview_message = bbencode_second_pass($preview_message, $bbcode_uid); $preview_message = bbencode_second_pass($preview_message, $bbcode_uid);
$preview_message = make_clickable($preview_message); $preview_message = make_clickable($preview_message);

15
phpBB/templates/PSO/PSO.cfg
View file

@ -13,6 +13,8 @@ define(TEMPLATE_CONFIG, TRUE);
// by the template // by the template
// //
$smilies_url = "images/smiles";
$images['icon_quote'] = "images/icon_quote.gif"; $images['icon_quote'] = "images/icon_quote.gif";
$images['icon_edit'] = "images/icon_edit.gif"; $images['icon_edit'] = "images/icon_edit.gif";
$images['icon_search'] = "images/icon_search.gif"; $images['icon_search'] = "images/icon_search.gif";
@ -37,8 +39,15 @@ $images['folder_sticky_new'] = "images/folder_sticky_new.gif";
$images['folder_announce'] = "images/folder_announce.gif"; $images['folder_announce'] = "images/folder_announce.gif";
$images['folder_announce_new'] = "images/folder_announce_new.gif"; $images['folder_announce_new'] = "images/folder_announce_new.gif";
$images['topic_new'] = "templates/PSO/images/post.gif"; $images['post_new'] = "templates/PSO/images/post.gif";
$images['topic_reply'] = "templates/PSO/images/reply.gif"; $images['post_locked'] = "templates/PSO/images/post-locked.gif";
$images['topic_locked'] = "templates/PSO/images/reply-locked.gif"; $images['reply_new'] = "templates/PSO/images/reply.gif";
$images['reply_locked'] = "templates/PSO/images/reply-locked.gif";
//
// Default theme to use (can be blank if
// themes aren't supported by this template)
//
$template_default_theme = "PSO-Default";
?> ?>