diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-17 23:05:46 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-10-17 23:05:46 +0000 |
| commit | 6b2915c0a2470c012cabf490b7c95021f04ea7d8 (patch) | |
| tree | af5058508e0850a765cfcac6109116a8c810b22d | |
| parent | ad4bc2586b472f599475d317a173bf8b61561480 (diff) | |
| download | forums-6b2915c0a2470c012cabf490b7c95021f04ea7d8.tar forums-6b2915c0a2470c012cabf490b7c95021f04ea7d8.tar.gz forums-6b2915c0a2470c012cabf490b7c95021f04ea7d8.tar.bz2 forums-6b2915c0a2470c012cabf490b7c95021f04ea7d8.tar.xz forums-6b2915c0a2470c012cabf490b7c95021f04ea7d8.zip | |
Removed remaining elements of global announcements to prevent confusion
git-svn-id: file:///svn/phpbb/trunk@1235 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/posting.php | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index a6fdb1436d..84d4e2ca12 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -525,11 +525,7 @@ else if( $topic_status == TOPIC_LOCKED ) // if( isset($HTTP_POST_VARS['topictype']) ) { - if( $HTTP_POST_VARS['topictype'] == "global" ) - { - $topic_type = POST_ANNOUNCE_GLOBAL; - } - else if( $HTTP_POST_VARS['topictype'] == "announce" ) + if( $HTTP_POST_VARS['topictype'] == "announce" ) { $topic_type = POST_ANNOUNCE; } @@ -554,7 +550,7 @@ $auth_type = AUTH_ALL; switch( $mode ) { case 'newtopic': - if( $topic_type == POST_ANNOUNCE || $topic_type == POST_GLOBAL_ANNOUNCE ) + if( $topic_type == POST_ANNOUNCE ) { $is_auth_type = "auth_announce"; $auth_string = $lang['can_post_announcements']; @@ -642,11 +638,6 @@ if( !$is_auth[$is_auth_type] ) 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 // @@ -944,10 +935,6 @@ if( ( $submit || $confirm || $mode == "delete" ) && !$error ) $sql .= " WHERE forum_id = $forum_id"; -/* if( $topic_type != POST_GLOBAL_ANNOUNCE ) - { - } -*/ if($db->sql_query($sql)) { $sql = "UPDATE " . USERS_TABLE . " @@ -2254,16 +2241,6 @@ if( $mode == 'newtopic' || ( $mode == 'editpost' && $is_first_post_topic ) ) { $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'] . ' '; - } - if( $is_auth['auth_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 .= ' /> ' . $lang['Post_Normal'] . ' ' . $sticky_toggle . $announce_toggle . $global_announce_toggle; + $topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . ' ' . $sticky_toggle . $announce_toggle; } } |