mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00
Code Issues Releases Wiki Activity

Issue #2869 Media-Manager: Auto-convert to jpeg option added.

Browse Source
This commit is contained in:
Cameron
2017-11-16 20:17:07 -08:00
parent a6ede510a9
commit c10d350d8b
4 changed files with 183 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,8 +183,22 @@
rename("{$filePath}.part", $filePath);
}
$filePath = str_replace('//','/',$filePath); // cleanup .
$convertToJpeg = e107::getPref('convert_to_jpeg', 0);
$fileSize = filesize($filePath);
if(varset($_GET['for']) !== '_icon' && !empty($convertToJpeg))
{
if($jpegFile = e107::getMedia()->convertImageToJpeg($filePath, true))
{
$filePath = $jpegFile;
$fileName = basename($filePath);
$fileSize = filesize($jpegFile);
}
}
// rename($targetDir.$fileName,e_MEDIA."images/2012-05/",$fileName);
if($_GET['for'] != '') // leave in upload directory if no category given.
{
$uploadPath = varset($_GET['path'],null);
@@ -192,13 +206,17 @@
}
$log = $_GET;
$log['filepath'] = $filePath;
$log = e107::getParser()->filter($_GET,'str');
$log['filepath'] = str_replace('../','',$filePath);
$log['filename'] = $fileName;
$log['filesize'] = $fileSize;
$log['status'] = ($result) ? 'ok' : 'failed';
$type = ($result) ? E_LOG_INFORMATIVE : E_LOG_WARNING;
e107::getLog()->add('Media Upload', print_r($log, true), $type, MEDIA_01);
e107::getLog()->add('LAN_AL_MEDIA_01', print_r($log, true), $type, 'MEDIA_01');
$array = array("jsonrpc" => "2.0", "result" => $result, "id" => "id");