Zeile 204 | Zeile 204 |
---|
}
// Check we have a valid extension
|
}
// 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; }
| $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 263 | Zeile 250 |
---|
// 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 267 |
---|
} else {
|
} else {
|
| // Copy scaled image to CDN copy_file_to_cdn($avatarpath . '/' . $thumbnail['filename']);
|
// Reset filesize $avatar['size'] = filesize($avatarpath."/".$filename); // Reset dimensions
| // Reset filesize $avatar['size'] = filesize($avatarpath."/".$filename); // Reset dimensions
|
Zeile 299 | Zeile 288 |
---|
} }
|
} }
|
// 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 323 | Zeile 317 |
---|
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 397 | Zeile 405 |
---|
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
| $ext = get_extension($attachment['name']); // Check if we have a valid extension
|
Zeile 414 | Zeile 431 |
---|
// 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']); return $ret;
| { $ret['error'] = $lang->sprintf($lang->error_attachsize, htmlspecialchars_uni($attachment['name']), $attachtype['maxsize']); return $ret;
|
}
// Double check attachment space usage
| }
// Double check attachment space usage
|
Zeile 455 | Zeile 472 |
---|
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 500 |
---|
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 611 | Zeile 634 |
---|
if($forumpermissions['modattachments'] == 1 && !is_moderator($forum['fid'], "canapproveunapproveattachs")) { $attacharray['visible'] = 0;
|
if($forumpermissions['modattachments'] == 1 && !is_moderator($forum['fid'], "canapproveunapproveattachs")) { $attacharray['visible'] = 0;
|
} else {
| } else {
|
$attacharray['visible'] = 1; }
| $attacharray['visible'] = 1; }
|
Zeile 653 | Zeile 676 |
---|
} } $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 784 |
---|
*/ function delete_uploaded_file($path = '') {
|
*/ function delete_uploaded_file($path = '') {
|
global $mybb;
| global $mybb, $plugins;
|
$deleted = false;
| $deleted = false;
|
Zeile 674 | Zeile 793 |
---|
$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 693 | Zeile 818 |
---|
*/ function delete_upload_directory($path = '') {
|
*/ function delete_upload_directory($path = '') {
|
global $mybb;
| global $mybb, $plugins;
|
$deleted = false;
| $deleted = false;
|
Zeile 707 | Zeile 832 |
---|
{ $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);
|
return $deleted; }
| return $deleted; }
|
Zeile 729 | Zeile 861 |
---|
{ $upload['error'] = 1; return $upload;
|
{ $upload['error'] = 1; return $upload;
|
}
| }
|
if(!$filename) {
| if(!$filename) {
|
Zeile 740 | Zeile 872 |
---|
$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) {
|