Vergleich inc/functions_upload.php - 1.8.3 - 1.8.31

  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

Zeile 17Zeile 36
 * @param int $aid The attachment ID
*/
function remove_attachment($pid, $posthash, $aid)

 * @param int $aid The attachment ID
*/
function remove_attachment($pid, $posthash, $aid)

{
global $db, $mybb, $plugins;

{
global $db, $mybb, $plugins;

	$aid = (int)$aid;
$posthash = $db->escape_string($posthash);

	$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 33Zeile 52
	}

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

	}

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

 

if($attachment === false)
{
// no attachment found with the given details
return;
}


$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($uploadspath_abs."/".$attachment['attachname']);
if($attachment['thumbnail'] && $attachment['thumbnail'] !== 'SMALL')

		{

		{

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

			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 78Zeile 97
function remove_attachments($pid, $posthash="")
{
global $db, $mybb, $plugins;

function remove_attachments($pid, $posthash="")
{
global $db, $mybb, $plugins;





	if($pid)
{
$post = get_post($pid);

	if($pid)
{
$post = get_post($pid);

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


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


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

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

		$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']);

				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 172Zeile 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 184Zeile 209
function upload_avatar($avatar=array(), $uid=0)
{
global $db, $mybb, $lang, $plugins, $cache;

function upload_avatar($avatar=array(), $uid=0)
{
global $db, $mybb, $lang, $plugins, $cache;





	$ret = array();

if(!$uid)
{
$uid = $mybb->user['uid'];

	$ret = array();

if(!$uid)
{
$uid = $mybb->user['uid'];

	}

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

	}

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

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

if(!is_uploaded_file($avatar['tmp_name']))

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

if(!is_uploaded_file($avatar['tmp_name']))

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

// Check we have a valid extension
// This is attached to the attachment types allowed to be uploaded (set in the ACP)
$valid_extensions = array();
$extensions = $cache->read("attachtypes");

foreach($extensions as $ext => $type)
{
if(substr($type['mimetype'], 0, 5) == 'image')
{
$valid_extensions[$ext] = 1;
}
}

$ext = get_extension(my_strtolower($avatar['name']));

if(!isset($valid_extensions[$ext]))
{
$ret['error'] = $lang->error_avatartype;
return $ret;

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






















	}

	}

 

// Check we have a valid extension
$ext = get_extension(my_strtolower($avatar['name']));
if(!preg_match("#^(gif|jpg|jpeg|jpe|bmp|png)$#i", $ext))
{
$ret['error'] = $lang->error_avatartype;
return $ret;
}


if(defined('IN_ADMINCP'))
{
$avatarpath = '../'.$mybb->settings['avataruploadpath'];
$lang->load("messages", true);


if(defined('IN_ADMINCP'))
{
$avatarpath = '../'.$mybb->settings['avataruploadpath'];
$lang->load("messages", true);

	}

	}

	else

	else

	{

	{

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

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

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

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

	if($file['error'])
{

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

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

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

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

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

		return $ret;
}

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

		return $ret;
}

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

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

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

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

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

Zeile 263Zeile 275
	// 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 280Zeile 292
				}
else
{

				}
else
{

 
					// Copy scaled image to CDN
copy_file_to_cdn($avatarpath . '/' . $thumbnail['filename']);

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

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

				}
}
else

				}
}
else

			{
$ret['error'] = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);
if($mybb->settings['avatarresizing'] == "user")

			{
$ret['error'] = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);
if($mybb->settings['avatarresizing'] == "user")

Zeile 297Zeile 311
				return $ret;
}
}

				return $ret;
}
}

	}















	}

// 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']);





	// 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']))

	switch($avatar['type'])










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

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

Zeile 323Zeile 342
		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 360Zeile 393

$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;
}


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

























		return $ret;
}


		return $ret;
}


	if(!is_uploaded_file($attachment['tmp_name']) || empty($attachment['tmp_name']))





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

$allowed_mime_types = array();
foreach($attachtypes as $ext => $attachtype)

	{

	{

		$ret['error'] = $lang->error_uploadfailed.$lang->error_uploadfailed_php4;
return $ret;
}

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

		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]))
{
$ret['error'] = $lang->error_attachtype;


$ext = get_extension($attachment['name']);
// Check if we have a valid extension
if(!isset($attachtypes[$ext]))
{
$ret['error'] = $lang->error_attachtype;

		return $ret;
}

		return $ret;
}

	else

	else

	{

	{

		$attachtype = $attachtypes[$ext];

		$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 434Zeile 454
	}

// Gather forum permissions

	}

// Gather forum permissions

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

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


// Check if an attachment with this name is already in the post
if($pid != 0)


// Check if an attachment with this name is already in the post
if($pid != 0)

	{

	{

		$uploaded_query = "pid='{$pid}'";

		$uploaded_query = "pid='{$pid}'";

	}

	}

	else
{
$uploaded_query = "posthash='{$posthash}'";

	else
{
$uploaded_query = "posthash='{$posthash}'";

	}

	}

	$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 455Zeile 475
			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 467Zeile 487
		if($attachcount >= $mybb->settings['maxattachments'])
{
$ret['error'] = $lang->sprintf($lang->error_maxattachpost, $mybb->settings['maxattachments']);

		if($attachcount >= $mybb->settings['maxattachments'])
{
$ret['error'] = $lang->sprintf($lang->error_maxattachpost, $mybb->settings['maxattachments']);

			return $ret;
}
}



			return $ret;
}
}

$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 = '';
}

			{
$month_dir = '';
}

		}
}






			else
{
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;

Zeile 518Zeile 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 559Zeile 584
				break;
default:
$img_type = 0;

				break;
default:
$img_type = 0;

		}


		}


		$supported_mimes = array();
foreach($attachtypes as $attachtype)
{
if(!empty($attachtype['mimetype']))
{
$supported_mimes[] = $attachtype['mimetype'];

		$supported_mimes = array();
foreach($attachtypes as $attachtype)
{
if(!empty($attachtype['mimetype']))
{
$supported_mimes[] = $attachtype['mimetype'];

			}
}

// Check if the uploaded file type matches the correct image type (returned by getimagesize)
$img_dimensions = @getimagesize($mybb->settings['uploadspath']."/".$filename);


			}
}

// Check if the uploaded file type matches the correct image type (returned by getimagesize)
$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);
}
else if(function_exists("mime_content_type"))

			finfo_close($file_info);
}
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;
}

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

Zeile 596Zeile 621
		$thumbname = str_replace(".attach", "_thumb.$ext", $filename);

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

		$thumbname = str_replace(".attach", "_thumb.$ext", $filename);

$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

Zeile 619Zeile 644

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



$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'])."'");

Zeile 629Zeile 654
		$query = $db->simple_select("attachments", "COUNT(aid) as numreferences", "attachname='".$db->escape_string($prevattach['attachname'])."'");
if($db->fetch_field($query, "numreferences") == 0)
{

		$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]);

			}
}


			}
}


Zeile 653Zeile 679
		}
}
$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 = !empty($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;
}
}

if(!$exists && $mybb->get_input('updateattachment') && $mybb->get_input('updateconfirmed', MyBB::INPUT_INT) != 1)
{
$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
{
$ret['errors'][] = $lang->sprintf($lang->error_uploadempty, htmlspecialchars_uni($FILE['name']));
$mybb->input['action'] = $action;
}
}
}
}


	return $ret;
}

/**
* Delete an uploaded file both from the relative path and the CDN path if a CDN is in use.

	return $ret;
}

/**
* Delete an uploaded file both from the relative path and the CDN path if a CDN is in use.

 *

 *

 * @param string $path The relative path to the uploaded file.
*
* @return bool Whether the file was deleted successfully.
*/
function delete_uploaded_file($path = '')

 * @param string $path The relative path to the uploaded file.
*
* @return bool Whether the file was deleted successfully.
*/
function delete_uploaded_file($path = '')

{
global $mybb;

$deleted = false;

$deleted = @unlink($path);

{
global $mybb, $plugins;

$deleted = false;

$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,
'deleted' => &$deleted,
);

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


return $deleted;
}

/**
* Delete an upload directory on both the local filesystem and the CDN filesystem.


return $deleted;
}

/**
* Delete an upload directory on both the local filesystem and the CDN filesystem.

 *

 *

 * @param string $path The directory to delete.
*
* @return bool Whether the directory was deleted.

 * @param string $path The directory to delete.
*
* @return bool Whether the directory was deleted.

 */

 */

function delete_upload_directory($path = '')
{

function delete_upload_directory($path = '')
{

	global $mybb;


	global $mybb, $plugins;


	$deleted = false;

	$deleted = false;

 

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


$deleted = @rmdir($path);



$deleted = @rmdir($path);


Zeile 703Zeile 894
	$path = ltrim($path, '/');
$cdn_path = rtrim(realpath($cdn_base_path . '/' . $path), '/');


	$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,
);

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

Zeile 740Zeile 944
	$filename = preg_replace("#/$#", "", $filename); // Make the filename safe
$moved = @move_uploaded_file($file['tmp_name'], $path."/".$filename);


	$filename = preg_replace("#/$#", "", $filename); // Make the filename safe
$moved = @move_uploaded_file($file['tmp_name'], $path."/".$filename);


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

	$cdn_path = '';







	if($mybb->settings['usecdn'] && !empty($cdn_base_path))
{
$moved_cdn = @copy($path . '/' . $filename, $cdn_path . '/' . $filename);
@my_chmod($cdn_path . '/' . $filename, '0644');
}

	$moved_cdn = copy_file_to_cdn($path."/".$filename, $cdn_path);






if(!$moved)
{


if(!$moved)
{