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

MediaPicker drag-n-drop upload.

Browse Source
This commit is contained in:
Cameron
2018-07-26 19:13:27 -07:00
parent baf570071e
commit f1329535a5
8 changed files with 222 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
e107_web/js/core/mediaManager.js
View File

@@ -299,6 +299,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
// Path of the Media Manager Item.
var path = $this.attr('data-path');
var preview = $this.attr('data-preview');
var previewHTML = $this.attr('data-preview-html');
var src = $this.attr('data-src');
// TinyMce/Textarea insert mode-
var bbcode = $this.attr('data-bbcode');
@@ -375,7 +376,20 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
$('img#' + target + "_prev", window.top.document).attr('src', preview); // set new value
if(type === 'glyph')
if(previewHTML) // mediapicker() method. New in v2.1.9
{
console.log("Mode: MediaPicker");
console.log("Preview Raw: "+previewHTML);
if($htmlHolder.length > 0)
{
$htmlHolder.val(previewHTML);
}
preview = atob(previewHTML).trim();
}
else if(type === 'glyph')
{
preview = "<span class='" + src + "'>&nbsp;</span>";
@@ -393,17 +407,6 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
{
preview = name;
}
else if(type === 'video' || type === 'audio') // mediapicker() method.
{
console.log("Preview 392: "+preview);
if($htmlHolder.length > 0)
{
$htmlHolder.val(preview);
}
preview = atob(preview).trim();
}
else // image
{
e107.mediaManager.eMediaAttribute($this, bbcode);
@@ -421,7 +424,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
{
preview = preview.replace(e107_plugins_directory, '');
}
console.log("Mode: Image/Video");
console.log("Mode: Image");
}

21
e107_web/js/plupload/upload.php
View File

@@ -47,9 +47,17 @@
$fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : '';
// Clean the fileName for security reasons
$fileName = preg_replace('/[^\w\._]+/', '_', $fileName);
$fileName= 'hello.jpg';
if(!empty($_FILES['file']['name'])) // dropzone support v2.1.9
{
$fileName = $_FILES['file']['name'];
}
// Make sure the fileName is unique but only if chunking is disabled
if($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName))
{
@@ -143,8 +151,10 @@
}
else
{
die('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": "Failed to move uploaded file."}, "id" : "id"}');
die('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": "Failed to move uploaded file. '.ini_get('upload_max_filesize').'"}, "id" : "id"}');
}
}
else
{
@@ -211,6 +221,11 @@
$log['filename'] = $fileName;
$log['filesize'] = $fileSize;
$log['status'] = ($result) ? 'ok' : 'failed';
$log['_files'] = $_FILES;
// $log['_get'] = $_GET;
// $log['_post'] = $_POST;
@@ -218,7 +233,9 @@
e107::getLog()->add('LAN_AL_MEDIA_01', print_r($log, true), $type, 'MEDIA_01');
$array = array("jsonrpc" => "2.0", "result" => $result, "id" => "id");
$preview = e107::getMedia()->previewTag($result);
$array = array("jsonrpc" => "2.0", "result" => $result, "id" => "id", 'preview' => $preview, 'data'=>$_FILES );
echo json_encode($array);
// Return JSON-RPC response