aboutsummaryrefslogtreecommitdiff
path: root/app/class
diff options
context:
space:
mode:
Diffstat (limited to 'app/class')
-rw-r--r--app/class/controller.php23
-rw-r--r--app/class/controlleradmin.php4
-rw-r--r--app/class/controllerart.php2
3 files changed, 13 insertions, 16 deletions
diff --git a/app/class/controller.php b/app/class/controller.php
index c4994f8..b925236 100644
--- a/app/class/controller.php
+++ b/app/class/controller.php
@@ -2,25 +2,27 @@
class Controller
{
- /**
- * @var User
- */
+ /** @var User */
protected $user;
- /**
- * @var Routes
- */
+
+ /** @var Routes */
protected $router;
- /**
- * @var Modeluser
- */
+
+ /** @var Modeluser */
protected $usermanager;
+
+ /** @var Modelart */
+ protected $artmanager;
+
protected $plates;
+
/** @var DateTimeImmutable */
protected $now;
public function __construct($router) {
$this->setuser();
- $this->router = $router;
+ $this->router = $router;
+ $this->artmanager = new Modelart();
$this->initplates();
$this->now = new DateTimeImmutable(null, timezone_open("Europe/Paris"));
}
@@ -54,6 +56,7 @@ class Controller
$commonsparams = [];
$commonsparams['router'] = $this->router;
$commonsparams['user'] = $this->user;
+ $commonsparams['pagelist'] = $this->artmanager->list();
$commonsparams['css'] = Model::csspath();
return $commonsparams;
}
diff --git a/app/class/controlleradmin.php b/app/class/controlleradmin.php
index 2101414..e3e1b2a 100644
--- a/app/class/controlleradmin.php
+++ b/app/class/controlleradmin.php
@@ -3,16 +3,12 @@
class Controlleradmin extends Controller
{
- /** @var Modelart $artmanager */
- protected $artmanager;
-
/** @var Modelmedia $mediamanager */
protected $mediamanager;
public function desktop()
{
if($this->user->isadmin()) {
- $this->artmanager = new Modelart();
$artlist = $this->artmanager->list();
$this->mediamanager = new Modelmedia();
$faviconlist = $this->mediamanager->listfavicon();
diff --git a/app/class/controllerart.php b/app/class/controllerart.php
index ac52043..690b260 100644
--- a/app/class/controllerart.php
+++ b/app/class/controllerart.php
@@ -4,7 +4,6 @@ class Controllerart extends Controller
{
/** @var Art2 */
protected $art;
- protected $artmanager;
protected $fontmanager;
protected $mediamanager;
@@ -14,7 +13,6 @@ class Controllerart extends Controller
{
parent::__construct($router);
- $this->artmanager = new Modelart();
$this->fontmanager = new Modelfont();
$this->mediamanager = new Modelmedia();