tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-27 20:06:43 +02:00
Code Issues Projects Releases Wiki Activity

Updating code style

Browse Source
This commit is contained in:
Daniel Hensby 2018-05-02 11:54:59 +01:00
parent ed17eb2bd8
commit a393de8d8d
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
1 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
code/Controllers/ContentController.php
View File

@ -50,17 +50,19 @@ class ContentController extends Controller
protected $dataRecord; 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', 'successfullyinstalled',
'deleteinstallfiles', // secured through custom code 'deleteinstallfiles', // secured through custom code
'LoginForm' 'LoginForm',
); ];
private static $casting = array( private static $casting = [
'SilverStripeNavigator' => 'HTMLFragment', 'SilverStripeNavigator' => 'HTMLFragment',
); ];
/** /**
* The ContentController will take the URLSegment parameter from the URL and use that to look * The ContentController will take the URLSegment parameter from the URL and use that to look
@ -137,7 +139,7 @@ class ContentController extends Controller
// If we've accessed the homepage as /home/, then we should redirect to /. // If we've accessed the homepage as /home/, then we should redirect to /.
if ($this->dataRecord instanceof SiteTree if ($this->dataRecord instanceof SiteTree
&& RootURLController::should_be_on_root($this->dataRecord) && 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() && !$_POST && !$_FILES && !$this->redirectedTo()
) { ) {
$getVars = $_GET; $getVars = $_GET;
@ -180,7 +182,7 @@ class ContentController extends Controller
public function handleRequest(HTTPRequest $request) public function handleRequest(HTTPRequest $request)
{ {
/** @var SiteTree $child */ /** @var SiteTree $child */
$child = null; $child = null;
$action = $request->param('Action'); $action = $request->param('Action');
// If nested URLs are enabled, and there is no action handler for the current request then attempt to pass // If nested URLs are enabled, and there is no action handler for the current request then attempt to pass
@ -192,10 +194,10 @@ class ContentController extends Controller
Translatable::disable_locale_filter(); Translatable::disable_locale_filter();
} }
// look for a page with this URLSegment // look for a page with this URLSegment
$child = SiteTree::get()->filter(array( $child = SiteTree::get()->filter([
'ParentID' => $this->ID, 'ParentID' => $this->ID,
'URLSegment' => rawurlencode($action) 'URLSegment' => rawurlencode($action),
))->first(); ])->first();
if (class_exists('Translatable')) { if (class_exists('Translatable')) {
Translatable::enable_locale_filter(); Translatable::enable_locale_filter();
} }
@ -273,13 +275,13 @@ class ContentController extends Controller
public function getMenu($level = 1) public function getMenu($level = 1)
{ {
if ($level == 1) { if ($level == 1) {
$result = SiteTree::get()->filter(array( $result = SiteTree::get()->filter([
"ShowInMenus" => 1, "ShowInMenus" => 1,
"ParentID" => 0 "ParentID" => 0,
)); ]);
} else { } else {
$parent = $this->data(); $parent = $this->data();
$stack = array($parent); $stack = [$parent];
if ($parent) { if ($parent) {
while (($parent = $parent->Parent()) && $parent->exists()) { while (($parent = $parent->Parent()) && $parent->exists()) {
@ -287,12 +289,12 @@ class ContentController extends Controller
} }
} }
if (isset($stack[$level-2])) { if (isset($stack[$level - 2])) {
$result = $stack[$level-2]->Children(); $result = $stack[$level - 2]->Children();
} }
} }
$visible = array(); $visible = [];
// Remove all entries the can not be viewed by the current user // Remove all entries the can not be viewed by the current user
// We might need to create a show in menu permission // We might need to create a show in menu permission
@ -344,13 +346,13 @@ class ContentController extends Controller
if ($member) { if ($member) {
$firstname = Convert::raw2xml($member->FirstName); $firstname = Convert::raw2xml($member->FirstName);
$surname = Convert::raw2xml($member->Surname); $surname = Convert::raw2xml($member->Surname);
$logInMessage = _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGGEDINAS', 'Logged in as') ." {$firstname} {$surname} - <a href=\"Security/logout\">". _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGOUT', 'Log out'). "</a>"; $logInMessage = _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGGEDINAS', 'Logged in as') . " {$firstname} {$surname} - <a href=\"Security/logout\">" . _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGOUT', 'Log out') . "</a>";
} else { } else {
$logInMessage = sprintf( $logInMessage = sprintf(
'%s - <a href="%s">%s</a>', '%s - <a href="%s">%s</a>',
_t('SilverStripe\\CMS\\Controllers\\ContentController.NOTLOGGEDIN', 'Not logged in'), _t('SilverStripe\\CMS\\Controllers\\ContentController.NOTLOGGEDIN', 'Not logged in'),
Security::config()->login_url, Security::config()->login_url,
_t('SilverStripe\\CMS\\Controllers\\ContentController.LOGIN', 'Login') ."</a>" _t('SilverStripe\\CMS\\Controllers\\ContentController.LOGIN', 'Login') . "</a>"
); );
} }
$viewPageIn = _t('SilverStripe\\CMS\\Controllers\\ContentController.VIEWPAGEIN', 'View Page in:'); $viewPageIn = _t('SilverStripe\\CMS\\Controllers\\ContentController.VIEWPAGEIN', 'View Page in:');
@ -371,7 +373,7 @@ class ContentController extends Controller
$message $message
HTML; HTML;
// On live sites we should still see the archived message // On live sites we should still see the archived message
} else { } else {
if ($date = Versioned::current_archived_date()) { if ($date = Versioned::current_archived_date()) {
Requirements::css('silverstripe/cms: client/dist/styles/SilverStripeNavigator.css'); Requirements::css('silverstripe/cms: client/dist/styles/SilverStripeNavigator.css');
@ -483,19 +485,19 @@ HTML;
} }
global $project; global $project;
$data = new ArrayData(array( $data = new ArrayData([
'Project' => Convert::raw2xml($project), 'Project' => Convert::raw2xml($project),
'Username' => Convert::raw2xml($this->getRequest()->getSession()->get('username')), 'Username' => Convert::raw2xml($this->getRequest()->getSession()->get('username')),
'Password' => Convert::raw2xml($this->getRequest()->getSession()->get('password')), 'Password' => Convert::raw2xml($this->getRequest()->getSession()->get('password')),
)); ]);
return array( return [
"Title" => _t("SilverStripe\\CMS\\Controllers\\ContentController.INSTALL_SUCCESS", "Installation Successful!"), "Title" => _t("SilverStripe\\CMS\\Controllers\\ContentController.INSTALL_SUCCESS", "Installation Successful!"),
"Content" => $data->renderWith([ "Content" => $data->renderWith([
'type' => 'Includes', 'type' => 'Includes',
'Install_successfullyinstalled' 'Install_successfullyinstalled',
]), ]),
); ];
} }
public function deleteinstallfiles() public function deleteinstallfiles()
@ -510,12 +512,12 @@ HTML;
// We can't delete index.php as it might be necessary for URL routing without mod_rewrite. // We can't delete index.php as it might be necessary for URL routing without mod_rewrite.
// There's no safe way to detect usage of mod_rewrite across webservers, // There's no safe way to detect usage of mod_rewrite across webservers,
// so we have to assume the file is required. // so we have to assume the file is required.
$installfiles = array( $installfiles = [
'install.php', 'install.php',
'config-form.css', 'config-form.css',
'config-form.html', 'config-form.html',
'index.html' 'index.html',
); ];
$unsuccessful = new ArrayList(); $unsuccessful = new ArrayList();
foreach ($installfiles as $installfile) { foreach ($installfiles as $installfile) {
@ -524,23 +526,23 @@ HTML;
} }
if (file_exists(BASE_PATH . '/' . $installfile)) { if (file_exists(BASE_PATH . '/' . $installfile)) {
$unsuccessful->push(new ArrayData(array('File' => $installfile))); $unsuccessful->push(new ArrayData(['File' => $installfile]));
} }
} }
$data = new ArrayData(array( $data = new ArrayData([
'Username' => Convert::raw2xml($this->getRequest()->getSession()->get('username')), 'Username' => Convert::raw2xml($this->getRequest()->getSession()->get('username')),
'Password' => Convert::raw2xml($this->getRequest()->getSession()->get('password')), 'Password' => Convert::raw2xml($this->getRequest()->getSession()->get('password')),
'UnsuccessfulFiles' => $unsuccessful 'UnsuccessfulFiles' => $unsuccessful,
)); ]);
$content->setValue($data->renderWith([ $content->setValue($data->renderWith([
'type' => 'Includes', 'type' => 'Includes',
'Install_deleteinstallfiles' 'Install_deleteinstallfiles',
])); ]));
return array( return [
"Title" => $title, "Title" => $title,
"Content" => $content, "Content" => $content,
); ];
} }
} }