Vergleich inc/functions_upload.php - 1.8.7 - 1.8.25

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 21Zeile 21
	global $db, $mybb, $plugins;
$aid = (int)$aid;
$posthash = $db->escape_string($posthash);

	global $db, $mybb, $plugins;
$aid = (int)$aid;
$posthash = $db->escape_string($posthash);

	if($posthash != "")

	if(!empty($posthash))

	{
$query = $db->simple_select("attachments", "aid, attachname, thumbnail, visible", "aid='{$aid}' AND posthash='{$posthash}'");
$attachment = $db->fetch_array($query);

	{
$query = $db->simple_select("attachments", "aid, attachname, thumbnail, visible", "aid='{$aid}' AND posthash='{$posthash}'");
$attachment = $db->fetch_array($query);

Zeile 34Zeile 34

$plugins->run_hooks("remove_attachment_do_delete", $attachment);



$plugins->run_hooks("remove_attachment_do_delete", $attachment);


	$db->delete_query("attachments", "aid='{$attachment['aid']}'");

if(defined('IN_ADMINCP'))
{
$uploadpath = '../'.$mybb->settings['uploadspath'];
}
else

	if($attachment === false)







	{

	{

	    $uploadpath = $mybb->settings['uploadspath'];













		// no attachment found with the given details
return;
}

$db->delete_query("attachments", "aid='{$attachment['aid']}'");

if(defined('IN_ADMINCP'))
{
$uploadpath = '../'.$mybb->settings['uploadspath'];
}
else
{
$uploadpath = $mybb->settings['uploadspath'];

	}

// Check if this attachment is referenced in any other posts. If it isn't, then we are safe to delete the actual file.

	}

// Check if this attachment is referenced in any other posts. If it isn't, then we are safe to delete the actual file.

Zeile 80Zeile 86
	global $db, $mybb, $plugins;

if($pid)

	global $db, $mybb, $plugins;

if($pid)

	{

	{

		$post = get_post($pid);
}
$posthash = $db->escape_string($posthash);

		$post = get_post($pid);
}
$posthash = $db->escape_string($posthash);

Zeile 108Zeile 114
		if($attachment['visible'] == 1)
{
$num_attachments++;

		if($attachment['visible'] == 1)
{
$num_attachments++;

		}

		}


$plugins->run_hooks("remove_attachments_do_delete", $attachment);



$plugins->run_hooks("remove_attachments_do_delete", $attachment);


Zeile 250Zeile 256
	// Check avatar dimensions
if($mybb->settings['maxavatardims'] != '')
{

	// Check avatar dimensions
if($mybb->settings['maxavatardims'] != '')
{

		list($maxwidth, $maxheight) = @explode("x", $mybb->settings['maxavatardims']);

		list($maxwidth, $maxheight) = @preg_split('/[|x]/', $mybb->settings['maxavatardims']);

		if(($maxwidth && $img_dimensions[0] > $maxwidth) || ($maxheight && $img_dimensions[1] > $maxheight))
{
// Automatic resizing enabled?

		if(($maxwidth && $img_dimensions[0] > $maxwidth) || ($maxheight && $img_dimensions[1] > $maxheight))
{
// Automatic resizing enabled?

Zeile 259Zeile 265
				require_once MYBB_ROOT."inc/functions_image.php";
$thumbnail = generate_thumbnail($avatarpath."/".$filename, $avatarpath, $filename, $maxheight, $maxwidth);
if(!$thumbnail['filename'])

				require_once MYBB_ROOT."inc/functions_image.php";
$thumbnail = generate_thumbnail($avatarpath."/".$filename, $avatarpath, $filename, $maxheight, $maxwidth);
if(!$thumbnail['filename'])

				{

				{

					$ret['error'] = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);
$ret['error'] .= "<br /><br />".$lang->error_avatarresizefailed;
delete_uploaded_file($avatarpath."/".$filename);

					$ret['error'] = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);
$ret['error'] .= "<br /><br />".$lang->error_avatarresizefailed;
delete_uploaded_file($avatarpath."/".$filename);

Zeile 285Zeile 291
				delete_uploaded_file($avatarpath."/".$filename);
return $ret;
}

				delete_uploaded_file($avatarpath."/".$filename);
return $ret;
}

		}
}

// Next check the file size
if($avatar['size'] > ($mybb->settings['avatarsize']*1024) && $mybb->settings['avatarsize'] > 0)
{
delete_uploaded_file($avatarpath."/".$filename);
$ret['error'] = $lang->error_uploadsize;
return $ret;
}

// Check a list of known MIME types to establish what kind of avatar we're uploading
switch(my_strtolower($avatar['type']))
{






		}
}

// Check a list of known MIME types to establish what kind of avatar we're uploading
$attachtypes = (array)$cache->read('attachtypes');

$allowed_mime_types = array();
foreach($attachtypes as $attachtype)
{
if(defined('IN_ADMINCP') || is_member($attachtype['groups']) && $attachtype['avatarfile'])
{
$allowed_mime_types[$attachtype['mimetype']] = $attachtype['maxsize'];
}
}

$avatar['type'] = my_strtolower($avatar['type']);

switch($avatar['type'])
{

		case "image/gif":
$img_type = 1;
break;

		case "image/gif":
$img_type = 1;
break;

Zeile 308Zeile 319
		case "image/pjpeg":
case "image/jpg":
$img_type = 2;

		case "image/pjpeg":
case "image/jpg":
$img_type = 2;

			break;

			break;

		case "image/png":
case "image/x-png":
$img_type = 3;

		case "image/png":
case "image/x-png":
$img_type = 3;

 
			break;
case "image/bmp":
case "image/x-bmp":
case "image/x-windows-bmp":
$img_type = 6;

			break;
default:
$img_type = 0;
}

// Check if the uploaded file type matches the correct image type (returned by getimagesize)

			break;
default:
$img_type = 0;
}

// Check if the uploaded file type matches the correct image type (returned by getimagesize)

	if($img_dimensions[2] != $img_type || $img_type == 0)

	if(empty($allowed_mime_types[$avatar['type']]) || $img_dimensions[2] != $img_type || $img_type == 0)

	{
$ret['error'] = $lang->error_uploadfailed;
delete_uploaded_file($avatarpath."/".$filename);
return $ret;
}

	{
$ret['error'] = $lang->error_uploadfailed;
delete_uploaded_file($avatarpath."/".$filename);
return $ret;
}

 

// Next check the file size
if(($mybb->settings['avatarsize'] > 0 && $avatar['size'] > ($mybb->settings['avatarsize']*1024)) || $avatar['size'] > ($allowed_mime_types[$avatar['type']]*1024))
{
delete_uploaded_file($avatarpath."/".$filename);
$ret['error'] = $lang->error_uploadsize;
return $ret;
}


	// Everything is okay so lets delete old avatars for this user
remove_avatars($uid, $filename);


	// Everything is okay so lets delete old avatars for this user
remove_avatars($uid, $filename);


Zeile 333Zeile 358
		"height" => (int)$img_dimensions[1]
);
$ret = $plugins->run_hooks("upload_avatar_end", $ret);

		"height" => (int)$img_dimensions[1]
);
$ret = $plugins->run_hooks("upload_avatar_end", $ret);

	return $ret;
}

/**

	return $ret;
}

/**

 * Upload an attachment in to the file system
*
* @param array $attachment Attachment data (as fed by PHPs $_FILE)

 * Upload an attachment in to the file system
*
* @param array $attachment Attachment data (as fed by PHPs $_FILE)

Zeile 349Zeile 374

$posthash = $db->escape_string($mybb->get_input('posthash'));
$pid = (int)$pid;


$posthash = $db->escape_string($mybb->get_input('posthash'));
$pid = (int)$pid;


if(isset($attachment['error']) && $attachment['error'] != 0)
{
$ret['error'] = $lang->error_uploadfailed.$lang->error_uploadfailed_detail;
switch($attachment['error'])
{
case 1: // UPLOAD_ERR_INI_SIZE
$ret['error'] .= $lang->error_uploadfailed_php1;
break;
case 2: // UPLOAD_ERR_FORM_SIZE
$ret['error'] .= $lang->error_uploadfailed_php2;
break;
case 3: // UPLOAD_ERR_PARTIAL
$ret['error'] .= $lang->error_uploadfailed_php3;
break;
case 4: // UPLOAD_ERR_NO_FILE
$ret['error'] .= $lang->error_uploadfailed_php4;
break;
case 6: // UPLOAD_ERR_NO_TMP_DIR
$ret['error'] .= $lang->error_uploadfailed_php6;
break;
case 7: // UPLOAD_ERR_CANT_WRITE
$ret['error'] .= $lang->error_uploadfailed_php7;
break;
default:
$ret['error'] .= $lang->sprintf($lang->error_uploadfailed_phpx, $attachment['error']);
break;
}
return $ret;
}


































	if(!is_uploaded_file($attachment['tmp_name']) || empty($attachment['tmp_name']))
{
$ret['error'] = $lang->error_uploadfailed.$lang->error_uploadfailed_php4;

	if(!is_uploaded_file($attachment['tmp_name']) || empty($attachment['tmp_name']))
{
$ret['error'] = $lang->error_uploadfailed.$lang->error_uploadfailed_php4;

		return $ret;
}

$attachtypes = $cache->read('attachtypes');

		return $ret;
}

$attachtypes = (array)$cache->read('attachtypes');

    $attachment = $plugins->run_hooks("upload_attachment_start", $attachment);

    $attachment = $plugins->run_hooks("upload_attachment_start", $attachment);

 

$allowed_mime_types = array();
foreach($attachtypes as $ext => $attachtype)
{
if(!is_member($attachtype['groups']) || ($attachtype['forums'] != -1 && strpos(','.$attachtype['forums'].',', ','.$forum['fid'].',') === false))
{
unset($attachtypes[$ext]);
}
}


$ext = get_extension($attachment['name']);
// Check if we have a valid extension


$ext = get_extension($attachment['name']);
// Check if we have a valid extension

Zeile 399Zeile 403
	else
{
$attachtype = $attachtypes[$ext];

	else
{
$attachtype = $attachtypes[$ext];

 
	}

// check the length of the filename
$maxFileNameLength = 255;
if(my_strlen($attachment['name']) > $maxFileNameLength)
{
$ret['error'] = $lang->sprintf($lang->error_attach_filename_length, htmlspecialchars_uni($attachment['name']), $maxFileNameLength);
return $ret;

	}

// Check the size
if($attachment['size'] > $attachtype['maxsize']*1024 && $attachtype['maxsize'] != "")
{

	}

// Check the size
if($attachment['size'] > $attachtype['maxsize']*1024 && $attachtype['maxsize'] != "")
{

		$ret['error'] = $lang->sprintf($lang->error_attachsize, $attachtype['maxsize']);

		$ret['error'] = $lang->sprintf($lang->error_attachsize, htmlspecialchars_uni($attachment['name']), $attachtype['maxsize']);

		return $ret;
}


		return $ret;
}


Zeile 444Zeile 456
			return $ret;
}


			return $ret;
}


		$ret['error'] = $lang->error_alreadyuploaded;

		$ret['error'] = $lang->sprintf($lang->error_alreadyuploaded, htmlspecialchars_uni($attachment['name']));

		return $ret;
}


		return $ret;
}


Zeile 498Zeile 510
	}

if(!empty($file['error']))

	}

if(!empty($file['error']))

	{

	{

		$ret['error'] = $lang->error_uploadfailed.$lang->error_uploadfailed_detail;
switch($file['error'])
{

		$ret['error'] = $lang->error_uploadfailed.$lang->error_uploadfailed_detail;
switch($file['error'])
{

Zeile 648Zeile 660
		}
}
$ret['aid'] = $aid;

		}
}
$ret['aid'] = $aid;

 
	return $ret;
}

/**
* Check whether the input $FILE variable indicates a PHP file upload error,
* and if so, return an appropriate user-friendly error message.
*
* @param array $FILE File data (as fed by PHP's $_FILE).
*
* @return string Error message or empty if no error detected.
*/
function check_parse_php_upload_err($FILE)
{
global $lang;

$err = '';

if(isset($FILE['error']) && $FILE['error'] != 0 && ($FILE['error'] != UPLOAD_ERR_NO_FILE || $FILE['name']))
{
$err = $lang->error_uploadfailed.$lang->error_uploadfailed_detail;
switch($FILE['error'])
{
case 1: // UPLOAD_ERR_INI_SIZE
$err .= $lang->error_uploadfailed_php1;
break;
case 2: // UPLOAD_ERR_FORM_SIZE
$err .= $lang->error_uploadfailed_php2;
break;
case 3: // UPLOAD_ERR_PARTIAL
$err .= $lang->error_uploadfailed_php3;
break;
case 4: // UPLOAD_ERR_NO_FILE
$err .= $lang->error_uploadfailed_php4;
break;
case 6: // UPLOAD_ERR_NO_TMP_DIR
$err .= $lang->error_uploadfailed_php6;
break;
case 7: // UPLOAD_ERR_CANT_WRITE
$err .= $lang->error_uploadfailed_php7;
break;
default:
$err .= $lang->sprintf($lang->error_uploadfailed_phpx, $FILE['error']);
break;
}
}

return $err;
}

/**
* Process adding attachment(s) when the "Add Attachment" button is pressed.
*
* @param int $pid The ID of the post.
* @param array $forumpermission The permissions for the forum.
* @param string $attachwhere Search string "pid='$pid'" or "posthash='".$db->escape_string($mybb->get_input('posthash'))."'"
* @param string $action Where called from: "newthread", "newreply", or "editpost"
*
* @return array Array of errors if any, empty array otherwise
*/
function add_attachments($pid, $forumpermissions, $attachwhere, $action=false)
{
global $db, $mybb, $editdraftpid, $lang;

$ret = array();

if($forumpermissions['canpostattachments'])
{
$attachments = array();
$fields = array ('name', 'type', 'tmp_name', 'error', 'size');
$aid = array();

$total = isset($_FILES['attachments']['name']) ? count($_FILES['attachments']['name']) : 0;
$filenames = "";
$delim = "";
for($i=0; $i<$total; ++$i)
{
foreach($fields as $field)
{
$attachments[$i][$field] = $_FILES['attachments'][$field][$i];
}

$FILE = $attachments[$i];
if(!empty($FILE['name']) && !empty($FILE['type']) && $FILE['size'] > 0)
{
$filenames .= $delim . "'" . $db->escape_string($FILE['name']) . "'";
$delim = ",";
}
}

if ($filenames != '')
{
$query = $db->simple_select("attachments", "filename", "{$attachwhere} AND filename IN (".$filenames.")");

while ($row = $db->fetch_array($query))
{
$aid[$row['filename']] = true;
}
}

foreach($attachments as $FILE)
{
if($err = check_parse_php_upload_err($FILE))
{
$ret['errors'][] = $err;
$mybb->input['action'] = $action;
}
else if(!empty($FILE['name']) && !empty($FILE['type']))
{
if($FILE['size'] > 0)
{
$filename = $db->escape_string($FILE['name']);
$exists = $aid[$filename];

$update_attachment = false;
if($action == "editpost")
{
if($exists && $mybb->get_input('updateattachment') && ($mybb->usergroup['caneditattachments'] || $forumpermissions['caneditattachments']))
{
$update_attachment = true;
}
}
else
{
if($exists && $mybb->get_input('updateattachment'))
{
$update_attachment = true;
}
}

$attachedfile = upload_attachment($FILE, $update_attachment);

if(!empty($attachedfile['error']))
{
$ret['errors'][] = $attachedfile['error'];
$mybb->input['action'] = $action;
}

}
else
{
$ret['errors'][] = $lang->sprintf($lang->error_uploadempty, htmlspecialchars_uni($FILE['name']));
$mybb->input['action'] = $action;
}
}
}
}


	return $ret;
}


	return $ret;
}