ben/sihnon-php-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Page to support processed includes

Browse Source 
Permit inclusion of templates through the templating code, rather than
through smarty.
This commit is contained in:
Ben Roberts
2011-12-19 12:07:12 +00:00
parent 537583a231
commit 5b72a8a206
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/lib/SihnonFramework/Page.class.php
View File

@@ -7,10 +7,14 @@ class SihnonFramework_Page {
private $page; private $page;
public function __construct(Smarty $smarty, SihnonFramework_RequestParser $request) { public function __construct(Smarty $smarty, SihnonFramework_RequestParser $request, $page = null) {
$this->smarty = $smarty; $this->smarty = $smarty;
$this->request = $request; $this->request = $request;
$this->page = $request->page(); $this->page = $page;
if ($page === null) {
$this->page = $request->page();
}
} }
public function page() { public function page() {
@@ -20,23 +24,32 @@ class SihnonFramework_Page {
public function template_filename() { public function template_filename() {
return $this->page . '.tpl'; return $this->page . '.tpl';
} }
public function code_filename() {
return $this->page . '.php';
}
public function evaluate($template_variables = array()) { public function evaluate($template_variables = array()) {
$code_filename = $this->page . '.php'; $code_filename = $this->code_filename();
$template_filename = $this->template_filename(); $template_filename = $this->template_filename();
$content = '';
try { try {
$this->render($template_filename, $code_filename, $template_variables); $this->smarty->assign('page', $this);
$this->smarty->assign('requested_page', $this->page);
$content = $this->render($template_filename, $code_filename, $template_variables);
} catch (SihnonFramework_Exception_AbortEntirePage $e) { } catch (SihnonFramework_Exception_AbortEntirePage $e) {
return false; return false;
} catch (SihnonFramework_Exception_FileNotFound $e) { } catch (SihnonFramework_Exception_FileNotFound $e) {
$this->render('errors/404.tpl', 'errors/404.php'); $content = $this->render('errors/404.tpl', 'errors/404.php');
} catch (SihnonFramework_Exception $e) { } catch (SihnonFramework_Exception $e) {
$this->render('errors/unhandled-exception.tpl', 'errors/unhandled-exception.php', array( $content = $this->render('errors/unhandled-exception.tpl', 'errors/unhandled-exception.php', array(
'exception' => $e, 'exception' => $e,
)); ));
} }
$this->smarty->assign('page_content', $content);
return true; return true;
} }
@@ -57,10 +70,13 @@ class SihnonFramework_Page {
include $real_code_filename; include $real_code_filename;
} }
$this->smarty->assign('requested_page', $this->page);
// Now execute the template itself, which will render the results of the code file // Now execute the template itself, which will render the results of the code file
$this->smarty->assign('page_content', $this->smarty->fetch($template_filename)); return $this->smarty->fetch($template_filename);
}
public function include_template($page, $template_variables = array()) {
$subpage = new Sihnon_Page($this->smarty, $this->request, $page);
return $subpage->render($subpage->template_filename(), $subpage->code_filename(), $template_variables);
} }
public static function redirect($relative_url) { public static function redirect($relative_url) {