| Zeile 21 | Zeile 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 34 | Zeile 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 66 | Zeile 72 |
|---|
{
$post = get_post($pid);
update_thread_counters($post['tid'], array("attachmentcount" => "-1"));
|
{
$post = get_post($pid);
update_thread_counters($post['tid'], array("attachmentcount" => "-1"));
|
}
| }
|
}
/**
| }
/**
|
| Zeile 87 | Zeile 93 |
|---|
if($posthash != "" && !$pid)
{
$query = $db->simple_select("attachments", "*", "posthash='$posthash'");
|
if($posthash != "" && !$pid)
{
$query = $db->simple_select("attachments", "*", "posthash='$posthash'");
|
}
else
| }
else
|
{
$query = $db->simple_select("attachments", "*", "pid='$pid'");
}
| {
$query = $db->simple_select("attachments", "*", "pid='$pid'");
}
|
| Zeile 120 | Zeile 126 |
|---|
{
delete_uploaded_file($uploadpath."/".$attachment['attachname']);
if($attachment['thumbnail'])
|
{
delete_uploaded_file($uploadpath."/".$attachment['attachname']);
if($attachment['thumbnail'])
|
{
| {
|
delete_uploaded_file($uploadpath."/".$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]);
|
$date_directory = explode('/', $attachment['attachname']);
if(@is_dir($uploadpath."/".$date_directory[0]))
{
delete_upload_directory($uploadpath."/".$date_directory[0]);
|
}
}
| }
}
|
}
if($post['tid'])
| }
if($post['tid'])
|
| Zeile 149 | Zeile 155 |
|---|
global $mybb, $plugins;
if(defined('IN_ADMINCP'))
|
global $mybb, $plugins;
if(defined('IN_ADMINCP'))
|
{
| {
|
$avatarpath = '../'.$mybb->settings['avataruploadpath'];
}
else
| $avatarpath = '../'.$mybb->settings['avataruploadpath'];
}
else
|
| Zeile 168 | Zeile 174 |
|---|
{
delete_uploaded_file($avatarpath."/".$file);
}
|
{
delete_uploaded_file($avatarpath."/".$file);
}
|
}
| }
|
@closedir($dir);
}
|
@closedir($dir);
}
|
| Zeile 188 | Zeile 194 |
|---|
$ret = array();
if(!$uid)
|
$ret = array();
if(!$uid)
|
{
| {
|
$uid = $mybb->user['uid'];
|
$uid = $mybb->user['uid'];
|
}
| }
|
if(!$avatar['name'] || !$avatar['tmp_name'])
|
if(!$avatar['name'] || !$avatar['tmp_name'])
|
{
| {
|
$avatar = $_FILES['avatarupload'];
}
|
$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]))
| if(!is_uploaded_file($avatar['tmp_name']))
|
{
|
{
|
$ret['error'] = $lang->error_avatartype;
| $ret['error'] = $lang->error_uploadfailed;
|
return $ret;
}
|
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'))
{
|
if(defined('IN_ADMINCP'))
{
|
| Zeile 245 | Zeile 238 |
|---|
// Lets just double check that it exists
if(!file_exists($avatarpath."/".$filename))
|
// 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);
| delete_uploaded_file($avatarpath."/".$filename);
|
return $ret;
}
// Check if this is a valid image or not
$img_dimensions = @getimagesize($avatarpath."/".$filename);
if(!is_array($img_dimensions))
|
return $ret;
}
// Check if this is a valid image or not
$img_dimensions = @getimagesize($avatarpath."/".$filename);
if(!is_array($img_dimensions))
|
{
delete_uploaded_file($avatarpath."/".$filename);
| {
delete_uploaded_file($avatarpath."/".$filename);
|
$ret['error'] = $lang->error_uploadfailed;
return $ret;
}
| $ret['error'] = $lang->error_uploadfailed;
return $ret;
}
|
| Zeile 263 | Zeile 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 280 | Zeile 273 |
|---|
}
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
{
$ret['error'] = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);
| else
{
$ret['error'] = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);
|
| Zeile 295 | Zeile 290 |
|---|
}
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
|
// Check a list of known MIME types to establish what kind of avatar we're uploading
|
switch(my_strtolower($avatar['type']))
| $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;
| {
case "image/gif":
$img_type = 1;
|
| Zeile 323 | Zeile 323 |
|---|
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;
|
break;
default:
$img_type = 0;
|
}
| }
|
// 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)
|
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 397 | Zeile 411 |
|---|
return $ret;
}
|
return $ret;
}
|
$attachtypes = $cache->read('attachtypes');
| $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
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;
}
else
{
$attachtype = $attachtypes[$ext];
}
| return $ret;
}
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;
}
// Double check attachment space usage
if($mybb->usergroup['attachquota'] > 0)
|
return $ret;
}
// Double check attachment space usage
if($mybb->usergroup['attachquota'] > 0)
|
{
| {
|
$query = $db->simple_select("attachments", "SUM(filesize) AS ausage", "uid='".$mybb->user['uid']."'");
$usage = $db->fetch_array($query);
$usage = $usage['ausage']+$attachment['size'];
| $query = $db->simple_select("attachments", "SUM(filesize) AS ausage", "uid='".$mybb->user['uid']."'");
$usage = $db->fetch_array($query);
$usage = $usage['ausage']+$attachment['size'];
|
| Zeile 429 | Zeile 460 |
|---|
{
$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 452 | Zeile 483 |
|---|
if(!$mybb->usergroup['caneditattachments'] && !$forumpermissions['caneditattachments'])
{
$ret['error'] = $lang->error_alreadyuploaded_perm;
|
if(!$mybb->usergroup['caneditattachments'] && !$forumpermissions['caneditattachments'])
{
$ret['error'] = $lang->error_alreadyuploaded_perm;
|
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 483 | Zeile 514 |
|---|
if(!@is_dir($mybb->settings['uploadspath']."/".$month_dir))
{
$month_dir = '';
|
if(!@is_dir($mybb->settings['uploadspath']."/".$month_dir))
{
$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 \n</body>\n</html>");
@fclose($index);
}
|
}
}
| }
}
|
| Zeile 653 | Zeile 690 |
|---|
}
}
$ret['aid'] = $aid;
|
}
}
$ret['aid'] = $aid;
|
| | return $ret;
}
/**
* 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)
{
$attach1[$field] = $_FILES['attachments'][$field][$key];
$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(!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;
}
|
| Zeile 665 | Zeile 798 |
|---|
*/
function delete_uploaded_file($path = '')
{
|
*/
function delete_uploaded_file($path = '')
{
|
global $mybb;
| global $mybb, $plugins;
|
$deleted = false;
|
$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))
{
$deleted = $deleted && @unlink($cdn_path);
}
|
if($mybb->settings['usecdn'] && !empty($cdn_base_path))
{
$deleted = $deleted && @unlink($cdn_path);
}
|
| |
$hook_params = array(
'path' => &$path,
'deleted' => &$deleted,
);
$plugins->run_hooks('delete_uploaded_file', $hook_params);
|
return $deleted;
}
|
return $deleted;
}
|
| Zeile 692 | Zeile 831 |
|---|
* @return bool Whether the directory was deleted.
*/
function delete_upload_directory($path = '')
|
* @return bool Whether the directory was deleted.
*/
function delete_upload_directory($path = '')
|
{
global $mybb;
$deleted = false;
$deleted = @rmdir($path);
| {
global $mybb, $plugins;
$deleted = false;
$deleted = @rmdir($path);
|
$cdn_base_path = rtrim($mybb->settings['cdnpath'], '/');
$path = ltrim($path, '/');
|
$cdn_base_path = rtrim($mybb->settings['cdnpath'], '/');
$path = ltrim($path, '/');
|
| Zeile 706 | Zeile 845 |
|---|
if($mybb->settings['usecdn'] && !empty($cdn_base_path))
{
$deleted = $deleted && @rmdir($cdn_path);
|
if($mybb->settings['usecdn'] && !empty($cdn_base_path))
{
$deleted = $deleted && @rmdir($cdn_path);
|
}
| }
$hook_params = array(
'path' => &$path,
'deleted' => &$deleted,
);
$plugins->run_hooks('delete_upload_directory', $hook_params);
|
return $deleted;
}
|
return $deleted;
}
|
| Zeile 726 | Zeile 872 |
|---|
$upload = array();
if(empty($file['name']) || $file['name'] == "none" || $file['size'] < 1)
|
$upload = array();
if(empty($file['name']) || $file['name'] == "none" || $file['size'] < 1)
|
{
| {
|
$upload['error'] = 1;
return $upload;
}
| $upload['error'] = 1;
return $upload;
}
|
| Zeile 740 | Zeile 886 |
|---|
$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)
{
|