| Zeile 14 | Zeile 14 |
|---|
$templatelist = "newthread,previewpost,loginbox,changeuserbox,newthread_postpoll,posticons,codebuttons,postbit,post_attachments_attachment_unapproved,newreply_modoptions_close,newreply_modoptions_stick";
$templatelist .= ",newthread_disablesmilies,post_attachments_new,post_attachments,post_savedraftbutton,post_subscription_method,post_attachments_attachment_remove,postbit_warninglevel_formatted,postbit_icon";
$templatelist .= ",forumdisplay_rules,forumdisplay_rules_link,post_attachments_attachment_postinsert,post_attachments_attachment,newthread_signature,post_prefixselect_prefix,post_prefixselect_single,posticons_icon";
|
$templatelist = "newthread,previewpost,loginbox,changeuserbox,newthread_postpoll,posticons,codebuttons,postbit,post_attachments_attachment_unapproved,newreply_modoptions_close,newreply_modoptions_stick";
$templatelist .= ",newthread_disablesmilies,post_attachments_new,post_attachments,post_savedraftbutton,post_subscription_method,post_attachments_attachment_remove,postbit_warninglevel_formatted,postbit_icon";
$templatelist .= ",forumdisplay_rules,forumdisplay_rules_link,post_attachments_attachment_postinsert,post_attachments_attachment,newthread_signature,post_prefixselect_prefix,post_prefixselect_single,posticons_icon";
|
$templatelist .= ",post_captcha_hidden,post_captcha_recaptcha,post_captcha_recaptcha_invisible,post_captcha_nocaptcha,postbit_gotopost,newthread_postoptions,post_attachments_add";
| $templatelist .= ",post_captcha_hidden,post_captcha_recaptcha_invisible,post_captcha_nocaptcha,post_javascript,postbit_gotopost,newthread_postoptions,post_attachments_add,post_attachments_viewlink";
|
$templatelist .= ",postbit_avatar,postbit_find,postbit_pm,postbit_rep_button,postbit_www,postbit_email,postbit_reputation,postbit_warn,postbit_warninglevel,postbit_author_user,postbit_author_guest,post_captcha";
$templatelist .= ",postbit_signature,postbit_classic,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved";
$templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_attachments,postbit_reputation_formatted_link,post_attachments_update,postbit_offline,newreply_modoptions,newthread_multiquote_external";
| $templatelist .= ",postbit_avatar,postbit_find,postbit_pm,postbit_rep_button,postbit_www,postbit_email,postbit_reputation,postbit_warn,postbit_warninglevel,postbit_author_user,postbit_author_guest,post_captcha";
$templatelist .= ",postbit_signature,postbit_classic,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved";
$templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_attachments,postbit_reputation_formatted_link,post_attachments_update,postbit_offline,newreply_modoptions,newthread_multiquote_external";
|
| Zeile 150 | Zeile 150 |
|---|
if((empty($_POST) && empty($_FILES)) && $mybb->get_input('processed', MyBB::INPUT_INT) == 1)
{
|
if((empty($_POST) && empty($_FILES)) && $mybb->get_input('processed', MyBB::INPUT_INT) == 1)
{
|
error($lang->error_cannot_upload_php_post);
| error($lang->error_empty_post_input);
|
}
$errors = array();
| }
$errors = array();
|
| Zeile 171 | Zeile 171 |
|---|
$attachwhere = "posthash='".$db->escape_string($mybb->get_input('posthash'))."'";
}
|
$attachwhere = "posthash='".$db->escape_string($mybb->get_input('posthash'))."'";
}
|
// If there's an attachment, check it and upload it
if($forumpermissions['canpostattachments'] != 0)
{
if(!empty($_FILES['attachment']['name']) && !empty($_FILES['attachment']['type']))
{
if($_FILES['attachment']['size'] > 0)
{
$query = $db->simple_select("attachments", "aid", "filename='".$db->escape_string($_FILES['attachment']['name'])."' AND {$attachwhere}");
$updateattach = $db->fetch_field($query, "aid");
require_once MYBB_ROOT."inc/functions_upload.php";
| require_once MYBB_ROOT."inc/functions_upload.php";
$ret = add_attachments($pid, $forumpermissions, $attachwhere, "newthread");
|
|
|
$update_attachment = false;
if($updateattach > 0 && $mybb->get_input('updateattachment'))
{
$update_attachment = true;
}
$attachedfile = upload_attachment($_FILES['attachment'], $update_attachment);
}
else
{
$errors[] = $lang->error_uploadempty;
$mybb->input['action'] = "newthread";
}
}
}
// Error with attachments - should use new inline errors?
if(!empty($attachedfile['error']))
| if(!empty($ret['errors']))
|
{
|
{
|
$errors[] = $attachedfile['error'];
$mybb->input['action'] = "newthread";
| $errors = $ret['errors'];
|
}
// If we were dealing with an attachment but didn't click 'Post Thread', force the new thread page again.
if(!$mybb->get_input('submit'))
{
|
}
// If we were dealing with an attachment but didn't click 'Post Thread', force the new thread page again.
if(!$mybb->get_input('submit'))
{
|
//$editdraftpid = "<input type=\"hidden\" name=\"pid\" value=\"$pid\" />";
| |
$mybb->input['action'] = "newthread";
}
}
| $mybb->input['action'] = "newthread";
}
}
|
| Zeile 315 | Zeile 289 |
|---|
$user_check = "p.ipaddress=".$db->escape_binary($session->packedip);
}
if(!$mybb->get_input('savedraft') && !$pid)
|
$user_check = "p.ipaddress=".$db->escape_binary($session->packedip);
}
if(!$mybb->get_input('savedraft') && !$pid)
|
{
| {
|
$query = $db->simple_select("posts p", "p.pid", "$user_check AND p.fid='{$forum['fid']}' AND p.subject='".$db->escape_string($mybb->get_input('subject'))."' AND p.message='".$db->escape_string($mybb->get_input('message'))."' AND p.dateline>".(TIME_NOW-600));
$duplicate_check = $db->fetch_field($query, "pid");
if($duplicate_check)
| $query = $db->simple_select("posts p", "p.pid", "$user_check AND p.fid='{$forum['fid']}' AND p.subject='".$db->escape_string($mybb->get_input('subject'))."' AND p.message='".$db->escape_string($mybb->get_input('message'))."' AND p.dateline>".(TIME_NOW-600));
$duplicate_check = $db->fetch_field($query, "pid");
if($duplicate_check)
|
| Zeile 545 | Zeile 519 |
|---|
if($unviewable_forums)
{
$unviewable_forums = "AND t.fid NOT IN ({$unviewable_forums})";
|
if($unviewable_forums)
{
$unviewable_forums = "AND t.fid NOT IN ({$unviewable_forums})";
|
}
| }
|
if($inactiveforums)
{
$inactiveforums = "AND t.fid NOT IN ({$inactiveforums})";
| if($inactiveforums)
{
$inactiveforums = "AND t.fid NOT IN ({$inactiveforums})";
|
| Zeile 574 | Zeile 548 |
|---|
if(!empty($onlyusfids))
{
$onlyusforums = "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))";
|
if(!empty($onlyusfids))
{
$onlyusforums = "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))";
|
}
| }
|
if($mybb->get_input('load_all_quotes', MyBB::INPUT_INT) == 1)
{
|
if($mybb->get_input('load_all_quotes', MyBB::INPUT_INT) == 1)
{
|
| Zeile 589 | Zeile 563 |
|---|
while($quoted_post = $db->fetch_array($query))
{
if($quoted_post['userusername'])
|
while($quoted_post = $db->fetch_array($query))
{
if($quoted_post['userusername'])
|
{
| {
|
$quoted_post['username'] = $quoted_post['userusername'];
}
$quoted_post['message'] = preg_replace('#(^|\r|\n)/me ([^\r\n<]*)#i', "\\1* {$quoted_post['username']} \\2", $quoted_post['message']);
| $quoted_post['username'] = $quoted_post['userusername'];
}
$quoted_post['message'] = preg_replace('#(^|\r|\n)/me ([^\r\n<]*)#i', "\\1* {$quoted_post['username']} \\2", $quoted_post['message']);
|
| Zeile 617 | Zeile 591 |
|---|
$multiquote_text = $lang->multiquote_external_one;
$multiquote_deselect = $lang->multiquote_external_one_deselect;
$multiquote_quote = $lang->multiquote_external_one_quote;
|
$multiquote_text = $lang->multiquote_external_one;
$multiquote_deselect = $lang->multiquote_external_one_deselect;
$multiquote_quote = $lang->multiquote_external_one_quote;
|
}
| }
|
else
{
$multiquote_text = $lang->sprintf($lang->multiquote_external, $external_quotes);
| else
{
$multiquote_text = $lang->sprintf($lang->multiquote_external, $external_quotes);
|
| Zeile 636 | Zeile 610 |
|---|
}
$postoptionschecked = array('signature' => '', 'disablesmilies' => '');
|
}
$postoptionschecked = array('signature' => '', 'disablesmilies' => '');
|
$postoptions_subscriptionmethod_dont = $postoptions_subscriptionmethod_none = $postoptions_subscriptionmethod_email = $postoptions_subscriptionmethod_pm = '';
| $subscribe = $nonesubscribe = $emailsubscribe = $pmsubscribe = '';
|
$postpollchecked = '';
// Check the various post options if we're
| $postpollchecked = '';
// Check the various post options if we're
|
| Zeile 652 | Zeile 626 |
|---|
{
$postoptionschecked['signature'] = " checked=\"checked\"";
}
|
{
$postoptionschecked['signature'] = " checked=\"checked\"";
}
|
if(isset($postoptions['subscriptionmethod']) && $postoptions['subscriptionmethod'] == "none")
{
$postoptions_subscriptionmethod_none = "checked=\"checked\"";
}
else if(isset($postoptions['subscriptionmethod']) && $postoptions['subscriptionmethod'] == "email")
{
$postoptions_subscriptionmethod_email = "checked=\"checked\"";
}
else if(isset($postoptions['subscriptionmethod']) && $postoptions['subscriptionmethod'] == "pm")
{
$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else
{
$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
if(isset($postoptions['disablesmilies']) && $postoptions['disablesmilies'] == 1)
| if(isset($postoptions['disablesmilies']) && $postoptions['disablesmilies'] == 1)
|
{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
|
{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
|
}
| }
|
if($mybb->get_input('postpoll', MyBB::INPUT_INT) == 1)
{
$postpollchecked = "checked=\"checked\"";
}
|
if($mybb->get_input('postpoll', MyBB::INPUT_INT) == 1)
{
$postpollchecked = "checked=\"checked\"";
}
|
| | $subscription_method = get_subscription_method($tid, $postoptions);
|
$numpolloptions = $mybb->get_input('numpolloptions', MyBB::INPUT_INT);
|
$numpolloptions = $mybb->get_input('numpolloptions', MyBB::INPUT_INT);
|
}
| }
|
// Editing a draft thread
else if($mybb->input['action'] == "editdraft" && $mybb->user['uid'])
|
// Editing a draft thread
else if($mybb->input['action'] == "editdraft" && $mybb->user['uid'])
|
{
| {
|
$mybb->input['threadprefix'] = $thread['prefix'];
$message = htmlspecialchars_uni($post['message']);
$subject = htmlspecialchars_uni($post['subject']);
if($post['includesig'] != 0)
|
$mybb->input['threadprefix'] = $thread['prefix'];
$message = htmlspecialchars_uni($post['message']);
$subject = htmlspecialchars_uni($post['subject']);
if($post['includesig'] != 0)
|
{
$postoptionschecked['signature'] = " checked=\"checked\"";
}
| {
$postoptionschecked['signature'] = " checked=\"checked\"";
}
|
if($post['smilieoff'] == 1)
{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
}
$icon = $post['icon'];
if($forum['allowpicons'] != 0)
|
if($post['smilieoff'] == 1)
{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
}
$icon = $post['icon'];
if($forum['allowpicons'] != 0)
|
{
| {
|
$posticons = get_post_icons();
}
|
$posticons = get_post_icons();
}
|
if($postoptions['subscriptionmethod'] == "none")
{
$postoptions_subscriptionmethod_none = "checked=\"checked\"";
}
else if($postoptions['subscriptionmethod'] == "email")
{
$postoptions_subscriptionmethod_email = "checked=\"checked\"";
}
else if($postoptions['subscriptionmethod'] == "pm")
{
$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else
{
$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
| $subscription_method = get_subscription_method($tid); // Subscription method doesn't get saved in drafts
|
}
// Otherwise, this is our initial visit to this page.
| }
// Otherwise, this is our initial visit to this page.
|
| Zeile 723 | Zeile 667 |
|---|
{
$postoptionschecked['signature'] = " checked=\"checked\"";
}
|
{
$postoptionschecked['signature'] = " checked=\"checked\"";
}
|
if($mybb->user['subscriptionmethod'] == 1)
{
$postoptions_subscriptionmethod_none = "checked=\"checked\"";
}
else if($mybb->user['subscriptionmethod'] == 2)
{
$postoptions_subscriptionmethod_email = "checked=\"checked\"";
}
else if($mybb->user['subscriptionmethod'] == 3)
{
$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else
{
$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
| $subscription_method = get_subscription_method($tid); // Fresh thread, let the function set the appropriate method
|
$numpolloptions = "2";
}
|
$numpolloptions = "2";
}
|
| | ${$subscription_method.'subscribe'} = "checked=\"checked\" ";
|
$preview = '';
// If we're previewing a post then generate the preview.
| $preview = '';
// If we're previewing a post then generate the preview.
|
| Zeile 940 | Zeile 870 |
|---|
else
{
$stickycheck = '';
|
else
{
$stickycheck = '';
|
}
| }
|
$closeoption = '';
if(is_moderator($thread['fid'], "canopenclosethreads"))
|
$closeoption = '';
if(is_moderator($thread['fid'], "canopenclosethreads"))
|
{
| {
|
eval("\$closeoption = \"".$templates->get("newreply_modoptions_close")."\";");
}
$stickoption = '';
if(is_moderator($thread['fid'], "canstickunstickthreads"))
|
eval("\$closeoption = \"".$templates->get("newreply_modoptions_close")."\";");
}
$stickoption = '';
if(is_moderator($thread['fid'], "canstickunstickthreads"))
|
{
| {
|
eval("\$stickoption = \"".$templates->get("newreply_modoptions_stick")."\";");
|
eval("\$stickoption = \"".$templates->get("newreply_modoptions_stick")."\";");
|
}
| }
|
if(!empty($closeoption) || !empty($stickoption))
|
if(!empty($closeoption) || !empty($stickoption))
|
{
| {
|
eval("\$modoptions = \"".$templates->get("newreply_modoptions")."\";");
$bgcolor = "trow1";
$bgcolor2 = "trow2";
|
eval("\$modoptions = \"".$templates->get("newreply_modoptions")."\";");
$bgcolor = "trow1";
$bgcolor2 = "trow2";
|
}
else
{
| }
else
{
|
$bgcolor = "trow2";
$bgcolor2 = "trow1";
}
|
$bgcolor = "trow2";
$bgcolor2 = "trow1";
}
|
}
| }
|
else
{
$bgcolor = "trow2";
$bgcolor2 = "trow1";
}
|
else
{
$bgcolor = "trow2";
$bgcolor2 = "trow1";
}
|
|
|
// Fetch subscription select box
eval("\$subscriptionmethod = \"".$templates->get("post_subscription_method")."\";");
| // Fetch subscription select box
eval("\$subscriptionmethod = \"".$templates->get("post_subscription_method")."\";");
|
| Zeile 981 | Zeile 911 |
|---|
if($mybb->input['action'] == "editdraft" || ($mybb->input['tid'] && $mybb->input['pid']))
{
$attachwhere = "pid='$pid'";
|
if($mybb->input['action'] == "editdraft" || ($mybb->input['tid'] && $mybb->input['pid']))
{
$attachwhere = "pid='$pid'";
|
}
else
| }
else
|
{
$attachwhere = "posthash='".$db->escape_string($posthash)."'";
}
| {
$attachwhere = "posthash='".$db->escape_string($posthash)."'";
}
|
| Zeile 993 | Zeile 923 |
|---|
$attachment['size'] = get_friendly_size($attachment['filesize']);
$attachment['icon'] = get_attachment_icon(get_extension($attachment['filename']));
$attachment['filename'] = htmlspecialchars_uni($attachment['filename']);
|
$attachment['size'] = get_friendly_size($attachment['filesize']);
$attachment['icon'] = get_attachment_icon(get_extension($attachment['filename']));
$attachment['filename'] = htmlspecialchars_uni($attachment['filename']);
|
|
|
if($mybb->settings['bbcodeinserter'] != 0 && $forum['allowmycode'] != 0 && (!$mybb->user['uid'] || $mybb->user['showcodebuttons'] != 0))
{
eval("\$postinsert = \"".$templates->get("post_attachments_attachment_postinsert")."\";");
}
|
if($mybb->settings['bbcodeinserter'] != 0 && $forum['allowmycode'] != 0 && (!$mybb->user['uid'] || $mybb->user['showcodebuttons'] != 0))
{
eval("\$postinsert = \"".$templates->get("post_attachments_attachment_postinsert")."\";");
}
|
|
|
eval("\$attach_rem_options = \"".$templates->get("post_attachments_attachment_remove")."\";");
$attach_mod_options = '';
if($attachment['visible'] != 1)
|
eval("\$attach_rem_options = \"".$templates->get("post_attachments_attachment_remove")."\";");
$attach_mod_options = '';
if($attachment['visible'] != 1)
|
{
| {
|
eval("\$attachments .= \"".$templates->get("post_attachments_attachment_unapproved")."\";");
}
else
| eval("\$attachments .= \"".$templates->get("post_attachments_attachment_unapproved")."\";");
}
else
|
| Zeile 1026 | Zeile 956 |
|---|
{
$friendlyquota = get_friendly_size($mybb->usergroup['attachquota']*1024);
}
|
{
$friendlyquota = get_friendly_size($mybb->usergroup['attachquota']*1024);
}
|
$friendlyusage = get_friendly_size($usage['ausage']);
$lang->attach_quota = $lang->sprintf($lang->attach_quota, $friendlyusage, $friendlyquota);
| $lang->attach_quota = $lang->sprintf($lang->attach_quota, $friendlyquota);
if($usage['ausage'] !== NULL)
{
$friendlyusage = get_friendly_size($usage['ausage']);
$lang->attach_usage = $lang->sprintf($lang->attach_usage, $friendlyusage);
eval("\$link_viewattachments = \"".$templates->get("post_attachments_viewlink")."\";");
}
else
{
$lang->attach_usage = "";
}
|
if($mybb->settings['maxattachments'] == 0 || ($mybb->settings['maxattachments'] != 0 && $attachcount < $mybb->settings['maxattachments']) && !isset($noshowattach))
{
eval("\$attach_add_options = \"".$templates->get("post_attachments_add")."\";");
| if($mybb->settings['maxattachments'] == 0 || ($mybb->settings['maxattachments'] != 0 && $attachcount < $mybb->settings['maxattachments']) && !isset($noshowattach))
{
eval("\$attach_add_options = \"".$templates->get("post_attachments_add")."\";");
|
| Zeile 1080 | Zeile 1021 |
|---|
{
$post_captcha->build_captcha();
}
|
{
$post_captcha->build_captcha();
}
|
elseif(in_array($post_captcha->type, array(2, 4, 5)))
| elseif(in_array($post_captcha->type, array(4, 5)))
|
{
$post_captcha->build_recaptcha();
}
|
{
$post_captcha->build_recaptcha();
}
|
if($post_captcha->html)
{
$captcha = $post_captcha->html;
}
}
else if($correct && (in_array($post_captcha->type, array(2, 4, 5))))
| }
else if($correct && (in_array($post_captcha->type, array(4, 5))))
|
{
$post_captcha->build_recaptcha();
|
{
$post_captcha->build_recaptcha();
|
if($post_captcha->html)
{
$captcha = $post_captcha->html;
}
}
| }
if($post_captcha->html)
{
$captcha = $post_captcha->html;
}
|
}
if($forumpermissions['canpostpolls'] != 0)
| }
if($forumpermissions['canpostpolls'] != 0)
|
| Zeile 1128 | Zeile 1064 |
|---|
"allow_smilies" => 1,
"allow_imgcode" => 1
);
|
"allow_smilies" => 1,
"allow_imgcode" => 1
);
|
|
|
$forum['rules'] = $parser->parse_message($forum['rules'], $rules_parser);
$foruminfo = $forum;
| $forum['rules'] = $parser->parse_message($forum['rules'], $rules_parser);
$foruminfo = $forum;
|
| Zeile 1148 | Zeile 1084 |
|---|
if($forumpermissions['modattachments'] == 1 && $forumpermissions['canpostattachments'] != 0)
{
$moderation_text = $lang->moderation_forum_attachments;
|
if($forumpermissions['modattachments'] == 1 && $forumpermissions['canpostattachments'] != 0)
{
$moderation_text = $lang->moderation_forum_attachments;
|
eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
| eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
|
}
if(!is_moderator($forum['fid'], "canapproveunapprovethreads"))
| }
if(!is_moderator($forum['fid'], "canapproveunapprovethreads"))
|
| Zeile 1157 | Zeile 1093 |
|---|
if($forumpermissions['modthreads'] == 1)
{
$moderation_text = $lang->moderation_forum_thread;
|
if($forumpermissions['modthreads'] == 1)
{
$moderation_text = $lang->moderation_forum_thread;
|
eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}
| eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}
|
if(!is_moderator($forum['fid'], "canapproveunapproveposts"))
|
if(!is_moderator($forum['fid'], "canapproveunapproveposts"))
|
{
| {
|
if($mybb->user['moderateposts'] == 1)
{
$moderation_text = $lang->moderation_user_posts;
eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}
|
if($mybb->user['moderateposts'] == 1)
{
$moderation_text = $lang->moderation_user_posts;
eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}
|
| |
$php_max_upload_filesize = return_bytes(ini_get('max_upload_filesize'));
$php_post_max_size = return_bytes(ini_get('post_max_size'));
if ($php_max_upload_filesize != 0 && $php_post_max_size != 0)
{
$php_max_upload_size = min($php_max_upload_filesize, $php_post_max_size);
}
else
{
$php_max_upload_size = max($php_max_upload_filesize, $php_post_max_size);
}
$php_max_file_uploads = (int)ini_get('max_file_uploads');
eval("\$post_javascript = \"".$templates->get("post_javascript")."\";");
|
$plugins->run_hooks("newthread_end");
|
$plugins->run_hooks("newthread_end");
|