From 8a40c718fb9f9272ea99094a760f399e323cd66c Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 11 Mar 2011 00:18:29 +0100
Subject: Move translation functions. Add tt() for plural cases.

---
 include/pgettext.php | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 include/pgettext.php

(limited to 'include')

diff --git a/include/pgettext.php b/include/pgettext.php
new file mode 100644
index 000000000..2ffee70bc
--- /dev/null
+++ b/include/pgettext.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * translation support
+ */
+
+// load string translation table for alternate language
+
+if(! function_exists('load_translation_table')) {
+function load_translation_table($lang) {
+	global $a;
+
+	if(file_exists("view/$lang/strings.php"))
+		include("view/$lang/strings.php");
+}}
+
+// translate string if translation exists
+
+if(! function_exists('t')) {
+function t($s) {
+
+	$a = get_app();
+
+	if(x($a->strings,$s)) {
+		$t = $a->strings[$s];
+		return is_array($t)?$t[0]:$t;
+	}
+	return $s;
+}}
+
+if(! function_exists('tt')){
+function tt($singular, $plural, $count){
+	
+	$a = get_app();
+
+	if(x($a->strings,$singular)) {
+		$t = $a->strings[$singular];
+		$k = string_plural_select($count);
+		return is_array($t)?$t[$k]:$t;
+	}
+	
+	if ($count!=1){
+		return $plural;
+	} else {
+		return $singular;
+	}
+}}
\ No newline at end of file
-- 
cgit v1.2.3


From 0cf647bf6f199586bad2e13973fe034bf5676eea Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 13 Mar 2011 16:47:41 -0700
Subject: don't let somebody install with a bogus db hostname as this seems to
 lead to spectacular failure modes

---
 include/dba.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'include')

diff --git a/include/dba.php b/include/dba.php
index d75ed560a..1fdddb8a2 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -19,6 +19,22 @@ class dba {
 	public  $connected = false;
 
 	function __construct($server,$user,$pass,$db,$install = false) {
+		$server = trim($server);
+		$user = trim($user);
+		$pass = trim($pass);
+		$db = trim($db);
+
+		if($install) {
+			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
+				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
+					notice( sprintf( t('Cannot locate DNS info for database server \'%s\'',$server)));
+					$this->connected = false;
+					$this->db = null;
+					return;
+				}
+			}
+		}
+
 		$this->db = @new mysqli($server,$user,$pass,$db);
 		if(! mysqli_connect_errno()) {
 			$this->connected = true;
-- 
cgit v1.2.3


From aebf9bb4d6bf2cf3e86378a369f2d51996f4f6a6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 13 Mar 2011 19:12:46 -0700
Subject: non-code change

---
 include/dba.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/dba.php b/include/dba.php
index 1fdddb8a2..e2f369f19 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -19,6 +19,7 @@ class dba {
 	public  $connected = false;
 
 	function __construct($server,$user,$pass,$db,$install = false) {
+
 		$server = trim($server);
 		$user = trim($user);
 		$pass = trim($pass);
@@ -77,7 +78,7 @@ class dba {
 		}
 		else {
 
-			/*
+			/**
 			 * If dbfail.out exists, we will write any failed calls directly to it,
 			 * regardless of any logging that may or may nor be in effect.
 			 * These usually indicate SQL syntax errors that need to be resolved.
-- 
cgit v1.2.3


From f2734681e537031926a1e9c142403048b420deee Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 13 Mar 2011 22:07:56 -0700
Subject: friend finder support functions

---
 include/fcontact.php | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 include/fcontact.php

(limited to 'include')

diff --git a/include/fcontact.php b/include/fcontact.php
new file mode 100644
index 000000000..8821a985f
--- /dev/null
+++ b/include/fcontact.php
@@ -0,0 +1,41 @@
+<?php
+
+
+
+function fcontact_store($url,$name,$photo) {
+
+	$nurl = str_replace(array('https:','//www.'), array('http:','//'), $url);
+
+	$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1",
+		dbesc($nurl)
+	);
+
+	if(count($r))
+		return $r[0]['id'];
+
+	$r = q("INSERT INTO `fcontact` ( `url`, `name`, `photo` ) VALUES ( '%s', '%s', '%s' ) ",
+		dbesc($nurl),
+		dbesc($name),
+		dbesc($photo)
+	);
+
+	if($r) {
+		$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1",
+			dbesc($nurl)
+		);
+		if(count($r))
+			return $r[0]['id'];
+	}
+
+	return 0;
+}
+
+function ffinder_store($uid,$cid,$fid) {
+	$r = q("INSERT INTO `ffinder` ( `uid`, `cid`, `fid` ) VALUES ( %d, %d, %d ) ",
+		intval($uid),
+		intval($cid),
+		intval($fid)
+	);
+	return $r;
+}
+
-- 
cgit v1.2.3


From 852ea1aedd22ea55ae07bcba4eb9bcf0b0018704 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 14 Mar 2011 18:34:58 -0700
Subject: force last-child on foster children, disallow time travel

---
 include/items.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index e930ab5d2..2294fe294 100644
--- a/include/items.php
+++ b/include/items.php
@@ -401,6 +401,17 @@ function get_atom_elements($feed,$item) {
 		$res['edited'] = $item->get_date('c');
 
 
+	// Disallow time travelling posts
+
+	$d1 = strtotime($res['created']);
+	$d2 = strtotime($res['edited']);
+	$d3 = strtotime('now');
+
+	if($d1 > $d3)
+		$res['created'] = datetime_convert();
+	if($d2 > $d3)
+		$res['edited'] = datetime_convert();
+
 	$rawowner = $item->get_item_tags(NAMESPACE_DFRN, 'owner');
 	if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])
 		$res['owner-name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']);
@@ -702,6 +713,18 @@ function item_store($arr,$force_parent = false) {
 		intval($current_post)
 	);
 
+	/**
+	 * If this is now the last-child, force all _other_ children of this parent to *not* be last-child
+	 */
+
+	if($arr['last-child']) {
+		$r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d",
+			dbesc($arr['uri']),
+			intval($arr['uid']),
+			intval($current_post)
+		);
+	}
+
 	return $current_post;
 }
 
-- 
cgit v1.2.3


From 4cc20f1288a59d6ff48a62da62ec056ebd543e14 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 15 Mar 2011 00:56:25 -0700
Subject: fix youtube videos that use https:// urls

---
 include/bbcode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 978b4af69..4caf18766 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -90,7 +90,7 @@ function bbcode($Text) {
 	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '<img src="$3" height="$2" width="$1">', $Text);
 
 	// Youtube extensions
-        $Text = preg_replace("/\[youtube\]http:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); 
+        $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); 
 	$Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
 
 	// oembed tag
-- 
cgit v1.2.3


From f01538a54f68c172e09aabed90e2651ca2305675 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 15 Mar 2011 17:31:49 -0700
Subject: content expiration

---
 include/expire.php   | 44 ++++++++++++++++++++++++++++++++++++++++++++
 include/items.php    | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 include/notifier.php | 34 +++++++++++++++++++++++-----------
 include/poller.php   | 11 +++++++++++
 4 files changed, 124 insertions(+), 11 deletions(-)
 create mode 100644 include/expire.php

(limited to 'include')

diff --git a/include/expire.php b/include/expire.php
new file mode 100644
index 000000000..3c30e01c1
--- /dev/null
+++ b/include/expire.php
@@ -0,0 +1,44 @@
+<?php
+
+require_once("boot.php");
+
+function expire_run($argv, $argc){
+	global $a, $db;
+
+	if(is_null($a)) {
+		$a = new App;
+	}
+  
+	if(is_null($db)) {
+	    @include(".htconfig.php");
+    	require_once("dba.php");
+	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
+    	unset($db_host, $db_user, $db_pass, $db_data);
+  	};
+
+	require_once('session.php');
+	require_once('datetime.php');
+	require_once('simplepie/simplepie.inc');
+	require_once('include/items.php');
+	require_once('include/Contact.php');
+
+	$a->set_baseurl(get_config('system','url'));
+
+
+	logger('expire: start');
+	
+	$r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
+	if(count($r)) {
+		foreach($r as $rr) {
+			logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
+			item_expire($rr['uid'],$rr['expire']);
+		}
+	}
+
+	return;
+}
+
+if (array_search(__file__,get_included_files())===0){
+  expire_run($argv,$argc);
+  killme();
+}
diff --git a/include/items.php b/include/items.php
index 2294fe294..051659321 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1507,3 +1507,49 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	return $o;
 }
 	
+function item_expire($uid,$days) {
+
+	if((! $uid) || (! $days))
+		return;
+
+	$r = q("SELECT * FROM `item` 
+		WHERE `uid` = %d 
+		AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY 
+		AND `id` = `parent` 
+		AND `deleted` = 0",
+		intval($uid),
+		intval($days)
+	);
+
+	if(! count($r))
+		return;
+ 
+	logger('expire: # items=' . count($r) );
+
+	foreach($r as $item) {
+
+		// Only expire posts, not photos and photo comments
+
+		if(strlen($item['resource-id']))
+			continue;
+
+		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			intval($item['id'])
+		);
+
+		// kill the kids
+
+		$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			dbesc($item['parent-uri']),
+			intval($item['uid'])
+		);
+
+	}
+
+	proc_run('php',"include/notifier.php","expire","$uid");
+
+}
\ No newline at end of file
diff --git a/include/notifier.php b/include/notifier.php
index 648a07062..ca2304845 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -40,6 +40,7 @@ function notifier_run($argv, $argc){
 			break;
 	}
 
+	$expire = false;
 	$top_level = false;
 	$recipients = array();
 	$url_recipients = array();
@@ -57,6 +58,17 @@ function notifier_run($argv, $argc){
 		$item = $message[0];
 
 	}
+	elseif($cmd === 'expire') {
+		$expire = true;
+		$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 
+			AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP - INTERVAL 10 MINUTE",
+			intval($item_id)
+		);
+		$uid = $item_id;
+		$item_id = 0;
+		if(! count($items))
+			return;
+	}
 	else {
 
 		// find ancestors
@@ -76,11 +88,10 @@ function notifier_run($argv, $argc){
 			intval($parent_id)
 		);
 
-		if(! count($items)){
+		if(! count($items)) {
 			return;
 		}
 
-
 		// avoid race condition with deleting entries
 
 		if($items[0]['deleted']) {
@@ -98,11 +109,11 @@ function notifier_run($argv, $argc){
 		intval($uid)
 	);
 
-	if(count($r))
-		$owner = $r[0];
-	else {
+	if(! count($r))
 		return;
-	}
+
+	$owner = $r[0];
+
 	$hub = get_config('system','huburl');
 
 	// If this is a public conversation, notify the feed hub
@@ -117,7 +128,7 @@ function notifier_run($argv, $argc){
 
 		$parent = $items[0];
 
-		if($parent['type'] === 'remote') {
+		if($parent['type'] === 'remote' && (! $expire)) {
 			// local followup to remote post
 			$followup = true;
 			$notify_hub = false; // not public
@@ -235,6 +246,7 @@ function notifier_run($argv, $argc){
 		}
 		else {
 			foreach($items as $item) {
+
 				if(! $item['parent'])
 					continue;
 
@@ -242,9 +254,9 @@ function notifier_run($argv, $argc){
 				if(! $contact)
 					continue;
 
-				$atom   .= atom_entry($item,'text',$contact,$owner,true);
+				$atom .= atom_entry($item,'text',$contact,$owner,true);
 
-				if(($top_level) && ($notify_hub) && ($item['author-link'] === $item['owner-link'])) 
+				if(($top_level) && ($notify_hub) && ($item['author-link'] === $item['owner-link']) && (! $expire)) 
 					$slaps[] = atom_entry($item,'html',$contact,$owner,true);
 			}
 		}
@@ -319,7 +331,7 @@ function notifier_run($argv, $argc){
 						// only send salmon if public - e.g. if it's ok to notify
 						// a public hub, it's ok to send a salmon
 
-						if(count($slaps) && $notify_hub) {
+						if((count($slaps)) && ($notify_hub) && (! $expire)) {
 							logger('notifier: slapdelivery: ' . $contact['name']);
 							foreach($slaps as $slappy) {
 								if($contact['notify']) {
@@ -350,7 +362,7 @@ function notifier_run($argv, $argc){
 		
 	// send additional slaps to mentioned remote tags (@foo@example.com)
 
-	if($slap && count($url_recipients) && $followup && $notify_hub) {
+	if($slap && count($url_recipients) && $followup && $notify_hub && (! $expire)) {
 		foreach($url_recipients as $url) {
 			if($url) {
 				logger('notifier: urldelivery: ' . $url);
diff --git a/include/poller.php b/include/poller.php
index a093190a6..8619697d9 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -29,6 +29,17 @@ function poller_run($argv, $argc){
 
 	proc_run('php',"include/queue.php");
 	
+	// once daily run expire in background
+
+	$d1 = get_config('system','last_expire_day');
+	$d2 = intval(datetime_convert('UTC','UTC','now','d'));
+
+	if($d2 != intval($d1)) {
+		set_config('system','last_expire_day',$d2);
+		proc_run('php','include/expire.php');
+	}
+
+
 	// clear old cache
 	q("DELETE FROM `cache` WHERE `updated` < '%s'",
 		dbesc(datetime_convert('UTC','UTC',"now - 30 days")));
-- 
cgit v1.2.3


From ea03d9fa86827cbc7e86885bbe2493d8a9739546 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 17 Mar 2011 21:15:27 -0700
Subject: more thorough cleanup on account/contact removal

---
 include/Contact.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include')

diff --git a/include/Contact.php b/include/Contact.php
index 7cac3c0e0..4ca77d065 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -14,11 +14,13 @@ function user_remove($uid) {
 	q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `intro` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `event` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `item` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `mail` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `photo` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile_check` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
 	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
@@ -41,6 +43,9 @@ function contact_remove($id) {
 	q("DELETE FROM `mail` WHERE `contact-id` = %d ",
 		intval($id)
 	);
+	q("DELETE FROM `event` WHERE `cid` = %d ",
+		intval($id)
+	);
 }
 
 
-- 
cgit v1.2.3


From 7e33c1072a4a948941e2522afe0123899b0abddd Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 19 Mar 2011 01:19:11 -0700
Subject: stuff to make connecting to diaspora profiles easier

---
 include/items.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 051659321..6900c5920 100644
--- a/include/items.php
+++ b/include/items.php
@@ -905,6 +905,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
 
 	require_once('simplepie/simplepie.inc');
 
+	if(! $contact)
+		logger('consume feed: anonymous');
 	$feed = new SimplePie();
 	$feed->set_raw_data($xml);
 	if($datedir)
-- 
cgit v1.2.3


From be67cf663bc645d9825c7d6c6059663fead06645 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 19 Mar 2011 05:10:05 -0700
Subject: minor edits

---
 include/items.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 6900c5920..051659321 100644
--- a/include/items.php
+++ b/include/items.php
@@ -905,8 +905,6 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
 
 	require_once('simplepie/simplepie.inc');
 
-	if(! $contact)
-		logger('consume feed: anonymous');
 	$feed = new SimplePie();
 	$feed->set_raw_data($xml);
 	if($datedir)
-- 
cgit v1.2.3


From b7292bc673bc7983b1fd933070bc9d6a0a155dbb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 20 Mar 2011 17:54:50 -0700
Subject: user pref -> block remote wall posting

---
 include/security.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/security.php b/include/security.php
index 5e79e1edd..c74a9b4a3 100644
--- a/include/security.php
+++ b/include/security.php
@@ -25,7 +25,7 @@ function can_write_wall(&$a,$owner) {
 		else {
 			$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` 
 				WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-				AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
+				AND `user`.`blockwall` = 0 AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
 				intval($owner),
 				intval(remote_user()),
 				intval(REL_VIP),
-- 
cgit v1.2.3


From 82bd1ce3cb0097ad6be9650e4a1414e819cf8b0c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 21 Mar 2011 03:33:58 -0700
Subject: installation issues

---
 include/dba.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/dba.php b/include/dba.php
index e2f369f19..49b325cf7 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -28,7 +28,7 @@ class dba {
 		if($install) {
 			if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 				if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-					notice( sprintf( t('Cannot locate DNS info for database server \'%s\'',$server)));
+					notice( sprintf( t('Cannot locate DNS info for database server \'%s\''), $server));
 					$this->connected = false;
 					$this->db = null;
 					return;
-- 
cgit v1.2.3


From ca113bfaa05fdf90a904c3a286a4e69b3a2d2082 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 24 Mar 2011 21:10:51 -0700
Subject: change link to project website

---
 include/nav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index 4104cf3cf..db3b909af 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -124,7 +124,7 @@ function nav(&$a) {
 	$banner = get_config('system','banner');
 
 	if($banner === false) 
-		$banner .= '<a href="http://friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendika.com">Friendika</a></span>';
+		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
 
 
 	$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';
-- 
cgit v1.2.3


From 8f547283c07483123901ae41c9f70881113cb35d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 29 Mar 2011 18:20:52 -0700
Subject: update comment count as new comments come in

---
 include/main.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index 824f2dfdf..750cce74c 100644
--- a/include/main.js
+++ b/include/main.js
@@ -113,12 +113,18 @@
 
 		$.get(update_url,function(data) {
 			in_progress = false;
+			$('.ccollapse-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+				if($('#' + ident).length) {
+					$('#' + ident).replaceWith($(this));
+				}
+			});
 			$('.wall-item-outside-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
 				if($('#' + ident).length == 0) { 
-                                        $('img',this).each(function() {
-                                                $(this).attr('src',$(this).attr('dst'));
-                                        });
+					$('img',this).each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
 					$('#' + prev).after($(this));
 				}
 				else { 
@@ -127,11 +133,9 @@
 					$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
 					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
 					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
-                                        $('#' + ident + ' ' + '.my-comment-photo').each(function() {
-                                                $(this).attr('src',$(this).attr('dst'));
-                                        });
-
-
+					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
 				}
 				prev = ident; 
 			});
-- 
cgit v1.2.3


From f198c5cff8932bc1d42c34869afecec6dcab2f46 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 30 Mar 2011 04:07:47 -0700
Subject: secure profile failure

---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 051659321..58fad9927 100644
--- a/include/items.php
+++ b/include/items.php
@@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if(! $rino_enable)
 		$rino = 0;
 
-	$url = $contact['notify'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+	$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
 	logger('dfrn_deliver: ' . $url);
 
-- 
cgit v1.2.3


From 04cd865cc94c1c3647beb567baf1bb64af269c4e Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 30 Mar 2011 04:20:40 -0700
Subject: placeholder arg in dfrn conversations

---
 include/items.php  | 2 +-
 include/poller.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 58fad9927..4a740e55b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if(! $rino_enable)
 		$rino = 0;
 
-	$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+	$url = $contact['notify'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
 	logger('dfrn_deliver: ' . $url);
 
diff --git a/include/poller.php b/include/poller.php
index 8619697d9..98c55a2a9 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -167,7 +167,7 @@ function poller_run($argv, $argc){
 				if(intval($contact['duplex']) && $contact['issued-id'])
 					$idtosend = '1:' . $orig_id;		
 
-				$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+				$url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend 
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
 					. '&type=data&last_update=' . $last_update ;
 	
-- 
cgit v1.2.3


From 0fe997490df7fbd3d108c8da931e4823b0a4b2d9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 30 Mar 2011 15:04:18 -0700
Subject: dfrn remote profile protocol revision

---
 include/items.php  | 2 +-
 include/poller.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 4a740e55b..58fad9927 100644
--- a/include/items.php
+++ b/include/items.php
@@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if(! $rino_enable)
 		$rino = 0;
 
-	$url = $contact['notify'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+	$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
 	logger('dfrn_deliver: ' . $url);
 
diff --git a/include/poller.php b/include/poller.php
index 98c55a2a9..8619697d9 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -167,7 +167,7 @@ function poller_run($argv, $argc){
 				if(intval($contact['duplex']) && $contact['issued-id'])
 					$idtosend = '1:' . $orig_id;		
 
-				$url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend 
+				$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
 					. '&type=data&last_update=' . $last_update ;
 	
-- 
cgit v1.2.3


From 89e81862ec316ae41e616dd8b9ddeb6ab18193c7 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 30 Mar 2011 16:18:59 -0700
Subject: bug #29 - commas not linkified

---
 include/bbcode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 4caf18766..44f571450 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -22,7 +22,7 @@ function bbcode($Text) {
 	// Perform URL Search
 
 
-	$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
+	$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+\,]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
 
 	$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text);
 	$Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text);
-- 
cgit v1.2.3


From 08032e04536e67dbf488654a0142350690154c57 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 31 Mar 2011 04:57:31 -0700
Subject: change language dynamically - bound to F8 key

---
 include/main.js | 13 +++++++++++++
 include/nav.php |  1 +
 2 files changed, 14 insertions(+)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index 750cce74c..18e884b31 100644
--- a/include/main.js
+++ b/include/main.js
@@ -26,6 +26,7 @@
 	var pr = 0;
 	var liking = 0;
 	var in_progress = false;
+	var langSelect = false;
 
 	$(document).ready(function() {
 		$.ajaxSetup({cache: false});
@@ -45,6 +46,18 @@
 					$('#pause').html('');
 				}
 			}
+			// F8 - show/hide language selector
+			if(event.keyCode == '119') {
+				if(langSelect) {
+					langSelect = false;
+					$('#language-selector').hide();
+				}
+				else {
+					langSelect = true;
+					$('#language-selector').show();
+				}
+			}		
+
 // this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
 // update: incompatible usage of onKeyDown vs onKeyPress
 //			if(event.keyCode == '36' && event.shiftKey == true) {
diff --git a/include/nav.php b/include/nav.php
index db3b909af..b8b65f84d 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -16,6 +16,7 @@ function nav(&$a) {
 	 */
 
 	$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+	$a->page['nav'] .= lang_selector();
 
 	/**
 	 *
-- 
cgit v1.2.3


From 9b50b0e16f2046b91cb4c734c56024524d8b178b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 3 Apr 2011 20:41:40 -0700
Subject: Public exposure warning on affected network group pages. config-able
 so a plugin can shut it up.

---
 include/group.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/group.php b/include/group.php
index 793e854be..07cd45f19 100644
--- a/include/group.php
+++ b/include/group.php
@@ -110,7 +110,7 @@ function group_get_members($gid) {
 			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
 			WHERE `gid` = %d AND `group_member`.`uid` = %d",
 			intval($gid),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(count($r))
 			$ret = $r;
@@ -118,6 +118,21 @@ function group_get_members($gid) {
 	return $ret;
 }
 
+function group_public_members($gid) {
+	$ret = 0;
+	if(intval($gid)) {
+		$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` 
+			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
+			WHERE `gid` = %d AND `group_member`.`uid` = %d AND `contact`.`network` != 'dfrn' ",
+			intval($gid),
+			intval(local_user())
+		);		
+		if(count($r))
+			$ret = count($r);
+	}
+	return $ret;
+}
+
 
 
 function group_side($every="contacts",$each="group") {
-- 
cgit v1.2.3


From b5bcf44354410e2c37d5ec143c7050c3903200ed Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 4 Apr 2011 01:18:28 -0700
Subject: profile not set

---
 include/items.php  | 2 +-
 include/poller.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 58fad9927..1dd39d2ba 100644
--- a/include/items.php
+++ b/include/items.php
@@ -901,7 +901,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
  *
  */
 
-function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
+function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_feed = false) {
 
 	require_once('simplepie/simplepie.inc');
 
diff --git a/include/poller.php b/include/poller.php
index 8619697d9..3b80c1c04 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -278,7 +278,8 @@ function poller_run($argv, $argc){
 				continue;
 			}
 
-			consume_feed($xml,$importer,$contact,$hub,1);
+
+			consume_feed($xml,$importer,$contact,$hub,1, true);
 
 			// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
 
-- 
cgit v1.2.3


From 793967a1d3c23fcf1f3b00a2832f51e6f473f4bd Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 4 Apr 2011 19:36:18 -0700
Subject: better handling of troublesome feeds.

---
 include/Scrape.php |  2 +-
 include/items.php  | 23 +++++++++++++++--------
 include/poller.php |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index ff9899252..21820ddaf 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -216,7 +216,7 @@ function scrape_feed($url) {
 				}
  				if(stristr($line,'application/rss+xml') || stristr($s,'<rss')) {
 					$ret['feed_rss'] = $url;
-					return ret;
+					return $ret;
 				}
 			}
 		}
diff --git a/include/items.php b/include/items.php
index 1dd39d2ba..a9ac85969 100644
--- a/include/items.php
+++ b/include/items.php
@@ -180,7 +180,7 @@ function construct_activity_object($item) {
 
 	if($item['object']) {
 		$o = '<as:object>' . "\r\n";
-		$r = @simplexml_load_string($item['object']);
+		$r = parse_xml_string($item['object']);
 		if($r->type)
 			$o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>' . "\r\n";
 		if($r->id)
@@ -206,7 +206,7 @@ function construct_activity_target($item) {
 
 	if($item['target']) {
 		$o = '<as:target>' . "\r\n";
-		$r = @simplexml_load_string($item['target']);
+		$r = parse_xml_string($item['target']);
 		if($r->type)
 			$o .= '<as:object-type>' . xmlify($r->type) . '</as:object-type>' . "\r\n";
 		if($r->id)
@@ -241,8 +241,14 @@ function get_atom_elements($feed,$item) {
 	$res = array();
 
 	$author = $item->get_author();
-	$res['author-name'] = unxmlify($author->get_name());
-	$res['author-link'] = unxmlify($author->get_link());
+	if($author) { 
+		$res['author-name'] = unxmlify($author->get_name());
+		$res['author-link'] = unxmlify($author->get_link());
+	}
+	else {
+		$res['author-name'] = unxmlify($feed->get_title());
+		$res['author-link'] = unxmlify($feed->get_permalink());
+	}
 	$res['uri'] = unxmlify($item->get_id());
 	$res['title'] = unxmlify($item->get_title());
 	$res['body'] = unxmlify($item->get_content());
@@ -343,7 +349,6 @@ function get_atom_elements($feed,$item) {
 	// the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining 
 	// html.
 
-
 	if((strpos($res['body'],'<') !== false) || (strpos($res['body'],'>') !== false)) {
 
 		$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
@@ -783,7 +788,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 		return 3;
 	}
 
-	$res = simplexml_load_string($xml);
+	$res = parse_xml_string($xml);
 
 	if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
 		return (($res->status) ? $res->status : 3);
@@ -878,7 +883,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 		return 3;
 	}
 
-	$res = simplexml_load_string($xml);
+	$res = parse_xml_string($xml);
 
 	return $res->status;
  
@@ -916,6 +921,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
 	if($feed->error())
 		logger('consume_feed: Error parsing XML: ' . $feed->error());
 
+	$permalink = $feed->get_permalink();
 
 	// Check at the feed level for updated contact name and/or photo
 
@@ -1230,6 +1236,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
 				// Head post of a conversation. Have we seen it? If not, import it.
 
 				$item_id  = $item->get_id();
+
 				$datarray = get_atom_elements($feed,$item);
 
 				$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
@@ -1275,7 +1282,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
 				if(! is_array($contact))
 					return;
 
-				if($contact['network'] === 'stat') {
+				if($contact['network'] === 'stat' || stristr($permalink,'twitter.com')) {
 					if(strlen($datarray['title']))
 						unset($datarray['title']);
 					$datarray['last-child'] = 1;
diff --git a/include/poller.php b/include/poller.php
index 3b80c1c04..9362c28b3 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -203,7 +203,7 @@ function poller_run($argv, $argc){
 				}
 
 
-				$res = simplexml_load_string($xml);
+				$res = parse_xml_string($xml);
 	
 				if(intval($res->status) == 1) {
 					logger("poller: $url replied status 1 - marking for death ");
-- 
cgit v1.2.3


From 4c5e091b784574337c7124b7763bbd19f4bc810f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 4 Apr 2011 20:40:31 -0700
Subject: better twitter follow support

---
 include/Scrape.php | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index 21820ddaf..002fdfb35 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -227,16 +227,36 @@ function scrape_feed($url) {
 	if(! $dom)
 		return $ret;
 
+
+	$items = $dom->getElementsByTagName('img');
+
+	// get img elements (twitter)
+
+	if($items) {
+		foreach($items as $item) {
+			$x = $item->getAttribute('id');
+			if($x === 'profile-image') {
+				$ret['photo'] = $item->getAttribute('src');
+			}
+		}
+	}
+
 	$items = $dom->getElementsByTagName('link');
 
-	// get Atom link elements
+	// get Atom/RSS link elements, take the first one of either.
 
-	foreach($items as $item) {
-		$x = $item->getAttribute('rel');
-		if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml'))
-			$ret['feed_atom'] = $item->getAttribute('href');
-		if(($x === 'alternate') && ($item->getAttribute('type') === 'application/rss+xml'))
-			$ret['feed_rss'] = $item->getAttribute('href');
+	if($items) {
+		foreach($items as $item) {
+			$x = $item->getAttribute('rel');
+			if(($x === 'alternate') && ($item->getAttribute('type') === 'application/atom+xml')) {
+				if(! x($ret,'feed_atom'))
+					$ret['feed_atom'] = $item->getAttribute('href');
+			}
+			if(($x === 'alternate') && ($item->getAttribute('type') === 'application/rss+xml')) {
+				if(! x($ret,'feed_rss'))
+					$ret['feed_rss'] = $item->getAttribute('href');
+			}
+		}	
 	}
 
 	return $ret;
-- 
cgit v1.2.3


From 438473529c667f151aefcede1d7fa6b8b22f2d91 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 5 Apr 2011 17:41:02 -0700
Subject: atom categories and tag import

---
 include/items.php | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index a9ac85969..b17eadba2 100644
--- a/include/items.php
+++ b/include/items.php
@@ -456,7 +456,22 @@ function get_atom_elements($feed,$item) {
 	if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
 		$res['verb'] = ACTIVITY_UNFOLLOW;
 
-		
+
+	$cats = $item->get_categories();
+	if($cats) {
+		$tag_arr = array();
+		foreach($cats as $cat) {
+			$term = $cat->get_term();
+			if(! $term)
+				$term = $cat->get_label();
+			$scheme = $cat->get_scheme();
+			if($scheme && $term && stristr($scheme,'X-DFRN:'))
+				$tag_arr[] = substr($scheme,7,1) . '[url=' . unxmlify(substr($scheme,9)) . ']' . unxmlify($term) . '[/url]';
+			elseif($term)
+				$tag_arr[] = $term;
+		}
+		$res['tag'] =  implode(',', $tag_arr);
+	}
 
 	$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
 
@@ -614,6 +629,7 @@ function item_store($arr,$force_parent = false) {
 	$arr['deny_gid']      = ((x($arr,'deny_gid'))      ? trim($arr['deny_gid'])              : '');
 	$arr['private']       = ((x($arr,'private'))       ? intval($arr['private'])             : 0 );
 	$arr['body']          = ((x($arr,'body'))          ? trim($arr['body'])                  : '');
+	$arr['tag']           = ((x($arr,'tag'))           ? notags(trim($arr['tag']))           : '');
 
 	if($arr['parent-uri'] === $arr['uri']) {
 		$parent_id = 0;
@@ -1503,6 +1519,13 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	if(strlen($actarg))
 		$o .= $actarg;
 
+	$tags = item_getfeedtags($item);
+	if(count($tags)) {
+		foreach($tags as $t) {
+			$o .= '<category scheme="X-DFRN:' . xmlify($t[0]) . ':' . xmlify($t[1]) . '" term="' . xmlify($t[2]) . '" />' . "\r\n";
+		}
+	}
+
 	$mentioned = get_mentions($item);
 	if($mentioned)
 		$o .= $mentioned;
@@ -1513,6 +1536,29 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	
 	return $o;
 }
+
+function item_getfeedtags($item) {
+	$ret = array();
+	$matches = false;
+	$cnt = preg_match_all('|\#\[url\=(.+?)\](.+?)\[\/url\]|',$item['tag'],$matches);
+	if($cnt) {
+		for($x = 0; $x < count($matches); $x ++) {
+			if($matches[1][$x])
+				$ret[] = array('#',$matches[1][$x], $matches[2][$x]);
+		}
+	}
+	$matches = false; 
+	$cnt = preg_match_all('|\@\[url\=(.+?)\](.+?)\[\/url\]|',$item['tag'],$matches);
+	if($cnt) {
+		for($x = 0; $x < count($matches); $x ++) {
+			if($matches[1][$x])
+				$ret[] = array('#',$matches[1][$x], $matches[2][$x]);
+		}
+	} 
+	return $ret;
+}
+
+
 	
 function item_expire($uid,$days) {
 
-- 
cgit v1.2.3


From 6728a11ee38e890a0ce9b8b6d96dba98a7238129 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 6 Apr 2011 19:41:16 -0700
Subject: support feed attachments/enclosures, and fix for bug #30

---
 include/items.php | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index b17eadba2..501f2f944 100644
--- a/include/items.php
+++ b/include/items.php
@@ -468,11 +468,34 @@ function get_atom_elements($feed,$item) {
 			if($scheme && $term && stristr($scheme,'X-DFRN:'))
 				$tag_arr[] = substr($scheme,7,1) . '[url=' . unxmlify(substr($scheme,9)) . ']' . unxmlify($term) . '[/url]';
 			elseif($term)
-				$tag_arr[] = $term;
+				$tag_arr[] = notags(trim($term));
 		}
 		$res['tag'] =  implode(',', $tag_arr);
 	}
 
+	$attach = $item->get_enclosures();
+	if($attach) {
+		$att_arr = array();
+		foreach($attach as $att) {
+			$len = intval($att->get_length());
+			$link = str_replace(',','%2D', notags(trim($att->get_link())));
+			$title = str_replace(',','%2D',notags(trim($att->get_title())));
+			$type = notags(trim($att->get_type()));
+			if((! $link) || (strpos($link,'http') !== 0))
+				continue;
+
+			if(! $title)
+				$title = ' ';
+			if(! $type)
+				$type = 'application/octet-stream';
+
+			// this isn't legal html - there is no size in an 'a' tag, remember to strip it before display
+
+			$att_arr[] = '<a href="' . $link . '" size="' . $len . '" type="' . $type . '">' . $title . '</a>'; 
+		}
+		$res['attach'] = implode(',', $att_arr);
+	}
+
 	$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
 
 	if($rawobj) {
@@ -1526,6 +1549,8 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 		}
 	}
 
+	$o .= item_getfeedattach($item);
+
 	$mentioned = get_mentions($item);
 	if($mentioned)
 		$o .= $mentioned;
@@ -1558,6 +1583,26 @@ function item_getfeedtags($item) {
 	return $ret;
 }
 
+function item_getfeedattach($item) {
+	$ret = array();
+	$arr = explode(',',$item['attach']);
+	if(count($arr)) {
+		foreach($arr as $r) {
+			$matches = false;
+			$cnt = preg_match('|\<a href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" >(.+?)</a>|',$item['attach'],$matches);
+			if($cnt) {
+				$ret .= '<link href="' . $matches[1] . '" type="' . $matches[3] . '" ';
+				if(intval($matches[2]))
+					$ret .= 'size="' . intval($matches[2]) . '" ';
+				if($matches[4] !== ' ')
+					$ret .= 'title="' . $matches[4] . '" ';
+				$ret .= ' />' . "\r\n";
+			}
+		}
+	}
+	return $ret;
+}
+
 
 	
 function item_expire($uid,$days) {
-- 
cgit v1.2.3


From 109c25a1bd04ba27f19ecad23e174daef0fc691b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 6 Apr 2011 20:03:06 -0700
Subject: some fixes to attachment output in feed

---
 include/items.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 501f2f944..9eaee4573 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1584,14 +1584,14 @@ function item_getfeedtags($item) {
 }
 
 function item_getfeedattach($item) {
-	$ret = array();
+	$ret = '';
 	$arr = explode(',',$item['attach']);
 	if(count($arr)) {
 		foreach($arr as $r) {
 			$matches = false;
-			$cnt = preg_match('|\<a href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" >(.+?)</a>|',$item['attach'],$matches);
+			$cnt = preg_match('|\<a href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" >(.+?)</a>|',$r,$matches);
 			if($cnt) {
-				$ret .= '<link href="' . $matches[1] . '" type="' . $matches[3] . '" ';
+				$ret .= '<link rel="enclosure" href="' . $matches[1] . '" type="' . $matches[3] . '" ';
 				if(intval($matches[2]))
 					$ret .= 'size="' . intval($matches[2]) . '" ';
 				if($matches[4] !== ' ')
-- 
cgit v1.2.3


From c8d827a67118e693f4d69662b99163e08976479f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 6 Apr 2011 20:36:24 -0700
Subject: xmlify enclosure items

---
 include/items.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 9eaee4573..c617f13cb 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1591,11 +1591,11 @@ function item_getfeedattach($item) {
 			$matches = false;
 			$cnt = preg_match('|\<a href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" >(.+?)</a>|',$r,$matches);
 			if($cnt) {
-				$ret .= '<link rel="enclosure" href="' . $matches[1] . '" type="' . $matches[3] . '" ';
+				$ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" ';
 				if(intval($matches[2]))
 					$ret .= 'size="' . intval($matches[2]) . '" ';
 				if($matches[4] !== ' ')
-					$ret .= 'title="' . $matches[4] . '" ';
+					$ret .= 'title="' . xmlify($matches[4]) . '" ';
 				$ret .= ' />' . "\r\n";
 			}
 		}
-- 
cgit v1.2.3


From cc45ac14b5ec2e37ef9d021642a4916877c8bacf Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 6 Apr 2011 21:59:07 -0700
Subject: attachment storage

---
 include/items.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index c617f13cb..596946681 100644
--- a/include/items.php
+++ b/include/items.php
@@ -653,6 +653,7 @@ function item_store($arr,$force_parent = false) {
 	$arr['private']       = ((x($arr,'private'))       ? intval($arr['private'])             : 0 );
 	$arr['body']          = ((x($arr,'body'))          ? trim($arr['body'])                  : '');
 	$arr['tag']           = ((x($arr,'tag'))           ? notags(trim($arr['tag']))           : '');
+	$arr['attach']        = ((x($arr,'attach'))        ? notags(trim($arr['attach']))        : '');
 
 	if($arr['parent-uri'] === $arr['uri']) {
 		$parent_id = 0;
-- 
cgit v1.2.3


From e35a5bac55e0e259c7c587adfaf546484b032c92 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 7 Apr 2011 23:10:43 -0700
Subject: the rest of the english html templates except for htconfig

---
 include/profile_advanced.php | 258 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 258 insertions(+)
 create mode 100644 include/profile_advanced.php

(limited to 'include')

diff --git a/include/profile_advanced.php b/include/profile_advanced.php
new file mode 100644
index 000000000..8c4ba7698
--- /dev/null
+++ b/include/profile_advanced.php
@@ -0,0 +1,258 @@
+<?php
+
+function advanced_profile(&$a) {
+
+$o .= '';
+
+$o .= '<h2>' . t('Profile') . '</h2>';
+
+if($a->profile['name']) {
+	$lbl_fullname = t('Full Name:');
+	$fullname = $a->profile['name'];
+
+$o .= <<< EOT
+<div id="advanced-profile-name-wrapper" >
+<div id="advanced-profile-name-text">$lbl_fullname</div>
+<div id="advanced-profile-name">$fullname</div>
+</div>
+<div id="advanced-profile-name-end"></div>
+EOT;
+}
+
+if($a->profile['gender']) {
+	$lbl_gender = t('Gender:');
+	$gender = $a->profile['gender'];
+
+$o .= <<< EOT
+<div id="advanced-profile-gender-wrapper" >
+<div id="advanced-profile-gender-text">$lbl_gender</div>
+<div id="advanced-profile-gender">$gender</div>
+</div>
+<div id="advanced-profile-gender-end"></div>
+EOT;
+}
+
+if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
+	$lbl_birthday = t('Birthday:');
+
+$o .= <<< EOT
+<div id="advanced-profile-dob-wrapper" >
+<div id="advanced-profile-dob-text">$lbl_birthday</div>
+EOT;
+
+// If no year, add an arbitrary one so just we can parse the month and day.
+
+$year_bd_format = t('j F, Y');
+$short_bd_format = t('j F');
+
+$o .= '<div id="advanced-profile-dob">' 
+	. ((intval($a->profile['dob'])) 
+		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
+		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00',$short_bd_format))) 
+	. "</div>\r\n</div>";
+
+$o .= '<div id="advanced-profile-dob-end"></div>';
+
+}
+
+if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
+	$lbl_age = t('Age:');
+$o .= <<< EOT
+<div id="advanced-profile-age-wrapper" >
+<div id="advanced-profile-age-text">$lbl_age</div>
+<div id="advanced-profile-age">$age</div>
+</div>
+<div id="advanced-profile-age-end"></div>
+EOT;
+}
+
+if($a->profile['marital']) {
+	$lbl_marital = t('<span class="heart">&hearts;</span> Status:');
+	$marital = $a->profile['marital'];
+
+$o .= <<< EOT
+<div id="advanced-profile-marital-wrapper" >
+<div id="advanced-profile-marital-text">$lbl_marital</div>
+<div id="advanced-profile-marital">$marital</div>
+EOT;
+
+if($a->profile['with']) {
+	$with = $a->profile['with'];
+	$o .= "<div id=\"advanced-profile-with\">($with)</div>";
+}
+$o .= <<< EOT
+</div>
+<div id="advanced-profile-marital-end"></div>
+EOT;
+}
+
+if($a->profile['sexual']) {
+	$lbl_sexual = t('Sexual Preference:');
+	$sexual = $a->profile['sexual'];
+
+$o .= <<< EOT
+<div id="advanced-profile-sexual-wrapper" >
+<div id="advanced-profile-sexual-text">$lbl_sexual</div>
+<div id="advanced-profile-sexual">$sexual</div>
+</div>
+<div id="advanced-profile-sexual-end"></div>
+EOT;
+}
+
+if($a->profile['homepage']) {
+	$lbl_homepage = t('Homepage:');
+	$homepage = linkify($a->profile['homepage']);
+$o .= <<< EOT
+<div id="advanced-profile-homepage-wrapper" >
+<div id="advanced-profile-homepage-text">$lbl_homepage</div>
+<div id="advanced-profile-homepage">$homepage</div>
+</div>
+<div id="advanced-profile-homepage-end"></div>
+EOT;
+}
+
+if($a->profile['politic']) {
+	$lbl_politic = t('Policial Views:');
+	$politic = $a->profile['politic'];
+$o .= <<< EOT
+<div id="advanced-profile-politic-wrapper" >
+<div id="advanced-profile-politic-text">$lbl_politic</div>
+<div id="advanced-profile-politic">$politic</div>
+</div>
+<div id="advanced-profile-politic-end"></div>
+EOT;
+}
+
+if($a->profile['religion']) {
+	$lbl_religion = t('Religion:');
+	$religion = $a->profile['religion'];
+$o .= <<< EOT
+<div id="advanced-profile-religion-wrapper" >
+<div id="advanced-profile-religion-text">$lbl_religion</div>
+<div id="advanced-profile-religion">$religion</div>
+</div>
+<div id="advanced-profile-religion-end"></div>
+EOT;
+}
+if($txt = prepare_text($a->profile['about'])) {
+	$lbl_about = t('About:');
+$o .= <<< EOT
+<div id="advanced-profile-about-wrapper" >
+<div id="advanced-profile-about-text">$lbl_about</div>
+<br />
+<div id="advanced-profile-about">$txt</div>
+</div>
+<div id="advanced-profile-about-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['interest'])) {
+	$lbl_interests = t('Hobbies/Interests:');
+$o .= <<< EOT
+<div id="advanced-profile-interest-wrapper" >
+<div id="advanced-profile-interest-text">$lbl_interests</div>
+<br />
+<div id="advanced-profile-interest">$txt</div>
+</div>
+<div id="advanced-profile-interest-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['contact'])) {
+	$lbl_contact = t('Contact information and Social Networks:');
+$o .= <<< EOT
+<div id="advanced-profile-contact-wrapper" >
+<div id="advanced-profile-contact-text">$lbl_contact</div>
+<br />
+<div id="advanced-profile-contact">$txt</div>
+</div>
+<div id="advanced-profile-contact-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['music'])) {
+	$lbl_music = t('Musical interests:');
+$o .= <<< EOT
+<div id="advanced-profile-music-wrapper" >
+<div id="advanced-profile-music-text">$lbl_music</div>
+<br />
+<div id="advanced-profile-music">$txt</div>
+</div>
+<div id="advanced-profile-music-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['book'])) {
+	$lbl_book = t('Books, literature:');
+$o .= <<< EOT
+<div id="advanced-profile-book-wrapper" >
+<div id="advanced-profile-book-text">$lbl_book</div>
+<br />
+<div id="advanced-profile-book">$txt</div>
+</div>
+<div id="advanced-profile-book-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['tv'])) {
+	$lbl_tv = t('Television:');
+$o .= <<< EOT
+<div id="advanced-profile-tv-wrapper" >
+<div id="advanced-profile-tv-text">$lbl_tv</div>
+<br />
+<div id="advanced-profile-tv">$txt</div>
+</div>
+<div id="advanced-profile-tv-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['film'])) {
+	$lbl_film = t('Film/dance/culture/entertainment:');
+$o .= <<< EOT
+<div id="advanced-profile-film-wrapper" >
+<div id="advanced-profile-film-text">$lbl_film</div>
+<br />
+<div id="advanced-profile-film">$txt</div>
+</div>
+<div id="advanced-profile-film-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['romance'])) {
+	$lbl_romance = t('Love/Romance:');
+$o .= <<< EOT
+<div id="advanced-profile-romance-wrapper" >
+<div id="advanced-profile-romance-text">$lbl_romance</div>
+<br />
+<div id="advanced-profile-romance">$txt</div>
+</div>
+<div id="advanced-profile-romance-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['work'])) {
+	$lbl_work = t('Work/employment:');
+$o .= <<< EOT
+<div id="advanced-profile-work-wrapper" >
+<div id="advanced-profile-work-text">$lbl_work</div>
+<br />
+<div id="advanced-profile-work">$txt</div>
+</div>
+<div id="advanced-profile-work-end"></div>
+EOT;
+}
+
+if($txt = prepare_text($a->profile['education'])) {
+	$lbl_education = t('School/education:');
+$o .= <<< EOT
+<div id="advanced-profile-education-wrapper" >
+<div id="advanced-profile-education-text">$lbl_education</div>
+<br />
+<div id="advanced-profile-education">$txt</div>
+</div>
+<div id="advanced-profile-education-end"></div>
+EOT;
+}
+
+return $o;
+}
-- 
cgit v1.2.3


From 969cc6996a18290d234101fb9b245d27d4a6314a Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 8 Apr 2011 12:35:42 +0200
Subject: Fix a typo, updated IT strings

---
 include/profile_advanced.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/profile_advanced.php b/include/profile_advanced.php
index 8c4ba7698..c1dfad66f 100644
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -112,7 +112,7 @@ EOT;
 }
 
 if($a->profile['politic']) {
-	$lbl_politic = t('Policial Views:');
+	$lbl_politic = t('Political Views:');
 	$politic = $a->profile['politic'];
 $o .= <<< EOT
 <div id="advanced-profile-politic-wrapper" >
-- 
cgit v1.2.3


From bf865f0210aee4c6742b10bb63cd05f0de9b9d12 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Apr 2011 03:00:29 -0700
Subject: bug #34, line breaks double in retweet/share

---
 include/bbcode.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 44f571450..6fadbaf7e 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -3,7 +3,7 @@ require_once("include/oembed.php");
 	// BBcode 2 HTML was written by WAY2WEB.net
 	// extended to work with Mistpark/Friendika - Mike Macgirvin
 
-function bbcode($Text) {
+function bbcode($Text,$preserve_nl = false) {
 
 	// Replace any html brackets with HTML Entities to prevent executing HTML or script
 	// Don't use strip_tags here because it breaks [url] search by replacing & with amp
@@ -12,7 +12,10 @@ function bbcode($Text) {
 	$Text = str_replace(">", "&gt;", $Text);
 
 	// Convert new line chars to html <br /> tags
+
 	$Text = nl2br($Text);
+	if($preserve_nl)
+		$Text = str_replace(array("\n","\r"), array('',''),$Text);
 
 	// Set up the parameters for a URL search string
 	$URLSearchString = "^\[\]";
-- 
cgit v1.2.3


From 58508201a5fe1f4c3bd6bb93e626c46739afda46 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Apr 2011 03:36:12 -0700
Subject: bug #37, ampersand + everything following in url is stripped when
 using link icon to share link

---
 include/main.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index 18e884b31..8779f8413 100644
--- a/include/main.js
+++ b/include/main.js
@@ -255,3 +255,26 @@
          return false;  
 	}
 
+
+    function bin2hex(s){  
+        // Converts the binary representation of data to hex    
+        //   
+        // version: 812.316  
+        // discuss at: http://phpjs.org/functions/bin2hex  
+        // +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)  
+        // +   bugfixed by: Onno Marsman  
+        // +   bugfixed by: Linuxworld  
+        // *     example 1: bin2hex('Kev');  
+        // *     returns 1: '4b6576'  
+        // *     example 2: bin2hex(String.fromCharCode(0x00));  
+        // *     returns 2: '00'  
+        var v,i, f = 0, a = [];  
+        s += '';  
+        f = s.length;  
+          
+        for (i = 0; i<f; i++) {  
+            a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");  
+        }  
+          
+        return a.join('');  
+    }  
\ No newline at end of file
-- 
cgit v1.2.3


From c12927042ec9bfdc63cbc0bdd330402741991843 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Apr 2011 05:55:45 -0700
Subject: nav link to help & documentation

---
 include/nav.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index b8b65f84d..703d8da40 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -61,6 +61,12 @@ function nav(&$a) {
 		$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' 
 			. t('Register') . "</a>\r\n";
 
+	$help_url = get_config('system','help_url');
+	if(! $help_url)
+		$help_url = 'http://github.com/friendika/friendika/wiki';
+
+	$a->page['nav'] .= '<a id="nav-help-link" class="nav-link" target="friendika-help" href="' . $help_url . '">' . t('Help') . "</a>\r\n";
+
 	if(strlen($a->apps)) {
 		$a->page['nav'] .= '<a id="nav-apps-link" class="nav-link" href="apps">' . t('Apps') . "</a>\r\n";
 	}
-- 
cgit v1.2.3


From 940d216395406744f23fe4144f2a503688624b45 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Apr 2011 18:38:55 -0700
Subject: initial dfrn update to pass perms

---
 include/items.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 596946681..d7644fb42 100644
--- a/include/items.php
+++ b/include/items.php
@@ -867,14 +867,14 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if($dissolve)
 		$postvars['dissolve'] = '1';
 
-	if(($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked']) && (! $contact['readonly'])) {
-		$postvars['data'] = $atom;
-	}
-	elseif($owner['page-flags'] == PAGE_COMMUNITY) {
+
+	if((($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
 		$postvars['data'] = $atom;
+		$postvars['perm'] = 'rw';
 	}
 	else {
 		$postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
+		$postvars['perm'] = 'r';
 	}
 
 	if($rino && $rino_allowed && (! $dissolve)) {
@@ -916,7 +916,6 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if((! $curl_stat) || (! strlen($xml)))
 		return(-1); // timed out
 
-
 	if(strpos($xml,'<?xml') === false) {
 		logger('dfrn_deliver: phase 2: no valid XML returned');
 		logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
@@ -925,8 +924,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$res = parse_xml_string($xml);
 
-	return $res->status;
- 
+	return $res->status; 
 }
 
 
-- 
cgit v1.2.3


From 3d51518a13fd44da3fa9a01b9ae1f1baa5d41848 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Apr 2011 19:29:21 -0700
Subject: set writable flag on dfrn_poll

---
 include/poller.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index 9362c28b3..cb2461584 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -165,11 +165,15 @@ function poller_run($argv, $argc){
 				if(intval($contact['duplex']) && $contact['dfrn-id'])
 					$idtosend = '0:' . $orig_id;
 				if(intval($contact['duplex']) && $contact['issued-id'])
-					$idtosend = '1:' . $orig_id;		
+					$idtosend = '1:' . $orig_id;
+
+				// they have permission to write to us. We already filtered this in the contact query.
+				$perm = 'rw';
 
 				$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
-					. '&type=data&last_update=' . $last_update ;
+					. '&type=data&last_update=' . $last_update 
+					. '&perm=' . $perm ;
 	
 				$xml = fetch_url($url);
 
@@ -250,13 +254,14 @@ function poller_run($argv, $argc){
 					$final_dfrn_id = substr($final_dfrn_id,2);
 
 				if($final_dfrn_id != $orig_id) {
-	
+					logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);	
 					// did not decode properly - cannot trust this site 
 					continue;
 				}
 
 				$postvars['dfrn_id'] = $idtosend;
 				$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
+				$postvars['perm'] = 'rw';
 
 				$xml = post_url($contact['poll'],$postvars);
 			}
-- 
cgit v1.2.3


From a65c595b169eec63b9a9dddac14b72e88ba34a04 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Apr 2011 21:21:16 -0700
Subject: "display list of status items" moved to include/conversation.php,
 currently network module has been updated to use it for display, other
 modules to follow with whatever special case code they require.

---
 include/conversation.php | 350 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 350 insertions(+)
 create mode 100644 include/conversation.php

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
new file mode 100644
index 000000000..a45befe5b
--- /dev/null
+++ b/include/conversation.php
@@ -0,0 +1,350 @@
+<?php
+
+
+function conversation(&$a,$r, $mode, $update) {
+
+	require_once('bbcode.php');
+
+	// find all the authors involved in remote conversations
+	// We will use a local profile photo if they are one of our contacts
+	// otherwise we have to get the photo from the item owner's site
+
+	$author_contacts = extract_item_authors($r,local_user());
+
+
+	$cmnt_tpl    = load_view_file('view/comment_item.tpl');
+	$like_tpl    = load_view_file('view/like.tpl');
+	$noshare_tpl = load_view_file('view/like_noshare.tpl');
+	$tpl         = load_view_file('view/wall_item.tpl');
+	$wallwall    = load_view_file('view/wallwall_item.tpl');
+
+	$alike = array();
+	$dlike = array();
+	
+	if(count($r)) {
+
+		if($mode === 'network-new') {
+
+			// "New Item View" - just loop through the items and format them minimally for display
+
+			$tpl = load_view_file('view/search_item.tpl');
+			$droptpl = load_view_file('view/wall_fake_drop.tpl');
+
+			foreach($r as $item) {
+
+				$comment     = '';
+				$owner_url   = '';
+				$owner_photo = '';
+				$owner_name  = '';
+				$sparkle     = '';
+			
+				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
+				$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'])) {
+					if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
+						$profile_link = $redirect_url;
+						$sparkle = ' sparkle';
+					}
+					elseif(isset($author_contacts[$item['author-link']])) {
+						$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
+						$sparkle = ' sparkle';
+					}
+				}
+
+				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+				if($coord) {
+					if($location)
+						$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+					else
+						$location = '<span class="smalltext">' . $coord . '</span>';
+				}
+
+				$drop = replace_macros($droptpl,array('$id' => $item['id']));
+				$lock = '<div class="wall-item-lock"></div>';
+				
+				$o .= replace_macros($tpl,array(
+					'$id' => $item['item_id'],
+					'$linktitle' => sprintf( t('View %s\s profile'), $profile_name),
+					'$profile_url' => $profile_link,
+					'$item_photo_menu' => item_photo_menu($item),
+					'$name' => $profile_name,
+					'$sparkle' => $sparkle,
+					'$lock' => $lock,
+					'$thumb' => $profile_avatar,
+					'$title' => $item['title'],
+					'$body' => smilies(bbcode($item['body'])),
+					'$ago' => relative_date($item['created']),
+					'$location' => $location,
+					'$indent' => '',
+					'$owner_url' => $owner_url,
+					'$owner_photo' => $owner_photo,
+					'$owner_name' => $owner_name,
+					'$drop' => $drop,
+					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>'
+				));
+
+			}
+
+			return $o;
+		}
+
+
+
+
+		// Normal View
+
+
+		// Figure out how many comments each parent has
+		// (Comments all have gravity of 6)
+		// Store the result in the $comments array
+
+		$comments = array();
+		foreach($r as $rr) {
+			if(intval($rr['gravity']) == 6) {
+				if(! x($comments,$rr['parent']))
+					$comments[$rr['parent']] = 1;
+				else
+					$comments[$rr['parent']] += 1;
+			}
+		}
+
+		// map all the like/dislike activities for each parent item 
+		// Store these in the $alike and $dlike arrays
+
+		foreach($r as $item) {
+			like_puller($a,$item,$alike,'like');
+			like_puller($a,$item,$dlike,'dislike');
+		}
+
+		$comments_collapsed = false;
+		$blowhard = 0;
+		$blowhard_count = 0;
+
+		foreach($r as $item) {
+
+			$comment = '';
+			$template = $tpl;
+			$commentww = '';
+			$sparkle = '';
+			$owner_url = $owner_photo = $owner_name = '';
+
+
+			// We've already parsed out like/dislike for special treatment. We can ignore them now
+
+			if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
+				|| (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+				&& ($item['id'] != $item['parent']))
+				continue;
+
+			// Take care of author collapsing and comment collapsing
+			// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
+			// If there are more than two comments, squash all but the last 2.
+
+			if($item['id'] == $item['parent']) {
+				if($blowhard == $item['cid'] && (! $item['self'])) {
+					$blowhard_count ++;
+					if($blowhard_count == 3) {
+						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' . $item['parent'] . '" style="display: none;" >';
+					}
+				}
+				else {
+					$blowhard = $item['cid'];					
+					if($blowhard_count >= 3)
+						$o .= '</div>';
+					$blowhard_count = 0;
+				}
+
+				$comments_seen = 0;
+				$comments_collapsed = false;
+			}
+			else
+				$comments_seen ++;
+
+
+			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+				if(! $comments_collapsed) {
+					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
+					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+					$comments_collapsed = true;
+				}
+			}
+			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+				$o .= '</div>';
+			}
+
+
+
+			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
+				: '<div class="wall-item-lock"></div>');
+
+
+			// Top-level wall post not written by the wall owner (wall-to-wall)
+			// First figure out who owns it. 
+
+			$osparkle = '';
+
+			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
+
+				if($item['type'] === 'wall') {
+					// I do. Put me on the left of the wall-to-wall notice.
+					$owner_url = $a->contact['url'];
+					$owner_photo = $a->contact['thumb'];
+					$owner_name = $a->contact['name'];
+					$template = $wallwall;
+					$commentww = 'ww';	
+				}
+				if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+					// Could be anybody. 
+					$owner_url = $item['owner-link'];
+					$owner_photo = $item['owner-avatar'];
+					$owner_name = $item['owner-name'];
+					$template = $wallwall;
+					$commentww = 'ww';
+					// If it is our contact, use a friendly redirect link
+					if((link_compare($item['owner-link'],$item['url'])) 
+						&& ($item['network'] === 'dfrn')) {
+						$owner_url = $redirect_url;
+						$osparkle = ' sparkle';
+					}
+				}
+			}
+
+			if($update)
+				$return_url = $_SESSION['return_url'];
+			else
+				$return_url = $_SESSION['return_url'] = $a->cmd;
+
+			$likebuttons = '';
+			if($item['id'] == $item['parent']) {
+				$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+					'$id' => $item['id'],
+					'$likethis' => t("I like this \x28toggle\x29"),
+					'$nolike' => t("I don't like this \x28toggle\x29"),
+					'$share' => t('Share'),
+					'$wait' => t('Please wait') 
+				));
+			}
+
+			if($item['last-child']) {
+				$comment = replace_macros($cmnt_tpl,array(
+					'$return_path' => '', 
+					'$jsreload' => '', // $_SESSION['return_url'],
+					'$type' => 'net-comment',
+					'$id' => $item['item_id'],
+					'$parent' => $item['parent'],
+					'$profile_uid' =>  $_SESSION['uid'],
+					'$mylink' => $a->contact['url'],
+					'$mytitle' => t('This is you'),
+					'$myphoto' => $a->contact['thumb'],
+					'$comment' => t('Comment'),
+					'$submit' => t('Submit'),
+					'$ww' => $commentww
+				));
+			}
+
+			$edpost = '';
+			if(($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
+				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
+			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+			$photo = $item['photo'];
+			$thumb = $item['thumb'];
+
+			// Post was remotely authored.
+
+			$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+
+			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+
+			if(strlen($item['author-link'])) {
+				$profile_link = $item['author-link'];
+				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
+					$profile_link = $redirect_url;
+					$sparkle = ' sparkle';
+				}
+				elseif(isset($author_contacts[$item['author-link']])) {
+					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
+					$sparkle = ' sparkle';
+				}
+			}
+			else 
+				$profile_link = $item['url'];
+
+			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+
+			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+			if($coord) {
+				if($location)
+					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+				else
+					$location = '<span class="smalltext">' . $coord . '</span>';
+			}
+
+			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
+
+			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+				$indent .= ' shiny'; 
+
+
+
+			// Build the HTML
+
+			$tmp_item = replace_macros($template,array(
+				'$id' => $item['item_id'],
+				'$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,
+				'$item_photo_menu' => item_photo_menu($item),
+				'$name' => $profile_name,
+				'$thumb' => $profile_avatar,
+				'$osparkle' => $osparkle,
+				'$sparkle' => $sparkle,
+				'$title' => $item['title'],
+				'$body' => smilies(bbcode($item['body'])),
+				'$ago' => relative_date($item['created']),
+				'$lock' => $lock,
+				'$location' => $location,
+				'$indent' => $indent,
+				'$owner_url' => $owner_url,
+				'$owner_photo' => $owner_photo,
+				'$owner_name' => $owner_name,
+				'$plink' => get_plink($item),
+				'$edpost' => $edpost,
+				'$drop' => $drop,
+				'$vote' => $likebuttons,
+				'$like' => $like,
+				'$dislike' => $dislike,
+				'$comment' => $comment
+			));
+
+			$arr = array('item' => $item, 'output' => $tmp_item);
+			call_hooks('display_item', $arr);
+
+			$o .= $arr['output'];
+
+		}
+	}
+
+
+	// if author collapsing is in force but didn't get closed, close it off now.
+
+	if($blowhard_count >= 3)
+		$o .= '</div>';
+
+	return $o;
+} 
\ No newline at end of file
-- 
cgit v1.2.3


From 7192299ff14b9754aad2a7b85bff837dc2594bc6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Apr 2011 21:43:44 -0700
Subject: first cut at profile page conversation

---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index a45befe5b..943ebfeba 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -146,7 +146,7 @@ function conversation(&$a,$r, $mode, $update) {
 			// If there are more than two comments, squash all but the last 2.
 
 			if($item['id'] == $item['parent']) {
-				if($blowhard == $item['cid'] && (! $item['self'])) {
+				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile')) {
 					$blowhard_count ++;
 					if($blowhard_count == 3) {
 						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' . $item['parent'] . '" style="display: none;" >';
-- 
cgit v1.2.3


From a0956ee9556d4daffdd3dff7eee408dc412bcb90 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 10 Apr 2011 23:01:38 -0700
Subject: some w3c validation issues

---
 include/conversation.php | 94 +++++++++++++++++++++++++++++++++---------------
 1 file changed, 66 insertions(+), 28 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 943ebfeba..52c11fff5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -5,6 +5,21 @@ function conversation(&$a,$r, $mode, $update) {
 
 	require_once('bbcode.php');
 
+	$profile_owner = 0;
+	$writable      = false;
+
+	if($mode === 'network') {
+		$profile_owner = local_user();
+		$writable = true;
+	}
+
+	if($mode === 'profile') {
+		$profile_owner = $a->profile['profile_uid'];
+		$writable = can_write_wall($a,$profile_owner);
+	}
+
+
+
 	// find all the authors involved in remote conversations
 	// We will use a local profile photo if they are one of our contacts
 	// otherwise we have to get the photo from the item owner's site
@@ -64,12 +79,22 @@ function conversation(&$a,$r, $mode, $update) {
 						$location = '<span class="smalltext">' . $coord . '</span>';
 				}
 
+				$drop = '';
+				$dropping = false;
+
+				if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+					$dropping = true;
+
+	            $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+
+
 				$drop = replace_macros($droptpl,array('$id' => $item['id']));
 				$lock = '<div class="wall-item-lock"></div>';
 				
 				$o .= replace_macros($tpl,array(
 					'$id' => $item['item_id'],
-					'$linktitle' => sprintf( t('View %s\s profile'), $profile_name),
+					'$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
 					'$profile_url' => $profile_link,
 					'$item_photo_menu' => item_photo_menu($item),
 					'$name' => $profile_name,
@@ -192,7 +217,7 @@ function conversation(&$a,$r, $mode, $update) {
 
 			$osparkle = '';
 
-			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
+			if(($item['parent'] == $item['item_id']) && (! $item['self']) && ($mode !== 'profile')) {
 
 				if($item['type'] === 'wall') {
 					// I do. Put me on the left of the wall-to-wall notice.
@@ -224,35 +249,38 @@ function conversation(&$a,$r, $mode, $update) {
 				$return_url = $_SESSION['return_url'] = $a->cmd;
 
 			$likebuttons = '';
-			if($item['id'] == $item['parent']) {
-				$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
-					'$id' => $item['id'],
-					'$likethis' => t("I like this \x28toggle\x29"),
-					'$nolike' => t("I don't like this \x28toggle\x29"),
-					'$share' => t('Share'),
-					'$wait' => t('Please wait') 
-				));
-			}
 
-			if($item['last-child']) {
-				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => '', 
-					'$jsreload' => '', // $_SESSION['return_url'],
-					'$type' => 'net-comment',
-					'$id' => $item['item_id'],
-					'$parent' => $item['parent'],
-					'$profile_uid' =>  $_SESSION['uid'],
-					'$mylink' => $a->contact['url'],
-					'$mytitle' => t('This is you'),
-					'$myphoto' => $a->contact['thumb'],
-					'$comment' => t('Comment'),
-					'$submit' => t('Submit'),
-					'$ww' => $commentww
-				));
+			if($writable) {
+				if($item['id'] == $item['parent']) {
+					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+						'$id' => $item['id'],
+						'$likethis' => t("I like this \x28toggle\x29"),
+						'$nolike' => t("I don't like this \x28toggle\x29"),
+						'$share' => t('Share'),
+						'$wait' => t('Please wait') 
+					));
+				}
+
+				if($item['last-child']) {
+					$comment = replace_macros($cmnt_tpl,array(
+						'$return_path' => '', 
+						'$jsreload' => '', // $_SESSION['return_url'],
+						'$type' => 'net-comment',
+						'$id' => $item['item_id'],
+						'$parent' => $item['parent'],
+						'$profile_uid' =>  $profile_owner,
+						'$mylink' => $a->contact['url'],
+						'$mytitle' => t('This is you'),
+						'$myphoto' => $a->contact['thumb'],
+						'$comment' => t('Comment'),
+						'$submit' => t('Submit'),
+						'$ww' => $commentww
+					));
+				}
 			}
 
 			$edpost = '';
-			if(($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
+			if(($profile_owner == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
 				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
 			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
@@ -266,7 +294,17 @@ function conversation(&$a,$r, $mode, $update) {
 			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
 			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
-			if(strlen($item['author-link'])) {
+			if($mode === 'profile') {
+				if(local_user() && ($item['contact-uid'] == local_user()) && ($item['network'] === 'dfrn') && (! $item['self'] )) {
+	                $profile_link = $redirect_url;
+    	            $sparkle = ' sparkle';
+        	    }
+				else {
+					$profile_link = $item['url'];
+					$sparkle = '';
+				}
+			}
+			elseif(strlen($item['author-link'])) {
 				$profile_link = $item['author-link'];
 				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
 					$profile_link = $redirect_url;
-- 
cgit v1.2.3


From 9133a2384aecd61f8ee59b380d82dc2d58660703 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Apr 2011 01:31:04 -0700
Subject: all conversations unified except photos

---
 include/conversation.php | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 52c11fff5..76bb8b6af 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -18,6 +18,17 @@ function conversation(&$a,$r, $mode, $update) {
 		$writable = can_write_wall($a,$profile_owner);
 	}
 
+	if($mode === 'display') {
+		$profile_owner = $a->profile['uid'];
+		$writable = can_write_wall($a,$profile_owner);
+	}
+
+
+
+	if($update)
+		$return_url = $_SESSION['return_url'];
+	else
+		$return_url = $_SESSION['return_url'] = $a->cmd;
 
 
 	// find all the authors involved in remote conversations
@@ -38,9 +49,10 @@ function conversation(&$a,$r, $mode, $update) {
 	
 	if(count($r)) {
 
-		if($mode === 'network-new') {
+		if($mode === 'network-new' || $mode === 'search') {
 
-			// "New Item View" - just loop through the items and format them minimally for display
+			// "New Item View" on network page or search page results 
+			// - just loop through the items and format them minimally for display
 
 			$tpl = load_view_file('view/search_item.tpl');
 			$droptpl = load_view_file('view/wall_fake_drop.tpl');
@@ -52,6 +64,15 @@ function conversation(&$a,$r, $mode, $update) {
 				$owner_photo = '';
 				$owner_name  = '';
 				$sparkle     = '';
+
+				if($mode === 'search') {
+					if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+						&& ($item['id'] != $item['parent']))
+						continue;
+					$nickname = $item['nickname'];
+				}
+				else
+					$nickname = $a->user['nickname'];
 			
 				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
 				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
@@ -110,7 +131,7 @@ function conversation(&$a,$r, $mode, $update) {
 					'$owner_photo' => $owner_photo,
 					'$owner_name' => $owner_name,
 					'$drop' => $drop,
-					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>'
+					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
 				));
 
 			}
@@ -243,10 +264,6 @@ function conversation(&$a,$r, $mode, $update) {
 				}
 			}
 
-			if($update)
-				$return_url = $_SESSION['return_url'];
-			else
-				$return_url = $_SESSION['return_url'] = $a->cmd;
 
 			$likebuttons = '';
 
@@ -264,8 +281,8 @@ function conversation(&$a,$r, $mode, $update) {
 				if($item['last-child']) {
 					$comment = replace_macros($cmnt_tpl,array(
 						'$return_path' => '', 
-						'$jsreload' => '', // $_SESSION['return_url'],
-						'$type' => 'net-comment',
+						'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+						'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
 						'$id' => $item['item_id'],
 						'$parent' => $item['parent'],
 						'$profile_uid' =>  $profile_owner,
@@ -274,7 +291,7 @@ function conversation(&$a,$r, $mode, $update) {
 						'$myphoto' => $a->contact['thumb'],
 						'$comment' => t('Comment'),
 						'$submit' => t('Submit'),
-						'$ww' => $commentww
+						'$ww' => (($mode === 'network') ? $commentww : '')
 					));
 				}
 			}
@@ -341,8 +358,8 @@ function conversation(&$a,$r, $mode, $update) {
 
 			$tmp_item = replace_macros($template,array(
 				'$id' => $item['item_id'],
-				'$linktitle' => t('View $name\'s profile'),
-				'$olinktitle' => t('View $owner_name\'s profile'),
+				'$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
+				'$olinktitle' => sprintf( t('View %s\'s profile'), $owner_name),
 				'$to' => t('to'),
 				'$wall' => t('Wall-to-Wall'),
 				'$vwall' => t('via Wall-To-Wall:'),
-- 
cgit v1.2.3


From c8f32536ff77193689efe69702f91122f97c1f36 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Apr 2011 03:22:09 -0700
Subject: pull in new 'writable' dfrn flag

---
 include/notifier.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/notifier.php b/include/notifier.php
index ca2304845..9d74f8b9b 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -354,6 +354,7 @@ function notifier_run($argv, $argc){
 				case 'mail':
 				case 'dspr':
 				case 'feed':
+				case 'face':
 				default:
 					break;
 			}
-- 
cgit v1.2.3


From 8b323b566fe2d7a0d72e9a61ef475c3dacb434d0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Apr 2011 03:30:25 -0700
Subject: set writable flag on all stat contacts with notify link

---
 include/poller.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index cb2461584..b878ef295 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -269,6 +269,11 @@ function poller_run($argv, $argc){
 
 				// $contact['network'] !== 'dfrn'
 
+				if(($contact['notify']) && (! $contact['writable'])) {
+					q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d LIMIT 1",
+						intval($contact['id'])
+					);
+				}
 				$xml = fetch_url($contact['poll']);
 			}
 
-- 
cgit v1.2.3


From ff15ea099310bab5cdcaa724274f3ef22301fcb4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Apr 2011 15:45:19 -0700
Subject: wrong variable passed

---
 include/conversation.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 76bb8b6af..d6a439a53 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,7 +1,7 @@
 <?php
 
 
-function conversation(&$a,$r, $mode, $update) {
+function conversation(&$a, $items, $mode, $update) {
 
 	require_once('bbcode.php');
 
@@ -23,8 +23,6 @@ function conversation(&$a,$r, $mode, $update) {
 		$writable = can_write_wall($a,$profile_owner);
 	}
 
-
-
 	if($update)
 		$return_url = $_SESSION['return_url'];
 	else
@@ -35,7 +33,7 @@ function conversation(&$a,$r, $mode, $update) {
 	// We will use a local profile photo if they are one of our contacts
 	// otherwise we have to get the photo from the item owner's site
 
-	$author_contacts = extract_item_authors($r,local_user());
+	$author_contacts = extract_item_authors($items,local_user());
 
 
 	$cmnt_tpl    = load_view_file('view/comment_item.tpl');
@@ -47,7 +45,7 @@ function conversation(&$a,$r, $mode, $update) {
 	$alike = array();
 	$dlike = array();
 	
-	if(count($r)) {
+	if(count($items)) {
 
 		if($mode === 'network-new' || $mode === 'search') {
 
@@ -57,7 +55,7 @@ function conversation(&$a,$r, $mode, $update) {
 			$tpl = load_view_file('view/search_item.tpl');
 			$droptpl = load_view_file('view/wall_fake_drop.tpl');
 
-			foreach($r as $item) {
+			foreach($items as $item) {
 
 				$comment     = '';
 				$owner_url   = '';
@@ -150,19 +148,19 @@ function conversation(&$a,$r, $mode, $update) {
 		// Store the result in the $comments array
 
 		$comments = array();
-		foreach($r as $rr) {
-			if(intval($rr['gravity']) == 6) {
-				if(! x($comments,$rr['parent']))
-					$comments[$rr['parent']] = 1;
+		foreach($items as $item) {
+			if(intval($item['gravity']) == 6) {
+				if(! x($comments,$item['parent']))
+					$comments[$item['parent']] = 1;
 				else
-					$comments[$rr['parent']] += 1;
+					$comments[$item['parent']] += 1;
 			}
 		}
 
 		// map all the like/dislike activities for each parent item 
 		// Store these in the $alike and $dlike arrays
 
-		foreach($r as $item) {
+		foreach($items as $item) {
 			like_puller($a,$item,$alike,'like');
 			like_puller($a,$item,$dlike,'dislike');
 		}
@@ -171,7 +169,7 @@ function conversation(&$a,$r, $mode, $update) {
 		$blowhard = 0;
 		$blowhard_count = 0;
 
-		foreach($r as $item) {
+		foreach($items as $item) {
 
 			$comment = '';
 			$template = $tpl;
-- 
cgit v1.2.3


From a4836ac1ba1c92f54d286621592f3f332603ff07 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Apr 2011 16:15:38 -0700
Subject: wallwall oddities on display page

---
 include/conversation.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index d6a439a53..3f8ea4196 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -240,9 +240,9 @@ function conversation(&$a, $items, $mode, $update) {
 
 				if($item['type'] === 'wall') {
 					// I do. Put me on the left of the wall-to-wall notice.
-					$owner_url = $a->contact['url'];
-					$owner_photo = $a->contact['thumb'];
-					$owner_name = $a->contact['name'];
+					$owner_url = $a->page_contact['url'];
+					$owner_photo = $a->page_contact['thumb'];
+					$owner_name = $a->page_contact['name'];
 					$template = $wallwall;
 					$commentww = 'ww';	
 				}
-- 
cgit v1.2.3


From 0ed2d19ac8e0b624dd4c971dd3f053f7b02b04d4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Apr 2011 20:11:21 -0700
Subject: death to comment box oddities (a slow death as it will take some time
 for everybody to upgrade)

---
 include/conversation.php | 23 +++++++++++++++--------
 include/items.php        |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 3f8ea4196..d81142bca 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,21 +6,21 @@ function conversation(&$a, $items, $mode, $update) {
 	require_once('bbcode.php');
 
 	$profile_owner = 0;
-	$writable      = false;
+	$page_writeable      = false;
 
 	if($mode === 'network') {
 		$profile_owner = local_user();
-		$writable = true;
+		$page_writeable = true;
 	}
 
 	if($mode === 'profile') {
 		$profile_owner = $a->profile['profile_uid'];
-		$writable = can_write_wall($a,$profile_owner);
+		$page_writeable = can_write_wall($a,$profile_owner);
 	}
 
 	if($mode === 'display') {
 		$profile_owner = $a->profile['uid'];
-		$writable = can_write_wall($a,$profile_owner);
+		$page_writeable = can_write_wall($a,$profile_owner);
 	}
 
 	if($update)
@@ -177,7 +177,6 @@ function conversation(&$a, $items, $mode, $update) {
 			$sparkle = '';
 			$owner_url = $owner_photo = $owner_name = '';
 
-
 			// We've already parsed out like/dislike for special treatment. We can ignore them now
 
 			if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
@@ -185,11 +184,17 @@ function conversation(&$a, $items, $mode, $update) {
 				&& ($item['id'] != $item['parent']))
 				continue;
 
+			$toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+
+
 			// Take care of author collapsing and comment collapsing
 			// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
 			// If there are more than two comments, squash all but the last 2.
 
-			if($item['id'] == $item['parent']) {
+			if($toplevelpost) {
+
+				$item_writeable = (($item['writable'] || $item['self']) ? true : false);
+
 				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile')) {
 					$blowhard_count ++;
 					if($blowhard_count == 3) {
@@ -210,6 +215,8 @@ function conversation(&$a, $items, $mode, $update) {
 				$comments_seen ++;
 
 
+			$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
+
 			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
 				if(! $comments_collapsed) {
 					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
@@ -265,7 +272,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 			$likebuttons = '';
 
-			if($writable) {
+			if($page_writeable) {
 				if($item['id'] == $item['parent']) {
 					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
 						'$id' => $item['id'],
@@ -276,7 +283,7 @@ function conversation(&$a, $items, $mode, $update) {
 					));
 				}
 
-				if($item['last-child']) {
+				if(($show_comment_box) || (($show_comment_box == false) && ($item['last-child']))) {
 					$comment = replace_macros($cmnt_tpl,array(
 						'$return_path' => '', 
 						'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
diff --git a/include/items.php b/include/items.php
index d7644fb42..86579512e 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1367,8 +1367,8 @@ function new_follower($importer,$contact,$datarray,$item) {
 		// create contact record - set to readonly
 
 		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `photo`, `network`, `rel`, 
-			`blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 1, 1 ) ",
+			`blocked`, `readonly`, `pending`, `writable` )
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 1, 1, 1 ) ",
 			intval($importer['uid']),
 			dbesc(datetime_convert()),
 			dbesc($url),
-- 
cgit v1.2.3


From 4cb21fc60b343ccb77937f669951b05feb9cdcff Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 11 Apr 2011 20:34:10 -0700
Subject: cleanup

---
 include/conversation.php | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index d81142bca..839afc481 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -198,7 +198,10 @@ function conversation(&$a, $items, $mode, $update) {
 				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile')) {
 					$blowhard_count ++;
 					if($blowhard_count == 3) {
-						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' . $item['parent'] . '" style="display: none;" >';
+						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
+							. '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' 
+							. t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
+							. $item['parent'] . '" style="display: none;" >';
 					}
 				}
 				else {
@@ -219,8 +222,10 @@ function conversation(&$a, $items, $mode, $update) {
 
 			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
 				if(! $comments_collapsed) {
-					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
-					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
+						. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' 
+						. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
+						. '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
 					$comments_collapsed = true;
 				}
 			}
@@ -228,8 +233,6 @@ function conversation(&$a, $items, $mode, $update) {
 				$o .= '</div>';
 			}
 
-
-
 			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
 			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
@@ -243,10 +246,14 @@ function conversation(&$a, $items, $mode, $update) {
 
 			$osparkle = '';
 
-			if(($item['parent'] == $item['item_id']) && (! $item['self']) && ($mode !== 'profile')) {
+			if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
 
 				if($item['type'] === 'wall') {
-					// I do. Put me on the left of the wall-to-wall notice.
+
+					// On the network page, I am the owner. On the display page it will be the profile owner.
+					// This will have been stored in $a->page_contact by our calling page.
+					// Put this person on the left of the wall-to-wall notice.
+
 					$owner_url = $a->page_contact['url'];
 					$owner_photo = $a->page_contact['thumb'];
 					$owner_name = $a->page_contact['name'];
@@ -254,7 +261,9 @@ function conversation(&$a, $items, $mode, $update) {
 					$commentww = 'ww';	
 				}
 				if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+
 					// Could be anybody. 
+
 					$owner_url = $item['owner-link'];
 					$owner_photo = $item['owner-avatar'];
 					$owner_name = $item['owner-name'];
@@ -273,7 +282,7 @@ function conversation(&$a, $items, $mode, $update) {
 			$likebuttons = '';
 
 			if($page_writeable) {
-				if($item['id'] == $item['parent']) {
+				if($toplevelpost) {
 					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
 						'$id' => $item['id'],
 						'$likethis' => t("I like this \x28toggle\x29"),
@@ -301,9 +310,10 @@ function conversation(&$a, $items, $mode, $update) {
 				}
 			}
 
-			$edpost = '';
-			if(($profile_owner == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
-				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
+			$edpost = ((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1))
+					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
+						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
+					: '');
 			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 			$photo = $item['photo'];
@@ -311,7 +321,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 			// Post was remotely authored.
 
-			$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+			$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
 
 			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
 			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
@@ -343,8 +353,10 @@ function conversation(&$a, $items, $mode, $update) {
 			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
-			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] 
+				. '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] 
+				. '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 			if($coord) {
 				if($location)
 					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
@@ -352,13 +364,11 @@ function conversation(&$a, $items, $mode, $update) {
 					$location = '<span class="smalltext">' . $coord . '</span>';
 			}
 
-			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
+			$indent = (($toplevelpost) ? '' : ' comment');
 
 			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
 				$indent .= ' shiny'; 
 
-
-
 			// Build the HTML
 
 			$tmp_item = replace_macros($template,array(
-- 
cgit v1.2.3


From 61915a524debe3db08a07f0adb86033ee894be28 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Apr 2011 01:31:55 -0700
Subject: first cut at group chooser UI

---
 include/group.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/group.php b/include/group.php
index 07cd45f19..5001cf53e 100644
--- a/include/group.php
+++ b/include/group.php
@@ -108,7 +108,7 @@ function group_get_members($gid) {
 	if(intval($gid)) {
 		$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member` 
 			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
-			WHERE `gid` = %d AND `group_member`.`uid` = %d",
+			WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY `contact`.`name` ASC ",
 			intval($gid),
 			intval(local_user())
 		);
-- 
cgit v1.2.3


From 5545c8ada9e44fd417d592c97365022a320aafef Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Apr 2011 05:37:26 -0700
Subject: cleanup

---
 include/main.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index 8779f8413..1710115af 100644
--- a/include/main.js
+++ b/include/main.js
@@ -277,4 +277,12 @@
         }  
           
         return a.join('');  
-    }  
\ No newline at end of file
+    }  
+
+	function groupChangeMember(gid,cid) {
+		$.get('group/' + gid + '/' + cid, function(data) {
+				$('#group-update-wrapper').html(data);
+				$('#group-update2-wrapper').html(data);
+				
+		});
+	}
-- 
cgit v1.2.3


From 38014e9b4d720a6a18e87b3c10f71bfa2e7038d4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Apr 2011 15:45:41 -0700
Subject: show busy cursor during ajax call

---
 include/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index 1710115af..65bd95c72 100644
--- a/include/main.js
+++ b/include/main.js
@@ -280,9 +280,10 @@
     }  
 
 	function groupChangeMember(gid,cid) {
+		$('body .fakelink').css('cursor', 'wait');
 		$.get('group/' + gid + '/' + cid, function(data) {
 				$('#group-update-wrapper').html(data);
 				$('#group-update2-wrapper').html(data);
-				
+				$('body .fakelink').css('cursor', 'auto');				
 		});
 	}
-- 
cgit v1.2.3


From 5654ce926ca012acd9f725c8c7d6e32609a17646 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Apr 2011 17:58:16 -0700
Subject: move all message display sub-functions from boot.php into
 conversation.php

---
 include/conversation.php | 173 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 172 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 839afc481..5c8327e56 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,5 +1,15 @@
 <?php
 
+/**
+ * "Render" a conversation or list of items for HTML display.
+ * There are two major forms of display:
+ *      - Sequential or unthreaded ("New Item View" or search results)
+ *      - conversation view
+ * The $mode parameter decides between the various renderings and also
+ * figures out how to determine page owner and other contextual items 
+ * that are based on unique features of the calling module.
+ *
+ */
 
 function conversation(&$a, $items, $mode, $update) {
 
@@ -417,4 +427,165 @@ function conversation(&$a, $items, $mode, $update) {
 		$o .= '</div>';
 
 	return $o;
-} 
\ No newline at end of file
+} 
+
+
+
+
+if(! function_exists('extract_item_authors')) {
+function extract_item_authors($arr,$uid) {
+
+	if((! $uid) || (! is_array($arr)) || (! count($arr)))
+		return array();
+	$urls = array();
+	foreach($arr as $rr) {
+		if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
+			$urls[] = "'" . dbesc($rr['author-link']) . "'";
+	}
+
+	// pre-quoted, don't put quotes on %s
+	if(count($urls)) {
+		$r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s )  AND `self` = 0 AND `blocked` = 0 ",
+			intval($uid),
+			implode(',',$urls)
+		);
+		if(count($r)) {
+			$ret = array();
+			$authors = array();
+			foreach($r as $rr){
+				if ($rr['network']=='dfrn')
+					$ret[$rr['url']] = $rr['id'];
+				$authors[$r['url']]= $rr;
+			}
+			$a->authors = $authors;
+			return $ret;
+		}
+	}
+	return array();		
+}}
+
+if(! function_exists('item_photo_menu')){
+function item_photo_menu($item){
+	$a = get_app();
+	
+	if (!isset($a->authors)){
+		$rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
+		$authors = array();
+		foreach($rr as $r) $authors[$r['url']]= $r;
+		$a->authors = $authors;
+	}
+	
+	$contact_url="";
+	$pm_url="";
+
+	$status_link="";
+	$photo_link="";
+	$profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
+	$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+	// $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
+
+	$profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0);	
+
+	// So we are checking that this is a logged in user on some page that *isn't* a profile page
+	// OR a profile page where the viewer owns the profile. 
+	// Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
+	// or a friend's contact that we both have a connection to. 
+
+	if((local_user() && ($profile_owner == 0)) 
+		|| ($profile_owner && $profile_owner == local_user())) {
+
+		if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']))
+			$redir = $redirect_url;
+		elseif(isset($a->authors[$item['author-link']])) {
+			$redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
+			$cid = $a->authors[$item['author-link']]['id'];
+		}
+
+		if($item['network'] === 'dfrn' && (! $item['self'])) {
+			$status_link = $redir . "?url=status";
+			$profile_link = $redir . "?url=profile";
+			$photos_link = $redir . "?url=photos";
+			$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+		}
+
+		$contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . (($item['cid']) ? $item['cid'] : $cid);
+	}
+
+
+	$menu = Array(
+		t("View status") => $status_link,
+		t("View profile") => $profile_link,
+		t("View photos") => $photos_link,		
+		t("Edit contact") => $contact_url,
+		t("Send PM") => $pm_url,
+	);
+	
+	
+	$args = array($item, &$menu);
+	
+	call_hooks('item_photo_menu', $args);
+	
+	$o = "";
+	foreach($menu as $k=>$v){
+		if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+	}
+	return $o;
+}}
+
+if(! function_exists('like_puller')) {
+function like_puller($a,$item,&$arr,$mode) {
+
+	$url = '';
+	$sparkle = '';
+	$verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
+
+	if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
+		$url = $item['author-link'];
+		if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
+			$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
+			$sparkle = ' class="sparkle" ';
+		}
+		if(! ((isset($arr[$item['parent'] . '-l'])) && (is_array($arr[$item['parent'] . '-l']))))
+			$arr[$item['parent'] . '-l'] = array();
+		if(! isset($arr[$item['parent']]))
+			$arr[$item['parent']] = 1;
+		else	
+			$arr[$item['parent']] ++;
+		$arr[$item['parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author-name'] . '</a>';
+	}
+	return;
+}}
+
+// Format the like/dislike text for a profile item
+// $cnt = number of people who like/dislike the item
+// $arr = array of pre-linked names of likers/dislikers
+// $type = one of 'like, 'dislike'
+// $id  = item id
+// returns formatted text
+
+if(! function_exists('format_like')) {
+function format_like($cnt,$arr,$type,$id) {
+	$o = '';
+	if($cnt == 1)
+		$o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
+	else {
+		$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
+		$o .= (($type === 'like') ? 
+					sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt)
+					 : 
+					sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) ); 
+		$o .= EOL ;
+		$total = count($arr);
+		if($total >= MAX_LIKERS)
+			$arr = array_slice($arr, 0, MAX_LIKERS - 1);
+		if($total < MAX_LIKERS)
+			$arr[count($arr)-1] = t('and') . ' ' . $arr[count($arr)-1];
+		$str = implode(', ', $arr);
+		if($total >= MAX_LIKERS)
+			$str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS );
+		$str = (($type === 'like') ? sprintf( t('%s like this.'), $str) : sprintf( t('%s don\'t like this.'), $str));
+		$o .= "\t" . '<div id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
+	}
+	return $o;
+}}
-- 
cgit v1.2.3


From f04e2e70447e433bdc6acb2094fd988a995d1c08 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Apr 2011 18:22:58 -0700
Subject: edit group links on network page

---
 include/group.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/group.php b/include/group.php
index 5001cf53e..065c2241f 100644
--- a/include/group.php
+++ b/include/group.php
@@ -135,7 +135,7 @@ function group_public_members($gid) {
 
 
 
-function group_side($every="contacts",$each="group") {
+function group_side($every="contacts",$each="group",$edit = false) {
 
 	$o = '';
 
@@ -165,7 +165,7 @@ EOT;
 	);
 	if(count($r)) {
 		foreach($r as $rr)
-			$o .= "	<li class=\"sidebar-group-li\"><a href=\"$each/{$rr['id']}\">{$rr['name']}</a></li>\r\n";
+			$o .= '	<li class="sidebar-group-li">' . (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit') . "\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") . "<a href=\"$each/{$rr['id']}\">{$rr['name']}</a></li>\r\n";
 	}
 	$o .= "	</ul>\r\n	</div>\r\n</div>";	
 
-- 
cgit v1.2.3


From e8a0dd40b273df2dc22e10d91fc44fe464b408e7 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 12 Apr 2011 21:21:33 -0700
Subject: profile visibility editor

---
 include/main.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index 65bd95c72..1c695265d 100644
--- a/include/main.js
+++ b/include/main.js
@@ -283,7 +283,15 @@
 		$('body .fakelink').css('cursor', 'wait');
 		$.get('group/' + gid + '/' + cid, function(data) {
 				$('#group-update-wrapper').html(data);
-				$('#group-update2-wrapper').html(data);
 				$('body .fakelink').css('cursor', 'auto');				
 		});
 	}
+
+	function profChangeMember(gid,cid) {
+		$('body .fakelink').css('cursor', 'wait');
+		$.get('profperm/' + gid + '/' + cid, function(data) {
+				$('#prof-update-wrapper').html(data);
+				$('body .fakelink').css('cursor', 'auto');				
+		});
+	}
+
-- 
cgit v1.2.3


From 3c4e5014350a76c75e7d55edd8be988c0a0cefec Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 13 Apr 2011 01:53:40 -0700
Subject: convert feed attach to bbcode

---
 include/items.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 86579512e..82752e168 100644
--- a/include/items.php
+++ b/include/items.php
@@ -477,10 +477,12 @@ function get_atom_elements($feed,$item) {
 	if($attach) {
 		$att_arr = array();
 		foreach($attach as $att) {
-			$len = intval($att->get_length());
-			$link = str_replace(',','%2D', notags(trim($att->get_link())));
-			$title = str_replace(',','%2D',notags(trim($att->get_title())));
-			$type = notags(trim($att->get_type()));
+			$len   = intval($att->get_length());
+			$link  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_link()))));
+			$title = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_title()))));
+			$type  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att->get_type()))));
+			if(strpos($type,';'))
+				$type = substr($type,0,strpos($type,';'));
 			if((! $link) || (strpos($link,'http') !== 0))
 				continue;
 
@@ -489,9 +491,7 @@ function get_atom_elements($feed,$item) {
 			if(! $type)
 				$type = 'application/octet-stream';
 
-			// this isn't legal html - there is no size in an 'a' tag, remember to strip it before display
-
-			$att_arr[] = '<a href="' . $link . '" size="' . $len . '" type="' . $type . '">' . $title . '</a>'; 
+			$att_arr[] = '[attach]href="' . $link . '" size="' . $len . '" type="' . $type . '" title="' . $title . '"[/attach]'; 
 		}
 		$res['attach'] = implode(',', $att_arr);
 	}
@@ -1588,13 +1588,13 @@ function item_getfeedattach($item) {
 	if(count($arr)) {
 		foreach($arr as $r) {
 			$matches = false;
-			$cnt = preg_match('|\<a href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" >(.+?)</a>|',$r,$matches);
+			$cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches);
 			if($cnt) {
 				$ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" ';
 				if(intval($matches[2]))
 					$ret .= 'size="' . intval($matches[2]) . '" ';
 				if($matches[4] !== ' ')
-					$ret .= 'title="' . xmlify($matches[4]) . '" ';
+					$ret .= 'title="' . xmlify(trim($matches[4])) . '" ';
 				$ret .= ' />' . "\r\n";
 			}
 		}
-- 
cgit v1.2.3


From 767f165965280a9a6b7b5a0fbaa533b3a35bc723 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 13 Apr 2011 07:07:21 -0700
Subject: local documentation library

---
 include/nav.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index 703d8da40..fa4b0a5cc 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -61,11 +61,10 @@ function nav(&$a) {
 		$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' 
 			. t('Register') . "</a>\r\n";
 
-	$help_url = get_config('system','help_url');
-	if(! $help_url)
-		$help_url = 'http://github.com/friendika/friendika/wiki';
+	$help_url = $a->get_baseurl() . '/help';
 
-	$a->page['nav'] .= '<a id="nav-help-link" class="nav-link" target="friendika-help" href="' . $help_url . '">' . t('Help') . "</a>\r\n";
+	if(! get_config('system','hide-help'))
+		$a->page['nav'] .= '<a id="nav-help-link" class="nav-link" target="friendika-help" href="' . $help_url . '">' . t('Help') . "</a>\r\n";
 
 	if(strlen($a->apps)) {
 		$a->page['nav'] .= '<a id="nav-apps-link" class="nav-link" href="apps">' . t('Apps') . "</a>\r\n";
-- 
cgit v1.2.3


From 0afef6b17e622d1fabd0f499ac206e8924278dfb Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 14 Apr 2011 09:22:38 +0200
Subject: arrays and simple conditional blocks in template, template for nav,
 load templates from themes

---
 include/nav.php                | 61 +++++++++++++++++++++---------------------
 include/template_processor.php | 50 ++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 31 deletions(-)
 create mode 100644 include/template_processor.php

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index fa4b0a5cc..2ead5c07e 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -16,7 +16,6 @@ function nav(&$a) {
 	 */
 
 	$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
-	$a->page['nav'] .= lang_selector();
 
 	/**
 	 *
@@ -28,24 +27,23 @@ function nav(&$a) {
 
 	$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
 		
-	$a->page['nav'] .= '<div id="site-location">' . $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
+	$sitelocation = $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 );
 
 
+	// nav links: array of array('href', 'text', 'extra css classes')
+	$nav = Array();
+
 	/**
 	 * Display login or logout
 	 */
 
 	if(local_user()) {
-		$a->page['nav'] .= '<a id="nav-logout-link" class="nav-link" href="logout">' . t('Logout') . "</a>\r\n";
+		$nav['logout'] = Array('logout',t('Logout'), "");
 	}
 	else {
-		$a->page['nav'] .= '<a id="nav-login-link" class="nav-login-link';
-		if ($a->module == 'login') { $a->page['nav'] .= ' nav-selected';  }
-
-		$a->page['nav'] .= '" href="login">' . t('Login') . "</a>\r\n";
+		$nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''));
 	}
 
-	$a->page['nav'] .= "<span id=\"nav-link-wrapper\" >\r\n";
 
 	/**
 	 * "Home" should also take you home from an authenticated remote profile connection
@@ -54,23 +52,23 @@ function nav(&$a) {
 	$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
 
 	if(($a->module != 'home') && (! (local_user()))) 
-		$a->page['nav'] .= '<a id="nav-home-link" class="nav-commlink" href="' . $homelink . '">' . t('Home') . "</a>\r\n";
+		$nav['home'] = array($homelink, t('Home'), "");
 
 
 	if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
-		$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' 
-			. t('Register') . "</a>\r\n";
+		$nav['register'] = array('register',t('Register'), "");
 
 	$help_url = $a->get_baseurl() . '/help';
 
 	if(! get_config('system','hide-help'))
-		$a->page['nav'] .= '<a id="nav-help-link" class="nav-link" target="friendika-help" href="' . $help_url . '">' . t('Help') . "</a>\r\n";
+		$nav['help'] = array($help_url, t('Help'), "");
+
 
 	if(strlen($a->apps)) {
-		$a->page['nav'] .= '<a id="nav-apps-link" class="nav-link" href="apps">' . t('Apps') . "</a>\r\n";
+		$nav['apps'] = array('apps', t('Apps'), "");
 	}
 
-	$a->page['nav'] .= '<a id="nav-search-link" class="nav-link" href="search">' . t('Search') . "</a>\r\n";
+	$nav['search'] = array('search', t('Search'), "");
 
 	$gdirpath = 'directory';
 
@@ -80,7 +78,7 @@ function nav(&$a) {
 			$gdirpath = $gdir;
 	}
 
-	$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="' . $gdirpath . '">' . t('Directory') . "</a>\r\n";
+	$nav['directory'] = array($gdirpath, t('Directory'), ""); 
 
 	/**
 	 *
@@ -90,36 +88,30 @@ function nav(&$a) {
 
 	if(local_user()) {
 
-		$a->page['nav'] .= '<a id="nav-network-link" class="nav-commlink" href="network">' . t('Network') 
-			. '</a><span id="net-update" class="nav-ajax-left"></span>' . "\r\n";
+		$nav['network'] = array('network', t('Network'), "");
+
+		$nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "");
 
-		$a->page['nav'] .= '<a id="nav-home-link" class="nav-commlink" href="profile/' . $a->user['nickname'] . '">' 
-			. t('Home') . '</a><span id="home-update" class="nav-ajax-left"></span>' . "\r\n";
 
 		/* only show friend requests for normal pages. Other page types have automatic friendship. */
 
 		if($_SESSION['page_flags'] == PAGE_NORMAL) {
-			$a->page['nav'] .= '<a id="nav-notify-link" class="nav-commlink" href="notifications">' . t('Notifications') 
-				. '</a><span id="notify-update" class="nav-ajax-left"></span>' . "\r\n";
+			$nav['notifications'] = array('notifications',	t('Notifications'), "");
 		}
 
-		$a->page['nav'] .= '<a id="nav-messages-link" class="nav-commlink" href="message">' . t('Messages') 
-			. '</a><span id="mail-update" class="nav-ajax-left"></span>' . "\r\n";
+		$nav['messages'] = array('message', t('Messages'), "");
 		
 		if(is_array($a->identities) && count($a->identities) > 1) {
-			$a->page['nav'] .= '<a id="nav-manage-link" class="nav-commlink" href="manage">' . t('Manage') . '</a>' . "\r\n"; 
+			$nav['manage'] = array('manage', t('Manage'), "");
 		}
 
-		$a->page['nav'] .= '<a id="nav-settings-link" class="nav-link" href="settings">' . t('Settings') . "</a>\r\n";
-
-		$a->page['nav'] .= '<a id="nav-profiles-link" class="nav-link" href="profiles">' . t('Profiles') . "</a>\r\n";
-
-		$a->page['nav'] .= '<a id="nav-contacts-link" class="nav-link" href="contacts">' . t('Contacts') . "</a>\r\n";
+		$nav['settings'] = array('settings', t('Settings'),"");
+		$nav['profiles'] = array('profiles', t('Profiles'),"");
+		$nav['contacts'] = array('contacts', t('Contacts'),"");
 
 		
 	}
 
-	$a->page['nav'] .= "</span>\r\n<span id=\"nav-end\"></span>\r\n";
 
 	/**
 	 *
@@ -133,7 +125,14 @@ function nav(&$a) {
 		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
 
 
-	$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';
+	$tpl = load_view_file('view/nav.tpl');
+
+	$a->page['nav'] .= replace_macros($tpl, array(
+		'$langselector' => lang_selector(),
+		'$sitelocation' => $sitelocation,
+		'$nav' => $nav,
+		'$banner' =>  $banner,
+	));
 
 	call_hooks('page_header', $a->page['nav']);
 
diff --git a/include/template_processor.php b/include/template_processor.php
new file mode 100644
index 000000000..f6d0264df
--- /dev/null
+++ b/include/template_processor.php
@@ -0,0 +1,50 @@
+<?php
+	
+
+	class Template {
+		var $s;
+		var $r;
+		var $search;
+		var $replace;
+		
+		private function _build_replace($r, $prefix){
+	
+			if(is_array($r) && count($r)) {
+				foreach ($r as $k => $v ) {
+					if (is_array($v))
+						$this->_build_replace($v, "$prefix$k.");
+					
+					$this->search[] =  $prefix . $k;
+					$this->replace[] = $v;
+				}
+			}
+		} 
+		
+		private function _replcb_if($m){
+			//echo "<pre>"; var_dump($m);
+			$keys = explode(".",$m[1]);
+			$val = $this->r;
+			foreach($keys as $k) {
+				$val = $val[$k];
+			}
+			
+			//echo $val;
+			return ($val?$m[2]:"");
+		}
+		
+		public function replace($s, $r) {
+			$this->s = $s;
+			$this->r = $r;
+			$this->search = array();
+			$this->replace = array();
+	
+			$this->_build_replace($r, "");
+	
+			
+			$s = preg_replace_callback("|{{ *if *([^ }]*) *}}([^{]*){{ *endif *}}|", array($this, "_replcb_if"), $s);
+			
+			return str_replace($this->search,$this->replace,$s);
+		}
+		
+	}	
+	$t = new Template;
-- 
cgit v1.2.3


From c3b42fdbcb2165045e0ae759e103cc7d44b3f584 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 14 Apr 2011 16:40:14 -0700
Subject: it's tough getting the photo menu right in all circumstances. Lots of
 variables. Much better now.

---
 include/conversation.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 5c8327e56..b2d20300f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -495,21 +495,24 @@ function item_photo_menu($item){
 	if((local_user() && ($profile_owner == 0)) 
 		|| ($profile_owner && $profile_owner == local_user())) {
 
-		if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url']))
+		if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) {
 			$redir = $redirect_url;
+			$cid = $item['cid'];
+		}
 		elseif(isset($a->authors[$item['author-link']])) {
 			$redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
 			$cid = $a->authors[$item['author-link']]['id'];
 		}
 
-		if($item['network'] === 'dfrn' && (! $item['self'])) {
-			$status_link = $redir . "?url=status";
-			$profile_link = $redir . "?url=profile";
-			$photos_link = $redir . "?url=photos";
-			$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+		if((isset($cid)) && (! $item['self'])) {
+			$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
+			if($item['network'] === 'dfrn') {
+				$status_link = $redir . "?url=status";
+				$profile_link = $redir . "?url=profile";
+				$photos_link = $redir . "?url=photos";
+				$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+			}
 		}
-
-		$contact_url = $item['self']?"":$a->get_baseurl() . '/contacts/' . (($item['cid']) ? $item['cid'] : $cid);
 	}
 
 
-- 
cgit v1.2.3


From de131c9e58ac2b14380d145d643bf2bd902ae9dc Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 14 Apr 2011 17:13:13 -0700
Subject: set utf-8 on all emails

---
 include/items.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 82752e168..733cd8048 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1415,7 +1415,9 @@ function new_follower($importer,$contact,$datarray,$item) {
 				$res = mail($r[0]['email'], 
 					t("You have a new follower at ") . $a->config['sitename'],
 					$email,
-					'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
+					'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+					. 'Content-type: text/plain; charset=UTF-8' . "\n"
+					. 'Content-transfer-encoding: 8bit' );
 			
 			}
 		}
-- 
cgit v1.2.3


From b5ccb8e2055bf08d282ebb0cba2cac0d850fdc5a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 14 Apr 2011 19:43:00 -0700
Subject: ensure host xrd is correct, even if installed in subpath

---
 include/hostxrd.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/hostxrd.php b/include/hostxrd.php
index 9161b265c..987175c33 100644
--- a/include/hostxrd.php
+++ b/include/hostxrd.php
@@ -1,10 +1,10 @@
 <?php
 
-function hostxrd($hostname) {
+function hostxrd($baseurl) {
 
 	header("Content-type: text/xml");
 	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace('$domain',$hostname,$tpl);
+	echo str_replace('$domain',$baseurl,$tpl);
 	session_write_close();
 	exit();
 
-- 
cgit v1.2.3


From 13eaa802e435c4f0d68ee427c3b1604a0e151858 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 15 Apr 2011 00:59:00 -0700
Subject: relocated "follow" url scraping code so it can be used elsewhere
 (contact repair, etc.)

---
 include/Scrape.php | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 191 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index 002fdfb35..e5c10a9be 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -260,4 +260,194 @@ function scrape_feed($url) {
 	}
 
 	return $ret;
-}}
\ No newline at end of file
+}}
+
+
+function probe_url($url) {
+
+	$result = array();
+
+	if(! $url)
+		return $result;
+
+	$diaspora = false;	
+	$email_conversant = false;
+
+	if($url) {
+		$links = lrdd($url);
+
+		if(count($links)) {
+			foreach($links as $link) {
+				if($link['@attributes']['rel'] === NAMESPACE_DFRN)
+					$dfrn = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'salmon')
+					$notify = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === NAMESPACE_FEED)
+					$poll = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
+					$hcard = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+					$profile = unamp($link['@attributes']['href']);
+				if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location')
+					$diaspora = true;
+			}
+
+			// Status.Net can have more than one profile URL. We need to match the profile URL
+			// to a contact on incoming messages to prevent spam, and we won't know which one
+			// to match. So in case of two, one of them is stored as an alias. Only store URL's
+			// and not webfinger user@host aliases. If they've got more than two non-email style
+			// aliases, let's hope we're lucky and get one that matches the feed author-uri because 
+			// otherwise we're screwed.
+
+			foreach($links as $link) {
+				if($link['@attributes']['rel'] === 'alias') {
+					if(strpos($link['@attributes']['href'],'@') === false) {
+						if(isset($profile)) {
+							if($link['@attributes']['href'] !== $profile)
+								$alias = unamp($link['@attributes']['href']);
+						}
+						else
+							$profile = unamp($link['@attributes']['href']);
+					}
+				}
+			}
+		}
+		else {
+			if((strpos($orig_url,'@')) && validate_email($orig_url)) {
+				$email_conversant = true;
+			}
+		}
+	}	
+
+	if(strlen($dfrn)) {
+		$ret = scrape_dfrn($dfrn);
+		if(is_array($ret) && x($ret,'dfrn-request')) {
+			$network = NETWORK_DFRN;
+			$request = $ret['dfrn-request'];
+			$confirm = $ret['dfrn-confirm'];
+			$notify  = $ret['dfrn-notify'];
+			$poll    = $ret['dfrn-poll'];
+		}
+	}
+
+	if($network !== NETWORK_DFRN) {
+		$network  = NETWORK_OSTATUS;
+		$priority = 0;
+
+		if($hcard) {
+			$vcard = scrape_vcard($hcard);
+
+			// Google doesn't use absolute url in profile photos
+	
+			if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') {
+				$h = @parse_url($hcard);
+				if($h)
+					$vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo'];
+			}
+		
+			logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA);
+		}
+
+		if(! $profile) {
+			if($diaspora)
+				$profile = $hcard;
+			else
+				$profile = $url;
+		}
+
+		if(! x($vcard,'fn'))
+			if(x($vcard,'nick'))
+				$vcard['fn'] = $vcard['nick'];
+
+		if((! isset($vcard)) && (! $poll)) {
+
+			$ret = scrape_feed($url);
+			logger('probe_url: scrape_feed returns: ' . print_r($ret,true), LOGGER_DATA);
+			if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
+				$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
+				$vcard = array();
+					if(x($ret,'photo'))
+						$vcard['photo'] = $ret['photo'];
+				require_once('simplepie/simplepie.inc');
+			    $feed = new SimplePie();
+				$xml = fetch_url($poll);
+
+    			$feed->set_raw_data($xml);
+
+			    $feed->init();
+
+				if(! x($vcard,'photo'))
+					$vcard['photo'] = $feed->get_image_url();
+				$author = $feed->get_author();
+				if($author) {			
+					$vcard['fn'] = unxmlify(trim($author->get_name()));
+					if(! $vcard['fn'])
+						$vcard['fn'] = trim(unxmlify($author->get_email()));
+					if(strpos($vcard['fn'],'@') !== false)
+						$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
+					$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
+					if(strpos($vcard['nick'],' '))
+						$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+					$email = unxmlify($author->get_email());
+				}
+				else {
+					$item = $feed->get_item(0);
+					if($item) {
+						$author = $item->get_author();
+						if($author) {			
+							$vcard['fn'] = trim(unxmlify($author->get_name()));
+							if(! $vcard['fn'])
+								$vcard['fn'] = trim(unxmlify($author->get_email()));
+							if(strpos($vcard['fn'],'@') !== false)
+								$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
+							$vcard['nick'] = strtolower(unxmlify($vcard['fn']));
+							if(strpos($vcard['nick'],' '))
+								$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+							$email = unxmlify($author->get_email());
+						}
+						if(! $vcard['photo']) {
+							$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
+							if($rawmedia && $rawmedia[0]['attribs']['']['url'])
+								$vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
+						}
+					}
+				}
+				if((! $vcard['photo']) && strlen($email))
+					$vcard['photo'] = gravatar_img($email);
+				if($poll === $profile)
+					$lnk = $feed->get_permalink();
+				if(isset($lnk) && strlen($lnk))
+					$profile = $lnk;	
+				if(! (x($vcard,'fn')))
+					$vcard['fn'] = notags($feed->get_title());
+				if(! (x($vcard,'fn')))
+					$vcard['fn'] = notags($feed->get_description());
+				$network = 'feed';
+				$priority = 2;
+			}
+		}
+	}
+
+	if(! x($vcard,'photo')) {
+		$a = get_app();
+		$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; 
+	}
+	$vcard['fn'] = notags($vcard['fn']);
+	$vcard['nick'] = notags($vcard['nick']);
+
+	$result['name'] = $vcard['fn'];
+	$result['nick'] = $vcard['nick'];
+	$result['url'] = $profile;
+	$result['notify'] = $notify;
+	$result['poll'] = $poll;
+	$result['request'] = $request;
+	$result['confirm'] = $confirm;
+	$result['photo'] = $vcard['photo'];
+	$result['priority'] = $priority;
+	$result['network'] = $network;
+	$result['alias'] = $alias;
+
+	logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG);
+
+	return $result;
+}
-- 
cgit v1.2.3


From 158b65894a086b36e383c2a41e494eb1d45fdb4a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 15 Apr 2011 19:16:37 -0700
Subject: initial checkin mailbox reading functions - lots more to do

---
 include/imap.php | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 include/imap.php

(limited to 'include')

diff --git a/include/imap.php b/include/imap.php
new file mode 100644
index 000000000..018727639
--- /dev/null
+++ b/include/imap.php
@@ -0,0 +1,107 @@
+<?php
+
+
+function f9_imap_connect($mailbox,$username,$password) {
+
+	if(! (local_user() && function_exists('imap_open')))
+		return false;
+
+	$mbox = imap_open($mailbox,$username,$password);
+
+	return $mbox;
+	
+}
+
+
+function f9_imap_poll_from($mbox,$str) {
+
+	if(! ($mbox && $str))
+		return false;
+
+	$search = imap_search($mbox,'FROM "' . $str . '"', SE_UID);
+
+	return $search;
+}
+	
+
+function getmsg($mbox,$mid) {
+    // input $mbox = IMAP stream, $mid = message id
+    // output all the following:
+    global $charset,$htmlmsg,$plainmsg,$attachments;
+    $htmlmsg = $plainmsg = $charset = '';
+    $attachments = array();
+
+    // HEADER
+    $h = imap_header($mbox,$mid);
+    // add code here to get date, from, to, cc, subject...
+
+    // BODY
+    $s = imap_fetchstructure($mbox,$mid);
+    if (!$s->parts)  // simple
+        getpart($mbox,$mid,$s,0);  // pass 0 as part-number
+    else {  // multipart: cycle through each part
+        foreach ($s->parts as $partno0=>$p)
+            getpart($mbox,$mid,$p,$partno0+1);
+    }
+}
+
+function getpart($mbox,$mid,$p,$partno) {
+    // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
+    global $htmlmsg,$plainmsg,$charset,$attachments;
+
+    // DECODE DATA
+    $data = ($partno)?
+        imap_fetchbody($mbox,$mid,$partno):  // multipart
+        imap_body($mbox,$mid);  // simple
+    // Any part may be encoded, even plain text messages, so check everything.
+    if ($p->encoding==4)
+        $data = quoted_printable_decode($data);
+    elseif ($p->encoding==3)
+        $data = base64_decode($data);
+
+    // PARAMETERS
+    // get all parameters, like charset, filenames of attachments, etc.
+    $params = array();
+    if ($p->parameters)
+        foreach ($p->parameters as $x)
+            $params[strtolower($x->attribute)] = $x->value;
+    if ($p->dparameters)
+        foreach ($p->dparameters as $x)
+            $params[strtolower($x->attribute)] = $x->value;
+
+    // ATTACHMENT
+    // Any part with a filename is an attachment,
+    // so an attached text file (type 0) is not mistaken as the message.
+    if ($params['filename'] || $params['name']) {
+        // filename may be given as 'Filename' or 'Name' or both
+        $filename = ($params['filename'])? $params['filename'] : $params['name'];
+        // filename may be encoded, so see imap_mime_header_decode()
+        $attachments[$filename] = $data;  // this is a problem if two files have same name
+    }
+
+    // TEXT
+    if ($p->type==0 && $data) {
+        // Messages may be split in different parts because of inline attachments,
+        // so append parts together with blank row.
+        if (strtolower($p->subtype)=='plain')
+            $plainmsg. = trim($data) ."\n\n";
+        else
+            $htmlmsg. = $data ."<br><br>";
+        $charset = $params['charset'];  // assume all parts are same charset
+    }
+
+    // EMBEDDED MESSAGE
+    // Many bounce notifications embed the original message as type 2,
+    // but AOL uses type 1 (multipart), which is not handled here.
+    // There are no PHP functions to parse embedded messages,
+    // so this just appends the raw source to the main message.
+    elseif ($p->type==2 && $data) {
+        $plainmsg. = $data."\n\n";
+    }
+
+    // SUBPART RECURSION
+    if ($p->parts) {
+        foreach ($p->parts as $partno0=>$p2)
+            getpart($mbox,$mid,$p2,$partno.'.'.($partno0+1));  // 1.2, 1.2.1, etc.
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 27cbb830a7bd72f13181acc5999a6bed4f74f5ae Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 15 Apr 2011 23:40:43 -0700
Subject: more work on email contacts

---
 include/email.php  | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/imap.php   | 107 ---------------------------------------------------
 include/poller.php | 103 +++++++++++++++++++++++++++++++++----------------
 3 files changed, 180 insertions(+), 140 deletions(-)
 create mode 100644 include/email.php
 delete mode 100644 include/imap.php

(limited to 'include')

diff --git a/include/email.php b/include/email.php
new file mode 100644
index 000000000..c7a006da0
--- /dev/null
+++ b/include/email.php
@@ -0,0 +1,110 @@
+<?php
+
+function email_connect($mailbox,$username,$password) {
+	if(! (local_user() && function_exists('imap_open')))
+		return false;
+
+	$mbox = imap_open($mailbox,$username,$password);
+
+	return $mbox;
+}
+
+function email_poll($mbox,$email_addr) {
+
+	if(! ($mbox && $email_addr))
+		return false;
+
+	$search = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
+	return $search;
+}
+
+
+function construct_mailbox_name($mailacct) {
+	$ret = '{' . $mailacct['server'] . (($mailacct['port']) ? ':' . $mailacct['port'] : '');
+	$ret .= (($mailacct['ssltype']) ?  '/' . $mailacct['ssltype'] . '/novalidate-cert' : '');
+	$ret .= '}' . $mailacct['mailbox'];
+	return $ret;
+}
+
+
+function getmsg($mbox,$mid) {
+    // input $mbox = IMAP stream, $mid = message id
+    // output all the following:
+    global $charset,$htmlmsg,$plainmsg,$attachments;
+    $htmlmsg = $plainmsg = $charset = '';
+    $attachments = array();
+
+    // HEADER
+    $h = imap_header($mbox,$mid);
+    // add code here to get date, from, to, cc, subject...
+
+    // BODY
+    $s = imap_fetchstructure($mbox,$mid);
+    if (!$s->parts)  // simple
+        getpart($mbox,$mid,$s,0);  // pass 0 as part-number
+    else {  // multipart: cycle through each part
+        foreach ($s->parts as $partno0=>$p)
+            getpart($mbox,$mid,$p,$partno0+1);
+    }
+}
+
+function getpart($mbox,$mid,$p,$partno) {
+    // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
+    global $htmlmsg,$plainmsg,$charset,$attachments;
+
+    // DECODE DATA
+    $data = ($partno)?
+        imap_fetchbody($mbox,$mid,$partno):  // multipart
+        imap_body($mbox,$mid);  // simple
+    // Any part may be encoded, even plain text messages, so check everything.
+    if ($p->encoding==4)
+        $data = quoted_printable_decode($data);
+    elseif ($p->encoding==3)
+        $data = base64_decode($data);
+
+    // PARAMETERS
+    // get all parameters, like charset, filenames of attachments, etc.
+    $params = array();
+    if ($p->parameters)
+        foreach ($p->parameters as $x)
+            $params[strtolower($x->attribute)] = $x->value;
+    if ($p->dparameters)
+        foreach ($p->dparameters as $x)
+            $params[strtolower($x->attribute)] = $x->value;
+
+    // ATTACHMENT
+    // Any part with a filename is an attachment,
+    // so an attached text file (type 0) is not mistaken as the message.
+    if ($params['filename'] || $params['name']) {
+        // filename may be given as 'Filename' or 'Name' or both
+        $filename = ($params['filename'])? $params['filename'] : $params['name'];
+        // filename may be encoded, so see imap_mime_header_decode()
+        $attachments[$filename] = $data;  // this is a problem if two files have same name
+    }
+
+    // TEXT
+    if ($p->type==0 && $data) {
+        // Messages may be split in different parts because of inline attachments,
+        // so append parts together with blank row.
+        if (strtolower($p->subtype)=='plain')
+            $plainmsg .= trim($data) ."\n\n";
+        else
+            $htmlmsg .= $data ."<br><br>";
+        $charset = $params['charset'];  // assume all parts are same charset
+    }
+
+    // EMBEDDED MESSAGE
+    // Many bounce notifications embed the original message as type 2,
+    // but AOL uses type 1 (multipart), which is not handled here.
+    // There are no PHP functions to parse embedded messages,
+    // so this just appends the raw source to the main message.
+    elseif ($p->type==2 && $data) {
+        $plainmsg .= $data."\n\n";
+    }
+
+    // SUBPART RECURSION
+    if ($p->parts) {
+        foreach ($p->parts as $partno0=>$p2)
+            getpart($mbox,$mid,$p2,$partno.'.'.($partno0+1));  // 1.2, 1.2.1, etc.
+    }
+}
\ No newline at end of file
diff --git a/include/imap.php b/include/imap.php
deleted file mode 100644
index 018727639..000000000
--- a/include/imap.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-
-function f9_imap_connect($mailbox,$username,$password) {
-
-	if(! (local_user() && function_exists('imap_open')))
-		return false;
-
-	$mbox = imap_open($mailbox,$username,$password);
-
-	return $mbox;
-	
-}
-
-
-function f9_imap_poll_from($mbox,$str) {
-
-	if(! ($mbox && $str))
-		return false;
-
-	$search = imap_search($mbox,'FROM "' . $str . '"', SE_UID);
-
-	return $search;
-}
-	
-
-function getmsg($mbox,$mid) {
-    // input $mbox = IMAP stream, $mid = message id
-    // output all the following:
-    global $charset,$htmlmsg,$plainmsg,$attachments;
-    $htmlmsg = $plainmsg = $charset = '';
-    $attachments = array();
-
-    // HEADER
-    $h = imap_header($mbox,$mid);
-    // add code here to get date, from, to, cc, subject...
-
-    // BODY
-    $s = imap_fetchstructure($mbox,$mid);
-    if (!$s->parts)  // simple
-        getpart($mbox,$mid,$s,0);  // pass 0 as part-number
-    else {  // multipart: cycle through each part
-        foreach ($s->parts as $partno0=>$p)
-            getpart($mbox,$mid,$p,$partno0+1);
-    }
-}
-
-function getpart($mbox,$mid,$p,$partno) {
-    // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
-    global $htmlmsg,$plainmsg,$charset,$attachments;
-
-    // DECODE DATA
-    $data = ($partno)?
-        imap_fetchbody($mbox,$mid,$partno):  // multipart
-        imap_body($mbox,$mid);  // simple
-    // Any part may be encoded, even plain text messages, so check everything.
-    if ($p->encoding==4)
-        $data = quoted_printable_decode($data);
-    elseif ($p->encoding==3)
-        $data = base64_decode($data);
-
-    // PARAMETERS
-    // get all parameters, like charset, filenames of attachments, etc.
-    $params = array();
-    if ($p->parameters)
-        foreach ($p->parameters as $x)
-            $params[strtolower($x->attribute)] = $x->value;
-    if ($p->dparameters)
-        foreach ($p->dparameters as $x)
-            $params[strtolower($x->attribute)] = $x->value;
-
-    // ATTACHMENT
-    // Any part with a filename is an attachment,
-    // so an attached text file (type 0) is not mistaken as the message.
-    if ($params['filename'] || $params['name']) {
-        // filename may be given as 'Filename' or 'Name' or both
-        $filename = ($params['filename'])? $params['filename'] : $params['name'];
-        // filename may be encoded, so see imap_mime_header_decode()
-        $attachments[$filename] = $data;  // this is a problem if two files have same name
-    }
-
-    // TEXT
-    if ($p->type==0 && $data) {
-        // Messages may be split in different parts because of inline attachments,
-        // so append parts together with blank row.
-        if (strtolower($p->subtype)=='plain')
-            $plainmsg. = trim($data) ."\n\n";
-        else
-            $htmlmsg. = $data ."<br><br>";
-        $charset = $params['charset'];  // assume all parts are same charset
-    }
-
-    // EMBEDDED MESSAGE
-    // Many bounce notifications embed the original message as type 2,
-    // but AOL uses type 1 (multipart), which is not handled here.
-    // There are no PHP functions to parse embedded messages,
-    // so this just appends the raw source to the main message.
-    elseif ($p->type==2 && $data) {
-        $plainmsg. = $data."\n\n";
-    }
-
-    // SUBPART RECURSION
-    if ($p->parts) {
-        foreach ($p->parts as $partno0=>$p2)
-            getpart($mbox,$mid,$p2,$partno.'.'.($partno0+1));  // 1.2, 1.2.1, etc.
-    }
-}
\ No newline at end of file
diff --git a/include/poller.php b/include/poller.php
index b878ef295..37109f17d 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,4 +1,5 @@
 <?php
+
 require_once("boot.php");
 
 function poller_run($argv, $argc){
@@ -15,11 +16,14 @@ function poller_run($argv, $argc){
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
 
+	$mbox = null;
+
 	require_once('session.php');
 	require_once('datetime.php');
 	require_once('simplepie/simplepie.inc');
 	require_once('include/items.php');
 	require_once('include/Contact.php');
+	require_once('include/email.php');
 
 	$a->set_baseurl(get_config('system','url'));
 
@@ -85,6 +89,9 @@ function poller_run($argv, $argc){
 			continue;
 
 		foreach($res as $contact) {
+
+			$xml = false;
+
 			if($manual_id)
 				$contact['last-update'] = '0000-00-00 00:00:00';
 
@@ -158,7 +165,7 @@ function poller_run($argv, $argc){
 				: datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
 			);
 
-			if($contact['network'] === 'dfrn') {
+			if($contact['network'] === NETWORK_DFRN) {
 
 				$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 
@@ -175,12 +182,12 @@ function poller_run($argv, $argc){
 					. '&type=data&last_update=' . $last_update 
 					. '&perm=' . $perm ;
 	
-				$xml = fetch_url($url);
+				$handshake_xml = fetch_url($url);
 
-				logger('poller: handshake with url ' . $url . ' returns xml: ' . $xml, LOGGER_DATA);
+				logger('poller: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
 
 
-				if(! $xml) {
+				if(! $handshake_xml) {
 					logger("poller: $url appears to be dead - marking for death ");
 					// dead connection - might be a transient event, or this might
 					// mean the software was uninstalled or the domain expired. 
@@ -197,7 +204,7 @@ function poller_run($argv, $argc){
 					continue;
 				}
 
-				if(! strstr($xml,'<?xml')) {
+				if(! strstr($handshake_xml,'<?xml')) {
 					logger('poller: response from ' . $url . ' did not contain XML.');
 					$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
 						dbesc(datetime_convert()),
@@ -207,7 +214,7 @@ function poller_run($argv, $argc){
 				}
 
 
-				$res = parse_xml_string($xml);
+				$res = parse_xml_string($handshake_xml);
 	
 				if(intval($res->status) == 1) {
 					logger("poller: $url replied status 1 - marking for death ");
@@ -265,52 +272,82 @@ function poller_run($argv, $argc){
 
 				$xml = post_url($contact['poll'],$postvars);
 			}
-			else {
+			elseif(($contact['network'] === NETWORK_OSTATUS) 
+				|| ($contact['network'] === NETWORK_DIASPORA)
+				|| ($contact['network'] === NETWORK_FEED) ) {
 
-				// $contact['network'] !== 'dfrn'
+				// Upgrading DB fields from an older Friendika version
+				// Will only do this once per notify-enabled OStatus contact
 
 				if(($contact['notify']) && (! $contact['writable'])) {
 					q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d LIMIT 1",
 						intval($contact['id'])
 					);
 				}
+
 				$xml = fetch_url($contact['poll']);
 			}
-
-			logger('poller: received xml : ' . $xml, LOGGER_DATA);
-
-			if(! strstr($xml,'<?xml')) {
-				logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
-				$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
-					dbesc(datetime_convert()),
-					intval($contact['id'])
-				);
-				continue;
+			elseif($contact['network'] === NETWORK_MAIL) {
+				if(! $mbox) {
+					$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = $d LIMIT 1",
+						intval($importer_uid)
+					);
+					$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+						intval($importer_uid)
+					);
+					if(count($x) && count($r)) {
+					    $mailbox = construct_mailbox_name($r[0]);
+						$password = '';
+						openssl_private_decrypt($r[0]['pass'],$password,$x[0]['prvkey']);
+						$mbox = email_connect($mailbox,$r[0]['user'],$password);
+						unset($password);
+					}
+				}
+				if($mbox) {
+					$msgs = email_poll($mbox,$contact['addr']);
+					if(count($msgs)) {
+							// TODO: loop through, fetch, check duplicates, and import
+					}
+				}
+			}
+			elseif($contact['network'] === NETWORK_FACEBOOK) {
+				// TODO: work in progress			
 			}
 
+			if($xml) {
+				logger('poller: received xml : ' . $xml, LOGGER_DATA);
 
-			consume_feed($xml,$importer,$contact,$hub,1, true);
-
-			// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
+				if(! strstr($xml,'<?xml')) {
+					logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
+					$r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
+						dbesc(datetime_convert()),
+						intval($contact['id'])
+					);
+					continue;
+				}
 
-			consume_feed($xml,$importer,$contact,$hub,1);
 
+				consume_feed($xml,$importer,$contact,$hub,1, true);
 
-			if((strlen($hub)) && ($hub_update) 
-				&& (($contact['rel'] == REL_BUD) || (($contact['network'] === 'stat') && (! $contact['readonly'])))) {
-				logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
-				$hubs = explode(',', $hub);
-				if(count($hubs)) {
-					foreach($hubs as $h) {
-						$h = trim($h);
-						if(! strlen($h))
-							continue;
-						subscribe_to_hub($h,$importer,$contact);
+				// do it twice. Ensures that children of parents which may be later in the stream aren't tossed
+	
+				consume_feed($xml,$importer,$contact,$hub,1);
+
+
+				if((strlen($hub)) && ($hub_update) && (($contact['rel'] == REL_BUD) || (($contact['network'] === NETWORK_OSTATUS) && (! $contact['readonly'])))) {
+					logger('poller: subscribing to hub(s) : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
+					$hubs = explode(',', $hub);
+					if(count($hubs)) {
+						foreach($hubs as $h) {
+							$h = trim($h);
+							if(! strlen($h))
+								continue;
+							subscribe_to_hub($h,$importer,$contact);
+						}
 					}
 				}
 			}
 
-
 			$updated = datetime_convert();
 
 			$r = q("UPDATE `contact` SET `last-update` = '%s', `success_update` = '%s' WHERE `id` = %d LIMIT 1",
-- 
cgit v1.2.3


From c7bcdf0c186c8d5ce278a3710a5ba570d066be99 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 16 Apr 2011 01:14:25 -0700
Subject: get meta info for email msgs

---
 include/email.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/email.php b/include/email.php
index c7a006da0..4d8c25edf 100644
--- a/include/email.php
+++ b/include/email.php
@@ -12,10 +12,10 @@ function email_connect($mailbox,$username,$password) {
 function email_poll($mbox,$email_addr) {
 
 	if(! ($mbox && $email_addr))
-		return false;
+		return array();;
 
 	$search = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
-	return $search;
+	return (($search) ? $search : array());
 }
 
 
@@ -27,6 +27,13 @@ function construct_mailbox_name($mailacct) {
 }
 
 
+function email_msg_meta($mbox,$uid) {
+	$ret = (($mbox && $uid) ? imap_fetch_overview($mbox,$uid,FT_UID) : array(array()));
+	return ((count($ret)) ? $ret[0] : array());
+}
+
+
+
 function getmsg($mbox,$mid) {
     // input $mbox = IMAP stream, $mid = message id
     // output all the following:
-- 
cgit v1.2.3


From 863ddf1676be3837da4219ed7883e61e4d493b1c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 16 Apr 2011 08:45:08 -0700
Subject: mail changes

---
 include/Scrape.php | 37 ++++++++++++++++++++++++--
 include/email.php  | 76 ++++++++++++++++++++++++++++++++----------------------
 include/poller.php | 44 ++++++++++++++++++++++++++++---
 3 files changed, 121 insertions(+), 36 deletions(-)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index e5c10a9be..97e2fb7f1 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -264,6 +264,7 @@ function scrape_feed($url) {
 
 
 function probe_url($url) {
+	require_once('include/email.php');
 
 	$result = array();
 
@@ -313,8 +314,38 @@ function probe_url($url) {
 			}
 		}
 		else {
+
+			// Check email
+
+			$orig_url = $url;
 			if((strpos($orig_url,'@')) && validate_email($orig_url)) {
-				$email_conversant = true;
+				$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
+					intval(local_user())
+				);
+				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+					intval(local_user())
+				);
+				if(count($x) && count($r)) {
+				    $mailbox = construct_mailbox_name($r[0]);
+					$password = '';
+					openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']);
+					$mbox = email_connect($mailbox,$r[0]['user'],$password);
+					unset($password);
+				}
+				if($mbox) {
+					$msgs = email_poll($mbox,$orig_url);
+					if(count($msgs)) {
+						$addr = $orig_url;
+						$network = NETWORK_MAIL;
+						$name = substr($url,0,strpos($url,'@'));
+						// fix nick
+						$vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
+						$notify = 'smtp';
+						$poll = 'email';
+						$priority = 0;
+					}
+					imap_close($mbox);
+				}
 			}
 		}
 	}	
@@ -330,7 +361,7 @@ function probe_url($url) {
 		}
 	}
 
-	if($network !== NETWORK_DFRN) {
+	if($network !== NETWORK_DFRN && $network !== NETWORK_MAIL) {
 		$network  = NETWORK_OSTATUS;
 		$priority = 0;
 
@@ -435,9 +466,11 @@ function probe_url($url) {
 	$vcard['fn'] = notags($vcard['fn']);
 	$vcard['nick'] = notags($vcard['nick']);
 
+
 	$result['name'] = $vcard['fn'];
 	$result['nick'] = $vcard['nick'];
 	$result['url'] = $profile;
+	$result['addr'] = $addr;
 	$result['notify'] = $notify;
 	$result['poll'] = $poll;
 	$result['request'] = $request;
diff --git a/include/email.php b/include/email.php
index 4d8c25edf..c0fe17cc6 100644
--- a/include/email.php
+++ b/include/email.php
@@ -1,7 +1,7 @@
 <?php
 
 function email_connect($mailbox,$username,$password) {
-	if(! (local_user() && function_exists('imap_open')))
+	if(! function_exists('imap_open'))
 		return false;
 
 	$mbox = imap_open($mailbox,$username,$password);
@@ -33,36 +33,41 @@ function email_msg_meta($mbox,$uid) {
 }
 
 
+function email_get_msg($mbox,$uid) {
+	$ret = array();
 
-function getmsg($mbox,$mid) {
-    // input $mbox = IMAP stream, $mid = message id
-    // output all the following:
-    global $charset,$htmlmsg,$plainmsg,$attachments;
-    $htmlmsg = $plainmsg = $charset = '';
-    $attachments = array();
+	$struc = (($mbox && $uid) ? imap_fetchstructure($mbox,$uid,FT_UID) : null);
 
-    // HEADER
-    $h = imap_header($mbox,$mid);
-    // add code here to get date, from, to, cc, subject...
+	if(! $struc)
+		return $ret;
 
-    // BODY
-    $s = imap_fetchstructure($mbox,$mid);
-    if (!$s->parts)  // simple
-        getpart($mbox,$mid,$s,0);  // pass 0 as part-number
-    else {  // multipart: cycle through each part
-        foreach ($s->parts as $partno0=>$p)
-            getpart($mbox,$mid,$p,$partno0+1);
-    }
+	if(! $struc->parts) {
+		$ret['body'] = email_get_part($mbox,$uid,$struc,0);
+	}
+	else {
+		foreach($struc->parts as $ptop => $p) {
+			$x = email_get_part($mbox,$uid,$p,$ptop + 1);
+			if($x)
+				$ret['body'] = $x;
+		}
+	}
+	return $ret;
 }
 
-function getpart($mbox,$mid,$p,$partno) {
+// At the moment - only return plain/text.
+// Later we'll repackage inline images as data url's and make the HTML safe
+
+function email_get_part($mbox,$uid,$p,$partno) {
     // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
     global $htmlmsg,$plainmsg,$charset,$attachments;
 
+	echo $partno;
+
     // DECODE DATA
-    $data = ($partno)?
-        imap_fetchbody($mbox,$mid,$partno):  // multipart
-        imap_body($mbox,$mid);  // simple
+    $data = ($partno)
+		? imap_fetchbody($mbox,$uid,$partno, FT_UID|FT_PEEK)
+        : imap_body($mbox,$uid,FT_UID|FT_PEEK);
+
     // Any part may be encoded, even plain text messages, so check everything.
     if ($p->encoding==4)
         $data = quoted_printable_decode($data);
@@ -82,6 +87,7 @@ function getpart($mbox,$mid,$p,$partno) {
     // ATTACHMENT
     // Any part with a filename is an attachment,
     // so an attached text file (type 0) is not mistaken as the message.
+
     if ($params['filename'] || $params['name']) {
         // filename may be given as 'Filename' or 'Name' or both
         $filename = ($params['filename'])? $params['filename'] : $params['name'];
@@ -90,13 +96,15 @@ function getpart($mbox,$mid,$p,$partno) {
     }
 
     // TEXT
-    if ($p->type==0 && $data) {
+    if ($p->type == 0 && $data) {
         // Messages may be split in different parts because of inline attachments,
         // so append parts together with blank row.
         if (strtolower($p->subtype)=='plain')
-            $plainmsg .= trim($data) ."\n\n";
+            return (trim($data) ."\n\n");
         else
-            $htmlmsg .= $data ."<br><br>";
+			$data = '';
+
+ //           $htmlmsg .= $data ."<br><br>";
         $charset = $params['charset'];  // assume all parts are same charset
     }
 
@@ -105,13 +113,19 @@ function getpart($mbox,$mid,$p,$partno) {
     // but AOL uses type 1 (multipart), which is not handled here.
     // There are no PHP functions to parse embedded messages,
     // so this just appends the raw source to the main message.
-    elseif ($p->type==2 && $data) {
-        $plainmsg .= $data."\n\n";
-    }
+//    elseif ($p->type==2 && $data) {
+//        $plainmsg .= $data."\n\n";
+//    }
 
     // SUBPART RECURSION
     if ($p->parts) {
-        foreach ($p->parts as $partno0=>$p2)
-            getpart($mbox,$mid,$p2,$partno.'.'.($partno0+1));  // 1.2, 1.2.1, etc.
+        foreach ($p->parts as $partno0=>$p2) {
+            $x =  email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1));  // 1.2, 1.2.1, etc.
+			if($x)
+				return $x;
+		}
     }
-}
\ No newline at end of file
+}
+
+
+
diff --git a/include/poller.php b/include/poller.php
index 37109f17d..b8bd0b708 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -289,7 +289,7 @@ function poller_run($argv, $argc){
 			}
 			elseif($contact['network'] === NETWORK_MAIL) {
 				if(! $mbox) {
-					$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = $d LIMIT 1",
+					$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
 						intval($importer_uid)
 					);
 					$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
@@ -298,7 +298,7 @@ function poller_run($argv, $argc){
 					if(count($x) && count($r)) {
 					    $mailbox = construct_mailbox_name($r[0]);
 						$password = '';
-						openssl_private_decrypt($r[0]['pass'],$password,$x[0]['prvkey']);
+						openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']);
 						$mbox = email_connect($mailbox,$r[0]['user'],$password);
 						unset($password);
 					}
@@ -306,7 +306,42 @@ function poller_run($argv, $argc){
 				if($mbox) {
 					$msgs = email_poll($mbox,$contact['addr']);
 					if(count($msgs)) {
-							// TODO: loop through, fetch, check duplicates, and import
+						foreach($msgs as $msg_uid) {
+							$datarray = array();
+							$meta = email_msg_meta($mbox,$msg_uid);
+							$datarray['uri'] = trim($meta->message_id,'<>');
+//FIXME
+							$datarray['parent-uri'] = $datarray['uri'];
+							// Have we seen it before?
+							$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+								intval($importer_uid),
+								dbesc($datarray['uri'])
+							);
+							if(count($r)) {
+								if($meta->deleted && ! $r[0]['deleted']) {
+									q("UPDATE `item` SET `deleted` = `, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+										dbesc(datetime_convert()),
+										intval($r[0]['id'])
+									);
+								}		
+								continue;
+							}
+							$datarray['title'] = notags(trim($meta->subject));
+							$datarray['created'] = datetime_convert('UTC','UTC',$meta->date);
+	
+							$r = email_get_msg($mbox,$msg_uid);
+							if(! $r)
+								continue;
+							$datarray['body'] = escape_tags($r['body']);
+							$datarray['uid'] = $importer_uid;
+							$datarray['contact-id'] = $contact['id'];
+							$datarray['private'] = 1;
+							$datarray['author-name'] = $contact['name'];
+							$datarray['author-link'] = 'mailbox';
+							$datarray['author-avatar'] = $contact['photo'];
+						
+							item_store($datarray);
+						}
 					}
 				}
 			}
@@ -359,6 +394,9 @@ function poller_run($argv, $argc){
 			// loop - next contact
 		}
 	}
+
+	if($mbox && function_exists('imap_close'))
+		imap_close($mbox);
 		
 	return;
 }
-- 
cgit v1.2.3


From 12571c42f12610e88e0159e1463de931269e033f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 16 Apr 2011 15:48:08 -0700
Subject: we need a profile url. Something.

---
 include/Scrape.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index 97e2fb7f1..320e18edb 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -338,6 +338,7 @@ function probe_url($url) {
 						$addr = $orig_url;
 						$network = NETWORK_MAIL;
 						$name = substr($url,0,strpos($url,'@'));
+						$profile = 'http://' . substr($url,strpos($url,'@')+1);
 						// fix nick
 						$vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
 						$notify = 'smtp';
-- 
cgit v1.2.3


From 7cc5a9bba9ee892bac41fe3af4ae00da846ca96a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 17 Apr 2011 15:24:24 -0700
Subject: email follow seems to be stabilising

---
 include/Scrape.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index 320e18edb..05a53e538 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -339,11 +339,15 @@ function probe_url($url) {
 						$network = NETWORK_MAIL;
 						$name = substr($url,0,strpos($url,'@'));
 						$profile = 'http://' . substr($url,strpos($url,'@')+1);
-						// fix nick
+						// fix nick character range
 						$vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
 						$notify = 'smtp';
 						$poll = 'email';
 						$priority = 0;
+						$x = email_msg_meta($mbox,$msgs[0]);
+						$adr = imap_rfc822_parse_adrlist($x->from,'');
+						if(strlen($adr[0]->personal))
+							$vcard['fn'] = notags($adr[0]->personal);
 					}
 					imap_close($mbox);
 				}
-- 
cgit v1.2.3


From ab099e91028122dfb6b10cf9510b1b061f6f547f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 17 Apr 2011 23:27:11 -0700
Subject: email integration, cont.

---
 include/Scrape.php       |  6 ++--
 include/conversation.php | 10 ++++++
 include/email.php        | 60 +++++++++++++++++++++++++++++++
 include/group.php        |  3 +-
 include/notifier.php     | 91 ++++++++++++++++++++++++++++++++++++++++++++++--
 include/poller.php       | 58 +++++++++++++++++++++++++-----
 6 files changed, 213 insertions(+), 15 deletions(-)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index 05a53e538..a6bb5f728 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -322,7 +322,7 @@ function probe_url($url) {
 				$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
 					intval(local_user())
 				);
-				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 					intval(local_user())
 				);
 				if(count($x) && count($r)) {
@@ -341,8 +341,8 @@ function probe_url($url) {
 						$profile = 'http://' . substr($url,strpos($url,'@')+1);
 						// fix nick character range
 						$vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
-						$notify = 'smtp';
-						$poll = 'email';
+						$notify = 'smtp ' . random_string();
+						$poll = 'email ' . random_string();
 						$priority = 0;
 						$x = email_msg_meta($mbox,$msgs[0]);
 						$adr = imap_rfc822_parse_adrlist($x->from,'');
diff --git a/include/conversation.php b/include/conversation.php
index b2d20300f..4c858d818 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -85,6 +85,8 @@ function conversation(&$a, $items, $mode, $update) {
 				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
 				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
 				$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
+				if($profile_link === 'mailbox')
+					$profile_link = '';
 
 				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
@@ -360,6 +362,9 @@ function conversation(&$a, $items, $mode, $update) {
 			else 
 				$profile_link = $item['url'];
 
+			if($profile_link === 'mailbox')
+				$profile_link = '';
+
 			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
@@ -483,6 +488,9 @@ function item_photo_menu($item){
 	$profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
 	$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
+	if($profile_link === 'mailbox')
+		$profile_link = '';
+
 	// $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
 
 	$profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0);	
@@ -503,6 +511,8 @@ function item_photo_menu($item){
 			$redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
 			$cid = $a->authors[$item['author-link']]['id'];
 		}
+		if($item['author-link'] === 'mailbox')
+			$cid = $item['cid'];
 
 		if((isset($cid)) && (! $item['self'])) {
 			$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
diff --git a/include/email.php b/include/email.php
index c0fe17cc6..91aafd45e 100644
--- a/include/email.php
+++ b/include/email.php
@@ -32,6 +32,27 @@ function email_msg_meta($mbox,$uid) {
 	return ((count($ret)) ? $ret[0] : array());
 }
 
+function email_msg_headers($mbox,$uid) {
+	$raw_header = (($mbox && $uid) ? imap_fetchheader($mbox,$uid,FT_UID) : '');
+	$raw_header = str_replace("\r",'',$raw_header);
+	$ret = array();
+	$h = split("\n",$raw_header);
+	if(count($h))
+	foreach($h as $line ) {
+	    if (preg_match("/^[a-zA-Z]/", $line)) {
+			$key = substr($line,0,strpos($line,':'));
+			$value = substr($line,strpos($line,':')+1);
+
+			$last_entry = strtolower($key);
+			$ret[$last_entry] = trim($value);
+		}
+		else {
+			$ret[$last_entry] .= ' ' . trim($line);
+    	}
+	}
+	return $ret;
+}
+
 
 function email_get_msg($mbox,$uid) {
 	$ret = array();
@@ -129,3 +150,42 @@ function email_get_part($mbox,$uid,$p,$partno) {
 
 
 
+function email_header_encode($in_str, $charset) {
+    $out_str = $in_str;
+    if ($out_str && $charset) {
+
+        // define start delimimter, end delimiter and spacer
+        $end = "?=";
+        $start = "=?" . $charset . "?B?";
+        $spacer = $end . "\r\n " . $start;
+
+        // determine length of encoded text within chunks
+        // and ensure length is even
+        $length = 75 - strlen($start) - strlen($end);
+
+        /*
+            [EDIT BY danbrown AT php DOT net: The following
+            is a bugfix provided by (gardan AT gmx DOT de)
+            on 31-MAR-2005 with the following note:
+            "This means: $length should not be even,
+            but divisible by 4. The reason is that in
+            base64-encoding 3 8-bit-chars are represented
+            by 4 6-bit-chars. These 4 chars must not be
+            split between two encoded words, according
+            to RFC-2047.
+        */
+        $length = $length - ($length % 4);
+
+        // encode the string and split it into chunks
+        // with spacers after each chunk
+        $out_str = base64_encode($out_str);
+        $out_str = chunk_split($out_str, $length, $spacer);
+
+        // remove trailing spacer and
+        // add start and end delimiters
+        $spacer = preg_quote($spacer);
+        $out_str = preg_replace("/" . $spacer . "$/", "", $out_str);
+        $out_str = $start . $out_str . $end;
+    }
+    return $out_str;
+} 
\ No newline at end of file
diff --git a/include/group.php b/include/group.php
index 065c2241f..5dca08c76 100644
--- a/include/group.php
+++ b/include/group.php
@@ -123,7 +123,8 @@ function group_public_members($gid) {
 	if(intval($gid)) {
 		$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` 
 			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
-			WHERE `gid` = %d AND `group_member`.`uid` = %d AND `contact`.`network` != 'dfrn' ",
+			WHERE `gid` = %d AND `group_member`.`uid` = %d 
+			AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' ",
 			intval($gid),
 			intval(local_user())
 		);		
diff --git a/include/notifier.php b/include/notifier.php
index 9d74f8b9b..80f0e67c7 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -72,7 +72,7 @@ function notifier_run($argv, $argc){
 	else {
 
 		// find ancestors
-		$r = q("SELECT `parent`, `uid`, `edited` FROM `item` WHERE `id` = %d LIMIT 1",
+		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
 			intval($item_id)
 		);
 
@@ -80,6 +80,7 @@ function notifier_run($argv, $argc){
 			return;
 		}
 
+		$parent_item = $r[0];
 		$parent_id = intval($r[0]['parent']);
 		$uid = $r[0]['uid'];
 		$updated = $r[0]['edited'];
@@ -267,12 +268,25 @@ function notifier_run($argv, $argc){
 
 	logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
 
+	// If this is a public message and pubmail is set on the parent, include all your email contacts
+
+	if((! strlen($parent_item['allow_cid'])) && (! strlen($parent_item['allow_gid'])) && (! strlen($parent_item['deny_cid'])) && (! strlen($parent_item['deny_gid'])) 
+		&& (intval($parent_item['pubmail']))) {
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
+			intval($uid),
+			dbesc(NETWORK_MAIL)
+		);
+		if(count($r)) {
+			foreach($r as $rr)
+				$recipients[] = $rr['id'];
+		}
+	}
+
 	if($followup)
 		$recip_str = $parent['contact-id'];
 	else
 		$recip_str = implode(', ', $recipients);
 
-
 	$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ",
 		dbesc($recip_str)
 	);
@@ -352,6 +366,79 @@ function notifier_run($argv, $argc){
 					}
 					break;
 				case 'mail':
+
+					// WARNING: does not currently convert to RFC2047 header encodings, etc.
+
+					$addr = $contact['addr'];
+					if(! strlen($addr))
+						break;
+
+					if($cmd === 'wall-new' || $cmd === 'comment-new') {
+
+						$it = null;
+						if($cmd === 'wall-new') 
+							$it = $items[0];
+						else {
+							$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", 
+								intval($argv[2]),
+								intval($uid)
+							);
+							if(count($r))
+								$it = $r[0];
+						}
+						if(! $it)
+							break;
+						
+
+
+						$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+							intval($uid)
+						);
+						if(! count($local_user))
+							break;
+						
+						$reply_to = '';
+						$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+							intval($uid)
+						);
+						if($r1 && $r1[0]['reply_to'])
+							$reply_to = $r1[0]['reply_to'];
+	
+						$subject  = (($it['title']) ? $it['title'] : t("\x28no subject\x29")) ;
+						$headers  = 'From: ' . $local_user[0]['username'] . ' <' . $local_user[0]['email'] . '>' . "\n";
+
+						if($reply_to)
+							$headers .= 'Reply-to: ' . $reply_to . "\n";
+
+						$headers .= 'Message-id: <' . $it['uri'] . '>' . "\n";
+
+						if($it['uri'] !== $it['parent-uri']) {
+							$header .= 'References: <' . $it['parent-uri'] . '>' . "\n";
+							if(! strlen($it['title'])) {
+								$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
+									dbesc($it['parent-uri'])
+								);
+								if(count($r)) {
+									$subtitle = $r[0]['title'];
+									if($subtitle) {
+										if(strncasecmp($subtitle,'RE:',3))
+											$subject = $subtitle;
+										else
+											$subject = 'Re: ' . $subtitle;
+									}
+								}
+							}
+						}
+
+						$headers .= 'MIME-Version: 1.0' . "\n";
+						$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
+						$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
+						$html    = prepare_body($it);
+						$message = '<html><body>' . $html . '</body></html>';
+						logger('notifier: email delivery to ' . $addr);
+						mail($addr, $subject, $message, $headers);
+					}
+					break;
 				case 'dspr':
 				case 'feed':
 				case 'face':
diff --git a/include/poller.php b/include/poller.php
index b8bd0b708..4e1e30ad5 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -292,31 +292,63 @@ function poller_run($argv, $argc){
 					$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
 						intval($importer_uid)
 					);
-					$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+					$mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
 						intval($importer_uid)
 					);
-					if(count($x) && count($r)) {
-					    $mailbox = construct_mailbox_name($r[0]);
+					if(count($x) && count($mailconf)) {
+					    $mailbox = construct_mailbox_name($mailconf[0]);
 						$password = '';
-						openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']);
-						$mbox = email_connect($mailbox,$r[0]['user'],$password);
+						openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
+						$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
 						unset($password);
+						if($mbox) {
+							q("UPDATE `mailacct` SET `last_check` = '%d' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+								dbesc(datetime_convert()),
+								intval($mailconf[0]['id']),
+								intval($importer_uid)
+							);
+						}
 					}
 				}
 				if($mbox) {
+
 					$msgs = email_poll($mbox,$contact['addr']);
+
 					if(count($msgs)) {
 						foreach($msgs as $msg_uid) {
 							$datarray = array();
 							$meta = email_msg_meta($mbox,$msg_uid);
+							$headers = email_msg_headers($mbox,$msg_uid);
+
+							// look for a 'references' header and try and match with a parent item we have locally.
+
+							$raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
 							$datarray['uri'] = trim($meta->message_id,'<>');
-//FIXME
-							$datarray['parent-uri'] = $datarray['uri'];
+
+							if($raw_refs) {
+								$refs_arr = explode(' ', $raw_refs);
+								if(count($refs_arr)) {
+									for($x = 0; $x < count($refs_arr); $x ++)
+										$refs_arr[$x] = "'" . str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x])) . "'";
+								}
+								$qstr = implode(',',$refs_arr);
+								$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1",
+									intval($importer_uid)
+								);
+								if(count($r))
+									$datarray['parent-uri'] = $r[0]['uri'];
+							}
+
+
+							if(! x($datarray,'parent-uri'))
+								$datarray['parent-uri'] = $datarray['uri'];
+
 							// Have we seen it before?
 							$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
 								intval($importer_uid),
 								dbesc($datarray['uri'])
 							);
+
 							if(count($r)) {
 								if($meta->deleted && ! $r[0]['deleted']) {
 									q("UPDATE `item` SET `deleted` = `, `changed` = '%s' WHERE `id` = %d LIMIT 1",
@@ -335,12 +367,20 @@ function poller_run($argv, $argc){
 							$datarray['body'] = escape_tags($r['body']);
 							$datarray['uid'] = $importer_uid;
 							$datarray['contact-id'] = $contact['id'];
-							$datarray['private'] = 1;
+							if($datarray['parent-uri'] === $datarray['uri'])
+								$datarray['private'] = 1;
 							$datarray['author-name'] = $contact['name'];
 							$datarray['author-link'] = 'mailbox';
 							$datarray['author-avatar'] = $contact['photo'];
 						
-							item_store($datarray);
+							$stored_item = item_store($datarray);
+							q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d",
+								dbesc($datarray['parent-uri']),
+								intval($importer_uid)
+							);
+							q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
+								intval($stored_item)
+							);
 						}
 					}
 				}
-- 
cgit v1.2.3


From b81eefbffbf747b6ec3a65ca0ef771b1e88aa00c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 17 Apr 2011 23:38:12 -0700
Subject: sv language had unquoted quotes in strings

---
 include/poller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index 4e1e30ad5..82ac89cf5 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -302,7 +302,7 @@ function poller_run($argv, $argc){
 						$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
 						unset($password);
 						if($mbox) {
-							q("UPDATE `mailacct` SET `last_check` = '%d' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+							q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
 								dbesc(datetime_convert()),
 								intval($mailconf[0]['id']),
 								intval($importer_uid)
-- 
cgit v1.2.3


From 4f952979d586d21fbfa4a6cb86726adb754bd5f7 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Apr 2011 00:55:54 -0700
Subject: show email contacts in acl selector

---
 include/acl_selectors.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index fa700818f..d1303d933 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -57,9 +57,12 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		$sql_extra .= sprintf(" AND `rel` = %d ", intval(REL_BUD));
 	}
 
-	if($privmail || $privatenet) {
+	if($privmail) {
 		$sql_extra .= " AND `network` IN ( 'dfrn' ) ";
-	}	
+	}
+	elseif($privatenet) {	
+		$sql_extra .= " AND `network` IN ( 'dfrn', 'mail' ) ";
+	}
 
 	if($privmail)
 		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\" >\r\n";
-- 
cgit v1.2.3


From 60fbe0b39b02e9d1ce4521883c86b4783f4b9d4e Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Mon, 18 Apr 2011 17:37:02 +0200
Subject: translate verb items at display time

---
 include/conversation.php | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 4c858d818..a1ce19a7a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,5 +1,34 @@
 <?php
 
+/**
+ * Render actions localized
+ */
+function localize_item(&$item){
+	
+	if ($item['verb']=="http://activitystrea.ms/schema/1.0/like" ||
+		$item['verb']=="http://activitystrea.ms/schema/1.0/dislike"){
+
+		
+		$author	 = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+		#$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
+		#$objlink = preg_grep("|<link.*href=&quot;, $input)$item['object']
+		// $item['verb']=="http://activitystrea.ms/schema/1.0/like"
+		
+		switch($item['verb']){
+			case "http://activitystrea.ms/schema/1.0/like":
+				$bodyverb = t('%1$s likes %2$s\'s %3$s');
+				break;
+			case "http://activitystrea.ms/schema/1.0/dislike":
+				$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
+				break;
+		}
+		$item['body'] = sprintf($bodyverb, $author, "tizio", "coso");
+			
+	}
+
+
+}
+
 /**
  * "Render" a conversation or list of items for HTML display.
  * There are two major forms of display:
@@ -10,7 +39,6 @@
  * that are based on unique features of the calling module.
  *
  */
-
 function conversation(&$a, $items, $mode, $update) {
 
 	require_once('bbcode.php');
@@ -118,7 +146,8 @@ function conversation(&$a, $items, $mode, $update) {
 
 	            $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete')));
 
-
+				// 
+				localize_item($item);
 
 				$drop = replace_macros($droptpl,array('$id' => $item['id']));
 				$lock = '<div class="wall-item-lock"></div>';
@@ -384,6 +413,9 @@ function conversation(&$a, $items, $mode, $update) {
 			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
 				$indent .= ' shiny'; 
 
+			// 
+			localize_item($item);
+
 			// Build the HTML
 
 			$tmp_item = replace_macros($template,array(
-- 
cgit v1.2.3


From 1d8bd89fece18e861760eeed40ded146e01a0abb Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 18 Apr 2011 20:38:48 +0200
Subject: translate "like"/"dislike"/"friends with" messages at print time

---
 include/conversation.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index a1ce19a7a..3ec0706e9 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -8,12 +8,18 @@ function localize_item(&$item){
 	if ($item['verb']=="http://activitystrea.ms/schema/1.0/like" ||
 		$item['verb']=="http://activitystrea.ms/schema/1.0/dislike"){
 
+		$r = q("SELECT * from `item`,`contact` WHERE 
+				`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
+				 dbesc($item['parent-uri']));
+		if(count($r)==0) return;
+		$obj=$r[0];
 		
 		$author	 = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-		#$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
-		#$objlink = preg_grep("|<link.*href=&quot;, $input)$item['object']
-		// $item['verb']=="http://activitystrea.ms/schema/1.0/like"
+		$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
 		
+		$post_type = (($obj['resource-id']) ? t('photo') : t('status'));		
+		$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
+                
 		switch($item['verb']){
 			case "http://activitystrea.ms/schema/1.0/like":
 				$bodyverb = t('%1$s likes %2$s\'s %3$s');
@@ -22,11 +28,21 @@ function localize_item(&$item){
 				$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 				break;
 		}
-		$item['body'] = sprintf($bodyverb, $author, "tizio", "coso");
+		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
 			
 	}
+	if ($item['verb']=='http://activitystrea.ms/schema/1.0/make-friend'){
 
+		$b = str_replace("[/url]","[/url]\n", $item['body']);
+		preg_match_all("|(\[url.*\[/url\])|", $b, $match);
 
+		$item['body'] = $match[0][0]." "
+						.t('is now friends with')
+						." ".$match[0][1]."\n\n\n"
+						.$match[0][2];
+                
+	}
+        
 }
 
 /**
-- 
cgit v1.2.3


From 1e967eddb75ebed6712e33735971d53b009442dd Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Apr 2011 15:16:51 -0700
Subject: multi-user, do not cache open mbox

---
 include/poller.php | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index 82ac89cf5..4373dc081 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -16,7 +16,6 @@ function poller_run($argv, $argc){
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
 
-	$mbox = null;
 
 	require_once('session.php');
 	require_once('datetime.php');
@@ -288,26 +287,25 @@ function poller_run($argv, $argc){
 				$xml = fetch_url($contact['poll']);
 			}
 			elseif($contact['network'] === NETWORK_MAIL) {
-				if(! $mbox) {
-					$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
-						intval($importer_uid)
-					);
-					$mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
-						intval($importer_uid)
-					);
-					if(count($x) && count($mailconf)) {
-					    $mailbox = construct_mailbox_name($mailconf[0]);
-						$password = '';
-						openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
-						$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
-						unset($password);
-						if($mbox) {
-							q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
-								dbesc(datetime_convert()),
-								intval($mailconf[0]['id']),
-								intval($importer_uid)
-							);
-						}
+				$mbox = null;
+				$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
+					intval($importer_uid)
+				);
+				$mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
+					intval($importer_uid)
+				);
+				if(count($x) && count($mailconf)) {
+				    $mailbox = construct_mailbox_name($mailconf[0]);
+					$password = '';
+					openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
+					$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
+					unset($password);
+					if($mbox) {
+						q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
+							dbesc(datetime_convert()),
+							intval($mailconf[0]['id']),
+							intval($importer_uid)
+						);
 					}
 				}
 				if($mbox) {
@@ -383,6 +381,8 @@ function poller_run($argv, $argc){
 							);
 						}
 					}
+
+					imap_close($mbox);
 				}
 			}
 			elseif($contact['network'] === NETWORK_FACEBOOK) {
@@ -435,8 +435,6 @@ function poller_run($argv, $argc){
 		}
 	}
 
-	if($mbox && function_exists('imap_close'))
-		imap_close($mbox);
 		
 	return;
 }
-- 
cgit v1.2.3


From 4b6a24ec3fe43a9b54eacd02684d07eb4a853a2c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Apr 2011 16:00:02 -0700
Subject: don't try to connect to port 0

---
 include/email.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/email.php b/include/email.php
index 91aafd45e..db10af2ee 100644
--- a/include/email.php
+++ b/include/email.php
@@ -20,7 +20,7 @@ function email_poll($mbox,$email_addr) {
 
 
 function construct_mailbox_name($mailacct) {
-	$ret = '{' . $mailacct['server'] . (($mailacct['port']) ? ':' . $mailacct['port'] : '');
+	$ret = '{' . $mailacct['server'] . ((intval($mailacct['port'])) ? ':' . $mailacct['port'] : '');
 	$ret .= (($mailacct['ssltype']) ?  '/' . $mailacct['ssltype'] . '/novalidate-cert' : '');
 	$ret .= '}' . $mailacct['mailbox'];
 	return $ret;
-- 
cgit v1.2.3


From 2afd4c9d5a5b0543d7de3fd8b5428fbb91a3898b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Apr 2011 19:08:50 -0700
Subject: "wait" cursor when submitting comments bug #45

---
 include/main.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index 1c695265d..a251d8e3a 100644
--- a/include/main.js
+++ b/include/main.js
@@ -27,6 +27,7 @@
 	var liking = 0;
 	var in_progress = false;
 	var langSelect = false;
+	var commentBusy = false;
 
 	$(document).ready(function() {
 		$.ajaxSetup({cache: false});
@@ -109,7 +110,6 @@
 			}) ;
 		}
 		timer = setTimeout(NavUpdate,30000);
-
 	}
 
 	function liveUpdate() {
@@ -153,8 +153,11 @@
 				prev = ident; 
 			});
 			$('.like-rotator').hide();
+			if(commentBusy) {
+				commentBusy = false;
+				$('body').css('cursor', 'auto');
+			}
 		});
-
 	}
 
 	function imgbright(node) {
@@ -232,6 +235,8 @@
 	}
 
 	function post_comment(id) {
+		commentBusy = true;
+		$('body').css('cursor', 'wait');
 		$.post(  
              "item",  
              $("#comment-edit-form-" + id).serialize(),
@@ -248,7 +253,6 @@
 				if(data.reload) {
 					window.location.href=data.reload;
 				}
-					
 			},
 			"json"  
          );  
-- 
cgit v1.2.3


From a0179235d2d4672ba9dc79b33505555766b3228a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 18 Apr 2011 20:20:04 -0700
Subject: provide a way to disable mailbox integration

---
 include/notifier.php | 23 ++++++++++++++---------
 include/poller.php   |  5 +++++
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/notifier.php b/include/notifier.php
index 80f0e67c7..4cc6d7a99 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -270,15 +270,20 @@ function notifier_run($argv, $argc){
 
 	// If this is a public message and pubmail is set on the parent, include all your email contacts
 
-	if((! strlen($parent_item['allow_cid'])) && (! strlen($parent_item['allow_gid'])) && (! strlen($parent_item['deny_cid'])) && (! strlen($parent_item['deny_gid'])) 
-		&& (intval($parent_item['pubmail']))) {
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
-			intval($uid),
-			dbesc(NETWORK_MAIL)
-		);
-		if(count($r)) {
-			foreach($r as $rr)
-				$recipients[] = $rr['id'];
+	$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+
+	if(! $mail_disabled) {
+		if((! strlen($parent_item['allow_cid'])) && (! strlen($parent_item['allow_gid'])) 
+			&& (! strlen($parent_item['deny_cid'])) && (! strlen($parent_item['deny_gid'])) 
+			&& (intval($parent_item['pubmail']))) {
+			$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
+				intval($uid),
+				dbesc(NETWORK_MAIL)
+			);
+			if(count($r)) {
+				foreach($r as $rr)
+					$recipients[] = $rr['id'];
+			}
 		}
 	}
 
diff --git a/include/poller.php b/include/poller.php
index 4373dc081..b5639e034 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -287,6 +287,11 @@ function poller_run($argv, $argc){
 				$xml = fetch_url($contact['poll']);
 			}
 			elseif($contact['network'] === NETWORK_MAIL) {
+
+				$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+				if($mail_disabled)
+					continue;
+
 				$mbox = null;
 				$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
 					intval($importer_uid)
-- 
cgit v1.2.3


From d874a55178cce01195b23296bbae6365807dc300 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 19 Apr 2011 20:50:02 -0700
Subject: per contact network page (link in photo menu)

---
 include/conversation.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 3ec0706e9..5cdcfca8c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -533,6 +533,7 @@ function item_photo_menu($item){
 
 	$status_link="";
 	$photo_link="";
+	$posts_link="";
 	$profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
 	$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
@@ -564,6 +565,7 @@ function item_photo_menu($item){
 
 		if((isset($cid)) && (! $item['self'])) {
 			$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
+			$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
 			if($item['network'] === 'dfrn') {
 				$status_link = $redir . "?url=status";
 				$profile_link = $redir . "?url=profile";
@@ -577,7 +579,8 @@ function item_photo_menu($item){
 	$menu = Array(
 		t("View status") => $status_link,
 		t("View profile") => $profile_link,
-		t("View photos") => $photos_link,		
+		t("View photos") => $photos_link,
+		t("View recent") => $posts_link,		
 		t("Edit contact") => $contact_url,
 		t("Send PM") => $pm_url,
 	);
-- 
cgit v1.2.3


From afdbbaf27d4f841fce977186f125db452292da7c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 19 Apr 2011 20:55:20 -0700
Subject: photos_link not photo_link

---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 5cdcfca8c..0919419ec 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -532,7 +532,7 @@ function item_photo_menu($item){
 	$pm_url="";
 
 	$status_link="";
-	$photo_link="";
+	$photos_link="";
 	$posts_link="";
 	$profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
 	$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-- 
cgit v1.2.3


From afe4cc8bfa01017f3dfc1f40892b78f125c596f9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 20 Apr 2011 04:50:12 -0700
Subject: pull request #91 fabrixxm (manual merge)

---
 include/conversation.php | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 0919419ec..a3b15146b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -33,14 +33,33 @@ function localize_item(&$item){
 	}
 	if ($item['verb']=='http://activitystrea.ms/schema/1.0/make-friend'){
 
-		$b = str_replace("[/url]","[/url]\n", $item['body']);
-		preg_match_all("|(\[url.*\[/url\])|", $b, $match);
+		if ($item['object-type']=="" || $item['object-type']!='http://activitystrea.ms/schema/1.0/person') return;
+
+		$Aname = $item['author-name'];
+		$Alink = $item['author-link'];
+		
+		$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+		
+		$obj = parse_xml_string($xmlhead.$item['object']);
+		$links = parse_xml_string($xmlhead."<links>".unxmlify($obj->link)."</links>");
+		
+		$Bname = $obj->title;
+		$Blink = ""; $Bphoto = "";
+		foreach ($links->link as $l){
+			$atts = $l->attributes();
+			switch($atts['rel']){
+				case "alternate": $Blink = $atts['href'];
+				case "photo": $Bphoto = $atts['href'];
+			}
+			
+		}
+		
+		$A = '[url=' . $Alink . ']' . $Aname . '[/url]';
+		$B = '[url=' . $Blink . ']' . $Bname . '[/url]';
+		if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]';
+
+		$item['body'] = sprintf(t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
-		$item['body'] = $match[0][0]." "
-						.t('is now friends with')
-						." ".$match[0][1]."\n\n\n"
-						.$match[0][2];
-                
 	}
         
 }
@@ -579,8 +598,8 @@ function item_photo_menu($item){
 	$menu = Array(
 		t("View status") => $status_link,
 		t("View profile") => $profile_link,
-		t("View photos") => $photos_link,
-		t("View recent") => $posts_link,		
+		t("View photos") => $photos_link,		
+		t("View recent") => $posts_link, 
 		t("Edit contact") => $contact_url,
 		t("Send PM") => $pm_url,
 	);
-- 
cgit v1.2.3


From 0af6014c940eba5c5d9399e922794da373738337 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 20 Apr 2011 05:00:58 -0700
Subject: keep space before t() for legacy string puller

---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index a3b15146b..cd2406859 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -58,7 +58,7 @@ function localize_item(&$item){
 		$B = '[url=' . $Blink . ']' . $Bname . '[/url]';
 		if ($Bphoto!="") $Bphoto = '[url=' . $Blink . '][img]' . $Bphoto . '[/img][/url]';
 
-		$item['body'] = sprintf(t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
+		$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
 	}
         
-- 
cgit v1.2.3


From e302741e49adc73150bcd3027de1fdb157600a9b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 20 Apr 2011 05:48:12 -0700
Subject: merge status editor instances

---
 include/conversation.php | 85 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index cd2406859..1c56fa1bf 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -672,3 +672,88 @@ function format_like($cnt,$arr,$type,$id) {
 	}
 	return $o;
 }}
+
+
+function status_editor($a,$x) {
+
+	$o = '';
+		
+	$geotag = (($x['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+
+		$tpl = load_view_file('view/jot-header.tpl');
+	
+		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$geotag' => $geotag,
+			'$nickname' => $x['nickname'],
+			'$linkurl' => t('Please enter a link URL:'),
+			'$utubeurl' => t('Please enter a YouTube link:'),
+			'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
+			'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
+			'$whereareu' => t('Where are you right now?'),
+			'$title' => t('Enter a title for this item') 
+		));
+
+
+		$tpl = load_view_file("view/jot.tpl");
+		
+		$jotplugins = '';
+		$jotnets = '';
+
+		$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+
+		$mail_enabled = false;
+		$pubmail_enabled = false;
+
+		if(($x['is_owner']) && (! $mail_disabled)) {
+			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+				intval(local_user())
+			);
+			if(count($r)) {
+				$mail_enabled = true;
+				if(intval($r[0]['pubmail']))
+					$pubmail_enabled = true;
+			}
+		}
+
+		if($mail_enabled) {
+	       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
+			$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+           	. t("Post to Email") . '</div>';
+		}
+
+		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,
+			'$action' => 'item',
+			'$share' => t('Share'),
+			'$upload' => t('Upload photo'),
+			'$weblink' => t('Insert web link'),
+			'$youtube' => t('Insert YouTube video'),
+			'$video' => t('Insert Vorbis [.ogg] video'),
+			'$audio' => t('Insert Vorbis [.ogg] audio'),
+			'$setloc' => t('Set your location'),
+			'$noloc' => t('Clear browser location'),
+			'$title' => t('Set title'),
+			'$wait' => t('Please wait'),
+			'$permset' => t('Permission settings'),
+			'$content' => '',
+			'$post_id' => '',
+			'$baseurl' => $a->get_baseurl(),
+			'$defloc' => $x['default-location'],
+			'$visitor' => $x['visitor'],
+			'$emailcc' => t('CC: email addresses'),
+			'$jotnets' => $jotnets,
+			'$emtitle' => t('Example: bob@example.com, mary@example.com'),
+			'$lockstate' => $x['lockstate'],
+			'$acl' => $x['acl'],
+			'$bang' => $x['bang'],
+			'$profile_uid' => $x['profile_uid'],
+		));
+
+	return $o;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From b505e76393c28110fa1b6c208d248f0ee59f90cf Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Tue, 15 Feb 2011 12:24:21 +0100
Subject: First attemp of api

---
 include/api.php | 389 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 389 insertions(+)
 create mode 100644 include/api.php

(limited to 'include')

diff --git a/include/api.php b/include/api.php
new file mode 100644
index 000000000..dadd33d45
--- /dev/null
+++ b/include/api.php
@@ -0,0 +1,389 @@
+<?php
+	require_once("bbcode.php");
+	require_once("datetime.php");
+	
+	/* 
+	 * Twitter-Like API
+	 *  
+	 */
+
+	$API = Array();
+	 
+	class XMLSerializer {
+	
+	    // functions adopted from http://www.sean-barton.co.uk/2009/03/turning-an-array-or-object-into-xml-using-php/
+	
+	    public static function generateValidXmlFromObj(stdClass $obj, $node_block='nodes', $node_name='node') {
+	        $arr = get_object_vars($obj);
+	        return self::generateValidXmlFromArray($arr, $node_block, $node_name);
+	    }
+	
+	    public static function generateValidXmlFromArray($array, $node_block='nodes', $node_name='node') {
+			$attrs="";
+			if ($array instanceof Container){
+				$node_block=$array->name;
+				foreach($array->attrs as $n=>$v){
+					$attrs .= " $n='$v'";
+				}
+			}
+	
+	
+	        $xml = '<?xml version="1.0" encoding="UTF-8" ?>';
+	
+	        $xml .= '<' . $node_block . $attrs. '>';
+	        $xml .= self::generateXmlFromArray($array, $node_name);
+	        $xml .= '</' . $node_block . '>';
+	
+	        return $xml;
+	    }
+	
+	    private static function generateXmlFromArray($array, $node_name) {
+	        $xml = '';
+				
+	        if (is_array($array) || is_object($array)) {
+	            foreach ($array as $key=>$value) {
+	            	$attrs="";
+					if ($value instanceof Container){
+						$node_name=$value->name;
+						foreach($value->attrs as $n=>$v){
+							$attrs .= " $n='$v'";
+						}
+					}		            	
+	                if (is_numeric($key)) {
+	                    $key = $node_name;
+	                }
+	
+	
+	                $xml .= '<' . $key . $attrs.'>' . self::generateXmlFromArray($value, $node_name) . '</' . $key . '>';
+	            }
+	        } else {
+	        	if (is_bool($array)) $array = ($array===true?"true":"false");
+	            $xml = htmlspecialchars($array, ENT_QUOTES);
+	        }
+	
+	        return $xml;
+	    }
+	
+	}
+	
+	// this is used when json and xml are not translatable to arrays
+	// like [{text:'text'},{text:'text2'}]
+	//	and	<statuses type='array'><status><text>text</text></status><status><text>text2</text></status></statuses>
+	class Container extends ArrayObject{
+		public $name;
+		public $attrs=Array();
+		function __construct($name){
+			$this->name = $name;
+			$args = func_get_args();
+			unset($args[0]);
+			call_user_func_array(array(parent,'__construct'), $args);
+		}
+	}
+	
+	function api_date($str){
+		//Wed May 23 06:01:13 +0000 2007
+		return datetime_convert('UTC', 'UTC', $str, "D M d h:i:s +0000 Y" );
+	}
+	 
+	
+	function api_register_func($path, $func, $auth=false){
+		global $API;
+		$API[$path] = array('func'=>$func,
+							'auth'=>auth);
+	}
+	
+	/**
+	 * Simple HTTP Login
+	 */
+	function api_login(&$a){
+		if (!isset($_SERVER['PHP_AUTH_USER'])) {
+		    header('WWW-Authenticate: Basic realm="Friendika"');
+		    header('HTTP/1.0 401 Unauthorized');
+		    die('This api require login');
+		}
+		
+		$user = $_SERVER['PHP_AUTH_USER'];
+		$encrypted = hash('whirlpool',trim($_SERVER['PHP_AUTH_PW']));
+    		
+		
+			// da auth.php
+		
+		// process normal login request
+
+		$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
+			AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
+			dbesc(trim($user)),
+			dbesc(trim($user)),
+			dbesc($encrypted)
+		);
+		if(count($r))
+			$record = $r[0];
+		$_SESSION['uid'] = $record['uid'];
+		$_SESSION['theme'] = $record['theme'];
+		$_SESSION['authenticated'] = 1;
+		$_SESSION['page_flags'] = $record['page-flags'];
+		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
+		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
+
+		notice( t("Welcome back ") . $record['username'] . EOL);
+		$a->user = $record;
+
+		if(strlen($a->user['timezone'])) {
+			date_default_timezone_set($a->user['timezone']);
+			$a->timezone = $a->user['timezone'];
+		}
+
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
+			intval($_SESSION['uid']));
+		if(count($r)) {
+			$a->contact = $r[0];
+			$a->cid = $r[0]['id'];
+			$_SESSION['cid'] = $a->cid;
+		}
+		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
+			dbesc(datetime_convert()),
+			intval($_SESSION['uid'])
+		);
+
+		call_hooks('logged_in', $a->user);
+
+		header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
+	}
+	
+	function api_call(&$a){
+		GLOBAL $API;
+		foreach ($API as $p=>$info){
+			if (strpos($a->query_string, $p)===0){
+				if ($info['auth']===true) api_login($a);
+				
+				$r = call_user_func($info['func'], $a);
+				if ($r===false) return;
+				
+				if ($r instanceof Container){
+					$name=NULL; $values=$r;
+				} else {						
+					foreach($r as $name=>$values){}
+				}
+				
+				// return xml
+				if (strpos($a->query_string, ".xml")>0){
+					return XMLSerializer::generateValidXmlFromArray($values, $name);
+				}
+				// return json
+				if (strpos($a->query_string, ".json")>0){
+					if ($values instanceof Container) $values= iterator_to_array($values);
+					return json_encode($values);
+				}
+				//echo "<pre>"; var_dump($r); die();
+			}
+		}
+		return false;
+	}
+	
+		
+	/**
+	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
+	 * The author's most recent status will be returned inline.
+	 * http://developer.twitter.com/doc/get/users/show
+	 */
+	function api_users_show(&$a){
+		
+		$user = null;
+		$extra_query = "";
+		if(x($_GET, 'user_id')) {
+			$user = intval($_GET['user_id']);	
+			$extra_query = "AND `user`.`uid` = %d ";
+		}
+		if(x($_GET, 'screen_name')) {
+			$user = dbesc($_GET['screen_name']);	
+			$extra_query = "AND `user`.`nickname` = '%s' ";
+		}
+		
+		if ($user===null){
+			list($user, $null) = explode(".",$a->argv[3]);
+			if(is_numeric($user)){
+				$user = intval($user);
+				$extra_query = "AND `user`.`uid` = %d ";
+			} else {
+				$user = dbesc($user);
+				$extra_query = "AND `user`.`nickname` = '%s' ";
+			}
+		}
+		
+		if ($user==='') {
+			return False;
+		}
+		
+
+		// user info		
+		$uinfo = q("SELECT * FROM `user`, `contact`
+				WHERE `user`.`uid`=`contact`.`uid` AND `contact`.`self`=1
+				$extra_query",
+				$user
+		);
+		if (count($uinfo)==0) {
+			return False;
+		}
+		
+		// count public wall messages
+		$r = q("SELECT COUNT(`id`) as `count` FROM `item`
+				WHERE  `uid` = %d
+				AND `type`='wall' 
+				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+				intval($uinfo[0]['uid'])
+		);
+		$countitms = $r[0]['count'];
+		
+		// count friends
+		$r = q("SELECT COUNT(`id`) as `count` FROM `contact`
+				WHERE  `uid` = %d
+				AND `self`=0 AND `blocked`=0", 
+				intval($uinfo[0]['uid'])
+		);
+		$countfriends = $r[0]['count'];
+		
+		// get last public wall message
+		$lastwall = q("SELECT * FROM `item`
+				WHERE  `uid` = %d
+				AND `type`='wall' 
+				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
+				ORDER BY `created` DESC LIMIT 1",
+				intval($uinfo[0]['uid'])
+		);
+	
+		//echo "<pre>"; var_dump($lastwall); die();
+		
+		$ret = Array(
+			'user' => Array(
+				'id' => $uinfo[0]['uid'],
+				'name' => $uinfo[0]['username'],
+				'screen_name' => $uinfo[0]['nickname'],
+				'location' => $uinfo[0]['default-location'],
+				'profile_image_url' => $uinfo[0]['photo'],
+				'url' => $uinfo[0]['url'],
+				'protected' => false,	#
+				'friends_count' => $countfriends,
+				'created_at' => api_date($uinfo[0]['created']),
+				'utc_offset' => 0, #XXX: fix me
+				'time_zone' => $uinfo[0]['timezone'],
+				'geo_enabled' => false,
+				'statuses_count' => $countitms, #XXX: fix me 
+  				'lang' => 'en', #XXX: fix me
+  				'status' => array(
+  					'created_at' => api_date($lastwall[0]['created']),
+  					'id' => $lastwall[0]['id'],
+  					'text' => bbcode($lastwall[0]['body']),
+  					'source' => 'web',
+  					'truncated' => false,
+  					'in_reply_to_status_id' => '',
+  					'in_reply_to_user_id' => '',
+  					'favorited' => false,
+  					'in_reply_to_screen_name' => '',
+  					'geo' => '',
+    				'coordinates' => $lastwall[0]['coord'],
+    				'place' => $lastwall[0]['location'],
+    				'contributors' => ''					
+  				)
+				
+			)
+		);
+		
+		return $ret;
+		
+	}
+	api_register_func('api/users/show','api_users_show');
+	
+	/**
+	 * 
+	 * http://developer.twitter.com/doc/get/statuses/home_timeline
+	 */
+	function api_statuses_home_timeline(&$a){
+		if (local_user()===false) return false;
+		
+		// count public wall messages
+		$r = q("SELECT COUNT(`id`) as `count` FROM `item`
+				WHERE  `uid` = %d
+				AND `type`='wall' 
+				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
+				intval($uinfo[0]['uid'])
+		);
+		$countitms = $r[0]['count'];
+		
+		// get last newtork messages
+		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
+		
+		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`, `user`
+			WHERE `item`.`uid` = %d AND `user`.`uid` = `item`.`uid` 
+			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			$sql_extra
+			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+			intval($_SESSION['uid']),
+			intval($a->pager['start']),
+			intval($a->pager['itemspage'])
+		);
+		$ret = new Container("statuses");
+		$ret->attrs['type']='array';
+
+		#foreach($r as $item) {
+		{
+			$item = $r[0];
+			$status = new Container('status', array(
+				'created_at'=> api_date($item['created']),
+				'id'		=> $item['id'],
+				'text'		=> bbcode($item['body']),
+				'source'	=> 'web', 	#XXX: Fix me!
+				'truncated' => False,
+				'in_reply_to_status_id' => '',
+				'in_reply_to_user_id' => '',
+				'favorited' => false,
+				'in_reply_to_screen_name' => '',
+				'geo' => '',
+				'coordinates' => $item['coord'],
+				'place' => $item['location'],
+				'contributors' => '',
+				'annotations'  => '',
+				'entities'  => '',
+				'user' => Array(
+					'id' => $item['uid'],
+					'name' => $item['username'],
+					'screen_name' => $item['nickname'],
+					'location' => $item['default-location'],
+					'description' => '',
+					'profile_image_url' => $item['photo'],
+					'url' => $item['url'],
+					'protected' => false,	#
+					'followers_count' => $countfriends, #XXX: fix me
+					'friends_count' => $countfriends,
+					'created_at' => api_date($item['created']),
+					'utc_offset' => 0, #XXX: fix me
+					'time_zone' => $item['timezone'],
+					'geo_enabled' => false,
+					'statuses_count' => $countitms, #XXX: fix me 
+	  				'lang' => 'en', #XXX: fix me
+	  				'favourites_count' => 0,
+	  				'contributors_enabled' => false,
+	  				'follow_request_sent' => false,
+	  				'profile_background_color' => 'cfe8f6',
+      				'profile_text_color' => '000000',
+      				'profile_link_color' => 'FF8500',
+ 					'profile_sidebar_fill_color' =>'AD0066',
+					'profile_sidebar_border_color' => 'AD0066',
+	  				'profile_background_image_url' => '',
+	  				'profile_background_tile' => false,
+	  				'profile_use_background_image' => false,
+	  				'notifications' => false,	  				
+				)					
+			
+			));
+			$ret[]=$status;
+		};
+		
+		return $ret;
+	}
+	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
-- 
cgit v1.2.3


From 1fb097951d3769b37a870ea498998b662f261e3f Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Wed, 16 Feb 2011 08:56:47 +0100
Subject: work on api.

---
 include/api.php | 246 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 157 insertions(+), 89 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index dadd33d45..e8a49a028 100644
--- a/include/api.php
+++ b/include/api.php
@@ -89,7 +89,7 @@
 	function api_register_func($path, $func, $auth=false){
 		global $API;
 		$API[$path] = array('func'=>$func,
-							'auth'=>auth);
+							'auth'=>$auth);
 	}
 	
 	/**
@@ -167,10 +167,12 @@
 				
 				// return xml
 				if (strpos($a->query_string, ".xml")>0){
+					header ("Content-Type: text/xml");  
 					return XMLSerializer::generateValidXmlFromArray($values, $name);
 				}
 				// return json
 				if (strpos($a->query_string, ".json")>0){
+					header ("Content-Type: application/json");  
 					if ($values instanceof Container) $values= iterator_to_array($values);
 					return json_encode($values);
 				}
@@ -179,15 +181,10 @@
 		}
 		return false;
 	}
-	
-		
 	/**
-	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
-	 * The author's most recent status will be returned inline.
-	 * http://developer.twitter.com/doc/get/users/show
+	 * Returns user info array
 	 */
-	function api_users_show(&$a){
-		
+	function api_get_user(&$a){
 		$user = null;
 		$extra_query = "";
 		if(x($_GET, 'user_id')) {
@@ -211,7 +208,13 @@
 		}
 		
 		if ($user==='') {
-			return False;
+			if (local_user()===false) {
+				api_login($a); return False;
+			} else {
+				$user = $_SESSION['uid'];
+				$extra_query = "AND `user`.`uid` = %d ";
+			}
+			
 		}
 		
 
@@ -241,6 +244,70 @@
 				intval($uinfo[0]['uid'])
 		);
 		$countfriends = $r[0]['count'];
+				
+
+		$ret = Array(
+			'id' => $uinfo[0]['uid'],
+			'name' => $uinfo[0]['username'],
+			'screen_name' => $uinfo[0]['nickname'],
+			'location' => $uinfo[0]['default-location'],
+			'profile_image_url' => $uinfo[0]['photo'],
+			'url' => $uinfo[0]['url'],
+			'protected' => false,	#
+			'friends_count' => $countfriends,
+			'created_at' => api_date($uinfo[0]['created']),
+			'utc_offset' => 0, #XXX: fix me
+			'time_zone' => $uinfo[0]['timezone'],
+			'geo_enabled' => false,
+			'statuses_count' => $countitms, #XXX: fix me 
+			'lang' => 'en', #XXX: fix me
+			'description' => '',
+			'followers_count' => $countfriends, #XXX: fix me
+			'lang' => 'en', #XXX: fix me
+			'favourites_count' => 0,
+			'contributors_enabled' => false,
+			'follow_request_sent' => false,
+			'profile_background_color' => 'cfe8f6',
+			'profile_text_color' => '000000',
+			'profile_link_color' => 'FF8500',
+			'profile_sidebar_fill_color' =>'AD0066',
+			'profile_sidebar_border_color' => 'AD0066',
+			'profile_background_image_url' => '',
+			'profile_background_tile' => false,
+			'profile_use_background_image' => false,
+			'notifications' => false,	 
+		);
+		
+		return $ret;
+		
+	}
+	
+	/**
+	 ** TWITTER API
+	 */
+	
+	/**
+	 * Returns an HTTP 200 OK response code and a representation of the requesting user if authentication was successful; 
+	 * returns a 401 status code and an error message if not. 
+	 * http://developer.twitter.com/doc/get/account/verify_credentials
+	 */
+	function api_account_verify_credentials(&$a){
+		if (local_user()===false) return false;
+		$user_info = api_get_user($a);
+		$ret = new Container("user", $user_info);
+		return $ret;
+	}
+	api_register_func('api/account/verify_credentials','api_account_verify_credentials', true);
+	 	
+	
+		
+	/**
+	 * Returns extended information of a given user, specified by ID or screen name as per the required id parameter.
+	 * The author's most recent status will be returned inline.
+	 * http://developer.twitter.com/doc/get/users/show
+	 */
+	function api_users_show(&$a){
+		$user_info = api_get_user($a);
 		
 		// get last public wall message
 		$lastwall = q("SELECT * FROM `item`
@@ -248,45 +315,28 @@
 				AND `type`='wall' 
 				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
 				ORDER BY `created` DESC LIMIT 1",
-				intval($uinfo[0]['uid'])
+				intval($user_info['uid'])
 		);
 	
 		//echo "<pre>"; var_dump($lastwall); die();
 		
-		$ret = Array(
-			'user' => Array(
-				'id' => $uinfo[0]['uid'],
-				'name' => $uinfo[0]['username'],
-				'screen_name' => $uinfo[0]['nickname'],
-				'location' => $uinfo[0]['default-location'],
-				'profile_image_url' => $uinfo[0]['photo'],
-				'url' => $uinfo[0]['url'],
-				'protected' => false,	#
-				'friends_count' => $countfriends,
-				'created_at' => api_date($uinfo[0]['created']),
-				'utc_offset' => 0, #XXX: fix me
-				'time_zone' => $uinfo[0]['timezone'],
-				'geo_enabled' => false,
-				'statuses_count' => $countitms, #XXX: fix me 
-  				'lang' => 'en', #XXX: fix me
-  				'status' => array(
-  					'created_at' => api_date($lastwall[0]['created']),
-  					'id' => $lastwall[0]['id'],
-  					'text' => bbcode($lastwall[0]['body']),
-  					'source' => 'web',
-  					'truncated' => false,
-  					'in_reply_to_status_id' => '',
-  					'in_reply_to_user_id' => '',
-  					'favorited' => false,
-  					'in_reply_to_screen_name' => '',
-  					'geo' => '',
-    				'coordinates' => $lastwall[0]['coord'],
-    				'place' => $lastwall[0]['location'],
-    				'contributors' => ''					
-  				)
-				
-			)
+		$user_info['status'] = array(
+			'created_at' => api_date($lastwall[0]['created']),
+			'id' => $lastwall[0]['id'],
+			'text' => bbcode($lastwall[0]['body']),
+			'source' => 'web',
+			'truncated' => false,
+			'in_reply_to_status_id' => '',
+			'in_reply_to_user_id' => '',
+			'favorited' => false,
+			'in_reply_to_screen_name' => '',
+			'geo' => '',
+			'coordinates' => $lastwall[0]['coord'],
+			'place' => $lastwall[0]['location'],
+			'contributors' => ''					
 		);
+
+		$ret = Array('user' => $user_info);
 		
 		return $ret;
 		
@@ -300,14 +350,7 @@
 	function api_statuses_home_timeline(&$a){
 		if (local_user()===false) return false;
 		
-		// count public wall messages
-		$r = q("SELECT COUNT(`id`) as `count` FROM `item`
-				WHERE  `uid` = %d
-				AND `type`='wall' 
-				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''",
-				intval($uinfo[0]['uid'])
-		);
-		$countitms = $r[0]['count'];
+		$user_info = api_get_user($a);
 		
 		// get last newtork messages
 		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
@@ -323,23 +366,20 @@
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			$sql_extra
 			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-			intval($_SESSION['uid']),
-			intval($a->pager['start']),
-			intval($a->pager['itemspage'])
+			intval($user_info['id']),
+			0,20
 		);
 		$ret = new Container("statuses");
 		$ret->attrs['type']='array';
 
-		#foreach($r as $item) {
-		{
-			$item = $r[0];
+		foreach($r as $item) {
 			$status = new Container('status', array(
 				'created_at'=> api_date($item['created']),
 				'id'		=> $item['id'],
-				'text'		=> bbcode($item['body']),
+				'text'		=> strip_tags(bbcode($item['body'])),
 				'source'	=> 'web', 	#XXX: Fix me!
 				'truncated' => False,
-				'in_reply_to_status_id' => '',
+				'in_reply_to_status_id' => ($item['parent']!=$item['id']?$item['id']:''),
 				'in_reply_to_user_id' => '',
 				'favorited' => false,
 				'in_reply_to_screen_name' => '',
@@ -349,36 +389,7 @@
 				'contributors' => '',
 				'annotations'  => '',
 				'entities'  => '',
-				'user' => Array(
-					'id' => $item['uid'],
-					'name' => $item['username'],
-					'screen_name' => $item['nickname'],
-					'location' => $item['default-location'],
-					'description' => '',
-					'profile_image_url' => $item['photo'],
-					'url' => $item['url'],
-					'protected' => false,	#
-					'followers_count' => $countfriends, #XXX: fix me
-					'friends_count' => $countfriends,
-					'created_at' => api_date($item['created']),
-					'utc_offset' => 0, #XXX: fix me
-					'time_zone' => $item['timezone'],
-					'geo_enabled' => false,
-					'statuses_count' => $countitms, #XXX: fix me 
-	  				'lang' => 'en', #XXX: fix me
-	  				'favourites_count' => 0,
-	  				'contributors_enabled' => false,
-	  				'follow_request_sent' => false,
-	  				'profile_background_color' => 'cfe8f6',
-      				'profile_text_color' => '000000',
-      				'profile_link_color' => 'FF8500',
- 					'profile_sidebar_fill_color' =>'AD0066',
-					'profile_sidebar_border_color' => 'AD0066',
-	  				'profile_background_image_url' => '',
-	  				'profile_background_tile' => false,
-	  				'profile_use_background_image' => false,
-	  				'notifications' => false,	  				
-				)					
+				'user' => $user_info				
 			
 			));
 			$ret[]=$status;
@@ -387,3 +398,60 @@
 		return $ret;
 	}
 	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
+	
+	/*
+	 * http://developer.twitter.com/doc/get/statuses/user_timeline
+	 */
+	function api_statuses_user_timeline(&$a){
+			
+		$user_info = api_get_user($a);
+		
+		// get last public wall message
+		$lastwall = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
+			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+			FROM `item`, `contact`, `user`
+			WHERE `item`.`uid` = %d AND `user`.`uid` = `item`.`uid` 
+			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+			AND `contact`.`id` = `item`.`contact-id`
+			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			
+			AND `item`.`type`='wall' 
+			AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
+			
+			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
+			intval($user_info['id']),
+			0, 20
+		);
+		
+		
+		$ret = new Container("statuses");
+		$ret->attrs['type']='array';
+		
+		foreach($lastwall as $item) {
+			$status = new Container('status', array(
+				'created_at'=> api_date($item['created']),
+				'id'		=> $item['id'],
+				'text'		=> strip_tags(bbcode($item['body'])),
+				'source'	=> 'web', 	#XXX: Fix me!
+				'truncated' => False,
+				'in_reply_to_status_id' => '',
+				'in_reply_to_user_id' => '',
+				'favorited' => false,
+				'in_reply_to_screen_name' => '',
+				'geo' => '',
+				'coordinates' => $item['coord'],
+				'place' => $item['location'],
+				'contributors' => '',
+				'annotations'  => '',
+				'entities'  => '',
+				'user' => $user_info
+			));
+			$ret[]=$status;
+		};
+		
+		return $ret;
+	}
+	api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true);
+	
\ No newline at end of file
-- 
cgit v1.2.3


From e472d79b1e64c91dd3e19227151bdf82eb209192 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 21 Apr 2011 17:03:19 +0200
Subject: Reworked template processor. support for "if" "for" and "inc" blocks,
 also nested

---
 include/template_processor.php | 113 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 100 insertions(+), 13 deletions(-)

(limited to 'include')

diff --git a/include/template_processor.php b/include/template_processor.php
index f6d0264df..d1ff3998f 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -1,11 +1,12 @@
 <?php
-	
 
 	class Template {
-		var $s;
 		var $r;
 		var $search;
 		var $replace;
+		var $stack = array();
+		var $nodes = array();
+		var $done = false;
 		
 		private function _build_replace($r, $prefix){
 	
@@ -20,31 +21,117 @@
 			}
 		} 
 		
-		private function _replcb_if($m){
-			//echo "<pre>"; var_dump($m);
-			$keys = explode(".",$m[1]);
+		private function _push_stack(){
+			$this->stack[] = array($this->r, $this->search, $this->replace, $this->nodes);
+		}
+		private function _pop_stack(){
+			list($this->r, $this->search, $this->replace, $this->nodes) = array_pop($this->stack);
+		}
+		
+		private function _get_var($name){
+			$keys = array_map('trim',explode(".",$name));			
 			$val = $this->r;
 			foreach($keys as $k) {
 				$val = $val[$k];
 			}
+			return $val;
+		}
+		
+		/**
+		 * IF node
+		 * 
+		 * {{ if <$var> }}...{{ endif }}
+		 */
+		private function _replcb_if($args){
+			$val = $this->_get_var($args[2]);
+			return ($val?$args[3]:"");
+		}
+		
+		/**
+		 * FOR node
+		 * 
+		 * {{ for <$var> as $name }}...{{ endfor }}
+		 * {{ for <$var> as $key=>$name }}...{{ endfor }}
+		 */
+		private function _replcb_for($args){
+			$m = array_map('trim', explode(" as ", $args[2]));
+			list($keyname, $varname) = explode("=>",$m[1]);
+			if (is_null($varname)) { $varname=$keyname; $keyname=""; }
+			if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
+			$vals = $this->r[$m[0]];
+			$ret="";
+			if (!is_array($vals)) return $ret; 
+			foreach ($vals as $k=>$v){
+				$this->_push_stack();
+				$r = $this->r;
+				$r[$varname] = $v;
+				if ($keyname!='') $r[$keyname] = $k;
+				$ret .=  $this->replace($args[3], $r);
+				$this->_pop_stack();
+			}
+			return $ret;
+		}
+
+		/**
+		 * INC node
+		 * 
+		 * {{ inc <templatefile> [with $var1=$var2] }}{{ endinc }}
+		 */
+		private function _replcb_inc($args){
+			list($tplfile, $newctx) = array_map('trim', explode("with",$args[2]));
+			$this->_push_stack();
+			$r = $this->r;
+			if (!is_null($newctx)) {
+				list($a,$b) = array_map('trim', explode("=",$newctx));
+				$r[$a] = $this->_get_var($b); 
+			}
+			$this->nodes = Array();
+			$tpl = load_view_file($tplfile);
+			$ret = $this->replace($tpl, $r);
+			$this->_pop_stack();
+			return $ret;
 			
-			//echo $val;
-			return ($val?$m[2]:"");
+		}
+
+		private function _replcb_node($m) {
+			$node = $this->nodes[$m[1]];
+			if (method_exists($this, "_replcb_".$node[1])){
+				return call_user_func(array($this, "_replcb_".$node[1]),  $node);
+			} else {
+				return "";
+			}
+		}
+						
+		private function _replcb($m){
+			$this->done = false;	
+			$this->nodes[] = (array) $m;
+			return "||". (count($this->nodes)-1) ."||";
+		}
+		
+		private function _build_nodes($s){
+			$this->done = false;
+			while (!$this->done){
+				$this->done=true;
+				$s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*){{ *end\1 *}}|', array($this, "_replcb"), $s);
+			}
+			krsort($this->nodes);
+			return $s;
 		}
 		
 		public function replace($s, $r) {
-			$this->s = $s;
 			$this->r = $r;
 			$this->search = array();
 			$this->replace = array();
 	
 			$this->_build_replace($r, "");
-	
 			
-			$s = preg_replace_callback("|{{ *if *([^ }]*) *}}([^{]*){{ *endif *}}|", array($this, "_replcb_if"), $s);
+			#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
+			$s = $this->_build_nodes($s);
+			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+			$s = str_replace($this->search,$this->replace,$s);
 			
-			return str_replace($this->search,$this->replace,$s);
+			return $s;
 		}
-		
-	}	
+	}
+	
 	$t = new Template;
-- 
cgit v1.2.3


From 41f6ccc039633890b42f3a1a4495dfd8c7262da0 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Thu, 21 Apr 2011 17:03:31 +0200
Subject: More works on api

---
 include/api.php | 358 +++++++++++++++++++++++++-------------------------------
 1 file changed, 158 insertions(+), 200 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index e8a49a028..c2a9b3bbe 100644
--- a/include/api.php
+++ b/include/api.php
@@ -9,76 +9,7 @@
 
 	$API = Array();
 	 
-	class XMLSerializer {
-	
-	    // functions adopted from http://www.sean-barton.co.uk/2009/03/turning-an-array-or-object-into-xml-using-php/
-	
-	    public static function generateValidXmlFromObj(stdClass $obj, $node_block='nodes', $node_name='node') {
-	        $arr = get_object_vars($obj);
-	        return self::generateValidXmlFromArray($arr, $node_block, $node_name);
-	    }
-	
-	    public static function generateValidXmlFromArray($array, $node_block='nodes', $node_name='node') {
-			$attrs="";
-			if ($array instanceof Container){
-				$node_block=$array->name;
-				foreach($array->attrs as $n=>$v){
-					$attrs .= " $n='$v'";
-				}
-			}
-	
-	
-	        $xml = '<?xml version="1.0" encoding="UTF-8" ?>';
-	
-	        $xml .= '<' . $node_block . $attrs. '>';
-	        $xml .= self::generateXmlFromArray($array, $node_name);
-	        $xml .= '</' . $node_block . '>';
-	
-	        return $xml;
-	    }
-	
-	    private static function generateXmlFromArray($array, $node_name) {
-	        $xml = '';
-				
-	        if (is_array($array) || is_object($array)) {
-	            foreach ($array as $key=>$value) {
-	            	$attrs="";
-					if ($value instanceof Container){
-						$node_name=$value->name;
-						foreach($value->attrs as $n=>$v){
-							$attrs .= " $n='$v'";
-						}
-					}		            	
-	                if (is_numeric($key)) {
-	                    $key = $node_name;
-	                }
-	
-	
-	                $xml .= '<' . $key . $attrs.'>' . self::generateXmlFromArray($value, $node_name) . '</' . $key . '>';
-	            }
-	        } else {
-	        	if (is_bool($array)) $array = ($array===true?"true":"false");
-	            $xml = htmlspecialchars($array, ENT_QUOTES);
-	        }
-	
-	        return $xml;
-	    }
-	
-	}
-	
-	// this is used when json and xml are not translatable to arrays
-	// like [{text:'text'},{text:'text2'}]
-	//	and	<statuses type='array'><status><text>text</text></status><status><text>text2</text></status></statuses>
-	class Container extends ArrayObject{
-		public $name;
-		public $attrs=Array();
-		function __construct($name){
-			$this->name = $name;
-			$args = func_get_args();
-			unset($args[0]);
-			call_user_func_array(array(parent,'__construct'), $args);
-		}
-	}
+
 	
 	function api_date($str){
 		//Wed May 23 06:01:13 +0000 2007
@@ -106,8 +37,10 @@
 		$encrypted = hash('whirlpool',trim($_SERVER['PHP_AUTH_PW']));
     		
 		
-			// da auth.php
-		
+			/**
+			 *  next code from mod/auth.php. needs better solution
+			 */
+			
 		// process normal login request
 
 		$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
@@ -125,7 +58,7 @@
 		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
 		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-		notice( t("Welcome back ") . $record['username'] . EOL);
+		//notice( t("Welcome back ") . $record['username'] . EOL);
 		$a->user = $record;
 
 		if(strlen($a->user['timezone'])) {
@@ -150,60 +83,90 @@
 		header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 	}
 	
+	/**************************
+	 *  MAIN API ENTRY POINT  *
+	 **************************/
 	function api_call(&$a){
 		GLOBAL $API;
 		foreach ($API as $p=>$info){
 			if (strpos($a->query_string, $p)===0){
-				if ($info['auth']===true) api_login($a);
-				
-				$r = call_user_func($info['func'], $a);
-				if ($r===false) return;
-				
-				if ($r instanceof Container){
-					$name=NULL; $values=$r;
-				} else {						
-					foreach($r as $name=>$values){}
+				if ($info['auth']===true && local_user()===false) {
+						api_login($a);
 				}
+		
+				$type="json";		
+				if (strpos($a->query_string, ".xml")>0) $type="xml";
+				if (strpos($a->query_string, ".json")>0) $type="json";
+				if (strpos($a->query_string, ".rss")>0) $type="rss";
+				if (strpos($a->query_string, ".atom")>0) $type="atom";				
 				
-				// return xml
-				if (strpos($a->query_string, ".xml")>0){
-					header ("Content-Type: text/xml");  
-					return XMLSerializer::generateValidXmlFromArray($values, $name);
-				}
-				// return json
-				if (strpos($a->query_string, ".json")>0){
-					header ("Content-Type: application/json");  
-					if ($values instanceof Container) $values= iterator_to_array($values);
-					return json_encode($values);
+				$r = call_user_func($info['func'], $a, $type);
+				if ($r===false) return;
+
+				switch($type){
+					case "xml":
+						$r = mb_convert_encoding($r, "UTF-8",mb_detect_encoding($r));
+						header ("Content-Type: text/xml");
+						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+						break;
+					case "json": 
+						header ("Content-Type: application/json");  
+						return json_encode($r);
+						break;
+					case "rss":
+						header ("Content-Type: application/rss+xml");
+						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+						break;
+					case "atom":
+						#header ("Content-Type: application/atom+xml");
+						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+						break;
+						
 				}
 				//echo "<pre>"; var_dump($r); die();
 			}
 		}
 		return false;
 	}
+
+	/**
+	 * RSS extra info
+	 */
+	function api_rss_extra(&$a, $arr, $user_info){
+		if (is_null($user_info)) $user_info = api_get_user($a);
+		$arr['$rss'] = array(
+			'alternate' => $user_info['url'],
+			'self' => $a->get_baseurl(). "/". $a->query_string,
+			'updated' => api_date(null),
+			'language' => $user_info['language'],
+		);
+		
+		return $arr;
+	}
+	 
 	/**
-	 * Returns user info array
+	 * Returns user info array.
 	 */
 	function api_get_user(&$a){
 		$user = null;
 		$extra_query = "";
 		if(x($_GET, 'user_id')) {
 			$user = intval($_GET['user_id']);	
-			$extra_query = "AND `user`.`uid` = %d ";
+			$extra_query = "AND `contact`.`id` = %d ";
 		}
 		if(x($_GET, 'screen_name')) {
 			$user = dbesc($_GET['screen_name']);	
-			$extra_query = "AND `user`.`nickname` = '%s' ";
+			$extra_query = "AND `contact`.`nick` = '%s' ";
 		}
 		
 		if ($user===null){
 			list($user, $null) = explode(".",$a->argv[3]);
 			if(is_numeric($user)){
 				$user = intval($user);
-				$extra_query = "AND `user`.`uid` = %d ";
+				$extra_query = "AND `contact`.`id` = %d ";
 			} else {
 				$user = dbesc($user);
-				$extra_query = "AND `user`.`nickname` = '%s' ";
+				$extra_query = "AND `contact`.`nick` = '%s' ";
 			}
 		}
 		
@@ -219,7 +182,7 @@
 		
 
 		// user info		
-		$uinfo = q("SELECT * FROM `user`, `contact`
+		$uinfo = q("SELECT *, `contact`.`id` as `cid` FROM `user`, `contact`
 				WHERE `user`.`uid`=`contact`.`uid` AND `contact`.`self`=1
 				$extra_query",
 				$user
@@ -247,7 +210,7 @@
 				
 
 		$ret = Array(
-			'id' => $uinfo[0]['uid'],
+			'id' => $uinfo[0]['cid'],
 			'name' => $uinfo[0]['username'],
 			'screen_name' => $uinfo[0]['nickname'],
 			'location' => $uinfo[0]['default-location'],
@@ -275,12 +238,43 @@
 			'profile_background_image_url' => '',
 			'profile_background_tile' => false,
 			'profile_use_background_image' => false,
-			'notifications' => false,	 
+			'notifications' => false,
+			'verified' => true, #XXX: fix me
+			'followers' => '', #XXX: fix me
+			#'status' => null
 		);
-		
+	
 		return $ret;
 		
 	}
+
+	/**
+	 * apply xmlify() to all values of array $val, recursively
+	 */
+	function api_xmlify($val){
+		if (is_bool($val)) return $val?"true":"false";
+		if (is_array($val)) return array_map('api_xmlify', $val);
+		return xmlify($val);
+	}
+
+	/**
+	 *  load api $templatename for $type and replace $data array
+	 */
+	function api_apply_template($templatename, $type, $data){
+		switch($type){
+			case "rss":
+			case "atom":
+			case "xml":
+				$data = api_xmlify($data);
+				$tpl = load_view_file("view/api_".$templatename."_".$type.".tpl");
+				$ret = replace_macros($tpl, $data);
+				break;
+			case "json":
+				$ret = $data;
+				break;
+		}
+		return $ret;
+	}
 	
 	/**
 	 ** TWITTER API
@@ -291,11 +285,12 @@
 	 * returns a 401 status code and an error message if not. 
 	 * http://developer.twitter.com/doc/get/account/verify_credentials
 	 */
-	function api_account_verify_credentials(&$a){
+	function api_account_verify_credentials(&$a, $type){
 		if (local_user()===false) return false;
 		$user_info = api_get_user($a);
-		$ret = new Container("user", $user_info);
-		return $ret;
+		
+		return api_apply_template("user", $type, array('$user' => $user_info));
+
 	}
 	api_register_func('api/account/verify_credentials','api_account_verify_credentials', true);
 	 	
@@ -306,39 +301,50 @@
 	 * The author's most recent status will be returned inline.
 	 * http://developer.twitter.com/doc/get/users/show
 	 */
-	function api_users_show(&$a){
+	function api_users_show(&$a, $type){
 		$user_info = api_get_user($a);
-		
 		// get last public wall message
-		$lastwall = q("SELECT * FROM `item`
-				WHERE  `uid` = %d
-				AND `type`='wall' 
-				AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`=''
-				ORDER BY `created` DESC LIMIT 1",
-				intval($user_info['uid'])
-		);
-	
-		//echo "<pre>"; var_dump($lastwall); die();
-		
-		$user_info['status'] = array(
-			'created_at' => api_date($lastwall[0]['created']),
-			'id' => $lastwall[0]['id'],
-			'text' => bbcode($lastwall[0]['body']),
-			'source' => 'web',
-			'truncated' => false,
-			'in_reply_to_status_id' => '',
-			'in_reply_to_user_id' => '',
-			'favorited' => false,
-			'in_reply_to_screen_name' => '',
-			'geo' => '',
-			'coordinates' => $lastwall[0]['coord'],
-			'place' => $lastwall[0]['location'],
-			'contributors' => ''					
+		$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`nick` as `reply_author`
+				FROM `item`, `contact`,
+					(SELECT `item`.`id`, `item`.`contact-id`, `contact`.`nick` FROM `item`,`contact` WHERE `contact`.`id`=`item`.`contact-id`) as `i` 
+				WHERE `item`.`contact-id` = %d
+					AND `i`.`id` = `item`.`parent`
+					AND `contact`.`id`=`item`.`contact-id` AND `contact`.`self`=1
+					AND `type`!='activity'
+					AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
+				ORDER BY `created` DESC 
+				LIMIT 1",
+				intval($user_info['id'])
 		);
 
-		$ret = Array('user' => $user_info);
-		
-		return $ret;
+		if (count($lastwall)>0){
+			$lastwall = $lastwall[0];
+			
+			$in_reply_to_status_id = '';
+			$in_reply_to_user_id = '';
+			$in_reply_to_screen_name = '';
+			if ($lastwall['parent']!=$lastwall['id']) {
+				$in_reply_to_status_id=$lastwall['parent'];
+				$in_reply_to_user_id = $lastwall['reply_uid'];
+				$in_reply_to_screen_name = $lastwall['reply_author'];
+			}  
+			$user_info['status'] = array(
+				'created_at' => api_date($lastwall['created']),
+				'id' => $lastwall['contact-id'],
+				'text' => strip_tags(bbcode($lastwall['body'])),
+				'source' => 'web',
+				'truncated' => false,
+				'in_reply_to_status_id' => $in_reply_to_status_id,
+				'in_reply_to_user_id' => $in_reply_to_user_id,
+				'favorited' => false,
+				'in_reply_to_screen_name' => $in_reply_to_screen_name,
+				'geo' => '',
+				'coordinates' => $lastwall['coord'],
+				'place' => $lastwall['location'],
+				'contributors' => ''					
+			);
+		}
+		return  api_apply_template("user", $type, array('$user' => $user_info));
 		
 	}
 	api_register_func('api/users/show','api_users_show');
@@ -346,21 +352,24 @@
 	/**
 	 * 
 	 * http://developer.twitter.com/doc/get/statuses/home_timeline
+	 * 
+	 * TODO: Optional parameters
+	 * TODO: Add reply info
 	 */
-	function api_statuses_home_timeline(&$a){
+	function api_statuses_home_timeline(&$a, $type){
 		if (local_user()===false) return false;
 		
 		$user_info = api_get_user($a);
 		
 		// get last newtork messages
 		$sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE `id` = `parent` ) ";
-		
+
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 			FROM `item`, `contact`, `user`
-			WHERE `item`.`uid` = %d AND `user`.`uid` = `item`.`uid` 
+			WHERE `item`.`contact-id` = %d AND `user`.`uid` = `item`.`uid` 
 			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
 			AND `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
@@ -369,15 +378,15 @@
 			intval($user_info['id']),
 			0,20
 		);
-		$ret = new Container("statuses");
-		$ret->attrs['type']='array';
+		$ret = Array();
 
 		foreach($r as $item) {
-			$status = new Container('status', array(
+			$status = array(
 				'created_at'=> api_date($item['created']),
 				'id'		=> $item['id'],
 				'text'		=> strip_tags(bbcode($item['body'])),
-				'source'	=> 'web', 	#XXX: Fix me!
+				'source'	=> 'web',
+				'url'		=> ($item['plink']!=''?$item['plink']:$item['author-link']),
 				'truncated' => False,
 				'in_reply_to_status_id' => ($item['parent']!=$item['id']?$item['id']:''),
 				'in_reply_to_user_id' => '',
@@ -389,69 +398,18 @@
 				'contributors' => '',
 				'annotations'  => '',
 				'entities'  => '',
-				'user' => $user_info				
-			
-			));
+				'user' =>  $user_info				
+			);
 			$ret[]=$status;
 		};
 		
-		return $ret;
-	}
-	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
-	
-	/*
-	 * http://developer.twitter.com/doc/get/statuses/user_timeline
-	 */
-	function api_statuses_user_timeline(&$a){
-			
-		$user_info = api_get_user($a);
-		
-		// get last public wall message
-		$lastwall = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-			FROM `item`, `contact`, `user`
-			WHERE `item`.`uid` = %d AND `user`.`uid` = `item`.`uid` 
-			AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-			AND `contact`.`id` = `item`.`contact-id`
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			
-			AND `item`.`type`='wall' 
-			AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
-			
-			ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-			intval($user_info['id']),
-			0, 20
-		);
-		
-		
-		$ret = new Container("statuses");
-		$ret->attrs['type']='array';
+		$data = array('$statuses' => $ret);
+		if ($type=="rss" || $type=="atom") $data = api_rss_extra($a, $data, $user_info);
 		
-		foreach($lastwall as $item) {
-			$status = new Container('status', array(
-				'created_at'=> api_date($item['created']),
-				'id'		=> $item['id'],
-				'text'		=> strip_tags(bbcode($item['body'])),
-				'source'	=> 'web', 	#XXX: Fix me!
-				'truncated' => False,
-				'in_reply_to_status_id' => '',
-				'in_reply_to_user_id' => '',
-				'favorited' => false,
-				'in_reply_to_screen_name' => '',
-				'geo' => '',
-				'coordinates' => $item['coord'],
-				'place' => $item['location'],
-				'contributors' => '',
-				'annotations'  => '',
-				'entities'  => '',
-				'user' => $user_info
-			));
-			$ret[]=$status;
-		};
-		
-		return $ret;
+		return  api_apply_template("timeline", $type, $data);
 	}
-	api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true);
+	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
+	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
+	api_register_func('api/statuses/user_timeline','api_statuses_home_timeline', true);
+	# TODO: user_timeline should be profile view
 	
\ No newline at end of file
-- 
cgit v1.2.3


From a0e7d8fa00cadf00184d606135bb5c07d670b748 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 23 Apr 2011 17:31:23 -0700
Subject: redirect to profile photo upload on very first login

---
 include/auth.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/auth.php b/include/auth.php
index e8cee3918..4c7e85d86 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -191,9 +191,17 @@ else {
 		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
 		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
-		notice( t("Welcome back ") . $record['username'] . EOL);
 		$a->user = $record;
 
+		if($a->user['login_date'] === '0000-00-00 00:00:00') {
+			$_SESSION['return_url'] = 'profile_photo/new';
+			$a->module = 'profile_photo';
+			notice( t("Welcome ") . $a->user['username'] . EOL);
+			notice( t('Please upload a profile photo.') . EOL);
+		}
+		else
+			notice( t("Welcome back ") . $a->user['username'] . EOL);
+
 		if(strlen($a->user['timezone'])) {
 			date_default_timezone_set($a->user['timezone']);
 			$a->timezone = $a->user['timezone'];
@@ -214,6 +222,8 @@ else {
 			$a->cid = $r[0]['id'];
 			$_SESSION['cid'] = $a->cid;
 		}
+
+
 		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
 			dbesc(datetime_convert()),
 			intval($_SESSION['uid'])
-- 
cgit v1.2.3


From 245a56f0c1c7db884d0bbd4265f6f74a20442748 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 26 Apr 2011 04:39:27 -0700
Subject: lots of facebook fixes

---
 include/acl_selectors.php | 6 ++----
 include/notifier.php      | 2 ++
 include/poller.php        | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index d1303d933..f2763a569 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -48,7 +48,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$o = '';
 
-	// When used for private messages, we limit correspondence to mutual friends and the selector
+	// When used for private messages, we limit correspondence to mutual DFRN/Friendika friends and the selector
 	// to one recipient. By default our selector allows multiple selects amongst all contacts.
 
 	$sql_extra = '';
@@ -61,7 +61,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		$sql_extra .= " AND `network` IN ( 'dfrn' ) ";
 	}
 	elseif($privatenet) {	
-		$sql_extra .= " AND `network` IN ( 'dfrn', 'mail' ) ";
+		$sql_extra .= " AND `network` IN ( 'dfrn', 'mail', 'face' ) ";
 	}
 
 	if($privmail)
@@ -83,8 +83,6 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
-
-
 	if(count($r)) {
 		foreach($r as $rr) {
 			if((is_array($preselected)) && in_array($rr['id'], $preselected))
diff --git a/include/notifier.php b/include/notifier.php
index 4cc6d7a99..b009cc870 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -20,6 +20,8 @@ function notifier_run($argv, $argc){
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 
+	load_hooks();
+
 	if($argc < 3)
 		return;
 
diff --git a/include/poller.php b/include/poller.php
index b5639e034..dd2efcb76 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -26,6 +26,8 @@ function poller_run($argv, $argc){
 
 	$a->set_baseurl(get_config('system','url'));
 
+	load_hooks();
+
 	logger('poller: start');
 	
 	// run queue delivery process in the background
@@ -61,10 +63,12 @@ function poller_run($argv, $argc){
 
 	$sql_extra = (($manual_id) ? " AND `id` = $manual_id " : "");
 
+	reload_plugins();
+
 	$d = datetime_convert();
+
 	call_hooks('cron', $d);
 
-	reload_plugins();
 
 	$contacts = q("SELECT `id` FROM `contact` 
 		WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
-- 
cgit v1.2.3


From a01c40a845ae96d44ca58859cb2bc54ad6cd0b3d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 26 Apr 2011 05:45:53 -0700
Subject: no insecure warning on FB connections

---
 include/group.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/group.php b/include/group.php
index 5dca08c76..8866104fc 100644
--- a/include/group.php
+++ b/include/group.php
@@ -124,7 +124,7 @@ function group_public_members($gid) {
 		$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` 
 			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
 			WHERE `gid` = %d AND `group_member`.`uid` = %d 
-			AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' ",
+			AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' AND `contact`.`network` != 'face' ",
 			intval($gid),
 			intval(local_user())
 		);		
-- 
cgit v1.2.3


From cde17704ddbbe2b4926824aa2aa7aec7a9ac2dd6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 26 Apr 2011 18:36:51 -0700
Subject: over-ride comment box

---
 include/conversation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 1c56fa1bf..8e7554577 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -294,6 +294,7 @@ function conversation(&$a, $items, $mode, $update) {
 				$comments_seen ++;
 
 
+			$override_coment_box = (($page_writeable) && ($item_writeable) ? true : false);
 			$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
 
 			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
@@ -368,7 +369,7 @@ function conversation(&$a, $items, $mode, $update) {
 					));
 				}
 
-				if(($show_comment_box) || (($show_comment_box == false) && ($item['last-child']))) {
+				if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
 					$comment = replace_macros($cmnt_tpl,array(
 						'$return_path' => '', 
 						'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
-- 
cgit v1.2.3


From a5d478233c51bc5adc42f8193acd65d1790ef1e5 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 26 Apr 2011 18:39:19 -0700
Subject: misspell

---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 8e7554577..b3e424e52 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -294,7 +294,7 @@ function conversation(&$a, $items, $mode, $update) {
 				$comments_seen ++;
 
 
-			$override_coment_box = (($page_writeable) && ($item_writeable) ? true : false);
+			$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
 			$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
 
 			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-- 
cgit v1.2.3


From 976d1eaf4312f8c45af0e16205f573afc5be5136 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 27 Apr 2011 17:46:23 +0200
Subject: API work

---
 include/api.php | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index c2a9b3bbe..82790a638 100644
--- a/include/api.php
+++ b/include/api.php
@@ -49,8 +49,13 @@
 			dbesc(trim($user)),
 			dbesc($encrypted)
 		);
-		if(count($r))
+		if(count($r)){
 			$record = $r[0];
+		} else {
+		    header('WWW-Authenticate: Basic realm="Friendika"');
+		    header('HTTP/1.0 401 Unauthorized');
+		    die('This api require login');
+		}
 		$_SESSION['uid'] = $record['uid'];
 		$_SESSION['theme'] = $record['theme'];
 		$_SESSION['authenticated'] = 1;
@@ -90,6 +95,7 @@
 		GLOBAL $API;
 		foreach ($API as $p=>$info){
 			if (strpos($a->query_string, $p)===0){
+				#unset($_SERVER['PHP_AUTH_USER']);
 				if ($info['auth']===true && local_user()===false) {
 						api_login($a);
 				}
@@ -139,6 +145,7 @@
 			'self' => $a->get_baseurl(). "/". $a->query_string,
 			'updated' => api_date(null),
 			'language' => $user_info['language'],
+			'logo'	=> $a->get_baseurl()."/images/friendika-32.png",
 		);
 		
 		return $arr;
@@ -214,7 +221,7 @@
 			'name' => $uinfo[0]['username'],
 			'screen_name' => $uinfo[0]['nickname'],
 			'location' => $uinfo[0]['default-location'],
-			'profile_image_url' => $uinfo[0]['photo'],
+			'profile_image_url' => $uinfo[0]['micro'],
 			'url' => $uinfo[0]['url'],
 			'protected' => false,	#
 			'friends_count' => $countfriends,
@@ -385,6 +392,7 @@
 				'created_at'=> api_date($item['created']),
 				'id'		=> $item['id'],
 				'text'		=> strip_tags(bbcode($item['body'])),
+				'html'		=> bbcode($item['body']),
 				'source'	=> 'web',
 				'url'		=> ($item['plink']!=''?$item['plink']:$item['author-link']),
 				'truncated' => False,
@@ -398,18 +406,26 @@
 				'contributors' => '',
 				'annotations'  => '',
 				'entities'  => '',
-				'user' =>  $user_info				
+				'user' =>  $user_info,
+				'objecttype' => $item['object-type'],
+				'verb' => $item['verb'],
+				'self' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,
+				'edit' => $a->get_baseurl()."/api/statuses/show/".$ite['id'].".".$type,				
 			);
 			$ret[]=$status;
 		};
 		
 		$data = array('$statuses' => $ret);
-		if ($type=="rss" || $type=="atom") $data = api_rss_extra($a, $data, $user_info);
-		
+		switch($type){
+			case "atom":
+			case "rss":
+				$data = api_rss_extra($a, $data, $user_info);
+		}
+				
 		return  api_apply_template("timeline", $type, $data);
 	}
 	api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
 	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
 	api_register_func('api/statuses/user_timeline','api_statuses_home_timeline', true);
 	# TODO: user_timeline should be profile view
-	
\ No newline at end of file
+	
-- 
cgit v1.2.3


From daa7dc983bbae309dc984617dbb31a0dba52e481 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Thu, 28 Apr 2011 19:01:35 +0200
Subject: Icons as CSS classes, hide net/home/mail/notify-update divs with no
 value

---
 include/main.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index a251d8e3a..c7a3aea48 100644
--- a/include/main.js
+++ b/include/main.js
@@ -91,19 +91,20 @@
 			$.get("ping",function(data) {
 				$(data).find('result').each(function() {
 					var net = $(this).find('net').text();
-					if(net == 0) { net = ''; }
+					if(net == 0) { net = ''; $('#net-update').hide() } else { $('#net-update').show() }
 					$('#net-update').html(net);
 					var home = $(this).find('home').text();
-					if(home == 0) { home = ''; }
+					if(home == 0) { home = '';  $('#home-update').hide() } else { $('#home-update').show() }
 					$('#home-update').html(home);
 					var mail = $(this).find('mail').text();
-					if(mail == 0) { mail = ''; }
+					if(mail == 0) { mail = '';  $('#mail-update').hide() } else { $('#mail-update').show() }
 					$('#mail-update').html(mail);
 					var intro = $(this).find('intro').text();
 					var register = $(this).find('register').text();
 					if(intro == 0) { intro = ''; }
 					if(register != 0 && intro != '') { intro = intro+'/'+register; }
 					if(register != 0 && intro == '') { intro = '0/'+register; }
+					if (intro == '') { $('#notify-update').hide() } else { $('#notify-update').show() }
 					$('#notify-update').html(intro);
 
 				});
@@ -161,15 +162,11 @@
 	}
 
 	function imgbright(node) {
-		$(node).attr("src",$(node).attr("src").replace('hide','show'));
-		$(node).css('width',24);
-		$(node).css('height',24);
+		$(node).removeClass("drophide").addClass("drop");
 	}
 
 	function imgdull(node) {
-		$(node).attr("src",$(node).attr("src").replace('show','hide'));
-		$(node).css('width',16);
-		$(node).css('height',16);
+		$(node).removeClass("drop").addClass("drophide");
 	}
 
 	// Since our ajax calls are asynchronous, we will give a few 
-- 
cgit v1.2.3


From 7d455a039552049de82704a20ccda9fe05c173d4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 28 Apr 2011 20:04:02 -0700
Subject: missing location after editor was consolidated

---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index b3e424e52..38816a7d7 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -745,7 +745,7 @@ function status_editor($a,$x) {
 			'$content' => '',
 			'$post_id' => '',
 			'$baseurl' => $a->get_baseurl(),
-			'$defloc' => $x['default-location'],
+			'$defloc' => $x['default_location'],
 			'$visitor' => $x['visitor'],
 			'$emailcc' => t('CC: email addresses'),
 			'$jotnets' => $jotnets,
-- 
cgit v1.2.3


From e00068334f414b42cd7a25c594a47efb86d5bb2f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 30 Apr 2011 17:24:37 -0700
Subject: fix private images

---
 include/bbcode.php |  2 +-
 include/items.php  | 45 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 6fadbaf7e..89a14988a 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -80,7 +80,7 @@ function bbcode($Text,$preserve_nl = false) {
          
 	// Images
 	// [img]pathtoimage[/img]
-	$Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1">', $Text);
+	$Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
 
 	// html5 video and audio
 
diff --git a/include/items.php b/include/items.php
index 733cd8048..c5ecac777 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1496,10 +1496,17 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) {
 
 function atom_entry($item,$type,$author,$owner,$comment = false) {
 
+	$a = get_app();
+
 	if($item['deleted'])
 		return '<at:deleted-entry ref="' . xmlify($item['uri']) . '" when="' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '" />' . "\r\n";
 
-	$a = get_app();
+
+	if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
+		$body = fix_private_photos($item['body'],$owner['uid']);
+	else
+		$body = $item['body'];
+
 
 	$o = "\r\n\r\n<entry>\r\n";
 
@@ -1517,8 +1524,8 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
 	$o .= '<published>' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '</published>' . "\r\n";
 	$o .= '<updated>' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '</updated>' . "\r\n";
-	$o .= '<dfrn:env>' . base64url_encode($item['body'], true) . '</dfrn:env>' . "\r\n";
-	$o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($item['body']) : $item['body']) . '</content>' . "\r\n";
+	$o .= '<dfrn:env>' . base64url_encode($body, true) . '</dfrn:env>' . "\r\n";
+	$o .= '<content type="' . $type . '" >' . xmlify(($type === 'html') ? bbcode($body) : $body) . '</content>' . "\r\n";
 	$o .= '<link rel="alternate" type="text/html" href="' . xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']) . '" />' . "\r\n";
 	if($comment)
 		$o .= '<dfrn:comment-allow>' . intval($item['last-child']) . '</dfrn:comment-allow>' . "\r\n";
@@ -1563,6 +1570,38 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	return $o;
 }
 
+function fix_private_photos($s,$uid) {
+	$a = get_app();
+	logger('fix_private_photos');
+
+	if(preg_match("/\[img\](.+?)\[\/img\]/is",$s,$matches)) {
+		$image = $matches[1];
+		logger('fix_private_photos: found photo ' . $image);
+		if(stristr($image ,$a->get_baseurl() . '/photo/')) {
+			$i = basename($image);
+			$i = str_replace('.jpg','',$i);
+			$x = strpos($i,'-');
+			if($x) {
+				$res = substr($i,$x+1);
+				$i = substr($i,0,$x);
+				$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d",
+					dbesc($i),
+					intval($res),
+					intval($uid)
+				);
+				if(count($r)) {
+					logger('replacing photo');
+					$s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s);
+				}
+			}
+			logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
+		}	
+	}
+	return($s);
+}
+
+
+
 function item_getfeedtags($item) {
 	$ret = array();
 	$matches = false;
-- 
cgit v1.2.3


From 6c47f262cc8be96de0f543284b303fd6a1564a3f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 1 May 2011 19:50:00 -0700
Subject: warn if msg is visible to all

---
 include/conversation.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 38816a7d7..1558a5c41 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -687,6 +687,7 @@ function status_editor($a,$x) {
 			'$baseurl' => $a->get_baseurl(),
 			'$geotag' => $geotag,
 			'$nickname' => $x['nickname'],
+			'$ispublic' => t('Visible to <strong>everybody</strong>'),
 			'$linkurl' => t('Please enter a link URL:'),
 			'$utubeurl' => t('Please enter a YouTube link:'),
 			'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
-- 
cgit v1.2.3


From 64a7d0b578ae3264eb65bd4ad1c20a38d63cf3bf Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 3 May 2011 18:05:11 -0700
Subject: lost comment boxes on status.net conversations

---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 1558a5c41..7c30c01c2 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -225,7 +225,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 		$comments = array();
 		foreach($items as $item) {
-			if(intval($item['gravity']) == 6) {
+			if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
 				if(! x($comments,$item['parent']))
 					$comments[$item['parent']] = 1;
 				else
-- 
cgit v1.2.3


From 59fd70e568fbc93922769333c55d8c1fa72cea9d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 4 May 2011 02:20:44 -0700
Subject: issues with private photos - hitting internal size limits

---
 include/Photo.php | 12 ++++++++++--
 include/items.php |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/Photo.php b/include/Photo.php
index 9934b9a39..707b0de5d 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -162,12 +162,20 @@ class Photo {
 	}
 
 	public function saveImage($path) {
-		imagejpeg($this->image,$path,100);
+		$quality = get_config('system','jpeg_quality');
+		if((! $quality) || ($quality > 100))
+			$quality = JPEG_QUALITY;
+		imagejpeg($this->image,$path,$quality);
 	}
 
 	public function imageString() {
 		ob_start();
-		imagejpeg($this->image,NULL,100);
+
+		$quality = get_config('system','jpeg_quality');
+		if((! $quality) || ($quality > 100))
+			$quality = JPEG_QUALITY;
+
+		imagejpeg($this->image,NULL,$quality);
 		$s = ob_get_contents();
 		ob_end_clean();
 		return $s;
diff --git a/include/items.php b/include/items.php
index c5ecac777..3a3085f1b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -701,6 +701,7 @@ function item_store($arr,$force_parent = false) {
 				$parent_id = 0;
 				$arr['thr-parent'] = $arr['parent-uri'];
 				$arr['parent-uri'] = $arr['uri'];
+				$arr['gravity'] = 0;
 			}
 			else {
 				logger('item_store: item parent was not found - ignoring item');
-- 
cgit v1.2.3


From 2c63b65e3c66bcb0a047ce51c04d23376aa6c525 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 6 May 2011 06:30:33 -0700
Subject: refactor "which link to show" logic

---
 include/conversation.php | 190 ++++++++++++++++++++---------------------------
 include/items.php        |  16 ++++
 2 files changed, 96 insertions(+), 110 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 7c30c01c2..12c3b2a20 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -101,12 +101,7 @@ function conversation(&$a, $items, $mode, $update) {
 	else
 		$return_url = $_SESSION['return_url'] = $a->cmd;
 
-
-	// find all the authors involved in remote conversations
-	// We will use a local profile photo if they are one of our contacts
-	// otherwise we have to get the photo from the item owner's site
-
-	$author_contacts = extract_item_authors($items,local_user());
+	load_contact_links(local_user());
 
 
 	$cmnt_tpl    = load_view_file('view/comment_item.tpl');
@@ -147,22 +142,14 @@ function conversation(&$a, $items, $mode, $update) {
 			
 				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
 				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
-				$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
+
+				$sp = false;
+				$profile_link = best_link_url($item,$sp);
+				if($sp)
+					$sparkle = ' sparkle';
 				if($profile_link === 'mailbox')
 					$profile_link = '';
 
-				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-				if(strlen($item['author-link'])) {
-					if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-						$profile_link = $redirect_url;
-						$sparkle = ' sparkle';
-					}
-					elseif(isset($author_contacts[$item['author-link']])) {
-						$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-						$sparkle = ' sparkle';
-					}
-				}
 
 				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
 				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
@@ -403,33 +390,15 @@ function conversation(&$a, $items, $mode, $update) {
 			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
 			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
-			if($mode === 'profile') {
-				if(local_user() && ($item['contact-uid'] == local_user()) && ($item['network'] === 'dfrn') && (! $item['self'] )) {
-	                $profile_link = $redirect_url;
-    	            $sparkle = ' sparkle';
-        	    }
-				else {
-					$profile_link = $item['url'];
-					$sparkle = '';
-				}
-			}
-			elseif(strlen($item['author-link'])) {
-				$profile_link = $item['author-link'];
-				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-					$profile_link = $redirect_url;
-					$sparkle = ' sparkle';
-				}
-				elseif(isset($author_contacts[$item['author-link']])) {
-					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-					$sparkle = ' sparkle';
-				}
-			}
-			else 
-				$profile_link = $item['url'];
+			$sp = false;
+			$profile_link = best_link_url($item,$sp);
+			if($sp)
+				$sparkle = ' sparkle';
 
 			if($profile_link === 'mailbox')
 				$profile_link = '';
 
+
 			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
 
@@ -503,98 +472,99 @@ function conversation(&$a, $items, $mode, $update) {
 } 
 
 
+if(! function_exists('load_contact_links')) {
+function load_contact_links($uid) {
+
+	$a = get_app();
 
+	$ret = array();
 
-if(! function_exists('extract_item_authors')) {
-function extract_item_authors($arr,$uid) {
+	if(! $uid || x($a->contacts,'empty'))
+		return;
 
-	if((! $uid) || (! is_array($arr)) || (! count($arr)))
-		return array();
-	$urls = array();
-	foreach($arr as $rr) {
-		if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
-			$urls[] = "'" . dbesc($rr['author-link']) . "'";
+	$r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
+			intval($uid)
+	);
+	if(count($r)) {
+		foreach($r as $rr){
+			$url = normalise_link($rr['url']);
+			$ret[$url] = $rr;
+		}
 	}
+	else 
+		$ret['empty'] = true;	
+	$a->contacts = $ret;
+	return;		
+}}
 
-	// pre-quoted, don't put quotes on %s
-	if(count($urls)) {
-		$r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s )  AND `self` = 0 AND `blocked` = 0 ",
-			intval($uid),
-			implode(',',$urls)
-		);
-		if(count($r)) {
-			$ret = array();
-			$authors = array();
-			foreach($r as $rr){
-				if ($rr['network']=='dfrn')
-					$ret[$rr['url']] = $rr['id'];
-				$authors[$r['url']]= $rr;
+
+function best_link_url($item,&$sparkle) {
+
+	$a = get_app();
+
+	$best_url = '';
+	$sparkle  = false;
+
+	$clean_url = normalise_link($item['author-link']);
+
+	if((local_user()) && (local_user() == $item['uid'])) {
+		if(isset($a->contacts) && x($a->contacts,$clean_url)) {
+			if($a->contacts[$clean_url]['network'] === NETWORK_DFRN) {
+				$best_url = $a->get_baseurl() . '/redir/' . $a->contacts[$clean_url]['id'];
+				$sparkle = true;
 			}
-			$a->authors = $authors;
-			return $ret;
+			else
+				$best_url = $a->contacts[$clean_url]['url'];
 		}
 	}
-	return array();		
-}}
+	if(! $best_url) {
+		if(strlen($item['author-link']))
+			$best_url = $item['author-link'];
+		else
+			$best_url = $item['url'];
+	}
+
+	return $best_url;
+}
+
 
 if(! function_exists('item_photo_menu')){
 function item_photo_menu($item){
 	$a = get_app();
 	
-	if (!isset($a->authors)){
-		$rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
-		$authors = array();
-		foreach($rr as $r) $authors[$r['url']]= $r;
-		$a->authors = $authors;
-	}
-	
+	if (local_user() && (! count($a->contacts)))
+		load_contact_links(local_user());
+
 	$contact_url="";
 	$pm_url="";
-
 	$status_link="";
 	$photos_link="";
 	$posts_link="";
-	$profile_link   = ((strlen($item['author-link']))   ? $item['author-link'] : $item['url']);
-	$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
+	$sparkle = false;
+    $profile_link = best_link_url($item,$sparkle);
 	if($profile_link === 'mailbox')
 		$profile_link = '';
 
-	// $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile.
-
-	$profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0);	
-
-	// So we are checking that this is a logged in user on some page that *isn't* a profile page
-	// OR a profile page where the viewer owns the profile. 
-	// Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact
-	// or a friend's contact that we both have a connection to. 
-
-	if((local_user() && ($profile_owner == 0)) 
-		|| ($profile_owner && $profile_owner == local_user())) {
-
-		if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) {
-			$redir = $redirect_url;
-			$cid = $item['cid'];
-		}
-		elseif(isset($a->authors[$item['author-link']])) {
-			$redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
-			$cid = $a->authors[$item['author-link']]['id'];
-		}
-		if($item['author-link'] === 'mailbox')
-			$cid = $item['cid'];
-
-		if((isset($cid)) && (! $item['self'])) {
-			$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
-			$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
-			if($item['network'] === 'dfrn') {
-				$status_link = $redir . "?url=status";
-				$profile_link = $redir . "?url=profile";
-				$photos_link = $redir . "?url=photos";
-				$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
-			}
+	if($sparkle) {
+		$cid = intval(basename($profile_link));
+		$status_link = $profile_link . "?url=status";
+		$photos_link = $profile_link . "?url=photos";
+		$profile_link = $profile_link . "?url=profile";
+		$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
+	}
+	else {
+		if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
+			$cid = $item['contact-id'];
+		}		
+		else {
+			$cid = 0;
 		}
 	}
-
+	if(($cid) && (! $item['self'])) {
+		$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
+		$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+	}
 
 	$menu = Array(
 		t("View status") => $status_link,
diff --git a/include/items.php b/include/items.php
index 3a3085f1b..b7863f838 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1205,6 +1205,13 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
 				$item_id  = $item->get_id();
 				$datarray = get_atom_elements($feed,$item);
 
+				if(! x($datarray,'author-name'))
+					$datarray['author-name'] = $contact['name'];
+				if(! x($datarray,'author-link'))
+					$datarray['author-link'] = $contact['url'];
+				if(! x($datarray,'author-avatar'))
+					$datarray['author-avatar'] = $contact['thumb'];
+
 				$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($item_id),
 					intval($importer['uid'])
@@ -1278,6 +1285,15 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
 
 				$datarray = get_atom_elements($feed,$item);
 
+				if(is_array($contact)) {
+					if(! x($datarray,'author-name'))
+						$datarray['author-name'] = $contact['name'];
+					if(! x($datarray,'author-link'))
+						$datarray['author-link'] = $contact['url'];
+					if(! x($datarray,'author-avatar'))
+						$datarray['author-avatar'] = $contact['thumb'];
+				}
+
 				$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($item_id),
 					intval($importer['uid'])
-- 
cgit v1.2.3


From be84d51767366c4538a8203f0046cb5ac06396d6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 9 May 2011 01:35:24 -0700
Subject: use local contact photo if available

---
 include/conversation.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index 12c3b2a20..775234284 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -141,7 +141,6 @@ function conversation(&$a, $items, $mode, $update) {
 					$nickname = $a->user['nickname'];
 			
 				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
-				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
 
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
@@ -151,6 +150,12 @@ function conversation(&$a, $items, $mode, $update) {
 					$profile_link = '';
 
 
+				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+				if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
+					$profile_avatar = $a->contacts[$normalised]['thumb'];
+				else
+					$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+
 				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
 				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 				if($coord) {
@@ -388,7 +393,6 @@ function conversation(&$a, $items, $mode, $update) {
 			$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
 
 			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
 			$sp = false;
 			$profile_link = best_link_url($item,$sp);
@@ -398,6 +402,15 @@ function conversation(&$a, $items, $mode, $update) {
 			if($profile_link === 'mailbox')
 				$profile_link = '';
 
+			$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+			if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
+				$profile_avatar = $a->contacts[$normalised]['thumb'];
+			else
+				$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+
+
+
+
 
 			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
 			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
-- 
cgit v1.2.3


From a5e0190f23a9b3ee840e98f9a819d688f6326781 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 9 May 2011 22:15:19 -0700
Subject: missing self photo on remote site comment boxes

---
 include/auth.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'include')

diff --git a/include/auth.php b/include/auth.php
index 4c7e85d86..ec02cd85c 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -28,6 +28,15 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		goaway($a->get_baseurl());
 	}
 
+	if(x($_SESSION['visitor_id']) && (! x($_SESSION['uid']))) {
+		$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+			intval($_SESSION['visitor_id'])
+		);
+		if(count($r)) {
+			$a->contact = $r[0];
+		}
+	}
+
 	if(x($_SESSION,'uid')) {
 
 		// already logged in user returning
-- 
cgit v1.2.3


From c052d688284fda76c612325b237d8352f2abb5d4 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 10 May 2011 16:12:50 -0700
Subject: don't use load_view_file() except in email templates and install of
 htconfig - to avoid getting wrong file when package is updated by copying
 over an older version.

---
 include/api.php          |  2 +-
 include/conversation.php | 22 +++++++++++-----------
 include/items.php        |  2 +-
 include/nav.php          |  2 +-
 include/notifier.php     |  4 ++--
 include/salmon.php       |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index 82790a638..0753962ab 100644
--- a/include/api.php
+++ b/include/api.php
@@ -273,7 +273,7 @@
 			case "atom":
 			case "xml":
 				$data = api_xmlify($data);
-				$tpl = load_view_file("view/api_".$templatename."_".$type.".tpl");
+				$tpl = file_get_contents("view/api_".$templatename."_".$type.".tpl");
 				$ret = replace_macros($tpl, $data);
 				break;
 			case "json":
diff --git a/include/conversation.php b/include/conversation.php
index 775234284..d3744e21f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -104,11 +104,11 @@ function conversation(&$a, $items, $mode, $update) {
 	load_contact_links(local_user());
 
 
-	$cmnt_tpl    = load_view_file('view/comment_item.tpl');
-	$like_tpl    = load_view_file('view/like.tpl');
-	$noshare_tpl = load_view_file('view/like_noshare.tpl');
-	$tpl         = load_view_file('view/wall_item.tpl');
-	$wallwall    = load_view_file('view/wallwall_item.tpl');
+	$cmnt_tpl    = file_get_contents('view/comment_item.tpl');
+	$like_tpl    = file_get_contents('view/like.tpl');
+	$noshare_tpl = file_get_contents('view/like_noshare.tpl');
+	$tpl         = file_get_contents('view/wall_item.tpl');
+	$wallwall    = file_get_contents('view/wallwall_item.tpl');
 
 	$alike = array();
 	$dlike = array();
@@ -120,8 +120,8 @@ function conversation(&$a, $items, $mode, $update) {
 			// "New Item View" on network page or search page results 
 			// - just loop through the items and format them minimally for display
 
-			$tpl = load_view_file('view/search_item.tpl');
-			$droptpl = load_view_file('view/wall_fake_drop.tpl');
+			$tpl = file_get_contents('view/search_item.tpl');
+			$droptpl = file_get_contents('view/wall_fake_drop.tpl');
 
 			foreach($items as $item) {
 
@@ -383,7 +383,7 @@ function conversation(&$a, $items, $mode, $update) {
 					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
 						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
 					: '');
-			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+			$drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 			$photo = $item['photo'];
 			$thumb = $item['thumb'];
@@ -662,9 +662,9 @@ function status_editor($a,$x) {
 
 	$o = '';
 		
-	$geotag = (($x['allow_location']) ? load_view_file('view/jot_geotag.tpl') : '');
+	$geotag = (($x['allow_location']) ? file_get_contents('view/jot_geotag.tpl') : '');
 
-		$tpl = load_view_file('view/jot-header.tpl');
+		$tpl = file_get_contents('view/jot-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(),
@@ -680,7 +680,7 @@ function status_editor($a,$x) {
 		));
 
 
-		$tpl = load_view_file("view/jot.tpl");
+		$tpl = file_get_contents("view/jot.tpl");
 		
 		$jotplugins = '';
 		$jotnets = '';
diff --git a/include/items.php b/include/items.php
index b7863f838..c75e509cf 100644
--- a/include/items.php
+++ b/include/items.php
@@ -113,7 +113,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 
 	$items = $r;
 
-	$feed_template = load_view_file('view/atom_feed.tpl');
+	$feed_template = file_get_contents('view/atom_feed.tpl');
 
 	$atom = '';
 
diff --git a/include/nav.php b/include/nav.php
index 2ead5c07e..602385c32 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -125,7 +125,7 @@ function nav(&$a) {
 		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
 
 
-	$tpl = load_view_file('view/nav.tpl');
+	$tpl = file_get_contents('view/nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
 		'$langselector' => lang_selector(),
diff --git a/include/notifier.php b/include/notifier.php
index b009cc870..bd061a0c6 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -191,8 +191,8 @@ function notifier_run($argv, $argc){
 			$contacts = $r;
 	}
 
-	$feed_template = load_view_file('view/atom_feed.tpl');
-	$mail_template = load_view_file('view/atom_mail.tpl');
+	$feed_template = file_get_contents('view/atom_feed.tpl');
+	$mail_template = file_get_contents('view/atom_mail.tpl');
 
 	$atom = '';
 	$slaps = array();
diff --git a/include/salmon.php b/include/salmon.php
index b5c21a87b..b96ca774f 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -161,7 +161,7 @@ EOT;
 
 	$signature2  = base64url_encode($rsa->sign($data));
 
-	$salmon_tpl = load_view_file('view/magicsig.tpl');
+	$salmon_tpl = file_get_contents('view/magicsig.tpl');
 	$salmon = replace_macros($salmon_tpl,array(
 		'$data'      => $data,
 		'$encoding'  => $encoding,
-- 
cgit v1.2.3


From a00813497fccf295d72e35537599409b3f1eaa22 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 10 May 2011 23:35:31 -0700
Subject: bring back load_view_file for dispy templates

---
 include/conversation.php | 10 +++++-----
 include/nav.php          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index d3744e21f..7af7c1efd 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -107,8 +107,8 @@ function conversation(&$a, $items, $mode, $update) {
 	$cmnt_tpl    = file_get_contents('view/comment_item.tpl');
 	$like_tpl    = file_get_contents('view/like.tpl');
 	$noshare_tpl = file_get_contents('view/like_noshare.tpl');
-	$tpl         = file_get_contents('view/wall_item.tpl');
-	$wallwall    = file_get_contents('view/wallwall_item.tpl');
+	$tpl         = load_view_file('view/wall_item.tpl');
+	$wallwall    = load_view_file('view/wallwall_item.tpl');
 
 	$alike = array();
 	$dlike = array();
@@ -120,7 +120,7 @@ function conversation(&$a, $items, $mode, $update) {
 			// "New Item View" on network page or search page results 
 			// - just loop through the items and format them minimally for display
 
-			$tpl = file_get_contents('view/search_item.tpl');
+			$tpl = load_view_file('view/search_item.tpl');
 			$droptpl = file_get_contents('view/wall_fake_drop.tpl');
 
 			foreach($items as $item) {
@@ -664,7 +664,7 @@ function status_editor($a,$x) {
 		
 	$geotag = (($x['allow_location']) ? file_get_contents('view/jot_geotag.tpl') : '');
 
-		$tpl = file_get_contents('view/jot-header.tpl');
+		$tpl = load_view_file('view/jot-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(),
@@ -680,7 +680,7 @@ function status_editor($a,$x) {
 		));
 
 
-		$tpl = file_get_contents("view/jot.tpl");
+		$tpl = load_view_file("view/jot.tpl");
 		
 		$jotplugins = '';
 		$jotnets = '';
diff --git a/include/nav.php b/include/nav.php
index 602385c32..2ead5c07e 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -125,7 +125,7 @@ function nav(&$a) {
 		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
 
 
-	$tpl = file_get_contents('view/nav.tpl');
+	$tpl = load_view_file('view/nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
 		'$langselector' => lang_selector(),
-- 
cgit v1.2.3


From b2e92e0af32f86212d15748c6d432d658905d4b6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 11 May 2011 04:37:13 -0700
Subject: deprecate load_view_file

---
 include/api.php                |  2 +-
 include/conversation.php       | 22 +++++++++++-----------
 include/items.php              |  4 ++--
 include/nav.php                |  2 +-
 include/notifier.php           |  4 ++--
 include/salmon.php             |  2 +-
 include/template_processor.php |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index 0753962ab..84cb7b38f 100644
--- a/include/api.php
+++ b/include/api.php
@@ -273,7 +273,7 @@
 			case "atom":
 			case "xml":
 				$data = api_xmlify($data);
-				$tpl = file_get_contents("view/api_".$templatename."_".$type.".tpl");
+				$tpl = get_markup_template("api_".$templatename."_".$type.".tpl");
 				$ret = replace_macros($tpl, $data);
 				break;
 			case "json":
diff --git a/include/conversation.php b/include/conversation.php
index 7af7c1efd..a58a4d638 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -104,11 +104,11 @@ function conversation(&$a, $items, $mode, $update) {
 	load_contact_links(local_user());
 
 
-	$cmnt_tpl    = file_get_contents('view/comment_item.tpl');
-	$like_tpl    = file_get_contents('view/like.tpl');
-	$noshare_tpl = file_get_contents('view/like_noshare.tpl');
-	$tpl         = load_view_file('view/wall_item.tpl');
-	$wallwall    = load_view_file('view/wallwall_item.tpl');
+	$cmnt_tpl    = get_markup_template('comment_item.tpl');
+	$like_tpl    = get_markup_template('like.tpl');
+	$noshare_tpl = get_markup_template('like_noshare.tpl');
+	$tpl         = get_markup_template('wall_item.tpl');
+	$wallwall    = get_markup_template('wallwall_item.tpl');
 
 	$alike = array();
 	$dlike = array();
@@ -120,8 +120,8 @@ function conversation(&$a, $items, $mode, $update) {
 			// "New Item View" on network page or search page results 
 			// - just loop through the items and format them minimally for display
 
-			$tpl = load_view_file('view/search_item.tpl');
-			$droptpl = file_get_contents('view/wall_fake_drop.tpl');
+			$tpl = get_markup_template('search_item.tpl');
+			$droptpl = get_markup_template('wall_fake_drop.tpl');
 
 			foreach($items as $item) {
 
@@ -383,7 +383,7 @@ function conversation(&$a, $items, $mode, $update) {
 					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
 						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
 					: '');
-			$drop = replace_macros(file_get_contents('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+			$drop = replace_macros(get_markup_template('wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 			$photo = $item['photo'];
 			$thumb = $item['thumb'];
@@ -662,9 +662,9 @@ function status_editor($a,$x) {
 
 	$o = '';
 		
-	$geotag = (($x['allow_location']) ? file_get_contents('view/jot_geotag.tpl') : '');
+	$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
-		$tpl = load_view_file('view/jot-header.tpl');
+		$tpl = get_markup_template('jot-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(),
@@ -680,7 +680,7 @@ function status_editor($a,$x) {
 		));
 
 
-		$tpl = load_view_file("view/jot.tpl");
+		$tpl = get_markup_template("jot.tpl");
 		
 		$jotplugins = '';
 		$jotnets = '';
diff --git a/include/items.php b/include/items.php
index c75e509cf..6f15b6814 100644
--- a/include/items.php
+++ b/include/items.php
@@ -113,7 +113,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 
 	$items = $r;
 
-	$feed_template = file_get_contents('view/atom_feed.tpl');
+	$feed_template = get_markup_template('atom_feed.tpl');
 
 	$atom = '';
 
@@ -1421,7 +1421,7 @@ function new_follower($importer,$contact,$datarray,$item) {
 		$a = get_app();
 		if(count($r)) {
 			if(($r[0]['notify-flags'] & NOTIFY_INTRO) && ($r[0]['page-flags'] == PAGE_NORMAL)) {
-				$email_tpl = load_view_file('view/follow_notify_eml.tpl');
+				$email_tpl = get_intltext_template('follow_notify_eml.tpl');
 				$email = replace_macros($email_tpl, array(
 					'$requestor' => ((strlen($name)) ? $name : t('[Name Withheld]')),
 					'$url' => $url,
diff --git a/include/nav.php b/include/nav.php
index 2ead5c07e..d8f7621cc 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -125,7 +125,7 @@ function nav(&$a) {
 		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
 
 
-	$tpl = load_view_file('view/nav.tpl');
+	$tpl = get_markup_template('nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
 		'$langselector' => lang_selector(),
diff --git a/include/notifier.php b/include/notifier.php
index bd061a0c6..db2542849 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -191,8 +191,8 @@ function notifier_run($argv, $argc){
 			$contacts = $r;
 	}
 
-	$feed_template = file_get_contents('view/atom_feed.tpl');
-	$mail_template = file_get_contents('view/atom_mail.tpl');
+	$feed_template = get_markup_template('atom_feed.tpl');
+	$mail_template = get_markup_template('atom_mail.tpl');
 
 	$atom = '';
 	$slaps = array();
diff --git a/include/salmon.php b/include/salmon.php
index b96ca774f..d7060b0f7 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -161,7 +161,7 @@ EOT;
 
 	$signature2  = base64url_encode($rsa->sign($data));
 
-	$salmon_tpl = file_get_contents('view/magicsig.tpl');
+	$salmon_tpl = get_markup_template('magicsig.tpl');
 	$salmon = replace_macros($salmon_tpl,array(
 		'$data'      => $data,
 		'$encoding'  => $encoding,
diff --git a/include/template_processor.php b/include/template_processor.php
index d1ff3998f..d431831cb 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -86,7 +86,7 @@
 				$r[$a] = $this->_get_var($b); 
 			}
 			$this->nodes = Array();
-			$tpl = load_view_file($tplfile);
+			$tpl = get_markup_template($tplfile);
 			$ret = $this->replace($tpl, $r);
 			$this->_pop_stack();
 			return $ret;
-- 
cgit v1.2.3


From 45b9bd96baa12c426b1a0a629e81908a59f149d9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 14 May 2011 06:16:21 -0700
Subject: wrong author came from feed, not from FB

---
 include/items.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 6f15b6814..8c2c78696 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1530,7 +1530,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	if(is_array($author))
 		$o .= atom_author('author',$author['name'],$author['url'],80,80,$author['thumb']);
 	else
-		$o .= atom_author('author',$item['name'],$item['url'],80,80,$item['thumb']);
+		$o .= atom_author('author',(($item['author-name']) ? $item['author-name'] : $item['name']),(($item['author-link']) ? $item['author-link'] : $item['url']),80,80,(($item['author-avatar']) ? $item['author-avatar'] : $item['thumb']));
 	if(strlen($item['owner-name']))
 		$o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']);
 
-- 
cgit v1.2.3


From 730322ee5fd1b04a026ce6d0bafae9079f307a4b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 15 May 2011 16:36:49 -0700
Subject: bug #70 - error messages on group deletion, warning cleanup

---
 include/auth.php               | 2 +-
 include/template_processor.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/auth.php b/include/auth.php
index ec02cd85c..1c430406e 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -28,7 +28,7 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		goaway($a->get_baseurl());
 	}
 
-	if(x($_SESSION['visitor_id']) && (! x($_SESSION['uid']))) {
+	if(x($_SESSION,'visitor_id') && (! x($_SESSION,'uid'))) {
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($_SESSION['visitor_id'])
 		);
diff --git a/include/template_processor.php b/include/template_processor.php
index d431831cb..efdfbaecb 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -128,7 +128,7 @@
 			#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
 			$s = $this->_build_nodes($s);
 			$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
-			$s = str_replace($this->search,$this->replace,$s);
+			$s = str_replace($this->search,$this->replace, (string) $s);
 			
 			return $s;
 		}
-- 
cgit v1.2.3


From 85c6457e6e6c9be6200f76bb12c449f010d4117b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 16 May 2011 17:57:29 -0700
Subject: bug #65 'show all nn comments', 'show more posts like this' are
 misleading after they've been clicked once. Solution, hide them once clicked.

---
 include/conversation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index a58a4d638..febd6c347 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -267,7 +267,7 @@ function conversation(&$a, $items, $mode, $update) {
 					$blowhard_count ++;
 					if($blowhard_count == 3) {
 						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
-							. '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' 
+							. '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
 							. t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
 							. $item['parent'] . '" style="display: none;" >';
 					}
@@ -292,7 +292,7 @@ function conversation(&$a, $items, $mode, $update) {
 			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
 				if(! $comments_collapsed) {
 					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
-						. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' 
+						. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
 						. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
 						. '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
 					$comments_collapsed = true;
-- 
cgit v1.2.3


From 8fa9ca520badd6ae757bbafa647020ed50a288c3 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 17 May 2011 17:40:00 -0700
Subject: "show all n comments" comes back after toggled and ajax updated, plus
 connector doc improvements

---
 include/main.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index c7a3aea48..e3e56fa0b 100644
--- a/include/main.js
+++ b/include/main.js
@@ -129,8 +129,11 @@
 			in_progress = false;
 			$('.ccollapse-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
+				var is_hidden = $('#' + ident).is(':hidden');
 				if($('#' + ident).length) {
 					$('#' + ident).replaceWith($(this));
+					if(is_hidden)
+						$('#' + ident).hide();
 				}
 			});
 			$('.wall-item-outside-wrapper',data).each(function() {
-- 
cgit v1.2.3


From 990d5e82a0c38831240590f907fb4c6efd62041d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 18 May 2011 17:29:12 -0700
Subject: doc updates - connecting to services

---
 include/conversation.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index febd6c347..e66b45f09 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -732,6 +732,7 @@ function status_editor($a,$x) {
 			'$defloc' => $x['default_location'],
 			'$visitor' => $x['visitor'],
 			'$emailcc' => t('CC: email addresses'),
+			'$public' => t('Public post'),
 			'$jotnets' => $jotnets,
 			'$emtitle' => t('Example: bob@example.com, mary@example.com'),
 			'$lockstate' => $x['lockstate'],
-- 
cgit v1.2.3


From a6603a54d9c68d1efee553e747de233f992dc3d2 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 18 May 2011 20:34:18 -0700
Subject: don't send any potentially large embeds over ajax so as to avoid huge
 prefetch downloads. Strip them out and provide a notice to reload page to
 view them. Ensures they will only be loaded once.

---
 include/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/main.js b/include/main.js
index e3e56fa0b..0d68c2b2b 100644
--- a/include/main.js
+++ b/include/main.js
@@ -138,7 +138,7 @@
 			});
 			$('.wall-item-outside-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
-				if($('#' + ident).length == 0) { 
+				if($('#' + ident).length == 0) {
 					$('img',this).each(function() {
 						$(this).attr('src',$(this).attr('dst'));
 					});
-- 
cgit v1.2.3


From 44d5c90af446537ddd292caff0cd85370a7339ab Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 19 May 2011 17:25:41 -0700
Subject: better mailing list support, email addr can be either 'from' or 'to'

---
 include/Scrape.php |  8 ++++++--
 include/email.php  | 12 +++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index a6bb5f728..21e6bd01f 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -278,6 +278,7 @@ function probe_url($url) {
 		$links = lrdd($url);
 
 		if(count($links)) {
+			logger('probe_url: found lrdd links: ' . print_r($links,true), LOGGER_DATA);
 			foreach($links as $link) {
 				if($link['@attributes']['rel'] === NAMESPACE_DFRN)
 					$dfrn = unamp($link['@attributes']['href']);
@@ -345,8 +346,11 @@ function probe_url($url) {
 						$poll = 'email ' . random_string();
 						$priority = 0;
 						$x = email_msg_meta($mbox,$msgs[0]);
-						$adr = imap_rfc822_parse_adrlist($x->from,'');
-						if(strlen($adr[0]->personal))
+						if(stristr($x->from,$orig_url))
+							$adr = imap_rfc822_parse_adrlist($x->from,'');
+						elseif(stristr($x->to,$orig_url))
+							$adr = imap_rfc822_parse_adrlist($x->to,'');
+						if(isset($adr) && strlen($adr[0]->personal))
 							$vcard['fn'] = notags($adr[0]->personal);
 					}
 					imap_close($mbox);
diff --git a/include/email.php b/include/email.php
index db10af2ee..7e0351e94 100644
--- a/include/email.php
+++ b/include/email.php
@@ -15,7 +15,17 @@ function email_poll($mbox,$email_addr) {
 		return array();;
 
 	$search = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
-	return (($search) ? $search : array());
+
+	$search2 = imap_search($mbox,'TO "' . $email_addr . '"', SE_UID);
+
+	if($search && $search2)
+		$res = array_merge($search,$search2);
+	elseif($search)
+		$res = $search;
+	else
+		$res = $search2;
+
+	return (($res) ? $res : array());
 }
 
 
-- 
cgit v1.2.3


From e51e772abcddeae77f8c6003290922922afed11a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 19 May 2011 18:53:35 -0700
Subject: typo in email delete sql, add message sender to body for better
 handling of mailing lists

---
 include/poller.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index dd2efcb76..7490bfa81 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -358,7 +358,7 @@ function poller_run($argv, $argc){
 
 							if(count($r)) {
 								if($meta->deleted && ! $r[0]['deleted']) {
-									q("UPDATE `item` SET `deleted` = `, `changed` = '%s' WHERE `id` = %d LIMIT 1",
+									q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
 										dbesc(datetime_convert()),
 										intval($r[0]['id'])
 									);
@@ -372,6 +372,13 @@ function poller_run($argv, $argc){
 							if(! $r)
 								continue;
 							$datarray['body'] = escape_tags($r['body']);
+
+							// some mailing lists have the original author as 'from' - add this sender info to msg body. 
+							// todo: adding a gravatar for the original author would be cool
+
+							if(! stristr($meta->from,$contact['addr']))
+								$datarray['body'] = t('From: ') . escape_tags($meta->from) . "\n\n" . $datarray['body'];
+
 							$datarray['uid'] = $importer_uid;
 							$datarray['contact-id'] = $contact['id'];
 							if($datarray['parent-uri'] === $datarray['uri'])
-- 
cgit v1.2.3


From a27b7fb28d151c00eef8319cdf876896d36df8b0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 19 May 2011 19:55:34 -0700
Subject: more indicators of public visibility

---
 include/acl_selectors.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index f2763a569..b1bcf5108 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -130,7 +130,7 @@ function populate_acl($user = null,$celeb = false) {
 	$o = '';
 	$o .= '<div id="acl-wrapper">';
 	$o .= '<div id="acl-permit-outer-wrapper">';
-	$o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div>';
+	$o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div><div id="jot-public">' . t('everybody') . '</div>';
 	$o .= '<div id="acl-permit-text-end"></div>';
 	$o .= '<div id="acl-permit-wrapper">';
 	$o .= '<div id="group_allow_wrapper">';
-- 
cgit v1.2.3


From 681885a120fb44ddb0cee5cab1191a6aea67b3e0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 20 May 2011 01:15:02 -0700
Subject: "notes" app

---
 include/conversation.php | 18 ++++++++++++++----
 include/nav.php          |  5 ++---
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/conversation.php b/include/conversation.php
index e66b45f09..5f761ccf0 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -91,6 +91,11 @@ function conversation(&$a, $items, $mode, $update) {
 		$page_writeable = can_write_wall($a,$profile_owner);
 	}
 
+	if($mode === 'notes') {
+		$profile_owner = $a->profile['profile_uid'];
+		$page_writeable = true;
+	}
+
 	if($mode === 'display') {
 		$profile_owner = $a->profile['uid'];
 		$page_writeable = can_write_wall($a,$profile_owner);
@@ -263,7 +268,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 				$item_writeable = (($item['writable'] || $item['self']) ? true : false);
 
-				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile')) {
+				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) {
 					$blowhard_count ++;
 					if($blowhard_count == 3) {
 						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
@@ -379,7 +384,7 @@ function conversation(&$a, $items, $mode, $update) {
 				}
 			}
 
-			$edpost = ((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1))
+			$edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
 					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
 						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
 					: '');
@@ -658,7 +663,7 @@ function format_like($cnt,$arr,$type,$id) {
 }}
 
 
-function status_editor($a,$x) {
+function status_editor($a,$x, $notes_cid = 0) {
 
 	$o = '';
 		
@@ -710,12 +715,15 @@ function status_editor($a,$x) {
 		call_hooks('jot_tool', $jotplugins);
 		call_hooks('jot_networks', $jotnets);
 
+		if($notes_cid)
+			$jotnets .= '<input type="hidden" name="contact_allow[]" value="' . $notes_cid .'" />';
+
 		$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
 
 		$o .= replace_macros($tpl,array(
 			'$return_path' => $a->cmd,
 			'$action' => 'item',
-			'$share' => t('Share'),
+			'$share' => (($x['button']) ? $x['button'] : t('Share')),
 			'$upload' => t('Upload photo'),
 			'$weblink' => t('Insert web link'),
 			'$youtube' => t('Insert YouTube video'),
@@ -726,11 +734,13 @@ function status_editor($a,$x) {
 			'$title' => t('Set title'),
 			'$wait' => t('Please wait'),
 			'$permset' => t('Permission settings'),
+			'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
 			'$content' => '',
 			'$post_id' => '',
 			'$baseurl' => $a->get_baseurl(),
 			'$defloc' => $x['default_location'],
 			'$visitor' => $x['visitor'],
+			'$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
 			'$emailcc' => t('CC: email addresses'),
 			'$public' => t('Public post'),
 			'$jotnets' => $jotnets,
diff --git a/include/nav.php b/include/nav.php
index d8f7621cc..66fdbc49b 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -64,9 +64,8 @@ function nav(&$a) {
 		$nav['help'] = array($help_url, t('Help'), "");
 
 
-	if(strlen($a->apps)) {
-		$nav['apps'] = array('apps', t('Apps'), "");
-	}
+
+	$nav['apps'] = array('apps', t('Apps'), "");
 
 	$nav['search'] = array('search', t('Search'), "");
 
-- 
cgit v1.2.3


From 0abf2f11c6b3caaad2f9a833f477a094b7488e9a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 20 May 2011 15:46:41 -0700
Subject: patches for youtube's change in link and embed formats, please test

---
 include/bbcode.php |  6 +++++-
 include/items.php  | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/bbcode.php b/include/bbcode.php
index 89a14988a..195fc9181 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -94,7 +94,11 @@ function bbcode($Text,$preserve_nl = false) {
 
 	// Youtube extensions
         $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); 
-	$Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
+        $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); 
+
+	$Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<iframe width="425" height="349" src="http://www.youtube.com/embed/$1" frameborder="0" allowfullscreen></iframe>', $Text);
+
+//	$Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text);
 
 	// oembed tag
 	$Text = oembed_bbcode2html($Text);
diff --git a/include/items.php b/include/items.php
index 8c2c78696..3170b9384 100644
--- a/include/items.php
+++ b/include/items.php
@@ -354,6 +354,9 @@ function get_atom_elements($feed,$item) {
 		$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
 			'[youtube]$1[/youtube]', $res['body']);
 
+		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/[A-Za-z0-9\-_=]+).+?</iframe>#s',
+			'[youtube]$1[/youtube]', $res['body']);
+
 		$res['body'] = oembed_html2bbcode($res['body']);
 
 		$config = HTMLPurifier_Config::createDefault();
@@ -521,6 +524,10 @@ function get_atom_elements($feed,$item) {
 				$body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
 					'[youtube]$1[/youtube]', $body);
 
+		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/[A-Za-z0-9\-_=]+).+?</iframe>#s',
+			'[youtube]$1[/youtube]', $res['body']);
+
+
 				$config = HTMLPurifier_Config::createDefault();
 				$config->set('Cache.DefinitionImpl', null);
 
@@ -560,6 +567,9 @@ function get_atom_elements($feed,$item) {
 				$body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
 					'[youtube]$1[/youtube]', $body);
 
+		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/[A-Za-z0-9\-_=]+).+?</iframe>#s',
+			'[youtube]$1[/youtube]', $res['body']);
+
 				$config = HTMLPurifier_Config::createDefault();
 				$config->set('Cache.DefinitionImpl', null);
 
-- 
cgit v1.2.3


From ccbdc9b2fc78b47935c79e748fb8bf75e827800f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 21 May 2011 01:17:07 -0700
Subject: regex stuffed up

---
 include/items.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/items.php b/include/items.php
index 3170b9384..55b17158a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -354,7 +354,7 @@ function get_atom_elements($feed,$item) {
 		$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
 			'[youtube]$1[/youtube]', $res['body']);
 
-		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/[A-Za-z0-9\-_=]+).+?</iframe>#s',
+		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
 			'[youtube]$1[/youtube]', $res['body']);
 
 		$res['body'] = oembed_html2bbcode($res['body']);
@@ -524,7 +524,7 @@ function get_atom_elements($feed,$item) {
 				$body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
 					'[youtube]$1[/youtube]', $body);
 
-		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/[A-Za-z0-9\-_=]+).+?</iframe>#s',
+		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
 			'[youtube]$1[/youtube]', $res['body']);
 
 
@@ -567,7 +567,7 @@ function get_atom_elements($feed,$item) {
 				$body = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
 					'[youtube]$1[/youtube]', $body);
 
-		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/[A-Za-z0-9\-_=]+).+?</iframe>#s',
+		$res['body'] = preg_replace('#<iframe[^>].+?' . 'http://www.youtube.com/embed/([A-Za-z0-9\-_=]+).+?</iframe>#s',
 			'[youtube]$1[/youtube]', $res['body']);
 
 				$config = HTMLPurifier_Config::createDefault();
-- 
cgit v1.2.3


From f3f063c0dd7fd8b706987b856d79c7b58924acbb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sat, 21 May 2011 19:15:55 -0700
Subject: Drupal doesn't provide absolute URL on feed. Fix to allow importing
 Drupal "contacts".

---
 include/Scrape.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index 21e6bd01f..7fc0c964b 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -241,6 +241,17 @@ function scrape_feed($url) {
 		}
 	}
 
+
+	$head = $dom->getElementsByTagName('base');
+	if($head) {
+		foreach($head as $head0) {
+			$basename = $head0->getAttribute('href');
+			break;
+		}
+	}
+	if(! $basename)
+		$basename = substr($url,0,strrpos($url,'/')) . '/';
+
 	$items = $dom->getElementsByTagName('link');
 
 	// get Atom/RSS link elements, take the first one of either.
@@ -259,6 +270,13 @@ function scrape_feed($url) {
 		}	
 	}
 
+	// Drupal and perhaps others only provide relative URL's. Turn them into absolute.
+
+	if(x($ret,'feed_atom') && (! strstr($ret['feed_atom'],'://')))
+		$ret['feed_atom'] = $basename . $ret['feed_atom'];
+	if(x($ret,'feed_rss') && (! strstr($ret['feed_rss'],'://')))
+		$ret['feed_rss'] = $basename . $ret['feed_rss'];
+
 	return $ret;
 }}
 
-- 
cgit v1.2.3