mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Tidy up code a lil

Browse Source
This commit is contained in:
Sam Georges 2014-10-30 16:54:56 +11:00
parent 2a771190ea
commit ac37d23d14
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
modules/cms/classes/Controller.php
View File

@ -368,15 +368,19 @@ class Controller extends BaseController
{
if (!$this->layout->isFallBack()) {
foreach ($this->layout->settings['components'] as $component => $properties) {
list($name, $alias) = strpos($component, ' ') ?
explode(' ', $component) : array($component, $component);
list($name, $alias) = strpos($component, ' ')
? explode(' ', $component)
: [$component, $component];
$this->addComponent($name, $alias, $properties, true);
}
}
foreach ($this->page->settings['components'] as $component => $properties) {
list($name, $alias) = strpos($component, ' ') ?
explode(' ', $component) : array($component, $component);
list($name, $alias) = strpos($component, ' ')
? explode(' ', $component)
: [$component, $component];
$this->addComponent($name, $alias, $properties);
}
}
@ -755,23 +759,25 @@ class Controller extends BaseController
}
/*
* Run partial functions (only for real partials)
* Run functions for CMS partials only (Cms\Classes\Partial)
*/
if ($partial instanceof \Cms\Classes\Partial) {
if ($partial instanceof Partial) {
$manager = ComponentManager::instance();
foreach ($partial->settings['components'] as $component => $properties) {
list($name, $alias) = strpos($component, ' ') ?
explode(' ', $component) : array($component, $component);
list($name, $alias) = strpos($component, ' ')
? explode(' ', $component)
: [$component, $component];
$properties = $this->setComponentPropertiesFromParameters($properties, $parameters, []);
if (!$componentObj = $manager->makeComponent($name, $this->pageObj, $properties))
if (!$componentObj = $manager->makeComponent($name, $this->pageObj, $properties)) {
throw new CmsException(Lang::get('cms::lang.component.not_found', ['name'=>$name]));
}
$componentObj->alias = $alias;
$parameters[$alias] = $partial->components[$alias] = $componentObj;
$parameters[$alias] = $partial->components[$alias] = $componentObj;
array_push($this->partialComponentStack, [
'name' => $alias,
@ -800,11 +806,10 @@ class Controller extends BaseController
CmsException::mask($partial, 400);
$this->loader->setObject($partial);
$template = $this->twig->loadTemplate($partial->getFullPath());
$result = $template->render(array_merge($this->vars, $parameters));
CmsException::unmask($this->partialComponentStack);
CmsException::unmask();
if ($partial instanceof \Cms\Classes\Partial) {
if ($partial instanceof Partial) {
if ($this->partialComponentStack) {
array_pop($this->partialComponentStack);
}
@ -1091,18 +1096,26 @@ class Controller extends BaseController
$routerParameters = $this->router->getParameters();
foreach ($properties as $propertyName=>$propertyValue) {
foreach ($properties as $propertyName => $propertyValue) {
$matches = [];
if (preg_match('/^\{\{([^\}]+)\}\}$/', $propertyValue, $matches)) {
$paramName = trim($matches[1]);
if ( substr($paramName, 0, 1) == ':' ) {
if (substr($paramName, 0, 1) == ':') {
$paramName = substr($paramName, 1);
$result[$propertyName] = array_key_exists($paramName, $routerParameters) ? $routerParameters[$paramName] : null;
} else
$result[$propertyName] = array_key_exists($paramName, $parameters) ? $parameters[$paramName] : null;
} else
$result[$propertyName] = array_key_exists($paramName, $routerParameters)
? $routerParameters[$paramName]
: null;
}
else {
$result[$propertyName] = array_key_exists($paramName, $parameters)
? $parameters[$paramName]
: null;
}
}
else {
$result[$propertyName] = $propertyValue;
}
}
return $result;

4
modules/cms/controllers/index/_form_page.htm
View File

@ -5,8 +5,8 @@
'data-window-close-confirm' => e(trans('backend::lang.form.confirm_tab_close')),
'data-inspector-external-parameters' => true
];
echo Form::open($formConfig) ?>
?>
<?= Form::open($formConfig) ?>
<?= $form->render() ?>
<input type="hidden" value="<?= ($templateType) ?>" name="templateType" />