move html from crepair.php to template

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index a92e0c691b497ccdef8b88062407ee985c5d9620..dfd7c013007fbdb39618ee681764652df3252f29 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -568,14 +568,14 @@ function network_content(&$a, $update = 0) {
                        intval($cid)
                );
                if(count($r)) {
-                       $sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` 
-                                           WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0 
-                                           ORDER BY `item`.`received` DESC) AS `temp1` 
+                       $sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item`
+                                           WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0
+                                           ORDER BY `item`.`received` DESC) AS `temp1`
                                            ON $sql_table.$sql_parent = `temp1`.`parent` ";
                        $sql_extra = "";
 
                        $o = replace_macros(get_markup_template("section_title.tpl"),array(
-                               '$title' => sprintf( t('Contact: %s'), $r[0]['name'])
+                               '$title' => sprintf( t('Contact: %s'), htmlentities($r[0]['name']))
                        )) . $o;
 
                        if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
@@ -732,7 +732,10 @@ function network_content(&$a, $update = 0) {
                // Fetch a page full of parent items for this page
                if($update) {
                        if (!get_config("system", "like_no_comment"))
-                               $sql_extra4 = "(`item`.`deleted` = 0 OR `item`.`verb` = '".ACTIVITY_LIKE."' OR `item`.`verb` = '".ACTIVITY_DISLIKE."')";
+                               $sql_extra4 = "(`item`.`deleted` = 0
+                                               OR `item`.`verb` = '".ACTIVITY_LIKE."' OR `item`.`verb` = '".ACTIVITY_DISLIKE."'
+                                               OR `item`.`verb` = '".ACTIVITY_ATTEND."' OR `item`.`verb` = '".ACTIVITY_ATTENDNO."'
+                                               OR `item`.`verb` = '".ACTIVITY_ATTENDMAYBE."')";
                        else
                                $sql_extra4 = "`item`.`deleted` = 0 AND `item`.`verb` = '".ACTIVITY_POST."'";