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

Issue #1974 - Media-Manager file-mode: Added Option to remove selected file. Fixes #1959 - allow for more than one media-category of a particular type during plugin installation. Issue #6 LAN fix on "Choose a file".

Browse Source
This commit is contained in:
Cameron
2016-10-31 20:34:59 -07:00
parent 7041f9b6a8
commit dc6754d0e8
10 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e107_admin/image.php
View File

@@ -585,7 +585,9 @@ class media_form_ui extends e_admin_form_ui
$for = $this->getController()->getQuery('for');
if(strpos($for, '_file') !==false)
if(strpos($for, '_file') !==false )
{
$type = 'file';
}
@@ -1017,7 +1019,7 @@ class media_admin_ui extends e_admin_ui
function dialogPage() // Popup dialogPage for Image Selection.
{
$cat = $this->getQuery('for');
$file = (substr($cat,-5) == "_file") ? TRUE : FALSE;
$file = (preg_match('/_file(_[\d]{1,2})?$/',$cat)) ? TRUE : FALSE;
$mes = e107::getMessage();
$mes->addDebug("For:".$cat);
$mes->addDebug("Bbcode: ".$this->getQuery('bbcode'));
@@ -1048,8 +1050,17 @@ class media_admin_ui extends e_admin_ui
{
$this->fields[$k]['filter'] = false;
}
echo $this->mediaSelectUpload('file');
echo $this->mediaSelectUpload('file');
$tagid = e107::getParser()->filter($this->getQuery('tagid'));
echo '<div class="media-select-file-footer"><a class="btn btn-danger e-media-select-file-none e-dialog-close" data-target="'.$tagid.'" data-target-label="'.LAN_CHOOSE_FILE.'" href="#" ><span><i class="fa fa-ban"></i> '.IMALAN_167.'</span></a></div>';
}
else
{
@@ -1071,7 +1082,7 @@ class media_admin_ui extends e_admin_ui
}
// if 'for' has no value, files are placed in /temp and not added to the db.
$text = IMALAN_145;
$text = "<h4>".IMALAN_145."</h4>";
$text .= '<div id="uploader" rel="'.e_JS.'plupload/upload.php?for='.$this->getQuery('for').'">
<p>'.IMALAN_146.'</p>
</div>';
@@ -1080,7 +1091,7 @@ class media_admin_ui extends e_admin_ui
$text .= $frm->open('upload-url-form','post');
$text .= '<div class="plupload_header_content">';
$text .= IMALAN_147;
$text .= "<h4>".IMALAN_147."</h4>";
$text .= "<div class='plupload_header_text form-inline' style='padding-left:20px;padding-right:20px'>";
$text .= "<table class='table'>";