Changeset 286
- Timestamp:
- 02/21/07 17:17:50 (1 year ago)
- Files:
-
- trunk/config/xml/processors.xml (modified) (1 diff)
- trunk/docroot/index.php (modified) (2 diffs)
- trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php (moved) (moved from trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisPageProcessor.php) (2 diffs)
- trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php (modified) (1 diff)
- trunk/src/test/php/net/stubbles/websites/memphis (added)
- trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/config/xml/processors.xml
r279 r286 6 6 <pageFactory type="net.stubbles.websites.stubXJConfPageFactory" /> 7 7 <processor name="xml" type="net.stubbles.websites.xml.stubXMLPageProcessor" /> 8 <processor name="page" type="net.stubbles.websites.memphis.stubMemphisP ageProcessor" />8 <processor name="page" type="net.stubbles.websites.memphis.stubMemphisProcessor" /> 9 9 </defaultResolver> 10 10 </xj:configuration> trunk/docroot/index.php
r279 r286 2 2 require '../config/php/config.php'; 3 3 require '../lib/stubbles.php'; 4 stubClassLoader::load('net.stubbles.websites.memphis.stubMemphisP ageProcessor',4 stubClassLoader::load('net.stubbles.websites.memphis.stubMemphisProcessor', 5 5 'net.stubbles.websites.stubXJConfPageFactory', 6 6 'net.stubbles.ipo.request.stubWebRequest', … … 14 14 $session = new stubPHPSession('stubSID'); 15 15 $pageFactory = new stubXJConfPageFactory(stubXJConfLoader::getInstance()); 16 $processor = new stubMemphisP ageProcessor($request, $session, $pageFactory);16 $processor = new stubMemphisProcessor($request, $session, $pageFactory); 17 17 $processor->process()->getResponse()->send(); 18 18 } trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php
r280 r286 16 16 * @subpackage websites_memphis 17 17 */ 18 class stubMemphisP ageProcessor extends stubAbstractProcessor18 class stubMemphisProcessor extends stubAbstractProcessor 19 19 { 20 20 /** … … 40 40 if ($this->request->hasValue('page') == true) { 41 41 $pageName = $this->request->getValidatedValue(new stubRegexValidator('[a-zA-Z0-9_'), 'page'); 42 if (null == $pageName || file_exists(stubConfig::getConfigPath() . '/xml/pages/memphis/' . $pageName . '.xml') == false) {42 if (null == $pageName || $this->pageFactory->hasPage('memphis/' . $pageName) == false) { 43 43 $pageName = 'index'; 44 44 } trunk/src/test/php/net/stubbles/websites/WebsitesTestSuite.php
r283 r286 24 24 $this->addTestFile($dir . '/stubPageTestCase.php'); 25 25 26 // memphis tests 27 $this->addTestFile($dir . '/memphis/stubMemphisProcessorTestCase.php'); 28 26 29 // processors tests 27 30 $this->addTestFile($dir . '/processors/stubDefaultProcessorResolverTestCase.php');
