fix show-stopping bugs

17 files changed, 2 insertions, 240 deletions

diff --git a/view/tpl/smarty3/conv_item.tpl b/view/tpl/smarty3/conv_item.tpl
index a3e1ba7db..f69166f63 100644
--- a/view/tpl/smarty3/conv_item.tpl
+++ b/view/tpl/smarty3/conv_item.tpl
@@ -101,8 +101,8 @@
 <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
 </div>
 {{if $item.toplevel}}
-{{foreach $item.children as $item}}
-	{{include file="{{$item.template}}"}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
 {{/foreach}}
 {{/if}}
 
diff --git a/view/tpl/smarty3/diaspora_comment.tpl b/view/tpl/smarty3/diaspora_comment.tpl
deleted file mode 100644
index 27ec3dffc..000000000
--- a/view/tpl/smarty3/diaspora_comment.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <comment>
-      <guid>{{$guid}}</guid>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <author_signature>{{$authorsig}}</author_signature>
-      <text>{{$body}}</text>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_comment_relay.tpl b/view/tpl/smarty3/diaspora_comment_relay.tpl
deleted file mode 100644
index 37a9e88b3..000000000
--- a/view/tpl/smarty3/diaspora_comment_relay.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<XML>
-  <post>
-    <comment>
-      <guid>{{$guid}}</guid>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <author_signature>{{$authorsig}}</author_signature>
-      <text>{{$body}}</text>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_conversation.tpl b/view/tpl/smarty3/diaspora_conversation.tpl
deleted file mode 100644
index dc4482e4b..000000000
--- a/view/tpl/smarty3/diaspora_conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<XML>
-  <post>
-    <conversation>
-      <guid>{{$conv.guid}}</guid>
-      <subject>{{$conv.subject}}</subject>
-      <created_at>{{$conv.created_at}}</created_at>
-
-      {{foreach $conv.messages as $msg}}
-
-      <message>
-        <guid>{{$msg.guid}}</guid>
-        <parent_guid>{{$msg.parent_guid}}</parent_guid>
-        {{if $msg.parent_author_signature}}
-        <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature>
-        {{/if}}
-        <author_signature>{{$msg.author_signature}}</author_signature>
-        <text>{{$msg.text}}</text>
-        <created_at>{{$msg.created_at}}</created_at>
-        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
-        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
-      </message>
-
-      {{/foreach}}
-
-      <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle>
-      <participant_handles>{{$conv.participant_handles}}</participant_handles>
-    </conversation>
-  </post>
-</XML>
diff --git a/view/tpl/smarty3/diaspora_like.tpl b/view/tpl/smarty3/diaspora_like.tpl
deleted file mode 100644
index b03aef37a..000000000
--- a/view/tpl/smarty3/diaspora_like.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<XML>
-  <post>
-    <like>
-      <target_type>{{$target_type}}</target_type>
-      <guid>{{$guid}}</guid>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <author_signature>{{$authorsig}}</author_signature>
-      <positive>{{$positive}}</positive>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/tpl/smarty3/diaspora_like_relay.tpl b/view/tpl/smarty3/diaspora_like_relay.tpl
deleted file mode 100644
index 30df4cac6..000000000
--- a/view/tpl/smarty3/diaspora_like_relay.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <like>
-      <guid>{{$guid}}</guid>
-      <target_type>{{$target_type}}</target_type>
-      <parent_guid>{{$parent_guid}}</parent_guid>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <author_signature>{{$authorsig}}</author_signature>
-      <positive>{{$positive}}</positive>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/tpl/smarty3/diaspora_message.tpl b/view/tpl/smarty3/diaspora_message.tpl
deleted file mode 100644
index 3413d79b0..000000000
--- a/view/tpl/smarty3/diaspora_message.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-      <message>
-        <guid>{{$msg.guid}}</guid>
-        <parent_guid>{{$msg.parent_guid}}</parent_guid>
-        <author_signature>{{$msg.author_signature}}</author_signature>
-        <text>{{$msg.text}}</text>
-        <created_at>{{$msg.created_at}}</created_at>
-        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
-        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
-      </message>
-  </post>
-</XML>
diff --git a/view/tpl/smarty3/diaspora_photo.tpl b/view/tpl/smarty3/diaspora_photo.tpl
deleted file mode 100644
index cd7ef5802..000000000
--- a/view/tpl/smarty3/diaspora_photo.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <photo>
-      <remote_photo_path>{{$path}}</remote_photo_path>
-      <remote_photo_name>{{$filename}}</remote_photo_name>
-      <status_message_guid>{{$msg_guid}}</status_message_guid>
-      <guid>{{$guid}}</guid>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-      <public>{{$public}}</public>
-      <created_at>{{$created_at}}</created_at>
-    </photo>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_post.tpl b/view/tpl/smarty3/diaspora_post.tpl
deleted file mode 100644
index abbcc4c61..000000000
--- a/view/tpl/smarty3/diaspora_post.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <status_message>
-      <raw_message>{{$body}}</raw_message>
-      <guid>{{$guid}}</guid>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-      <public>{{$public}}</public>
-      <created_at>{{$created}}</created_at>
-    </status_message>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_profile.tpl b/view/tpl/smarty3/diaspora_profile.tpl
deleted file mode 100644
index 04f2e2948..000000000
--- a/view/tpl/smarty3/diaspora_profile.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<XML>
- <post><profile>
-  <diaspora_handle>{{$handle}}</diaspora_handle>
-  <first_name>{{$first}}</first_name>
-  <last_name>{{$last}}</last_name>
-  <image_url>{{$large}}</image_url>
-  <image_url_small>{{$small}}</image_url_small>
-  <image_url_medium>{{$medium}}</image_url_medium>
-  <birthday>{{$dob}}</birthday>
-  <gender>{{$gender}}</gender>
-  <bio>{{$about}}</bio>
-  <location>{{$location}}</location>
-  <searchable>{{$searchable}}</searchable>
-  <tag_string>{{$tags}}</tag_string>
-</profile></post>
-      </XML>
diff --git a/view/tpl/smarty3/diaspora_relay_retraction.tpl b/view/tpl/smarty3/diaspora_relay_retraction.tpl
deleted file mode 100644
index 5e7aed41f..000000000
--- a/view/tpl/smarty3/diaspora_relay_retraction.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>{{$type}}</target_type>
-      <target_guid>{{$guid}}</target_guid>
-      <target_author_signature>{{$signature}}</target_author_signature>
-      <sender_handle>{{$handle}}</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/tpl/smarty3/diaspora_relayable_retraction.tpl b/view/tpl/smarty3/diaspora_relayable_retraction.tpl
deleted file mode 100644
index 927e394f3..000000000
--- a/view/tpl/smarty3/diaspora_relayable_retraction.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>{{$target_type}}</target_type>
-      <target_guid>{{$guid}}</target_guid>
-      <parent_author_signature>{{$parentsig}}</parent_author_signature>
-      <target_author_signature>{{$authorsig}}</target_author_signature>
-      <sender_handle>{{$handle}}</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/tpl/smarty3/diaspora_retract.tpl b/view/tpl/smarty3/diaspora_retract.tpl
deleted file mode 100644
index 26e2cb94e..000000000
--- a/view/tpl/smarty3/diaspora_retract.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<XML>
-  <post>
-    <retraction>
-      <post_guid>{{$guid}}</post_guid>
-      <type>{{$type}}</type>
-      <diaspora_handle>{{$handle}}</diaspora_handle>
-    </retraction>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_share.tpl b/view/tpl/smarty3/diaspora_share.tpl
deleted file mode 100644
index 59eb06124..000000000
--- a/view/tpl/smarty3/diaspora_share.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<XML>
-  <post>
-    <request>
-      <sender_handle>{{$sender}}</sender_handle>
-      <recipient_handle>{{$recipient}}</recipient_handle>
-    </request>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/tpl/smarty3/diaspora_signed_retract.tpl b/view/tpl/smarty3/diaspora_signed_retract.tpl
deleted file mode 100644
index f0f346da8..000000000
--- a/view/tpl/smarty3/diaspora_signed_retract.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<XML>
-  <post>
-    <signed_retraction>
-      <target_guid>{{$guid}}</target_guid>
-      <target_type>{{$type}}</target_type>
-      <sender_handle>{{$handle}}</sender_handle>
-      <target_author_signature>{{$signature}}</target_author_signature>
-    </signed_retraction>
-  </post>
-</XML>
diff --git a/view/tpl/smarty3/diaspora_vcard.tpl b/view/tpl/smarty3/diaspora_vcard.tpl
deleted file mode 100644
index 0ab6879f9..000000000
--- a/view/tpl/smarty3/diaspora_vcard.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<div style="display:none;">
-	<dl class='channel_nickname'>
-		<dt>Nickname</dt>
-		<dd>		
-			<a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a>
-		</dd>
-	</dl>
-	<dl class='channel_fn'>
-		<dt>Full name</dt>
-		<dd>
-			<span class='fn'>{{$diaspora.fullname}}</span>
-		</dd>
-	</dl>
-
-	<dl class='channel_given_name'>
-		<dt>First name</dt>
-		<dd>
-		<span class='given_name'>{{$diaspora.firstname}}</span>
-		</dd>
-	</dl>
-	<dl class='channel_family_name'>
-		<dt>Family name</dt>
-		<dd>
-		<span class='family_name'>{{$diaspora.lastname}}</span>
-		</dd>
-	</dl>
-	<dl class="channel_url">
-		<dt>URL</dt>
-		<dd>
-			<a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a>
-		</dd>
-	</dl>
-	<dl class="channel_photo">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}">
-		</dd>
-	</dl>
-	<dl class="channel_photo_medium">
-		<dt>Photo</dt>
-		<dd> 
-			<img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
-		</dd>
-	</dl>
-	<dl class="channel_photo_small">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
-		</dd>
-	</dl>
-	<dl class="channel_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">{{$diaspora.searchable}}</span>
-		</dd>
-	</dl>
-</div>
diff --git a/view/tpl/smarty3/xrd_diaspora.tpl b/view/tpl/smarty3/xrd_diaspora.tpl
deleted file mode 100644
index aa0d8c740..000000000
--- a/view/tpl/smarty3/xrd_diaspora.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
-	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
-	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />