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

Removed remaining elements of global announcements to prevent confusion

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1235 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-10-17 23:05:46 +00:00
parent ad4bc2586b
commit 6b2915c0a2
1 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
phpBB/posting.php
View file

@ -525,11 +525,7 @@ else if( $topic_status == TOPIC_LOCKED )
// //
if( isset($HTTP_POST_VARS['topictype']) ) if( isset($HTTP_POST_VARS['topictype']) )
{ {
if( $HTTP_POST_VARS['topictype'] == "global" ) if( $HTTP_POST_VARS['topictype'] == "announce" )
{
$topic_type = POST_ANNOUNCE_GLOBAL;
}
else if( $HTTP_POST_VARS['topictype'] == "announce" )
{ {
$topic_type = POST_ANNOUNCE; $topic_type = POST_ANNOUNCE;
} }
@ -554,7 +550,7 @@ $auth_type = AUTH_ALL;
switch( $mode ) switch( $mode )
{ {
case 'newtopic': case 'newtopic':
if( $topic_type == POST_ANNOUNCE || $topic_type == POST_GLOBAL_ANNOUNCE ) if( $topic_type == POST_ANNOUNCE )
{ {
$is_auth_type = "auth_announce"; $is_auth_type = "auth_announce";
$auth_string = $lang['can_post_announcements']; $auth_string = $lang['can_post_announcements'];
@ -642,11 +638,6 @@ 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
// //
@ -944,10 +935,6 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error )
$sql .= " WHERE forum_id = $forum_id"; $sql .= " WHERE forum_id = $forum_id";
/* if( $topic_type != POST_GLOBAL_ANNOUNCE )
{
}
*/
if($db->sql_query($sql)) if($db->sql_query($sql))
{ {
$sql = "UPDATE " . USERS_TABLE . " $sql = "UPDATE " . USERS_TABLE . "
@ -2254,16 +2241,6 @@ 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="global"';
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"';
@ -2291,7 +2268,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 . $global_announce_toggle; $topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle;
} }
} }