roll version - now in alpha 2.1

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 11d1c5291f0044d852f674401df43fd7fd7d9f91..50d7134c174b0a507241f6ad4c30b952a4aa7b23 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -3,6 +3,7 @@
 
 function network_init(&$a) {
        if(! local_user()) {
+               notice( t('Permission denied.') . EOL);
                return;
        }
   
@@ -78,6 +79,9 @@ function network_content(&$a, $update = 0) {
 
                $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
+    $jotplugins = "";
+    call_hooks('jot_tool', $jotplugins);
+
                $o .= replace_macros($tpl,array(
                        '$return_path' => $a->cmd,
                        '$baseurl' => $a->get_baseurl(),
@@ -86,7 +90,8 @@ function network_content(&$a, $update = 0) {
                        '$lockstate' => $lockstate,
                        '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
                        '$bang' => (($group) ? '!' : ''),
-                       '$profile_uid' => $_SESSION['uid']
+                       '$profile_uid' => $_SESSION['uid'],
+                       '$jotplugins' => $jotplugins
                ));
 
 
@@ -239,7 +244,7 @@ function network_content(&$a, $update = 0) {
                                        '$lock' => $lock,
                                        '$thumb' => $profile_avatar,
                                        '$title' => $item['title'],
-                                       '$body' => bbcode($item['body']),
+                                       '$body' => smilies(bbcode($item['body'])),
                                        '$ago' => relative_date($item['created']),
                                        '$location' => $location,
                                        '$indent' => '',
@@ -429,8 +434,10 @@ function network_content(&$a, $update = 0) {
                }
        }
 
-       if(! $update)
+       if(! $update) {
                $o .= paginate($a);
+               $o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
+       }
 
        return $o;
 }
\ No newline at end of file