community: Only show top postings, no comments

parse_url: Follow location in "meta"-header

diff --git a/mod/community.php b/mod/community.php
index 27a9e219416abc0264b23f21f845c32bf5915156..84fc15debb51110407235c133475233cf4d072f6 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -75,7 +75,8 @@ function community_content(&$a, $update = 0) {
                WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
                AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
                AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' 
-               AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
+               AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent`
+               AND `user`.`hidewall` = 0
                AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self`
                ORDER BY `received` DESC LIMIT %d, %d ",
                intval($a->pager['start']),

diff --git a/mod/parse_url.php b/mod/parse_url.php
index a2b4c9e28a179c44b997a31602f6c0e2587e638f..1393a15d36b95bd94a9ab69ebd6fa6a38cddacb7 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -97,6 +97,28 @@ function parseurl_getsiteinfo($url) {
 
        $xpath = new DomXPath($doc);
 
+       $list = $xpath->query("//meta[@content]");
+        foreach ($list as $node) {
+                $attr = array();
+                if ($node->attributes->length)
+                        foreach ($node->attributes as $attribute)
+                                $attr[$attribute->name] = $attribute->value;
+
+                if (@$attr["http-equiv"] == 'refresh') {
+                        $path = $attr["content"];
+                        $pathinfo = explode(";", $path);
+                        $content = "";
+                        foreach ($pathinfo AS $value) {
+                                if (substr(strtolower($value), 0, 4) == "url=")
+                                        $content = substr($value, 4);
+                        }
+                        if ($content != "") {
+                                $siteinfo = parseurl_getsiteinfo($content);
+                                return($siteinfo);
+                        }
+                }
+       }
+
        //$list = $xpath->query("head/title");
        $list = $xpath->query("//title");
        foreach ($list as $node)