| 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_invisible,post_captcha_nocaptcha,postbit_gotopost,newthread_postoptions,post_attachments_add,post_attachments_viewlink";
| $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 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";
$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']))
{
$errors[] = $attachedfile['error'];
$mybb->input['action'] = "newthread";
| require_once MYBB_ROOT."inc/functions_upload.php";
$ret = add_attachments($pid, $forumpermissions, $attachwhere, "newthread");
if(!empty($ret['errors']))
{
$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 224 | Zeile 198 |
|---|
if(!$mybb->get_input('submit'))
{
$mybb->input['action'] = "newthread";
|
if(!$mybb->get_input('submit'))
{
$mybb->input['action'] = "newthread";
|
| | }
if($mybb->get_input('ajax', MyBB::INPUT_INT) == 1)
{
header("Content-type: application/json; charset={$lang->settings['charset']}");
echo json_encode(array("success" => true));
exit();
|
}
}
| }
}
|
| Zeile 431 | Zeile 412 |
|---|
$thread_info = $posthandler->insert_thread();
$tid = $thread_info['tid'];
$visible = $thread_info['visible'];
|
$thread_info = $posthandler->insert_thread();
$tid = $thread_info['tid'];
$visible = $thread_info['visible'];
|
|
|
// Invalidate solved captcha
if($mybb->settings['captchaimage'] && !$mybb->user['uid'])
{
| // Invalidate solved captcha
if($mybb->settings['captchaimage'] && !$mybb->user['uid'])
{
|
| Zeile 636 | Zeile 617 |
|---|
}
$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 651 | Zeile 632 |
|---|
if(isset($postoptions['signature']) && $postoptions['signature'] == 1)
{
$postoptionschecked['signature'] = " checked=\"checked\"";
|
if(isset($postoptions['signature']) && $postoptions['signature'] == 1)
{
$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)
{
|
| Zeile 676 | Zeile 641 |
|---|
{
$postpollchecked = "checked=\"checked\"";
}
|
{
$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);
}
|
| Zeile 698 | Zeile 664 |
|---|
{
$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.
else
{
if($mybb->user['signature'] != '')
|
}
// Otherwise, this is our initial visit to this page.
else
{
if($mybb->user['signature'] != '')
|
{
| {
|
$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 767 | Zeile 704 |
|---|
{
$username = $mybb->user['username'];
$uid = $mybb->user['uid'];
|
{
$username = $mybb->user['username'];
$uid = $mybb->user['uid'];
|
}
| }
|
// Set up posthandler.
require_once MYBB_ROOT."inc/datahandlers/post.php";
$posthandler = new PostDataHandler("insert");
| // Set up posthandler.
require_once MYBB_ROOT."inc/datahandlers/post.php";
$posthandler = new PostDataHandler("insert");
|
| Zeile 793 | Zeile 730 |
|---|
}
$posthandler->set_data($new_thread);
|
}
$posthandler->set_data($new_thread);
|
|
|
// Now let the post handler do all the hard work.
$valid_thread = $posthandler->verify_message();
$valid_subject = $posthandler->verify_subject();
| // Now let the post handler do all the hard work.
$valid_thread = $posthandler->verify_message();
$valid_subject = $posthandler->verify_subject();
|
| Zeile 802 | Zeile 739 |
|---|
if($new_thread['uid'] == 0)
{
$valid_username = $posthandler->verify_author();
|
if($new_thread['uid'] == 0)
{
$valid_username = $posthandler->verify_author();
|
}
| }
|
else
{
$valid_username = true;
|
else
{
$valid_username = true;
|
}
| }
|
$post_errors = array();
// Fetch friendly error messages if this is an invalid post
|
$post_errors = array();
// Fetch friendly error messages if this is an invalid post
|
| Zeile 831 | Zeile 768 |
|---|
$post = $db->fetch_array($query);
$post['username'] = $username;
if($mybb->user['uid'])
|
$post = $db->fetch_array($query);
$post['username'] = $username;
if($mybb->user['uid'])
|
{
| {
|
$post['userusername'] = $mybb->user['username'];
}
$previewmessage = $mybb->get_input('message');
| $post['userusername'] = $mybb->user['username'];
}
$previewmessage = $mybb->get_input('message');
|
| Zeile 1175 | Zeile 1112 |
|---|
eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}
|
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");
|