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

bug fixes and permission tests

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-01-22 21:56:01 +01:00
parent 91c84e20d8
commit 2eed4a63b6
3 changed files with 61 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Admin/Installer.php
View File

@ -100,12 +100,6 @@ final class Installer extends InstallerAbstract
*/
public static function installExternal(ApplicationAbstract $app, array $data) : array
{
try {
$app->dbPool->get()->con->query('select 1 from `media`');
} catch (\Exception $e) {
return []; // @codeCoverageIgnore
}
if (!\is_file($data['path'] ?? '')) {
throw new PathException($data['path'] ?? '');
}
@ -276,7 +270,16 @@ final class Installer extends InstallerAbstract
$media->size = $uFile['size'];
$media->createdBy = new NullAccount((int) $data['user'] ?? 1);
$media->extension = $uFile['extension'];
$media->setVirtualPath((string) ($data['virtualPath'] ?? '/'));
// Use defined virtual path if no collection is used.
// If a collection is created modify the virtual path so that it is the virtual path + the collection name for the uploaded files
$media->setVirtualPath((string) (
$data['create_collection']
? \rtrim($data['virtualPath'] ?? '/', '/') . '/' . ((string) $data['name'] ?? '')
: ($data['virtualPath'] ?? '/')
)
);
$media->type = $data['media_type'] ?? null; // = identifier for modules
MediaMapper::create()->execute($media);

2
Controller/ApiController.php
View File

@ -294,7 +294,7 @@ final class ApiController extends Controller
$media->createdBy = new NullAccount($account);
$media->extension = $status['extension'];
$media->setVirtualPath($virtualPath);
$media->type = \is_int($type) ? new NullMediaType($type) : null;
$media->type = $type === null ? null : new NullMediaType($type);
MediaMapper::create()->execute($media);

54
Controller/BackendController.php
View File

@ -17,16 +17,20 @@ namespace Modules\Media\Controller;
use Model\NullSetting;
use Model\SettingMapper;
use Modules\Admin\Models\Account;
use Modules\Admin\Models\PermissionAbstractMapper;
use Modules\Media\Models\Collection;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\Media;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\MediaTypeMapper;
use Modules\Media\Models\MediaTypeL11nMapper;
use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PermissionState;
use Modules\Media\Theme\Backend\Components\Media\ElementView;
use Modules\Media\Theme\Backend\Components\Media\ListView;
use Modules\Media\Views\MediaView;
use phpOMS\Account\PermissionType;
use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
@ -72,9 +76,51 @@ final class BackendController extends Controller
$path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
$hasPermission = $this->app->accountManager->get($request->header->account)
->hasPermission(
PermissionType::READ,
$this->app->orgId,
$this->app->appName,
self::NAME,
PermissionState::MEDIA,
);
$mediaMapper = MediaMapper::getByVirtualPath($path)->where('tags/title/language', $request->getLanguage());
if (!$hasPermission) {
$permWhere = PermissionAbstractMapper::helper($this->app->dbPool->get('select'))
->groups($this->app->accountManager->get($request->header->account)->getGroupIds())
->account($request->header->account)
->units([null, $this->app->orgId])
->apps([null, 'Api', $this->app->appName])
->modules([null, self::NAME])
->types([null, PermissionState::MEDIA])
->permission(PermissionType::READ)
->query(MediaMapper::PRIMARYFIELD);
$mediaMapper ->where('', $permWhere);
}
/** @var Media[] $media */
$media = MediaMapper::getByVirtualPath($path)->where('tags/title/language', $request->getLanguage())->execute();
$collection = CollectionMapper::getParentCollection($path)->where('tags/title/language', $request->getLanguage())->execute();
$media = $mediaMapper->execute();
$collectionMapper = CollectionMapper::getParentCollection($path)->where('tags/title/language', $request->getLanguage());
if (!$hasPermission) {
$permWhere = PermissionAbstractMapper::helper($this->app->dbPool->get('select'))
->groups($this->app->accountManager->get($request->header->account)->getGroupIds())
->account($request->header->account)
->units([null, $this->app->orgId])
->apps([null, 'Api', $this->app->appName])
->modules([null, self::NAME])
->types([null, PermissionState::MEDIA])
->permission(PermissionType::READ)
->query(MediaMapper::PRIMARYFIELD);
$collectionMapper ->where('', $permWhere);
}
$collection = $collectionMapper->execute();
if (\is_array($collection) && \is_dir(__DIR__ . '/../Files' . $path)) {
$collection = new Collection();
@ -84,12 +130,12 @@ final class BackendController extends Controller
$collection->isAbsolute = false;
}
if ($collection instanceof Collection) {
if ($collection instanceof Collection && !($collection instanceof NullCollection)) {
$media += $collection->getSources();
/** @var string[] $glob */
$glob = $collection->isAbsolute
? $collection->getPath() . '/' . $collection->name . '/*'
? \glob($collection->getPath() . '/' . $collection->name . '/*')
: \glob(__DIR__ . '/../Files/' . \trim($collection->getVirtualPath(), '/') . '/' . $collection->name . '/*');
$glob = $glob === false ? [] : $glob;