Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename ci attribute to container

Browse source
This commit is contained in:
ArthurHoaro 2020-01-26 09:06:13 +01:00
parent 0498b209b5
commit 27ceea2aee
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
application/front/controllers/LoginController.php
View file

@ -22,11 +22,13 @@ class LoginController extends ShaarliController
{
public function index(Request $request, Response $response): Response
{
if ($this->ci->loginManager->isLoggedIn() || $this->ci->conf->get('security.open_shaarli', false)) {
if ($this->container->loginManager->isLoggedIn()
|| $this->container->conf->get('security.open_shaarli', false)
) {
return $response->withRedirect('./');
}
$userCanLogin = $this->ci->loginManager->canLogin($request->getServerParams());
$userCanLogin = $this->container->loginManager->canLogin($request->getServerParams());
if ($userCanLogin !== true) {
throw new LoginBannedException();
}
@ -37,8 +39,8 @@ public function index(Request $request, Response $response): Response
$this
->assignView('returnurl', escape($request->getServerParam('HTTP_REFERER')))
->assignView('remember_user_default', $this->ci->conf->get('privacy.remember_user_default', true))
->assignView('pagetitle', t('Login') .' - '. $this->ci->conf->get('general.title', 'Shaarli'))
->assignView('remember_user_default', $this->container->conf->get('privacy.remember_user_default', true))
->assignView('pagetitle', t('Login') .' - '. $this->container->conf->get('general.title', 'Shaarli'))
;
return $response->write($this->render('loginform'));

22
application/front/controllers/ShaarliController.php
View file

@ -10,12 +10,12 @@
abstract class ShaarliController
{
/** @var ShaarliContainer */
protected $ci;
protected $container;
/** @param ShaarliContainer $ci Slim container (extended for attribute completion). */
public function __construct(ShaarliContainer $ci)
/** @param ShaarliContainer $container Slim container (extended for attribute completion). */
public function __construct(ShaarliContainer $container)
{
$this->ci = $ci;
$this->container = $container;
}
/**
@ -25,20 +25,20 @@ public function __construct(ShaarliContainer $ci)
*/
protected function assignView(string $name, $value): self
{
$this->ci->pageBuilder->assign($name, $value);
$this->container->pageBuilder->assign($name, $value);
return $this;
}
protected function render(string $template): string
{
$this->assignView('linkcount', $this->ci->bookmarkService->count(BookmarkFilter::$ALL));
$this->assignView('privateLinkcount', $this->ci->bookmarkService->count(BookmarkFilter::$PRIVATE));
$this->assignView('plugin_errors', $this->ci->pluginManager->getErrors());
$this->assignView('linkcount', $this->container->bookmarkService->count(BookmarkFilter::$ALL));
$this->assignView('privateLinkcount', $this->container->bookmarkService->count(BookmarkFilter::$PRIVATE));
$this->assignView('plugin_errors', $this->container->pluginManager->getErrors());
$this->executeDefaultHooks($template);
return $this->ci->pageBuilder->render($template);
return $this->container->pageBuilder->render($template);
}
/**
@ -55,12 +55,12 @@ protected function executeDefaultHooks(string $template): void
foreach ($common_hooks as $name) {
$plugin_data = [];
$this->ci->pluginManager->executeHooks(
$this->container->pluginManager->executeHooks(
'render_' . $name,
$plugin_data,
[
'target' => $template,
'loggedin' => $this->ci->loginManager->isLoggedIn()
'loggedin' => $this->container->loginManager->isLoggedIn()
]
);
$this->assignView('plugins_' . $name, $plugin_data);