ifhub/ifhub.club
1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-05-19 09:18:18 +03:00
Code Issues Releases Wiki Activity

Доработка модуля Media #704

Browse source
This commit is contained in:
Mzhelskiy Maxim 2015-09-28 16:20:22 +07:00
parent 94400bfc28
commit 0065604be4
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/classes/actions/ActionBlog.class.php
View file

@ -2093,8 +2093,8 @@ class ActionBlog extends Action
* Храним две копии - мелкую для показа пользователю и крупную в качестве исходной для ресайза
*/
$sDir = Config::Get('path.uploads.images') . "/tmp/blog/{$oBlog->getId()}";
if ($sFileOriginal = $oImage->resize(1000, null)->saveSmart($sDir, 'original')) {
if ($sFilePreview = $oImage->resize(350, null)->saveSmart($sDir, 'preview')) {
if ($sFileOriginal = $oImage->resize(1000, null)->saveSmart($sDir, 'original', array('skip_watermark' => true))) {
if ($sFilePreview = $oImage->resize(350, null)->saveSmart($sDir, 'preview', array('skip_watermark' => true))) {
list($iOriginalWidth, $iOriginalHeight) = @getimagesize($this->Fs_GetPathServer($sFileOriginal));
list($iWidth, $iHeight) = @getimagesize($this->Fs_GetPathServer($sFilePreview));
/**

4
application/classes/actions/ActionSettings.class.php
View file

@ -142,8 +142,8 @@ class ActionSettings extends Action
$sDir = Config::Get('path.uploads.images') . "/tmp/userphoto/{$oUser->getId()}";
$aPhotoSizes = $this->Media_ParsedImageSize(Config::Get('module.user.profile_photo_size'));
$sSaveWidth = $aPhotoSizes['w'] > 1000 ? $aPhotoSizes['w'] : 1000;
if ($sFileOriginal = $oImage->resize($sSaveWidth, null)->saveSmart($sDir, 'original')) {
if ($sFilePreview = $oImage->resize(350, null)->saveSmart($sDir, 'preview')) {
if ($sFileOriginal = $oImage->resize($sSaveWidth, null)->saveSmart($sDir, 'original', array('skip_watermark' => true))) {
if ($sFilePreview = $oImage->resize(350, null)->saveSmart($sDir, 'preview', array('skip_watermark' => true))) {
list($iOriginalWidth, $iOriginalHeight) = @getimagesize($this->Fs_GetPathServer($sFileOriginal));
list($iWidth, $iHeight) = @getimagesize($this->Fs_GetPathServer($sFilePreview));
/**

5
application/classes/modules/media/Media.class.php
View file

@ -449,11 +449,12 @@ class ModuleMedia extends ModuleORM
$sFileName = func_generator(20);
/**
* Сохраняем оригинальную копию
* Оригинал храним без вотермарка
*/
$sFileResult = null;
$mOriginalSize = $this->GetConfigParam('image.original', $sTargetType);
if ($mOriginalSize === true) {
if (!$sFileResult = $oImage->saveSmart($sPath, $sFileName)) {
if (!$sFileResult = $oImage->saveSmart($sPath, $sFileName, array('skip_watermark' => true))) {
$this->Fs_RemoveFileLocal($sFileTmp);
return $this->Image_GetLastError();
}
@ -465,7 +466,7 @@ class ModuleMedia extends ModuleORM
if ($aOriginalSize['crop']) {
$oImage->cropProportion($aOriginalSize['w'] / $aOriginalSize['h'], 'center');
}
if (!$sFileResult = $oImage->resize($aOriginalSize['w'], $aOriginalSize['h'], true)->saveSmart($sPath, $sFileName)
if (!$sFileResult = $oImage->resize($aOriginalSize['w'], $aOriginalSize['h'], true)->saveSmart($sPath, $sFileName, array('skip_watermark' => true))
) {
$this->Fs_RemoveFileLocal($sFileTmp);
return $this->Image_GetLastError();

2
framework

@ -1 +1 @@
Subproject commit 19d7f4801f4c6a3ef835c30041645849d5dc891d
Subproject commit 54f76be0b09c5e126f13628b5e73e63c49734318