mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-24 19:23:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3046 from acs-ferreira/patch-4

Browse Source 
Clean
This commit is contained in:
Lucas Bartholemy 2018-02-25 19:29:42 +01:00 committed by GitHub
commit fe173cda3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
protected/humhub/modules/file/libs/FileHelper.php
View File

@ -9,14 +9,15 @@
namespace humhub\modules\file\libs;
use humhub\modules\file\widgets\FileDownload;
use Yii;
use yii\helpers\Url;
use humhub\libs\Html;
use humhub\libs\MimeHelper;
use humhub\modules\file\models\File;
use humhub\modules\file\handler\FileHandlerCollection;
use humhub\modules\file\handler\DownloadFileHandler;
use humhub\modules\file\converter\PreviewImage;
use humhub\modules\content\components\ContentActiveRecord;
use Yii;
use yii\helpers\Url;
/**
* FileHelper
@ -35,7 +36,7 @@ class FileHelper extends \yii\helpers\FileHelper
*/
public static function hasExtension($fileName)
{
return (strpos($fileName, ".") !== false);
return (strpos($fileName, '.') !== false);
}
/**
@ -54,6 +55,7 @@ class FileHelper extends \yii\helpers\FileHelper
if (isset($fileParts['extension'])) {
return $fileParts['extension'];
}
return '';
}
@ -76,6 +78,7 @@ class FileHelper extends \yii\helpers\FileHelper
}
$htmlOptions = array_merge($htmlOptions, ['data-target' => '#globalModal']);
return Html::a($label, Url::to(['/file/view', 'guid' => $file->guid]), $htmlOptions);
}
@ -90,7 +93,7 @@ class FileHelper extends \yii\helpers\FileHelper
{
$relation = $file->getPolymorphicRelation();
if ($relation !== null && $relation instanceof \humhub\modules\content\components\ContentActiveRecord) {
if ($relation !== null && $relation instanceof ContentActiveRecord) {
if ($relation->content->container !== null) {
return $relation->content->container;
}
@ -124,7 +127,7 @@ class FileHelper extends \yii\helpers\FileHelper
'size_format' => Yii::$app->formatter->asShortSize($file->size, 1),
'url' => $file->getUrl(),
'openLink' => FileHelper::createLink($file),
'thumbnailUrl' => $thumbnailUrl,
'thumbnailUrl' => $thumbnailUrl
];
}