crash backup
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
CI / general_module_workflow_php (push) Has been cancelled
CI / general_module_workflow_js (push) Has been cancelled

This commit is contained in:
Dennis Eichhorn 2025-03-21 02:48:19 +00:00
parent 3cff2618e5
commit ac82d2b7f8
4 changed files with 19 additions and 19 deletions

View File

@ -299,7 +299,7 @@ final class ApiController extends Controller
public function apiWikiDocGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiWikiDocGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Knowledgebase\Models\WikiDoc $doc */ /** @var \Modules\Knowledgebase\Models\WikiDoc $doc */
$doc = WikiDocMapper::get()->where('id', (int) $request->getData('id'))->execute(); $doc = WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->createStandardReturnResponse($request, $response, $doc); $this->createStandardReturnResponse($request, $response, $doc);
} }
@ -319,7 +319,7 @@ final class ApiController extends Controller
public function apiWikiDocUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiWikiDocUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Knowledgebase\Models\WikiDoc $old */ /** @var \Modules\Knowledgebase\Models\WikiDoc $old */
$old = WikiDocMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateDocFromRequest($request, clone $old); $new = $this->updateDocFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, WikiDocMapper::class, 'doc', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, WikiDocMapper::class, 'doc', $request->getOrigin());
@ -371,7 +371,7 @@ final class ApiController extends Controller
public function apiWikiDocDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiWikiDocDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Knowledgebase\Models\WikiDoc $doc */ /** @var \Modules\Knowledgebase\Models\WikiDoc $doc */
$doc = WikiDocMapper::get()->where('id', (int) $request->getData('id'))->execute(); $doc = WikiDocMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $doc, WikiDocMapper::class, 'doc', $request->getOrigin()); $this->deleteModel($request->header->account, $doc, WikiDocMapper::class, 'doc', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $doc); $this->createStandardDeleteResponse($request, $response, $doc);
@ -466,7 +466,7 @@ final class ApiController extends Controller
/** @var \Modules\Knowledgebase\Models\WikiCategory $category */ /** @var \Modules\Knowledgebase\Models\WikiCategory $category */
$category = WikiCategoryMapper::get() $category = WikiCategoryMapper::get()
->with('name') ->with('name')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->where('name/language', ISO639x1Enum::_EN) ->where('name/language', ISO639x1Enum::_EN)
->execute(); ->execute();
@ -489,7 +489,7 @@ final class ApiController extends Controller
public function apiWikiCategoryUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiWikiCategoryUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Knowledgebase\Models\WikiCategory $old */ /** @var \Modules\Knowledgebase\Models\WikiCategory $old */
$old = WikiCategoryMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = WikiCategoryMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateCategoryFromRequest($request, clone $old); $new = $this->updateCategoryFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, WikiCategoryMapper::class, 'category', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, WikiCategoryMapper::class, 'category', $request->getOrigin());
@ -531,7 +531,7 @@ final class ApiController extends Controller
public function apiWikiCategoryDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiWikiCategoryDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Knowledgebase\Models\WikiCategory $category */ /** @var \Modules\Knowledgebase\Models\WikiCategory $category */
$category = WikiCategoryMapper::get()->where('id', (int) $request->getData('id'))->execute(); $category = WikiCategoryMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $category, WikiCategoryMapper::class, 'category', $request->getOrigin()); $this->deleteModel($request->header->account, $category, WikiCategoryMapper::class, 'category', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $category); $this->createStandardDeleteResponse($request, $response, $category);
@ -617,7 +617,7 @@ final class ApiController extends Controller
public function apiWikiAppGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiWikiAppGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Knowledgebase\Models\WikiApp $app */ /** @var \Modules\Knowledgebase\Models\WikiApp $app */
$app = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute(); $app = WikiAppMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->createStandardReturnResponse($request, $response, $app); $this->createStandardReturnResponse($request, $response, $app);
} }
@ -637,7 +637,7 @@ final class ApiController extends Controller
public function apiWikiAppUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiWikiAppUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Knowledgebase\Models\WikiApp $old */ /** @var \Modules\Knowledgebase\Models\WikiApp $old */
$old = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = WikiAppMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateAppFromRequest($request, clone $old); $new = $this->updateAppFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, WikiAppMapper::class, 'app', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, WikiAppMapper::class, 'app', $request->getOrigin());
@ -676,7 +676,7 @@ final class ApiController extends Controller
public function apiWikiAppDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiWikiAppDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Knowledgebase\Models\WikiApp $app */ /** @var \Modules\Knowledgebase\Models\WikiApp $app */
$app = WikiAppMapper::get()->where('id', (int) $request->getData('id'))->execute(); $app = WikiAppMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $app, WikiAppMapper::class, 'app', $request->getOrigin()); $this->deleteModel($request->header->account, $app, WikiAppMapper::class, 'app', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $app); $this->createStandardDeleteResponse($request, $response, $app);
@ -705,7 +705,7 @@ final class ApiController extends Controller
} }
/** @var BaseStringL11n $old */ /** @var BaseStringL11n $old */
$old = WikiCategoryL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = WikiCategoryL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateCategoryL11nFromRequest($request, clone $old); $new = $this->updateCategoryL11nFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, WikiCategoryL11nMapper::class, 'category_l11n', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, WikiCategoryL11nMapper::class, 'category_l11n', $request->getOrigin());
@ -775,7 +775,7 @@ final class ApiController extends Controller
} }
/** @var BaseStringL11n $categoryL11n */ /** @var BaseStringL11n $categoryL11n */
$categoryL11n = WikiCategoryL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $categoryL11n = WikiCategoryL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $categoryL11n, WikiCategoryL11nMapper::class, 'category_l11n', $request->getOrigin()); $this->deleteModel($request->header->account, $categoryL11n, WikiCategoryL11nMapper::class, 'category_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $categoryL11n); $this->createStandardDeleteResponse($request, $response, $categoryL11n);
} }

View File

@ -154,7 +154,7 @@ final class BackendController extends Controller
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response);
$view->data['app'] = WikiAppMapper::get() $view->data['app'] = WikiAppMapper::get()
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->execute(); ->execute();
return $view; return $view;
@ -233,7 +233,7 @@ final class BackendController extends Controller
$view->data['category'] = WikiCategoryMapper::get() $view->data['category'] = WikiCategoryMapper::get()
->with('name') ->with('name')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->where('name/language', $response->header->l11n->language) ->where('name/language', $response->header->l11n->language)
->execute(); ->execute();
@ -380,7 +380,7 @@ final class BackendController extends Controller
->with('tags') ->with('tags')
->with('tags/title') ->with('tags/title')
->with('files') ->with('files')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->where('language', $request->header->l11n->language) ->where('language', $request->header->l11n->language)
->where('tags/title/language', $response->header->l11n->language) ->where('tags/title/language', $response->header->l11n->language)
->execute(); ->execute();

View File

@ -17,7 +17,7 @@ use Modules\Knowledgebase\Models\WikiStatus;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** @var \Modules\Knowledgebase\Models\WikiDoc $wiki */ /** @var \Modules\Knowledgebase\Models\WikiDoc $wiki */
$wiki = $this->getData('doc') ?? new NullWikiDoc(); $wiki = $this->data['doc'] ?? new NullWikiDoc();
$isNewDoc = $wiki->id === 0; $isNewDoc = $wiki->id === 0;
$languages = \phpOMS\Localization\ISO639Enum::getConstants(); $languages = \phpOMS\Localization\ISO639Enum::getConstants();
@ -35,12 +35,12 @@ echo $this->data['nav']->render(); ?>
<section class="portlet"> <section class="portlet">
<div class="portlet-body"> <div class="portlet-body">
<?= $this->getData('editor')->render('iWiki'); ?> <?= $this->data['editor']->render('iWiki'); ?>
</div> </div>
</section> </section>
<div class="box wf-100"> <div class="box wf-100">
<?= $this->getData('editor')->getData('text')->render('iWiki', 'plain', 'docForm', $wiki->docRaw, $wiki->doc); ?> <?= $this->data['editor']->data['text']->render('iWiki', 'plain', 'docForm', $wiki->docRaw, $wiki->doc); ?>
</div> </div>
</div> </div>
</div> </div>
@ -104,7 +104,7 @@ echo $this->data['nav']->render(); ?>
<!-- <!--
<div class="form-group"> <div class="form-group">
<?= $this->getHtml('Tags', 'Tag'); ?> <?= $this->getHtml('Tags', 'Tag'); ?>
<?= $this->getData('tagSelector')->render('iTag', 'tag', 'fEditor', false); ?> <?= $this->data['tagSelector']->render('iTag', 'tag', 'fEditor', false); ?>
</div> </div>
--> -->
</div> </div>

View File

@ -22,7 +22,7 @@ use Modules\Knowledgebase\Models\NullWikiDoc;
$categories = $this->data['categories'] ?? []; $categories = $this->data['categories'] ?? [];
/** @var \Modules\Knowledgebase\Models\WikiDoc $doc */ /** @var \Modules\Knowledgebase\Models\WikiDoc $doc */
$doc = $this->getData('document') ?? new NullWikiDoc(); $doc = $this->data['document'] ?? new NullWikiDoc();
/** @var bool $editable */ /** @var bool $editable */
$editable = $this->data['editable']; $editable = $this->data['editable'];