Merge pull request #639 from annando/master

Community/Open Graph

include/ostatus_conversation.php

@@ -1,5 +1,6 @@
 <?php
 define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
+define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
 
 function check_conversations() {
         $last = get_config('system','ostatus_last_poll');
@@ -8,17 +9,25 @@ function check_conversations() {
         if(! $poll_interval)
                 $poll_interval = OSTATUS_DEFAULT_POLL_INTERVAL;
 
+	// Don't poll if the interval is set negative
+	if ($poll_interval < 0)
+		return;
+
+        $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
+        if(! $poll_timeframe)
+                $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME;
+
         if($last) {
                 $next = $last + ($poll_interval * 60);
                 if($next > time()) {
-                        logger('complete_conversation: poll intervall not reached');
+                        logger('complete_conversation: poll interval not reached');
                         return;
                 }
         }
 
         logger('complete_conversation: cron_start');
 
-        $start = date("Y-m-d H:i:s", time() - 86400);
+        $start = date("Y-m-d H:i:s", time() - ($poll_timeframe * 60));
         $conversations = q("SELECT * FROM `term` WHERE `type` = 7 AND `term` > '%s'", 
                                 dbesc($start));
         foreach ($conversations AS $conversation) {
@@ -100,18 +109,18 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 			else
 				$parent_uri = $parent["uri"];
 
-			if ($parent["id"] != 0) {
 			$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
 							intval($message["uid"]), dbesc($single_conv->id));
 			if ($message_exists) {
+				if ($parent["id"] != 0) {
 					$existing_message = $message_exists[0];
 					$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d LIMIT 1",
 						intval($parent["id"]),
 						dbesc($parent["uri"]),
 						dbesc($parent_uri),
 						intval($existing_message["id"]));
-					continue;
 				}
+				continue;
 			}
 
 			$arr = array();

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']),

mod/display.php

@@ -166,6 +166,32 @@ function display_content(&$a, $update = 0) {
 			$o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
 		$o .= conversation($a,$items,'display', $update);
 
+		// Preparing the meta header
+		require_once('include/bbcode.php');
+		require_once("include/html2plain.php");
+		$description = trim(html2plain(bbcode($r[0]["body"], false, false), 0, true));
+		$title = trim(html2plain(bbcode($r[0]["title"], false, false), 0, true));
+
+		if ($title == "")
+			$title = $r[0]["author-name"];
+
+		//<meta name="keywords" content="">
+		$a->page['htmlhead'] .= '<meta name="author" content="'.$r[0]["author-name"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="title" content="'.$title.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="fulltitle" content="'.$title.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="description" content="'.$description.'" />'."\n";
+
+		$a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="DC.description" content="'.$description.'" />'."\n";
+
+		$a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
+		$a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
+		//<meta property="og:image" content="" />
+		$a->page['htmlhead'] .= '<meta property="og:url" content="'.$r[0]["plink"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$r[0]["author-name"].'" />'."\n";
+		// article:tag
+
 	}
 	else {
 		$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",

mod/parse_url.php

@@ -33,7 +33,7 @@ function completeurl($url, $scheme) {
 
         $complete = $schemearr["scheme"]."://".$schemearr["host"];
 
-        if ($schemearr["port"] != "")
+        if (@$schemearr["port"] != "")
                 $complete .= ":".$schemearr["port"];
 
 		if(strpos($urlarr['path'],'/') !== 0)
@@ -41,10 +41,10 @@ function completeurl($url, $scheme) {
 
         $complete .= $urlarr["path"];
 
-        if ($urlarr["query"] != "")
+        if (@$urlarr["query"] != "")
                 $complete .= "?".$urlarr["query"];
 
-        if ($urlarr["fragment"] != "")
+        if (@$urlarr["fragment"] != "")
                 $complete .= "#".$urlarr["fragment"];
 
         return($complete);
@@ -52,18 +52,29 @@ function completeurl($url, $scheme) {
 
 function parseurl_getsiteinfo($url) {
 	$siteinfo = array();
-
 	$ch = curl_init();
 	curl_setopt($ch, CURLOPT_URL, $url);
 	curl_setopt($ch, CURLOPT_HEADER, 1);
 	curl_setopt($ch, CURLOPT_NOBODY, 0);
 	curl_setopt($ch, CURLOPT_TIMEOUT, 3);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	//curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
 	curl_setopt($ch,CURLOPT_USERAGENT,'Opera/9.64(Windows NT 5.1; U; de) Presto/2.1.1');
 
 	$header = curl_exec($ch);
+	$curl_info = @curl_getinfo($ch);
+        $http_code = $curl_info['http_code'];
 	curl_close($ch);
 
+	if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302"))
+		AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) {
+		if ($curl_info['redirect_url'] != "")
+			$siteinfo = parseurl_getsiteinfo($curl_info['redirect_url']);
+		else
+			$siteinfo = parseurl_getsiteinfo($curl_info['location']);
+		return($siteinfo);
+	}
+
 	// Fetch the first mentioned charset. Can be in body or header
 	if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches))
 		$charset = trim(array_pop($matches));
@@ -97,6 +108,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)
@@ -151,7 +184,7 @@ function parseurl_getsiteinfo($url) {
 		}
 	}
 
-	if ($siteinfo["image"] == "") {
+	if (@$siteinfo["image"] == "") {
             $list = $xpath->query("//img[@src]");
             foreach ($list as $node) {
                 $attr = array();
@@ -190,7 +223,7 @@ function parseurl_getsiteinfo($url) {
 							"height"=>$photodata[1]);
 	}
 
-	if ($siteinfo["text"] == "") {
+	if (@$siteinfo["text"] == "") {
 		$text = "";
 
 		$list = $xpath->query("//div[@class='article']");

view/theme/vier/smarty3/wall_thread.tpl

@@ -64,7 +64,7 @@
 			</span>
 		</div>
 
-		<div class="wall-item-content">
+		<div itemprop="description" class="wall-item-content">
 			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
 			{{$item.body}}
 		</div>

view/theme/vier/wall_thread.tpl

@@ -59,7 +59,7 @@
 			</span>
 		</div>
 
-		<div class="wall-item-content">
+		<div itemprop="description" class="wall-item-content">
 			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
 			$item.body
 		</div>