mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-11 08:34:45 +02:00
Code Issues Releases Wiki Activity

Moved logo to image folder

Browse Source
This commit is contained in:
trendschau
2021-12-15 16:48:10 +01:00
parent aec4dbb934
commit cfa7b7be32
7 changed files with 199 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/Models/ProcessFile.php
View File

@@ -13,7 +13,7 @@ class ProcessFile extends ProcessAssets
* @param UploadedFile $uploadedFile file uploaded file to move
* @return string filename of moved file
*/
public function moveUploadedFile(UploadedFile $uploadedFile, $overwrite = false, $name = false)
public function moveUploadedFile(UploadedFile $uploadedFile, $overwrite = false, $name = false, $folder = NULL)
{
$this->setFileName($uploadedFile->getClientFilename(), 'file');
@@ -104,7 +104,7 @@ class ProcessFile extends ProcessAssets
if($name != '' && !in_array($name, array(".","..")))
{
foreach(glob($this->fileFolder . $name . '.*') as $file)
foreach(glob($this->fileFolder . $name) as $file)
{
unlink($file);
}

56
system/Models/ProcessImage.php
View File

@@ -1,6 +1,7 @@
<?php
namespace Typemill\Models;
use Slim\Http\UploadedFile;
use Typemill\Models\Helpers;
class ProcessImage extends ProcessAssets
@@ -261,6 +262,32 @@ class ProcessImage extends ProcessAssets
return false;
}
/**
* Moves the uploaded file to the upload directory. Only used for settings / NON VUE.JS uploads
*
* @param string $directory directory to which the file is moved
* @param UploadedFile $uploadedFile file uploaded file to move
* @return string filename of moved file
*/
public function moveUploadedImage(UploadedFile $uploadedFile, $overwrite = false, $name = false, $folder = NULL)
{
$this->setFileName($uploadedFile->getClientFilename(), 'file');
if($name)
{
$this->setFileName($name . '.' . $this->extension, 'file', $overwrite);
}
if(!$folder)
{
$folder = $this->liveFolder;
}
$uploadedFile->moveTo($folder . $this->getFullName());
return $this->getFullName();
}
public function deleteImage($name)
{
@@ -301,6 +328,35 @@ class ProcessImage extends ProcessAssets
return $result;
}
public function deleteImageWithName($name)
{
# e.g. delete $name = 'logo...';
$name = basename($name);
if($name != '' && !in_array($name, array(".","..")))
{
foreach(glob($this->liveFolder . $name) as $file)
{
unlink($file);
}
foreach(glob($this->originalFolder . $name) as $file)
{
unlink($file);
}
foreach(glob($this->thumbFolder . $name) as $file)
{
unlink($file);
}
}
}
public function copyImage($name,$sourcefolder,$targetfolder)
{
copy($sourcefolder . $name, $targetfolder . $name);
}
/*
* scans content of a folder (without recursion)
* vars: folder path as string