Vergleich inc/functions_upload.php - 1.8.23 - 1.8.30

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 8Zeile 8
 *
*/


 *
*/


 
/**
* Get maximum upload filesize limit set in PHP
* @since MyBB 1.8.27
* @return int maximum allowed filesize
*/
function get_php_upload_limit()
{
$maxsize = array(return_bytes(ini_get('upload_max_filesize')), return_bytes(ini_get('post_max_size')));
$maxsize = array_filter($maxsize); // Remove empty values

if(empty($maxsize))
{
return 0;
}
else
{
return (int)min($maxsize);
}
}


/**
* Remove an attachment from a specific post


/**
* Remove an attachment from a specific post

 *

 *

 * @param int $pid The post ID
* @param string $posthash The posthash if available
* @param int $aid The attachment ID

 * @param int $pid The post ID
* @param string $posthash The posthash if available
* @param int $aid The attachment ID

Zeile 42Zeile 61

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



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


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

	$uploadspath_abs = mk_path_abs($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.
$query = $db->simple_select("attachments", "COUNT(aid) as numreferences", "attachname='".$db->escape_string($attachment['attachname'])."'");
if($db->fetch_field($query, "numreferences") == 0)


// Check if this attachment is referenced in any other posts. If it isn't, then we are safe to delete the actual file.
$query = $db->simple_select("attachments", "COUNT(aid) as numreferences", "attachname='".$db->escape_string($attachment['attachname'])."'");
if($db->fetch_field($query, "numreferences") == 0)

	{
delete_uploaded_file($uploadpath."/".$attachment['attachname']);
if($attachment['thumbnail'])
{
delete_uploaded_file($uploadpath."/".$attachment['thumbnail']);
}

	{
delete_uploaded_file($uploadspath_abs."/".$attachment['attachname']);
if($attachment['thumbnail'] && $attachment['thumbnail'] !== 'SMALL')
{
delete_uploaded_file($uploadspath_abs."/".$attachment['thumbnail']);
}


$date_directory = explode('/', $attachment['attachname']);


$date_directory = explode('/', $attachment['attachname']);

		if(@is_dir($uploadpath."/".$date_directory[0]))


		$query_indir = $db->simple_select("attachments", "COUNT(aid) as indir", "attachname LIKE '".$db->escape_string_like($date_directory[0])."/%'");
if($db->fetch_field($query_indir, 'indir') == 0 && @is_dir($uploadspath_abs."/".$date_directory[0]))

		{

		{

			delete_upload_directory($uploadpath."/".$date_directory[0]);

			delete_upload_directory($uploadspath_abs."/".$date_directory[0]);

		}
}


		}
}


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

if($pid)

	global $db, $mybb, $plugins;

if($pid)

	{

	{

		$post = get_post($pid);

		$post = get_post($pid);

	}

	}

	$posthash = $db->escape_string($posthash);
if($posthash != "" && !$pid)

	$posthash = $db->escape_string($posthash);
if($posthash != "" && !$pid)

	{

	{

		$query = $db->simple_select("attachments", "*", "posthash='$posthash'");
}
else
{

		$query = $db->simple_select("attachments", "*", "posthash='$posthash'");
}
else
{

		$query = $db->simple_select("attachments", "*", "pid='$pid'");
}

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

		$query = $db->simple_select("attachments", "*", "pid='$pid'");










	}

	}

 

$uploadspath_abs = mk_path_abs($mybb->settings['uploadspath']);


$num_attachments = 0;
while($attachment = $db->fetch_array($query))


$num_attachments = 0;
while($attachment = $db->fetch_array($query))

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

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

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

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





		// Check if this attachment is referenced in any other posts. If it isn't, then we are safe to delete the actual file.
$query2 = $db->simple_select("attachments", "COUNT(aid) as numreferences", "attachname='".$db->escape_string($attachment['attachname'])."'");
if($db->fetch_field($query2, "numreferences") == 0)
{

		// Check if this attachment is referenced in any other posts. If it isn't, then we are safe to delete the actual file.
$query2 = $db->simple_select("attachments", "COUNT(aid) as numreferences", "attachname='".$db->escape_string($attachment['attachname'])."'");
if($db->fetch_field($query2, "numreferences") == 0)
{

			delete_uploaded_file($uploadpath."/".$attachment['attachname']);

			delete_uploaded_file($uploadspath_abs."/".$attachment['attachname']);

			if($attachment['thumbnail'])
{

			if($attachment['thumbnail'])
{

				delete_uploaded_file($uploadpath."/".$attachment['thumbnail']);
}

$date_directory = explode('/', $attachment['attachname']);
if(@is_dir($uploadpath."/".$date_directory[0]))
{
delete_upload_directory($uploadpath."/".$date_directory[0]);

				delete_uploaded_file($uploadspath_abs."/".$attachment['thumbnail']);







			}

			}

		}
}

 




	if($post['tid'])
{
update_thread_counters($post['tid'], array("attachmentcount" => "-{$num_attachments}"));





			$date_directory = explode('/', $attachment['attachname']);
$query_indir = $db->simple_select("attachments", "COUNT(aid) as indir", "attachname LIKE '".$db->escape_string_like($date_directory[0])."/%'");
if($db->fetch_field($query_indir, 'indir') == 0 && @is_dir($uploadspath_abs."/".$date_directory[0]))
{
delete_upload_directory($uploadspath_abs."/".$date_directory[0]);
}
}

	}

	}

}

 




/**







	if($post['tid'])
{
update_thread_counters($post['tid'], array("attachmentcount" => "-{$num_attachments}"));
}
}

/**

 * Remove any matching avatars for a specific user ID
*
* @param int $uid The user ID

 * Remove any matching avatars for a specific user ID
*
* @param int $uid The user ID

Zeile 157Zeile 164
	if(defined('IN_ADMINCP'))
{
$avatarpath = '../'.$mybb->settings['avataruploadpath'];

	if(defined('IN_ADMINCP'))
{
$avatarpath = '../'.$mybb->settings['avataruploadpath'];

	}

	}

	else
{
$avatarpath = $mybb->settings['avataruploadpath'];

	else
{
$avatarpath = $mybb->settings['avataruploadpath'];

Zeile 178Zeile 185

@closedir($dir);
}


@closedir($dir);
}

 
}

/**
* Create the attachment directory index file.
*
* @param string $path The path to the attachment directory to create the file in.
*/
function create_attachment_index($path)
{
$index = @fopen(rtrim($path, '/').'/index.html', 'w');
@fwrite($index, '<html>\n<head>\n<title></title>\n</head>\n<body>\n&nbsp;\n</body>\n</html>');
@fclose($index);

}

/**

}

/**

Zeile 198Zeile 217
		$uid = $mybb->user['uid'];
}


		$uid = $mybb->user['uid'];
}


	if(!$avatar['name'] || !$avatar['tmp_name'])

	if(empty($avatar['name']) || empty($avatar['tmp_name']))

	{
$avatar = $_FILES['avatarupload'];
}

	{
$avatar = $_FILES['avatarupload'];
}

Zeile 229Zeile 248

$filename = "avatar_".$uid.".".$ext;
$file = upload_file($avatar, $avatarpath, $filename);


$filename = "avatar_".$uid.".".$ext;
$file = upload_file($avatar, $avatarpath, $filename);

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

// Lets just double check that it exists
if(!file_exists($avatarpath."/".$filename))

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









	{

	{

 
		delete_uploaded_file($avatarpath."/".$filename);

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

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

		delete_uploaded_file($avatarpath."/".$filename);








		return $ret;
}

// Lets just double check that it exists
if(!file_exists($avatarpath."/".$filename))
{
$ret['error'] = $lang->error_uploadfailed;
delete_uploaded_file($avatarpath."/".$filename);

		return $ret;
}


		return $ret;
}


Zeile 255Zeile 274

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


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

	{

	{

		list($maxwidth, $maxheight) = @preg_split('/[|x]/', $mybb->settings['maxavatardims']);
if(($maxwidth && $img_dimensions[0] > $maxwidth) || ($maxheight && $img_dimensions[1] > $maxheight))
{

		list($maxwidth, $maxheight) = @preg_split('/[|x]/', $mybb->settings['maxavatardims']);
if(($maxwidth && $img_dimensions[0] > $maxwidth) || ($maxheight && $img_dimensions[1] > $maxheight))
{

Zeile 279Zeile 298
					$avatar['size'] = filesize($avatarpath."/".$filename);
// Reset dimensions
$img_dimensions = @getimagesize($avatarpath."/".$filename);

					$avatar['size'] = filesize($avatarpath."/".$filename);
// Reset dimensions
$img_dimensions = @getimagesize($avatarpath."/".$filename);

				}
}

				}
}

			else
{
$ret['error'] = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);

			else
{
$ret['error'] = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);

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

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

		}
}


		}
}


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


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


Zeile 319Zeile 338
		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;

Zeile 331Zeile 350
			break;
default:
$img_type = 0;

			break;
default:
$img_type = 0;

	}

	}


// Check if the uploaded file type matches the correct image type (returned by getimagesize)
if(empty($allowed_mime_types[$avatar['type']]) || $img_dimensions[2] != $img_type || $img_type == 0)


// Check if the uploaded file type matches the correct image type (returned by getimagesize)
if(empty($allowed_mime_types[$avatar['type']]) || $img_dimensions[2] != $img_type || $img_type == 0)

Zeile 343Zeile 362

// Next check the file size
if(($mybb->settings['avatarsize'] > 0 && $avatar['size'] > ($mybb->settings['avatarsize']*1024)) || $avatar['size'] > ($allowed_mime_types[$avatar['type']]*1024))


// 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;

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

Zeile 378Zeile 397
	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;
}


		return $ret;
}


    $attachtypes = (array)$cache->read('attachtypes');
$attachment = $plugins->run_hooks("upload_attachment_start", $attachment);

    $attachtypes = (array)$cache->read('attachtypes');
$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]);

	$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
if(!isset($attachtypes[$ext]))

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

Zeile 430Zeile 449
		{
$friendlyquota = get_friendly_size($mybb->usergroup['attachquota']*1024);
$ret['error'] = $lang->sprintf($lang->error_reachedattachquota, $friendlyquota);

		{
$friendlyquota = get_friendly_size($mybb->usergroup['attachquota']*1024);
$ret['error'] = $lang->sprintf($lang->error_reachedattachquota, $friendlyquota);

			return $ret;
}
}


			return $ret;
}
}


	// Gather forum permissions
$forumpermissions = forum_permissions($forum['fid']);


	// Gather forum permissions
$forumpermissions = forum_permissions($forum['fid']);


Zeile 448Zeile 467
	}
$query = $db->simple_select("attachments", "*", "filename='".$db->escape_string($attachment['name'])."' AND ".$uploaded_query);
$prevattach = $db->fetch_array($query);

	}
$query = $db->simple_select("attachments", "*", "filename='".$db->escape_string($attachment['name'])."' AND ".$uploaded_query);
$prevattach = $db->fetch_array($query);

	if($prevattach['aid'] && $update_attachment == false)

	if(!empty($prevattach) && $prevattach['aid'] && $update_attachment == false)

	{
if(!$mybb->usergroup['caneditattachments'] && !$forumpermissions['caneditattachments'])
{

	{
if(!$mybb->usergroup['caneditattachments'] && !$forumpermissions['caneditattachments'])
{

Zeile 472Zeile 491
		}
}


		}
}


 
	$uploadspath_abs = mk_path_abs($mybb->settings['uploadspath']);

	$month_dir = '';
if($mybb->safemode == false)
{
// Check if the attachment directory (YYYYMM) exists, if not, create it
$month_dir = gmdate("Ym");

	$month_dir = '';
if($mybb->safemode == false)
{
// Check if the attachment directory (YYYYMM) exists, if not, create it
$month_dir = gmdate("Ym");

		if(!@is_dir($mybb->settings['uploadspath']."/".$month_dir))

		if(!@is_dir($uploadspath_abs."/".$month_dir))

		{

		{

			@mkdir($mybb->settings['uploadspath']."/".$month_dir);

			@mkdir($uploadspath_abs."/".$month_dir);

			// Still doesn't exist - oh well, throw it in the main directory

			// Still doesn't exist - oh well, throw it in the main directory

			if(!@is_dir($mybb->settings['uploadspath']."/".$month_dir))

			if(!@is_dir($uploadspath_abs."/".$month_dir))

			{
$month_dir = '';
}
else
{

			{
$month_dir = '';
}
else
{

				$index = @fopen($mybb->settings['uploadspath']."/".$month_dir."/index.html", 'w');
@fwrite($index, "<html>\n<head>\n<title></title>\n</head>\n<body>\n&nbsp;\n</body>\n</html>");
@fclose($index);

				create_attachment_index($uploadspath_abs."/".$month_dir);



			}

			}

		}
}

		}
}


// All seems to be good, lets move the attachment!
$filename = "post_".$mybb->user['uid']."_".TIME_NOW."_".md5(random_str()).".attach";



// All seems to be good, lets move the attachment!
$filename = "post_".$mybb->user['uid']."_".TIME_NOW."_".md5(random_str()).".attach";


	$file = upload_file($attachment, $mybb->settings['uploadspath']."/".$month_dir, $filename);


	$file = upload_file($attachment, $uploadspath_abs."/".$month_dir, $filename);


	// Failed to create the attachment in the monthly directory, just throw it in the main directory
if(!empty($file['error']) && $month_dir)
{

	// Failed to create the attachment in the monthly directory, just throw it in the main directory
if(!empty($file['error']) && $month_dir)
{

		$file = upload_file($attachment, $mybb->settings['uploadspath'].'/', $filename);

		$file = upload_file($attachment, $uploadspath_abs.'/', $filename);

	}
elseif($month_dir)
{
$filename = $month_dir."/".$filename;

	}
elseif($month_dir)
{
$filename = $month_dir."/".$filename;

	}

	}


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


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

Zeile 525Zeile 543
	}

// Lets just double check that it exists

	}

// Lets just double check that it exists

	if(!file_exists($mybb->settings['uploadspath']."/".$filename))

	if(!file_exists($uploadspath_abs."/".$filename))

	{
$ret['error'] = $lang->error_uploadfailed.$lang->error_uploadfailed_detail.$lang->error_uploadfailed_lost;
return $ret;

	{
$ret['error'] = $lang->error_uploadfailed.$lang->error_uploadfailed_detail.$lang->error_uploadfailed_lost;
return $ret;

Zeile 546Zeile 564

// If we're uploading an image, check the MIME type compared to the image type and attempt to generate a thumbnail
if($ext == "gif" || $ext == "png" || $ext == "jpg" || $ext == "jpeg" || $ext == "jpe")


// If we're uploading an image, check the MIME type compared to the image type and attempt to generate a thumbnail
if($ext == "gif" || $ext == "png" || $ext == "jpg" || $ext == "jpeg" || $ext == "jpe")

	{

	{

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

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

Zeile 578Zeile 596
		}

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

		}

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

		$img_dimensions = @getimagesize($mybb->settings['uploadspath']."/".$filename);

		$img_dimensions = @getimagesize($uploadspath_abs."/".$filename);


$mime = "";


$mime = "";

		$file_path = $mybb->settings['uploadspath']."/".$filename;

		$file_path = $uploadspath_abs."/".$filename;

		if(function_exists("finfo_open"))
{
$file_info = finfo_open(FILEINFO_MIME);

		if(function_exists("finfo_open"))
{
$file_info = finfo_open(FILEINFO_MIME);

			list($mime, ) = explode(';', finfo_file($file_info, MYBB_ROOT.$file_path), 1);

			list($mime, ) = explode(';', finfo_file($file_info, $file_path), 1);

			finfo_close($file_info);

			finfo_close($file_info);

		}

		}

		else if(function_exists("mime_content_type"))

		else if(function_exists("mime_content_type"))

		{
$mime = mime_content_type(MYBB_ROOT.$file_path);
}


		{
$mime = mime_content_type($file_path);
}


		if(!is_array($img_dimensions) || ($img_dimensions[2] != $img_type && !in_array($mime, $supported_mimes)))
{

		if(!is_array($img_dimensions) || ($img_dimensions[2] != $img_type && !in_array($mime, $supported_mimes)))
{

			delete_uploaded_file($mybb->settings['uploadspath']."/".$filename);

			delete_uploaded_file($uploadspath_abs."/".$filename);

			$ret['error'] = $lang->error_uploadfailed;
return $ret;
}
require_once MYBB_ROOT."inc/functions_image.php";
$thumbname = str_replace(".attach", "_thumb.$ext", $filename);

			$ret['error'] = $lang->error_uploadfailed;
return $ret;
}
require_once MYBB_ROOT."inc/functions_image.php";
$thumbname = str_replace(".attach", "_thumb.$ext", $filename);





		$attacharray = $plugins->run_hooks("upload_attachment_thumb_start", $attacharray);


		$attacharray = $plugins->run_hooks("upload_attachment_thumb_start", $attacharray);


		$thumbnail = generate_thumbnail($mybb->settings['uploadspath']."/".$filename, $mybb->settings['uploadspath'], $thumbname, $mybb->settings['attachthumbh'], $mybb->settings['attachthumbw']);

if($thumbnail['filename'])
{

		$thumbnail = generate_thumbnail($uploadspath_abs."/".$filename, $uploadspath_abs, $thumbname, $mybb->settings['attachthumbh'], $mybb->settings['attachthumbw']);

if(!empty($thumbnail['filename']))
{

			$attacharray['thumbnail'] = $thumbnail['filename'];

			$attacharray['thumbnail'] = $thumbnail['filename'];

		}

		}

		elseif($thumbnail['code'] == 4)
{
$attacharray['thumbnail'] = "SMALL";
}
}
if($forumpermissions['modattachments'] == 1 && !is_moderator($forum['fid'], "canapproveunapproveattachs"))

		elseif($thumbnail['code'] == 4)
{
$attacharray['thumbnail'] = "SMALL";
}
}
if($forumpermissions['modattachments'] == 1 && !is_moderator($forum['fid'], "canapproveunapproveattachs"))

	{

	{

		$attacharray['visible'] = 0;
}
else

		$attacharray['visible'] = 0;
}
else

	{

	{

		$attacharray['visible'] = 1;
}

$attacharray = $plugins->run_hooks("upload_attachment_do_insert", $attacharray);

		$attacharray['visible'] = 1;
}

$attacharray = $plugins->run_hooks("upload_attachment_do_insert", $attacharray);


if($prevattach['aid'] && $update_attachment == true)


if(!empty($prevattach) && $prevattach['aid'] && $update_attachment == true)

	{
unset($attacharray['downloads']); // Keep our download count if we're updating an attachment
$db->update_query("attachments", $attacharray, "aid='".$db->escape_string($prevattach['aid'])."'");

	{
unset($attacharray['downloads']); // Keep our download count if we're updating an attachment
$db->update_query("attachments", $attacharray, "aid='".$db->escape_string($prevattach['aid'])."'");





		// Remove old attachment file
// Check if this attachment is referenced in any other posts. If it isn't, then we are safe to delete the actual file.
$query = $db->simple_select("attachments", "COUNT(aid) as numreferences", "attachname='".$db->escape_string($prevattach['attachname'])."'");
if($db->fetch_field($query, "numreferences") == 0)
{

		// Remove old attachment file
// Check if this attachment is referenced in any other posts. If it isn't, then we are safe to delete the actual file.
$query = $db->simple_select("attachments", "COUNT(aid) as numreferences", "attachname='".$db->escape_string($prevattach['attachname'])."'");
if($db->fetch_field($query, "numreferences") == 0)
{

			delete_uploaded_file($mybb->settings['uploadspath']."/".$prevattach['attachname']);

			delete_uploaded_file($uploadspath_abs."/".$prevattach['attachname']);

			if($prevattach['thumbnail'])

			if($prevattach['thumbnail'])

			{
delete_uploaded_file($mybb->settings['uploadspath']."/".$prevattach['thumbnail']);
}

			{
delete_uploaded_file($uploadspath_abs."/".$prevattach['thumbnail']);
}


$date_directory = explode('/', $prevattach['attachname']);


$date_directory = explode('/', $prevattach['attachname']);

			if(@is_dir($mybb->settings['uploadspath']."/".$date_directory[0]))


			$query_indir = $db->simple_select("attachments", "COUNT(aid) as indir", "attachname LIKE '".$db->escape_string_like($date_directory[0])."/%'");
if($db->fetch_field($query_indir, 'indir') == 0 && @is_dir($uploadspath_abs."/".$date_directory[0]))

			{

			{

				delete_upload_directory($mybb->settings['uploadspath']."/".$date_directory[0]);

				delete_upload_directory($uploadspath_abs."/".$date_directory[0]);

			}

			}

		}

		}


$aid = $prevattach['aid'];


$aid = $prevattach['aid'];

	}

	}

	else
{
$aid = $db->insert_query("attachments", $attacharray);

	else
{
$aid = $db->insert_query("attachments", $attacharray);

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

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

	return $ret;
}

	return $ret;
}


/**
* Check whether the input $FILE variable indicates a PHP file upload error,


/**
* Check whether the input $FILE variable indicates a PHP file upload error,

Zeile 771Zeile 790
				if($FILE['size'] > 0)
{
$filename = $db->escape_string($FILE['name']);

				if($FILE['size'] > 0)
{
$filename = $db->escape_string($FILE['name']);

					$exists = $aid[$filename];

					$exists = !empty($aid[$filename]);


$update_attachment = false;
if($action == "editpost")


$update_attachment = false;
if($action == "editpost")

Zeile 788Zeile 807
							$update_attachment = true;
}
}

							$update_attachment = true;
}
}


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

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

					
if(!$exists && $mybb->get_input('updateattachment') && $mybb->get_input('updateconfirmed', MyBB::INPUT_INT) != 1)



					{

					{

						$ret['errors'][] = $attachedfile['error'];
$mybb->input['action'] = $action;
}



						$ret['errors'][] = $lang->sprintf($lang->error_updatefailed, $filename);
}
else
{
$attachedfile = upload_attachment($FILE, $update_attachment);





 
						if(!empty($attachedfile['error']))
{
$ret['errors'][] = $attachedfile['error'];
$mybb->input['action'] = $action;
}
else if(isset($attachedfile['aid']) && $mybb->get_input('ajax', MyBB::INPUT_INT) == 1)
{
$ret['success'][] = array($attachedfile['aid'], get_attachment_icon(get_extension($filename)), $filename, get_friendly_size($FILE['size']));
}
}

				}
else
{

				}
else
{

Zeile 818Zeile 847
 * @return bool Whether the file was deleted successfully.
*/
function delete_uploaded_file($path = '')

 * @return bool Whether the file was deleted successfully.
*/
function delete_uploaded_file($path = '')

{
global $mybb, $plugins;

$deleted = false;

{
global $mybb, $plugins;

$deleted = false;


$deleted = @unlink($path);


$deleted = @unlink($path);





	$cdn_base_path = rtrim($mybb->settings['cdnpath'], '/');
$path = ltrim($path, '/');
$cdn_path = realpath($cdn_base_path . '/' . $path);


	$cdn_base_path = rtrim($mybb->settings['cdnpath'], '/');
$path = ltrim($path, '/');
$cdn_path = realpath($cdn_base_path . '/' . $path);


	if($mybb->settings['usecdn'] && !empty($cdn_base_path))

	if(!empty($mybb->settings['usecdn']) && !empty($cdn_base_path))

	{
$deleted = $deleted && @unlink($cdn_path);

	{
$deleted = $deleted && @unlink($cdn_path);

	}

	}


$hook_params = array(
'path' => &$path,


$hook_params = array(
'path' => &$path,

Zeile 856Zeile 885
	global $mybb, $plugins;

$deleted = false;

	global $mybb, $plugins;

$deleted = false;

 

$deleted_index = @unlink(rtrim($path, '/').'/index.html');


$deleted = @rmdir($path);

$cdn_base_path = rtrim($mybb->settings['cdnpath'], '/');
$path = ltrim($path, '/');
$cdn_path = rtrim(realpath($cdn_base_path . '/' . $path), '/');


$deleted = @rmdir($path);

$cdn_base_path = rtrim($mybb->settings['cdnpath'], '/');
$path = ltrim($path, '/');
$cdn_path = rtrim(realpath($cdn_base_path . '/' . $path), '/');


if($mybb->settings['usecdn'] && !empty($cdn_base_path))


if(!empty($mybb->settings['usecdn']) && !empty($cdn_base_path))

	{
$deleted = $deleted && @rmdir($cdn_path);

	{
$deleted = $deleted && @rmdir($cdn_path);

	}


	}


	$hook_params = array(
'path' => &$path,
'deleted' => &$deleted,
);

	$hook_params = array(
'path' => &$path,
'deleted' => &$deleted,
);





	$plugins->run_hooks('delete_upload_directory', $hook_params);

	$plugins->run_hooks('delete_upload_directory', $hook_params);

 

// If not successfully deleted then reinstante the index file
if(!$deleted && $deleted_index)
{
create_attachment_index($path);
}


return $deleted;
}


return $deleted;
}