Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-07 06:35:36 +02:00
Code Issues Packages Projects Releases Activity

Improve multi-site support

Browse Source
This commit is contained in:
Matias Griese
2016-09-27 18:21:11 +03:00
parent 4cd6b52fb0
commit 8e5720f7b9
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
admin.php
View File

@@ -41,6 +41,11 @@ class AdminPlugin extends Plugin
*/
protected $route;
/**
* @var string
*/
protected $admin_route;
/**
* @var Uri
*/
@@ -97,6 +102,7 @@ class AdminPlugin extends Plugin
}
$this->base = '/' . trim($route, '/');
$this->admin_route = rtrim($this->grav['pages']->base(), '/') . $this->base;
$this->uri = $this->grav['uri'];
// check for existence of a user account
@@ -106,7 +112,7 @@ class AdminPlugin extends Plugin
// If no users found, go to register
if ($user_check == false || count((array)$user_check) == 0) {
if (!$this->isAdminPath()) {
$this->grav->redirect($this->base);
$this->grav->redirect($this->admin_route);
}
$this->template = 'register';
}
@@ -236,7 +242,7 @@ class AdminPlugin extends Plugin
$messages = $this->grav['messages'];
$messages->add($this->grav['language']->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info');
$this->grav->redirect($this->base);
$this->grav->redirect($this->admin_route);
break;
}
@@ -429,7 +435,7 @@ class AdminPlugin extends Plugin
throw new \RuntimeException('Page Not Found', 404);
}
} else {
$this->grav->redirect($this->base);
$this->grav->redirect($this->admin_route);
}
}
@@ -471,7 +477,7 @@ class AdminPlugin extends Plugin
$twig->twig_vars['location'] = $this->template;
$twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '/';
$twig->twig_vars['admin_route'] = trim($this->config->get('plugins.admin.route'), '/');
$twig->twig_vars['admin_route'] = trim($this->admin_route, '/');
$twig->twig_vars['base_url_relative'] = $twig->twig_vars['base_url_simple'] . '/' . $twig->twig_vars['admin_route'];
$theme_url = '/' . ltrim($this->grav['locator']->findResource('plugin://admin/themes/' . $this->theme,
false), '/');
@@ -660,7 +666,7 @@ class AdminPlugin extends Plugin
$this->route = array_shift($array);
}
$this->admin = new Admin($this->grav, $this->base, $this->template, $this->route);
$this->admin = new Admin($this->grav, $this->admin_route, $this->template, $this->route);
// And store the class into DI container.