mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Reverted page sef-chapters fix until a suitable solution can be found.

Browse Source
This commit is contained in:
Cameron
2015-01-25 01:56:43 -08:00
parent 277e0c5020
commit f2e71589c7
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
e107_core/url/page/sef_chapters_url.php
View File

@@ -19,19 +19,26 @@ class core_page_sef_chapters_url extends eUrlConfig
'format' => 'path', // get|path - notify core for the current URL format, if set to 'get' rules will be ignored 'format' => 'path', // get|path - notify core for the current URL format, if set to 'get' rules will be ignored
'defaultRoute' => 'view/index',// [optional] default empty; route (no leading module) used when module is found with no additional controller/action information e.g. /news/ 'defaultRoute' => 'view/index',// [optional] default empty; route (no leading module) used when module is found with no additional controller/action information e.g. /news/
'urlSuffix' => '', // [optional] default empty; string to append to the URL (e.g. .html) 'urlSuffix' => '', // [optional] default empty; string to append to the URL (e.g. .html)
'mapVars' => array(
'page_id' => 'id',
'page_sef' => 'name',
),
'allowVars' => array( 'allowVars' => array(
'page', 'page',
), ),
), ),
'rules' => array( ### using only title for pages is risky enough (empty sef for old DB's)
### match page view with no assigned chapter first to avoid namespace collisions # reverted. Ultimate solution must allow for root level book-name as well as root level 'page' without the use of 'item' or any other prefix.
'item/<name:{secure}>' => array('view/other', 'mapVars' => array('page_id'=>'id', 'page_sef'=>'name'),'legacyQuery' => '{id}.{page}', 'parseCallback' => 'itemIdByTitle'), # Books/Chapters should take priority as that is the primary purpose of this module.
'<book:{sefsecure}>/<chapter:{sefsecure}>/<name:{secure}>' => array('view/index', 'mapVars' => array('page_id'=>'id', 'page_sef'=>'name', 'chapter_sef'=>'chapter', 'book_sef'=>'book'), 'legacyQuery' => '{id}.{page}', 'parseCallback' => 'itemIdByTitle'), 'rules' => array(
'<book:{sefsecure}>/<name:{sefsecure}>' => array('chapter/index', 'allowVars' => false, 'mapVars' => array('chapter_id'=>'id', 'chapter_sef'=>'name', 'book_sef'=>'book'), 'legacyQuery' => 'ch={id}', 'parseCallback' => 'chapterIdByTitle'), '<book:{sefsecure}>/<chapter:{sefsecure}>/<name:{secure}>' => array('view/index', 'allowVars' => false, 'mapVars' => array('page_id'=>'id', 'page_sef'=>'name', 'chapter_sef'=>'chapter', 'book_sef'=>'book'), 'legacyQuery' => '{name}.{page}', 'parseCallback' => 'itemIdByTitle'),
'<book:{sefsecure}>' => array('book/index', 'allowVars' => false, 'mapVars' => array('chapter_id'=>'id', 'chapter_sef'=>'book'), 'legacyQuery' => 'bk={id}', 'parseCallback' => 'chapterIdByTitle'), '<book:{sefsecure}>/<name:{sefsecure}>' => array('chapter/index', 'allowVars' => false, 'mapVars' => array('chapter_id'=>'id', 'chapter_sef'=>'name', 'book_sef'=>'book'), 'legacyQuery' => 'ch={id}', 'parseCallback' => 'chapterIdByTitle'),
'/' => array('list/index', 'allowVars' => false, 'legacyQuery' => '', ), // page list '<name:{sefsecure}>' => array('book/index', 'allowVars' => false, 'mapVars' => array('chapter_id'=>'id', 'chapter_sef'=>'name'), 'legacyQuery' => '{type}={id}', 'parseCallback' => 'chapterIdByTitle'),
'<name:{secure}>' => array('view/other', 'allowVars' => false, 'legacyQuery' => '{type}={id}', 'parseCallback' => 'chapterIdByTitle'),
'/' => array('list/index', 'legacyQuery' => '', ), // page list
) )
); );
} }
@@ -93,8 +100,7 @@ class core_page_sef_chapters_url extends eUrlConfig
{ {
$name = $sql->fetch(); $name = $sql->fetch();
//$request->setRequestParam('legacyQuery','{name}.{page}'); //$request->setRequestParam('legacyQuery','{name}.{page}');
$request->setRequestParam('name', $name['page_id']) $request->setRequestParam('name', $name['page_id']);
->setRequestParam('id', $name['page_id']);
e107::getMessage()->addDebug("Set PAGE ID = '".$name['page_id']."'"); e107::getMessage()->addDebug("Set PAGE ID = '".$name['page_id']."'");
} }
@@ -128,12 +134,7 @@ class core_page_sef_chapters_url extends eUrlConfig
public function chapterIdByTitle(eRequest $request) public function chapterIdByTitle(eRequest $request)
{ {
$name = $request->getRequestParam('name'); $name = $request->getRequestParam('name');
if(null == $name)
{
// Book view
$name = $request->getRequestParam('book');
}
if(($id = $request->getRequestParam('id'))) if(($id = $request->getRequestParam('id')))
{ {
$request->setRequestParam('name', $id); $request->setRequestParam('name', $id);
@@ -154,19 +155,17 @@ class core_page_sef_chapters_url extends eUrlConfig
if($sql->select('page_chapters', 'chapter_id', "chapter_sef='{$name}'")) // First check books and chapters. if($sql->select('page_chapters', 'chapter_id', "chapter_sef='{$name}'")) // First check books and chapters.
{ {
$name = $sql->fetch(); $name = $sql->fetch();
$request->setRequestParam('id', $name['chapter_id']) $request->setRequestParam('id', $name['chapter_id']);
->setRequestParam('name', $name['chapter_id']); $request->setRequestParam('type', 'bk');
//$request->setRequestParam('type', 'bk');
e107::getMessage()->addDebug("Set CHAPTER ID = '".$name['chapter_id']."'"); e107::getMessage()->addDebug("Set CHAPTER ID = '".$name['chapter_id']."'");
} }
/*elseif($sql->select('page', 'page_id', "page_sef='{$name}'")) // fall back to pages. elseif($sql->select('page', 'page_id', "page_sef='{$name}'")) // fall back to pages.
{ {
$name = $sql->fetch(); $name = $sql->fetch();
$request->setRequestParam('id', $name['page_id']); $request->setRequestParam('id', $name['page_id']);
$request->setRequestParam('type', 'id'); $request->setRequestParam('type', 'id');
e107::getMessage()->addDebug("Set PAGE ID = '".$name['page_id']."'"); e107::getMessage()->addDebug("Set PAGE ID = '".$name['page_id']."'");
}*/ }
else else
{ {
if(ADMIN) if(ADMIN)