new item view: sparkle links not redirecting

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 2ec06fe614fea94d4c2786f091a4a88ef10cbcf3..65e6855a233c530188106bd3adf2fb726b979136 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -39,22 +39,22 @@ function network_content(&$a, $update = 0) {
        $group = 0;
 
        $nouveau = false;
+       require_once('include/acl_selectors.php');
 
-       if(! $update) {
-               $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
+       if(($a->argc > 2) && $a->argv[2] === 'new')
+               $nouveau = true;
 
-               if(($a->argc > 2) && $a->argv[2] === 'new')
+       if($a->argc > 1) {
+               if($a->argv[1] === 'new')
                        $nouveau = true;
-
-                       // pull out the group here because the updater might have different args
-               if($a->argc > 1) {
-                       if($a->argv[1] === 'new')
-                               $nouveau = true;
-                       else {
-                               $group = intval($a->argv[1]);
-                               $group_acl = array('allow_gid' => '<' . $group . '>');
-                       }
+               else {
+                       $group = intval($a->argv[1]);
+                       $group_acl = array('allow_gid' => '<' . $group . '>');
                }
+       }
+
+       if(! $update) {
+               $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
 
                $_SESSION['return_url'] = $a->cmd;
 
@@ -68,7 +68,6 @@ function network_content(&$a, $update = 0) {
                        '$nickname' => $a->user['nickname']
                ));
 
-               require_once('include/acl_selectors.php');
 
                $tpl = load_view_file("view/jot.tpl");
                
@@ -79,8 +78,12 @@ 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);
+               $jotplugins = '';
+               $jotnets = '';
+               call_hooks('jot_tool', $jotplugins);
+               call_hooks('jot_networks', $jotnets);
+
+               $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));        
 
                $o .= replace_macros($tpl,array(
                        '$return_path' => $a->cmd,
@@ -88,12 +91,12 @@ function network_content(&$a, $update = 0) {
                        '$defloc' => $a->user['default-location'],
                        '$visitor' => 'block',
                        '$emailcc' => t('CC: email addresses'),
+                       '$jotnets' => $jotnets,
                        '$emtitle' => t('Example: bob@example.com, mary@example.com'),
                        '$lockstate' => $lockstate,
                        '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
                        '$bang' => (($group) ? '!' : ''),
-                       '$profile_uid' => $_SESSION['uid'],
-                       '$jotplugins' => $jotplugins
+                       '$profile_uid' => $_SESSION['uid']
                ));
 
 
@@ -102,10 +105,10 @@ function network_content(&$a, $update = 0) {
                // filtering by group and also you aren't writing a comment (the last
                // criteria is discovered in javascript).
 
-               if($a->pager['start'] == 0 && $a->argc == 1) {
                        $o .= '<div id="live-network"></div>' . "\r\n";
-                       $o .= "<script> var profile_uid = " . $_SESSION['uid'] . "; </script>\r\n";
-               }
+                       $o .= "<script> var profile_uid = " . $_SESSION['uid'] 
+                               . "; var netargs = '" . substr($a->cmd,8) 
+                               . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 
        }
 
@@ -130,6 +133,8 @@ function network_content(&$a, $update = 0) {
                        intval($_SESSION['uid'])
                );
                if(! count($r)) {
+                       if($update)
+                               killme();
                        notice( t('No such group') . EOL );
                        goaway($a->get_baseurl() . '/network');
                        return; // NOTREACHED
@@ -145,7 +150,7 @@ function network_content(&$a, $update = 0) {
                }
 
                $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` AND `contact-id` IN ( $contact_str )) ";
-               $o = '<h4>' . t('Group: ') . $r[0]['name'] . '</h4>' . $o;
+               $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
        }
 
        if((! $group) && (! $update))
@@ -225,6 +230,13 @@ function network_content(&$a, $update = 0) {
                                $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
                                $profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
 
+                               $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+                               if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']) 
+                                       && ($item['network'] === 'dfrn') && (! $item['self'])) {
+                                       $profile_link = $redirect_url;
+                                       $sparkle = ' sparkle';
+                               }
 
                                $location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
                                $coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
@@ -240,6 +252,7 @@ function network_content(&$a, $update = 0) {
 
                                $o .= replace_macros($tpl,array(
                                        '$id' => $item['item_id'],
+                                       '$linktitle' => t('View $name\'s profile'),
                                        '$profile_url' => $profile_link,
                                        '$name' => $profile_name,
                                        '$sparkle' => $sparkle,
@@ -336,7 +349,8 @@ function network_content(&$a, $update = 0) {
 
                        if($item['last-child']) {
                                $comment = replace_macros($cmnt_tpl,array(
-                                       '$return_path' => $_SESSION['return_url'],
+                                       '$return_path' => '', 
+                                       '$jsreload' => '', // $_SESSION['return_url'],
                                        '$type' => 'net-comment',
                                        '$id' => $item['item_id'],
                                        '$parent' => $item['parent'],
@@ -348,7 +362,7 @@ function network_content(&$a, $update = 0) {
                                ));
                        }
 
-                       $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+                       $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 
        
@@ -406,7 +420,11 @@ function network_content(&$a, $update = 0) {
 
                        $tmp_item = replace_macros($template,array(
                                '$id' => $item['item_id'],
-                               '$title' => t('View $name\'s profile'),
+                               '$linktitle' => t('View $name\'s profile'),
+                               '$olinktitle' => t('View $owner_name\'s profile'),
+                               '$to' => t('to'),
+                               '$wall' => t('Wall-to-Wall'),
+                               '$vwall' => t('via Wall-To-Wall:'),
                                '$profile_url' => $profile_link,
                                '$name' => $profile_name,
                                '$thumb' => $profile_avatar,
@@ -421,6 +439,7 @@ function network_content(&$a, $update = 0) {
                                '$owner_url' => $owner_url,
                                '$owner_photo' => $owner_photo,
                                '$owner_name' => $owner_name,
+                               '$plink' => get_plink($item),
                                '$drop' => $drop,
                                '$vote' => $likebuttons,
                                '$like' => $like,