From 499d29a4da206fe88f036b15eada60df99c8610d Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Wed, 24 Oct 2012 22:02:18 +0000 Subject: [PATCH] a basic fix for the Page-List page. (ie. no url query) to display books/chapters. Also removed old avatar holder. --- e107_images/avatars/avatar_1.png | Bin 4377 -> 0 bytes page.php | 60 ++++++++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 5 deletions(-) delete mode 100644 e107_images/avatars/avatar_1.png diff --git a/e107_images/avatars/avatar_1.png b/e107_images/avatars/avatar_1.png deleted file mode 100644 index 938ef07effd690b550c1850329ab4425976c7f17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4377 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 TkoRfx00000NkvXXu0mjf2ESc! diff --git a/page.php b/page.php index d0870e7c0..be5ee98e6 100644 --- a/page.php +++ b/page.php @@ -21,7 +21,8 @@ $e107CorePage = new pageClass(false); if(!e_QUERY) { require_once(HEADERF); - $tmp = $e107CorePage->listPages(); +// $tmp = $e107CorePage->listPages(); + $tmp = $e107CorePage->listBooks(); if(is_array($tmp)) { $ns->tablerender($tmp['title'], $tmp['text']); @@ -102,8 +103,53 @@ class pageClass } + + + //XXX - May be better to compile into assoc 'tree' array first. ie. books/chapters/pages. + function listBooks() + { + $sql = e107::getDb('sql2'); + $tp = e107::getParser(); + + if($sql->db_Select("page_chapters", "*", "chapter_parent ='0' ORDER BY chapter_order ASC ")) + { + while($row = $sql->db_Fetch()) + { + $text .= "

".$tp->toHtml($row['chapter_name'])."

"; // Book Title. + $text .= $this->listChapters($row['chapter_id']); + } + } + + $text .= "

Other Pages

"; // Book Title. + $text .= $this->listPages(0); // Pages unassigned to Book/Chapters. + e107::getRender()->tablerender(LAN_PAGE_11, $text,"cpage_list"); + } + + + + + //XXX - May be better to compile into assoc 'tree' array first. ie. books/chapters/pages. + function listChapters($book=1) + { + $sql = e107::getDb(); + $tp = e107::getParser(); + + if($sql->db_Select("page_chapters", "*", "chapter_parent = ".intval($book)." ORDER BY chapter_order ASC ")) + { + while($row = $sql->db_Fetch()) + { + $text .= "

".$tp->toHtml($row['chapter_name'])."

"; // Chapter Title. + $text .= $this->listPages(intval($row['chapter_id'])); + } + } + + return $text; + } + + + // TODO template for page list - function listPages() + function listPages($chapt=0) { $sql = e107::getDb(); $tp = e107::getParser(); @@ -114,7 +160,7 @@ class pageClass } else { - if(!$sql->db_Select("page", "*", "page_theme='' AND page_class IN (".USERCLASS_LIST.") ")) + if(!$sql->db_Select("page", "*", "page_theme='' AND page_chapter=".$chapt." AND page_class IN (".USERCLASS_LIST.") ORDER BY page_order ASC ")) { $text = LAN_PAGE_2; } @@ -124,11 +170,15 @@ class pageClass foreach($pageArray as $page) { $url = e107::getUrl()->create('page/view', $page, 'allow=page_id,page_sef'); - $text .= $this->bullet." ".$tp->toHtml($page['page_title'])."
"; + $text .= $this->bullet." ".$tp->toHtml($page['page_title'])."
"; //XXX Better to use
    and
  • ?? } - e107::getRender()->tablerender(LAN_PAGE_11, $text,"cpage_list"); + + // $caption = ($title !='')? $title: LAN_PAGE_11; + // e107::getRender()->tablerender($caption, $text,"cpage_list"); } } + + return $text; }