mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-30 19:00:32 +02:00
Code Issues Releases Wiki Activity

Version 1.3.4: Media Library

Browse Source
This commit is contained in:
trendschau
2020-04-07 08:20:22 +02:00
parent aa52181849
commit d41fe5c95d
10 changed files with 70 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
system/Models/ProcessAssets.php
View File

@@ -60,9 +60,9 @@ class ProcessAssets
foreach($folders as $folder)
{
if(!file_exists($folder))
if(!file_exists($folder) && !is_dir( $folder ))
{
if(!mkdir($folder, 0774, true))
if(!mkdir($folder, 0755, true))
{
return false;
}
@@ -75,14 +75,29 @@ class ProcessAssets
$this->generateThumbs();
}
}
elseif(!is_writeable($folder))
elseif(!is_writeable($folder) OR !is_readable($folder))
{
return false;
}
# check if thumb-folder is empty, then generate thumbs from live folder
if($folder == $this->thumbFolder && $this->is_dir_empty($folder))
{
# cleanup old systems
$this->cleanupLiveFolder();
# generate thumbnails from live folder
$this->generateThumbs();
}
}
return true;
}
public function is_dir_empty($dir)
{
return (count(scandir($dir)) == 2);
}
public function setFileName($originalname, $type, $overwrite = null)
{
$pathinfo = pathinfo($originalname);

10
system/Models/ProcessImage.php
View File

@@ -329,9 +329,10 @@ class ProcessImage extends ProcessAssets
{
if (!in_array($name, array(".","..")))
{
$this->generateThumbFromImageFile($name);
$result = $this->generateThumbFromImageFile($name);
}
}
return $result;
}
public function generateThumbFromImageFile($filename)
@@ -354,7 +355,12 @@ class ProcessImage extends ProcessAssets
$thumb = $this->imageResize($image, $originalSize, ['thumbs' => $thumbSize ], $this->extension);
$this->saveImage($this->thumbFolder, $thumb['thumbs'], $this->filename, $this->extension);
$saveImage = $this->saveImage($this->thumbFolder, $thumb['thumbs'], $this->filename, $this->extension);
if($saveImage)
{
return true;
}
return false;
}
public function generateSizesFromImageFile($filename, $image)