remove now-unnecessary line in text.php

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index be4a0ab9f9d47552deee2ed24e4da59902d4b4c0..2e0b8216a4a7fc09316522177001aba54cef5f7d 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,13 +1,22 @@
 <?php
 
 
-function display_content(&$a) {
+function display_init(&$a) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
+               killme();
                return;
        }
 
+       $nick = (($a->argc > 1) ? $a->argv[1] : '');
+       profile_load($a,$nick);
+
+}
+
+
+function display_content(&$a, $update = 0) {
+
        require_once("include/bbcode.php");
        require_once('include/security.php');
        require_once('include/conversation.php');
@@ -16,13 +25,22 @@ function display_content(&$a) {
 
        $o = '';
 
-       $a->page['htmlhead'] .= get_markup_template('display-head.tpl');
+       $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
 
 
-       $nick = (($a->argc > 1) ? $a->argv[1] : '');
-       profile_load($a,$nick);
+       if($update) {
+               $nick = $_REQUEST['nick'];
+       }
+       else {
+               $nick = (($a->argc > 1) ? $a->argv[1] : '');
+       }
 
-       $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+       if($update) {
+               $item_id = $_REQUEST['item_id'];
+       }
+       else {
+               $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+       }
 
        if(! $item_id) {
                $a->error = 404;
@@ -97,6 +115,18 @@ function display_content(&$a) {
 
        $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
+       if($update) {
+               $r = q("SELECT id FROM item WHERE item.uid = %d
+                       AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
+                       $sql_extra AND unseen = 1",
+                       intval($a->profile['uid']),
+                       dbesc($item_id),
+                       dbesc($item_id) 
+               );
+               if(!$r)
+                       return '';
+       }
+
        $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
                `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
                `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
@@ -124,8 +154,10 @@ function display_content(&$a) {
                }
 
                $items = conv_sort($r,"`commented`");
-               
-               $o .= conversation($a,$items,'display', false);
+
+               if(!$update)
+                       $o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
+               $o .= conversation($a,$items,'display', $update);
 
        }
        else {