Merge commit '059badecbc0be895c6165430e5096a9ab653027e' as 'mod/livestream'

2 files changed, 52 insertions, 0 deletions

diff --git a/mod/livestream/views/default/object/list.php b/mod/livestream/views/default/object/list.php
new file mode 100755
index 000000000..9ab6789bd
--- /dev/null
+++ b/mod/livestream/views/default/object/list.php
@@ -0,0 +1,14 @@
+<?php
+    $item = $vars['entity'];
+    $owner = livestream_get_owner($item);
+
+	$row = "
+	<div class=\"contentWrapper\">
+	<br />
+	<a href=\"".$CONFIG->wwwroot."livestream/".$owner->username."/view/".$item->guid."\">".$item->title."</a>
+	</div>
+	";
+
+	echo elgg_echo($row);
+
+?>
diff --git a/mod/livestream/views/default/object/livestream.php b/mod/livestream/views/default/object/livestream.php
new file mode 100755
index 000000000..ea500aa10
--- /dev/null
+++ b/mod/livestream/views/default/object/livestream.php
@@ -0,0 +1,38 @@
+<?php
+$item = livestream_get($vars['entity']->guid);
+
+
+//foreach($data as $x => $item){
+	$src = $item->src;
+	
+	$owner = livestream_get_owner($item);
+	
+	/* the following html code raises this funny notice
+	 * 
+	 * NOTICE: SELECT e.* from elgg_users_entity u join elgg_entities e on e.guid=u.guid where 
+	 * 
+	 * u.username='com.fluendo.player.Cortado.class' 
+	 * 
+	 * and ( (e.access_id = -2\n\t\t\tAND e.owner_guid 
+	 * IN (\n\t\t\t\tSELECT guid_one FROM 
+	 * elgg_entity_relationships\n\t\t\t\tWHERE relationship='friend' AND guid_two=6\n\t\t\t)) 
+	 * OR  (e.access_id IN (2,1,4,5,6)\n\t\t\tOR (e.owner_guid = 6)\n\t\t\tOR 
+	 * (\n\t\t\t\te.access_id = 0\n\t\t\t\tAND e.owner_guid = 6\n\t\t\t)\n\t\t) 
+	 * and e.enabled='yes')  results cached, referer: 
+	 * http://localhost/lorea/elgg/livestream/alice
+	 * 
+	 * */
+	
+	$player = "<a href=\"".$CONFIG->wwwroot."livestream/".$owner->username."/view/".$item->guid."\">".$item->title."</a>";
+	
+	$row = "
+	<div class=\"contentWrapper\">
+	$player
+	</div>
+	";
+
+	
+	echo elgg_echo($row);
+//}
+
+?>