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

Fix a few things left over from old global announce stuff

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1227 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-10-16 16:23:33 +00:00
parent 274d8472b1
commit 36936afdb2
3 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/lang_english/lang_main.php
View file

@ -284,6 +284,7 @@ $lang['Post_a_reply'] = "Post a reply";
$lang['Post_topic_as'] = "Post topic as"; $lang['Post_topic_as'] = "Post topic as";
$lang['Edit_Post'] = "Edit post"; $lang['Edit_Post'] = "Edit post";
$lang['Post_Normal'] = "Normal"; $lang['Post_Normal'] = "Normal";
$lang['Post_Global_Announcement'] = "Global Announcement";
$lang['Post_Announcement'] = "Announcement"; $lang['Post_Announcement'] = "Announcement";
$lang['Post_Sticky'] = "Sticky"; $lang['Post_Sticky'] = "Sticky";
$lang['Options'] = "Options"; $lang['Options'] = "Options";

44
phpBB/posting.php
View file

@ -525,11 +525,15 @@ else if( $topic_status == TOPIC_LOCKED )
// //
if( isset($HTTP_POST_VARS['topictype']) ) if( isset($HTTP_POST_VARS['topictype']) )
{ {
if($HTTP_POST_VARS['topictype'] == "announce") if( $HTTP_POST_VARS['topictype'] == "global" )
{
$topic_type = POST_ANNOUNCE_GLOBAL;
}
else if( $HTTP_POST_VARS['topictype'] == "announce" )
{ {
$topic_type = POST_ANNOUNCE; $topic_type = POST_ANNOUNCE;
} }
else if($HTTP_POST_VARS['topictype'] == "sticky") else if( $HTTP_POST_VARS['topictype'] == "sticky" )
{ {
$topic_type = POST_STICKY; $topic_type = POST_STICKY;
} }
@ -550,7 +554,7 @@ $auth_type = AUTH_ALL;
switch( $mode ) switch( $mode )
{ {
case 'newtopic': case 'newtopic':
if( $topic_type == POST_ANNOUNCE ) if( $topic_type == POST_ANNOUNCE || $topic_type == POST_GLOBAL_ANNOUNCE )
{ {
$is_auth_type = "auth_announce"; $is_auth_type = "auth_announce";
$auth_string = $lang['can_post_announcements']; $auth_string = $lang['can_post_announcements'];
@ -638,6 +642,11 @@ if( !$is_auth[$is_auth_type] )
message_die(GENERAL_MESSAGE, $message); message_die(GENERAL_MESSAGE, $message);
} }
else if( $topic_type == POST_GLOBAL_ANNOUNCE && $userdata['user_level'] != ADMIN )
{
$message = $lang['Sorry_auth'] . $lang['Administrators'] . $auth_string . $lang['this_forum'];
message_die(GENERAL_MESSAGE, $message);
}
// //
// End Auth // End Auth
// //
@ -933,22 +942,11 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error )
$sql .= ", forum_topics = forum_topics + 1"; $sql .= ", forum_topics = forum_topics + 1";
} }
$sqlquery = "SELECT topic_type FROM " . TOPICS_TABLE . " /* if( $topic_type != POST_GLOBAL_ANNOUNCE )
WHERE topic_id = $topic_id";
if($result = $db->sql_query($sqlquery))
{ {
$topic_row = $db->sql_fetchrow($result); $sql .= " WHERE forum_id = $forum_id";
$topic_type = intval($topic_row['topic_type']);
} }
else */
{
message_die(GENERAL_ERROR, "Could not query topics table.", __LINE__, __FILE__, $sqlquery, "");
}
if($topic_type != POST_ANNOUNCE)
{
$sql .= " WHERE forum_id = $forum_id";
}
if($db->sql_query($sql)) if($db->sql_query($sql))
{ {
$sql = "UPDATE " . USERS_TABLE . " $sql = "UPDATE " . USERS_TABLE . "
@ -2255,6 +2253,16 @@ if( $mode == 'newtopic' || ( $mode == 'editpost' && $is_first_post_topic ) )
{ {
$template->assign_block_vars("type_toggle", array()); $template->assign_block_vars("type_toggle", array());
if( $userdata['user_level'] == ADMIN )
{
$global_announce_toggle = '<input type="radio" name="topictype" value="announce"';
if( $topic_type == POST_GLOBAL_ANNOUNCE )
{
$global_announce_toggle .= ' checked="checked"';
}
$global_announce_toggle .= ' /> ' . $lang['Post_Global_Announcement'] . '&nbsp;&nbsp;';
}
if( $is_auth['auth_announce'] ) if( $is_auth['auth_announce'] )
{ {
$announce_toggle = '<input type="radio" name="topictype" value="announce"'; $announce_toggle = '<input type="radio" name="topictype" value="announce"';
@ -2282,7 +2290,7 @@ if( $mode == 'newtopic' || ( $mode == 'editpost' && $is_first_post_topic ) )
{ {
$topic_type_toggle .= ' checked="checked"'; $topic_type_toggle .= ' checked="checked"';
} }
$topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle; $topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle . $global_announce_toggle;
} }
} }