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

Merge branch 'develop' into feature/es6_revamp

Browse Source
This commit is contained in:
Djamil Legato
2016-02-18 15:49:58 -08:00
parent 787ff61a1b 3efbf05bea
commit eed783e1ed
25 changed files with 31 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
classes/controller.php
View File

@@ -22,6 +22,10 @@ use RocketTheme\Toolbox\File\JsonFile;
use Symfony\Component\Yaml\Exception\ParseException;
use Symfony\Component\Yaml\Yaml;
/**
* Class AdminController
* @package Grav\Plugin
*/
class AdminController
{
/**
@@ -125,7 +129,7 @@ class AdminController
if (method_exists($this, $method)) {
try {
$success = call_user_func(array($this, $method));
$success = call_user_func([$this, $method]);
} catch (\RuntimeException $e) {
$success = true;
$this->admin->setMessage($e->getMessage(), 'error');
@@ -474,7 +478,7 @@ class AdminController
if (count($flags)) {
// Filter by state
$pageStates = array('modular', 'nonmodular', 'visible', 'nonvisible', 'routable', 'nonroutable', 'published', 'nonpublished');
$pageStates = ['modular', 'nonmodular', 'visible', 'nonvisible', 'routable', 'nonroutable', 'published', 'nonpublished'];
if (count(array_intersect($pageStates, $flags)) > 0) {
if (in_array('modular', $flags))
@@ -573,7 +577,7 @@ class AdminController
return false;
}
$media_list = array();
$media_list = [];
foreach ($page->media()->all() as $name => $media) {
$media_list[$name] = ['url' => $media->cropZoom(150, 100)->url(), 'size' => $media->get('size')];
}
@@ -772,11 +776,11 @@ class AdminController
}
// Filter value and save it.
$this->post = array('enabled' => true);
$this->post = ['enabled' => true];
$obj = $this->prepareData();
$obj->save();
$this->post = array('_redirect' => 'plugins');
$this->post = ['_redirect' => 'plugins'];
$this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_ENABLED_PLUGIN'), 'info');
return true;
@@ -951,7 +955,7 @@ class AdminController
$this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.INSTALLATION_FAILED'), 'error');
}
$this->post = array('_redirect' => $this->view . '/' . $this->route);
$this->post = ['_redirect' => $this->view . '/' . $this->route];
}
return true;
@@ -993,7 +997,6 @@ class AdminController
*/
private function cleanFilesData($key, $file)
{
$config = $this->grav['config'];
$blueprint = isset($this->items['fields'][$key]['files']) ? $this->items['fields'][$key]['files'] : [];
/** @var Page $page */
@@ -1059,7 +1062,7 @@ class AdminController
private function match_in_array($needle, $haystack)
{
foreach ((array)$haystack as $item) {
if (true == preg_match("#^" . strtr(preg_quote($item, '#'), array('\*' => '.*', '\?' => '.')) . "$#i", $needle)) {
if (true == preg_match("#^" . strtr(preg_quote($item, '#'), ['\*' => '.*', '\?' => '.']) . "$#i", $needle)) {
return true;
}
}
@@ -1126,6 +1129,7 @@ class AdminController
}
Folder::mkdir($path . '/' . $orderOfNewFolder . '.' . $data['folder']);
Cache::clearCache('standard');
$this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.SUCCESSFULLY_SAVED'), 'info');
@@ -1137,8 +1141,9 @@ class AdminController
return true;
}
/*
/**
* @param string $frontmatter
*
* @return bool
*/
public function checkValidFrontmatter($frontmatter)
@@ -1359,7 +1364,6 @@ class AdminController
try {
/** @var Pages $pages */
$pages = $this->grav['pages'];
$data = $this->post;
// And then get the current page.
$page = $this->admin->page(true);
@@ -1435,9 +1439,6 @@ class AdminController
return false;
}
/** @var Uri $uri */
$uri = $this->grav['uri'];
try {
$page = $this->admin->page();
@@ -1447,8 +1448,7 @@ class AdminController
Folder::delete($page->path());
}
$results = Cache::clearCache('standard');
Cache::clearCache('standard');
// Set redirect to either referrer or pages list.
$redirect = 'pages';