diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-10-19 15:36:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-10-19 15:36:45 +0000 |
| commit | e7c3370a043fe4f163fcc4b3b529d1c78093c0f2 (patch) | |
| tree | ede3cf8366d0ce1cd4e40c2b82b8056813b27c36 /phpBB/includes/functions_posting.php | |
| parent | de53ffabb410f7db9eb807a2965b02d19e314cc0 (diff) | |
| download | forums-e7c3370a043fe4f163fcc4b3b529d1c78093c0f2.tar forums-e7c3370a043fe4f163fcc4b3b529d1c78093c0f2.tar.gz forums-e7c3370a043fe4f163fcc4b3b529d1c78093c0f2.tar.bz2 forums-e7c3370a043fe4f163fcc4b3b529d1c78093c0f2.tar.xz forums-e7c3370a043fe4f163fcc4b3b529d1c78093c0f2.zip | |
bump topic and orphan attachments
changes here and there...
git-svn-id: file:///svn/phpbb/trunk@4614 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index f63b797373..677bdc08bd 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -47,7 +47,6 @@ function generate_smilies($mode, $forum_id) FROM ' . SMILIES_TABLE . ' WHERE display_on_posting = 0'; $result = $db->sql_query_limit($sql, 1, 0, 3600); - $row = $db->sql_fetchrow($result); if ($row = $db->sql_fetchrow($result)) { @@ -194,7 +193,7 @@ function update_last_post_information($type, $id) } // Upload Attachment - filedata is generated here -function upload_attachment($filename) +function upload_attachment($filename, $local = false, $local_storage = '') { global $auth, $user, $config, $db; @@ -208,8 +207,8 @@ function upload_attachment($filename) } $r_file = $filename; - $file = $_FILES['fileupload']['tmp_name']; - $filedata['mimetype'] = $_FILES['fileupload']['type']; + $file = (!$local) ? $_FILES['fileupload']['tmp_name'] : $local_storage; + $filedata['mimetype'] = (!$local) ? $_FILES['fileupload']['type'] : 'application/octet-stream'; // Opera add the name to the mime type $filedata['mimetype'] = ( strstr($filedata['mimetype'], '; name') ) ? str_replace(strstr($filedata['mimetype'], '; name'), '', $filedata['mimetype']) : $filedata['mimetype']; @@ -239,7 +238,7 @@ function upload_attachment($filename) } // check php upload-size - if ( ($file == 'none') ) + if ($file == 'none') { $filedata['error'][] = (@ini_get('upload_max_filesize') == '') ? $user->lang['ATTACHMENT_PHP_SIZE_NA'] : sprintf($user->lang['ATTACHMENT_PHP_SIZE_OVERRUN'], @ini_get('upload_max_filesize')); $filedata['post_attach'] = FALSE; @@ -304,6 +303,7 @@ function upload_attachment($filename) // Descide the Upload method $upload_mode = (@ini_get('open_basedir') || @ini_get('safe_mode')) ? 'move' : 'copy'; + $upload_mode = ($local) ? 'local' : $upload_mode; // Ok, upload the File $result = move_uploaded_attachment($upload_mode, $file, $filedata); @@ -319,40 +319,50 @@ function upload_attachment($filename) // Move/Upload File - could be used for Avatars too ? function move_uploaded_attachment($upload_mode, $source_filename, &$filedata) { - global $user, $config; + global $user, $config, $phpbb_root_path; + $upload_dir = ($config['upload_dir'][0] == '/' || ($config['upload_dir'][0] != '/' && $config['upload_dir'][1] == ':')) ? $config['upload_dir'] : $phpbb_root_path . $config['upload_dir']; $destination_filename = $filedata['destination_filename']; $thumbnail = (isset($filedata['thumbnail'])) ? $filedata['thumbnail'] : FALSE; switch ($upload_mode) { case 'copy': - if ( !@copy($source_filename, $config['upload_dir'] . '/' . $destination_filename) ) + if ( !@copy($source_filename, $upload_dir . '/' . $destination_filename) ) { - if ( !@move_uploaded_file($source_filename, $config['upload_dir'] . '/' . $destination_filename) ) + if ( !@move_uploaded_file($source_filename, $upload_dir . '/' . $destination_filename) ) { - return sprintf($user->lang['GENERAL_UPLOAD_ERROR'], './' . $config['upload_dir'] . '/' . $destination_filename); + return sprintf($user->lang['GENERAL_UPLOAD_ERROR'], $upload_dir . '/' . $destination_filename); } } - @chmod($config['upload_dir'] . '/' . $destination_filename, 0666); + @chmod($upload_dir . '/' . $destination_filename, 0666); break; case 'move': - if ( !@move_uploaded_file($source_filename, $config['upload_dir'] . '/' . $destination_filename) ) + if ( !@move_uploaded_file($source_filename, $upload_dir . '/' . $destination_filename) ) { - if ( !@copy($source_file, $config['upload_dir'] . '/' . $destination_filename) ) + if ( !@copy($source_file, $upload_dir . '/' . $destination_filename) ) { - return sprintf($user->lang['GENERAL_UPLOAD_ERROR'], './' . $config['upload_dir'] . '/' . $destination_filename); + return sprintf($user->lang['GENERAL_UPLOAD_ERROR'], $upload_dir . '/' . $destination_filename); } } - @chmod($config['upload_dir'] . '/' . $destination_filename, 0666); + @chmod($upload_dir . '/' . $destination_filename, 0666); + break; + + case 'local': + if (!@copy($source_filename, $upload_dir . '/' . $destination_filename)) + { + return sprintf($user->lang['GENERAL_UPLOAD_ERROR'], $upload_dir . '/' . $destination_filename); + } + @chmod($upload_dir . '/' . $destination_filename, 0666); + @unlink($source_filename); break; } if ($filedata['thumbnail']) { - $source = $config['upload_dir'] . '/' . $destination_filename; - $destination = $config['upload_dir'] . '/thumbs/t_' . $destination_filename; + $source = $upload_dir . '/' . $destination_filename; + $destination = $upload_dir . '/thumbs/t_' . $destination_filename; if (!create_thumbnail($source, $destination, $filedata['mimetype'])) { |