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

More key changes ...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3022 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-11-09 00:47:14 +00:00
parent 9d2219b39a
commit 782482df38
3 changed files with 96 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions_posting.php
View file

@ -497,15 +497,10 @@ function generate_smilies($mode)
{ {
$template->assign_vars(array( $template->assign_vars(array(
'S_SHOW_EMOTICON_LINK' => true, 'S_SHOW_EMOTICON_LINK' => true,
'L_MORE_SMILIES' => $user->lang['More_emoticons'],
'U_MORE_SMILIES' => "posting.$phpEx$SID&mode=smilies") 'U_MORE_SMILIES' => "posting.$phpEx$SID&mode=smilies")
); );
} }
$template->assign_vars(array(
'L_EMOTICONS' => $user->lang['Emoticons'],
'L_CLOSE_WINDOW' => $user->lang['Close_window'])
);
} }
if ($mode == 'window') if ($mode == 'window')

116
phpBB/language/en/lang_main.php
View file

@ -38,8 +38,8 @@ $lang = array_merge($lang, array(
'Posts' => 'Posts', 'Posts' => 'Posts',
'Posted' => 'Posted', 'Posted' => 'Posted',
'Rating' => 'Rating', 'Rating' => 'Rating',
'Username' => 'Username', 'USERNAME' => 'Username',
'Password' => 'Password', 'PASSWORD' => 'Password',
'Email' => 'Email', 'Email' => 'Email',
'Poster' => 'Poster', 'Poster' => 'Poster',
'Author' => 'Author', 'Author' => 'Author',
@ -60,7 +60,7 @@ $lang = array_merge($lang, array(
'Jump_to' => 'Jump to', 'Jump_to' => 'Jump to',
'SUBMIT' => 'Submit', 'SUBMIT' => 'Submit',
'Reset' => 'Reset', 'Reset' => 'Reset',
'Cancel' => 'Cancel', 'CANCEL' => 'Cancel',
'PREVIEW' => 'Preview', 'PREVIEW' => 'Preview',
'Confirm' => 'Confirm', 'Confirm' => 'Confirm',
'Delete' => 'Delete', 'Delete' => 'Delete',
@ -97,12 +97,12 @@ $lang = array_merge($lang, array(
'Admin_panel' => 'Go to Administration Panel', 'Admin_panel' => 'Go to Administration Panel',
'Board_disable' => 'Sorry but this board is currently unavailable', 'Board_disable' => 'Sorry but this board is currently unavailable',
'Board_unavailable' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes', 'Board_unavailable' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes',
'ADMINISTRATORS' => 'ADMINISTRATORS', 'G_ADMINISTRATORS' => 'ADMINISTRATORS',
'SUPER_MODERATORS' => 'SUPER MODERATORS', 'G_SUPER_MODERATORS'=> 'SUPER MODERATORS',
'MODERATORS' => 'MODERATORS', 'G_MODERATORS' => 'MODERATORS',
'REGISTERED' => 'REGISTERED USERS', 'G_REGISTERED' => 'REGISTERED USERS',
'INACTIVE' => 'INACTIVE USERS', 'G_INACTIVE' => 'INACTIVE USERS',
'GUESTS' => 'GUESTS', 'G_GUESTS' => 'GUESTS',
'Registered_users' => 'Registered Users:', 'Registered_users' => 'Registered Users:',
'Browsing_forum_guest' => 'Users browsing this forum: %s and %d guest', 'Browsing_forum_guest' => 'Users browsing this forum: %s and %d guest',
'Browsing_forum_guests' => 'Users browsing this forum: %s and %d guests', 'Browsing_forum_guests' => 'Users browsing this forum: %s and %d guests',
@ -125,9 +125,9 @@ $lang = array_merge($lang, array(
'User_online_color' => '%sUser%s', 'User_online_color' => '%sUser%s',
'You_last_visit' => 'You last visited on %s', 'You_last_visit' => 'You last visited on %s',
'Current_time' => 'The time now is %s', 'Current_time' => 'The time now is %s',
'Search_new' => 'View posts since last visit', 'SEARCH_NEW' => 'View posts since last visit',
'Search_your_posts' => 'View your posts', 'SEARCH_SELF' => 'View your posts',
'Search_unanswered' => 'View unanswered posts', 'SEARCH_UNANSWERED' => 'View unanswered posts',
'Register' => 'Register', 'Register' => 'Register',
'Profile' => 'Control Panel', 'Profile' => 'Control Panel',
'Edit_profile' => 'Edit your profile', 'Edit_profile' => 'Edit your profile',
@ -138,9 +138,8 @@ $lang = array_merge($lang, array(
'Usergroups' => 'Groups', 'Usergroups' => 'Groups',
'Last_Post' => 'Last Post', 'Last_Post' => 'Last Post',
'Moderator' => 'Moderator', 'Moderator' => 'Moderator',
'Moderators' => 'Moderators', 'MODERATORS' => 'Moderators',
'VIEW_MODERATORS' => 'List forum moderators', 'VIEW_MODERATORS' => 'List forum moderators',
'Login_check_pm' => 'Login to check your private messages',
'New_pms' => '<b>%d</b> new messages', 'New_pms' => '<b>%d</b> new messages',
'New_pm' => '<b>%d</b> new message', 'New_pm' => '<b>%d</b> new message',
'No_new_pm' => 'No new messages', 'No_new_pm' => 'No new messages',
@ -167,10 +166,10 @@ $lang = array_merge($lang, array(
'New_posts_locked' => 'New posts [ Locked ]', 'New_posts_locked' => 'New posts [ Locked ]',
'Forum_is_locked' => 'Forum is locked', 'Forum_is_locked' => 'Forum is locked',
'Enter_password' => 'Please enter your username and password to login', 'Enter_password' => 'Please enter your username and password to login',
'Login' => 'Login', 'LOGIN' => 'Login',
'Logout' => 'Logout', 'LOGOUT' => 'Logout',
'Forgotten_password' => 'I forgot my password', 'Forgotten_password' => 'I forgot my password',
'Log_me_in' => 'Log me on automatically each visit', 'LOG_ME_IN' => 'Log me on automatically each visit',
'Error_login' => 'You have specified an incorrect or inactive username or an invalid password', 'Error_login' => 'You have specified an incorrect or inactive username or an invalid password',
'Index' => 'Index', 'Index' => 'Index',
'No_Posts' => 'No Posts', 'No_Posts' => 'No Posts',
@ -214,7 +213,7 @@ $lang = array_merge($lang, array(
'You_are_watching_forum' => 'You are now watching this forum', 'You_are_watching_forum' => 'You are now watching this forum',
'View_topic' => 'View topic', 'View_topic' => 'View topic',
'Guest' => 'Guest', 'Guest' => 'Guest',
'Post_subject' => 'Post subject', 'POST_SUBJECT' => 'Post subject',
'View_next_topic' => 'View next topic', 'View_next_topic' => 'View next topic',
'View_previous_topic' => 'View previous topic', 'View_previous_topic' => 'View previous topic',
'Submit_vote' => 'Submit Vote', 'Submit_vote' => 'Submit Vote',
@ -257,23 +256,24 @@ $lang = array_merge($lang, array(
'Quite_good' => 'Quite Good', 'Quite_good' => 'Quite Good',
'Very_good' => 'Very Good', 'Very_good' => 'Very Good',
'Total_votes' => 'Total Votes', 'Total_votes' => 'Total Votes',
'MESSAGE_BODY' => 'Message body', 'MESSAGE_BODY' => 'Message body',
'Message_body_explain' => 'Enter your message here, it may contain no more than <b>%d</b> characters.', 'MESSAGE_BODY_EXPLAIN' => 'Enter your message here, it may contain no more than <b>%d</b> characters.',
'Topic_review' => 'Topic review', 'Topic_review' => 'Topic review',
'Topic_icon' => 'Topic icon', 'TOPIC_ICON' => 'Topic icon',
'No_post_mode' => 'No post mode specified', 'No_post_mode' => 'No post mode specified',
'Post_a_new_topic' => 'Post a new topic', 'POST_TOPIC' => 'Post a new topic',
'Post_a_reply' => 'Post a reply', 'POST_REPLY' => 'Post a reply',
'Post_topic_as' => 'Post topic as', 'POST_TOPIC_AS' => 'Post topic as',
'Edit_Post' => 'Edit post', 'EDIT_POST' => 'Edit post',
'OPTIONS' => 'Options', 'OPTIONS' => 'Options',
'Post_Announcement' => 'Announcement', 'POST_NORMAL' => 'Normal',
'Post_Sticky' => 'Sticky', 'POST_STICKY' => 'Sticky',
'Post_Normal' => 'Normal', 'POST_ANNOUNCEMENT' => 'Announcement',
'Confirm_delete' => 'Are you sure you want to delete this post?', 'CONFIRM_DELETE' => 'Are you sure you want to delete this post?',
'Confirm_delete_poll' => 'Are you sure you want to delete this poll?', 'Confirm_delete_poll' => 'Are you sure you want to delete this poll?',
'Cannot_edit_time' => 'You can no longer edit or delete that post', 'Cannot_edit_time' => 'You can no longer edit or delete that post',
'Flood_Error' => 'You cannot make another post so soon after your last, please try again in a short while', 'FLOOD_ERROR' => 'You cannot make another post so soon after your last, please try again in a short while',
'Empty_subject' => 'You must specify a subject when posting a new topic', 'Empty_subject' => 'You must specify a subject when posting a new topic',
'To_long_subject' => 'The subject is too long it must be 60 characters or less', 'To_long_subject' => 'The subject is too long it must be 60 characters or less',
'EMPTY_MESSAGE' => 'You must enter a message when posting', 'EMPTY_MESSAGE' => 'You must enter a message when posting',
@ -302,42 +302,42 @@ $lang = array_merge($lang, array(
'Post_has_no_poll' => 'This post has no poll', 'Post_has_no_poll' => 'This post has no poll',
'Already_voted' => 'You have already voted in this poll', 'Already_voted' => 'You have already voted in this poll',
'No_vote_option' => 'You must specify an option when voting', 'No_vote_option' => 'You must specify an option when voting',
'Add_poll' => 'Add a Poll', 'ADD_POLL' => 'Add a Poll',
'Add_poll_explain' => 'If you do not want to add a poll to your topic leave the fields blank', 'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank',
'Poll_question' => 'Poll question', 'POLL_QUESTION' => 'Poll question',
'Poll_options' => 'Poll options', 'POLL_OPTIONS' => 'Poll options',
'Poll_options_explain' => 'Place each option on a new line. You may enter up to <b>%d</b> options', 'POLL_OPTIONS_EXPLAIN' => 'Place each option on a new line. You may enter up to <b>%d</b> options',
'Poll_for' => 'Run poll for', 'POLL_FOR_EXPLAIN' => '[ Enter 0 or leave blank for a never ending poll ]',
'Days' => 'Days', 'POLL_FOR' => 'Run poll for',
'Poll_for_explain' => '[ Enter 0 or leave blank for a never ending poll ]', 'DAYS' => 'Days',
'Delete_poll' => 'Delete Poll', 'POLL_DELETE' => 'Delete Poll',
'Add_attach' => 'Add an Attachment', 'ADD_ATTACHMENT' => 'Add an Attachment',
'Add_attach_explain' => 'If you wish to attach ...', 'ADD_ATTACHMENT_EXPLAIN' => 'If you wish to attach one or more files enter the details below',
'Add_file' => 'Add File', 'ADD_FILE' => 'Add File',
'Filename' => 'Filename', 'FILENAME' => 'Filename',
'File_comment' => 'File comment', 'FILE_COMMENT' => 'File comment',
'Disable_HTML_post' => 'Disable HTML in this post', 'DISABLE_HTML' => 'Disable HTML',
'Disable_BBCode_post' => 'Disable BBCode in this post', 'DISABLE_BBCODE' => 'Disable BBCode',
'Disable_Smilies_post' => 'Disable Smilies in this post', 'DISABLE_SMILIES' => 'Disable Smilies',
'Disable_magic_url' => 'Disable Magic urls', 'DISABLE_MAGIC_URL' => 'Do not automatically parse URLs',
'HTML_is_ON' => 'HTML is <u>ON</u>', 'HTML_is_ON' => 'HTML is <u>ON</u>',
'HTML_is_OFF' => 'HTML is <u>OFF</u>', 'HTML_is_OFF' => 'HTML is <u>OFF</u>',
'BBCode_is_ON' => '%sBBCode%s is <u>ON</u>', 'BBCode_is_ON' => '%sBBCode%s is <u>ON</u>',
'BBCode_is_OFF' => '%sBBCode%s is <u>OFF</u>', 'BBCode_is_OFF' => '%sBBCode%s is <u>OFF</u>',
'Smilies_are_ON' => 'Smilies are <u>ON</u>', 'Smilies_are_ON'=> 'Smilies are <u>ON</u>',
'Smilies_are_OFF' => 'Smilies are <u>OFF</u>', 'Smilies_are_OFF'=> 'Smilies are <u>OFF</u>',
'Images_are_ON' => '[img] is <u>ON</u>', 'Images_are_ON' => '[img] is <u>ON</u>',
'Images_are_OFF' => '[img] is <u>OFF</u>', 'Images_are_OFF'=> '[img] is <u>OFF</u>',
'Flash_is_ON' => '[flash] is <u>ON</u>', 'Flash_is_ON' => '[flash] is <u>ON</u>',
'Flash_is_OFF' => '[flash] is <u>ON</u>', 'Flash_is_OFF' => '[flash] is <u>ON</u>',
'ATTACH_SIG' => 'Attach signature (signatures can be changed in profile)', 'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)',
'NOTIFY_REPLY' => 'Notify me when a reply is posted', 'NOTIFY_REPLY' => 'Send me an email when a reply is posted',
'SAVE' => 'Save', 'SAVE' => 'Save',
'Stored' => 'Your message has been entered successfully', 'POST_STORED' => 'Your message has been entered successfully',
'POST_STORED_MOD' => 'Your message has been saved but requires approval',
'Deleted' => 'Your message has been deleted successfully', 'Deleted' => 'Your message has been deleted successfully',
'Poll_delete' => 'Your poll has been deleted successfully', 'Poll_delete' => 'Your poll has been deleted successfully',
'Vote_cast' => 'Your vote has been cast', 'Vote_cast' => 'Your vote has been cast',
'Topic_reply_notification' => 'Topic Reply Notification',
'BBCODE_B_HELP' => 'Bold text: [b]text[/b] (alt+b)', 'BBCODE_B_HELP' => 'Bold text: [b]text[/b] (alt+b)',
'BBCODE_I_HELP' => 'Italic text: [i]text[/i] (alt+i)', 'BBCODE_I_HELP' => 'Italic text: [i]text[/i] (alt+i)',
'BBCODE_U_HELP' => 'Underline text: [u]text[/u] (alt+u)', 'BBCODE_U_HELP' => 'Underline text: [u]text[/u] (alt+u)',
@ -350,8 +350,8 @@ $lang = array_merge($lang, array(
'BBCODE_A_HELP' => 'Close all open bbCode tags', 'BBCODE_A_HELP' => 'Close all open bbCode tags',
'BBCODE_S_HELP' => 'Font color: [color=red]text[/color] Tip: you can also use color=#FF0000', 'BBCODE_S_HELP' => 'Font color: [color=red]text[/color] Tip: you can also use color=#FF0000',
'BBCODE_F_HELP' => 'Font size: [size=x-small]small text[/size]', 'BBCODE_F_HELP' => 'Font size: [size=x-small]small text[/size]',
'Emoticons' => 'Emoticons', 'EMOTICONS' => 'Emoticons',
'More_emoticons' => 'View more Emoticons', 'MORE_EMOTICONS'=> 'View more Emoticons',
'FONT_COLOR' => 'Font color', 'FONT_COLOR' => 'Font color',
'FONT_SIZE' => 'Font size', 'FONT_SIZE' => 'Font size',
'FONT_TINY' => 'Tiny', 'FONT_TINY' => 'Tiny',
@ -361,6 +361,9 @@ $lang = array_merge($lang, array(
'FONT_HUGE' => 'Huge', 'FONT_HUGE' => 'Huge',
'CLOSE_TAGS' => 'Close Tags', 'CLOSE_TAGS' => 'Close Tags',
'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text', 'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text',
'CLOSE_WINDOW' => 'Close Window',
'Topic_reply_notification' => 'Topic Reply Notification',
'Private_Messaging' => 'Private Messaging', 'Private_Messaging' => 'Private Messaging',
'Unread_message' => 'Unread message', 'Unread_message' => 'Unread message',
'Read_message' => 'Read message', 'Read_message' => 'Read message',
@ -637,7 +640,6 @@ $lang = array_merge($lang, array(
'No_search_match' => 'No topics or posts met your search criteria', 'No_search_match' => 'No topics or posts met your search criteria',
'Found_search_match' => 'Search found %d match', 'Found_search_match' => 'Search found %d match',
'Found_search_matches' => 'Search found %d matches', 'Found_search_matches' => 'Search found %d matches',
'Close_window' => 'Close Window',
'Sorry_auth_announce' => 'Sorry but only %s can post announcements in this forum', 'Sorry_auth_announce' => 'Sorry but only %s can post announcements in this forum',
'Sorry_auth_sticky' => 'Sorry but only %s can post sticky messages in this forum', 'Sorry_auth_sticky' => 'Sorry but only %s can post sticky messages in this forum',
'Sorry_auth_read' => 'Sorry but only %s can read topics in this forum', 'Sorry_auth_read' => 'Sorry but only %s can read topics in this forum',

53
phpBB/posting.php
View file

@ -208,7 +208,7 @@ if (isset($post))
{ {
if (intval($row['last_post_time']) && ($current_time - intval($row['last_post_time'])) < intval($config['flood_interval'])) if (intval($row['last_post_time']) && ($current_time - intval($row['last_post_time'])) < intval($config['flood_interval']))
{ {
$err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $user->lang['Flood_Error']; $err_msg .= ((!empty($err_msg)) ? '<br />' : '') . $user->lang['FLOOD_ERROR'];
} }
} }
} }
@ -476,7 +476,9 @@ if (isset($post))
$template->assign_vars(array( $template->assign_vars(array(
'META' => '<meta http-equiv="refresh" content="5; url=' . "viewtopic.$phpEx$SID&amp;f=$forum_id&amp;p=$post_id#$post_id" . '">') 'META' => '<meta http-equiv="refresh" content="5; url=' . "viewtopic.$phpEx$SID&amp;f=$forum_id&amp;p=$post_id#$post_id" . '">')
); );
trigger_error($user->lang['Stored']);
$message = (!empty($forum_moderated)) ? 'POST_STORED_MOD' : 'POST_STORED';
trigger_error($user->lang[$message]);
} }
// Houston, we have an error ... // Houston, we have an error ...
@ -565,29 +567,29 @@ if ($row = $db->sql_fetchrow($result))
$topic_type_toggle = ''; $topic_type_toggle = '';
if ($mode == 'post' || $mode == 'edit') if ($mode == 'post' || $mode == 'edit')
{ {
if ($auth->acl_gets('f_sticky', 'm_sticky', 'a_', intval($forum_id))) if ($auth->acl_gets('f_sticky', 'm_', 'a_', intval($forum_id)))
{ {
$topic_type_toggle .= '<input type="radio" name="topic_type" value="' . POST_STICKY . '"'; $topic_type_toggle .= '<input type="radio" name="topic_type" value="' . POST_STICKY . '"';
if (intval($topic_type) == POST_STICKY) if (intval($topic_type) == POST_STICKY)
{ {
$topic_type_toggle .= ' checked="checked"'; $topic_type_toggle .= ' checked="checked"';
} }
$topic_type_toggle .= ' /> ' . $user->lang['Post_Sticky'] . '&nbsp;&nbsp;'; $topic_type_toggle .= ' /> ' . $user->lang['POST_STICKY'] . '&nbsp;&nbsp;';
} }
if ($auth->acl_gets('f_announce', 'm_announce', 'a_', intval($forum_id))) if ($auth->acl_gets('f_announce', 'm_', 'a_', intval($forum_id)))
{ {
$topic_type_toggle .= '<input type="radio" name="topic_type" value="' . POST_ANNOUNCE . '"'; $topic_type_toggle .= '<input type="radio" name="topic_type" value="' . POST_ANNOUNCE . '"';
if (intval($topic_type) == POST_ANNOUNCE) if (intval($topic_type) == POST_ANNOUNCE)
{ {
$topic_type_toggle .= ' checked="checked"'; $topic_type_toggle .= ' checked="checked"';
} }
$topic_type_toggle .= ' /> ' . $user->lang['Post_Announcement'] . '&nbsp;&nbsp;'; $topic_type_toggle .= ' /> ' . $user->lang['POST_ANNOUNCEMENT'] . '&nbsp;&nbsp;';
} }
if ($topic_type_toggle != '') if ($topic_type_toggle != '')
{ {
$topic_type_toggle = $user->lang['Post_topic_as'] . ': <input type="radio" name="topic_type" value="' . POST_NORMAL .'"' . ((intval($topic_type) == POST_NORMAL) ? ' checked="checked"' : '') . ' /> ' . $user->lang['Post_Normal'] . '&nbsp;&nbsp;' . $topic_type_toggle; $topic_type_toggle = $user->lang['POST_TOPIC_AS'] . ': <input type="radio" name="topic_type" value="' . POST_NORMAL .'"' . ((intval($topic_type) == POST_NORMAL) ? ' checked="checked"' : '') . ' /> ' . $user->lang['POST_NORMAL'] . '&nbsp;&nbsp;' . $topic_type_toggle;
} }
} }
@ -610,11 +612,11 @@ $s_action = "posting.$phpEx$SID&amp;mode=$mode&amp;f=" . intval($forum_id);
switch ($mode) switch ($mode)
{ {
case 'post': case 'post':
$page_title = $user->lang['Post_a_new_topic']; $page_title = $user->lang['POST_TOPIC'];
break; break;
case 'reply': case 'reply':
$page_title = $user->lang['Post_a_reply']; $page_title = $user->lang['POST_REPLY'];
$s_action .= '&amp;t=' . intval($topic_id); $s_action .= '&amp;t=' . intval($topic_id);
break; break;
@ -655,18 +657,8 @@ $template->assign_vars(array(
'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : $user->lang['None'], 'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : $user->lang['None'],
'L_POST_A' => $page_title, 'L_POST_A' => $page_title,
'L_MODERATORS' => $user->lang['Moderators'],
'L_POST_SUBJECT' => $user->lang['Post_subject'],
'L_TOPIC_ICON' => $user->lang['Topic_icon'],
'L_SUBJECT' => $user->lang['Subject'], 'L_SUBJECT' => $user->lang['Subject'],
'L_MESSAGE_BODY_EXPLAIN'=> (intval($config['max_post_chars'])) ? sprintf($user->lang['Message_body_explain'], intval($config['max_post_chars'])) : '', 'L_MESSAGE_BODY_EXPLAIN'=> (intval($config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval($config['max_post_chars'])) : '',
'L_EMOTICONS' => $user->lang['Emoticons'],
'L_CANCEL' => $user->lang['Cancel'],
'L_CONFIRM_DELETE' => $user->lang['Confirm_delete'],
'L_DISABLE_HTML' => $user->lang['Disable_HTML_post'],
'L_DISABLE_BBCODE' => $user->lang['Disable_BBCode_post'],
'L_DISABLE_SMILIES' => $user->lang['Disable_Smilies_post'],
'L_DISABLE_MAGIC_URL' => $user->lang['Disable_magic_url'],
'L_NONE' => $user->lang['None'], 'L_NONE' => $user->lang['None'],
'U_VIEW_FORUM' => "viewforum.$phpEx$SID&amp;f=" . intval($forum_id), 'U_VIEW_FORUM' => "viewforum.$phpEx$SID&amp;f=" . intval($forum_id),
@ -703,18 +695,7 @@ if ((($mode == 'post' || ($mode == 'edit' && intval($post_id) == intval($topic_f
'S_SHOW_POLL_BOX' => true, 'S_SHOW_POLL_BOX' => true,
'S_POLL_DELETE' => ($mode = 'edit' && !empty($poll_options) && ((empty($poll_last_vote) && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', intval($forum_id))) || $auth->acl_gets('m_delete', 'a_', intval($forum_id)))) ? true : false, 'S_POLL_DELETE' => ($mode = 'edit' && !empty($poll_options) && ((empty($poll_last_vote) && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', intval($forum_id))) || $auth->acl_gets('m_delete', 'a_', intval($forum_id)))) ? true : false,
'L_ADD_A_POLL' => $user->lang['Add_poll'], 'L_POLL_OPTIONS_EXPLAIN'=> sprintf($user->lang['POLL_OPTIONS_EXPLAIN'], $config['max_poll_options']),
'L_ADD_POLL_EXPLAIN' => $user->lang['Add_poll_explain'],
'L_POLL_QUESTION' => $user->lang['Poll_question'],
'L_POLL_OPTIONS' => $user->lang['Poll_options'],
'L_POLL_OPTIONS_EXPLAIN'=> sprintf($user->lang['Poll_options_explain'], $config['max_poll_options']),
'L_ADD_OPTION' => $user->lang['Add_option'],
'L_UPDATE_OPTION' => $user->lang['Update'],
'L_DELETE_OPTION' => $user->lang['Delete'],
'L_POLL_LENGTH' => $user->lang['Poll_for'],
'L_DAYS' => $user->lang['Days'],
'L_POLL_LENGTH_EXPLAIN' => $user->lang['Poll_for_explain'],
'L_POLL_DELETE' => $user->lang['Delete_poll'],
'POLL_TITLE' => $poll_title, 'POLL_TITLE' => $poll_title,
'POLL_OPTIONS' => (!empty($poll_options)) ? implode("\n", $poll_options) : '', 'POLL_OPTIONS' => (!empty($poll_options)) ? implode("\n", $poll_options) : '',
@ -726,13 +707,7 @@ if ((($mode == 'post' || ($mode == 'edit' && intval($post_id) == intval($topic_f
if ($auth->acl_gets('f_attach', 'm_edit', 'a_', $forum_id)) if ($auth->acl_gets('f_attach', 'm_edit', 'a_', $forum_id))
{ {
$template->assign_vars(array( $template->assign_vars(array(
'S_SHOW_ATTACH_BOX' => true, 'S_SHOW_ATTACH_BOX' => true,)
'L_ADD_ATTACHMENT' => $user->lang['Add_attach'],
'L_ADD_ATTACHMENT_EXPLAIN' => $user->lang['Add_attach_explain'],
'L_ADD_FILE' => $user->lang['Add_file'],
'L_FILE_NAME' => $user->lang['Filename'],
'L_FILE_COMMENT'=> $user->lang['File_comment'],)
); );
} }