tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1' into 4

Browse Source 
# Conflicts:
  #	.travis.yml
This commit is contained in:
Robbie Averill 2018-05-28 18:22:07 +12:00
commit 0f27e9696b
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
code/Controllers/ContentController.php
View File

@ -62,6 +62,10 @@ class ContentController extends Controller
'LoginForm',
];
private static $casting = [
'SilverStripeNavigator' => 'HTMLFragment',
];
/**
* The ContentController will take the URLSegment parameter from the URL and use that to look
* up a SiteTree record.
@ -192,10 +196,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();
}
@ -273,13 +277,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()) {
@ -292,7 +296,7 @@ class ContentController extends Controller
}
}
$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
@ -356,7 +360,7 @@ class ContentController extends Controller
}
$viewPageIn = _t(__CLASS__ . '.VIEWPAGEIN', 'View Page in:');
$navigator = <<<HTML
return <<<HTML
<div id="SilverStripeNavigator">
<div class="holder">
<div id="logInStatus">
@ -371,7 +375,6 @@ class ContentController extends Controller
</div>
$message
HTML;
return DBField::create_field('HTMLFragment', $navigator);
// On live sites we should still see the archived message
} else {
@ -380,9 +383,9 @@ HTML;
/** @var DBDatetime $dateObj */
$dateObj = DBField::create_field('Datetime', $date);
// $dateObj->setVal($date);
return DBField::create_field('HTMLFragment', "<div id=\"SilverStripeNavigatorMessage\">" .
return "<div id=\"SilverStripeNavigatorMessage\">" .
_t(__CLASS__ . '.ARCHIVEDSITEFROM', 'Archived site from') .
"<br>" . $dateObj->Nice() . "</div>");
"<br>" . $dateObj->Nice() . "</div>";
}
}
return null;
@ -485,19 +488,19 @@ HTML;
}
global $project;
$data = new ArrayData(array(
$data = new ArrayData([
'Project' => Convert::raw2xml($project),
'Username' => Convert::raw2xml($this->getRequest()->getSession()->get('username')),
'Password' => Convert::raw2xml($this->getRequest()->getSession()->get('password')),
));
]);
return array(
return [
"Title" => _t(__CLASS__ . ".INSTALL_SUCCESS", "Installation Successful!"),
"Content" => $data->renderWith([
'type' => 'Includes',
'Install_successfullyinstalled'
'Install_successfullyinstalled',
]),
);
];
}
public function deleteinstallfiles()
@ -512,12 +515,12 @@ HTML;
// 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,
// so we have to assume the file is required.
$installfiles = array(
$installfiles = [
'install.php',
'config-form.css',
'config-form.html',
'index.html'
);
'index.html',
];
$unsuccessful = new ArrayList();
foreach ($installfiles as $installfile) {
@ -526,23 +529,23 @@ HTML;
}
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')),
'Password' => Convert::raw2xml($this->getRequest()->getSession()->get('password')),
'UnsuccessfulFiles' => $unsuccessful
));
'UnsuccessfulFiles' => $unsuccessful,
]);
$content->setValue($data->renderWith([
'type' => 'Includes',
'Install_deleteinstallfiles'
'Install_deleteinstallfiles',
]));
return array(
return [
"Title" => $title,
"Content" => $content,
);
];
}
}