Jingga/oms-Media
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Media.git synced 2026-02-17 01:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-24 18:44:22 +01:00
parent 249e2f65ad
commit e8008ab855
10 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controller/ApiController.php
View File

@ -32,9 +32,9 @@ use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\FileUtils;
use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\System\File\FileUtils;
/** /**
* Media class. * Media class.
@ -113,7 +113,7 @@ final class ApiController extends Controller
* @param array $files Files * @param array $files Files
* @param int $account Uploader * @param int $account Uploader
* @param string $basePath Base path. The path which is used for the upload. * @param string $basePath Base path. The path which is used for the upload.
* @param string $virtualPath Virtual path The path which is used to visually structure the files, like directories. * @param string $virtualPath virtual path The path which is used to visually structure the files, like directories
* @param string $type Media type (internal/custom media categorization) * @param string $type Media type (internal/custom media categorization)
* The file storage on the system can be different * The file storage on the system can be different
* @param string $password File password. The password to protect the file (only database) * @param string $password File password. The password to protect the file (only database)

6
Models/CollectionMapper.php
View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\Media\Models; namespace Modules\Media\Models;
use phpOMS\DataStorage\Database\RelationType;
use Modules\Admin\Models\Account; use Modules\Admin\Models\Account;
use phpOMS\DataStorage\Database\RelationType;
/** /**
* Mapper class. * Mapper class.
@ -122,11 +122,11 @@ final class CollectionMapper extends MediaMapper
*/ */
public static function getCollectionsByPath(string $path, bool $showDirectories = false) : array public static function getCollectionsByPath(string $path, bool $showDirectories = false) : array
{ {
$collection = CollectionMapper::getByVirtualPath($path); $collection = self::getByVirtualPath($path);
$parent = []; $parent = [];
if ($showDirectories) { if ($showDirectories) {
$parent = CollectionMapper::getParentCollection($path); $parent = self::getParentCollection($path);
if (\is_array($parent) && \is_dir(__DIR__ . '/../../Media/Files' . $path)) { if (\is_array($parent) && \is_dir(__DIR__ . '/../../Media/Files' . $path)) {
$parent = new Collection(); $parent = new Collection();
$parent->name = \basename($path); $parent->name = \basename($path);