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

Merge branch 'feature/login-separation' of bitbucket.org:rockettheme/grav-plugin-admin into feature/redesign

Browse Source 
Conflicts:
	admin.php
	admin.yaml
	pages/admin/login.md
	pages/admin/themes.md
This commit is contained in:
Matias Griese
2014-09-09 07:57:53 +03:00
parent af19f39b61 fa2975ca03
commit ff001b3dbc
21 changed files with 235 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
classes/admin.php
View File

@@ -2,7 +2,6 @@
namespace Grav\Plugin;
use Grav\Common\User\User;
use Grav\Common\User\Authentication;
use Grav\Common\Filesystem\File;
use Grav\Common\Grav;
use Grav\Common\Plugins;
@@ -40,11 +39,6 @@ class Admin
*/
protected $blueprints;
/**
* @var string
*/
public $message;
/**
* @var string
*/
@@ -61,7 +55,7 @@ class Admin
public $route;
/**
* @var array
* @var User
*/
public $user;
@@ -81,17 +75,9 @@ class Admin
$this->location = $location;
$this->route = $route;
/** @var Uri uri */
$this->uri = $this->grav['uri'];
// TODO: add session timeout into configuration
$this->session = new Session\Session(1800, $this->uri->rootUrl(false) . $base);
$this->session->start();
// Get current user from the session.
if (isset($this->session->user)) {
$this->user = $this->session->user;
}
$this->session = $this->grav['session'];
$this->user = $this->grav['user'];
}
/**
@@ -112,12 +98,8 @@ class Admin
*/
public function setMessage($msg, $type = 'info')
{
if (!isset($this->session->messages)) {
$this->session->messages = new Session\Message;
}
/** @var Session\Message $messages */
$messages = $this->session->messages;
$messages = $this->grav['messages'];
$messages->add($msg, $type);
}
@@ -125,14 +107,13 @@ class Admin
* Fetch and delete messages from the session queue.
*
* @param string $type
* @return array
*/
public function messages($type = null)
{
if (!isset($this->session->messages)) {
$this->session->messages = new Session\Message;
}
return $this->session->messages->fetch($type);
/** @var Session\Message $messages */
$messages = $this->grav['messages'];
return $messages->fetch($type);
}
/**
@@ -143,10 +124,11 @@ class Admin
*/
public function authenticate($form)
{
if (!$this->session->user && isset($form['username']) && isset($form['password'])) {
if (!$this->user->authenticated && isset($form['username']) && isset($form['password'])) {
$file = File\Yaml::instance(ACCOUNTS_DIR . $form['username'] . YAML_EXT);
if ($file->exists()) {
$user = new User($file->content());
$user->authenticated = true;
// Authenticate user.
$result = $user->authenticate($form['password']);
@@ -172,7 +154,7 @@ class Admin
*/
public function authorise($action = 'admin.login')
{
return isset($this->user) && $this->user->authorise($action);
return $this->user->authorise($action);
}
/**
@@ -409,9 +391,7 @@ class Admin
$page->filePath($parent->path().'/'.$slug.'/'.$page->name());
$page->header();
// Attach page to parent and add routing information.
// FIXME:
$parent->{$slug} = $page;
// Add routing information.
$pages->addPage($page, $path);
// Determine page type.