12 files changed, 586 insertions, 34 deletions

diff --git a/include/ItemObject.php b/include/ItemObject.php
index 36070335d..19283c317 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -125,11 +125,24 @@ class Item extends BaseObject {
 
 		$like_count = ((x($alike,$item['mid'])) ? $alike[$item['mid']] : '');
 		$like_list = ((x($alike,$item['mid'])) ? $alike[$item['mid'] . '-l'] : '');
-		$like_button_label = ((x($alike,$item['mid'])) && ($alike[$item['mid']] < 2 ) ? t('like') : t('likes'));
+		if (count($like_list) > MAX_LIKERS) {
+			$like_list_part = array_slice($like_list, 0, MAX_LIKERS);
+			array_push($like_list_part, '<a href="#" data-toggle="modal" data-target="#likeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>');
+		} else {
+			$like_list_part = '';
+		}
+		$like_button_label = tt('Like','Likes',$like_count,'noun');
+
 		if (feature_enabled($conv->get_profile_owner(),'dislike')) {
 			$dislike_count = ((x($dlike,$item['mid'])) ? $dlike[$item['mid']] : '');
 			$dislike_list = ((x($dlike,$item['mid'])) ? $dlike[$item['mid'] . '-l'] : '');
-			$dislike_button_label = ((x($dlike,$item['mid'])) && ($dlike[$item['mid']] < 2) ? t('dislike') : t('dislikes'));
+			$dislike_button_label = tt('Dislike','Dislikes',$dislike_count,'noun');
+			if (count($dislike_list) > MAX_LIKERS) {
+				$dislike_list_part = array_slice($dislike_list, 0, MAX_LIKERS);
+				array_push($dislike_list_part, '<a href="#" data-toggle="modal" data-target="#dislikeModal-' . $this->get_id() . '"><b>' . t('View all') . '</b></a>');
+			} else {
+				$dislike_list_part = '';
+			}
 		}
 
 		$showlike    = ((x($alike,$item['mid'])) ? format_like($alike[$item['mid']],$alike[$item['mid'] . '-l'],'like',$item['mid']) : '');
@@ -261,10 +274,15 @@ class Item extends BaseObject {
 // end toolbar buttons
 			'like_count' => $like_count,
 			'like_list' => $like_list,
+			'like_list_part' => $like_list_part,
 			'like_button_label' => $like_button_label,
+			'like_modal_title' => t('Likes','noun'),
+			'dislike_modal_title' => t('Dislikes','noun'),
 			'dislike_count' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_count : ''),
 			'dislike_list' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list : ''),
+			'dislike_list_part' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_list_part : ''),
 			'dislike_button_label' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike_button_label : ''),
+			'modal_dismiss' => t('Close'),
 			'showlike' => $showlike,
 			'showdislike' => $showdislike,
 			'comment' => $this->get_comment_box($indent),
diff --git a/include/apps.php b/include/apps.php
new file mode 100644
index 000000000..9eb54af00
--- /dev/null
+++ b/include/apps.php
@@ -0,0 +1,387 @@
+<?php /** @file */
+
+/**
+ * apps
+ *
+ */
+
+require_once('include/plugin.php');
+
+function get_system_apps() {
+
+	$ret = array();
+	$files = glob('app/*.apd');
+	if($files) {
+		foreach($files as $f) {
+			$x = parse_app_description($f);
+			if($x) {
+				$ret[] = $x;
+			}
+		}
+	}
+	$files = glob('addon/*/*.apd');
+	if($files) {
+		foreach($files as $f) {
+			$n = basename($f,'.apd');
+			if(plugin_is_installed($n)) {
+				$x = parse_app_description($f);
+				if($x) {
+					$ret[] = $x;
+				}
+			}
+		}
+	}
+	usort($ret,'app_name_compare');
+	return $ret;
+
+}
+
+function app_name_compare($a,$b) {
+	return strcmp($a['name'],$b['name']);
+}
+
+function parse_app_description($f) {
+	$ret = array();
+
+	$baseurl = z_root();
+	$channel = get_app()->get_channel();
+	$address = (($channel) ? $channel['channel_address'] : '');
+		
+	//future expansion
+
+	$observer = get_app()->get_observer();
+	
+
+	$lines = @file($f);
+	if($lines) {
+		foreach($lines as $x) {
+			if(preg_match('/^([a-zA-Z].*?):(.*?)$/ism',$x,$matches)) {
+				$ret[$matches[1]] = trim(str_replace(array('$baseurl','$nick'),array($baseurl,$address),$matches[2]));
+			}
+		}
+	}
+
+
+
+	if(! $ret['photo'])
+		$ret['photo'] = $baseurl . '/' . get_default_profile_photo(80);
+
+
+	foreach($ret as $k => $v) {
+		if(strpos($v,'http') === 0)
+			$ret[$k] = zid($v);
+	}
+
+	if(array_key_exists('hover',$ret))
+		$ret['hover'] = str_replace(array('\'','"'),array('&#39;','&dquot;'),$ret['hover']);
+
+	if(array_key_exists('requires',$ret)) {
+		$require = trim(strtolower($ret['requires']));
+		switch($require) {
+			case 'nologin':
+				if(local_user())
+					unset($ret);
+				break;
+			case 'admin':
+				if(! is_site_admin())
+					unset($ret);
+				break;
+			case 'local_user':
+				if(! local_user())
+					unset($ret);
+				break;
+			case 'observer':
+				if(! $observer)
+					unset($ret);
+				break;
+			default:
+				if(! local_user() && feature_enabled(local_user(),$require))
+					unset($ret);
+				break;
+
+		}
+//		logger('require: ' . print_r($ret,true));
+	}
+	if($ret) {
+		translate_system_apps($ret);
+		return $ret;
+	}
+	return false;
+}	
+
+
+function translate_system_apps(&$arr) {
+	$apps = array(
+		'Site Admin' => t('Site Admin'),
+		'Bookmarks' => t('Bookmarks'),
+		'Address Book' => t('Address Book'),
+		'Login' => t('Login'),
+		'Channel Select' => t('Channel Select'), 
+		'Matrix' => t('Matrix'), 
+		'Settings' => t('Settings'),
+		'Files' => t('Files'),
+		'Webpages' => t('Webpages'),
+		'Channel Home' => t('Channel Home'), 
+		'Profile' => t('Profile'),
+		'Photos' => t('Photos'), 
+		'Events' => t('Events'), 
+		'Directory' => t('Directory'), 
+		'Help' => t('Help')
+	);
+
+	if(array_key_exists($arr['name'],$apps))
+		$arr['name'] = $apps[$arr['name']];
+
+}
+
+
+// papp is a portable app
+
+function app_render($papp,$mode = 'view') {
+
+	/**
+	 * modes:
+	 *    view: normal mode for viewing an app via bbcode from a conversation or page
+	 *       provides install/update button if you're logged in locally
+	 *    list: normal mode for viewing an app on the app page
+	 *       no buttons are shown
+	 *    edit: viewing the app page in editing mode provides a delete button
+	 */
+
+	$installed = false;
+
+	if(! $papp['photo'])
+		$papp['photo'] = z_root() . '/' . get_default_profile_photo(80);
+	
+	$papp['papp'] = papp_encode($papp);
+
+	foreach($papp as $k => $v) {
+		if(strpos($v,'http') === 0 && $k != 'papp')
+			$papp[$k] = zid($v);
+		if($k === 'desc')
+			$papp['desc'] = str_replace(array('\'','"'),array('&#39;','&dquot;'),$papp['desc']);
+
+	}
+
+	if(local_user()) {
+		$installed = app_installed(local_user(),$papp);
+	}
+
+	$install_action = (($installed) ? t('Update') : t('Install'));
+
+	return replace_macros(get_markup_template('app.tpl'),array(
+		'$app' => $papp,
+		'$purchase' => (($papp['page'] && (! $installed)) ? t('Purchase') : ''),
+		'$install' => ((local_user() && $mode == 'view') ? $install_action : ''),
+		'$edit' => ((local_user() && $installed && $mode == 'edit') ? t('Edit') : ''),
+		'$delete' => ((local_user() && $installed && $mode == 'edit') ? t('Delete') : '')
+	));
+}
+
+
+function app_install($uid,$app) {
+	$app['uid'] = $uid;
+	if(app_installed($uid,$app))
+		$x = app_update($app);
+	else
+		$x = app_store($app);
+
+	if($x['success'])
+		return $x['app_id'];
+
+	return false;
+}
+
+function app_destroy($uid,$app) {
+	if($uid && $app['guid']) {
+		$r = q("delete from app where app_id = '%s' and app_channel = %d limit 1",
+			dbesc($app['guid']),
+			intval($uid)
+		);
+	}
+}
+
+
+function app_installed($uid,$app) {
+
+	$r = q("select id from app where app_id = '%s' and app_version = '%s' and app_channel = %d limit 1",
+		dbesc((array_key_exists('guid',$app)) ? $app['guid'] : ''), 
+		dbesc((array_key_exists('version',$app)) ? $app['version'] : ''), 
+		intval($uid)
+	);
+	return(($r) ? true : false);
+
+}
+
+
+function app_list($uid) {
+	$r = q("select * from app where app_channel = %d order by app_name asc",
+		intval($uid)
+	);
+	return($r);
+}
+
+
+function app_decode($s) {
+	$x = base64_decode(str_replace(array('<br />',"\r","\n",' '),array('','','',''),$s));
+	return json_decode($x,true);
+}
+
+
+function app_store($arr) {
+
+	// logger('app_store: ' . print_r($arr,true));
+
+	$darray = array();
+	$ret = array('success' => false);
+
+	$darray['app_url'] = ((x($arr,'url')) ? $arr['url'] : '');
+	$darray['app_channel'] = ((x($arr,'uid')) ? $arr['uid'] : 0);
+	if((! $darray['app_url']) || (! $darray['app_channel']))
+		return $ret;
+
+	if($arr['photo'] && ! strstr($arr['photo'],z_root())) {
+		$x = import_profile_photo($arr['photo'],get_observer_hash(),true);
+		$arr['photo'] = $x[1];
+	}
+
+
+	$darray['app_id'] = ((x($arr,'guid')) ? $arr['guid'] : random_string(). '.' . get_app()->get_hostname());
+	$darray['app_sig'] = ((x($arr,'sig')) ? $arr['sig'] : '');
+	$darray['app_author'] = ((x($arr,'author')) ? $arr['author'] : get_observer_hash());
+	$darray['app_name'] = ((x($arr,'name')) ? escape_tags($arr['name']) : t('Unknown'));
+	$darray['app_desc'] = ((x($arr,'desc')) ? escape_tags($arr['desc']) : '');
+	$darray['app_photo'] = ((x($arr,'photo')) ? $arr['photo'] : z_root() . '/' . get_default_profile_photo(80));
+	$darray['app_version'] = ((x($arr,'version')) ? escape_tags($arr['version']) : '');
+	$darray['app_addr'] = ((x($arr,'addr')) ? escape_tags($arr['addr']) : '');
+	$darray['app_price'] = ((x($arr,'price')) ? escape_tags($arr['price']) : '');
+	$darray['app_page'] = ((x($arr,'page')) ? escape_tags($arr['page']) : '');
+
+	$r = q("insert into app ( app_id, app_sig, app_author, app_name, app_desc, app_url, app_photo, app_version, app_channel, app_addr, app_price, app_page ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s' )",
+		dbesc($darray['app_id']),
+		dbesc($darray['app_sig']),
+		dbesc($darray['app_author']),
+		dbesc($darray['app_name']),
+		dbesc($darray['app_desc']),
+		dbesc($darray['app_url']),
+		dbesc($darray['app_photo']),
+		dbesc($darray['app_version']),
+		intval($darray['app_channel']),
+		dbesc($darray['app_addr']),
+		dbesc($darray['app_price']),
+		dbesc($darray['app_page'])
+	);
+	if($r) {
+		$ret['success'] = true;
+		$ret['app_id'] = $darray['app_id'];
+	}
+	return $ret;
+}
+
+
+function app_update($arr) {
+
+	$darray = array();
+	$ret = array('success' => false);
+
+	$darray['app_url'] = ((x($arr,'url')) ? $arr['url'] : '');
+	$darray['app_channel'] = ((x($arr,'uid')) ? $arr['uid'] : 0);
+	$darray['app_id'] = ((x($arr,'guid')) ? $arr['guid'] : 0);
+	if((! $darray['app_url']) || (! $darray['app_channel']) || (! $darray['app_id']))
+		return $ret;
+
+	if($arr['photo'] && ! strstr($arr['photo'],z_root())) {
+		$x = import_profile_photo($arr['photo'],get_observer_hash(),true);
+		$arr['photo'] = $x[1];
+	}
+
+	$darray['app_sig'] = ((x($arr,'sig')) ? $arr['sig'] : '');
+	$darray['app_author'] = ((x($arr,'author')) ? $arr['author'] : get_observer_hash());
+	$darray['app_name'] = ((x($arr,'name')) ? escape_tags($arr['name']) : t('Unknown'));
+	$darray['app_desc'] = ((x($arr,'desc')) ? escape_tags($arr['desc']) : '');
+	$darray['app_photo'] = ((x($arr,'photo')) ? $arr['photo'] : z_root() . '/' . get_default_profile_photo(80));
+	$darray['app_version'] = ((x($arr,'version')) ? escape_tags($arr['version']) : '');
+	$darray['app_addr'] = ((x($arr,'addr')) ? escape_tags($arr['addr']) : '');
+	$darray['app_price'] = ((x($arr,'price')) ? escape_tags($arr['price']) : '');
+	$darray['app_page'] = ((x($arr,'page')) ? escape_tags($arr['page']) : '');
+
+	$r = q("update app set app_sig = '%s', app_author = '%s', app_name = '%s', app_desc = '%s', app_url = '%s', app_photo = '%s', app_version = '%s', app_addr = '%s', app_price = '%s', app_page = '%s' where app_id = '%s' and app_channel = %d limit 1",
+		dbesc($darray['app_sig']),
+		dbesc($darray['app_author']),
+		dbesc($darray['app_name']),
+		dbesc($darray['app_desc']),
+		dbesc($darray['app_url']),
+		dbesc($darray['app_photo']),
+		dbesc($darray['app_version']),
+		dbesc($darray['app_addr']),
+		dbesc($darray['app_price']),
+		dbesc($darray['app_page']),
+		dbesc($darray['app_id']),
+		intval($darray['app_channel'])
+	);
+	if($r) {
+		$ret['success'] = true;
+		$ret['app_id'] = $darray['app_id'];
+	}
+
+	return $ret;
+
+}
+
+
+function app_encode($app,$embed = false) {
+
+	$ret = array();
+
+	if($app['app_id'])
+		$ret['guid'] = $app['app_id'];
+
+	if($app['app_id'])
+		$ret['guid'] = $app['app_id'];
+
+	if($app['app_sig'])
+		$ret['sig'] = $app['app_sig'];
+
+	if($app['app_author'])
+		$ret['author'] = $app['app_author'];
+
+	if($app['app_name'])
+		$ret['name'] = $app['app_name'];
+
+	if($app['app_desc'])
+		$ret['desc'] = $app['app_desc'];
+
+	if($app['app_url'])
+		$ret['url'] = $app['app_url'];
+
+	if($app['app_photo'])
+		$ret['photo'] = $app['app_photo'];
+
+	if($app['app_version'])
+		$ret['version'] = $app['app_version'];
+
+	if($app['app_addr'])
+		$ret['addr'] = $app['app_addr'];
+
+	if($app['app_price'])
+		$ret['price'] = $app['app_price'];
+
+	if($app['app_page'])
+		$ret['page'] = $app['app_page'];
+
+//	if($app['alt_url'])
+//		$ret['alt_url'] = $app['alt_url'];
+
+	if(! $embed)
+		return $ret;
+
+	$j = json_encode($ret);
+	return '[app]' . chunk_split(base64_encode($j),72,"\n") . '[/app]';
+
+}
+
+
+function papp_encode($papp) {
+	return chunk_split(base64_encode(json_encode($papp)),72,"\n");
+
+}
\ No newline at end of file
diff --git a/include/auth.php b/include/auth.php
index c21705c99..e8f13d0fb 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -117,13 +117,14 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 
 		// first check if we're enforcing that sessions can't change IP address
 
-		$check = get_config('system','paranoia');
-		// extra paranoia - if the IP changed, log them out
-		if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
-			logger('Session address changed. Paranoid setting in effect, blocking session. ' 
-				. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
-			nuke_session();
-			goaway(z_root());
+		if($_SESSION['addr'] != $_SERVER['REMOTE_ADDR']) {
+			logger('SECURITY: Session IP address changed: ' . $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
+			if(get_config('system','paranoia')) {
+				logger('Session address changed. Paranoid setting in effect, blocking session. ' 
+					. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
+				nuke_session();
+				goaway(z_root());
+			}
 		}
 
 		$r = q("select * from account where account_id = %d limit 1",
diff --git a/include/bbcode.php b/include/bbcode.php
index 326676b72..674b5f45a 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -63,7 +63,7 @@ function bb_spacefy($st) {
 }
 
 // The previously spacefied [noparse][ i ]italic[ /i ][/noparse],
-// now turns back and the [noparse] tags are trimed
+// now turns back and the [noparse] tags are trimmed
 // returning [i]italic[/i]
 
 function bb_unspacefy_and_trim($st) {
@@ -166,6 +166,15 @@ function bb_parse_crypt($match) {
 
 }
 
+function bb_parse_app($match) {
+	require_once('include/apps.php');
+
+	$app = app_decode($match[1]);
+	if($app)
+		return app_render($app);
+
+}
+
 function bb_qr($match) {
 	return '<img class="zrl" src="' . z_root() . '/photo/qr?f=&qr=' . urlencode($match[1]) . '" alt="' . t('QR code') . '" title="' . htmlspecialchars($match[1],ENT_QUOTES,'UTF-8') . '" />';
 } 	
@@ -507,6 +516,30 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		$Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1px;\">$2</span>",$Text);
 		$Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","<span style=\"font-size: $1;\">$2</span>",$Text);
 	}
+	// Check for h1
+	if (strpos($Text,'[h1]') !== false) {
+		$Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism",'<h1>$1</h1>',$Text);
+	}
+	// Check for h2
+	if (strpos($Text,'[h2]') !== false) {
+		$Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism",'<h2>$1</h2>',$Text);
+	}
+	// Check for h3
+	if (strpos($Text,'[h3]') !== false) {
+		$Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism",'<h3>$1</h3>',$Text);
+	}
+	// Check for h4
+	if (strpos($Text,'[h4]') !== false) {
+		$Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism",'<h4>$1</h4>',$Text);
+	}
+	// Check for h5
+	if (strpos($Text,'[h5]') !== false) {
+		$Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text);
+	}
+	// Check for h6
+	if (strpos($Text,'[h6]') !== false) {
+		$Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
+	}
 	// Check for centered text
 	if (strpos($Text,'[/center]') !== false) {	
 	$Text = preg_replace("(\[center\](.*?)\[\/center\])ism","<div style=\"text-align:center;\">$1</div>",$Text);
@@ -606,24 +639,24 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	// Images
 	// [img]pathtoimage[/img]
 	if (strpos($Text,'[/img]') !== false) {
-		$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text);
 	}
 	if (strpos($Text,'[/zmg]') !== false) {
-		$Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$1" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img class="zrl" style="max-width=100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text);
 	}
 
 	// [img float={left, right}]pathtoimage[/img]
 	if (strpos($Text,'[/img]') !== false) {
-		$Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '<img src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text);
 	}
 	if (strpos($Text,'[/img]') !== false) {
-		$Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '<img src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text);
 	}
 	if (strpos($Text,'[/zmg]') !== false) {
-		$Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '<img style="max-width=100%;" class="zrl" src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text);
 	}
 	if (strpos($Text,'[/zmg]') !== false) {
-		$Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text);
+		$Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '<img style="max-width=100%;" class="zrl" src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text);
 	}
 
 	// [img=widthxheight]pathtoimage[/img]
@@ -660,6 +693,11 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		$Text = preg_replace_callback("/\[crypt (.*?)\](.*?)\[\/crypt\]/ism", 'bb_parse_crypt', $Text);
 	}
 
+	if(strpos($Text,'[/app]') !== false) {
+		$Text = preg_replace_callback("/\[app\](.*?)\[\/app\]/ism",'bb_parse_app', $Text);
+	}
+
+
 	// html5 video and audio
 	if (strpos($Text,'[/video]') !== false) {	
 		$Text = preg_replace_callback("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", 'tryzrlvideo', $Text);
diff --git a/include/items.php b/include/items.php
index 7a94336be..1c44b7df5 100755
--- a/include/items.php
+++ b/include/items.php
@@ -239,6 +239,31 @@ function red_unescape_codeblock($m) {
 }
 
 
+function red_zrlify_img_callback($matches) {
+	$m = @parse_url($matches[2]);
+	$zrl = false;
+	if($m['host']) {
+		$r = q("select hubloc_url from hubloc where hubloc_host = '%s' limit 1",
+			dbesc($m['host'])
+		);
+		if($r)
+			$zrl = true;
+	}
+
+	$t = strip_zids($matches[2]);
+	if($t !== $matches[2]) {
+		$zrl = true;
+		$matches[2] = $t;
+	}
+
+	if($zrl)
+		return '[zmg' . $matches[1] . ']' . $matches[2] . '[/zmg]';
+	return $matches[0];
+}
+
+
+
+
 /**
  * @function post_activity_item($arr)
  *
@@ -2413,7 +2438,7 @@ function tag_deliver($uid,$item_id) {
 
 	if($terms) {
 		foreach($terms as $term) {
-			if((strcasecmp($term['term'],$u[0]['channel_name']) == 0) && link_compare($term['url'],$link)) {			
+			if(link_compare($term['url'],$link)) {			
 				$mention = true;
 				break;
 			}
@@ -2449,11 +2474,11 @@ function tag_deliver($uid,$item_id) {
 		$tagged = false;
 		$plustagged = false;
 
-		$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'],'/') . '\[\/zrl\]/';
+		$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'],'/') . '\[\/zrl\]/';
 		if(preg_match($pattern,$body,$matches)) 
 			$tagged = true;
 
-		$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'] . '+','/') . '\[\/zrl\]/';
+		$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/';
 		if(preg_match($pattern,$body,$matches)) 
 			$plustagged = true;
 
@@ -2582,7 +2607,7 @@ function tgroup_check($uid,$item) {
 
 	if($terms) {
 		foreach($terms as $term) {
-			if(($term['term'] == $u[0]['channel_name']) && link_compare($term['url'],$link)) {			
+			if(link_compare($term['url'],$link)) {			
 				$mention = true;
 				break;
 			}
@@ -2600,7 +2625,7 @@ function tgroup_check($uid,$item) {
 
 	$body = preg_replace('/\[share(.*?)\[\/share\]/','',$item['body']);
 
-	$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($u[0]['channel_name'] . '+','/') . '\[\/zrl\]/';
+	$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/';
 
 	if(! preg_match($pattern,$body,$matches)) {
 		logger('tgroup_check: mention was in a reshare - ignoring');
diff --git a/include/js_strings.php b/include/js_strings.php
index fef84077e..1b62266d6 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -14,6 +14,7 @@ function js_strings() {
 		'$passphrase'  => t('Secret Passphrase'),
 		'$passhint'    => t('Passphrase hint'),
 		'$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'),
+		'$closeAll'    => t('close all'),
 
 		'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''),
 		'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''),
diff --git a/include/language.php b/include/language.php
index b43f5aacc..cfaa855dd 100644
--- a/include/language.php
+++ b/include/language.php
@@ -145,25 +145,29 @@ function load_translation_table($lang, $install = false) {
 /**
  * @brief translate string if translation exists.
  *
- * @param s string that should get translated
+ * @param $s string that should get translated
+ * @param $ctx optional context to appear in po file
  * @return translated string if exsists, otherwise s
+ *
  */
-function t($s) {
+function t($s,$ctx = '') {
 	global $a;
 
-	if(x($a->strings,$s)) {
-		$t = $a->strings[$s];
+	$cs = $ctx?"__ctx:".$ctx."__ ".$s:$s;
+	if(x($a->strings,$cs)) {
+		$t = $a->strings[$cs];
 		return is_array($t) ? $t[0] : $t;
 	}
 	return $s;
 }
 
 
-function tt($singular, $plural, $count){
+function tt($singular, $plural, $count, $ctx = ''){
 	$a = get_app();
 
-	if(x($a->strings,$singular)) {
-		$t = $a->strings[$singular];
+	$cs = $ctx?"__ctx:".$ctx."__ ".$singular:$singular;
+	if(x($a->strings,$cs)) {
+		$t = $a->strings[$cs];
 		$f = 'string_plural_select_' . str_replace('-', '_', $a->language);
 		if(! function_exists($f))
 			$f = 'string_plural_select_default';
@@ -210,8 +214,10 @@ function detect_language($s) {
 	if($min_confidence === false)
 		$min_confidence = LANGUAGE_DETECT_MIN_CONFIDENCE;
 
+	// embedded apps have long base64 strings which will trip up the detector.
+	$naked_body = preg_replace('/\[app\](.*?)\[\/app\]/','',$s);
 	// strip off bbcode
-	$naked_body = preg_replace('/\[(.+?)\]/', '', $s);
+	$naked_body = preg_replace('/\[(.+?)\]/', '', $naked_body);
 	if(mb_strlen($naked_body) < intval($min_length)) {
 		logger('detect language: string length less than ' . intval($min_length), LOGGER_DATA);
 		return '';
diff --git a/include/nav.php b/include/nav.php
index a97b434bc..2d0d43d5a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -138,8 +138,8 @@ EOT;
 	if(! get_config('system','hide_help'))
 		$nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
 
-	if(count($a->get_apps()) > 0)
-		$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
+
+	$nav['apps'] = array('apps', t('Apps'), "", t('Applications, utilities, links, games'));
 
 	$nav['search'] = array('search', t('Search'), "", t('Search site content'));
 
@@ -221,7 +221,6 @@ EOT;
 		'$userinfo' => $x['usermenu'],
 		'$localuser' => local_user(),
 		'$sel' => 	$a->nav_sel,
-		'$apps' => $a->get_apps(),
 		'$pleasewait' => t('Please wait...')
 	));
 
diff --git a/include/plugin.php b/include/plugin.php
index 9982a48a2..ace00d43a 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -94,6 +94,17 @@ function load_plugin($plugin) {
 
 }
 
+function plugin_is_installed($name) {
+	$r = q("select name from addon where name = '%s' and installed = 1 limit 1",
+		dbesc($name)
+	);
+	if($r)
+		return true;
+	return false;
+}
+
+
+
 // reload all updated plugins
 
 function reload_plugins() {
diff --git a/include/session.php b/include/session.php
index be1ec5ee7..b531688e2 100644
--- a/include/session.php
+++ b/include/session.php
@@ -11,7 +11,11 @@ $session_expire = 180000;
 
 function new_cookie($time) {
     $old_sid = session_id();
-    session_set_cookie_params("$time");
+
+// ??? This shouldn't have any effect if called after session_start()
+// We probably need to set the session expiration and change the PHPSESSID cookie.
+
+    session_set_cookie_params($time);
     session_regenerate_id(false);
 
     q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid));
diff --git a/include/widgets.php b/include/widgets.php
index 1b0e140c0..1043acce0 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -74,6 +74,18 @@ function widget_collections($args) {
 }
 
 
+function widget_appselect($arr) {
+	return replace_macros(get_markup_template('app_select.tpl'),array(
+		'$title' => t('Apps'),
+		'$system' => t('System'),
+		'$personal' => t('Personal'),
+		'$new' => t('Create Personal App'),
+		'$edit' => t('Edit Personal App')
+	));
+}
+
+
+
 function widget_suggestions($arr) {
 
 	if((! local_user()) || (! feature_enabled(local_user(),'suggest')))
@@ -719,4 +731,51 @@ $(document).ready(function() {
 EOT;
 return $o;
 
-}
\ No newline at end of file
+}
+
+
+/**
+ * @function widget_photo($arr)
+ *    widget to display a single photo.
+ * @param array $arr;
+ *    'src' => URL of photo
+ *    'zrl' => true or false, use zid in url
+ *    'style' => CSS string
+ * URL must be an http or https URL
+ */
+
+
+function widget_photo($arr) {
+
+	$style = $zrl = false;
+	$params = '';
+	if(array_key_exists('src',$arr) && isset($arr['src']))
+		$url = $arr['src'];
+
+	if(strpos($url,'http') !== 0)
+		return '';
+
+	if(array_key_exists('style',$arr) && isset($arr['style']))
+		$style = $arr['style'];
+
+	// ensure they can't sneak in an eval(js) function
+
+	if(strpos($style,'(') !== false)
+		return '';
+
+	if(array_key_exists('zrl',$arr) && isset($arr['zrl']))
+		$zrl = (($arr['zrl']) ? true : false);
+
+	if($zrl)
+		$url = zid($url);
+
+	$o = '<div class="widget">';
+
+	$o .= '<img ' . (($zrl) ? ' class="zrl" ' : '') 
+				  . (($style) ? ' style="' . $style . '"' : '') 
+				  . ' src="' . $url . '" />';
+
+	$o .= '</div>';
+
+	return $o;
+}
diff --git a/include/zot.php b/include/zot.php
index 9e69aea96..869943a24 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1501,6 +1501,9 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
 			$arr['uid'] = $channel['channel_id'];
 			$item_result = item_store($arr);
 			$item_id = $item_result['item_id'];
+			$parr = array('item_id' => $item_id,'item' => $arr,'sender' => $sender,'channel' => $channel);
+			call_hooks('activity_received',$parr);
+
 			add_source_route($item_id,$sender['hash']);
 
 			$result[] = array($d['hash'],(($item_id) ? 'posted' : 'storage failed:' . $item_result['message']),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);