TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comment out code until determined if it is needed

This commit is contained in:
Sam Georges 2014-05-27 13:14:02 +10:00
parent 9b542efe6f
commit 0f082bd160
3 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/cms/classes/ComponentBase.php
View File

@ -160,28 +160,28 @@ abstract class ComponentBase extends Extendable
* @param array $mappings ['componentProperty' => 'routed value']
* @return string
*/
protected function makePageLink($page, $class, $mappings = [])
{
if (!isset($this->pageLinkCache[$page.$class])) {
$this->pageLinkCache[$page.$class] = $this->getOtherPageComponent($page, $class);
}
// protected function makePageLink($page, $class, $mappings = [])
// {
// if (!isset($this->pageLinkCache[$page.$class])) {
// $this->pageLinkCache[$page.$class] = $this->getOtherPageComponent($page, $class);
// }
if (!$component = $this->pageLinkCache[$page.$class])
return null;
// if (!$component = $this->pageLinkCache[$page.$class])
// return null;
$params = [];
foreach ($mappings as $property => $value) {
// $params = [];
// foreach ($mappings as $property => $value) {
if (!$param = $component->property($property))
continue;
// if (!$param = $component->property($property))
// continue;
if (substr($param, 0, 1) == ':')
$param = substr($param, 1);
// if (substr($param, 0, 1) == ':')
// $param = substr($param, 1);
$params[$param] = $value;
}
// $params[$param] = $value;
// }
return $this->pageUrl($page, $params);
}
// return $this->pageUrl($page, $params);
// }
}

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

@ -278,48 +278,6 @@ class Controller extends BaseController
return $componentObj;
}
/**
* Creates a basic component object for another page, useful for extracting properties.
* @param string $page Page name or page file name
* @param string $class Component class name
* @return ComponentBase
*/
public function getOtherPageComponent($page, $class)
{
$class = Str::normalizeClassName($class);
$theme = $this->getTheme();
$manager = ComponentManager::instance();
$componentObj = new $class;
if (($page = Page::loadCached($theme, $page)) && isset($page->settings['components'])) {
foreach ($page->settings['components'] as $component => $properties) {
list($name, $alias) = strpos($component, ' ') ? explode(' ', $component) : array($component, $component);
if ($manager->resolve($name) == $class) {
$componentObj->setProperties($properties);
$componentObj->alias = $alias;
return $componentObj;
}
}
if (!isset($page->settings['layout']))
return null;
$layout = $page->settings['layout'];
if (($layout = Layout::loadCached($theme, $layout)) && isset($layout->settings['components'])) {
foreach ($layout->settings['components'] as $component => $properties) {
list($name, $alias) = strpos($component, ' ') ? explode(' ', $component) : array($component, $component);
if ($manager->resolve($name) == $class) {
$componentObj->setProperties($properties);
$componentObj->alias = $alias;
return $componentObj;
}
}
}
}
return null;
}
/**
* Executes the page, layout, component and plugin AJAX handlers.
* @return mixed Returns the AJAX Response object or null.
@ -779,4 +737,47 @@ class Controller extends BaseController
return null;
}
/**
* Creates a basic component object for another page, useful for extracting properties.
* @param string $page Page name or page file name
* @param string $class Component class name
* @return ComponentBase
*/
// public function getOtherPageComponent($page, $class)
// {
// $class = Str::normalizeClassName($class);
// $theme = $this->getTheme();
// $manager = ComponentManager::instance();
// $componentObj = new $class;
// if (($page = Page::loadCached($theme, $page)) && isset($page->settings['components'])) {
// foreach ($page->settings['components'] as $component => $properties) {
// list($name, $alias) = strpos($component, ' ') ? explode(' ', $component) : array($component, $component);
// if ($manager->resolve($name) == $class) {
// $componentObj->setProperties($properties);
// $componentObj->alias = $alias;
// return $componentObj;
// }
// }
// if (!isset($page->settings['layout']))
// return null;
// $layout = $page->settings['layout'];
// if (($layout = Layout::loadCached($theme, $layout)) && isset($layout->settings['components'])) {
// foreach ($layout->settings['components'] as $component => $properties) {
// list($name, $alias) = strpos($component, ' ') ? explode(' ', $component) : array($component, $component);
// if ($manager->resolve($name) == $class) {
// $componentObj->setProperties($properties);
// $componentObj->alias = $alias;
// return $componentObj;
// }
// }
// }
// }
// return null;
// }
}

2
modules/cms/classes/Router.php
View File

@ -136,7 +136,7 @@ class Router
* @param array $parameters Route parameters to consider in the URL.
* @return string A built URL matching the page route.
*/
public function findByFile($fileName, $parameters = [])
public function findByFile($fileName, $parameters = [])
{
if (!strlen(File::extension($fileName)))
$fileName .= '.htm';