mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 00:54:49 +02:00
Code Issues Releases Wiki Activity

Forum now allows for multiple attachments in a single user selection. For update thread/count should now working with PDO.

Browse Source
This commit is contained in:
Cameron
2016-03-21 14:32:02 -07:00
parent d7818345ce
commit bf2db49dd1
6 changed files with 104 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
e107_plugins/forum/forum_post.php
View File

@@ -219,7 +219,9 @@ class forum_post_handler
if(E107_DEBUG_LEVEL > 0)
{
require_once(HEADERF);
e107::getRender()->tablerender('Debug', "Redirecting to: <a href='".$url."'>".$url."</a>");
echo e107::getMessage()->render();
require_once(FOOTERF);
exit;
@@ -781,18 +783,11 @@ class forum_post_handler
{
foreach($uploadResult as $ur)
{
//$postInfo['post_entry'] .= $ur['txt'];
// $_tmp = $ur['type'].'*'.$ur['file'];
// if($ur['thumb']) { $_tmp .= '*'.$ur['thumb']; }
// if($ur['fname']) { $_tmp .= '*'.$ur['fname']; }
$type = $ur['type'];
$newValues[$type][] = $ur['file'];
// $attachments[] = $_tmp;
$newValues[$type][] = array('file'=>$ur['file'], 'name'=>$ur['fname'], 'size'=>$ur['size']);
}
// $postInfo['_FIELD_TYPES']['post_attachments'] = 'array';
$postInfo['post_attachments'] = e107::serialize($newValues); //FIXME XXX - broken encoding when saved to DB.
$postInfo['post_attachments'] = e107::serialize($newValues);
}
// var_dump($uploadResult);
@@ -998,7 +993,7 @@ class forum_post_handler
// $attachments[] = $_tmp;
$type = $ur['type'];
$newValues[$type][] = $ur['file'];
$newValues[$type][] = array('file'=>$ur['file'], 'name'=>$ur['fname'], 'size'=>$ur['size']);
}
$postVals['post_attachments'] = e107::serialize($newValues);
// $postVals['post_attachments'] = implode(',', $attachments);
@@ -1051,10 +1046,26 @@ class forum_post_handler
return;
}
e107::getMessage()->addDebug(print_a($this->data,true));
$postVals['post_edit_datestamp'] = time();
$postVals['post_edit_user'] = USERID;
$postVals['post_entry'] = $_POST['post'];
if($uploadResult = $this->processAttachments())
{
$newValues = e107::unserialize($this->data['post_attachments']);
foreach($uploadResult as $ur)
{
$type = $ur['type'];
$newValues[$type][] = array('file'=>$ur['file'], 'name'=>$ur['fname'], 'size'=>$ur['size']);
}
$postVals['post_attachments'] = e107::serialize($newValues);
}
$this->forumObj->postUpdate($this->data['post_id'], $postVals);
e107::getCache()->clear('newforumposts');
@@ -1100,7 +1111,7 @@ class forum_post_handler
e107::getMessage()->addDebug("Attachment Directory: ".$attachmentDir);
if($uploaded = e107::getFile()->getUploaded($attachmentDir, 'attachment', ''))
if($uploaded = e107::getFile()->getUploaded($attachmentDir, 'attachment', array( 'max_file_count' => 5)))
{
e107::getMessage()->addDebug("Uploaded Data: ".print_a($uploaded,true));
@@ -1178,7 +1189,7 @@ class forum_post_handler
}
if($_txt && $_file)
{
$ret[] = array('type' => $_type, 'txt' => $_txt, 'file' => $_file, 'thumb' => $_thumb, 'fname' => $_fname);
$ret[] = array('type' => $_type, 'txt' => $_txt, 'file' => $_file, 'thumb' => $_thumb, 'fname' => $upload['origname'], 'size'=>$upload['size']);
}
}
else