Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-02 11:26:04 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into feature/new-folder-modal

Browse Source
This commit is contained in:
Flavio Copes
2016-02-04 21:05:00 +01:00
parent d5dea81d94 0d9a3e4bdc
commit b68a12fd11
23 changed files with 354 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
admin.php
View File

@@ -17,6 +17,10 @@ use RocketTheme\Toolbox\Session\Session;
class AdminPlugin extends Plugin
{
public $features = [
'blueprints' => 1000,
];
/**
* @var bool
*/
@@ -96,10 +100,10 @@ class AdminPlugin extends Plugin
// check for existence of a user account
$account_dir = $file_path = $this->grav['locator']->findResource('account://');
$user_check = (array) glob($account_dir . '/*.yaml');
$user_check = glob($account_dir . '/*.yaml');
// If no users found, go to register
if (!count($user_check) > 0) {
if ($user_check == false || count((array)$user_check) == 0) {
if (!$this->isAdminPath()) {
$this->grav->redirect($this->base);
}
@@ -119,12 +123,11 @@ class AdminPlugin extends Plugin
* - 'password1' for password format
* - 'password2' for equality to password1
*
* @param object $form The form
* @param string $type The field type
* @param string $value The field value
* @param string $extra Any extra value required
*
* @return mixed
* @return bool
*/
protected function validate($type, $value, $extra = '')
{
@@ -134,22 +137,21 @@ class AdminPlugin extends Plugin
return false;
}
return true;
break;
case 'password1':
if (!preg_match('/(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}/', $value)) {
return false;
}
return true;
break;
case 'password2':
if (strcmp($value, $extra)) {
return false;
}
return true;
break;
}
return false;
}
/**
@@ -255,7 +257,7 @@ class AdminPlugin extends Plugin
}
// Replace themes service with admin.
$this->grav['themes'] = function ($c) {
$this->grav['themes'] = function () {
require_once __DIR__ . '/classes/themes.php';
return new Themes($this->grav);
};
@@ -328,6 +330,8 @@ class AdminPlugin extends Plugin
// make sure page is not frozen!
unset($this->grav['page']);
$this->admin->pagesCount();
// Replace page service with admin.
$this->grav['page'] = function () use ($self) {
$page = new Page;
@@ -352,6 +356,8 @@ class AdminPlugin extends Plugin
return $page;
}
}
return null;
};
if (empty($this->grav['page'])) {
@@ -405,16 +411,12 @@ class AdminPlugin extends Plugin
{
$twig = $this->grav['twig'];
// Dynamic type support
$format = $this->uri->extension();
$ext = '.' . ($format ? $format : 'html') . TWIG_EXT;
$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['base_url_relative'] =
$twig->twig_vars['base_url_simple'] . '/' . $twig->twig_vars['admin_route'];
$twig->twig_vars['theme_url'] = '/user/plugins/admin/themes/' . $this->theme;
$twig->twig_vars['theme_url'] = $this->grav['locator']->findResource('plugin://admin/themes/' . $this->theme, false);
$twig->twig_vars['base_url'] = $twig->twig_vars['base_url_relative'];
$twig->twig_vars['base_path'] = GRAV_ROOT;
$twig->twig_vars['admin'] = $this->admin;
@@ -538,15 +540,6 @@ class AdminPlugin extends Plugin
throw new \RuntimeException('One of the required plugins is missing or not enabled');
}
// Double check we have system.yaml and site.yaml
$config_files[] = $this->grav['locator']->findResource('user://config') . '/system.yaml';
$config_files[] = $this->grav['locator']->findResource('user://config') . '/site.yaml';
foreach ($config_files as $config_file) {
if (!file_exists($config_file)) {
touch($config_file);
}
}
// Initialize Admin Language if needed
/** @var Language $language */
$language = $this->grav['language'];
@@ -570,9 +563,19 @@ class AdminPlugin extends Plugin
$this->admin = new Admin($this->grav, $this->base, $this->template, $this->route);
// And store the class into DI container.
$this->grav['admin'] = $this->admin;
// Double check we have system.yam, site.yaml etc
$config_path = $this->grav['locator']->findResource('user://config');
foreach ($this->admin->configurations() as $config_file) {
$config_file = "{$config_path}/{$config_file}.yaml";
if (!file_exists($config_file)) {
touch($config_file);
}
}
// Get theme for admin
$this->theme = $this->config->get('plugins.admin.theme', 'grav');