mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Page navigation visibility issues, format meta information (page view)

Browse Source
This commit is contained in:
SecretR
2013-04-02 09:29:11 +03:00
parent cebe1810a9
commit 17d75e6f55
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_plugins/page/e_sitelink.php
View File

@@ -69,19 +69,19 @@ class page_sitelink // include plugin-folder in the name.
} }
$query = "SELECT * FROM #page WHERE "; $query = "SELECT * FROM #page WHERE ";
$q = array();
if(vartrue($options['chapter'])) if(vartrue($options['chapter']))
{ {
$query .= "page_chapter = ".intval($options['chapter']); $q[] = "page_chapter = ".intval($options['chapter']);
} }
elseif(vartrue($options['book'])) elseif(vartrue($options['book']))
{ {
$query .= "page_chapter IN (SELECT chapter_id FROM #page_chapters WHERE chapter_parent=".intval($options['book']).")"; $q[] = "page_chapter IN (SELECT chapter_id FROM #page_chapters WHERE chapter_parent=".intval($options['book']).")";
} }
else // XXX discuss FIXED remove DB check, use default title - AND page_title !=''
{ $q[] = "page_class IN (".USERCLASS_LIST.")";
$query .= 1;
} $query .= implode(' AND ', $q)." ORDER BY page_order";
$query .= " AND page_title !='' ORDER BY page_order";
$data = $sql->retrieve($query, true); $data = $sql->retrieve($query, true);
$_pdata = array(); $_pdata = array();
@@ -91,7 +91,7 @@ class page_sitelink // include plugin-folder in the name.
$pid = $row['page_chapter']; $pid = $row['page_chapter'];
$sublinks[$pid][] = $_pdata[] = array( $sublinks[$pid][] = $_pdata[] = array(
'link_id' => $row['page_id'], 'link_id' => $row['page_id'],
'link_name' => $row['page_title'], 'link_name' => $row['page_title'] ? $row['page_title'] : 'No title', // FIXME lan
'link_url' => e107::getUrl()->create('page/view', $row, array('allow' => 'page_sef,page_title,page_id')), 'link_url' => e107::getUrl()->create('page/view', $row, array('allow' => 'page_sef,page_title,page_id')),
'link_description' => '', 'link_description' => '',
'link_button' => '', 'link_button' => '',

4
page.php
View File

@@ -316,8 +316,8 @@ class pageClass
$this->batch->setVars(new e_vars($ret))->setScVar('page', $this->page); $this->batch->setVars(new e_vars($ret))->setScVar('page', $this->page);
define('e_PAGETITLE', eHelper::formatMetaTitle($ret['title'])); define('e_PAGETITLE', eHelper::formatMetaTitle($ret['title']));
define('META_DESCRIPTION', $this->page['page_metadscr']); if($this->page['page_metadscr']) define('META_DESCRIPTION', eHelper::formatMetaDescription($this->page['page_metadscr']));
define('META_KEYWORDS', $this->page['page_metakeys']); if($this->page['page_metakeys']) define('META_KEYWORDS', eHelper::formatMetaKeys($this->page['page_metakeys']));
//return $ret; //return $ret;
} }