Navigation

Changeset 262

Timestamp:

02/14/07 17:30:55 (2 years ago)

Author:

mikey

Message:

renamed websites.pages to websites.memphis

Files:

r261	r262
38	38	{
39	39	if (null == self::$xmlParser) {
40		$tagParser = new DefinitionParser(array('http://stubbles.net/websites/pages' => $classLoader));
41		$defs = $tagParser->parse(stubFactory::getResourceURI('xjconf/~~page~~s.xml'));
	40	$tagParser = new DefinitionParser(array('http://stubbles.net/websites/pages/memphis' => $classLoader));
	41	$defs = $tagParser->parse(stubFactory::getResourceURI('xjconf/websites-memphis.xml'));
42	42
43	43	self::$xmlParser = new XmlParser();
…	…
58	58	self::$xmlParser->parse($configFile);
59	59	} catch (XJConfException $xjce) {
60		throw new stubPageConfigurationException('Can not read page configuration from ' . $configFile, $xjce~~->getMessage()~~);
	60	throw new stubPageConfigurationException('Can not read page configuration from ' . $configFile, $xjce);
61	61	}
62	62

r260	r262
69	69	if ($this->request->hasValue('page') == true) {
70	70	$pageName = $this->request->getValidatedValue(new stubRegexValidator('[a-zA-Z0-9_'), 'page');
71		if (null == $pageName \|\| file_exists(stubConfig::getConfigPath() . '/xml/memphis/' . $pageName . '.xml') == false) {
	71	if (null == $pageName \|\| file_exists(stubConfig::getConfigPath() . '/xml/pages/memphis/' . $pageName . '.xml') == false) {
72	72	$pageName = 'index';
73	73	}
…	…
77	77
78	78	try {
79		$page = $this->pageFactory->getPage(stubConfig::getConfigPath() . '/xml/memphis/' . $pageName . '.xml');
	79	$page = $this->pageFactory->getPage(stubConfig::getConfigPath() . '/xml/pages/memphis/' . $pageName . '.xml');
80	80	} catch (stubPageConfigurationException $pce) {
81		~~# create error response~~
	81	$this->response->replaceData((string) $pce);
82	82	return $this;
83	83	}