Merge remote-tracking branch 'upstream/master'

7 files changed, 186 insertions, 14 deletions

diff --git a/mod/channel.php b/mod/channel.php
index 5d4c7ce1b..c7b631c96 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -48,7 +48,7 @@ function channel_aside(&$a) {
 		$a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['channel_address'],$cat));
 	}
 	if(feature_enabled($a->profile['profile_uid'],'tagadelic'))
-		$a->set_widget('tagcloud',tagblock('search',$a->profile['profile_uid'],50,ITEM_WALL|ITEM_THREAD_TOP));
+		$a->set_widget('tagcloud',tagblock('search',$a->profile['profile_uid'],50,$a->profile['channel_hash'],ITEM_WALL));
 
 }
 
diff --git a/mod/connections.php b/mod/connections.php
index 89c0bcbc0..1b97412d4 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -23,6 +23,11 @@ function connections_init(&$a) {
 			$a->data['abook'] = $r[0];
 		}
 	}
+
+	$channel = $a->get_channel();
+	if($channel)
+		head_set_icon($channel['xchan_photo_s']);
+
 }
 
 function connections_aside(&$a) {
diff --git a/mod/message.php b/mod/message.php
index 54615f081..f5a2101ab 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -206,6 +206,7 @@ function message_content(&$a) {
 	}
 
 	$channel = $a->get_channel();
+	head_set_icon($channel['xchan_photo_s']);
 
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
diff --git a/mod/network.php b/mod/network.php
index aa134eece..0f4b4f7e8 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -7,6 +7,9 @@ function network_init(&$a) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
+
+	$channel = $a->get_channel();
+	head_set_icon($channel['xchan_photo_s']);
 	
 	$is_a_date_query = false;
 
diff --git a/mod/profiles.php b/mod/profiles.php
index 28d8dd973..173d97138 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -200,6 +200,11 @@ function profiles_post(&$a) {
 		$day = intval($_POST['day']);
 			if(($day > $mtab[$month]) || ($day < 0))
 				$day = 0;
+
+		if($year && (! ($month && $day))) {
+			$month = 1; $day = 1;
+		}
+
 		$dob = '0000-00-00';
 		$dob = sprintf('%04d-%02d-%02d',$year,$month,$day);
 
diff --git a/mod/settings.php b/mod/settings.php
index e830d7070..164a2a8a0 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -580,6 +580,11 @@ function settings_content(&$a) {
 		return;
 	}
 
+
+	$channel = $a->get_channel();
+	if($channel)
+		head_set_icon($channel['xchan_photo_s']);
+
 //	if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
 //		notice( t('Permission denied.') . EOL );
 //		return;
diff --git a/mod/thing.php b/mod/thing.php
index 723b069bc..91bdca78a 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -1,5 +1,6 @@
 <?php /** @file */
 
+require_once('include/items.php');
 
 
 function thing_init(&$a) {
@@ -8,36 +9,188 @@ function thing_init(&$a) {
 		return;
 
 	$account_id = $a->get_account();
+	$channel    = $a->get_channel();
+
 
 	$name = escape_tags($_REQUEST['term']);
+	$verb = escape_tags($_REQUEST['verb']);
+	$profile_guid = escape_tags($_REQUEST['profile']);
 	$url = $_REQUEST['link'];
 	$photo = $_REQUEST['photo'];
 
 	$hash = random_string();
 
 
-	if(! $name)
+	$verbs = obj_verbs();
+
+	/** 
+	 * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" 
+	 * We use the first person form when creating an activity, but the third person for use in activities
+	 * FIXME: There is no accounting for verb gender for languages where this is significant. We may eventually
+	 * require obj_verbs() to provide full conjugations and specify which form to use in the $_REQUEST params to this module.
+	 */
+
+	$translated_verb = $verbs[$verb][1];
+
+	/** 
+	 * The site administrator can do things that normals cannot.
+	 * This is restricted because it will likely cause
+	 * an activitystreams protocol violation and the activity might
+	 * choke in some other network and result in unnecessary 
+	 * support requests. It isn't because we're trying to be heavy-handed
+	 * about what you can and can't do. 
+	 */
+
+	if(! $translated_verb) {
+		if(is_site_admin())
+			$translated_verb = $verb;
+	} 
+	
+	/**
+	 * Things, objects: We do not provide definite (a, an) or indefinite (the) articles or singular/plural designators
+	 * That needs to be specified in your thing. e.g. Mike has "a carrot", Greg wants "balls", Bob likes "the Boston Red Sox".  
+	 */
+
+	/**
+	 * Future work on this module might produce more complex activities with targets, e.g. Phillip likes Karen's moustache
+	 * and to describe other non-thing objects like channels, such as Karl wants Susan - where Susan represents a channel profile.
+	 */
+ 
+	if((! $name) || (! $translated_verb))
+		return;
+
+	$sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 ");
+	$p = q("select profile_guid, is_default from profile where uid = %d $sql limit 1",
+		intval(local_user())
+	);
+	if($p)
+		$profile = $p[0];
+	else
 		return;
 
-	$r = q("insert into term ( aid, uid, oid, otype, type, term, url, imgurl, term_hash )
-		values( %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s' ) ",
-		intval($account_id),
+
+	$r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1",
 		intval(local_user()),
-		0,
-		TERM_OBJ_THING,
-		TERM_THING,
-		dbesc($name),
-		dbesc(($url) ? $url : z_root() . '/thing/' . $hash),
-		dbesc(($photo) ? $photo : ''),
-		dbesc($hash)
+		intval(TERM_OBJ_THING),
+		intval(TERM_THING),
+		dbesc($name)
 	);
+	if(! $r) {
+		$r = q("insert into term ( aid, uid, oid, otype, type, term, url, imgurl, term_hash )
+			values( %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s' ) ",
+			intval($account_id),
+			intval(local_user()),
+			0,
+			intval(TERM_OBJ_THING),
+			intval(TERM_THING),
+			dbesc($name),
+			dbesc(($url) ? $url : z_root() . '/thing/' . $hash),
+			dbesc(($photo) ? $photo : ''),
+			dbesc($hash)
+		);
+		$r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1",
+			intval(local_user()),
+			intval(TERM_OBJ_THING),
+			intval(TERM_THING),
+			dbesc($name)
+		);
+	}
+	$term = $r[0];
+
+	$r = q("insert into obj ( obj_page, obj_verb, obj_type, obj_channel, obj_obj) values ('%s','%s', %d, %d, '%s') ",
+		dbesc($profile['profile_guid']),
+		dbesc($verb),
+		intval(TERM_OBJ_THING),
+		intval(local_user()),
+		dbesc($term['term_hash'])
+	);
+
+	if(! $r) {
+		notice( t('Object store: failed'));
+		return;
+	}
+
+	info( t('thing/stuff added'));
+
+	$arr = array();
+	$links = array(array('rel' => 'alternate','type' => 'text/html', 
+		'href' => $term['url']));
+
+	$objtype = ACTIVITY_OBJ_THING;
+
+	$obj = json_encode(array(
+		'type'    => $objtype,
+		'id'      => $term['url'],
+		'link'    => $links,
+		'title'   => $term['term'],
+		'content' => $term['term']
+	));
+
+	$bodyverb = str_replace('OBJ: ', '',t('OBJ: %1$s %2$s %3$s'));
+
+	$arr['owner_xchan']  = $channel['channel_hash'];
+	$arr['author_xchan'] = $channel['channel_hash'];
+
+
+	$arr['item_flags'] = ITEM_ORIGIN|ITEM_WALL|ITEM_THREAD_TOP;
+	
+	$ulink = '[zrl=' . $channel['xchan_url'] . ']' . $channel['channel_name'] . '[/zrl]';
+	$plink = '[zrl=' . $term['url'] . ']' . $term['term'] . '[/zrl]';
+
+	$arr['body'] =  sprintf( $bodyverb, $ulink, $translated_verb, $plink );
+
+	$arr['verb'] = $verb;
+	$arr['obj_type'] = $objtype;
+	$arr['object'] = $obj;
+
+	if(! $profile['is_default']) {
+		$arr['item_private'] = true;
+		$str = '';
+		$r = q("select abook_hash from abook where abook_channel = %d and abook_profile = '%s'",
+			intval(local_user()),
+			dbesc($profile_guid)
+		);
+		if($r) {
+			$arr['allow_cid'] = '';
+			foreach($r as $rr)
+				$arr['allow_cid'] .= '<' . $rr['abook_hash'] . '>';
+		}
+		else
+			$arr['allow_cid'] = '<' . get_observer_hash() . '>';
+	}
+	
+	$ret = post_activity_item($arr);
+
+	if($ret['success'])
+		proc_run('php','include/notifier.php','tag',$ret['activity']['id']);
 	
 }
 
 
 function thing_content(&$a) {
-
-
+	
+	/* placeholders */
+
+	if(argc() > 1) {
+		return t('not yet implemented.');
+	}
+
+	require_once('include/contact_selectors.php');
+
+	$o .= replace_macros(get_markup_template('thing_input.tpl'),array(
+		'$thing_hdr' => t('Add Stuff to your Profile'),
+		'$multiprof' => feature_enabled(local_user(),'multi_profiles'),
+		'$profile_lbl' => t('Select a profile'),
+		'$profile_select' => contact_profile_assign(''),
+		'$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'),
+		'$verb_select' => obj_verb_selector(),
+		'$thing_lbl' => t('Name of thing or stuff e.g. something'),
+		'$url_lbl' => t('URL of thing or stuff (optional)'),
+		'$img_lbl' => t('URL for photo of thing or stuff (optional)'),
+		'$submit' => t('Submit')
+	));
+
+	return $o;
 
 
 }