nodes as stdclass instead of array

pkeane · Oct 8, 2011 · 1790dcb · 1790dcb
1 parent 252081a
commit 1790dcb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/lib/Dase/DBO.php b/lib/Dase/DBO.php
@@ -375,6 +375,16 @@ public function getIterator()
 		return new ArrayObject($this->fields);
 	}
 
+	public function asObj()
+	{
+			$obj = new stdClass();
+			foreach ($this->fields as $k => $v) {
+					$obj->$k = $v;
+			}
+			$obj->id = $this->id;
+			return $obj;
+	}
+
 	public function asArray()
 	{
 		foreach ($this->fields as $k => $v) {

diff --git a/lib/Dase/DBO/Node.php b/lib/Dase/DBO/Node.php
@@ -116,16 +116,15 @@ public function asJson($r)
 
 		public function asPhp($r,$get_attachments = true)
 		{
-				$obj_ar = $this->asArray();
+				$obj = $this->asObj();
-				$obj_ar['id'] = $this->id;
 				$meta = array();
 				foreach ($this->getAttvals() as $attval) {
 						if (!isset($meta[$attval->att_ascii])) {
 								$meta[$attval->att_ascii] = array();
 						}
 						$meta[$attval->att_ascii][] = $attval->value;
 				}
-				$obj_ar['meta'] = $meta;
+				$obj->meta = $meta;
 
 				if ($get_attachments) {
 						$attachments = array();
@@ -145,8 +144,8 @@ public function asPhp($r,$get_attachments = true)
 										$attachments[$at->name]['items'] = $nodeset->asPhp($r);
 								}
 						}
-						$obj_ar['attachments'] = $attachments;
+						$obj->attachments = $attachments;
 				}
-				return $obj_ar;
+				return $obj;
 		}
 }
diff --git a/lib/Dase/Handler/Page.php b/lib/Dase/Handler/Page.php
@@ -46,7 +46,12 @@ public function getNode($r) {
 				if ('image' == substr($node->mime,0,5)) {
 						$t->assign('is_image',1);
 				}
-				$r->renderResponse($t->fetch('page.tpl'));
+				$template_file = 'pages/page-'.$node->alias.'.tpl';
+				if ($t->template_exists($template_file)) {
+						$r->renderResponse($t->fetch($template_file));
+				} else {
+						$r->renderResponse($t->fetch('page.tpl'));
+				}   
 		}
 
 		public function getDynamicPage($r,$uri_path)

diff --git a/templates/pages/page-icons.tpl b/templates/pages/page-icons.tpl
@@ -1,11 +1,11 @@
 {extends file="eanthro-layout.tpl"}
 
 {block name="content"}
-<h1>{$node.title}</h1>
+<h1>{$node->title}</h1>
 <ul>
-{foreach item=subnode from=$node.attachments.icons.items}
+	{foreach item=subnode from=$node->attachments.icons.items}
-<li><img src="{$subnode.thumbnail_url}"></li>
+	<li><img src="{$subnode->thumbnail_url}"></li>
-{/foreach}
+	{/foreach}
 </ul>
 {if $is_image}
 <img src="node/{$node->name}">