From df0f6685ba75d4e2bf9a22fa6923d257a5f38fad Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Tue, 16 Apr 2019 00:51:42 +0300
Subject: [PATCH] Flextype Slim Integration - next round of integration

---
 site/plugins/admin/admin.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/site/plugins/admin/admin.php b/site/plugins/admin/admin.php
index 410c15e1..36da4088 100755
--- a/site/plugins/admin/admin.php
+++ b/site/plugins/admin/admin.php
@@ -20,9 +20,7 @@ use Flextype\Component\Arr\Arr;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-
-$uri = \Slim\Http\Uri::createFromEnvironment(new \Slim\Http\Environment($_SERVER));
-$uri = explode('/', $uri->getPath());
+$uri = explode('/', \Slim\Http\Uri::createFromEnvironment(new \Slim\Http\Environment($_SERVER))->getPath());
 
 if (isset($uri) && isset($uri[0]) && $uri[0] == 'admin') {
 
@@ -36,9 +34,10 @@ if (isset($uri) && isset($uri[0]) && $uri[0] == 'admin') {
     // Set Default Admin locale
     I18n::$locale = $flextype->registry->get('settings.locale');
 
+    //include_once 'classes/SettingsManager.php';
     include_once 'classes/UsersManager.php';
-    include_once 'classes/InformationManager.php';
-    include_once 'classes/PluginsManager.php';
+    //include_once 'classes/InformationManager.php';
+    //include_once 'classes/PluginsManager.php';
 
     addItem('content', 'entries', '<i class="far fa-newspaper"></i>' . __('admin_entries'), '/admin/entries', ['class' => 'nav-link'], $flextype);
     addItem('extends', 'fieldsets', '<i class="fas fa-list"></i>' . __('admin_fieldsets'), '/admin/fieldsets', ['class' => 'nav-link'], $flextype);
@@ -49,10 +48,10 @@ if (isset($uri) && isset($uri[0]) && $uri[0] == 'admin') {
     addItem('help', 'information', '<i class="fas fa-info"></i>' . __('admin_information'), '/admin/information', ['class' => 'nav-link'], $flextype);
 
 
-    if (UsersManager::isLoggedIn()) {
+    if (Users::isLoggedIn()) {
         //$app->redirect('/', $app->getContainer()->get('router')->pathFor('root'));
     } else {
-        if (UsersManager::isUsersExists()) {
+        if (Users::isUsersExists()) {
             //header('HTTP/1.1 301 Moved Permanently');
             //header('Location: '.$app->getContainer()->get('request')->getUri());
             //$app->redirect($app->getContainer()->get('request')->getUri(), $app->getContainer()->get('router')->pathFor('login'));