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

Media Manager Issue #3426

Browse Source
This commit is contained in:
Cameron
2018-09-10 12:31:31 -07:00
parent 688db76a96
commit 775cf26b98
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_plugins/tinymce4/plugins/e107/mediamanager.php
View File

@@ -6,6 +6,11 @@ $types = array('img','video','glyph');
$bbcode = in_array(e_QUERY,$types) ? e_QUERY : 'img'; $bbcode = in_array(e_QUERY,$types) ? e_QUERY : 'img';
if($bbcode === 'video')
{
$bbcode .= '&youtube=1';
}
header("Location: ".e_ADMIN_ABS.'image.php?mode=main&action=dialog&for='.$_SESSION['media_category'].'&tagid=&iframe=1&bbcode='.$bbcode, true); header("Location: ".e_ADMIN_ABS.'image.php?mode=main&action=dialog&for='.$_SESSION['media_category'].'&tagid=&iframe=1&bbcode='.$bbcode, true);
exit; exit;

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

@@ -234,12 +234,13 @@
} }
if(!empty($_GET['for'])) // leave in upload directory if no category given.
if($_GET['for'] != '') // leave in upload directory if no category given.
{ {
$uploadPath = varset($_GET['path'],null); $uploadPath = varset($_GET['path'],null);
$result = e107::getMedia()->importFile($fileName, $_GET['for'], array('path'=>$uploadPath)); $for = $tp->filter($_GET['for']);
$for = str_replace(array('+','^'),'', $for);
$result = e107::getMedia()->importFile($fileName, $for, array('path'=>$uploadPath));
} }