mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 05:07:27 +02:00
Code Issues Releases Wiki Activity

Uploading of attachments almost working. Held up by _FIELD_TYPES mess.

Browse Source
This commit is contained in:
Cameron
2013-03-31 00:43:18 -07:00
parent eae211fc63
commit 0c5f1ec880
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_plugins/forum/forum_class.php
View File

@@ -148,8 +148,9 @@ class e107forum
} }
function getAttachmentPath($user=0) function getAttachmentPath($user)
{ {
$user = intval($user);
$tp = e107::getParser(); $tp = e107::getParser();
$baseDir = e_MEDIA.'plugins/forum/attachments/'; $baseDir = e_MEDIA.'plugins/forum/attachments/';
$baseDir .= ($user) ? "user_". $tp->leadingZeros($user, 6) : "anon"; $baseDir .= ($user) ? "user_". $tp->leadingZeros($user, 6) : "anon";
@@ -852,7 +853,7 @@ class e107forum
} }
$info = array(); $info = array();
$info['data'] = $tmp; $info['data'] = $tmp;
$info['_FILE_TYPES']['post_attachments'] = 'escape'; $info['_FILE_TYPES']['post_attachments'] = 'array';
$info['WHERE'] = 'post_id = '.$id; $info['WHERE'] = 'post_id = '.$id;
$sql->update('forum_post', $info); $sql->update('forum_post', $info);
} }

44
e107_plugins/forum/forum_post.php
View File

@@ -251,12 +251,16 @@ if (isset($_POST['newthread']) || isset($_POST['reply']))
foreach($uploadResult as $ur) foreach($uploadResult as $ur)
{ {
//$postInfo['post_entry'] .= $ur['txt']; //$postInfo['post_entry'] .= $ur['txt'];
$_tmp = $ur['type'].'*'.$ur['file']; // $_tmp = $ur['type'].'*'.$ur['file'];
if($ur['thumb']) { $_tmp .= '*'.$ur['thumb']; } // if($ur['thumb']) { $_tmp .= '*'.$ur['thumb']; }
if($ur['fname']) { $_tmp .= '*'.$ur['fname']; } // if($ur['fname']) { $_tmp .= '*'.$ur['fname']; }
$attachments[] = $_tmp;
$type = $ur['type'];
$newValues[$type][] = basename($ur['fname']);
// $attachments[] = $_tmp;
} }
$postInfo['post_attachments'] = implode(',', $attachments); // $postInfo['_FIELD_TYPES']['post_attachments'] = 'array'; //XXX Horrible "FIELD_TYPES" idea.
$postInfo['post_attachments'] = e107::getArrayStorage()->write($newValues); //FIXME
} }
// var_dump($uploadResult); // var_dump($uploadResult);
@@ -554,16 +558,22 @@ function process_upload()
$postId = (int)$postId; $postId = (int)$postId;
$ret = array(); $ret = array();
// var_dump($_FILES);
if (isset($_FILES['file_userfile']['error'])) if (isset($_FILES['file_userfile']['error']))
{ {
require_once(e_HANDLER.'upload_handler.php'); require_once(e_HANDLER.'upload_handler.php');
$attachmentDir = e_PLUGIN.'forum/attachments/';
$thumbDir = e_PLUGIN.'forum/attachments/thumb/'; $attachmentDir = $forum->getAttachmentPath(USERID);
if(!is_dir($attachmentDir))
{
mkdir($attachmentDir,0755);
}
// $thumbDir = e_PLUGIN.'forum/attachments/thumb/';
if ($uploaded = process_uploaded_files($attachmentDir, 'attachment', '')) if ($uploaded = process_uploaded_files($attachmentDir, 'attachment', ''))
{ {
foreach($uploaded as $upload) foreach($uploaded as $upload)
{ {
if ($upload['error'] == 0) if ($upload['error'] == 0)
@@ -573,11 +583,14 @@ function process_upload()
$_file = ''; $_file = '';
$_thumb = ''; $_thumb = '';
$_fname = ''; $_fname = '';
$fpath = '{e_PLUGIN}forum/attachments/'; $fpath = '';
if(strstr($upload['type'], 'image')) if(strstr($upload['type'], 'image'))
{ {
$_type = 'img'; $_type = 'img';
if($forum->prefs->get('maxwidth', 0) > 0)
//XXX v2.x Image-resizing is now dynamic.
/*if($forum->prefs->get('maxwidth', 0) > 0)
{ {
require_once(e_HANDLER.'resize_handler.php'); require_once(e_HANDLER.'resize_handler.php');
$orig_file = $upload['name']; $orig_file = $upload['name'];
@@ -612,10 +625,12 @@ function process_upload()
} }
} }
else else
*/
{ //resizing disabled, show original { //resizing disabled, show original
$parms = image_getsize($attachmentDir.$upload['name']); // $parms = image_getsize($attachmentDir.$upload['name']);
//resizing disabled, show original //resizing disabled, show original
$_txt = "[br]<div class='spacer'>[img{$parms}]".$fpath.$upload['name']."[/img]</div>\n"; $_txt = "[br][img]".$fpath.$upload['name']."[/img]\n";
$_file = $upload['name']; $_file = $upload['name'];
} }
} }
@@ -638,9 +653,14 @@ function process_upload()
echo 'Error in uploaded file: '.(isset($upload['rawname']) ? $upload['rawname'] : $upload['name']).'<br />'; echo 'Error in uploaded file: '.(isset($upload['rawname']) ? $upload['rawname'] : $upload['name']).'<br />';
} }
} }
return $ret; return $ret;
} }
} }
//exit;
} }
function image_getsize($fname) function image_getsize($fname)