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

Continue with getter/setter cleanup

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:21 +02:00
parent 3b8540bf6d
commit cbb94ae6e8
9 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Settings/Theme/Backend/settings.tpl.php
View File

@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Media\Models\MediaType[] $types
*/
$types = $this->getData('types') ?? [];
$types = $this->data['types'] ?? [];
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

6
Controller/ApiController.php
View File

@ -1132,7 +1132,7 @@ final class ApiController extends Controller
$this->setMediaResponseHeader($media, $request, $response);
$view = $this->createView($media, $request, $response);
$view->setData('path', __DIR__ . '/../../../');
$view->data['path'] = __DIR__ . '/../../../';
$response->set('export', $view);
}
@ -1183,7 +1183,7 @@ final class ApiController extends Controller
public function createView(Media $media, RequestAbstract $request, ResponseAbstract $response) : View
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setData('media', $media);
$view->data['media'] = $media;
if (!\headers_sent()) {
$response->endAllOutputBuffering(); // for large files
@ -1202,7 +1202,7 @@ final class ApiController extends Controller
$head->setStyle('core', $css ?? '');
$head->addAsset(AssetType::CSS, 'cssOMS/styles.css?v=1.0.0');
$view->setData('head', $head);
$view->data['head'] = $head;
switch (\strtolower($media->extension)) {
case 'xls':

36
Controller/BackendController.php
View File

@ -183,9 +183,9 @@ final class BackendController extends Controller
$media = \array_merge($media, $unIndexedFiles);
}
$view->addData('media', $media);
$view->addData('path', $path);
$view->addData('account', $this->app->accountManager->get($request->header->account));
$view->data['media'] = $media;
$view->data['path'] = $path;
$view->data['account'] = $this->app->accountManager->get($request->header->account);
return $view;
}
@ -206,7 +206,7 @@ final class BackendController extends Controller
{
$view = new MediaView($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Media/Theme/Backend/media-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000401001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000401001, $request, $response);
$id = $request->getDataInt('id');
if ($id === 0) {
@ -222,7 +222,7 @@ final class BackendController extends Controller
$media->setPath('/Modules/Media/Files/' . \ltrim($path, '\\/'));
$media->isAbsolute = false;
$view->addData('view', $this->createMediaView($media, $request, $response));
$view->data['view'] = $this->createMediaView($media, $request, $response);
}
} else {
/** @var \Modules\Media\Models\Media $media */
@ -245,7 +245,7 @@ final class BackendController extends Controller
$collection = CollectionMapper::get()->where('id', $id)->execute();
$media = \array_merge($files, $collection->getSources());
$view->addData('path', $collection->getVirtualPath() . '/' . $collection->name);
$view->data['path'] = $collection->getVirtualPath() . '/' . $collection->name;
$view->setTemplate('/Modules/Media/Theme/Backend/media-list');
} else {
$sub = $request->getDataString('sub') ?? '';
@ -254,7 +254,7 @@ final class BackendController extends Controller
) {
$listView = new ListView($this->app->l11nManager, $request, $response);
$listView->setTemplate('/modules/Media/Theme/Backend/Components/Media/list');
$view->addData('view', $listView);
$view->data['view'] = $listView;
} else {
if ($media->class === MediaClass::REFERENCE) {
/** @var \Modules\Media\Models\Media $media */
@ -267,16 +267,16 @@ final class BackendController extends Controller
->where('tags/title/language', $request->header->l11n->language)
->execute();
$view->addData('view', $this->createMediaView($media->source, $request, $response));
$view->data['view'] = $this->createMediaView($media->source, $request, $response);
} else {
$view->addData('view', $this->createMediaView($media, $request, $response));
$view->data['view'] = $this->createMediaView($media, $request, $response);
}
}
}
}
$view->addData('account', $this->app->accountManager->get($request->header->account));
$view->addData('media', $media);
$view->data['account'] = $this->app->accountManager->get($request->header->account);
$view->data['media'] = $media;
return $view;
}
@ -391,15 +391,15 @@ final class BackendController extends Controller
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$id = $request->getDataString('id') ?? '';
$settings = SettingMapper::getAll()->where('module', $id)->execute();
$view->setData('settings', $settings);
$view->data['settings'] = $settings;
$types = MediaTypeMapper::getAll()->with('title')->where('title/language', $response->header->l11n->language)->execute();
$view->setData('types', $types);
$view->data['types'] = $types;
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
@ -430,11 +430,11 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id'))
->execute();
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response));
$view->addData('type', $type);
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response);
$view->data['type'] = $type;
$l11n = MediaTypeL11nMapper::getAll()->where('type', $type->id)->execute();
$view->addData('l11n', $l11n);
$view->data['l11n'] = $l11n;
return $view;
}
@ -477,7 +477,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Media/Theme/Backend/media-file-create');
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor);
$view->data['editor'] = $editor;
return $view;
}

2
Controller/FileUploaderTrait.php
View File

@ -42,7 +42,7 @@ trait FileUploaderTrait
*/
public static function setUpFileUploaderTrait(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::JS, '/Modules/Media/Controller.js', ['type' => 'module']);
}
}

2
Theme/Api/spreadsheetAsCsv.tpl.php
View File

@ -18,7 +18,7 @@ use phpOMS\Autoloader;
Autoloader::addPath(__DIR__ . '/../../../../Resources/');
$media = $this->getData('media');
$media = $this->data['media'];
$reader = IOFactory::createReaderforFile(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath());
$reader->setReadDataOnly(true);

2
Theme/Api/spreadsheetAsHtml.tpl.php
View File

@ -17,6 +17,6 @@ use phpOMS\Utils\Parser\Spreadsheet\SpreadsheetParser;
Autoloader::addPath(__DIR__ . '/../../../../Resources/');
$media = $this->getData('media');
$media = $this->data['media'];
echo SpreadsheetParser::parseSpreadsheet(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath(), 'html');

2
Theme/Api/wordAsHtml.tpl.php
View File

@ -18,7 +18,7 @@ use phpOMS\Autoloader;
Autoloader::addPath(__DIR__ . '/../../../../Resources/');
$media = $this->getData('media');
$media = $this->data['media'];
$reader = IOFactory::createReader('Word2007');
$doc = $reader->load(($media->isAbsolute ? '' : __DIR__ . '/../../../../') . $media->getPath());

4
Theme/Backend/media-list.tpl.php
View File

@ -24,10 +24,10 @@ include __DIR__ . '/template-functions.php';
$mediaPath = \urldecode($this->getData('path') ?? '/');
/** @var \Modules\Media\Models\Media[] $media */
$media = $this->getData('media') ?? [];
$media = $this->data['media'] ?? [];
/** @var \Modules\Admin\Models\Account $account */
$account = $this->getData('account');
$account = $this->data['account'];
$accountDir = $account->id . ' ' . $account->login;
$previous = empty($media) ? '{/base}/media/list' : '{/base}/media/list?{?}&id=' . \reset($media)->id . '&ptype=p';

8
Theme/Backend/media-single.tpl.php
View File

@ -20,21 +20,21 @@ include __DIR__ . '/template-functions.php';
/** @var \Modules\Media\Views\MediaView $this */
/** @var \Modules\Media\Models\Media $media */
$media = $this->getData('media');
$view = $this->getData('view');
$media = $this->data['media'];
$view = $this->data['view'];
/** @var \Modules\Tag\Models\Tag[] $tag */
$tags = $media->getTags();
/** @var \Modules\Admin\Models\Account $account */
$account = $this->getData('account');
$account = $this->data['account'];
$accountDir = $account->id . ' ' . $account->login;
$mediaPath = \urldecode($media->getVirtualPath() ?? '/');
/** @var \phpOMS\Message\Http\HttpRequest $this->request */
echo $this->getData('nav')->render();
echo $this->data['nav']->render();
?>
<div class="row">
<div class="col-xs-12">