loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Bugfix upload

This commit is contained in:
Thomas Zilio 2018-07-09 11:29:37 +02:00
parent 25f0f84adb
commit 0ecf1b931f
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/HTMLBuilder/Manager/FileManager.php
View File

@ -27,12 +27,7 @@ class FileManager implements ManagerInterface
$attachment_id = 'attachments_'.$options['id_module'].'-'.$options['id_plugin'];
// Cartella delle anteprime
if (!empty($options['id_plugin'])) {
$directory = '/plugins/'.\Plugins::get($options['id_plugin'])['directory'];
} else {
$directory = \Modules::get($options['id_module'])['directory'];
}
$directory = basename($directory);
$directory = \Uploads::getUploadDirectory($options['id_module'], $options['id_plugin']);
$dbo = \Database::getConnection();
@ -83,8 +78,8 @@ class FileManager implements ManagerInterface
$result .= '
<tr>
<td align="left">
<a href="'.ROOTDIR.'/files/'.\Modules::get($options['id_module'])['directory'].'/'.$r['filename'].'" target="_blank">
<i class="fa fa-external-link"></i> '.$r['nome'].'
<a href="'.ROOTDIR.'/'.$directory.'/'.$r['filename'].'" target="_blank">
<i class="fa fa-external-link"></i> '.$r['nome'].$directory.'
</a>
</td>
<td>'.\Translator::timestampToLocale($r['created_at']).'</td>
@ -102,10 +97,10 @@ class FileManager implements ManagerInterface
if ($extension == 'pdf') {
$result .= '
<iframe src="'.\Prints::getPDFLink('files/'.$directory.'/'.$r['filename']).'" frameborder="0" width="100%" height="550"></iframe>';
<iframe src="'.\Prints::getPDFLink($directory.'/'.$r['filename']).'" frameborder="0" width="100%" height="550"></iframe>';
} else {
$result .= '
<img src="'.ROOTDIR.'/files/'.$directory.'/'.$r['filename'].'" width="100%"></img>';
<img src="'.ROOTDIR.'/'.$directory.'/'.$r['filename'].'" width="100%"></img>';
}
$result .= '

2
src/Uploads.php
View File

@ -128,7 +128,7 @@ class Uploads
$info = Plugins::get($id_plugin);
if (!empty($info['script'])) {
$directory = self::fileInfo($info['script'])['name'];
$directory = self::fileInfo($info['script'])['filename'];
} else {
$directory = $info['directory'];
}