sync changes

8 files changed, 259 insertions, 24 deletions

diff --git a/boot.php b/boot.php
index ce57458fd..ea13c35b1 100644
--- a/boot.php
+++ b/boot.php
@@ -225,7 +225,7 @@ define ( 'TERM_OBJ_PHOTO', 2 );
  * various namespaces we may need to parse
  */
 
-define ( 'NAMESPACE_ZOT',             'http://purl.org/macgirvin/zot' );
+define ( 'NAMESPACE_ZOT',             'http://purl.org/zot' );
 define ( 'NAMESPACE_DFRN' ,           'http://purl.org/macgirvin/dfrn/1.0' );
 define ( 'NAMESPACE_THREAD' ,         'http://purl.org/syndication/thread/1.0' );
 define ( 'NAMESPACE_TOMB' ,           'http://purl.org/atompub/tombstones/1.0' );
@@ -260,6 +260,8 @@ define ( 'ACTIVITY_UPDATE',      NAMESPACE_ACTIVITY_SCHEMA . 'update' );
 define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
 
+define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
+
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );
 define ( 'ACTIVITY_OBJ_PERSON',  NAMESPACE_ACTIVITY_SCHEMA . 'person' );
diff --git a/include/conversation.php b/include/conversation.php
index 679606933..7f3980e70 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -163,6 +163,49 @@ function localize_item(&$item){
 		$item['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
 	}
+	if (stristr($item['verb'],ACTIVITY_POKE)) {
+		$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
+		if(! $verb)
+			return;
+		if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_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=' . zrl($Alink) . ']' . $Aname . '[/url]';
+		$B = '[url=' . zrl($Blink) . ']' . $Bname . '[/url]';
+		if ($Bphoto!="") $Bphoto = '[url=' . zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+
+		// we can't have a translation string with three positions but no distinguishable text
+		// So here is the translate string.
+
+		$txt = t('%1$s poked %2$s');
+
+		// now translate the verb
+
+		$txt = str_replace( t('poked'), t($verb), $txt);
+
+		// then do the sprintf on the translation string
+
+		$item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
+
+	}
     if ($item['verb']===ACTIVITY_TAG){
 		$r = q("SELECT * from `item`,`contact` WHERE 
 		`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
diff --git a/include/notifier.php b/include/notifier.php
index f443c700a..d67f2dd3a 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -180,6 +180,8 @@ function notifier_run($argv, $argc){
 
 		$parent = $items[0];
 
+
+
 		// This is IMPORTANT!!!!
 
 		// We will only send a "notify owner to relay" or followup message if the referenced post
@@ -195,10 +197,9 @@ function notifier_run($argv, $argc){
 		// Other DFRN conversation members will be alerted during polled updates.
 
 
-
-		$localhost = str_replace('www.','',$a->get_hostname());
-		if(strpos($localhost,':'))
-			$localhost = substr($localhost,0,strpos($localhost,':'));
+		$relay_to_owner = false;
+	
+		$relay_origin_check = (((intval($target_item['origin'])) && (! intval($parent['origin']))) ? true : false);
 
 		/**
 		 *
@@ -208,28 +209,17 @@ function notifier_run($argv, $argc){
 		 *
 		 */
  
-		$relay_to_owner = false;
 
-		if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
+		if((! $top_level) && ($parent['wall'] == 0) && ($relay_origin_check) && (! $expire))
 			$relay_to_owner = true;
-		}
-
 
 		if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && (! $top_level)) {
 			$relay_to_owner = true;			
 		} 
 
-		// until the 'origin' flag has been in use for several months
-		// we will just use it as a fallback test
-		// later we will be able to use it as the primary test of whether or not to relay.
-
-		if(! $target_item['origin'])
+		if(! $relay_origin_check)
 			$relay_to_owner = false;
 
-		if($parent['origin'])
-			$relay_to_owner = false;
-
-
 
 		if($relay_to_owner) {
 			logger('notifier: followup', LOGGER_DEBUG);
diff --git a/include/text.php b/include/text.php
index fe36e1319..05fcad6be 100644
--- a/include/text.php
+++ b/include/text.php
@@ -705,6 +705,20 @@ function linkify($s) {
 	return($s);
 }}
 
+function get_poke_verbs() {
+	
+	// index is present tense verb
+	// value is array containing past tense verb, translation of present, translation of past
+
+	$arr = array(
+		'poke' => array( 'poked', t('poke'), t('poked')),
+		'prod' => array( 'prodded', t('prod'), t('prodded')),
+		'slap' => array( 'slapped', t('slap'), t('slapped')),
+		'finger' => array( 'fingered', t('finger'), t('fingered'))
+	);
+	call_hooks('poke_verbs', $arr);
+	return $arr;
+}
 
 /**
  * 
diff --git a/mod/item.php b/mod/item.php
index db28e255f..5c3a0d888 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -42,6 +42,19 @@ function item_post(&$a) {
 	logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
 	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
+
+	// 'origin' (if non-zero) indicates that this network is where the message originated,
+	// for the purpose of relaying comments to other conversation members. 
+	// If using the API from a device (leaf node) you must set origin to 1 (default) or leave unset.
+	// If the API is used from another network with its own distribution
+	// and deliveries, you may wish to set origin to 0 or false and allow the other 
+	// network to relay comments.
+
+	// If you are unsure, it is prudent (and important) to leave it unset.   
+
+	$origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1);
+
+
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
 	$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
 	$categories = ((x($_REQUEST['category'])) ? escape_tags($_REQUEST['category']) : '');
@@ -532,11 +545,6 @@ function item_post(&$a) {
 
 	$gravity = (($parent) ? 6 : 0 );
 
-	// even if the post arrived via API we are considering that it 
-	// originated on this site by default for determining relayability.
-
-	$origin = ((x($_REQUEST,'origin')) ? intval($_REQUEST['origin']) : 1);
-	
 	$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
 
 	$uri = item_new_uri($a->get_hostname(),$profile_uid);
diff --git a/mod/poke.php b/mod/poke.php
new file mode 100755
index 000000000..8fe07b4cd
--- /dev/null
+++ b/mod/poke.php
@@ -0,0 +1,149 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function poke_init(&$a) {
+
+	if(! local_user())
+		return;
+
+	$uid = local_user();
+	$verb = notags(trim($_GET['verb']));
+	
+	if(! $verb) 
+		return;
+
+	$verbs = get_poke_verbs();
+
+	if(! array_key_exists($verb,$verbs))
+		return;
+
+	$activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
+
+	$contact_id = intval($_GET['cid']);
+	if(! $contact_id)
+		return;
+
+
+	logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
+
+
+	$r = q("SELECT * FROM `contact` WHERE `id` = %d and  `uid` = %d LIMIT 1",
+		intval($contact_id),
+		intval($uid)
+	);
+
+	if(! count($r)) {
+		logger('poke: no contact ' . $contact_id);
+		return;
+	}
+
+	$target = $r[0];
+
+	$poster = $a->contact;
+
+	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+
+	$arr = array();
+
+	$arr['uid']           = $uid;
+	$arr['uri']           = $uri;
+	$arr['parent-uri']    = $uri;
+	$arr['type']          = 'activity';
+	$arr['wall']          = 1;
+	$arr['contact-id']    = $poster['id'];
+	$arr['owner-name']    = $poster['name'];
+	$arr['owner-link']    = $poster['url'];
+	$arr['owner-avatar']  = $poster['thumb'];
+	$arr['author-name']   = $poster['name'];
+	$arr['author-link']   = $poster['url'];
+	$arr['author-avatar'] = $poster['thumb'];
+	$arr['title']         = '';
+	$arr['allow_cid']     = $a->user['allow_cid'];
+	$arr['allow_gid']     = $a->user['allow_gid'];
+	$arr['deny_cid']      = $a->user['deny_cid'];
+	$arr['deny_gid']      = $a->user['deny_gid'];
+	$arr['last-child']    = 1;
+	$arr['visible']       = 1;
+	$arr['verb']          = $activity;
+	$arr['object-type']   = ACTIVITY_OBJ_PERSON;
+
+	$arr['origin']        = 1;
+	$arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
+
+	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $a->get_baseurl() . '/contact/' . $target['id'] . '</id>';
+	$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
+
+	$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
+	$arr['object'] .= '</link></object>' . "\n";
+
+	$item_id = item_store($arr);
+	if($item_id) {
+		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+			intval($uid),
+			intval($item_id)
+		);
+		proc_run('php',"include/notifier.php","tag","$item_id");
+	}
+
+
+	call_hooks('post_local_end', $arr);
+
+	proc_run('php',"include/notifier.php","like","$post_id");
+
+	return;
+}
+
+
+
+function poke_content(&$a) {
+
+	$base = $a->get_baseurl();
+
+	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
+	$a->page['htmlhead'] .= <<< EOT
+
+<script>$(document).ready(function() { 
+	var a; 
+	a = $("#recip").autocomplete({ 
+		serviceUrl: '$base/acl',
+		minChars: 2,
+		width: 350,
+		onSelect: function(value,data) {
+			$("#recip-complete").val(data);
+		}			
+	});
+	a.setOptions({ params: { type: 'a' }});
+
+
+}); 
+
+</script>
+EOT;
+
+
+	$verbs = get_poke_verbs();
+
+	$shortlist = array();
+	foreach($verbs as $k => $v)
+		$shortlist[] = array($k,$v[1]);
+
+
+	$tpl = get_markup_template('poke_content.tpl');
+
+	$o = replace_macros($tpl,array(
+		'$title' => t('Poke/Prod'),
+		'$desc' => t('poke, prod or do other things to somebody'),
+		'$clabel' => t('Recipient'),
+		'$choice' => t('Choose what you wish to do to recipient'),
+		'$verbs' => $shortlist,
+		'$submit' => t('Submit')
+	));
+
+	return $o;
+
+}
\ No newline at end of file
diff --git a/version.inc b/version.inc
index 2df3ce42c..cbcc7b5d9 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-07-18.19
+2012-07-19.20
diff --git a/view/poke_content.tpl b/view/poke_content.tpl
new file mode 100644
index 000000000..09b3d8db4
--- /dev/null
+++ b/view/poke_content.tpl
@@ -0,0 +1,29 @@
+<h3>$title</h3>
+
+<div id="poke-desc">$desc</div>
+
+<form action="poke" method="get">
+<br />
+<br />
+
+<div id="poke-recip-label">$clabel</div>
+<br />
+<input id="recip" type="text" size="64" maxlength="255" value="" name="pokename" autocomplete="off">
+<input id="recip-complete" type="hidden" value="" name="cid">
+
+<br />
+<br />
+<div id="poke-action-label">$choice</div>
+<br />
+<br />
+<select name="verb" id="poke-verb-select" >
+{{ for $verbs as $v }}
+<option value="$v.0">$v.1</option>
+{{ endfor }}
+</select>
+<br />
+<br />
+
+<input type="submit" name="submit" value="$submit" />
+</form>
+