diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index 187748b8..503946c6 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -50,13 +50,19 @@ class ContentController extends Controller protected $dataRecord; - private static $extensions = array('SilverStripe\\CMS\\Controllers\\OldPageRedirector'); + private static $extensions = [ + 'SilverStripe\\CMS\\Controllers\\OldPageRedirector', + ]; - private static $allowed_actions = array( + private static $allowed_actions = [ 'successfullyinstalled', 'deleteinstallfiles', // secured through custom code - 'LoginForm' - ); + 'LoginForm', + ]; + + private static $casting = [ + 'SilverStripeNavigator' => 'HTMLFragment', + ]; /** * The ContentController will take the URLSegment parameter from the URL and use that to look @@ -133,7 +139,7 @@ class ContentController extends Controller // If we've accessed the homepage as /home/, then we should redirect to /. if ($this->dataRecord instanceof SiteTree && RootURLController::should_be_on_root($this->dataRecord) - && (!isset($this->urlParams['Action']) || !$this->urlParams['Action'] ) + && (!isset($this->urlParams['Action']) || !$this->urlParams['Action']) && !$_POST && !$_FILES && !$this->redirectedTo() ) { $getVars = $_GET; @@ -176,7 +182,7 @@ class ContentController extends Controller public function handleRequest(HTTPRequest $request) { /** @var SiteTree $child */ - $child = null; + $child = null; $action = $request->param('Action'); // If nested URLs are enabled, and there is no action handler for the current request then attempt to pass @@ -188,10 +194,10 @@ class ContentController extends Controller Translatable::disable_locale_filter(); } // look for a page with this URLSegment - $child = SiteTree::get()->filter(array( + $child = SiteTree::get()->filter([ 'ParentID' => $this->ID, - 'URLSegment' => rawurlencode($action) - ))->first(); + 'URLSegment' => rawurlencode($action), + ])->first(); if (class_exists('Translatable')) { Translatable::enable_locale_filter(); } @@ -269,13 +275,13 @@ class ContentController extends Controller public function getMenu($level = 1) { if ($level == 1) { - $result = SiteTree::get()->filter(array( + $result = SiteTree::get()->filter([ "ShowInMenus" => 1, - "ParentID" => 0 - )); + "ParentID" => 0, + ]); } else { $parent = $this->data(); - $stack = array($parent); + $stack = [$parent]; if ($parent) { while (($parent = $parent->Parent()) && $parent->exists()) { @@ -283,12 +289,12 @@ class ContentController extends Controller } } - if (isset($stack[$level-2])) { - $result = $stack[$level-2]->Children(); + if (isset($stack[$level - 2])) { + $result = $stack[$level - 2]->Children(); } } - $visible = array(); + $visible = []; // Remove all entries the can not be viewed by the current user // We might need to create a show in menu permission @@ -340,18 +346,18 @@ class ContentController extends Controller if ($member) { $firstname = Convert::raw2xml($member->FirstName); $surname = Convert::raw2xml($member->Surname); - $logInMessage = _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGGEDINAS', 'Logged in as') ." {$firstname} {$surname} - ". _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGOUT', 'Log out'). ""; + $logInMessage = _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGGEDINAS', 'Logged in as') . " {$firstname} {$surname} - " . _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGOUT', 'Log out') . ""; } else { $logInMessage = sprintf( '%s - %s', _t('SilverStripe\\CMS\\Controllers\\ContentController.NOTLOGGEDIN', 'Not logged in'), Security::config()->login_url, - _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGIN', 'Login') ."" + _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGIN', 'Login') . "" ); } $viewPageIn = _t('SilverStripe\\CMS\\Controllers\\ContentController.VIEWPAGEIN', 'View Page in:'); - $navigator = <<