From c533c62c640cf081c44bf0489680ee3be3e45ecb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 5 Mar 2017 14:47:20 -0800
Subject: [PATCH 001/299] some event work

---
 include/bbcode.php | 1 +
 include/event.php  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/include/bbcode.php b/include/bbcode.php
index c0033f280..5aa61760f 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1174,6 +1174,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 
 		$Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text); 
 
+		$Text = preg_replace("/\event\](.*?)\[\/event\]/ism",'',$Text);
 		$Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text);
 		$Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text);
 		$Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text);
diff --git a/include/event.php b/include/event.php
index a9634d7a5..726eb667c 100644
--- a/include/event.php
+++ b/include/event.php
@@ -210,6 +210,10 @@ function format_event_bbcode($ev) {
 
 	$o = '';
 
+	if($ev['event_vdata']) {
+		$o .= '[event]' . $ev['event_vdata'] . '[/event]';
+	}
+
 	if($ev['summary'])
 		$o .= '[event-summary]' . $ev['summary'] . '[/event-summary]';
 

From 9ca53fdc5d5d3515a4074527a619a6d6f2ef55cf Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 7 Mar 2017 17:44:19 -0800
Subject: [PATCH 002/299] DCV stuff

---
 include/markdown.php | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/include/markdown.php b/include/markdown.php
index 7e1f1c42c..de95544af 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -314,7 +314,11 @@ function bb2diaspora_itemwallwall(&$item,$uplink = false) {
 	// We will provide wallwall (embedded author on the Diaspora side) if
 	//  1. It is a wall-to-wall post
 	//  2. A comment arrived which has no Diaspora signature info
+	//  3. The channel allows us to send unsigned activities
 
+	$dcv = get_pconfig($item['uid'],'system','diaspora_send_unsigned');
+	if(! $dcv)
+		return;
 
 	$wallwall = false;
 	$author_exists = true;
@@ -346,7 +350,8 @@ function bb2diaspora_itemwallwall(&$item,$uplink = false) {
 	if($uplink)
 		$wallwall = true;
 
-	if(($wallwall) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_s']) {
+	if(($wallwall) && (is_array($item['author'])) && $item['author']['xchan_url'] 
+		&& $item['author']['xchan_name'] && $item['author']['xchan_photo_s']) {
 		logger('bb2diaspora_itemwallwall: wall to wall post',LOGGER_DEBUG);
 		// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
 		$item['body'] = "\n\n"
@@ -373,25 +378,6 @@ function bb2diaspora_itembody($item, $force_update = false, $have_channel = fals
 
 	$matches = array();
 
-	if(($item['diaspora_meta']) && (! $force_update)) {
-		$diaspora_meta = json_decode($item['diaspora_meta'],true);
-		if($diaspora_meta) {
-			if(array_key_exists('iv',$diaspora_meta)) {
-				$key = get_config('system','prvkey');
-				$meta = json_decode(crypto_unencapsulate($diaspora_meta,$key),true);
-			}
-			else {
-				$meta = $diaspora_meta;
-			}
-			if($meta) {
-				logger('bb2diaspora_itembody: cached ');
-				$newitem = $item;
-				$newitem['body'] = $meta['body'];
-				return $newitem['body'];
-			}
-		}
-	}
-
 	create_export_photo_body($item);
 
 	$newitem = $item;

From 15ab331b6b5793d04979e204af92084e8d5bb03c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 8 Mar 2017 17:35:19 -0800
Subject: [PATCH 003/299] move all the diaspora content hacks to the diaspora
 plugin

---
 include/markdown.php | 417 +------------------------------------------
 1 file changed, 9 insertions(+), 408 deletions(-)

diff --git a/include/markdown.php b/include/markdown.php
index de95544af..841540357 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -81,70 +81,6 @@ function share_unshield($m) {
 	return str_replace($m[1], base64url_decode($x), $m[0]);
 }
 
-
-function diaspora_mention_callback($matches) {
-
-	$webbie = $matches[2] . '@' . $matches[3];
-	$link = '';
-	if($webbie) {
-		$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
-			dbesc($webbie)
-		);
-		if(! $r) {
-			$x = discover_by_webbie($webbie);
-			if($x) {
-				$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
-					dbesc($webbie)
-				);
-			}
-		}
-		if($r)
-			$link = $r[0]['xchan_url'];
-	}
-	if(! $link)
-		$link = 'https://' . $matches[3] . '/u/' . $matches[2];
-
-	if($r && $r[0]['hubloc_network'] === 'zot')
-		return '@[zrl=' . $link . ']' . trim($matches[1]) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/zrl]' ;
-	else
-		return '@[url=' . $link . ']' . trim($matches[1]) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/url]' ;
-
-}
-
-function diaspora_mention_callback2($matches) {
-
-	$webbie = $matches[1] . '@' . $matches[2];
-	$link = '';
-	if($webbie) {
-		$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
-			dbesc($webbie)
-		);
-		if(! $r) {
-			$x = discover_by_webbie($webbie);
-			if($x) {
-				$r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1",
-					dbesc($webbie)
-				);
-			}
-		}
-		if($r)
-			$link = $r[0]['xchan_url'];
-	}
-
-	$name = (($r) ? $r[0]['xchan_name'] : $matches[1]);
-
-	if(! $link)
-		$link = 'https://' . $matches[2] . '/u/' . $matches[1];
-
-	if($r && $r[0]['hubloc_network'] === 'zot')
-		return '@[zrl=' . $link . ']' . trim($name) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/zrl]' ;
-	else
-		return '@[url=' . $link . ']' . trim($name) . ((substr($matches[0],-1,1) === '+') ? '+' : '') . '[/url]' ;
-
-}
-
-
-
 /**
  * @brief
  *
@@ -157,28 +93,29 @@ function diaspora_mention_callback2($matches) {
  * @param boolean $use_zrl default false
  * @return string
  */
-function markdown_to_bb($s, $use_zrl = false) {
 
-	$s = str_replace("&#xD;","\r",$s);
-	$s = str_replace("&#xD;\n&gt;","",$s);
+function markdown_to_bb($s, $use_zrl = false, $options = []) {
+
 
 	if(is_array($s)) {
 		btlogger('markdown_to_bb called with array. ' . print_r($s,true), LOGGER_NORMAL, LOG_WARNING);
 		return '';
 	}
 
+
+	$s = str_replace("&#xD;","\r",$s);
+	$s = str_replace("&#xD;\n&gt;","",$s);
+
 	$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
 
 	// if empty link text replace with the url
 	$s = preg_replace("/\[\]\((.*?)\)/ism",'[$1]($1)',$s);
 
-	// first try plustags
+	$x = [ 'text' => $s , 'zrl' => $use_zrl, 'options' => $options ];	
 
-	$s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}\+/','diaspora_mention_callback',$s);
-	$s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}/','diaspora_mention_callback',$s);
+	call_hooks('markdown_to_bb_init',$x);
 
-	$s = preg_replace_callback('/\@\{(.+?)\@(.+?)\}\+/','diaspora_mention_callback2',$s);
-	$s = preg_replace_callback('/\@\{(.+?)\@(.+?)\}/','diaspora_mention_callback2',$s);
+	$s = $x['text'];
 
 	// Escaping the hash tags - doesn't always seem to work
 	// $s = preg_replace('/\#([^\s\#])/','\\#$1',$s);
@@ -193,9 +130,6 @@ function markdown_to_bb($s, $use_zrl = false) {
 
 	$s = html2bbcode($s);
 
-	// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
-	$s = str_replace('&#x2672;',html_entity_decode('&#x2672;',ENT_QUOTES,'UTF-8'),$s);
-
 	// Convert everything that looks like a link to a link
 	if($use_zrl) {
 		$s = str_replace(array('[img','/img]'),array('[zmg','/zmg]'),$s);
@@ -217,336 +151,3 @@ function markdown_to_bb($s, $use_zrl = false) {
 }
 
 
-function stripdcode_br_cb($s) {
-	return '[code]' . str_replace('<br />', "\n\t", $s[1]) . '[/code]';
-}
-
-
-//////////////////////
-// The following "diaspora_ul" and "diaspora_ol" are only appropriate for the
-// pre-Markdownify conversion. If Markdownify isn't used, use the non-Markdownify
-// versions below
-//////////////////////
-/*
-function diaspora_ul($s) {
-	// Replace "[*]" followed by any number (including zero) of
-	// spaces by "* " to match Diaspora's list format
-	if( strpos($s[0], "[list]") === 0 )
-		return '<ul class="listbullet" style="list-style-type: circle;">' . preg_replace("/\[\*\]( *)/", "* ", $s[1]) . '</ul>';
-	elseif( strpos($s[0], "[ul]") === 0 )
-		return '<ul class="listbullet" style="list-style-type: circle;">' . preg_replace("/\[\*\]( *)/", "* ", $s[1]) . '</ul>';
-	else
-		return $s[0];
-}
-
-
-function diaspora_ol($s) {
-	// A hack: Diaspora will create a properly-numbered ordered list even
-	// if you use '1.' for each element of the list, like:
-	//		1. First element
-	//		1. Second element
-	//		1. Third element
-	if( strpos($s[0], "[list=1]") === 0 )
-		return '<ul class="listdecimal" style="list-style-type: decimal;">' . preg_replace("/\[\*\]( *)/", "1. ", $s[1]) . '</ul>';
-	elseif( strpos($s[0], "[list=i]") === 0 )
-		return '<ul class="listlowerroman" style="list-style-type: lower-roman;">' . preg_replace("/\[\*\]( *)/", "1. ", $s[1]) . '</ul>';
-	elseif( strpos($s[0], "[list=I]") === 0 )
-		return '<ul class="listupperroman" style="list-style-type: upper-roman;">' . preg_replace("/\[\*\]( *)/", "1. ", $s[1]) . '</ul>';
-	elseif( strpos($s[0], "[list=a]") === 0 )
-		return '<ul class="listloweralpha" style="list-style-type: lower-alpha;">' . preg_replace("/\[\*\]( *)/", "1. ", $s[1]) . '</ul>';
-	elseif( strpos($s[0], "[list=A]") === 0 )
-		return '<ul class="listupperalpha" style="list-style-type: upper-alpha;">' . preg_replace("/\[\*\]( *)/", "1. ", $s[1]) . '</ul>';
-	elseif( strpos($s[0], "[ol]") === 0 )
-		return '<ul class="listdecimal" style="list-style-type: decimal;">' . preg_replace("/\[\*\]( *)/", "1. ", $s[1]) . '</ul>';
-	else
-		return $s[0];
-}
-*/
-
-//////////////////////
-// Non-Markdownify versions of "diaspora_ol" and "diaspora_ul"
-//////////////////////
-/**
- * @brief
- *
- * Replace "[\\*]" followed by any number (including zero) of
- * spaces by "* " to match Diaspora's list format.
- *
- * @param string $s
- * @return string
- */
-function diaspora_ul($s) {
-	return preg_replace("/\[\\\\\*\]( *)/", "* ", $s[1]);
-}
-
-/**
- * @brief
- *
- * A hack: Diaspora will create a properly-numbered ordered list even
- * if you use '1.' for each element of the list, like:
- * \code
- * 1. First element
- * 1. Second element
- * 1. Third element
- * \endcode
- * @param string $s
- * @return string
- */
-function diaspora_ol($s) {
-	return preg_replace("/\[\\\\\*\]( *)/", "1. ", $s[1]);
-}
-
-function bb2dmention_callback($match) {
-
-	$r = q("select xchan_addr from xchan where xchan_url = '%s'",
-		dbesc($match[2])
-	);
-
-	if($r)
-		return '@{' . $match[3] . ' ; ' . $r[0]['xchan_addr'] . '}';
-
-	return '@' . $match[3];
-}
-
-
-function bb2diaspora_itemwallwall(&$item,$uplink = false) {
-
-	// We will provide wallwall (embedded author on the Diaspora side) if
-	//  1. It is a wall-to-wall post
-	//  2. A comment arrived which has no Diaspora signature info
-	//  3. The channel allows us to send unsigned activities
-
-	$dcv = get_pconfig($item['uid'],'system','diaspora_send_unsigned');
-	if(! $dcv)
-		return;
-
-	$wallwall = false;
-	$author_exists = true;
-
-	if(! array_key_exists('author',$item)) {
-		$author_exists = false;
-		logger('bb2diaspora_itemwallwall: no author');
-		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
-			dbesc($item['author_xchan'])
-		);
-		if($r)
-			$item['author'] = $r[0];
-	}
-
-	$has_meta = false;
-	if($item['diaspora_meta'] || get_iconfig($item,'diaspora','fields'))
-		$has_meta = true;
-
-	if($item['author_xchan'] != $item['owner_xchan']) {
-		if($item['mid'] == $item['parent_mid'])
-			$wallwall = true;
-		else {
-			if(! $has_meta) {
-				$wallwall = true;
-			}
-		}
-	}
-
-	if($uplink)
-		$wallwall = true;
-
-	if(($wallwall) && (is_array($item['author'])) && $item['author']['xchan_url'] 
-		&& $item['author']['xchan_name'] && $item['author']['xchan_photo_s']) {
-		logger('bb2diaspora_itemwallwall: wall to wall post',LOGGER_DEBUG);
-		// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
-		$item['body'] = "\n\n"
-			. '[quote]'
-			. '[img]' . $item['author']['xchan_photo_s'] . '[/img]'
-			. ' '
-			. '[url=' . $item['author']['xchan_url'] . '][b]' . $item['author']['xchan_name'] . '[/b][/url]' . "\n\n"
-			. $item['body']
-			. '[/quote]';
-	}
-
-	// $item['author'] might cause a surprise further down the line if it wasn't expected to be here.
-
-	if(! $author_exists)
-		unset($item['author']);
-}
-
-
-function bb2diaspora_itembody($item, $force_update = false, $have_channel = false, $uplink = false) {
-
-	if(! get_iconfig($item,'diaspora','fields')) {
-		$force_update = true;
-	}
-
-	$matches = array();
-
-	create_export_photo_body($item);
-
-	$newitem = $item;
-
-	if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
-		$key = get_config('system','prvkey');
-		$b = json_decode($item['body'],true);
-		// if called from diaspora_process_outbound, this decoding has already been done.
-		// Everything else that calls us will not yet be decoded.
-		if($b && is_array($b) && array_key_exists('iv',$b)) {
-			$newitem['title'] = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : '');
-			$newitem['body']  = (($item['body'])  ? crypto_unencapsulate(json_decode($item['body'],true),$key) : '');
-		}
-	}
-
-	if(! $have_channel)
-		bb2diaspora_itemwallwall($newitem,$uplink);
-
-	$title = $newitem['title'];
-	$body  = preg_replace('/\#\^http/i', 'http', $newitem['body']);
-
-	// protect tags and mentions from hijacking
-
-	if(intval(get_pconfig($item['uid'],'system','prevent_tag_hijacking'))) {
-		$new_tag	 = html_entity_decode('&#x22d5;',ENT_COMPAT,'UTF-8');
-		$new_mention = html_entity_decode('&#xff20;',ENT_COMPAT,'UTF-8');
-
-		// #-tags
-		$body = preg_replace('/\#\[url/i', $new_tag . '[url', $body);
-		$body = preg_replace('/\#\[zrl/i', $new_tag . '[zrl', $body);
-		// @-mentions
-		$body = preg_replace('/\@\!?\[url/i', $new_mention . '[url', $body);
-		$body = preg_replace('/\@\!?\[zrl/i', $new_mention . '[zrl', $body);
-	}
-
-	// remove multiple newlines
-	do {
-		$oldbody = $body;
-		$body = str_replace("\n\n\n", "\n\n", $body);
-	} while ($oldbody != $body);
-
-	$body = bb2diaspora($body);
-
-	if(strlen($title))
-		$body = "## " . $title . "\n\n" . $body;
-
-	if($item['attach']) {
-		$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item['attach'], $matches, PREG_SET_ORDER);
-		if($cnt) {
-			$body .= "\n" . t('Attachments:') . "\n";
-			foreach($matches as $mtch) {
-				$body .= '[' . $mtch[3] . '](' . $mtch[1] . ')' . "\n";
-			}
-		}
-	}
-
-//	logger('bb2diaspora_itembody : ' . $body, LOGGER_DATA);
-
-	return html_entity_decode($body);
-}
-
-function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
-
-	// Re-enabling the converter again.
-	// The bbcode parser now handles youtube-links (and the other stuff) correctly.
-	// Additionally the html code is now fixed so that lists are now working.
-
-	/*
-	 * Transform #tags, strip off the [url] and replace spaces with underscore
-	 */
-	$Text = preg_replace_callback('/#\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i', create_function('$match',
-		'return \'#\'. str_replace(\' \', \'_\', $match[3]);'
-	), $Text);
-
-	$Text = preg_replace('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text);
-
-	$Text = preg_replace_callback('/\@\!?\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', 'bb2dmention_callback', $Text);
-
-	// strip map tags, as the rendering is performed in bbcode() and the resulting output
-	// is not compatible with Diaspora (at least in the case of openstreetmap and probably
-	// due to the inclusion of an html iframe)
-
-	$Text = preg_replace("/\[map\=(.*?)\]/ism", '$1', $Text);
-	$Text = preg_replace("/\[map\](.*?)\[\/map\]/ism", '$1', $Text);
-
-	// Converting images with size parameters to simple images. Markdown doesn't know it.
-	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
-
-	// the following was added on 10-January-2012 due to an inability of Diaspora's
-	// new javascript markdown processor to handle links with images as the link "text"
-	// It is not optimal and may be removed if this ability is restored in the future
-	//if ($fordiaspora)
-	//	$Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
-	//				"[url]$1[/url]\n[img]$2[/img]", $Text);
-
-	// Convert it to HTML - don't try oembed
-	$Text = bbcode($Text, $preserve_nl, false);
-
-	// Markdownify does not preserve previously escaped html entities such as <> and &.
-
-	$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
-
-	// Now convert HTML to Markdown
-	$md = new Converter(Converter::LINK_AFTER_CONTENT, false, false);
-	$Text = $md->parseString($Text);
-
-
-	// It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
-
-	$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
-
-	// If the text going into bbcode() has a plain URL in it, i.e.
-	// with no [url] tags around it, it will come out of parseString()
-	// looking like: <http://url.com>, which gets removed by strip_tags().
-	// So take off the angle brackets of any such URL
-	$Text = preg_replace("/<http(.*?)>/is", "http$1", $Text);
-
-	// Remove empty zrl links
-	$Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text);
-
-	// Remove all unconverted tags
-	$Text = strip_tags($Text);
-
-	// Remove any leading or trailing whitespace, as this will mess up
-	// the Diaspora signature verification and cause the item to disappear
-
-	$Text = trim($Text);
-
-	call_hooks('bb2diaspora', $Text);
-
-	return $Text;
-}
-
-function unescape_underscores_in_links($m) {
-	$y = str_replace('\\_','_', $m[2]);
-	return('[' . $m[1] . '](' . $y . ')');
-}
-
-function format_event_diaspora($ev) {
-
-	if(! ((is_array($ev)) && count($ev)))
-		return '';
-
-	$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
-
-	$o = t('$Projectname event notification:') . "\n";
-
-	$o .= '**' . (($ev['summary']) ? bb2diaspora($ev['summary']) : bb2diaspora($ev['desc'])) .  '**' . "\n";
-
-	$o .= t('Starts:') . ' ' . '['
-		. (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
-			$ev['start'] , $bd_format ))
-			:  day_translate(datetime_convert('UTC', 'UTC',
-			$ev['start'] , $bd_format)))
-		.  '](' . z_root() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
-
-	if(! $ev['nofinish'])
-		$o .= t('Finishes:') . ' ' . '['
-			. (($ev['adjust']) ? day_translate(datetime_convert('UTC', 'UTC',
-				$ev['finish'] , $bd_format ))
-				:  day_translate(datetime_convert('UTC', 'UTC',
-				$ev['finish'] , $bd_format )))
-			. '](' . z_root() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
-
-	if(strlen($ev['location']))
-		$o .= t('Location:') . bb2diaspora($ev['location'])
-			. "\n";
-
-	$o .= "\n";
-
-	return $o;
-}

From b6477cd38b532ebe69a480460e7b883964ec6627 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 9 Mar 2017 11:51:21 -0800
Subject: [PATCH 004/299] go back to where the problem started

---
 include/items.php   |  70 +-----
 include/network.php | 545 +-------------------------------------------
 2 files changed, 14 insertions(+), 601 deletions(-)

diff --git a/include/items.php b/include/items.php
index 6d21953a9..8032f53c4 100755
--- a/include/items.php
+++ b/include/items.php
@@ -600,11 +600,6 @@ function get_item_elements($x,$allow_code = false) {
 
 	$arr['sig']          = (($x['signature']) ? htmlspecialchars($x['signature'],  ENT_COMPAT,'UTF-8',false) : '');
 
-	if(array_key_exists('diaspora_signature',$x) && is_array($x['diaspora_signature']))
-		$x['diaspora_signature'] = json_encode($x['diaspora_signature']);
-
-	$arr['diaspora_meta'] = (($x['diaspora_signature']) ? $x['diaspora_signature'] : '');
-
 	$arr['obj']          = activity_sanitise($x['object']);
 	$arr['target']       = activity_sanitise($x['target']);
 
@@ -1035,17 +1030,7 @@ function encode_item($item,$mirror = false) {
 	if($item['iconfig'])
 		$x['meta']        = encode_item_meta($item['iconfig'],$mirror);
 
-	if($item['diaspora_meta']) {
-		$z = json_decode($item['diaspora_meta'],true);
-		if($z) {
-			if(is_array($z) && array_key_exists('iv',$z))
-				$x['diaspora_signature'] = crypto_unencapsulate($z,$key);
-			else
-				$x['diaspora_signature'] = $z;
-			if(! is_array($z))
-				logger('encode_item: diaspora meta is not an array: ' . print_r($z,true));
-		}
-	}
+
 	logger('encode_item: ' . print_r($x,true), LOGGER_DATA);
 
 	return $x;
@@ -1324,7 +1309,6 @@ function encode_mail($item,$extended = false) {
 	$x['message_parent'] = $item['parent_mid'];
 	$x['created']        = $item['created'];
 	$x['expires']        = $item['expires'];
-	$x['diaspora_meta']  = $item['diaspora_meta'];
 	$x['title']          = $item['title'];
 	$x['body']           = $item['body'];
 	$x['from']           = encode_item_xchan($item['from']);
@@ -1517,7 +1501,6 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 	$arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title']))  ? trim($arr['title']) : '');
 	$arr['body']  = ((array_key_exists('body',$arr) && strlen($arr['body']))    ? trim($arr['body'])  : '');
 
-	$arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta']               : '');
 	$arr['allow_cid']     = ((x($arr,'allow_cid'))     ? trim($arr['allow_cid'])             : '');
 	$arr['allow_gid']     = ((x($arr,'allow_gid'))     ? trim($arr['allow_gid'])             : '');
 	$arr['deny_cid']      = ((x($arr,'deny_cid'))      ? trim($arr['deny_cid'])              : '');
@@ -2027,7 +2010,7 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) {
 	$arr['changed']       = $orig[0]['changed'];
 
 	$arr['route']         = ((array_key_exists('route',$arr)) ? trim($arr['route'])          : $orig[0]['route']);
-	$arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta']               : $orig[0]['diaspora_meta']);
+
 	$arr['location']      = ((x($arr,'location'))      ? notags(trim($arr['location']))      : $orig[0]['location']);
 	$arr['coord']         = ((x($arr,'coord'))         ? notags(trim($arr['coord']))         : $orig[0]['coord']);
 	$arr['verb']          = ((x($arr,'verb'))          ? notags(trim($arr['verb']))          : $orig[0]['verb']);
@@ -2186,55 +2169,6 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) {
 
 
 
-function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id, $walltowall = false) {
-
-	// We won't be able to sign Diaspora comments for authenticated visitors
-	// - we don't have their private key
-
-	// since Diaspora doesn't handle edits we can only do this for the original text and not update it.
-
-	require_once('include/markdown.php');
-	$signed_body = bb2diaspora_itembody($datarray,$walltowall);
-
-	if($walltowall) {
-		logger('wall to wall comment',LOGGER_DEBUG);
-		// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
-		$signed_body = "\n\n"
-			. '![' . $datarray['author']['xchan_name'] . '](' . $datarray['author']['xchan_photo_m'] . ')'
-			. '[' . $datarray['author']['xchan_name'] . '](' . $datarray['author']['xchan_url'] . ')' . "\n\n"
-			. $signed_body;
-	}
-
-	logger('storing diaspora comment signature',LOGGER_DEBUG);
-
-	$diaspora_handle = channel_reddress($channel);
-
-	$signed_text = $datarray['mid'] . ';' . $parent_item['mid'] . ';' . $signed_body . ';' . $diaspora_handle;
-
-
-	if( $channel && $channel['channel_prvkey'] )
-		$authorsig = base64_encode(rsa_sign($signed_text, $channel['channel_prvkey'], 'sha256'));
-	else
-		$authorsig = '';
-
-	$x = array('signer' => $diaspora_handle, 'body' => $signed_body, 'signed_text' => $signed_text, 'signature' => $authorsig);
-
-	$y = json_encode($x);
-
-	$r = q("update item set diaspora_meta = '%s' where id = %d",
-		dbesc($y),
-		intval($post_id)
-	);
-
-
-	if(! $r)
-		logger('store_diaspora_comment_sig: DB write failed');
-
-	return;
-}
-
-
-
 function send_status_notifications($post_id,$item) {
 
 	// only send notifications for comments
diff --git a/include/network.php b/include/network.php
index 6d1a05e9f..4d0bc6f0b 100644
--- a/include/network.php
+++ b/include/network.php
@@ -984,40 +984,6 @@ function email_header_encode($in_str, $charset = 'UTF-8') {
 	return $out_str;
 }
 
-function email_send($addr, $subject, $headers, $item) {
-	//$headers .= 'MIME-Version: 1.0' . "\n";
-	//$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
-	//$headers .= 'Content-Type: text/plain; charset=UTF-8' . "\n";
-	//$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
-
-	$part = uniqid("", true);
-
-	$html	= prepare_body($item);
-
-	$headers .= "Mime-Version: 1.0\n";
-	$headers .= 'Content-Type: multipart/alternative; boundary="=_'.$part.'"'."\n\n";
-
-	$body = "\n--=_".$part."\n";
-	$body .= "Content-Transfer-Encoding: 8bit\n";
-	$body .= "Content-Type: text/plain; charset=utf-8; format=flowed\n\n";
-
-	$body .= html2plain($html)."\n";
-
-	$body .= "--=_".$part."\n";
-	$body .= "Content-Transfer-Encoding: 8bit\n";
-	$body .= "Content-Type: text/html; charset=utf-8\n\n";
-
-	$body .= '<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">'.$html."</body></html>\n";
-
-	$body .= "--=_".$part."--";
-
-	//$message = '<html><body>' . $html . '</body></html>';
-	//$message = html2plain($html);
-	logger('notifier: email delivery to ' . $addr);
-	mail($addr, $subject, $body, $headers);
-}
-
-
 
 function discover_by_url($url,$arr = null) {
 	require_once('library/HTML5/Parser.php');
@@ -1027,10 +993,10 @@ function discover_by_url($url,$arr = null) {
 		if(! $arr)
 			return false;
 		$network = (($arr['network']) ? $arr['network'] : 'unknown');
-		$name = (($arr['name']) ? $arr['name'] : 'unknown');
-		$photo = (($arr['photo']) ? $arr['photo'] : '');
-		$addr = (($arr['addr']) ? $arr['addr'] : '');
-		$guid = $url;
+		$name    = (($arr['name']) ? $arr['name'] : 'unknown');
+		$photo   = (($arr['photo']) ? $arr['photo'] : '');
+		$addr    = (($arr['addr']) ? $arr['addr'] : '');
+		$guid    = $url;
 	}
 
 	$profile = $url;
@@ -1067,8 +1033,8 @@ function discover_by_url($url,$arr = null) {
 	if($feed->error())
 		logger('probe_url: scrape_feed: Error parsing XML: ' . $feed->error());
 
-	$name = unxmlify(trim($feed->get_title()));
-	$photo = $feed->get_image_url();
+	$name   = unxmlify(trim($feed->get_title()));
+	$photo  = $feed->get_image_url();
 	$author = $feed->get_author();
 
 	if($author) {
@@ -1172,23 +1138,11 @@ function discover_by_url($url,$arr = null) {
 
 
 function discover_by_webbie($webbie) {
-	require_once('library/HTML5/Parser.php');
 
-	$result   = array();
+	$result   = [];
 
 	$network  = null;
 
-	$diaspora = false;
-	$gnusoc   = false;
-	$dfrn     = false;
-
-	$has_salmon = false;
-	$salmon_key = false;
-	$atom_feed = false;
-	$diaspora_base = '';
-	$diaspora_guid = '';
-	$diaspora_key = '';
-
 	$webbie = strtolower($webbie);
 
 	$x = webfinger_rfc7033($webbie,true);
@@ -1214,21 +1168,6 @@ function discover_by_webbie($webbie) {
 						}
 					}
 				}
-				if($link['rel'] == NAMESPACE_DFRN) {
-					 $dfrn = $link['href'];
-				}
-				if($link['rel'] == 'magic-public-key') {
-        			if(substr($link['href'],0,5) === 'data:') {
-						$salmon_key = convert_salmon_key($link['href']);
-					}
-				}
-				if($link['rel'] == 'salmon') {
-					$has_salmon = true;
-					$salmon = $link['href'];
-				}
-				if($link['rel'] == 'http://schemas.google.com/g/2010#updates-from') {
-					$atom_feed = $link['href'];
-				}
 			}
 		}
 	}
@@ -1240,288 +1179,10 @@ function discover_by_webbie($webbie) {
 	if($arr['success'])
 		return true;
 
-	$aliases = array();
-
-	// Now let's make some decisions on what we may need
-	// to obtain further info
-
-	$probe_atom  = false;
-	$probe_old   = false;
-	$probe_hcard = false;
-
-	$address  = '';
-	$location = '';
-	$nickname = '';
-	$fullname = '';
-	$avatar   = '';
-	$pubkey   = '';
-
-	if(is_array($x)) {
-		if(array_key_exists('address',$x))
-			$address = $x['address'];
-		if(array_key_exists('location',$x))
-			$location = $x['location'];
-		if(array_key_exists('nickname',$x))
-			$nickname = $x['nickname'];
-	}
-
-	if(! $x)
-		$probe_old = true;
-
-
-	if((! $dfrn) && (! $has_salmon))
-		$probe_old = true;
-
-	if($probe_old) {
-		$y = old_webfinger($webbie);
-		if($y) {
-			logger('old_webfinger: ' . print_r($x,true));
-			foreach($y 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://portablecontacts.net/spec/1.0')
-					$poco = unamp($link['@attributes']['href']);
-				if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location') {
-					$diaspora_base = unamp($link['@attributes']['href']);
-					$diaspora = true;
-				}
-				if($link['@attributes']['rel'] === 'http://joindiaspora.com/guid') {
-					$diaspora_guid = unamp($link['@attributes']['href']);
-					$diaspora = true;
-				}
-				if($link['@attributes']['rel'] === 'diaspora-public-key') {
-					$diaspora_key = base64_decode(unamp($link['@attributes']['href']));
-					if(strstr($diaspora_key,'RSA '))
-						$pubkey = rsatopem($diaspora_key);
-					else
-						$pubkey = $diaspora_key;
-					$diaspora = true;
-				}
-				if($link['@attributes']['rel'] == 'magic-public-key') {
-        			if(substr($link['@attributes']['href'],0,5) === 'data:') {
-						$salmon_key = convert_salmon_key($link['@attributes']['href']);
-					}
-				}
-				if($link['@attributes']['rel'] == 'salmon') {
-					$has_salmon = true;
-					$salmon = $link['@attributes']['href'];
-				}
-
-				if($link['@attributes']['rel'] == 'http://schemas.google.com/g/2010#updates-from') {
-					$atom_feed = $link['@attributes']['href'];
-				}
-				if($link['@attributes']['rel'] === 'alias') {
-					$aliases[] = $link['@attributes']['href'];
-				}
-				if($link['@attributes']['rel'] === 'subject') {
-					$subject = $link['@attributes']['href'];
-				}
-			}
-		}
-	}
-
-	if($subject || $aliases) {
-		if(strpos($webbie,'@')) {
-			$rhs = substr($webbie,strpos($webbie,'@')+1);
-		}
-		else {
-			$m = parse_url($webbie);
-			if($m) {
-				$rhs = $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
-			}
-		}
-
-		$v = array('subject' => $subject,'aliases' => $aliases);
-		$address = find_webfinger_address($v,$rhs);
-		$location = find_webfinger_location($v,$rhs);
-		if($address)
-			$nickname = substr($address,0,strpos($address,'@'));
-
-	}
-
-	if($salmon_key && $has_salmon && $atom_feed && (! $dfrn) && (! $diaspora)) {
-		$gnusoc = true;
-		$probe_atom = true;
-	}
-
-	if(! $pubkey)
-		$pubkey = $salmon_key;
-
-	if(($dfrn || $diaspora) && $hcard)
-		$probe_hcard = true;
-
-	if(! $fullname)
-		$fullname = $nickname;
-
-	if($probe_atom) {
-		$k = z_fetch_url($atom_feed);
-		if($k['success'])
-			$feed_meta = feed_meta($k['body']);
-		if($feed_meta) {
-
-			// stash any discovered pubsubhubbub hubs in case we need to follow them
-			// this will save an expensive lookup later
-
-			if($feed_meta['hubs'] && $address) {
-				set_xconfig($address,'system','push_hubs',$feed_meta['hubs']);
-				set_xconfig($address,'system','feed_url',$atom_feed);
-			}
-			if($feed_meta['author']['author_name']) {
-				$fullname = $feed_meta['author']['author_name'];
-			}
-			if(! $avatar) {
-				if($feed_meta['author']['author_photo'])
-					$avatar = $feed_meta['author']['author_photo'];
-			}
-
-			// for GNU-social over-ride any url aliases we may have picked up in webfinger
-			// The author.uri element in the feed is likely to be more accurate
-
-			if($gnusoc && $feed_meta['author']['author_uri'])
-				$location = $feed_meta['author']['author_uri'];
-		}
-	}
-	else {
-		if($probe_hcard) {
-			$vcard = scrape_vcard($hcard);
-			if($vcard) {
-				logger('vcard: ' . print_r($vcard,true), LOGGER_DATA);
-				if($vcard['fn'])
-					$fullname = $vcard['fn'];
-				if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0))
-					$vcard['photo'] = $diaspora_base . '/' . $vcard['photo'];
-				if(($vcard['public_key']) && (! $pubkey)) {
-					$diaspora_key = $vcard['public_key'];
-					if(strstr($diaspora_key,'RSA '))
-						$pubkey = rsatopem($diaspora_key);
-					else
-						$pubkey = $diaspora_key;
-				}
-				if(! $avatar)
-					$avatar = $vcard['photo'];
-				if($diaspora) {
-					if(($vcard['uid']) && (! $diaspora_guid))
-						$diaspora_guid = $vcard['uid'];
-					if(($vcard['url']) && (! $diaspora_base))
-						$diaspora_base = $vcard['url'];
-
-
-
-
-				}
-
-			}
-		}
-	}
-
-	if(($profile) && (! $location))
-		$location = $profile;
-
-	if($location) {
-		$m = parse_url($location);
-		$base = $m['scheme'] . '://' . $m['host'];
-		$host = $m['host'];
-	}
-
-
-	if($diaspora && $diaspora_base && $diaspora_guid) {
-		if($dfrn)
-			$network = 'friendica-over-diaspora';
-		else
-			$network = 'diaspora';
-
-		$base = trim($diaspora_base,'/');
-		$notify = $base . '/receive';
-
-	}
-	else {
-		if($gnusoc) {
-			$network = 'gnusoc';
-			$notify = $salmon;
-		}
-	}
-
-
-	logger('network: ' . $network);
-	logger('address: ' . $address);
-	logger('fullname: ' . $fullname);
-	logger('pubkey: ' . $pubkey);
-	logger('location: ' . $location);
-
-
-
-	// if we have everything we need, let's create the records
-
-	if($network && $address && $fullname && $pubkey && $location) {
-		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
-			dbesc($address)
-		);
-		if($r) {
-			$r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s'",
-				dbesc($fullname),
-				dbesc($network),
-				dbesc(datetime_convert()),
-				dbesc($address)
-			);
-		}
-		else {
-			$r = xchan_store_lowlevel(
-				[
-					'xchan_hash'         => $address,
-					'xchan_guid'         => (($diaspora_guid) ? $diaspora_guid : $location),
-					'xchan_pubkey'       => $pubkey,
-					'xchan_addr'         => $address,
-					'xchan_url'          => $location,
-					'xchan_name'         => $fullname,
-					'xchan_name_date'    => datetime_convert(),
-					'xchan_network'      => $network
-				]
-			);
-		}
-
-		$r = q("select * from hubloc where hubloc_hash = '%s' limit 1",
-			dbesc($address)
-		);
-
-		if(! $r) {
-			$r = hubloc_store_lowlevel(
-				[
-					'hubloc_guid'     => (($diaspora_guid) ? $diaspora_guid : $location),
-					'hubloc_hash'     => $address,
-					'hubloc_addr'     => $address,
-					'hubloc_network'  => $network,
-					'hubloc_url'      => $base,
-					'hubloc_host'     => $host,
-					'hubloc_callback' => $notify,
-					'hubloc_updated'  => datetime_convert(),
-					'hubloc_primary'  => 1
-				]
-			);
-		}
-		$photos = import_xchan_photo($avatar,$address);
-		$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s'",
-			dbescdate(datetime_convert()),
-			dbesc($photos[0]),
-			dbesc($photos[1]),
-			dbesc($photos[2]),
-			dbesc($photos[3]),
-			dbesc($address)
-		);
-		return true;
-	}
 	return false;
+
 }
 
-
-
 function webfinger_rfc7033($webbie,$zot = false) {
 
 
@@ -1547,88 +1208,13 @@ function webfinger_rfc7033($webbie,$zot = false) {
 
 	if($s['success']) {
 		$j = json_decode($s['body'],true);
-
-		// We could have a number of URL aliases and webbies
-		// make an executive decision about the most likely "best" of each
-		// by comparing against some examples from known networks we're likely to encounter.
-		// Otherwise we have to store every alias that we may ever encounter and
-		// validate every URL we ever find against every possible alias
-
-		// @fixme pump.io is going to be a real bugger since it doesn't return subject or aliases
-		// or provide lookup by url
-
-		$j['address'] = find_webfinger_address($j,$rhs);
-		$j['location'] = find_webfinger_location($j,$rhs);
-		if($j['address'])
-			$j['nickname'] = substr($j['address'],0,strpos($j['address'],'@'));
+		return($j);
 	}
-	else
-		return false;
 
-	return($j);
+	return false;
+
 }
 
-function find_webfinger_address($j,$rhs) {
-	if(is_array($j) && ($j)) {
-		if(strpos($j['subject'],'acct:') !== false && strpos($j['subject'],'@' . $rhs))
-			return str_replace('acct:','',$j['subject']);
-		if($j['aliases']) {
-			foreach($j['aliases'] as $alias) {
-				if(strpos($alias,'acct:') !== false && strpos($alias,'@' . $rhs)) {
-					return str_replace('acct:','',$alias);
-				}
-			}
-		}
-	}
-	return '';
-}
-
-
-function find_webfinger_location($j,$rhs) {
-	if(is_array($j) && ($j)) {
-		if(strpos($j['subject'],'http') === 0) {
-			$x = match_webfinger_location($j['subject'],$rhs);
-			if($x)
-				return $x;
-		}
-		if($j['aliases']) {
-			foreach($j['aliases'] as $alias) {
-				if(strpos($alias,'http') === 0) {
-					$x = match_webfinger_location($alias,$rhs);
-					if($x)
-						return($x);
-				}
-			}
-		}
-	}
-	return '';
-}
-
-function match_webfinger_location($s,$h) {
-
-	// GNU-social and the older StatusNet - the $host/user/123 form doesn't work
-	if(preg_match('|' . $h . '/index.php/user/([0-9]*?)$|',$s))
-		return $s;
-	// Redmatrix / hubzilla
-	if(preg_match('|' . $h . '/channel/|',$s))
-		return $s;
-	// Friendica
-	if(preg_match('|' . $h . '/profile/|',$s))
-		return $s;
-
-	$arr = array('test' => $s, 'host' => $h, 'success' => false);
-	call_hooks('match_webfinger_location',$arr);
-	if($arr['success'])
-		return $s;
-	return '';
-}
-
-
-
-
-
-
-
 function old_webfinger($webbie) {
 
 	$host = '';
@@ -1696,9 +1282,6 @@ function fetch_xrd_links($url) {
 	if ((! $xml) || (! stristr($xml,'<xrd')))
 		return array();
 
-	// fix diaspora's bad xml
-	$xml = str_replace(array('href=&quot;','&quot;/>'),array('href="','"/>'),$xml);
-
 	$h = parse_xml_string($xml);
 	if(! $h)
 		return array();
@@ -1738,85 +1321,6 @@ function fetch_xrd_links($url) {
 }
 
 
-function scrape_vcard($url) {
-
-	$ret = array();
-
-	logger('scrape_vcard: url=' . $url);
-
-	$x = z_fetch_url($url);
-	if(! $x['success'])
-		return $ret;
-
-	$s = $x['body'];
-
-	if(! $s)
-		return $ret;
-
-	$headers = $x['header'];
-	$lines = explode("\n",$headers);
-	if(count($lines)) {
-		foreach($lines as $line) {
-			// don't try and run feeds through the html5 parser
-			if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml'))))
-				return ret;
-		}
-	}
-
-	try {
-		$dom = HTML5_Parser::parse($s);
-	} catch (DOMException $e) {
-		logger('scrape_vcard: parse error: ' . $e);
-	}
-
-	if(! $dom)
-		return $ret;
-
-	// Pull out hCard profile elements
-
-	$largest_photo = 0;
-
-	$items = $dom->getElementsByTagName('*');
-	foreach($items as $item) {
-		if(attribute_contains($item->getAttribute('class'), 'vcard')) {
-			$level2 = $item->getElementsByTagName('*');
-			foreach($level2 as $x) {
-				if(attribute_contains($x->getAttribute('id'),'pod_location'))
-					$ret['pod_location'] = $x->textContent;
-				if(attribute_contains($x->getAttribute('class'),'fn'))
-					$ret['fn'] = $x->textContent;
-				if(attribute_contains($x->getAttribute('class'),'uid'))
-					$ret['uid'] = $x->textContent;
-				if(attribute_contains($x->getAttribute('class'),'nickname'))
-					$ret['nick'] = $x->textContent;
-				if(attribute_contains($x->getAttribute('class'),'searchable'))
-					$ret['searchable'] = $x->textContent;
-				if(attribute_contains($x->getAttribute('class'),'key'))
-					$ret['public_key'] = $x->textContent;
-				if(attribute_contains($x->getAttribute('class'),'given_name'))
-					$ret['given_name'] = $x->textContent;
-				if(attribute_contains($x->getAttribute('class'),'family_name'))
-					$ret['family_name'] = $x->textContent;
-				if(attribute_contains($x->getAttribute('class'),'url'))
-					$ret['url'] = $x->textContent;
-
-				if((attribute_contains($x->getAttribute('class'),'photo'))
-					|| (attribute_contains($x->getAttribute('class'),'avatar'))) {
-					$size = intval($x->getAttribute('width'));
-					if(($size > $largest_photo) || (! $largest_photo)) {
-						$ret['photo'] = $x->getAttribute('src');
-						$largest_photo = $size;
-					}
-				}
-			}
-		}
-	}
-
-	return $ret;
-}
-
-
-
 function scrape_feed($url) {
 
 	$ret = array();
@@ -1910,31 +1414,6 @@ function scrape_feed($url) {
 }
 
 
-
-function service_plink($contact, $guid) {
-
-	$plink = '';
-
-	$m = parse_url($contact['xchan_url']);
-	if($m) {
-		$url = $m['scheme'] . '://' . $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
-	}
-	else
-		$url = 'https://' . substr($contact['xchan_addr'],strpos($contact['xchan_addr'],'@')+1);
-
-	$handle = substr($contact['xchan_addr'], 0, strpos($contact['xchan_addr'],'@'));
-
-	if($contact['xchan_network'] === 'diaspora')
-		$plink = $url . '/posts/' . $guid;
-	if($contact['xchan_network'] === 'friendica-over-diaspora')
-		$plink = $url . '/display/' . $handle . '/' . $guid;
-	if($contact['xchan_network'] === 'zot')
-		$plink = $url . '/channel/' . $handle . '?f=&mid=' . $guid;
-
-	return $plink;
-}
-
-
 function format_and_send_email($sender,$xchan,$item) {
 
 	$title = $item['title'];
@@ -1944,7 +1423,7 @@ function format_and_send_email($sender,$xchan,$item) {
 
 	$htmlversion = bbcode(str_replace(array("\\r","\\n"), array("","<br />\n"),$body));
 
-   $banner     = t('$Projectname Notification');
+	$banner     = t('$Projectname Notification');
     $product    = t('$projectname'); // PLATFORM_NAME;
     $siteurl    = z_root();
     $thanks     = t('Thank You,');

From c93db2cd218d5a1e8ff6e5b243b99e7fcbae36ea Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 9 Mar 2017 14:31:54 -0800
Subject: [PATCH 005/299] more cleanup

---
 boot.php          |  4 ++--
 include/items.php | 35 +----------------------------------
 include/text.php  |  6 ++----
 3 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/boot.php b/boot.php
index 36e08c77a..751bee9ec 100755
--- a/boot.php
+++ b/boot.php
@@ -635,11 +635,11 @@ function sys_boot() {
 
 
 	if(! defined('DEFAULT_PLATFORM_ICON')) {
-		define( 'DEFAULT_PLATFORM_ICON', '/images/hz-32.png' );
+		define( 'DEFAULT_PLATFORM_ICON', '/images/rm-32.png' );
 	}
 
 	if(! defined('DEFAULT_NOTIFY_ICON')) {
-		define( 'DEFAULT_NOTIFY_ICON', '/images/hz-white-32.png' );
+		define( 'DEFAULT_NOTIFY_ICON', '/images/rm-32.png' );
 	}
 
 	if(! defined('CRYPTO_ALGORITHM')) {
diff --git a/include/items.php b/include/items.php
index 033863c42..58305aa63 100755
--- a/include/items.php
+++ b/include/items.php
@@ -248,8 +248,6 @@ function can_comment_on_post($observer_xchan, $item) {
 	}
 	if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red'))
 		return true;
-	if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'diaspora'))
-		return true;
 	if(strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],App::get_hostname()))
 		return true;
 
@@ -766,8 +764,6 @@ function import_author_xchan($x) {
 	if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) {
 		$y = import_author_zot($x);
 	}
-	if(! $y)
-		$y = import_author_diaspora($x);
 
 	if($x['network'] === 'rss') {
 		$y = import_author_rss($x);
@@ -780,36 +776,6 @@ function import_author_xchan($x) {
 	return(($y) ? $y : false);
 }
 
-/**
- * @brief Imports an author from Diaspora.
- *
- * @param array $x an associative array with
- *   * \e string \b address
- * @return boolean|string false on error, otherwise xchan_hash of the new entry
- */
-function import_author_diaspora($x) {
-	if(! $x['address'])
-		return false;
-
-	$r = q("select * from xchan where xchan_addr = '%s' limit 1",
-		dbesc($x['address'])
-	);
-	if($r) {
-		logger('in_cache: ' . $x['address'], LOGGER_DATA);
-		return $r[0]['xchan_hash'];
-	}
-
-	if(discover_by_webbie($x['address'])) {
-		$r = q("select xchan_hash from xchan where xchan_addr = '%s' limit 1",
-			dbesc($x['address'])
-		);
-		if($r)
-			return $r[0]['xchan_hash'];
-	}
-
-	return false;
-}
-
 /**
  * @brief Imports an author from a RSS feed.
  *
@@ -819,6 +785,7 @@ function import_author_diaspora($x) {
  *   * \e string \b guid
  * @return boolean|string
  */
+
 function import_author_rss($x) {
 	if(! $x['url'])
 		return false;
diff --git a/include/text.php b/include/text.php
index 9d76f9d78..fe3206b32 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1183,8 +1183,7 @@ function list_smilies() {
 		':coffee',
 		':facepalm',
 		':like',
-		':dislike',
-		':hubzilla'
+		':dislike'
 	);
 
 	$icons = array(
@@ -1219,8 +1218,7 @@ function list_smilies() {
 		'<img class="smiley" src="' . z_root() . '/images/emoticons/coffee.gif" alt=":coffee" />',
 		'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-facepalm.gif" alt=":facepalm" />',
 		'<img class="smiley" src="' . z_root() . '/images/emoticons/like.gif" alt=":like" />',
-		'<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />',
-		'<img class="smiley" src="' . z_root() . '/images/hz-16.png" alt=":hubzilla" />',
+		'<img class="smiley" src="' . z_root() . '/images/emoticons/dislike.gif" alt=":dislike" />'
 
 	);
 

From 1a49f0d164ce94bc3fce227a68aa3796e22347e1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 9 Mar 2017 18:54:10 -0800
Subject: [PATCH 006/299] one role.

---
 Zotlabs/Lib/System.php        | 11 +++-----
 Zotlabs/Module/Setup.php      |  7 ------
 boot.php                      | 47 ++---------------------------------
 view/tpl/install_settings.tpl |  1 -
 4 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php
index 306c90f4a..865cb9a30 100644
--- a/Zotlabs/Lib/System.php
+++ b/Zotlabs/Lib/System.php
@@ -57,9 +57,7 @@ class System {
 
 
 	static public function get_server_role() {
-		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['server_role'])
-			return \App::$config['system']['server_role'];
-		return 'standard';
+		return 'pro';
 	}
 
 	static public function get_std_version() {
@@ -72,11 +70,8 @@ class System {
 
 		if(get_directory_realm() != DIRECTORY_REALM)
 			return true;
-
-		foreach(['hubzilla','zap'] as $t) {
-			if(stristr($p,$t))
-				return true;
-		}
+		if(in_array(strtolower($p),['hubzilla','zap','red']))
+			return true;
 		return false;
 	}
 }
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 9c688af01..e114dfc0b 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -324,11 +324,6 @@ class Setup extends \Zotlabs\Web\Controller {
 				$siteurl = trim($_POST['siteurl']);
 				$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
 
-				$server_roles = [
-					'basic'    => t('Basic/Minimal Social Networking'),
-					'standard' => t('Standard Configuration (default)'),
-					'pro'      => t('Professional')
-				];
 
 				$tpl = get_markup_template('install_settings.tpl');
 				$o .= replace_macros($tpl, array(
@@ -348,8 +343,6 @@ class Setup extends \Zotlabs\Web\Controller {
 
 					'$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')),
 
-					'$server_role' => array('server_role', t("Server Configuration/Role"), 'standard','',$server_roles),
-
 					'$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()),
 
 					'$baseurl' => z_root(),
diff --git a/boot.php b/boot.php
index 751bee9ec..16d60f61e 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ require_once('include/xchan.php');
 require_once('include/hubloc.php');
 
 
-define ( 'PLATFORM_NAME',           'hubzilla' );
+define ( 'PLATFORM_NAME',           'red' );
 define ( 'STD_VERSION',             '2.3' );
 define ( 'ZOT_REVISION',            '1.2' );
 
@@ -165,14 +165,6 @@ define ( 'LOGGER_DATA',            3 );
 define ( 'LOGGER_ALL',             4 );
 
 
-/**
- * Server roles
- */
-
-define ( 'SERVER_ROLE_BASIC',     0x0001 );
-define ( 'SERVER_ROLE_STANDARD',  0x0002 );
-define ( 'SERVER_ROLE_PRO',       0x0004 );
-
 /**
  * registration policies
  */
@@ -620,15 +612,7 @@ function sys_boot() {
 
 	$a->convert();
 
-	if(defined('UNO')) {
-		if(UNO)
-			App::$config['system']['server_role'] = 'basic';
-		else
-			App::$config['system']['server_role'] = 'standard';
-	}
-
-	if(! (array_key_exists('server_role',App::$config['system']) && App::$config['system']['server_role']))
-		App::$config['system']['server_role'] = 'standard';
+	App::$config['system']['server_role'] = 'pro';
 
 	App::$timezone = ((App::$config['system']['timezone']) ? App::$config['system']['timezone'] : 'UTC');
 	date_default_timezone_set(App::$timezone);
@@ -755,7 +739,6 @@ class miniApp {
 class App {
 
 	public  static $install    = false;           // true if we are installing the software
-	public  static $role       = 0;               // server role (constant, not the string)
 	public  static $account    = null;            // account record of the logged-in account
 	public  static $channel    = null;            // channel record of the current channel of the logged-in account
 	public  static $observer   = null;            // xchan record of the page observer
@@ -1030,36 +1013,10 @@ class App {
 		}
 	}
 
-	public static function get_role() {
-		if(! self::$role)
-			return self::set_role();
-		return self::$role;
-	}
-
-	public static function set_role() {
-		$role_str = \Zotlabs\Lib\System::get_server_role();
-		switch($role_str) {
-			case 'basic':
-				$role = SERVER_ROLE_BASIC;
-				break;
-			case 'pro':
-				$role = SERVER_ROLE_PRO;
-				break;
-			case 'standard':
-			default:
-				$role = SERVER_ROLE_STANDARD;
-				break;
-		}
-		self::$role = $role;
-		return $role;
-	}
-
-
 	public static function get_scheme() {
 		return self::$scheme;
 	}
 
-
 	public static function get_hostname() {
 		return self::$hostname;
 	}
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index f7a0108a8..62dcbb8b3 100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -19,7 +19,6 @@
 
 {{include file="field_input.tpl" field=$adminmail}}
 {{include file="field_input.tpl" field=$siteurl}}
-{{include file="field_select.tpl" field=$server_role}}
 
 {{include file="field_select_grouped.tpl" field=$timezone}}
 

From bbb83bea38c626aa59f28e3ed29e39488f2e9289 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 10 Mar 2017 12:44:57 -0800
Subject: [PATCH 007/299] strings

---
 util/hmessages.po | 8508 ++++++++++++++++++++++-----------------------
 1 file changed, 4247 insertions(+), 4261 deletions(-)

diff --git a/util/hmessages.po b/util/hmessages.po
index 135087b9e..796a53de2 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -1,6 +1,6 @@
-# hubzilla
-# Copyright (C) 2012-2016 hubzilla
-# This file is distributed under the same license as the hubzilla package.
+# red
+# Copyright (C) 2012-2016 red
+# This file is distributed under the same license as the red package.
 # Mike Macgirvin, 2012
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-03 00:05-0800\n"
+"POT-Creation-Date: 2017-03-10 00:05-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,16 +88,17 @@ msgid "Special - Group Repository"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:270
-#: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798
+#: ../../Zotlabs/Module/Connedit.php:925
 #: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Profiles.php:798
 #: ../../Zotlabs/Module/Settings/Channel.php:463
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148
 #: ../../extend/addon/addon/cdav/cdav.php:277
-#: ../../extend/addon/addon/cdav/cdav.php:284 ../../include/selectors.php:49
-#: ../../include/selectors.php:66 ../../include/selectors.php:104
-#: ../../include/selectors.php:140 ../../include/connections.php:675
-#: ../../include/connections.php:682 ../../include/permissions.php:949
+#: ../../extend/addon/addon/cdav/cdav.php:284
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148
+#: ../../include/connections.php:675 ../../include/connections.php:682
+#: ../../include/selectors.php:49 ../../include/selectors.php:66
+#: ../../include/selectors.php:104 ../../include/selectors.php:140
+#: ../../include/permissions.php:949
 msgid "Other"
 msgstr ""
 
@@ -182,7 +183,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2700
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2684
 msgid "Collection"
 msgstr ""
 
@@ -213,7 +214,7 @@ msgstr ""
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
-#: ../../include/widgets.php:1757 ../../include/conversation.php:1177
+#: ../../include/conversation.php:1177 ../../include/widgets.php:1757
 msgid "Unknown"
 msgstr ""
 
@@ -231,10 +232,10 @@ msgid "Shared"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:330
+#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Webpages.php:243
 #: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:928
 #: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Webpages.php:243 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Profiles.php:801
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
 #: ../../extend/addon/addon/cdav/include/widgets.php:127
 #: ../../extend/addon/addon/cdav/include/widgets.php:164
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
@@ -243,8 +244,8 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:332
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368
 #: ../../Zotlabs/Module/Profile_photo.php:421
+#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368
 #: ../../Zotlabs/Module/Embedphotos.php:157
 #: ../../extend/addon/addon/cdav/include/widgets.php:132
 #: ../../extend/addon/addon/cdav/include/widgets.php:168
@@ -252,13 +253,12 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:233
+#: ../../Zotlabs/Storage/Browser.php:233 ../../Zotlabs/Module/Chat.php:248
 #: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Connedit.php:913
+#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Wiki.php:171
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 #: ../../Zotlabs/Module/Settings/Oauth.php:89
 #: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Module/Wiki.php:171 ../../Zotlabs/Module/Chat.php:248
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136
 #: ../../extend/addon/addon/rendezvous/rendezvous.php:172
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
@@ -272,7 +272,7 @@ msgid "Type"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:235
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1414
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1398
 msgid "Size"
 msgstr ""
 
@@ -286,39 +286,39 @@ msgstr ""
 #: ../../Zotlabs/Module/Connections.php:300
 #: ../../Zotlabs/Module/Connections.php:320
 #: ../../Zotlabs/Module/Admin/Profs.php:154
+#: ../../Zotlabs/Module/Webpages.php:244
 #: ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Webpages.php:244
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Wiki.php:164
+#: ../../Zotlabs/Module/Wiki.php:271 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Layouts.php:192
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Wiki.php:164
-#: ../../Zotlabs/Module/Wiki.php:271 ../../Zotlabs/Lib/ThreadItem.php:106
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106
 #: ../../Zotlabs/Lib/Apps.php:357
 #: ../../extend/addon/addon/cdav/include/widgets.php:125
 #: ../../extend/addon/addon/cdav/include/widgets.php:161
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:149
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
-#: ../../include/menu.php:113 ../../include/channel.php:1044
-#: ../../include/channel.php:1048
+#: ../../include/channel.php:1044 ../../include/channel.php:1048
+#: ../../include/menu.php:113
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:239
+#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Profiles.php:803
 #: ../../Zotlabs/Module/Editblock.php:134
 #: ../../Zotlabs/Module/Connections.php:271
 #: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
 #: ../../Zotlabs/Module/Admin/Channels.php:149
+#: ../../Zotlabs/Module/Webpages.php:246
 #: ../../Zotlabs/Module/Editlayout.php:137
-#: ../../Zotlabs/Module/Editwebpage.php:170
+#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
 #: ../../Zotlabs/Module/Connedit.php:661 ../../Zotlabs/Module/Connedit.php:930
-#: ../../Zotlabs/Module/Photos.php:1174 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Profiles.php:803
+#: ../../Zotlabs/Module/Blocks.php:162
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126
-#: ../../Zotlabs/Lib/Apps.php:358
+#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1174
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../Zotlabs/Lib/Apps.php:358
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:864
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153
 #: ../../include/conversation.php:656
@@ -360,24 +360,26 @@ msgstr ""
 
 #: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Group.php:72
 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Import_items.php:114
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Like.php:283
-#: ../../Zotlabs/Module/Subthread.php:62
+#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Like.php:283
+#: ../../Zotlabs/Module/Subthread.php:62 ../../Zotlabs/Module/Profperm.php:28
 #: ../../extend/addon/addon/frphotos/frphotos.php:81
 #: ../../extend/addon/addon/redfiles/redfiles.php:109
 #: ../../extend/addon/addon/redphotos/redphotos.php:119
-#: ../../include/items.php:327
+#: ../../include/items.php:325
 msgid "Permission denied"
 msgstr ""
 
 #: ../../Zotlabs/Web/WebServer.php:128
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Appman.php:82
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
-#: ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Chat.php:98
+#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Page.php:35
+#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
+#: ../../Zotlabs/Module/Webpages.php:116
 #: ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:68
@@ -385,45 +387,42 @@ msgstr ""
 #: ../../Zotlabs/Module/Editwebpage.php:104
 #: ../../Zotlabs/Module/Editwebpage.php:126
 #: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78
-#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Connedit.php:388
-#: ../../Zotlabs/Module/Events.php:271 ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Locs.php:87
+#: ../../Zotlabs/Module/Filestorage.php:23
 #: ../../Zotlabs/Module/Filestorage.php:78
 #: ../../Zotlabs/Module/Filestorage.php:93
-#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Api.php:24
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Connedit.php:388
+#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Item.php:220
+#: ../../Zotlabs/Module/Item.php:230 ../../Zotlabs/Module/Item.php:1067
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17
+#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Webpages.php:116
 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
-#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
-#: ../../Zotlabs/Module/Item.php:1067 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71
-#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Rate.php:113
+#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:215
+#: ../../Zotlabs/Module/Wiki.php:311 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Mail.php:164
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113
 #: ../../Zotlabs/Module/Profile_photo.php:278
 #: ../../Zotlabs/Module/Profile_photo.php:291
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Common.php:39
-#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245
-#: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Common.php:39
 #: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29
-#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
-#: ../../Zotlabs/Module/Viewsrc.php:18
+#: ../../Zotlabs/Module/Events.php:271
 #: ../../Zotlabs/Module/Service_limits.php:11
 #: ../../Zotlabs/Module/Sharedwithme.php:11
-#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Sources.php:74
+#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245
+#: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Suggest.php:30
 #: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
-#: ../../Zotlabs/Module/Thing.php:335 ../../Zotlabs/Module/Setup.php:212
+#: ../../Zotlabs/Module/Thing.php:335
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:215
-#: ../../Zotlabs/Module/Wiki.php:311 ../../Zotlabs/Module/Chat.php:98
-#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Profile.php:83
+#: ../../Zotlabs/Module/Profile.php:100 ../../Zotlabs/Lib/Chatroom.php:137
 #: ../../extend/addon/addon/friendica/dfrn_confirm.php:55
 #: ../../extend/addon/addon/keepout/keepout.php:36
 #: ../../extend/addon/addon/pumpio/pumpio.php:40
@@ -431,7 +430,7 @@ msgstr ""
 #: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:58
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:194
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:291
-#: ../../include/items.php:3447 ../../include/attach.php:144
+#: ../../include/items.php:3350 ../../include/attach.php:144
 #: ../../include/attach.php:191 ../../include/attach.php:255
 #: ../../include/attach.php:269 ../../include/attach.php:276
 #: ../../include/attach.php:343 ../../include/attach.php:357
@@ -442,8 +441,8 @@ msgid "Permission denied."
 msgstr ""
 
 #: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Page.php:94
-#: ../../Zotlabs/Module/Display.php:122 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Lib/NativeWikiPage.php:518 ../../include/help.php:68
+#: ../../Zotlabs/Module/Block.php:79 ../../Zotlabs/Module/Display.php:122
+#: ../../Zotlabs/Lib/NativeWikiPage.php:522 ../../include/help.php:68
 msgid "Page not found."
 msgstr ""
 
@@ -462,11 +461,10 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15
 #: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Editlayout.php:31
 #: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:59
-#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Hcard.php:12
 #: ../../Zotlabs/Module/Profile.php:20 ../../include/channel.php:945
 msgid "Requested profile is not available."
 msgstr ""
@@ -475,74 +473,19 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55
-msgid "App installed."
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:32
+#: ../../extend/addon/addon/chess/chess.php:403
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:26
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:48
-msgid "Malformed app."
+#: ../../Zotlabs/Module/Chat.php:179
+msgid "Room not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:111
-msgid "Embed code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:117
-msgid "Edit App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:117
-msgid "Create App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Name of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
-#: ../../include/datetime.php:259
-msgid "Required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:123
-msgid "Location (URL) of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:124 ../../Zotlabs/Module/Events.php:473
-#: ../../Zotlabs/Module/Rbmark.php:101
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:173
-msgid "Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:125
-msgid "Photo icon URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:125
-msgid "80 x 80 pixels - optional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:126
-msgid "Categories (optional, comma separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:127
-msgid "Version ID"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:128
-msgid "Price of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:129
-msgid "Location (URL) to purchase app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:134 ../../Zotlabs/Module/Import.php:507
-#: ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:239
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
+#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Profs.php:157
@@ -553,30 +496,27 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Site.php:268
 #: ../../Zotlabs/Module/Admin/Plugins.php:438
 #: ../../Zotlabs/Module/Admin/Themes.php:158 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Filestorage.php:165
-#: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1053
-#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1211
-#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Mail.php:413
-#: ../../Zotlabs/Module/Import_items.php:122
-#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Cal.php:342
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85
+#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Mitem.php:243
 #: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Pdledit.php:74
+#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Mail.php:413
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493
 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Profiles.php:726
 #: ../../Zotlabs/Module/Settings/Features.php:47
 #: ../../Zotlabs/Module/Settings/Oauth.php:87
 #: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Channel.php:476
+#: ../../Zotlabs/Module/Settings/Display.php:203
 #: ../../Zotlabs/Module/Settings/Featured.php:50
 #: ../../Zotlabs/Module/Settings/Permcats.php:112
 #: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Module/Settings/Channel.php:476
 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
-#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:194
-#: ../../Zotlabs/Module/Chat.php:239 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Module/Import.php:507 ../../Zotlabs/Module/Photos.php:667
+#: ../../Zotlabs/Module/Photos.php:1053 ../../Zotlabs/Module/Photos.php:1093
+#: ../../Zotlabs/Module/Photos.php:1211 ../../Zotlabs/Module/Xchan.php:15
 #: ../../Zotlabs/Lib/ThreadItem.php:731
 #: ../../extend/addon/addon/chords/Mod_Chords.php:60
 #: ../../extend/addon/addon/diaspora/diaspora.php:714
@@ -629,6 +569,89 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#: ../../Zotlabs/Module/Chat.php:195
+msgid "Leave Room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:196
+msgid "Delete Room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "I am away right now"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "I am online"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "Bookmark this room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:240
+#: ../../Zotlabs/Module/Mail.php:349 ../../include/conversation.php:1330
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:293
+#: ../../Zotlabs/Module/Mail.php:418 ../../Zotlabs/Lib/ThreadItem.php:743
+#: ../../include/conversation.php:1440
+msgid "Encrypt text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:111
+#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:287
+#: ../../Zotlabs/Module/Mail.php:412 ../../include/conversation.php:1295
+msgid "Insert web link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:216 ../../Zotlabs/Module/Pdledit.php:34
+msgid "Feature disabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:229
+msgid "New Chatroom"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:230
+msgid "Chatroom name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:231
+msgid "Expiration of chats (minutes)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:232 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Connedit.php:683 ../../Zotlabs/Module/Thing.php:313
+#: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:657
+#: ../../Zotlabs/Module/Photos.php:1042 ../../include/acl_selectors.php:218
+msgid "Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:247
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:252
+msgid "No chatrooms available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:253 ../../Zotlabs/Module/Profiles.php:834
+#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Wiki.php:167
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
+msgid "Create New"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "Expiration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:257
+msgid "min"
+msgstr ""
+
 #: ../../Zotlabs/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
@@ -761,7 +784,7 @@ msgid "Membership on this site is by invitation only."
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:162
-#: ../../boot.php:1730
+#: ../../boot.php:1687
 msgid "Register"
 msgstr ""
 
@@ -776,123 +799,970 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:35
-msgid "Authentication failed."
+#: ../../Zotlabs/Module/Setup.php:176
+msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1989
-msgid "Remote Authentication"
+#: ../../Zotlabs/Module/Setup.php:180
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1990
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../Zotlabs/Module/Setup.php:184
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1991
-msgid "Authenticate"
+#: ../../Zotlabs/Module/Setup.php:191
+msgid "Could not create table."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:57 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
+#: ../../Zotlabs/Module/Setup.php:196
+msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:69 ../../Zotlabs/Module/Import.php:84
-#: ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
+#: ../../Zotlabs/Module/Setup.php:200
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:91 ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
+#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Setup.php:743
+msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:111
-#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Setup.php:260
+msgid "System check"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:337
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:944
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
+msgid "Next"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:265
+msgid "Check again"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:287
+msgid "Database connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:288
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:289
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:290
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Database Server Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Default is 127.0.0.1"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Database Port"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Communication port number - use 0 for default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:296
+msgid "Database Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:297
+msgid "Database Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:298
+msgid "Database Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:299
+msgid "Database Type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+msgid "Site administrator email address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Website URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Please use SSL (https) URL if available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:331
+msgid "Site settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:385
+msgid "PHP version 5.5 or greater is required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:386
+msgid "PHP version"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:402
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:403
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:407
+msgid "PHP executable path"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:407
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:412
+msgid "Command line PHP"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:422
+msgid ""
+"Unable to check command line PHP, as shell_exec() is disabled. This is "
+"required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:425
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:426
+msgid "This is required for message delivery to work."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:429
+msgid "PHP register_argc_argv"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:447
 #, php-format
-msgid "Warning: Database versions differ by %1$d updates."
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to "
+"upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:134
+#: ../../Zotlabs/Module/Setup.php:452
+msgid "You can adjust these settings in the server php.ini file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:454
+msgid "PHP upload limits"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:477
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:478
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:481
+msgid "Generate encryption keys"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:498
+msgid "libCurl PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:499
+msgid "GD graphics PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:500
+msgid "OpenSSL PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:501
+msgid "PDO database PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:502
+msgid "mb_string PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "xml PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+msgid "Apache mod_rewrite module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:507
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+msgid "exec"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:513
+msgid ""
+"Error: exec is required but is either not installed or has been disabled in "
+"php.ini"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+msgid "shell_exec"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:519
+msgid ""
+"Error: shell_exec is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:527
+msgid "Error: libCURL PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:531
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:535
+msgid "Error: openssl PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:539
+msgid "Error: PDO database PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:543
+msgid "Error: mb_string PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:547
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:565
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:566
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:567
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:568
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:571
+msgid ".htconfig.php is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:585
+msgid ""
+"This software uses the Smarty3 template engine to render its web views. "
+"Smarty3 compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:586
 #, php-format
-msgid "Your service plan only allows %d channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:149
-msgid "No channel. Import failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:467
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:142
-msgid "Import completed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:488
-msgid "You must be logged in to use this feature."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:493
-msgid "Import Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:494
 msgid ""
-"Use this form to import an existing channel from a different server/hub. You "
-"may retrieve the channel identity from the old server/hub via the network or "
-"provide an export file."
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:495
-#: ../../Zotlabs/Module/Import_items.php:121
-msgid "File to Upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:496
-msgid "Or provide the old server/hub details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:497
-msgid "Your old identity address (xyz@example.com)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:498
-msgid "Your old login email address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:499
-msgid "Your old login password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:500
+#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608
 msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be "
-"able to post from either location, but only one can be marked as the primary "
-"location for files, photos, and media."
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:501
-msgid "Make this hub my primary location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:502
-msgid "Move this channel (disable all previous locations)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:503
-msgid "Import a few months of posts if possible (limited by available memory"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:504
+#: ../../Zotlabs/Module/Setup.php:588
+#, php-format
 msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
+#: ../../Zotlabs/Module/Setup.php:591
+#, php-format
+msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
+#: ../../Zotlabs/Module/Setup.php:607
+msgid ""
+"This software uses the store directory to save uploaded files. The web "
+"server needs to have write access to the store directory under the top level "
+"web folder"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:611
+msgid "store is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:644
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:645
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:646
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:647
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:648
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:649
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:651
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:653
+msgid "SSL certificate validation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:659
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:662
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:676
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:700
+#: ../../extend/addon/addon/cdav/cdav.php:41
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:741
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:742
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
+#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
+msgid "Profile not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+msgid "Profile-"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+msgid "New profile created."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:111
+msgid "Profile unavailable to clone."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:146
+msgid "Profile unavailable to export."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:252
+msgid "Profile Name is required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:459
+msgid "Marital Status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:463
+msgid "Romantic Partner"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
+msgid "Work/Employment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:478
+msgid "Religion"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:482
+msgid "Political Views"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../extend/addon/addon/openid/MysqlProvider.php:74
+msgid "Gender"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:490
+msgid "Sexual Preference"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:494
+msgid "Homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:498
+msgid "Interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:920
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
+msgid "Address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
+#: ../../Zotlabs/Module/Events.php:475
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
+#: ../../include/js_strings.php:25
+msgid "Location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:594
+msgid "Profile updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:678
+msgid "Hide your connections list from viewers of this profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Admin/Site.php:226 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Connedit.php:402 ../../Zotlabs/Module/Connedit.php:786
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
+#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Wiki.php:179
+#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings/Display.php:103
+#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Photos.php:652
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+#: ../../extend/addon/addon/friendica/dfrn_request.php:865
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+#: ../../extend/addon/addon/libertree/libertree.php:69
+#: ../../extend/addon/addon/libertree/libertree.php:81
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+#: ../../extend/addon/addon/nofed/nofed.php:72
+#: ../../extend/addon/addon/nofed/nofed.php:76
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+#: ../../extend/addon/addon/planets/planets.php:153
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+#: ../../extend/addon/addon/redred/redred.php:95
+#: ../../extend/addon/addon/redred/redred.php:99
+#: ../../extend/addon/addon/rtof/rtof.php:81
+#: ../../extend/addon/addon/rtof/rtof.php:85
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:242
+#: ../../extend/addon/addon/twitter/twitter.php:246
+#: ../../extend/addon/addon/twitter/twitter.php:255
+#: ../../extend/addon/addon/visage/visage.php:166
+#: ../../extend/addon/addon/wppost/wppost.php:82
+#: ../../extend/addon/addon/wppost/wppost.php:105
+#: ../../extend/addon/addon/wppost/wppost.php:109
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+#: ../../extend/addon/addon/cdav/cdav.php:234
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1710
+msgid "No"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Admin/Site.php:228 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Connedit.php:402 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96
+#: ../../Zotlabs/Module/Wiki.php:179 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings/Display.php:103
+#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Photos.php:652
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+#: ../../extend/addon/addon/friendica/dfrn_request.php:865
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+#: ../../extend/addon/addon/libertree/libertree.php:69
+#: ../../extend/addon/addon/libertree/libertree.php:81
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+#: ../../extend/addon/addon/nofed/nofed.php:72
+#: ../../extend/addon/addon/nofed/nofed.php:76
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+#: ../../extend/addon/addon/planets/planets.php:153
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+#: ../../extend/addon/addon/redred/redred.php:95
+#: ../../extend/addon/addon/redred/redred.php:99
+#: ../../extend/addon/addon/rtof/rtof.php:81
+#: ../../extend/addon/addon/rtof/rtof.php:85
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:242
+#: ../../extend/addon/addon/twitter/twitter.php:246
+#: ../../extend/addon/addon/twitter/twitter.php:255
+#: ../../extend/addon/addon/visage/visage.php:166
+#: ../../extend/addon/addon/wppost/wppost.php:82
+#: ../../extend/addon/addon/wppost/wppost.php:105
+#: ../../extend/addon/addon/wppost/wppost.php:109
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+#: ../../extend/addon/addon/cdav/cdav.php:234
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1710
+msgid "Yes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "Edit Profile Details"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "View this profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
+#: ../../include/channel.php:1066
+msgid "Edit visibility"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Profile Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Change cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
+msgid "Change profile photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Create a new profile using these settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Clone this profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Delete this profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Add profile things"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1715
+msgid "Personal"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Relation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Import profile from file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Export profile to file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Your gender"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Marital status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "Sexual preference"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Profile name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
+#: ../../include/datetime.php:259
+msgid "Required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "This is your default profile."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:752
+msgid "Your full name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:753
+msgid "Title/Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:756
+msgid "Street address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:757
+msgid "Locality/City"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:758
+msgid "Region/State"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:759
+msgid "Postal/Zip code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:938
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
+msgid "Country"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Who (if applicable)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:766
+msgid "Since (date)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:769
+msgid "Tell us about yourself"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../extend/addon/addon/openid/MysqlProvider.php:68
+msgid "Homepage URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:771
+msgid "Hometown"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Political views"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:773
+msgid "Religious views"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Keywords used in directory listings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Example: fishing photography software"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:777
+msgid "Musical interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Books, literature"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:779
+msgid "Television"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "Film/Dance/Culture/Entertainment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:781
+msgid "Hobbies/Interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:782
+msgid "Love/Romance"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:784
+msgid "School/Education"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:785
+msgid "Contact information and social networks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:786
+msgid "My other channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:788
+msgid "Communications"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:916
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
+msgid "Phone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:917
+#: ../../extend/addon/addon/redred/redred.php:107
+#: ../../extend/addon/addon/rtof/rtof.php:93
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
+#: ../../extend/addon/addon/openid/MysqlProvider.php:56
+#: ../../extend/addon/addon/openid/MysqlProvider.php:57
+#: ../../include/network.php:1749
+msgid "Email"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:918
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
+msgid "Instant messenger"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:919
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
+msgid "Website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:921
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
+msgid "Note"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:922
+#: ../../extend/addon/addon/cdav/cdav.php:270
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
+#: ../../include/connections.php:668
+msgid "Mobile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:923
+#: ../../extend/addon/addon/cdav/cdav.php:271
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
+#: ../../include/connections.php:669
+msgid "Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:924
+#: ../../extend/addon/addon/cdav/cdav.php:274
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
+#: ../../include/connections.php:672
+msgid "Work"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:926
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
+msgid "Add Contact"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:927
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
+msgid "Add Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Module/Admin/Plugins.php:453
+#: ../../Zotlabs/Module/Connedit.php:929
+#: ../../Zotlabs/Module/Settings/Oauth.php:42
+#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
+msgid "Update"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:804
+#: ../../Zotlabs/Module/Admin/Plugins.php:423
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Wiki.php:261
+#: ../../Zotlabs/Module/Wiki.php:286
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../extend/addon/addon/friendica/dfrn_request.php:879
+#: ../../extend/addon/addon/js_upload/js_upload.php:46
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
+msgid "Cancel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
+msgid "Profile Image"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
+#: ../../include/nav.php:105
+msgid "Edit Profiles"
 msgstr ""
 
 #: ../../Zotlabs/Module/Help.php:23
@@ -987,7 +1857,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Themes.php:72
 #: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35
 #: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89
-#: ../../include/items.php:3368
+#: ../../include/items.php:3271
 msgid "Item not found."
 msgstr ""
 
@@ -1083,13 +1953,6 @@ msgstr ""
 msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:287
-#: ../../Zotlabs/Module/Mail.php:412 ../../Zotlabs/Module/Chat.php:205
-#: ../../include/conversation.php:1295
-msgid "Insert web link"
-msgstr ""
-
 #: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406
 msgid "Title (optional)"
 msgstr ""
@@ -1102,8 +1965,8 @@ msgstr ""
 msgid "Invalid item."
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Chanview.php:96
 #: ../../Zotlabs/Module/Wall_upload.php:31
 msgid "Channel not found."
 msgstr ""
@@ -1282,14 +2145,14 @@ msgid "Recent activity"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/nav.php:203 ../../include/text.php:940
+#: ../../include/text.php:940 ../../include/nav.php:203
 msgid "Connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44
 #: ../../Zotlabs/Lib/Apps.php:237 ../../include/widgets.php:302
-#: ../../include/acl_selectors.php:213 ../../include/nav.php:180
 #: ../../include/text.php:1010 ../../include/text.php:1022
+#: ../../include/nav.php:180 ../../include/acl_selectors.php:213
 msgid "Search"
 msgstr ""
 
@@ -1337,25 +2200,25 @@ msgstr ""
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4278
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4181
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4279
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4182
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4280
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4183
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4281
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4184
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4283
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4186
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
@@ -1742,18 +2605,6 @@ msgstr ""
 msgid "Request date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Profiles.php:790
-#: ../../extend/addon/addon/redred/redred.php:107
-#: ../../extend/addon/addon/rtof/rtof.php:93
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
-#: ../../extend/addon/addon/openid/MysqlProvider.php:56
-#: ../../extend/addon/addon/openid/MysqlProvider.php:57
-#: ../../include/network.php:2270
-msgid "Email"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Accounts.php:170
 msgid "No registrations."
 msgstr ""
@@ -1887,13 +2738,6 @@ msgstr ""
 msgid "UID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:920
-#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
-msgid "Address"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Channels.php:162
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
@@ -1978,7 +2822,7 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2936
+#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2920
 msgid "Default"
 msgstr ""
 
@@ -2001,139 +2845,10 @@ msgstr ""
 msgid "unsupported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:226 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:402
-#: ../../Zotlabs/Module/Connedit.php:786 ../../Zotlabs/Module/Events.php:470
-#: ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Mitem.php:162
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:97
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Settings/Channel.php:294
-#: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Wiki.php:179
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-#: ../../extend/addon/addon/libertree/libertree.php:69
-#: ../../extend/addon/addon/libertree/libertree.php:81
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-#: ../../extend/addon/addon/nofed/nofed.php:72
-#: ../../extend/addon/addon/nofed/nofed.php:76
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-#: ../../extend/addon/addon/planets/planets.php:153
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-#: ../../extend/addon/addon/redred/redred.php:95
-#: ../../extend/addon/addon/redred/redred.php:99
-#: ../../extend/addon/addon/rtof/rtof.php:81
-#: ../../extend/addon/addon/rtof/rtof.php:85
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:242
-#: ../../extend/addon/addon/twitter/twitter.php:246
-#: ../../extend/addon/addon/twitter/twitter.php:255
-#: ../../extend/addon/addon/visage/visage.php:166
-#: ../../extend/addon/addon/wppost/wppost.php:82
-#: ../../extend/addon/addon/wppost/wppost.php:105
-#: ../../extend/addon/addon/wppost/wppost.php:109
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:234
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1753
-msgid "No"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Site.php:227
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:228 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:402
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Mitem.php:162
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Settings/Channel.php:294
-#: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Wiki.php:179
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-#: ../../extend/addon/addon/libertree/libertree.php:69
-#: ../../extend/addon/addon/libertree/libertree.php:81
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-#: ../../extend/addon/addon/nofed/nofed.php:72
-#: ../../extend/addon/addon/nofed/nofed.php:76
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-#: ../../extend/addon/addon/planets/planets.php:153
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-#: ../../extend/addon/addon/redred/redred.php:95
-#: ../../extend/addon/addon/redred/redred.php:99
-#: ../../extend/addon/addon/rtof/rtof.php:81
-#: ../../extend/addon/addon/rtof/rtof.php:85
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:242
-#: ../../extend/addon/addon/twitter/twitter.php:246
-#: ../../extend/addon/addon/twitter/twitter.php:255
-#: ../../extend/addon/addon/visage/visage.php:166
-#: ../../extend/addon/addon/wppost/wppost.php:82
-#: ../../extend/addon/addon/wppost/wppost.php:105
-#: ../../extend/addon/addon/wppost/wppost.php:109
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:234
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1753
-msgid "Yes"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Site.php:233
 msgid "My site is not a public server"
 msgstr ""
@@ -2150,15 +2865,15 @@ msgstr ""
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:247 ../../Zotlabs/Module/Setup.php:328
+#: ../../Zotlabs/Module/Admin/Site.php:247
 msgid "Basic/Minimal Social Networking"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:248 ../../Zotlabs/Module/Setup.php:329
+#: ../../Zotlabs/Module/Admin/Site.php:248
 msgid "Standard Configuration (default)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:249 ../../Zotlabs/Module/Setup.php:330
+#: ../../Zotlabs/Module/Admin/Site.php:249
 msgid "Professional"
 msgstr ""
 
@@ -2208,7 +2923,7 @@ msgstr ""
 msgid "Site name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Module/Setup.php:351
+#: ../../Zotlabs/Module/Admin/Site.php:278
 msgid "Server Configuration/Role"
 msgstr ""
 
@@ -2578,23 +3293,6 @@ msgstr ""
 msgid "Install"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../Zotlabs/Module/Wiki.php:261 ../../Zotlabs/Module/Wiki.php:286
-#: ../../extend/addon/addon/friendica/dfrn_request.php:879
-#: ../../extend/addon/addon/js_upload/js_upload.php:46
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
-msgid "Cancel"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Plugins.php:445
 msgid "Manage Repos"
 msgstr ""
@@ -2607,20 +3305,12 @@ msgstr ""
 msgid "Install a New Plugin Repository"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Connedit.php:929 ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
-msgid "Update"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Plugins.php:454
 msgid "Switch branch"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:984 ../../Zotlabs/Module/Tagrm.php:137
+#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Photos.php:984
 #: ../../extend/addon/addon/superblock/superblock.php:116
 msgid "Remove"
 msgstr ""
@@ -2650,62 +3340,90 @@ msgstr ""
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Channel"
+#: ../../Zotlabs/Module/Webpages.php:52
+msgid "Import Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
+#: ../../Zotlabs/Module/Webpages.php:53
+msgid "Import selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export Content"
+#: ../../Zotlabs/Module/Webpages.php:76
+msgid "Export Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:61
-msgid ""
-"Export your channel information and recent content to a JSON backup that can "
-"be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for "
-"this download to begin."
+#: ../../Zotlabs/Module/Webpages.php:77
+msgid "Export selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
-msgid "Export your posts from a given year."
+#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/conversation.php:1889
+msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:65
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
+#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1073
+#: ../../extend/addon/addon/cdav/include/widgets.php:123
+#: ../../include/conversation.php:1378
+msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:66
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
+#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Pubsites.php:59
+#: ../../Zotlabs/Module/Wiki.php:166 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Events.php:694
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../include/page_widgets.php:42
+msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:67
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Events.php:478
+#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../include/conversation.php:1347 ../../include/page_widgets.php:43
+msgid "Preview"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:68
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a href=\"%1$s\">"
-"%2$s</a> on any site containing your channel. For best results please import "
-"or restore these in date order (oldest first)."
+#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:254
+msgid "Page Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:284
+msgid "Invalid file type."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:296
+msgid "Error opening zip file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:307
+msgid "Invalid folder path."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:334
+msgid "No webpage elements detected."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:409
+msgid "Import complete."
 msgstr ""
 
 #: ../../Zotlabs/Module/Editlayout.php:127
@@ -2730,16 +3448,12 @@ msgstr ""
 msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178
-msgid "Apps"
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:48
-msgid "Manage apps"
-msgstr ""
-
-#: ../../Zotlabs/Module/Apps.php:49
-msgid "Create new app"
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
 msgstr ""
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
@@ -2819,7 +3533,7 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2289
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2273
 msgid "Menus"
 msgstr ""
 
@@ -2827,18 +3541,6 @@ msgstr ""
 msgid "Drop"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:255
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190
-#: ../../include/page_widgets.php:47
-msgid "Created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:256
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../include/page_widgets.php:48
-msgid "Edited"
-msgstr ""
-
 #: ../../Zotlabs/Module/Menu.php:117
 msgid "Bookmarks allowed"
 msgstr ""
@@ -2896,7 +3598,11 @@ msgstr ""
 msgid "Not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:108
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
 msgid "Edit post"
 msgstr ""
 
@@ -2926,14 +3632,6 @@ msgstr ""
 msgid "Manage Channel Locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
-#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Profiles.php:509
-#: ../../Zotlabs/Module/Profiles.php:737
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
-#: ../../include/js_strings.php:25
-msgid "Location"
-msgstr ""
-
 #: ../../Zotlabs/Module/Locs.php:119
 msgid "Primary"
 msgstr ""
@@ -2998,12 +3696,360 @@ msgstr ""
 msgid "Rate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Events.php:694
-#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Wiki.php:166
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
-#: ../../include/page_widgets.php:42
-msgid "View"
+#: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178
+msgid "Apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Apps.php:48
+msgid "Manage apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Apps.php:49
+msgid "Create new app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../extend/addon/addon/opensearch/opensearch.php:42
+msgid "$Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Set/edit permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Include all files and sub folders"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:161
+msgid "Return to file list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Copy/paste this code to attach file to a post"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Copy/paste this URL to link file from a web page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:166
+msgid "Share this file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:167
+msgid "Show URL to this file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:168
+msgid "Notify your contacts about this file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
+#: ../../include/conversation.php:1836
+msgid "Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117
+#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183
+msgctxt "acl"
+msgid "Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:344
+msgid "network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:354
+msgid "RSS"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3804
+msgid "Privacy group not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:45
+msgid "Invalid message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:78
+msgid "no results"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:93
+msgid "channel sync processed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:97
+msgid "queued"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:101
+msgid "posted"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:105
+msgid "accepted for delivery"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:109
+msgid "updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:112
+msgid "update ignored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:115
+msgid "permission denied"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:119
+msgid "recipient not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:122
+msgid "mail recalled"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:125
+msgid "duplicate mail received"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:128
+msgid "mail delivered"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:148
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:151
+msgid "Options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:152
+msgid "Redeliver"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:605
+msgid "l, F j"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:660
+#: ../../include/text.php:1750
+msgid "Link to Source"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
+msgid "Edit Event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
+msgid "Create Event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
+#: ../../Zotlabs/Module/Photos.php:935
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
+msgid "Previous"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691
+#: ../../include/channel.php:1370
+msgid "Export"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2296
+msgid "Import"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:700
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
+msgid "Today"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:191
+#, php-format
+msgid "%s element installed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Impel.php:194
+#, php-format
+msgid "%s element installation failed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:57
+msgid "Nothing to import."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:69
+#: ../../Zotlabs/Module/Import.php:84
+msgid "Unable to download data from old server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:91
+msgid "Imported file is empty."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Import.php:111
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid "Use this form to import existing posts and content from an export file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:121
+#: ../../Zotlabs/Module/Import.php:495
+msgid "File to Upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:136
+#: ../../Zotlabs/Module/New_channel.php:121
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:223
+msgid "Channel Manager"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Connedit.php:82
@@ -3145,14 +4191,6 @@ msgstr ""
 msgid "Fetch electronic calling card for this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:683
-#: ../../Zotlabs/Module/Filestorage.php:152
-#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1042
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
-#: ../../Zotlabs/Module/Chat.php:232 ../../include/acl_selectors.php:218
-msgid "Permissions"
-msgstr ""
-
 #: ../../Zotlabs/Module/Connedit.php:686
 msgid "Open Individual Permissions section by default"
 msgstr ""
@@ -3178,9 +4216,10 @@ msgstr ""
 #: ../../Zotlabs/Module/Settings/Channel.php:66
 #: ../../Zotlabs/Module/Settings/Channel.php:67
 #: ../../Zotlabs/Module/Settings/Channel.php:70
-#: ../../Zotlabs/Module/Settings/Channel.php:81 ../../include/widgets.php:528
-#: ../../include/selectors.php:123 ../../include/channel.php:408
-#: ../../include/channel.php:409 ../../include/channel.php:416
+#: ../../Zotlabs/Module/Settings/Channel.php:81
+#: ../../include/selectors.php:123 ../../include/widgets.php:528
+#: ../../include/channel.php:408 ../../include/channel.php:409
+#: ../../include/channel.php:416
 msgid "Friends"
 msgstr ""
 
@@ -3224,7 +4263,7 @@ msgstr ""
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:858 ../../include/items.php:3934
+#: ../../Zotlabs/Module/Connedit.php:858 ../../include/items.php:3837
 #, php-format
 msgid "Connection: %s"
 msgstr ""
@@ -3372,58 +4411,6 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:789
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
-msgid "Phone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:791
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
-msgid "Instant messenger"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Profiles.php:792
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
-msgid "Website"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Profiles.php:794
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
-msgid "Note"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:922 ../../Zotlabs/Module/Profiles.php:795
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
-#: ../../extend/addon/addon/cdav/cdav.php:270
-#: ../../include/connections.php:668
-msgid "Mobile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Profiles.php:796
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
-#: ../../extend/addon/addon/cdav/cdav.php:271
-#: ../../include/connections.php:669
-msgid "Home"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:924 ../../Zotlabs/Module/Profiles.php:797
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
-#: ../../extend/addon/addon/cdav/cdav.php:274
-#: ../../include/connections.php:672
-msgid "Work"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:926 ../../Zotlabs/Module/Profiles.php:799
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
-msgid "Add Contact"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:800
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
-msgid "Add Field"
-msgstr ""
-
 #: ../../Zotlabs/Module/Connedit.php:932
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
 msgid "P.O. Box"
@@ -3454,869 +4441,6 @@ msgstr ""
 msgid "ZIP Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Profiles.php:760
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
-msgid "Country"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:110
-msgid "Event can not end before it has started."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
-msgid "Unable to generate preview."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:119
-msgid "Event title and start time are required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
-msgid "Event not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Like.php:372
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1141
-#: ../../include/conversation.php:123 ../../include/text.php:1961
-msgid "event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:460
-msgid "Edit event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:460
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Edit Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:466
-msgid "Edit start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:466
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
-msgid "Finish date and time are not known or not relevant"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:469
-msgid "Edit finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:469
-msgid "Finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:471
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:473
-msgid "Edit Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:475
-msgid "Edit Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Module/Photos.php:1094
-#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/ThreadItem.php:740
-#: ../../include/page_widgets.php:43 ../../include/conversation.php:1347
-msgid "Preview"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1410
-msgid "Permission settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:489
-msgid "Timezone:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:494
-msgid "Advanced Options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:605 ../../Zotlabs/Module/Cal.php:263
-msgid "l, F j"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:633
-msgid "Edit event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:635
-msgid "Delete event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:312
-#: ../../include/text.php:1766
-msgid "Link to Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:669
-msgid "calendar"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:335
-msgid "Edit Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:688 ../../Zotlabs/Module/Cal.php:335
-msgid "Create Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Photos.php:935 ../../Zotlabs/Module/Cal.php:336
-#: ../../Zotlabs/Module/Cal.php:343
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
-msgid "Previous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
-#: ../../Zotlabs/Module/Photos.php:944 ../../Zotlabs/Module/Cal.php:337
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Setup.php:264
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
-msgid "Next"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:338
-#: ../../include/channel.php:1370
-msgid "Export"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:695
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
-msgid "Month"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:696
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
-msgid "Week"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:697
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
-msgid "Day"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:700 ../../Zotlabs/Module/Cal.php:345
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
-msgid "Today"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:731
-msgid "Event removed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:734
-msgid "Failed to remove event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../extend/addon/addon/opensearch/opensearch.php:42
-msgid "$Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Home.php:92
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:87
-msgid "Permission Denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:103
-msgid "File not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:146
-msgid "Edit file permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:159
-msgid "Set/edit permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Include all files and sub folders"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Return to file list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Copy/paste this code to attach file to a post"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Copy/paste this URL to link file from a web page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:166
-msgid "Share this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:167
-msgid "Show URL to this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:168
-msgid "Notify your contacts about this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1836
-msgid "Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:82
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729
-#: ../../Zotlabs/Module/Profile_photo.php:115
-#: ../../Zotlabs/Module/Profile_photo.php:224
-#: ../../include/photo/photo_driver.php:730
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
-msgid "Album not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:112
-msgid "Delete Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:133
-msgid ""
-"Multiple storage folders exist with this album name, but within different "
-"directories. Please remove the desired folder or folders using the Files "
-"manager"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1054
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:508 ../../Zotlabs/Module/Display.php:22
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Directory.php:64
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../extend/addon/addon/friendica/dfrn_request.php:794
-msgid "Public access denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:519
-msgid "No photos selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:568
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:607
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:610
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:646
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:650
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:651
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:652
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:653
-msgid "Caption (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:654
-msgid "Description (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:685
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:729
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:752
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:754
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335
-#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1751
-msgid "View Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:809
-#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1768
-msgid "Edit Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:856
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:858
-msgid "Photo not available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:916
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:917
-msgid "Use as cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:924
-msgid "Private Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:939
-msgid "View Full Size"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1028
-msgid "Edit photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1030
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1031
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Move photo to album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Caption"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1049
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1052
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:268
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Lib/ThreadItem.php:269
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Webpages.php:245
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193
-#: ../../extend/addon/addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1378
-msgid "Share"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:411
-#: ../../include/conversation.php:738
-msgid "Please wait"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
-#: ../../Zotlabs/Lib/ThreadItem.php:728
-msgid "This is you"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210
-#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Agree"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Disagree"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Abstain"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Attending"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Not attending"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Might attend"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1139
-#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
-#: ../../include/conversation.php:1928
-msgid "View all"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1952
-#: ../../include/channel.php:1273
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:195
-#: ../../include/conversation.php:1955
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1236
-msgid "Photo Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1245
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1250
-msgid "Map"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:400
-msgctxt "noun"
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/ThreadItem.php:401
-msgctxt "noun"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:406
-#: ../../include/acl_selectors.php:220
-msgid "Close"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1341
-msgid "View Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
-#: ../../Zotlabs/Module/Photos.php:1366
-msgid "Recent Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3901
-msgid "Privacy group not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:45
-msgid "Invalid message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "no results"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "channel sync processed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "queued"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:101
-msgid "posted"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:105
-msgid "accepted for delivery"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:109
-msgid "updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:112
-msgid "update ignored"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:115
-msgid "permission denied"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:119
-msgid "recipient not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:122
-msgid "mail recalled"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:125
-msgid "duplicate mail received"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:128
-msgid "mail delivered"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:148
-#, php-format
-msgid "Delivery report for %1$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:151
-msgid "Options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:152
-msgid "Redeliver"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:65
-msgid "Unable to lookup recipient."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:72
-msgid "Unable to communicate with requested channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:79
-msgid "Cannot verify requested channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:97
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Messages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:213
-msgid "Message recalled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:226
-msgid "Conversation removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:349
-#: ../../Zotlabs/Module/Chat.php:203 ../../include/conversation.php:1330
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:269
-msgid "Requested channel is not in this network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:277
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
-msgid "To:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
-msgid "Subject:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:284 ../../Zotlabs/Module/Invite.php:138
-msgid "Your message:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
-#: ../../include/conversation.php:1390
-msgid "Attach file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:288
-msgid "Send"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
-#: ../../include/conversation.php:1435
-msgid "Set expiration date"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:418
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Lib/ThreadItem.php:743
-#: ../../include/conversation.php:1440
-msgid "Encrypt text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:375
-msgid "Delete message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:376
-msgid "Delivery report"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:377
-msgid "Recall message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:379
-msgid "Message has been recalled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:396
-msgid "Delete Conversation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:398
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:402
-msgid "Send Reply"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:407
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
-msgid "webpage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
-msgid "block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
-msgid "layout"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:191
-#, php-format
-msgid "%s element installed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:194
-#, php-format
-msgid "%s element installation failed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:104
-msgid "Import completed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "Import Items"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:120
-msgid "Use this form to import existing posts and content from an export file."
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:136
-#: ../../Zotlabs/Module/New_channel.php:121
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:834
-#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Chat.php:253
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
-msgid "Create New"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:223
-msgid "Channel Manager"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr ""
-
 #: ../../Zotlabs/Module/Magic.php:71
 msgid "Hub not found."
 msgstr ""
@@ -4438,14 +4562,18 @@ msgstr ""
 msgid "Link text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr ""
-
 #: ../../Zotlabs/Module/Ratings.php:70
 msgid "No ratings"
 msgstr ""
 
+#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17
+#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Display.php:22
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Zotlabs/Module/Photos.php:508
+#: ../../extend/addon/addon/friendica/dfrn_request.php:794
+msgid "Public access denied."
+msgstr ""
+
 #: ../../Zotlabs/Module/Ratings.php:98
 msgid "Rating: "
 msgstr ""
@@ -4462,14 +4590,6 @@ msgstr ""
 msgid "Item not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2312
-msgid "Import"
-msgstr ""
-
 #: ../../Zotlabs/Module/Notify.php:57
 #: ../../Zotlabs/Module/Notifications.php:38
 msgid "No more system notifications."
@@ -4480,6 +4600,40 @@ msgstr ""
 msgid "System Notifications"
 msgstr ""
 
+#: ../../Zotlabs/Module/Item.php:184
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:450
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:492
+msgid "Executable content type not permitted to this channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:842
+msgid "Duplicate post suppressed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:984
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1114
+msgid "Unable to obtain post information from database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1121
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1128
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr ""
+
 #: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
 msgid "Authorize application connection"
 msgstr ""
@@ -4539,6 +4693,10 @@ msgstr ""
 msgid "Enter email addresses, one per line:"
 msgstr ""
 
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
+msgid "Your message:"
+msgstr ""
+
 #: ../../Zotlabs/Module/Invite.php:139
 msgid "Please join my community on $Projectname."
 msgstr ""
@@ -4571,7 +4729,7 @@ msgstr ""
 msgid "Site Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1995
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1474
 msgid "Administrator"
 msgstr ""
 
@@ -4617,59 +4775,6 @@ msgid ""
 "or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:52
-msgid "Import Webpage Elements"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:53
-msgid "Import selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:76
-msgid "Export Webpage Elements"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:77
-msgid "Export selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1889
-msgid "Webpages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
-msgid "Actions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
-msgid "Page Link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:254
-msgid "Page Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:284
-msgid "Invalid file type."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:296
-msgid "Error opening zip file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:307
-msgid "Invalid folder path."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:334
-msgid "No webpage elements detected."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:409
-msgid "Import complete."
-msgstr ""
-
 #: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:208
 msgid "Mark all system notifications seen"
 msgstr ""
@@ -4703,85 +4808,6 @@ msgstr ""
 msgid "Make this post private"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1367
-msgid "Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Click on a contact to add or remove."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:124
-msgid "Visible To"
-msgstr ""
-
-#: ../../Zotlabs/Module/Hcard.php:35 ../../Zotlabs/Module/Channel.php:47
-#: ../../Zotlabs/Module/Profile.php:43
-msgid "Posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Hcard.php:42 ../../Zotlabs/Module/Channel.php:54
-#: ../../Zotlabs/Module/Profile.php:50
-msgid "Only posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:184
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:450
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:492
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:842
-msgid "Duplicate post suppressed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:984
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1114
-msgid "Unable to obtain post information from database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1121
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1128
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please "
-"leave this page unless you are comfortable with and knowledgeable about how "
-"to correctly use this feature."
-msgstr ""
-
 #: ../../Zotlabs/Module/Search.php:224
 #, php-format
 msgid "Items tagged with: %s"
@@ -4792,86 +4818,180 @@ msgstr ""
 msgid "Search results for: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
+#: ../../Zotlabs/Module/Wiki.php:30
+msgid "Profile Unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
+#: ../../Zotlabs/Module/Wiki.php:44
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:117 ../../Zotlabs/Module/Lockview.php:153
-#: ../../Zotlabs/Module/Acl.php:117 ../../include/acl_selectors.php:183
-msgctxt "acl"
-msgid "Profile"
+#: ../../Zotlabs/Module/Wiki.php:68
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60
+msgid "Invalid channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2288
-msgid "Blocks"
+#: ../../Zotlabs/Module/Wiki.php:159
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144
+#: ../../include/conversation.php:1900
+msgid "Wikis"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
+#: ../../Zotlabs/Module/Wiki.php:165
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150
+msgid "Download"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2290
-msgid "Layouts"
+#: ../../Zotlabs/Module/Wiki.php:169
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
+msgid "Wiki name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/help.php:55 ../../include/help.php:61
-#: ../../include/nav.php:174 ../../include/nav.php:288
-msgid "Help"
+#: ../../Zotlabs/Module/Wiki.php:170
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
+msgid "Content type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:185
-msgid "Comanche page description language help"
+#: ../../Zotlabs/Module/Wiki.php:179
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+msgid "Create a status post for this wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Description"
+#: ../../Zotlabs/Module/Wiki.php:204
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183
+msgid "Wiki not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:194
-msgid "Download PDL file"
+#: ../../Zotlabs/Module/Wiki.php:228
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208
+msgid "Rename page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:156
-msgid "Website:"
+#: ../../Zotlabs/Module/Wiki.php:232
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212
+msgid "Error retrieving page content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:159
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
+#: ../../Zotlabs/Module/Wiki.php:259
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241
+msgid "Revision Comparison"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Rating (this information is public)"
+#: ../../Zotlabs/Module/Wiki.php:260
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
+msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:161
-msgid "Optionally explain your rating (this information is public)"
+#: ../../Zotlabs/Module/Wiki.php:264
+msgid "Short description of your changes (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:194
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:298
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+#: ../../Zotlabs/Module/Wiki.php:271
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
+msgid "Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:420
-msgid "Use Photo for Profile"
+#: ../../Zotlabs/Module/Wiki.php:279
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259
+msgid "New page name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:420
-msgid "Upload Profile Photo"
+#: ../../Zotlabs/Module/Wiki.php:284
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264
+#: ../../include/conversation.php:1299
+msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:421
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:182
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:194
-msgid "Use"
+#: ../../Zotlabs/Module/Wiki.php:285
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1393
+msgid "Embed an image from your albums"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:287
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
+#: ../../include/conversation.php:1395 ../../include/conversation.php:1442
+msgid "OK"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:288
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1335
+msgid "Choose images to embed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:289
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1336
+msgid "Choose an album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:290
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
+msgid "Choose a different album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:291
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
+#: ../../include/conversation.php:1338
+msgid "Error getting album list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:292
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1339
+msgid "Error getting photo link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:293
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1340
+msgid "Error getting album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:357
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
+msgid "Error creating wiki. Invalid name."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:369
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
+msgid "Wiki created, but error creating Home page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:376
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
+msgid "Error creating wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:388
+msgid "Wiki delete permission denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:398
+msgid "Error deleting wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:424
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
+msgid "New page created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:539
+msgid "Cannot delete Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:603
+msgid "Current Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:603
+msgid "Selected Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:653
+msgid "You must be authenticated."
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:19
@@ -4913,16 +5033,22 @@ msgstr ""
 #: ../../Zotlabs/Module/Tagger.php:47
 #: ../../extend/addon/addon/diaspora/inbound.php:1794
 #: ../../extend/addon/addon/redphotos/redphotohelper.php:74
-#: ../../include/conversation.php:120 ../../include/text.php:1958
+#: ../../include/conversation.php:120 ../../include/text.php:1942
 msgid "photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
 #: ../../extend/addon/addon/diaspora/inbound.php:1794
-#: ../../include/conversation.php:148 ../../include/text.php:1964
+#: ../../include/conversation.php:148 ../../include/text.php:1948
 msgid "status"
 msgstr ""
 
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1145
+#: ../../include/conversation.php:123 ../../include/text.php:1945
+msgid "event"
+msgstr ""
+
 #: ../../Zotlabs/Module/Like.php:419
 #: ../../extend/addon/addon/diaspora/inbound.php:1823
 #: ../../include/conversation.php:164
@@ -4973,20 +5099,27 @@ msgstr ""
 msgid "Thank you."
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chanview.php:134
-msgid "toggle full screen mode"
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please "
+"leave this page unless you are comfortable with and knowledgeable about how "
+"to correctly use this feature."
 msgstr ""
 
 #: ../../Zotlabs/Module/Subthread.php:118
@@ -4999,109 +5132,6 @@ msgstr ""
 msgid "%1$s stopped following %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
-#: ../../extend/addon/addon/chess/chess.php:403
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:26
-msgid "You must be logged in to see this page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:112
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
-#, php-format
-msgid "Site Member (%s)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:68
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1757
-msgid "Password Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Your new password is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid "click here to login"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:96
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:117
-#, php-format
-msgid "Your password has changed at %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Forgot your Password?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:131
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:132
-msgid "Email Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:133
-msgid "Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rbmark.php:94
-msgid "Select a bookmark folder"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rbmark.php:99
-msgid "Save Bookmark"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rbmark.php:100
-msgid "URL of bookmark"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rbmark.php:105
-msgid "Or enter new bookmark folder name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
-msgstr ""
-
 #: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
 #, php-format
 msgctxt "mood"
@@ -5116,80 +5146,309 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regmod.php:15
-msgid "Please login."
+#: ../../Zotlabs/Module/Mail.php:65
+msgid "Unable to lookup recipient."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
+#: ../../Zotlabs/Module/Mail.php:72
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:79
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:97
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:178
+msgid "Messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:213
+msgid "Message recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:269
+msgid "Requested channel is not in this network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:277
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
+msgid "To:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
+msgid "Subject:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
+#: ../../include/conversation.php:1390
+msgid "Attach file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:288
+msgid "Send"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
+#: ../../include/conversation.php:1435
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:375
+msgid "Delete message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:376
+msgid "Delivery report"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:377
+msgid "Recall message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:379
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:396
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:398
 msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-msgid "Remove This Account"
+#: ../../Zotlabs/Module/Mail.php:402
+msgid "Send Reply"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "WARNING: "
+#: ../../Zotlabs/Module/Mail.php:407
+#, php-format
+msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2272
+msgid "Blocks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2274
+msgid "Layouts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:232
+#: ../../include/help.php:55 ../../include/help.php:61
+#: ../../include/nav.php:174 ../../include/nav.php:288
+msgid "Help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:185
+msgid "Comanche page description language help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:189
+msgid "Layout Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:194
+msgid "Download PDL file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:156
+msgid "Website:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:159
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Rating (this information is public)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:161
+msgid "Optionally explain your rating (this information is public)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:224
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729
+#: ../../include/photo/photo_driver.php:730
+msgid "Profile Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:194
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:298
 msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This action is permanent and can not be undone!"
+#: ../../Zotlabs/Module/Profile_photo.php:420
+msgid "Use Photo for Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Removeme.php:62
-msgid "Please enter your password for verification:"
+#: ../../Zotlabs/Module/Profile_photo.php:420
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Zotlabs/Module/Profile_photo.php:421
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:182
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:194
+msgid "Use"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55
+msgid "App installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:48
+msgid "Malformed app."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:111
+msgid "Embed code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Edit App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Create App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Name of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:123
+msgid "Location (URL) of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:124 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Zotlabs/Module/Events.php:473
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:173
+msgid "Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "Photo icon URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "80 x 80 pixels - optional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:126
+msgid "Categories (optional, comma separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:127
+msgid "Version ID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:128
+msgid "Price of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:129
+msgid "Location (URL) to purchase app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr ""
+
+#: ../../Zotlabs/Module/Chanview.php:134
+msgid "toggle full screen mode"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:59
 msgid ""
-"Remove this account, all its channels and all its channel clones from the "
-"network"
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export Content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:61
 msgid ""
-"By default only the instances of the channels located on this hub will be "
-"removed from the network"
+"Export your channel information and recent content to a JSON backup that can "
+"be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for "
+"this download to begin."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
-#: ../../Zotlabs/Module/Settings/Account.php:120
-msgid "Remove Account"
+#: ../../Zotlabs/Module/Uexport.php:63
+msgid "Export your posts from a given year."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:21
-msgid "Layout updated."
+#: ../../Zotlabs/Module/Uexport.php:65
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:216
-msgid "Feature disabled."
+#: ../../Zotlabs/Module/Uexport.php:66
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
+"\">%2$s</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
-msgid "Edit System Page Description"
+#: ../../Zotlabs/Module/Uexport.php:67
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:64
-msgid "Layout not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:70
-msgid "Module Name:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:71
-msgid "Layout Help"
+#: ../../Zotlabs/Module/Uexport.php:68
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a href=\"%1$s\">"
+"%2$s</a> on any site containing your channel. For best results please import "
+"or restore these in date order (oldest first)."
 msgstr ""
 
 #: ../../Zotlabs/Module/Directory.php:246
@@ -5216,8 +5475,7 @@ msgid "Age:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Directory.php:315 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/markdown.php:562
-#: ../../include/channel.php:1134
+#: ../../include/event.php:84 ../../include/channel.php:1134
 msgid "Location:"
 msgstr ""
 
@@ -5234,9 +5492,9 @@ msgid "About:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Directory.php:329 ../../Zotlabs/Module/Suggest.php:56
-#: ../../include/widgets.php:134 ../../include/widgets.php:171
 #: ../../include/connections.php:110 ../../include/conversation.php:938
-#: ../../include/conversation.php:1069 ../../include/channel.php:1119
+#: ../../include/conversation.php:1069 ../../include/widgets.php:134
+#: ../../include/widgets.php:171 ../../include/channel.php:1119
 msgid "Connect"
 msgstr ""
 
@@ -5305,32 +5563,335 @@ msgstr ""
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile.php:91
-msgid "vcard"
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#, php-format
+msgid "Site Member (%s)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewsrc.php:46
-msgid "Source of Item"
+#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:68
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1714
+msgid "Password Reset"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Your new password is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid "click here to login"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:96
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:117
+#, php-format
+msgid "Your password has changed at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:131
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:132
+msgid "Email Address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:133
+msgid "Reset"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rbmark.php:94
+msgid "Select a bookmark folder"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rbmark.php:99
+msgid "Save Bookmark"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rbmark.php:100
+msgid "URL of bookmark"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rbmark.php:105
+msgid "Or enter new bookmark folder name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
+msgstr ""
+
+#: ../../Zotlabs/Module/Regmod.php:15
+msgid "Please login."
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:35
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:57
+msgid "Remove This Account"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "WARNING: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This action is permanent and can not be undone!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
+msgid "Please enter your password for verification:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:60
+msgid ""
+"Remove this account, all its channels and all its channel clones from the "
+"network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:60
+msgid ""
+"By default only the instances of the channels located on this hub will be "
+"removed from the network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings/Account.php:120
+msgid "Remove Account"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:21
+msgid "Layout updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
+msgid "Edit System Page Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:64
+msgid "Layout not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:70
+msgid "Module Name:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:71
+msgid "Layout Help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:111
+msgid "Profile Visibility Editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1367
+msgid "Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Click on a contact to add or remove."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:124
+msgid "Visible To"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:110
+msgid "Event can not end before it has started."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
+#: ../../Zotlabs/Module/Events.php:143
+msgid "Unable to generate preview."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:119
+msgid "Event title and start time are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+msgid "Event not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:460
+msgid "Edit event title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:460
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
+msgid "Event title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Category"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Category"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:466
+msgid "Edit start date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:466
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
+msgid "Start date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+msgid "Finish date and time are not known or not relevant"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Edit finish date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Finish date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+msgid "Adjust for viewer timezone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:471
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:473
+msgid "Edit Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Edit Location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1410
+msgid "Permission settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:489
+msgid "Timezone:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:494
+msgid "Advanced Options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:633
+msgid "Edit event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:635
+msgid "Delete event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:669
+msgid "calendar"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:695
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
+msgid "Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:696
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
+msgid "Week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:697
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
+msgid "Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:731
+msgid "Event removed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:734
+msgid "Failed to remove event"
 msgstr ""
 
 #: ../../Zotlabs/Module/Service_limits.php:23
 msgid "No service class restrictions found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:344
-msgid "network"
+#: ../../Zotlabs/Module/Hcard.php:35 ../../Zotlabs/Module/Channel.php:47
+#: ../../Zotlabs/Module/Profile.php:43
+msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:354
-msgid "RSS"
+#: ../../Zotlabs/Module/Hcard.php:42 ../../Zotlabs/Module/Channel.php:54
+#: ../../Zotlabs/Module/Profile.php:50
+msgid "Only posts"
 msgstr ""
 
 #: ../../Zotlabs/Module/Removeme.php:35
@@ -5378,18 +5939,8 @@ msgstr ""
 msgid "Remove this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274
-msgid "post"
-msgstr ""
-
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1966
-msgid "comment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Tagger.php:95
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../Zotlabs/Module/Viewsrc.php:46
+msgid "Source of Item"
 msgstr ""
 
 #: ../../Zotlabs/Module/Sources.php:37
@@ -5470,6 +6021,10 @@ msgstr ""
 msgid "Unable to remove source."
 msgstr ""
 
+#: ../../Zotlabs/Module/Channel.php:112
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr ""
+
 #: ../../Zotlabs/Module/Suggest.php:39
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
@@ -5480,282 +6035,20 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../Zotlabs/Module/Rmagic.php:35
+msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1989
+msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
-msgid "Profile-"
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1990
+msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
-msgid "New profile created."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:111
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:146
-msgid "Profile unavailable to export."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:252
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:459
-msgid "Marital Status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:463
-msgid "Romantic Partner"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
-msgid "Work/Employment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:478
-msgid "Religion"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:482
-msgid "Political Views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:486
-#: ../../extend/addon/addon/openid/MysqlProvider.php:74
-msgid "Gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:490
-msgid "Sexual Preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:494
-msgid "Homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:498
-msgid "Interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:594
-msgid "Profile updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:678
-msgid "Hide your connections list from viewers of this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:725
-msgid "Edit Profile Details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "View this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1066
-msgid "Edit visibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Profile Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:730
-msgid "Change cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
-msgid "Change profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Create a new profile using these settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Clone this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Delete this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Add profile things"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1715
-msgid "Personal"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Relation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Import profile from file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Export profile to file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Your gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:744
-msgid "Marital status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:745
-msgid "Sexual preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:748
-msgid "Profile name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:750
-msgid "This is your default profile."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Your full name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:753
-msgid "Title/Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:756
-msgid "Street address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:757
-msgid "Locality/City"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:758
-msgid "Region/State"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:759
-msgid "Postal/Zip code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Who (if applicable)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:766
-msgid "Since (date)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:769
-msgid "Tell us about yourself"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:770
-#: ../../extend/addon/addon/openid/MysqlProvider.php:68
-msgid "Homepage URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:771
-msgid "Hometown"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:772
-msgid "Political views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Religious views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Keywords used in directory listings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Example: fishing photography software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:777
-msgid "Musical interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Books, literature"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:779
-msgid "Television"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:780
-msgid "Film/Dance/Culture/Entertainment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:781
-msgid "Hobbies/Interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:782
-msgid "Love/Romance"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:784
-msgid "School/Education"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:785
-msgid "Contact information and social networks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:786
-msgid "My other channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:788
-msgid "Communications"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
-msgid "Profile Image"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105
-#: ../../include/channel.php:1044
-msgid "Edit Profiles"
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1991
+msgid "Authenticate"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Features.php:45
@@ -5907,6 +6200,204 @@ msgstr ""
 msgid "Remove this account including all its channels"
 msgstr ""
 
+#: ../../Zotlabs/Module/Settings/Display.php:145
+msgid "No special theme for mobile devices"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:148
+#, php-format
+msgid "%s - (Experimental)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:198
+msgid "Display Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:199
+msgid "Theme Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:200
+msgid "Custom Theme Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:201
+msgid "Content Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:207
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:208
+msgid "Select scheme"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:210
+msgid "Mobile Theme:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:211
+msgid "Preload images before rendering the page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:211
+msgid ""
+"The subjective page load time will be longer but the page will be ready when "
+"displayed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:212
+msgid "Enable user zoom on mobile devices"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:213
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:213
+msgid "Minimum of 10 seconds, no maximum"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:214
+msgid "Maximum number of conversations to load at any time:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:214
+msgid "Maximum of 100 items"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:215
+msgid "Show emoticons (smilies) as images"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:216
+msgid "Manual conversation updates"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:216
+msgid "Default is on, turning this off may increase screen jumping"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:217
+msgid "Link post titles to source"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:218
+msgid "System Page Layout Editor - (advanced)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:221
+msgid "Use blog/list mode on channel page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:221
+#: ../../Zotlabs/Module/Settings/Display.php:222
+msgid "(comments displayed separately)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:222
+msgid "Use blog/list mode on grid page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:223
+msgid "Channel page max height of content (in pixels)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:223
+#: ../../Zotlabs/Module/Settings/Display.php:224
+msgid "click to expand content exceeding this height"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Display.php:224
+msgid "Grid page max height of content (in pixels)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:20
+msgid "Affinity Slider settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:34
+msgid "No feature settings configured"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:41
+msgid "Default maximum affinity level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:46
+msgid "Default minimum affinity level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+msgid "Affinity Slider Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:60
+msgid "Feature/Addon Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:37
+msgid "Permission category saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:63
+msgid ""
+"Use this form to create permission rules for various classes of people or "
+"connections."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:96
+msgid "Permission Categories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:104
+msgid "Permission Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:31
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:37
+msgid "Name and Password are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:77
+msgid "Token saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:113
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access private content."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:115
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:150 ../../include/widgets.php:644
+msgid "Guest Access Tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:157
+msgid "Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:158
+msgid "Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Tokens.php:159
+msgid "Expires (yyyy-mm-dd)"
+msgstr ""
+
 #: ../../Zotlabs/Module/Settings/Channel.php:251
 #: ../../extend/addon/addon/logrot/logrot.php:54
 #: ../../extend/addon/addon/msgfooter/msgfooter.php:54
@@ -6284,204 +6775,6 @@ msgstr ""
 msgid "Start calendar week on monday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Featured.php:20
-msgid "Affinity Slider settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:34
-msgid "No feature settings configured"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:41
-msgid "Default maximum affinity level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:46
-msgid "Default minimum affinity level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:50
-msgid "Affinity Slider Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Featured.php:60
-msgid "Feature/Addon Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:37
-msgid "Permission category saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:63
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:96
-msgid "Permission Categories"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:104
-msgid "Permission Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:31
-#, php-format
-msgid "This channel is limited to %d tokens"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:37
-msgid "Name and Password are required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:77
-msgid "Token saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:113
-msgid ""
-"Use this form to create temporary access identifiers to share things with "
-"non-members. These identities may be used in Access Control Lists and "
-"visitors may login using these credentials to access private content."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:115
-msgid ""
-"You may also provide <em>dropbox</em> style access links to friends and "
-"associates by adding the Login Password to any specific site URL as shown. "
-"Examples:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:150 ../../include/widgets.php:644
-msgid "Guest Access Tokens"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:157
-msgid "Login Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:158
-msgid "Login Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Tokens.php:159
-msgid "Expires (yyyy-mm-dd)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:145
-msgid "No special theme for mobile devices"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:148
-#, php-format
-msgid "%s - (Experimental)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:198
-msgid "Display Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:199
-msgid "Theme Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:200
-msgid "Custom Theme Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:201
-msgid "Content Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:207
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:208
-msgid "Select scheme"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:210
-msgid "Mobile Theme:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:211
-msgid "Preload images before rendering the page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:211
-msgid ""
-"The subjective page load time will be longer but the page will be ready when "
-"displayed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:212
-msgid "Enable user zoom on mobile devices"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:213
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:213
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:214
-msgid "Maximum number of conversations to load at any time:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:214
-msgid "Maximum of 100 items"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:215
-msgid "Show emoticons (smilies) as images"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:216
-msgid "Manual conversation updates"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:216
-msgid "Default is on, turning this off may increase screen jumping"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:217
-msgid "Link post titles to source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:218
-msgid "System Page Layout Editor - (advanced)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:221
-msgid "Use blog/list mode on channel page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:221
-#: ../../Zotlabs/Module/Settings/Display.php:222
-msgid "(comments displayed separately)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:222
-msgid "Use blog/list mode on grid page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:223
-msgid "Channel page max height of content (in pixels)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:223
-#: ../../Zotlabs/Module/Settings/Display.php:224
-msgid "click to expand content exceeding this height"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Display.php:224
-msgid "Grid page max height of content (in pixels)"
-msgstr ""
-
 #: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr ""
@@ -6551,437 +6844,18 @@ msgstr ""
 msgid "Add Thing to your Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:176
-msgid "$Projectname Server - Setup"
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274
+msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:180
-msgid "Could not connect to database."
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
+#: ../../include/text.php:1950
+msgid "comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:184
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:191
-msgid "Could not create table."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:196
-msgid "Your site database has been installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:200
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:750
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:260
-msgid "System check"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:265
-msgid "Check again"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:287
-msgid "Database connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:288
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:289
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:290
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Database Server Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Default is 127.0.0.1"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Database Port"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Communication port number - use 0 for default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:296
-msgid "Database Login Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:297
-msgid "Database Login Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:298
-msgid "Database Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:299
-msgid "Database Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
-msgid "Site administrator email address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:347
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
-msgid "Website URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:349
-msgid "Please use SSL (https) URL if available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:353
-msgid "Please select a default timezone for your website"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:336
-msgid "Site settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:392
-msgid "PHP version 5.5 or greater is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:393
-msgid "PHP version"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:409
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:410
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:414
-msgid "PHP executable path"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:414
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:419
-msgid "Command line PHP"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:429
-msgid ""
-"Unable to check command line PHP, as shell_exec() is disabled. This is "
-"required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:432
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:433
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:436
-msgid "PHP register_argc_argv"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:454
+#: ../../Zotlabs/Module/Tagger.php:95
 #, php-format
-msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to "
-"upload is set to %s. You are allowed to upload up to %d files at once."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:459
-msgid "You can adjust these settings in the server php.ini file."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:461
-msgid "PHP upload limits"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:484
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:485
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:488
-msgid "Generate encryption keys"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:505
-msgid "libCurl PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:506
-msgid "GD graphics PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:507
-msgid "OpenSSL PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:508
-msgid "PDO database PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:509
-msgid "mb_string PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:510
-msgid "xml PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516
-msgid "Apache mod_rewrite module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:514
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
-msgid "exec"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:520
-msgid ""
-"Error: exec is required but is either not installed or has been disabled in "
-"php.ini"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
-msgid "shell_exec"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:526
-msgid ""
-"Error: shell_exec is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:534
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:538
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:542
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:546
-msgid "Error: PDO database PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:550
-msgid "Error: mb_string PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:554
-msgid "Error: xml PHP module required for DAV but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:572
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:573
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:574
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:575
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:578
-msgid ".htconfig.php is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:592
-msgid ""
-"This software uses the Smarty3 template engine to render its web views. "
-"Smarty3 compiles templates to PHP to speed up rendering."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:593
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the top level web folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:595
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:598
-#, php-format
-msgid "%s is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:614
-msgid ""
-"This software uses the store directory to save uploaded files. The web "
-"server needs to have write access to the store directory under the top level "
-"web folder"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:618
-msgid "store is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:651
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:652
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:653
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:654
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:655
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:656
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:658
-msgid ""
-"If you are confident that the certificate is valid and signed by a trusted "
-"authority, check to see if you have failed to install an intermediate cert. "
-"These are not normally required by browsers, but are required for server-to-"
-"server communications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:660
-msgid "SSL certificate validation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:666
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:669
-msgid "Url rewrite is working"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:683
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:707
-#: ../../extend/addon/addon/cdav/cdav.php:41
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:748
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:749
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
 #: ../../Zotlabs/Module/Viewconnections.php:65
@@ -6997,233 +6871,352 @@ msgstr ""
 msgid "View Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:30
-msgid "Profile Unavailable."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:44
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40
-msgid "Not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:68
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60
-msgid "Invalid channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:159
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144
-#: ../../include/conversation.php:1900
-msgid "Wikis"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:165
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150
-msgid "Download"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:169
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
-msgid "Wiki name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:170
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
-msgid "Content type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:179
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-msgid "Create a status post for this wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:204
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183
-msgid "Wiki not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:228
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208
-msgid "Rename page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:232
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212
-msgid "Error retrieving page content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:259
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241
-msgid "Revision Comparison"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:260
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
-msgid "Revert"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:264
-msgid "Short description of your changes (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:271
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
-msgid "Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:279
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259
-msgid "New page name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:284
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264
-#: ../../include/conversation.php:1299
-msgid "Embed image from photo albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:285
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1393
-msgid "Embed an image from your albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:287
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
-#: ../../include/conversation.php:1395 ../../include/conversation.php:1442
-msgid "OK"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:288
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1335
-msgid "Choose images to embed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:289
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1336
-msgid "Choose an album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:290
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
-msgid "Choose a different album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:291
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
-#: ../../include/conversation.php:1338
-msgid "Error getting album list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:292
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1339
-msgid "Error getting photo link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:293
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1340
-msgid "Error getting album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:357
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
-msgid "Error creating wiki. Invalid name."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:369
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
-msgid "Wiki created, but error creating Home page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:376
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
-msgid "Error creating wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:388
-msgid "Wiki delete permission denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:398
-msgid "Error deleting wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:424
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
-msgid "New page created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:539
-msgid "Cannot delete Home"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:603
-msgid "Current Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:603
-msgid "Selected Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:653
-msgid "You must be authenticated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:179
-msgid "Room not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:195
-msgid "Leave Room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:196
-msgid "Delete Room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "I am away right now"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "I am online"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "Bookmark this room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:229
-msgid "New Chatroom"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:230
-msgid "Chatroom name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:231
-msgid "Expiration of chats (minutes)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:247
+#: ../../Zotlabs/Module/Import.php:134
 #, php-format
-msgid "%1$s's Chatrooms"
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:252
-msgid "No chatrooms available"
+#: ../../Zotlabs/Module/Import.php:149
+msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "Expiration"
+#: ../../Zotlabs/Module/Import.php:467
+#: ../../extend/addon/addon/diaspora/import_diaspora.php:142
+msgid "Import completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:257
-msgid "min"
+#: ../../Zotlabs/Module/Import.php:488
+msgid "You must be logged in to use this feature."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:493
+msgid "Import Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:494
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You "
+"may retrieve the channel identity from the old server/hub via the network or "
+"provide an export file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:496
+msgid "Or provide the old server/hub details"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:497
+msgid "Your old identity address (xyz@example.com)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:498
+msgid "Your old login email address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:499
+msgid "Your old login password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:500
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be "
+"able to post from either location, but only one can be marked as the primary "
+"location for files, photos, and media."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:501
+msgid "Make this hub my primary location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:502
+msgid "Move this channel (disable all previous locations)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:503
+msgid "Import a few months of posts if possible (limited by available memory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:504
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
+msgid "Album not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:112
+msgid "Delete Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:133
+msgid ""
+"Multiple storage folders exist with this album name, but within different "
+"directories. Please remove the desired folder or folders using the Files "
+"manager"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1054
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:519
+msgid "No photos selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:568
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:607
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:610
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:646
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:650
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:651
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:652
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:653
+msgid "Caption (optional):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:654
+msgid "Description (optional):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:685
+msgid "Album name could not be decoded"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:729
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:752
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:754
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335
+#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1751
+msgid "View Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:809
+#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1768
+msgid "Edit Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:856
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:858
+msgid "Photo not available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:916
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:917
+msgid "Use as cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:924
+msgid "Private Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:939
+msgid "View Full Size"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1028
+msgid "Edit photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1031
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1034
+msgid "Move photo to album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1035
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1039
+msgid "Caption"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1041
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1052
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:268
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Lib/ThreadItem.php:269
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:411
+#: ../../include/conversation.php:738
+msgid "Please wait"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Lib/ThreadItem.php:728
+msgid "This is you"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210
+#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1139
+#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
+#: ../../include/conversation.php:1928
+msgid "View all"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/taxonomy.php:403 ../../include/conversation.php:1952
+#: ../../include/channel.php:1273
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:195
+#: ../../include/conversation.php:1955
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1236
+msgid "Photo Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1245
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1250
+msgid "Map"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:400
+msgctxt "noun"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/ThreadItem.php:401
+msgctxt "noun"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:406
+#: ../../include/acl_selectors.php:220
+msgid "Close"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1341
+msgid "View Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
+#: ../../Zotlabs/Module/Photos.php:1366
+msgid "Recent Photos"
 msgstr ""
 
 #: ../../Zotlabs/Module/Xchan.php:10
@@ -7234,6 +7227,10 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
+#: ../../Zotlabs/Module/Profile.php:91
+msgid "vcard"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr ""
@@ -7254,22 +7251,22 @@ msgstr ""
 msgid "Room is full"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1947
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1426
 msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46
+#: ../../Zotlabs/Lib/Enotify.php:61
 #: ../../extend/addon/addon/diaspora/util.php:218
 #: ../../extend/addon/addon/diaspora/util.php:231
-#: ../../include/network.php:1948
+#: ../../extend/addon/addon/diaspora/p.php:46 ../../include/network.php:1427
 msgid "$projectname"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1950
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1429
 msgid "Thank You,"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1952
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1431
 #, php-format
 msgid "%s Administrator"
 msgstr ""
@@ -7539,89 +7536,6 @@ msgstr ""
 msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:31
-#: ../../Zotlabs/Lib/NativeWikiPage.php:70
-msgid "(No Title)"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:84
-msgid "Wiki page create failed."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:97
-msgid "Wiki not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:108
-msgid "Destination name already exists"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:134
-#: ../../Zotlabs/Lib/NativeWikiPage.php:361
-msgid "Page not found"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:164
-msgid "Error reading page content"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:346
-#: ../../Zotlabs/Lib/NativeWikiPage.php:399
-#: ../../Zotlabs/Lib/NativeWikiPage.php:466
-#: ../../Zotlabs/Lib/NativeWikiPage.php:507
-msgid "Error reading wiki"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:387
-msgid "Page update failed."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:421
-msgid "Nothing deleted"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:487
-msgid "Compare: object not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:493
-msgid "Page updated"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:496
-msgid "Untitled"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:502
-msgid "Wiki resource_id required for git commit"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:573
-#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
-#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
-msgid "Different viewers will see this text differently"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Permcat.php:58
-msgctxt "permcat"
-msgid "default"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Permcat.php:96
-msgctxt "permcat"
-msgid "follower"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Permcat.php:100
-msgctxt "permcat"
-msgid "contributor"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Permcat.php:104
-msgctxt "permcat"
-msgid "publisher"
-msgstr ""
-
 #: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:663
 msgid "Private Message"
 msgstr ""
@@ -7815,8 +7729,87 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWiki.php:126
-msgid "Wiki files deleted successfully"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:31
+#: ../../Zotlabs/Lib/NativeWikiPage.php:72
+msgid "(No Title)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:86
+msgid "Wiki page create failed."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:99
+msgid "Wiki not found."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:110
+msgid "Destination name already exists"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:136
+#: ../../Zotlabs/Lib/NativeWikiPage.php:365
+msgid "Page not found"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:166
+msgid "Error reading page content"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:350
+#: ../../Zotlabs/Lib/NativeWikiPage.php:403
+#: ../../Zotlabs/Lib/NativeWikiPage.php:470
+#: ../../Zotlabs/Lib/NativeWikiPage.php:511
+msgid "Error reading wiki"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:391
+msgid "Page update failed."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:425
+msgid "Nothing deleted"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:491
+msgid "Compare: object not found."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:497
+msgid "Page updated"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:500
+msgid "Untitled"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:506
+msgid "Wiki resource_id required for git commit"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:577
+#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
+#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Permcat.php:58
+msgctxt "permcat"
+msgid "default"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Permcat.php:96
+msgctxt "permcat"
+msgid "follower"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Permcat.php:100
+msgctxt "permcat"
+msgid "contributor"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Permcat.php:104
+msgctxt "permcat"
+msgid "publisher"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:212
@@ -7849,7 +7842,7 @@ msgid "Suggest Channels"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130
-#: ../../boot.php:1749
+#: ../../boot.php:1706
 msgid "Login"
 msgstr ""
 
@@ -7935,6 +7928,10 @@ msgstr ""
 msgid "Remove from app-tray"
 msgstr ""
 
+#: ../../Zotlabs/Lib/NativeWiki.php:128
+msgid "Wiki files deleted successfully"
+msgstr ""
+
 #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
 msgid "Flag Adult Photos"
 msgstr ""
@@ -7991,15 +7988,6 @@ msgstr ""
 msgid "Quick Reference"
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:16
-msgid "No username found in import file."
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:41
-#: ../../include/import.php:51
-msgid "Unable to create a unique channel address. Import failed."
-msgstr ""
-
 #: ../../extend/addon/addon/diaspora/diaspora.php:677
 msgid "Diaspora Protocol Settings updated."
 msgstr ""
@@ -8024,6 +8012,15 @@ msgstr ""
 msgid "Diaspora Protocol Settings"
 msgstr ""
 
+#: ../../extend/addon/addon/diaspora/import_diaspora.php:16
+msgid "No username found in import file."
+msgstr ""
+
+#: ../../extend/addon/addon/diaspora/import_diaspora.php:41
+#: ../../include/import.php:51
+msgid "Unable to create a unique channel address. Import failed."
+msgstr ""
+
 #: ../../extend/addon/addon/dirstats/dirstats.php:94
 msgid "Hubzilla Directory Stats"
 msgstr ""
@@ -8501,7 +8498,7 @@ msgid "Add a personal note:"
 msgstr ""
 
 #: ../../extend/addon/addon/friendica/dfrn_request.php:871
-#: ../../include/network.php:2265 ../../include/network.php:2266
+#: ../../include/network.php:1744 ../../include/network.php:1745
 msgid "Friendica"
 msgstr ""
 
@@ -8510,7 +8507,7 @@ msgid "StatusNet/Federated Social Web"
 msgstr ""
 
 #: ../../extend/addon/addon/friendica/dfrn_request.php:873
-#: ../../include/network.php:2271
+#: ../../include/network.php:1750
 msgid "Diaspora"
 msgstr ""
 
@@ -9201,7 +9198,7 @@ msgid "Page to load after image selection."
 msgstr ""
 
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:58
-#: ../../include/nav.php:107 ../../include/channel.php:1048
+#: ../../include/channel.php:1048 ../../include/nav.php:107
 msgid "Edit Profile"
 msgstr ""
 
@@ -10323,6 +10320,60 @@ msgstr ""
 msgid "Select an addressbook to import to"
 msgstr ""
 
+#: ../../extend/addon/addon/cdav/cdav.php:36
+msgid "Errors encountered creating database table: "
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:197
+msgid "Default Calendar"
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:206
+msgid "Default Addressbook"
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:215
+msgid "CalDAV/CardDAV Settings saved."
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:234
+msgid "Enable CalDAV/CardDAV Server for this channel"
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:237
+#, php-format
+msgid "Your CalDAV resources are located at %s "
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:240
+#, php-format
+msgid "Your CardDAV resources are located at %s "
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:246
+msgid "CalDAV/CardDAV Settings"
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:272
+#: ../../include/connections.php:670
+msgid "Home, Voice"
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:273
+#: ../../include/connections.php:671
+msgid "Home, Fax"
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:275
+#: ../../include/connections.php:673
+msgid "Work, Voice"
+msgstr ""
+
+#: ../../extend/addon/addon/cdav/cdav.php:276
+#: ../../include/connections.php:674
+msgid "Work, Fax"
+msgstr ""
+
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:744
 msgid "INVALID EVENT DISMISSED!"
 msgstr ""
@@ -10395,60 +10446,6 @@ msgstr ""
 msgid "Sorry! Editing of recurrent events is not yet implemented."
 msgstr ""
 
-#: ../../extend/addon/addon/cdav/cdav.php:36
-msgid "Errors encountered creating database table: "
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:197
-msgid "Default Calendar"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:206
-msgid "Default Addressbook"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:215
-msgid "CalDAV/CardDAV Settings saved."
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:234
-msgid "Enable CalDAV/CardDAV Server for this channel"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:237
-#, php-format
-msgid "Your CalDAV resources are located at %s "
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:240
-#, php-format
-msgid "Your CardDAV resources are located at %s "
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:246
-msgid "CalDAV/CardDAV Settings"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:272
-#: ../../include/connections.php:670
-msgid "Home, Voice"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:273
-#: ../../include/connections.php:671
-msgid "Home, Fax"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:275
-#: ../../include/connections.php:673
-msgid "Work, Voice"
-msgstr ""
-
-#: ../../extend/addon/addon/cdav/cdav.php:276
-#: ../../include/connections.php:674
-msgid "Work, Fax"
-msgstr ""
-
 #: ../../extend/addon/addon/chess/chess.php:276
 #: ../../extend/addon/addon/chess/chess.php:433
 msgid "Invalid game."
@@ -10800,13 +10797,13 @@ msgstr ""
 msgid "Enable the GNU-Social protocol for this channel"
 msgstr ""
 
-#: ../../extend/addon/addon/opensearch/opensearch.php:26 ../../boot.php:1186
+#: ../../extend/addon/addon/opensearch/opensearch.php:26 ../../boot.php:1143
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr ""
 
-#: ../../extend/addon/addon/opensearch/opensearch.php:28 ../../boot.php:1186
+#: ../../extend/addon/addon/opensearch/opensearch.php:28 ../../boot.php:1143
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr ""
@@ -10820,7 +10817,7 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/language.php:367 ../../include/text.php:1788
+#: ../../include/language.php:367 ../../include/text.php:1772
 msgid "default"
 msgstr ""
 
@@ -10896,240 +10893,35 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/widgets.php:46 ../../include/widgets.php:455
-#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
-#: ../../include/contact_widgets.php:91
-msgid "Categories"
+#: ../../include/help.php:33
+msgid "Help:"
 msgstr ""
 
-#: ../../include/widgets.php:141
-msgid "Suggestions"
+#: ../../include/help.php:65
+msgid "Not Found"
 msgstr ""
 
-#: ../../include/widgets.php:142
-msgid "See more..."
+#: ../../include/zot.php:649
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/widgets.php:162
+#: ../../include/zot.php:665
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:2316
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/widgets.php:168
-msgid "Add New Connection"
+#: ../../include/zot.php:3722
+msgid "invalid target signature"
 msgstr ""
 
-#: ../../include/widgets.php:169
-msgid "Enter channel address"
-msgstr ""
-
-#: ../../include/widgets.php:170
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr ""
-
-#: ../../include/widgets.php:186
-msgid "Notes"
-msgstr ""
-
-#: ../../include/widgets.php:262
-msgid "Remove term"
-msgstr ""
-
-#: ../../include/widgets.php:270 ../../include/features.php:301
-msgid "Saved Searches"
-msgstr ""
-
-#: ../../include/widgets.php:271 ../../include/group.php:336
-msgid "add"
-msgstr ""
-
-#: ../../include/widgets.php:333 ../../include/contact_widgets.php:53
-#: ../../include/features.php:390
-msgid "Saved Folders"
-msgstr ""
-
-#: ../../include/widgets.php:336 ../../include/widgets.php:458
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
-msgstr ""
-
-#: ../../include/widgets.php:377
-msgid "Archives"
-msgstr ""
-
-#: ../../include/widgets.php:549
-msgid "Refresh"
-msgstr ""
-
-#: ../../include/widgets.php:589
-msgid "Account settings"
-msgstr ""
-
-#: ../../include/widgets.php:595
-msgid "Channel settings"
-msgstr ""
-
-#: ../../include/widgets.php:604
-msgid "Additional features"
-msgstr ""
-
-#: ../../include/widgets.php:611
-msgid "Feature/Addon settings"
-msgstr ""
-
-#: ../../include/widgets.php:617
-msgid "Display settings"
-msgstr ""
-
-#: ../../include/widgets.php:624
-msgid "Manage locations"
-msgstr ""
-
-#: ../../include/widgets.php:631
-msgid "Export channel"
-msgstr ""
-
-#: ../../include/widgets.php:637
-msgid "Connected apps"
-msgstr ""
-
-#: ../../include/widgets.php:652 ../../include/features.php:153
-msgid "Permission Groups"
-msgstr ""
-
-#: ../../include/widgets.php:669
-msgid "Premium Channel Settings"
-msgstr ""
-
-#: ../../include/widgets.php:698
-msgid "Private Mail Menu"
-msgstr ""
-
-#: ../../include/widgets.php:700
-msgid "Combined View"
-msgstr ""
-
-#: ../../include/widgets.php:705 ../../include/nav.php:213
-msgid "Inbox"
-msgstr ""
-
-#: ../../include/widgets.php:710 ../../include/nav.php:214
-msgid "Outbox"
-msgstr ""
-
-#: ../../include/widgets.php:715 ../../include/nav.php:215
-msgid "New Message"
-msgstr ""
-
-#: ../../include/widgets.php:732 ../../include/widgets.php:744
-msgid "Conversations"
-msgstr ""
-
-#: ../../include/widgets.php:736
-msgid "Received Messages"
-msgstr ""
-
-#: ../../include/widgets.php:740
-msgid "Sent Messages"
-msgstr ""
-
-#: ../../include/widgets.php:754
-msgid "No messages."
-msgstr ""
-
-#: ../../include/widgets.php:772
-msgid "Delete conversation"
-msgstr ""
-
-#: ../../include/widgets.php:798
-msgid "Events Tools"
-msgstr ""
-
-#: ../../include/widgets.php:799
-msgid "Export Calendar"
-msgstr ""
-
-#: ../../include/widgets.php:800
-msgid "Import Calendar"
-msgstr ""
-
-#: ../../include/widgets.php:888 ../../include/conversation.php:1866
-#: ../../include/conversation.php:1869
-msgid "Chatrooms"
-msgstr ""
-
-#: ../../include/widgets.php:892
-msgid "Overview"
-msgstr ""
-
-#: ../../include/widgets.php:899
-msgid "Chat Members"
-msgstr ""
-
-#: ../../include/widgets.php:977
-msgctxt "wiki_history"
-msgid "Message"
-msgstr ""
-
-#: ../../include/widgets.php:999
-msgid "Bookmarked Chatrooms"
-msgstr ""
-
-#: ../../include/widgets.php:1030
-msgid "Suggested Chatrooms"
-msgstr ""
-
-#: ../../include/widgets.php:1175 ../../include/widgets.php:1287
-msgid "photo/image"
-msgstr ""
-
-#: ../../include/widgets.php:1230
-msgid "Click to show more"
-msgstr ""
-
-#: ../../include/widgets.php:1381
-msgid "Rating Tools"
-msgstr ""
-
-#: ../../include/widgets.php:1385 ../../include/widgets.php:1387
-msgid "Rate Me"
-msgstr ""
-
-#: ../../include/widgets.php:1390
-msgid "View Ratings"
-msgstr ""
-
-#: ../../include/widgets.php:1483
-msgid "Forums"
-msgstr ""
-
-#: ../../include/widgets.php:1540
-msgctxt "widget"
-msgid "Activity"
-msgstr ""
-
-#: ../../include/widgets.php:1569
-msgid "Tasks"
-msgstr ""
-
-#: ../../include/widgets.php:1635 ../../include/widgets.php:1673
-msgid "Member registrations waiting for confirmation"
-msgstr ""
-
-#: ../../include/widgets.php:1641
-msgid "Inspect queue"
-msgstr ""
-
-#: ../../include/widgets.php:1643
-msgid "DB updates"
-msgstr ""
-
-#: ../../include/widgets.php:1668 ../../include/nav.php:233
-msgid "Admin"
-msgstr ""
-
-#: ../../include/widgets.php:1669
-msgid "Plugin Features"
+#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46
+#: ../../include/widgets.php:455
+msgid "Categories"
 msgstr ""
 
 #: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
@@ -11164,42 +10956,47 @@ msgstr ""
 msgid "dislikes"
 msgstr ""
 
+#: ../../include/connections.php:127
+msgid "New window"
+msgstr ""
+
+#: ../../include/connections.php:128
+msgid "Open the selected location in a different window or browser tab"
+msgstr ""
+
 #: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/markdown.php:540
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
 #: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/markdown.php:546
 msgid "Starts:"
 msgstr ""
 
 #: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/markdown.php:554
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/event.php:1004
+#: ../../include/event.php:1008
 msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/event.php:1204
+#: ../../include/event.php:1208
 msgid "Not specified"
 msgstr ""
 
-#: ../../include/event.php:1205
+#: ../../include/event.php:1209
 msgid "Needs Action"
 msgstr ""
 
-#: ../../include/event.php:1206
+#: ../../include/event.php:1210
 msgid "Completed"
 msgstr ""
 
-#: ../../include/event.php:1207
+#: ../../include/event.php:1211
 msgid "In Process"
 msgstr ""
 
-#: ../../include/event.php:1208
+#: ../../include/event.php:1212
 msgid "Cancelled"
 msgstr ""
 
@@ -11215,7 +11012,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:286 ../../boot.php:2598
+#: ../../include/datetime.php:286 ../../boot.php:2555
 msgid "never"
 msgstr ""
 
@@ -11528,76 +11325,12 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/acl_selectors.php:208
-msgid "Who can see this?"
+#: ../../include/auth.php:148
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/acl_selectors.php:209
-msgid "Custom selection"
-msgstr ""
-
-#: ../../include/acl_selectors.php:210
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
-"the scope of \"Show\"."
-msgstr ""
-
-#: ../../include/acl_selectors.php:211
-msgid "Show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:212
-msgid "Don't show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:245
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These "
-"permissions set who is allowed to view the post."
-msgstr ""
-
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
-#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
-#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
-#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
-#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
-#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
-#: ../../include/bbcode.php:1079
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:189
-#, php-format
-msgid "Install %s element: "
-msgstr ""
-
-#: ../../include/bbcode.php:193
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr ""
-
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/bbcode.php:357
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:1028
-msgid "$1 wrote:"
+#: ../../include/auth.php:275
+msgid "Failed authentication"
 msgstr ""
 
 #: ../../include/bookmarks.php:34
@@ -11605,445 +11338,73 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/connections.php:127
-msgid "New window"
+#: ../../include/items.php:807 ../../include/items.php:854
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/connections.php:128
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/items.php:1045
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/help.php:33
-msgid "Help:"
+#: ../../include/items.php:1047
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/help.php:65
-msgid "Not Found"
+#: ../../include/items.php:1049
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/page_widgets.php:7
-msgid "New Page"
+#: ../../include/items.php:1051
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/contact_widgets.php:11
+#: ../../include/items.php:1053
 #, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
+#: ../../include/items.php:1055
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
+#: ../../include/items.php:1057
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/items.php:1059
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
+#: ../../include/items.php:3820
+msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr ""
-
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr ""
-
-#: ../../include/contact_widgets.php:122
+#: ../../include/items.php:3827
 #, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
+msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
+#: ../../include/items.php:3839
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/js_strings.php:8
+#: ../../include/items.php:4188
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/items.php:4384
 #, php-format
-msgid "%s show less"
+msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/js_strings.php:9
-#, php-format
-msgid "%s expand"
+#: ../../include/items.php:4384
+msgctxt "edit_activity"
+msgid "Post"
 msgstr ""
 
-#: ../../include/js_strings.php:10
-#, php-format
-msgid "%s collapse"
-msgstr ""
-
-#: ../../include/js_strings.php:11
-msgid "Password too short"
-msgstr ""
-
-#: ../../include/js_strings.php:12
-msgid "Passwords do not match"
-msgstr ""
-
-#: ../../include/js_strings.php:13
-msgid "everybody"
-msgstr ""
-
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
-msgstr ""
-
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
-msgstr ""
-
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
-msgstr ""
-
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr ""
-
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
-msgstr ""
-
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
-msgstr ""
-
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
-msgstr ""
-
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr ""
-
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr ""
-
-#: ../../include/js_strings.php:27
-msgid "timeago.prefixAgo"
-msgstr ""
-
-#: ../../include/js_strings.php:28
-msgid "timeago.prefixFromNow"
-msgstr ""
-
-#: ../../include/js_strings.php:29
-msgid "ago"
-msgstr ""
-
-#: ../../include/js_strings.php:30
-msgid "from now"
-msgstr ""
-
-#: ../../include/js_strings.php:31
-msgid "less than a minute"
-msgstr ""
-
-#: ../../include/js_strings.php:32
-msgid "about a minute"
-msgstr ""
-
-#: ../../include/js_strings.php:33
-#, php-format
-msgid "%d minutes"
-msgstr ""
-
-#: ../../include/js_strings.php:34
-msgid "about an hour"
-msgstr ""
-
-#: ../../include/js_strings.php:35
-#, php-format
-msgid "about %d hours"
-msgstr ""
-
-#: ../../include/js_strings.php:36
-msgid "a day"
-msgstr ""
-
-#: ../../include/js_strings.php:37
-#, php-format
-msgid "%d days"
-msgstr ""
-
-#: ../../include/js_strings.php:38
-msgid "about a month"
-msgstr ""
-
-#: ../../include/js_strings.php:39
-#, php-format
-msgid "%d months"
-msgstr ""
-
-#: ../../include/js_strings.php:40
-msgid "about a year"
-msgstr ""
-
-#: ../../include/js_strings.php:41
-#, php-format
-msgid "%d years"
-msgstr ""
-
-#: ../../include/js_strings.php:42
-msgid " "
-msgstr ""
-
-#: ../../include/js_strings.php:43
-msgid "timeago.numbers"
-msgstr ""
-
-#: ../../include/js_strings.php:45 ../../include/text.php:1331
-msgid "January"
-msgstr ""
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1331
-msgid "February"
-msgstr ""
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1331
-msgid "March"
-msgstr ""
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1331
-msgid "April"
-msgstr ""
-
-#: ../../include/js_strings.php:49
-msgctxt "long"
-msgid "May"
-msgstr ""
-
-#: ../../include/js_strings.php:50 ../../include/text.php:1331
-msgid "June"
-msgstr ""
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1331
-msgid "July"
-msgstr ""
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1331
-msgid "August"
-msgstr ""
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1331
-msgid "September"
-msgstr ""
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1331
-msgid "October"
-msgstr ""
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1331
-msgid "November"
-msgstr ""
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1331
-msgid "December"
-msgstr ""
-
-#: ../../include/js_strings.php:57
-msgid "Jan"
-msgstr ""
-
-#: ../../include/js_strings.php:58
-msgid "Feb"
-msgstr ""
-
-#: ../../include/js_strings.php:59
-msgid "Mar"
-msgstr ""
-
-#: ../../include/js_strings.php:60
-msgid "Apr"
-msgstr ""
-
-#: ../../include/js_strings.php:61
-msgctxt "short"
-msgid "May"
-msgstr ""
-
-#: ../../include/js_strings.php:62
-msgid "Jun"
-msgstr ""
-
-#: ../../include/js_strings.php:63
-msgid "Jul"
-msgstr ""
-
-#: ../../include/js_strings.php:64
-msgid "Aug"
-msgstr ""
-
-#: ../../include/js_strings.php:65
-msgid "Sep"
-msgstr ""
-
-#: ../../include/js_strings.php:66
-msgid "Oct"
-msgstr ""
-
-#: ../../include/js_strings.php:67
-msgid "Nov"
-msgstr ""
-
-#: ../../include/js_strings.php:68
-msgid "Dec"
-msgstr ""
-
-#: ../../include/js_strings.php:69 ../../include/text.php:1327
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1327
-msgid "Monday"
-msgstr ""
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1327
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1327
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1327
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1327
-msgid "Friday"
-msgstr ""
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1327
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/js_strings.php:76
-msgid "Sun"
-msgstr ""
-
-#: ../../include/js_strings.php:77
-msgid "Mon"
-msgstr ""
-
-#: ../../include/js_strings.php:78
-msgid "Tue"
-msgstr ""
-
-#: ../../include/js_strings.php:79
-msgid "Wed"
-msgstr ""
-
-#: ../../include/js_strings.php:80
-msgid "Thu"
-msgstr ""
-
-#: ../../include/js_strings.php:81
-msgid "Fri"
-msgstr ""
-
-#: ../../include/js_strings.php:82
-msgid "Sat"
-msgstr ""
-
-#: ../../include/js_strings.php:83
-msgctxt "calendar"
-msgid "today"
-msgstr ""
-
-#: ../../include/js_strings.php:84
-msgctxt "calendar"
-msgid "month"
-msgstr ""
-
-#: ../../include/js_strings.php:85
-msgctxt "calendar"
-msgid "week"
-msgstr ""
-
-#: ../../include/js_strings.php:86
-msgctxt "calendar"
-msgid "day"
-msgstr ""
-
-#: ../../include/js_strings.php:87
-msgctxt "calendar"
-msgid "All day"
-msgstr ""
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr ""
-
-#: ../../include/network.php:756
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:2011
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:2267
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/network.php:2268
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:2269
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/network.php:2272
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/network.php:2273
-msgid "Zot"
-msgstr ""
-
-#: ../../include/network.php:2274
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/network.php:2275
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/network.php:2276
-msgid "MySpace"
+#: ../../include/items.php:4384
+msgctxt "edit_activity"
+msgid "Comment"
 msgstr ""
 
 #: ../../include/conversation.php:204
@@ -12283,6 +11644,11 @@ msgstr ""
 msgid "Files and Storage"
 msgstr ""
 
+#: ../../include/conversation.php:1866 ../../include/conversation.php:1869
+#: ../../include/widgets.php:888
+msgid "Chatrooms"
+msgstr ""
+
 #: ../../include/conversation.php:1879
 msgid "Bookmarks"
 msgstr ""
@@ -12337,328 +11703,614 @@ msgid_plural "Abstains"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../include/page_widgets.php:7
+msgid "New Page"
 msgstr ""
 
-#: ../../include/group.php:268
-msgid "Add new connections to this privacy group"
-msgstr ""
-
-#: ../../include/group.php:309
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:331 ../../include/features.php:292
-msgid "Privacy Groups"
-msgstr ""
-
-#: ../../include/group.php:332
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:333
-msgid "Add privacy group"
-msgstr ""
-
-#: ../../include/group.php:334
-msgid "Channels not in any privacy group"
-msgstr ""
-
-#: ../../include/items.php:843 ../../include/items.php:890
-msgid "(Unknown)"
-msgstr ""
-
-#: ../../include/items.php:1091
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1093
-msgid "Visible to you only."
-msgstr ""
-
-#: ../../include/items.php:1095
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: ../../include/items.php:1097
-msgid "Visible to anybody authenticated."
-msgstr ""
-
-#: ../../include/items.php:1099
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "Visible to anybody on %s."
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
 msgstr ""
 
-#: ../../include/items.php:1101
-msgid "Visible to all connections."
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/items.php:1103
-msgid "Visible to approved connections."
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/items.php:1105
-msgid "Visible to specific connections."
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/items.php:3917
-msgid "Privacy group is empty."
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/items.php:3924
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr ""
+
+#: ../../include/contact_widgets.php:53 ../../include/widgets.php:333
+#: ../../include/features.php:390
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+#: ../../include/widgets.php:336 ../../include/widgets.php:458
+msgid "Everything"
+msgstr ""
+
+#: ../../include/contact_widgets.php:122
 #, php-format
-msgid "Privacy group: %s"
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:127
+msgid "show more"
 msgstr ""
 
-#: ../../include/items.php:3936
-msgid "Connection not found."
+#: ../../include/widgets.php:141
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/items.php:4285
-msgid "profile photo"
+#: ../../include/widgets.php:142
+msgid "See more..."
 msgstr ""
 
-#: ../../include/items.php:4481
+#: ../../include/widgets.php:162
 #, php-format
-msgid "[Edited %s]"
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/items.php:4481
-msgctxt "edit_activity"
-msgid "Post"
+#: ../../include/widgets.php:168
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/items.php:4481
-msgctxt "edit_activity"
-msgid "Comment"
+#: ../../include/widgets.php:169
+msgid "Enter channel address"
 msgstr ""
 
-#: ../../include/markdown.php:445
-msgid "Attachments:"
+#: ../../include/widgets.php:170
+msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../include/markdown.php:542
-msgid "$Projectname event notification:"
+#: ../../include/widgets.php:186
+msgid "Notes"
 msgstr ""
 
-#: ../../include/security.php:117
-msgid "guest:"
+#: ../../include/widgets.php:262
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/security.php:532
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: ../../include/widgets.php:270 ../../include/features.php:301
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Remote authentication"
+#: ../../include/widgets.php:271 ../../include/group.php:336
+msgid "add"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Click to authenticate to your home hub"
+#: ../../include/widgets.php:377
+msgid "Archives"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1748
-msgid "Logout"
+#: ../../include/widgets.php:549
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/nav.php:140
-msgid "End this session"
+#: ../../include/widgets.php:589
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/nav.php:103
-msgid "Your profile page"
+#: ../../include/widgets.php:595
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/nav.php:105
-msgid "Manage/Edit profiles"
+#: ../../include/widgets.php:604
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/nav.php:107
-msgid "Edit your profile"
+#: ../../include/widgets.php:611
+msgid "Feature/Addon settings"
 msgstr ""
 
-#: ../../include/nav.php:130
-msgid "Sign in"
+#: ../../include/widgets.php:617
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/nav.php:155
-msgid "Get me home"
+#: ../../include/widgets.php:624
+msgid "Manage locations"
 msgstr ""
 
-#: ../../include/nav.php:157
-msgid "Log me out of this site"
+#: ../../include/widgets.php:631
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/nav.php:162
-msgid "Create an account"
+#: ../../include/widgets.php:637
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/nav.php:174
-msgid "Help and documentation"
+#: ../../include/widgets.php:652 ../../include/features.php:153
+msgid "Permission Groups"
 msgstr ""
 
-#: ../../include/nav.php:178
-msgid "Applications, utilities, links, games"
+#: ../../include/widgets.php:669
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:180
-msgid "Search site @name, #tag, ?docs, content"
+#: ../../include/widgets.php:698
+msgid "Private Mail Menu"
 msgstr ""
 
-#: ../../include/nav.php:182
-msgid "Channel Directory"
+#: ../../include/widgets.php:700
+msgid "Combined View"
 msgstr ""
 
-#: ../../include/nav.php:194
-msgid "Your grid"
+#: ../../include/widgets.php:705 ../../include/nav.php:213
+msgid "Inbox"
 msgstr ""
 
-#: ../../include/nav.php:195
-msgid "View your network/grid"
+#: ../../include/widgets.php:710 ../../include/nav.php:214
+msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:196
-msgid "Mark all grid notifications seen"
+#: ../../include/widgets.php:715 ../../include/nav.php:215
+msgid "New Message"
 msgstr ""
 
-#: ../../include/nav.php:198
-msgid "Channel home"
+#: ../../include/widgets.php:732 ../../include/widgets.php:744
+msgid "Conversations"
 msgstr ""
 
-#: ../../include/nav.php:199
-msgid "View your channel home"
+#: ../../include/widgets.php:736
+msgid "Received Messages"
 msgstr ""
 
-#: ../../include/nav.php:200
-msgid "Mark all channel notifications seen"
+#: ../../include/widgets.php:740
+msgid "Sent Messages"
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Notices"
+#: ../../include/widgets.php:754
+msgid "No messages."
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Notifications"
+#: ../../include/widgets.php:772
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../include/nav.php:207
-msgid "View all notifications"
+#: ../../include/widgets.php:798
+msgid "Events Tools"
 msgstr ""
 
-#: ../../include/nav.php:210
-msgid "Private mail"
+#: ../../include/widgets.php:799
+msgid "Export Calendar"
 msgstr ""
 
-#: ../../include/nav.php:211
-msgid "View your private messages"
+#: ../../include/widgets.php:800
+msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/nav.php:212
-msgid "Mark all private messages seen"
+#: ../../include/widgets.php:892
+msgid "Overview"
 msgstr ""
 
-#: ../../include/nav.php:218
-msgid "Event Calendar"
+#: ../../include/widgets.php:899
+msgid "Chat Members"
 msgstr ""
 
-#: ../../include/nav.php:219
-msgid "View events"
+#: ../../include/widgets.php:977
+msgctxt "wiki_history"
+msgid "Message"
 msgstr ""
 
-#: ../../include/nav.php:220
-msgid "Mark all events seen"
+#: ../../include/widgets.php:999
+msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/nav.php:223
-msgid "Manage Your Channels"
+#: ../../include/widgets.php:1030
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/nav.php:225
-msgid "Account/Channel Settings"
+#: ../../include/widgets.php:1175 ../../include/widgets.php:1287
+msgid "photo/image"
 msgstr ""
 
-#: ../../include/nav.php:233
-msgid "Site Setup and Configuration"
+#: ../../include/widgets.php:1230
+msgid "Click to show more"
 msgstr ""
 
-#: ../../include/nav.php:297
-msgid "@name, #tag, ?doc, content"
+#: ../../include/widgets.php:1381
+msgid "Rating Tools"
 msgstr ""
 
-#: ../../include/nav.php:298
-msgid "Please wait..."
+#: ../../include/widgets.php:1385 ../../include/widgets.php:1387
+msgid "Rate Me"
 msgstr ""
 
-#: ../../include/nav.php:300
-msgid "Add Apps"
+#: ../../include/widgets.php:1390
+msgid "View Ratings"
 msgstr ""
 
-#: ../../include/attach.php:250 ../../include/attach.php:338
-msgid "Item was not found."
+#: ../../include/widgets.php:1483
+msgid "Forums"
 msgstr ""
 
-#: ../../include/attach.php:499
-msgid "No source file."
+#: ../../include/widgets.php:1540
+msgctxt "widget"
+msgid "Activity"
 msgstr ""
 
-#: ../../include/attach.php:521
-msgid "Cannot locate file to replace"
+#: ../../include/widgets.php:1569
+msgid "Tasks"
 msgstr ""
 
-#: ../../include/attach.php:539
-msgid "Cannot locate file to revise/update"
+#: ../../include/widgets.php:1635 ../../include/widgets.php:1673
+msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/attach.php:670
+#: ../../include/widgets.php:1641
+msgid "Inspect queue"
+msgstr ""
+
+#: ../../include/widgets.php:1643
+msgid "DB updates"
+msgstr ""
+
+#: ../../include/widgets.php:1668 ../../include/nav.php:233
+msgid "Admin"
+msgstr ""
+
+#: ../../include/widgets.php:1669
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr ""
+
+#: ../../include/js_strings.php:8
 #, php-format
-msgid "File exceeds size limit of %d"
+msgid "%s show less"
 msgstr ""
 
-#: ../../include/attach.php:684
+#: ../../include/js_strings.php:9
 #, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgid "%s expand"
 msgstr ""
 
-#: ../../include/attach.php:854
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/js_strings.php:10
+#, php-format
+msgid "%s collapse"
 msgstr ""
 
-#: ../../include/attach.php:867
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/js_strings.php:11
+msgid "Password too short"
 msgstr ""
 
-#: ../../include/attach.php:922 ../../include/attach.php:938
-msgid "Path not available."
+#: ../../include/js_strings.php:12
+msgid "Passwords do not match"
 msgstr ""
 
-#: ../../include/attach.php:984 ../../include/attach.php:1142
-msgid "Empty pathname"
+#: ../../include/js_strings.php:13
+msgid "everybody"
 msgstr ""
 
-#: ../../include/attach.php:1010
-msgid "duplicate filename or path"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
 msgstr ""
 
-#: ../../include/attach.php:1032
-msgid "Path not found."
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
 msgstr ""
 
-#: ../../include/attach.php:1096
-msgid "mkdir failed."
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
 msgstr ""
 
-#: ../../include/attach.php:1100
-msgid "database storage failed."
+#: ../../include/js_strings.php:17
+msgid "close all"
 msgstr ""
 
-#: ../../include/attach.php:1148
-msgid "Empty path"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr ""
+
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
+msgstr ""
+
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
+msgstr ""
+
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
+msgstr ""
+
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
+msgstr ""
+
+#: ../../include/js_strings.php:27
+msgid "timeago.prefixAgo"
+msgstr ""
+
+#: ../../include/js_strings.php:28
+msgid "timeago.prefixFromNow"
+msgstr ""
+
+#: ../../include/js_strings.php:29
+msgid "ago"
+msgstr ""
+
+#: ../../include/js_strings.php:30
+msgid "from now"
+msgstr ""
+
+#: ../../include/js_strings.php:31
+msgid "less than a minute"
+msgstr ""
+
+#: ../../include/js_strings.php:32
+msgid "about a minute"
+msgstr ""
+
+#: ../../include/js_strings.php:33
+#, php-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../include/js_strings.php:34
+msgid "about an hour"
+msgstr ""
+
+#: ../../include/js_strings.php:35
+#, php-format
+msgid "about %d hours"
+msgstr ""
+
+#: ../../include/js_strings.php:36
+msgid "a day"
+msgstr ""
+
+#: ../../include/js_strings.php:37
+#, php-format
+msgid "%d days"
+msgstr ""
+
+#: ../../include/js_strings.php:38
+msgid "about a month"
+msgstr ""
+
+#: ../../include/js_strings.php:39
+#, php-format
+msgid "%d months"
+msgstr ""
+
+#: ../../include/js_strings.php:40
+msgid "about a year"
+msgstr ""
+
+#: ../../include/js_strings.php:41
+#, php-format
+msgid "%d years"
+msgstr ""
+
+#: ../../include/js_strings.php:42
+msgid " "
+msgstr ""
+
+#: ../../include/js_strings.php:43
+msgid "timeago.numbers"
+msgstr ""
+
+#: ../../include/js_strings.php:45 ../../include/text.php:1315
+msgid "January"
+msgstr ""
+
+#: ../../include/js_strings.php:46 ../../include/text.php:1315
+msgid "February"
+msgstr ""
+
+#: ../../include/js_strings.php:47 ../../include/text.php:1315
+msgid "March"
+msgstr ""
+
+#: ../../include/js_strings.php:48 ../../include/text.php:1315
+msgid "April"
+msgstr ""
+
+#: ../../include/js_strings.php:49
+msgctxt "long"
+msgid "May"
+msgstr ""
+
+#: ../../include/js_strings.php:50 ../../include/text.php:1315
+msgid "June"
+msgstr ""
+
+#: ../../include/js_strings.php:51 ../../include/text.php:1315
+msgid "July"
+msgstr ""
+
+#: ../../include/js_strings.php:52 ../../include/text.php:1315
+msgid "August"
+msgstr ""
+
+#: ../../include/js_strings.php:53 ../../include/text.php:1315
+msgid "September"
+msgstr ""
+
+#: ../../include/js_strings.php:54 ../../include/text.php:1315
+msgid "October"
+msgstr ""
+
+#: ../../include/js_strings.php:55 ../../include/text.php:1315
+msgid "November"
+msgstr ""
+
+#: ../../include/js_strings.php:56 ../../include/text.php:1315
+msgid "December"
+msgstr ""
+
+#: ../../include/js_strings.php:57
+msgid "Jan"
+msgstr ""
+
+#: ../../include/js_strings.php:58
+msgid "Feb"
+msgstr ""
+
+#: ../../include/js_strings.php:59
+msgid "Mar"
+msgstr ""
+
+#: ../../include/js_strings.php:60
+msgid "Apr"
+msgstr ""
+
+#: ../../include/js_strings.php:61
+msgctxt "short"
+msgid "May"
+msgstr ""
+
+#: ../../include/js_strings.php:62
+msgid "Jun"
+msgstr ""
+
+#: ../../include/js_strings.php:63
+msgid "Jul"
+msgstr ""
+
+#: ../../include/js_strings.php:64
+msgid "Aug"
+msgstr ""
+
+#: ../../include/js_strings.php:65
+msgid "Sep"
+msgstr ""
+
+#: ../../include/js_strings.php:66
+msgid "Oct"
+msgstr ""
+
+#: ../../include/js_strings.php:67
+msgid "Nov"
+msgstr ""
+
+#: ../../include/js_strings.php:68
+msgid "Dec"
+msgstr ""
+
+#: ../../include/js_strings.php:69 ../../include/text.php:1311
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/js_strings.php:70 ../../include/text.php:1311
+msgid "Monday"
+msgstr ""
+
+#: ../../include/js_strings.php:71 ../../include/text.php:1311
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/js_strings.php:72 ../../include/text.php:1311
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/js_strings.php:73 ../../include/text.php:1311
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/js_strings.php:74 ../../include/text.php:1311
+msgid "Friday"
+msgstr ""
+
+#: ../../include/js_strings.php:75 ../../include/text.php:1311
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/js_strings.php:76
+msgid "Sun"
+msgstr ""
+
+#: ../../include/js_strings.php:77
+msgid "Mon"
+msgstr ""
+
+#: ../../include/js_strings.php:78
+msgid "Tue"
+msgstr ""
+
+#: ../../include/js_strings.php:79
+msgid "Wed"
+msgstr ""
+
+#: ../../include/js_strings.php:80
+msgid "Thu"
+msgstr ""
+
+#: ../../include/js_strings.php:81
+msgid "Fri"
+msgstr ""
+
+#: ../../include/js_strings.php:82
+msgid "Sat"
+msgstr ""
+
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "today"
+msgstr ""
+
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
+msgid "month"
+msgstr ""
+
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
+msgid "week"
+msgstr ""
+
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
+msgid "day"
+msgstr ""
+
+#: ../../include/js_strings.php:87
+msgctxt "calendar"
+msgid "All day"
+msgstr ""
+
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
 msgstr ""
 
 #: ../../include/text.php:461
@@ -12822,144 +12474,589 @@ msgstr ""
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:1331
+#: ../../include/text.php:1315
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1408 ../../include/text.php:1412
+#: ../../include/text.php:1392 ../../include/text.php:1396
 msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/text.php:1414
+#: ../../include/text.php:1398
 msgid "unknown"
 msgstr ""
 
-#: ../../include/text.php:1450
+#: ../../include/text.php:1434
 msgid "remove category"
 msgstr ""
 
-#: ../../include/text.php:1527
+#: ../../include/text.php:1511
 msgid "remove from file"
 msgstr ""
 
-#: ../../include/text.php:1796
+#: ../../include/text.php:1780
 msgid "Page layout"
 msgstr ""
 
-#: ../../include/text.php:1796
+#: ../../include/text.php:1780
 msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/text.php:1838
+#: ../../include/text.php:1822
 msgid "Page content type"
 msgstr ""
 
-#: ../../include/text.php:1971
+#: ../../include/text.php:1955
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:2285
+#: ../../include/text.php:2269
 msgid "Design Tools"
 msgstr ""
 
-#: ../../include/text.php:2291
+#: ../../include/text.php:2275
 msgid "Pages"
 msgstr ""
 
-#: ../../include/text.php:2313
+#: ../../include/text.php:2297
 msgid "Import website..."
 msgstr ""
 
-#: ../../include/text.php:2314
+#: ../../include/text.php:2298
 msgid "Select folder to import"
 msgstr ""
 
-#: ../../include/text.php:2315
+#: ../../include/text.php:2299
 msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../include/text.php:2316
+#: ../../include/text.php:2300
 msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../include/text.php:2317
+#: ../../include/text.php:2301
 msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../include/text.php:2318
+#: ../../include/text.php:2302
 msgid "Enter path to website files"
 msgstr ""
 
-#: ../../include/text.php:2319
+#: ../../include/text.php:2303
 msgid "Select folder"
 msgstr ""
 
-#: ../../include/text.php:2320
+#: ../../include/text.php:2304
 msgid "Export website..."
 msgstr ""
 
-#: ../../include/text.php:2321
+#: ../../include/text.php:2305
 msgid "Export to a zip file"
 msgstr ""
 
-#: ../../include/text.php:2322
+#: ../../include/text.php:2306
 msgid "website.zip"
 msgstr ""
 
-#: ../../include/text.php:2323
+#: ../../include/text.php:2307
 msgid "Enter a name for the zip file."
 msgstr ""
 
-#: ../../include/text.php:2324
+#: ../../include/text.php:2308
 msgid "Export to cloud files"
 msgstr ""
 
-#: ../../include/text.php:2325
+#: ../../include/text.php:2309
 msgid "/path/to/export/folder"
 msgstr ""
 
-#: ../../include/text.php:2326
+#: ../../include/text.php:2310
 msgid "Enter a path to a cloud files destination."
 msgstr ""
 
-#: ../../include/text.php:2327
+#: ../../include/text.php:2311
 msgid "Specify folder"
 msgstr ""
 
-#: ../../include/auth.php:148
-msgid "Logged out."
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/auth.php:275
-msgid "Failed authentication"
+#: ../../include/group.php:268
+msgid "Add new connections to this privacy group"
 msgstr ""
 
-#: ../../include/follow.php:26
-msgid "Channel is blocked on this site."
+#: ../../include/group.php:309
+msgid "edit"
 msgstr ""
 
-#: ../../include/follow.php:31
-msgid "Channel location missing."
+#: ../../include/group.php:331 ../../include/features.php:292
+msgid "Privacy Groups"
 msgstr ""
 
-#: ../../include/follow.php:73
-msgid "Response from remote channel was incomplete."
+#: ../../include/group.php:332
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/follow.php:90
-msgid "Channel was deleted and no longer exists."
+#: ../../include/group.php:333
+msgid "Add privacy group"
 msgstr ""
 
-#: ../../include/follow.php:140 ../../include/follow.php:175
-msgid "Protocol disabled."
+#: ../../include/group.php:334
+msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../include/follow.php:163
-msgid "Channel discovery failed."
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/follow.php:202
-msgid "Cannot connect to yourself."
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr ""
+
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr ""
+
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr ""
+
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr ""
+
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr ""
+
+#: ../../include/channel.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr ""
+
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/channel.php:344
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/channel.php:1045
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/channel.php:1065
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/channel.php:1138 ../../include/channel.php:1257
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/channel.php:1140 ../../include/channel.php:1312
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/channel.php:1141
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/channel.php:1262
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/channel.php:1286
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/channel.php:1287
+msgid "j F"
+msgstr ""
+
+#: ../../include/channel.php:1294
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/channel.php:1307
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: ../../include/channel.php:1310
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../include/channel.php:1316
+msgid "Tags:"
+msgstr ""
+
+#: ../../include/channel.php:1318
+msgid "Political Views:"
+msgstr ""
+
+#: ../../include/channel.php:1320
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/channel.php:1324
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/channel.php:1326
+msgid "Likes:"
+msgstr ""
+
+#: ../../include/channel.php:1328
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../include/channel.php:1330
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/channel.php:1332
+msgid "My other channels:"
+msgstr ""
+
+#: ../../include/channel.php:1334
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/channel.php:1336
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/channel.php:1338
+msgid "Television:"
+msgstr ""
+
+#: ../../include/channel.php:1340
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/channel.php:1342
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/channel.php:1344
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/channel.php:1346
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/channel.php:1369
+msgid "Like this thing"
+msgstr ""
+
+#: ../../include/channel.php:2103
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: ../../include/network.php:756
+msgid "view full size"
+msgstr ""
+
+#: ../../include/network.php:1490
+msgid "No Subject"
+msgstr ""
+
+#: ../../include/network.php:1746
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/network.php:1747
+msgid "GNU-Social"
+msgstr ""
+
+#: ../../include/network.php:1748
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/network.php:1751
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/network.php:1752
+msgid "Zot"
+msgstr ""
+
+#: ../../include/network.php:1753
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/network.php:1754
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/network.php:1755
+msgid "MySpace"
+msgstr ""
+
+#: ../../include/attach.php:250 ../../include/attach.php:338
+msgid "Item was not found."
+msgstr ""
+
+#: ../../include/attach.php:499
+msgid "No source file."
+msgstr ""
+
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
+msgstr ""
+
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
+msgstr ""
+
+#: ../../include/attach.php:670
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr ""
+
+#: ../../include/attach.php:684
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr ""
+
+#: ../../include/attach.php:854
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr ""
+
+#: ../../include/attach.php:867
+msgid "Stored file could not be verified. Upload failed."
+msgstr ""
+
+#: ../../include/attach.php:922 ../../include/attach.php:938
+msgid "Path not available."
+msgstr ""
+
+#: ../../include/attach.php:984 ../../include/attach.php:1142
+msgid "Empty pathname"
+msgstr ""
+
+#: ../../include/attach.php:1010
+msgid "duplicate filename or path"
+msgstr ""
+
+#: ../../include/attach.php:1032
+msgid "Path not found."
+msgstr ""
+
+#: ../../include/attach.php:1096
+msgid "mkdir failed."
+msgstr ""
+
+#: ../../include/attach.php:1100
+msgid "database storage failed."
+msgstr ""
+
+#: ../../include/attach.php:1148
+msgid "Empty path"
+msgstr ""
+
+#: ../../include/message.php:32
+msgid "Unable to determine sender."
+msgstr ""
+
+#: ../../include/message.php:69
+msgid "No recipient provided."
+msgstr ""
+
+#: ../../include/message.php:74
+msgid "[no subject]"
+msgstr ""
+
+#: ../../include/message.php:225
+msgid "Stored post could not be verified."
+msgstr ""
+
+#: ../../include/nav.php:88
+msgid "Remote authentication"
+msgstr ""
+
+#: ../../include/nav.php:88
+msgid "Click to authenticate to your home hub"
+msgstr ""
+
+#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1705
+msgid "Logout"
+msgstr ""
+
+#: ../../include/nav.php:99 ../../include/nav.php:140
+msgid "End this session"
+msgstr ""
+
+#: ../../include/nav.php:103
+msgid "Your profile page"
+msgstr ""
+
+#: ../../include/nav.php:105
+msgid "Manage/Edit profiles"
+msgstr ""
+
+#: ../../include/nav.php:107
+msgid "Edit your profile"
+msgstr ""
+
+#: ../../include/nav.php:130
+msgid "Sign in"
+msgstr ""
+
+#: ../../include/nav.php:155
+msgid "Get me home"
+msgstr ""
+
+#: ../../include/nav.php:157
+msgid "Log me out of this site"
+msgstr ""
+
+#: ../../include/nav.php:162
+msgid "Create an account"
+msgstr ""
+
+#: ../../include/nav.php:174
+msgid "Help and documentation"
+msgstr ""
+
+#: ../../include/nav.php:178
+msgid "Applications, utilities, links, games"
+msgstr ""
+
+#: ../../include/nav.php:180
+msgid "Search site @name, #tag, ?docs, content"
+msgstr ""
+
+#: ../../include/nav.php:182
+msgid "Channel Directory"
+msgstr ""
+
+#: ../../include/nav.php:194
+msgid "Your grid"
+msgstr ""
+
+#: ../../include/nav.php:195
+msgid "View your network/grid"
+msgstr ""
+
+#: ../../include/nav.php:196
+msgid "Mark all grid notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:198
+msgid "Channel home"
+msgstr ""
+
+#: ../../include/nav.php:199
+msgid "View your channel home"
+msgstr ""
+
+#: ../../include/nav.php:200
+msgid "Mark all channel notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:206
+msgid "Notices"
+msgstr ""
+
+#: ../../include/nav.php:206
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:207
+msgid "View all notifications"
+msgstr ""
+
+#: ../../include/nav.php:210
+msgid "Private mail"
+msgstr ""
+
+#: ../../include/nav.php:211
+msgid "View your private messages"
+msgstr ""
+
+#: ../../include/nav.php:212
+msgid "Mark all private messages seen"
+msgstr ""
+
+#: ../../include/nav.php:218
+msgid "Event Calendar"
+msgstr ""
+
+#: ../../include/nav.php:219
+msgid "View events"
+msgstr ""
+
+#: ../../include/nav.php:220
+msgid "Mark all events seen"
+msgstr ""
+
+#: ../../include/nav.php:223
+msgid "Manage Your Channels"
+msgstr ""
+
+#: ../../include/nav.php:225
+msgid "Account/Channel Settings"
+msgstr ""
+
+#: ../../include/nav.php:233
+msgid "Site Setup and Configuration"
+msgstr ""
+
+#: ../../include/nav.php:297
+msgid "@name, #tag, ?doc, content"
+msgstr ""
+
+#: ../../include/nav.php:298
+msgid "Please wait..."
+msgstr ""
+
+#: ../../include/nav.php:300
+msgid "Add Apps"
+msgstr ""
+
+#: ../../include/photos.php:115
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr ""
+
+#: ../../include/photos.php:122
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../include/photos.php:260
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:300
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:304
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr ""
+
+#: ../../include/photos.php:519
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../include/security.php:117
+msgid "guest:"
+msgstr ""
+
+#: ../../include/security.php:532
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
 #: ../../include/import.php:30
@@ -12979,53 +13076,56 @@ msgstr ""
 msgid "Unable to import element \""
 msgstr ""
 
-#: ../../include/message.php:32
-msgid "Unable to determine sender."
+#: ../../include/acl_selectors.php:208
+msgid "Who can see this?"
 msgstr ""
 
-#: ../../include/message.php:69
-msgid "No recipient provided."
+#: ../../include/acl_selectors.php:209
+msgid "Custom selection"
 msgstr ""
 
-#: ../../include/message.php:74
-msgid "[no subject]"
+#: ../../include/acl_selectors.php:210
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
 msgstr ""
 
-#: ../../include/message.php:225
-msgid "Stored post could not be verified."
+#: ../../include/acl_selectors.php:211
+msgid "Show"
 msgstr ""
 
-#: ../../include/oembed.php:308
-msgid " by "
+#: ../../include/acl_selectors.php:212
+msgid "Don't show"
 msgstr ""
 
-#: ../../include/oembed.php:309
-msgid " on "
-msgstr ""
-
-#: ../../include/oembed.php:338
-msgid "Embedded content"
-msgstr ""
-
-#: ../../include/oembed.php:347
-msgid "Embedding disabled"
-msgstr ""
-
-#: ../../include/zot.php:649
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:665
-msgid "Unable to verify channel signature"
-msgstr ""
-
-#: ../../include/zot.php:2316
+#: ../../include/acl_selectors.php:245
 #, php-format
-msgid "Unable to verify site signature for %s"
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These "
+"permissions set who is allowed to view the post."
 msgstr ""
 
-#: ../../include/zot.php:3722
-msgid "invalid target signature"
+#: ../../include/activities.php:41
+msgid " and "
+msgstr ""
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr ""
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr ""
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
 #: ../../include/permissions.php:35
@@ -13080,29 +13180,6 @@ msgstr ""
 msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/activities.php:41
-msgid " and "
-msgstr ""
-
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr ""
-
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr ""
-
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr ""
-
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr ""
-
 #: ../../include/features.php:58
 msgid "General Features"
 msgstr ""
@@ -13404,182 +13481,91 @@ msgid ""
 "channel"
 msgstr ""
 
-#: ../../include/photos.php:115
+#: ../../include/follow.php:26
+msgid "Channel is blocked on this site."
+msgstr ""
+
+#: ../../include/follow.php:31
+msgid "Channel location missing."
+msgstr ""
+
+#: ../../include/follow.php:73
+msgid "Response from remote channel was incomplete."
+msgstr ""
+
+#: ../../include/follow.php:90
+msgid "Channel was deleted and no longer exists."
+msgstr ""
+
+#: ../../include/follow.php:140 ../../include/follow.php:175
+msgid "Protocol disabled."
+msgstr ""
+
+#: ../../include/follow.php:163
+msgid "Channel discovery failed."
+msgstr ""
+
+#: ../../include/follow.php:202
+msgid "Cannot connect to yourself."
+msgstr ""
+
+#: ../../include/oembed.php:308
+msgid " by "
+msgstr ""
+
+#: ../../include/oembed.php:309
+msgid " on "
+msgstr ""
+
+#: ../../include/oembed.php:338
+msgid "Embedded content"
+msgstr ""
+
+#: ../../include/oembed.php:347
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
+#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
+#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
+#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
+#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
+#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
+#: ../../include/bbcode.php:1079
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:189
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/photos.php:122
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../include/photos.php:260
-msgid "Photo storage failed."
-msgstr ""
-
-#: ../../include/photos.php:300
-msgid "a new photo"
-msgstr ""
-
-#: ../../include/photos.php:304
+#: ../../include/bbcode.php:193
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr ""
-
-#: ../../include/photos.php:519
-msgid "Upload New Photos"
-msgstr ""
-
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
-msgstr ""
-
-#: ../../include/channel.php:67
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/channel.php:70
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/channel.php:181
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/channel.php:193
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/channel.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/channel.php:212
 msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
 msgstr ""
 
-#: ../../include/channel.php:272
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/channel.php:344
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/channel.php:1045
-msgid "Create New Profile"
-msgstr ""
-
-#: ../../include/channel.php:1065
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/channel.php:1138 ../../include/channel.php:1257
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/channel.php:1140 ../../include/channel.php:1312
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/channel.php:1141
-msgid "Online Now"
-msgstr ""
-
-#: ../../include/channel.php:1262
-msgid "Like this channel"
-msgstr ""
-
-#: ../../include/channel.php:1286
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/channel.php:1287
-msgid "j F"
-msgstr ""
-
-#: ../../include/channel.php:1294
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/channel.php:1307
+#: ../../include/bbcode.php:272
 #, php-format
-msgid "for %1$d %2$s"
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/channel.php:1310
-msgid "Sexual Preference:"
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/channel.php:1316
-msgid "Tags:"
+#: ../../include/bbcode.php:357
+msgid "spoiler"
 msgstr ""
 
-#: ../../include/channel.php:1318
-msgid "Political Views:"
-msgstr ""
-
-#: ../../include/channel.php:1320
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/channel.php:1324
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/channel.php:1326
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/channel.php:1328
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/channel.php:1330
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/channel.php:1332
-msgid "My other channels:"
-msgstr ""
-
-#: ../../include/channel.php:1334
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/channel.php:1336
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/channel.php:1338
-msgid "Television:"
-msgstr ""
-
-#: ../../include/channel.php:1340
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/channel.php:1342
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/channel.php:1344
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/channel.php:1346
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/channel.php:1369
-msgid "Like this thing"
-msgstr ""
-
-#: ../../include/channel.php:2103
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/bbcode.php:1028
+msgid "$1 wrote:"
 msgstr ""
 
 #: ../../util/nconfig.php:34
@@ -13718,54 +13704,54 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1522
+#: ../../boot.php:1479
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1525
+#: ../../boot.php:1482
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1729
+#: ../../boot.php:1686
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1751
+#: ../../boot.php:1708
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1752
+#: ../../boot.php:1709
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1753
+#: ../../boot.php:1710
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1756
+#: ../../boot.php:1713
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2320
+#: ../../boot.php:2277
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2475
+#: ../../boot.php:2432
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2478
+#: ../../boot.php:2435
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2597
+#: ../../boot.php:2554
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2601
+#: ../../boot.php:2558
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""

From 6f3493bb3ca3718d4b69278c96df384c8a4d5811 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 15:50:47 -0700
Subject: [PATCH 008/299] db issues

---
 include/dba/dba_pdo.php     | 14 ++++++-------
 install/schema_mysql.sql    | 41 -------------------------------------
 install/schema_postgres.sql | 41 -------------------------------------
 view/tpl/nav.tpl            |  2 +-
 4 files changed, 8 insertions(+), 90 deletions(-)

diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index f76e6cdd7..f119d8926 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -74,19 +74,19 @@ class dba_pdo extends dba_driver {
 			return $result;
 		}
 
-		if($this->debug) {
-			db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($result) . ' results.', LOGGER_NORMAL, LOG_INFO); 
-		}
-
 		$r = array();
 		if($result) {
 			foreach($result as $x) {
 				$r[] = $x;
 			}
-			if($this->debug) {
-				db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO);
-			}
 		}
+
+		if($this->debug) {
+			db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($r) . ' results.', LOGGER_NORMAL, LOG_INFO); 
+			db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO);
+		}
+
+
 		return (($this->error) ? false : $r);
 	}
 
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index be5317722..f3d46fa73 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -18,8 +18,6 @@ CREATE TABLE IF NOT EXISTS `abook` (
   `abook_account` int(10) unsigned NOT NULL DEFAULT '0',
   `abook_channel` int(10) unsigned NOT NULL DEFAULT '0',
   `abook_xchan` char(255) NOT NULL DEFAULT '',
-  `abook_my_perms` int(11) NOT NULL DEFAULT '0',
-  `abook_their_perms` int(11) NOT NULL DEFAULT '0',
   `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99',
   `abook_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `abook_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -42,8 +40,6 @@ CREATE TABLE IF NOT EXISTS `abook` (
   KEY `abook_account` (`abook_account`),
   KEY `abook_channel` (`abook_channel`),
   KEY `abook_xchan` (`abook_xchan`),
-  KEY `abook_my_perms` (`abook_my_perms`),
-  KEY `abook_their_perms` (`abook_their_perms`),
   KEY `abook_closeness` (`abook_closeness`),
   KEY `abook_created` (`abook_created`),
   KEY `abook_updated` (`abook_updated`),
@@ -266,24 +262,6 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_allow_gid` mediumtext NOT NULL,
   `channel_deny_cid` mediumtext NOT NULL,
   `channel_deny_gid` mediumtext NOT NULL,
-  `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_like` int(10) unsigned NOT NULL DEFAULT '0',
   `channel_removed` tinyint(1) NOT NULL DEFAULT '0',
   `channel_system` tinyint(1) NOT NULL DEFAULT '0',
   `channel_moved` char(255) NOT NULL DEFAULT '',
@@ -300,29 +278,11 @@ CREATE TABLE IF NOT EXISTS `channel` (
   KEY `channel_max_anon_mail` (`channel_max_anon_mail`),
   KEY `channel_max_friend_req` (`channel_max_friend_req`),
   KEY `channel_default_gid` (`channel_default_group`),
-  KEY `channel_r_stream` (`channel_r_stream`),
-  KEY `channel_r_profile` (`channel_r_profile`),
-  KEY `channel_r_photos` (`channel_r_photos`),
-  KEY `channel_r_abook` (`channel_r_abook`),
-  KEY `channel_w_stream` (`channel_w_stream`),
-  KEY `channel_w_wall` (`channel_w_wall`),
-  KEY `channel_w_tagwall` (`channel_w_tagwall`),
-  KEY `channel_w_comment` (`channel_w_comment`),
-  KEY `channel_w_mail` (`channel_w_mail`),
-  KEY `channel_w_photos` (`channel_w_photos`),
-  KEY `channel_w_chat` (`channel_w_chat`),
   KEY `channel_guid` (`channel_guid`),
   KEY `channel_hash` (`channel_hash`),
   KEY `channel_expire_days` (`channel_expire_days`),
-  KEY `channel_a_delegate` (`channel_a_delegate`),
-  KEY `channel_r_storage` (`channel_r_storage`),
-  KEY `channel_w_storage` (`channel_w_storage`),
-  KEY `channel_r_pages` (`channel_r_pages`),
-  KEY `channel_w_pages` (`channel_w_pages`),
   KEY `channel_deleted` (`channel_deleted`),
-  KEY `channel_a_republish` (`channel_a_republish`),
   KEY `channel_dirdate` (`channel_dirdate`),
-  KEY `channel_w_like` (`channel_w_like`),
   KEY `channel_removed` (`channel_removed`),
   KEY `channel_system` (`channel_system`),
   KEY `channel_lastpost` (`channel_lastpost`),
@@ -622,7 +582,6 @@ CREATE TABLE IF NOT EXISTS `item` (
   `resource_type` char(16) NOT NULL DEFAULT '',
   `attach` mediumtext NOT NULL,
   `sig` text NOT NULL,
-  `diaspora_meta` mediumtext NOT NULL,
   `location` char(255) NOT NULL DEFAULT '',
   `coord` char(255) NOT NULL DEFAULT '',
   `public_policy` char(255) NOT NULL DEFAULT '',
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index e78425828..4488d8271 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -16,8 +16,6 @@ CREATE TABLE "abook" (
   "abook_account" bigint  NOT NULL,
   "abook_channel" bigint  NOT NULL,
   "abook_xchan" text NOT NULL DEFAULT '',
-  "abook_my_perms" bigint NOT NULL DEFAULT '0',
-  "abook_their_perms" bigint NOT NULL DEFAULT '0',
   "abook_closeness" numeric(3)  NOT NULL DEFAULT '99',
   "abook_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "abook_updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -41,8 +39,6 @@ CREATE TABLE "abook" (
   create index  "abook_account" on abook ("abook_account");
   create index  "abook_channel" on abook  ("abook_channel");
   create index  "abook_xchan"  on abook ("abook_xchan");
-  create index  "abook_my_perms" on abook  ("abook_my_perms");
-  create index  "abook_their_perms" on abook  ("abook_their_perms");
   create index  "abook_closeness" on abook  ("abook_closeness");
   create index  "abook_created"  on abook ("abook_created");
   create index  "abook_updated"  on abook ("abook_updated");
@@ -259,24 +255,6 @@ CREATE TABLE "channel" (
   "channel_allow_gid" text ,
   "channel_deny_cid" text ,
   "channel_deny_gid" text ,
-  "channel_r_stream" bigint  NOT NULL DEFAULT '128',
-  "channel_r_profile" bigint  NOT NULL DEFAULT '128',
-  "channel_r_photos" bigint  NOT NULL DEFAULT '128',
-  "channel_r_abook" bigint  NOT NULL DEFAULT '128',
-  "channel_w_stream" bigint  NOT NULL DEFAULT '128',
-  "channel_w_wall" bigint  NOT NULL DEFAULT '128',
-  "channel_w_tagwall" bigint  NOT NULL DEFAULT '128',
-  "channel_w_comment" bigint  NOT NULL DEFAULT '128',
-  "channel_w_mail" bigint  NOT NULL DEFAULT '128',
-  "channel_w_photos" bigint  NOT NULL DEFAULT '128',
-  "channel_w_chat" bigint  NOT NULL DEFAULT '128',
-  "channel_a_delegate" bigint  NOT NULL DEFAULT '0',
-  "channel_r_storage" bigint  NOT NULL DEFAULT '128',
-  "channel_w_storage" bigint  NOT NULL DEFAULT '128',
-  "channel_r_pages" bigint  NOT NULL DEFAULT '128',
-  "channel_w_pages" bigint  NOT NULL DEFAULT '128',
-  "channel_a_republish" bigint  NOT NULL DEFAULT '128',
-  "channel_w_like" bigint  NOT NULL DEFAULT '128',
   "channel_removed" smallint NOT NULL DEFAULT '0',
   "channel_system" smallint NOT NULL DEFAULT '0',
   "channel_moved" text NOT NULL DEFAULT '',
@@ -294,28 +272,10 @@ create index "channel_pageflags" on channel ("channel_pageflags");
 create index "channel_max_anon_mail" on channel ("channel_max_anon_mail");
 create index "channel_max_friend_req" on channel ("channel_max_friend_req");
 create index "channel_default_gid" on channel ("channel_default_group");
-create index "channel_r_stream" on channel ("channel_r_stream");
-create index "channel_r_profile" on channel ("channel_r_profile");
-create index "channel_r_photos" on channel ("channel_r_photos");
-create index "channel_r_abook" on channel ("channel_r_abook");
-create index "channel_w_stream" on channel ("channel_w_stream");
-create index "channel_w_wall" on channel ("channel_w_wall");
-create index "channel_w_tagwall" on channel ("channel_w_tagwall");
-create index "channel_w_comment" on channel ("channel_w_comment");
-create index "channel_w_mail" on channel ("channel_w_mail");
-create index "channel_w_photos" on channel ("channel_w_photos");
-create index "channel_w_chat" on channel ("channel_w_chat");
 create index "channel_guid" on channel ("channel_guid");
 create index "channel_hash" on channel ("channel_hash");
 create index "channel_expire_days" on channel ("channel_expire_days");
-create index "channel_a_delegate" on channel ("channel_a_delegate");
-create index "channel_r_storage" on channel ("channel_r_storage");
-create index "channel_w_storage" on channel ("channel_w_storage");
-create index "channel_r_pages" on channel ("channel_r_pages");
-create index "channel_w_pages" on channel ("channel_w_pages");
 create index "channel_deleted" on channel ("channel_deleted");
-create index "channel_a_republish" on channel ("channel_a_republish");
-create index "channel_w_like" on channel ("channel_w_like");
 create index "channel_dirdate" on channel ("channel_dirdate");
 create index "channel_lastpost" on channel ("channel_lastpost");
 create index "channel_removed" on channel ("channel_removed");
@@ -609,7 +569,6 @@ CREATE TABLE "item" (
   "resource_type" varchar(16) NOT NULL DEFAULT '',
   "attach" text NOT NULL,
   "sig" text NOT NULL DEFAULT '',
-  "diaspora_meta" text NOT NULL DEFAULT '',
   "location" text NOT NULL DEFAULT '',
   "coord" text NOT NULL DEFAULT '',
   "public_policy" text NOT NULL DEFAULT '',
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0581989ec..11e107d2a 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -177,7 +177,7 @@
 				<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a>
 			</li>
 			{{/if}}
-			<li class="">
+			<li class="" id="app-menu">
 				<a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a>
 				<ul class="dropdown-menu">
 					{{foreach $navapps as $navapp}}

From 2a1f6e3df26bf641bbf977deaf3c5f3ac3c64449 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 15:57:56 -0700
Subject: [PATCH 009/299] update std_version

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 16d60f61e..83826fd0c 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ require_once('include/hubloc.php');
 
 
 define ( 'PLATFORM_NAME',           'red' );
-define ( 'STD_VERSION',             '2.3' );
+define ( 'STD_VERSION',             '5.2' );
 define ( 'ZOT_REVISION',            '1.2' );
 
 define ( 'DB_UPDATE_VERSION',       1188  );

From b1fc29be117cd95ad175a9899d1102ee56471d5b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 16:30:05 -0700
Subject: [PATCH 010/299] more cleanup

---
 boot.php | 64 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/boot.php b/boot.php
index 83826fd0c..a80bfbed3 100755
--- a/boot.php
+++ b/boot.php
@@ -1130,24 +1130,25 @@ class App {
 		 * since the code added by the modules frequently depends on it
 		 * being first
 		 */
-		$tpl = get_markup_template('head.tpl');
-		self::$page['htmlhead'] = replace_macros($tpl, array(
-			'$preload_images' => $preload_images,
-			'$user_scalable' => $user_scalable,
-			'$query' => urlencode(self::$query_string),
-			'$baseurl' => self::get_baseurl(),
-			'$local_channel' => local_channel(),
-			'$metas' => self::$meta->get(),
-			'$plugins' => $x['header'],
-			'$update_interval' => $interval,
-			'osearch' => sprintf( t('Search %1$s (%2$s)','opensearch'), Zotlabs\Lib\System::get_site_name(), t('$Projectname','opensearch')), 
-			'$head_css' => head_get_css(),
-			'$head_js' => head_get_js(),
-			'$linkrel' => head_get_links(),
-			'$js_strings' => js_strings(),
-			'$zid' => get_my_address(),
-			'$channel_id' => self::$profile['uid'],
-		)) . self::$page['htmlhead'];
+
+		self::$page['htmlhead'] = replace_macros(get_markup_template('head.tpl'), 
+			[
+				'$preload_images'  => $preload_images,
+				'$user_scalable'   => $user_scalable,
+				'$query'           => urlencode(self::$query_string),
+				'$baseurl'         => self::get_baseurl(),
+				'$local_channel'   => local_channel(),
+				'$metas'           => self::$meta->get(),
+				'$plugins'         => $x['header'],
+				'$update_interval' => $interval,
+				'$head_css'        => head_get_css(),
+				'$head_js'         => head_get_js(),
+				'$linkrel'         => head_get_links(),
+				'$js_strings'      => js_strings(),
+				'$zid'             => get_my_address(),
+				'$channel_id'      => self::$profile['uid']
+			]
+		) . self::$page['htmlhead'];
 
 		// always put main.js at the end
 		self::$page['htmlhead'] .= head_get_main_js();
@@ -1160,11 +1161,13 @@ class App {
 	* @param string $name
 	*/
 	public static function register_template_engine($class, $name = '') {
-		if ($name === ""){
-			$v = get_class_vars( $class );
-			if(x($v, "name")) $name = $v['name'];
+		if(! $name) {
+			$v = get_class_vars($class);
+			if(x($v, "name")) { 
+				$name = $v['name'];
+			}
 		}
-		if ($name === ""){
+		if (! $name) {
 			echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
 			killme();
 		}
@@ -1180,19 +1183,21 @@ class App {
 	* @return object Template Engine instance
 	*/
 	public static function template_engine($name = ''){
-		if ($name !== "") {
+		if($name !== '') {
 			$template_engine = $name;
-		} else {
+		}
+		else {
 			$template_engine = 'smarty3';
-			if (x(self::$theme, 'template_engine')) {
+			if(x(self::$theme, 'template_engine')) {
 				$template_engine = self::$theme['template_engine'];
 			}
 		}
 
-		if (isset(self::$template_engines[$template_engine])){
+		if(isset(self::$template_engines[$template_engine])){
 			if(isset(self::$template_engine_instance[$template_engine])){
 				return self::$template_engine_instance[$template_engine];
-			} else {
+			}
+			else {
 				$class = self::$template_engines[$template_engine];
 				$obj = new $class;
 				self::$template_engine_instance[$template_engine] = $obj;
@@ -1200,7 +1205,8 @@ class App {
 			}
 		}
 
-		echo "template engine <tt>$template_engine</tt> is not registered!\n"; killme();
+		echo "template engine <tt>$template_engine</tt> is not registered!\n"; 
+		killme();
 	}
 
 	/**
@@ -2555,7 +2561,7 @@ function check_cron_broken() {
 		'$lastdate' => (($d)? $d : t('never'))
 	));
 
-	$subject = email_header_encode(sprintf(t('[hubzilla] Cron tasks not running on %s'), App::get_hostname()));
+	$subject = email_header_encode(sprintf(t('[$Projectname] Cron tasks not running on %s'), App::get_hostname()));
 	mail(App::$config['system']['admin_email'], $subject, $email_msg,
 		'From: Administrator' . '@' . App::get_hostname() . "\n"
 		. 'Content-type: text/plain; charset=UTF-8' . "\n"

From c39c925d8db1fd6a62033c1ece71cc4424899935 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 17:32:45 -0700
Subject: [PATCH 011/299] grrr. stop making branding assumptions.

---
 Zotlabs/Lib/Config.php                        |  2 +-
 Zotlabs/Lib/PConfig.php                       |  2 +-
 doc/about/{about_hubzilla.bb => about.bb}     | 11 +++--------
 doc/about/{hubzilla_project.bb => project.bb} |  0
 doc/toc.html                                  |  4 ++--
 include/help.php                              |  2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)
 rename doc/about/{about_hubzilla.bb => about.bb} (97%)
 rename doc/about/{hubzilla_project.bb => project.bb} (100%)

diff --git a/Zotlabs/Lib/Config.php b/Zotlabs/Lib/Config.php
index 5625a3f79..6e042feba 100644
--- a/Zotlabs/Lib/Config.php
+++ b/Zotlabs/Lib/Config.php
@@ -53,7 +53,7 @@ class Config {
 		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
 		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
 
-		if(get_config($family, $key) === false || (! self::get_from_storage($family, $key))) {
+		if(self::Get($family, $key) === false || (! self::get_from_storage($family, $key))) {
 			$ret = q("INSERT INTO config ( cat, k, v ) VALUES ( '%s', '%s', '%s' ) ",
 				dbesc($family),
 				dbesc($key),
diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
index d70697fbc..25478e764 100644
--- a/Zotlabs/Lib/PConfig.php
+++ b/Zotlabs/Lib/PConfig.php
@@ -119,7 +119,7 @@ class PConfig {
 		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
 		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
 
-		if(get_pconfig($uid, $family, $key) === false) {
+		if(self::Get($uid, $family, $key) === false) {
 			if(! array_key_exists($uid, \App::$config))
 				\App::$config[$uid] = array();
 			if(! array_key_exists($family, \App::$config[$uid]))
diff --git a/doc/about/about_hubzilla.bb b/doc/about/about.bb
similarity index 97%
rename from doc/about/about_hubzilla.bb
rename to doc/about/about.bb
index e9485ffa6..2affe2cba 100644
--- a/doc/about/about_hubzilla.bb
+++ b/doc/about/about.bb
@@ -1,7 +1,7 @@
-[h3]What is Hubzilla?[/h3]
+[h3]What is $Projectname?[/h3]
 $Projectname is a [b]free and open source[/b] set of web applications and services running on a special kind of web server, called a "hub", that can connect to other hubs in a decentralised network we like to call "the grid", providing sophisticated communications, identity, and access control services which work together seamlessly across domains and independent websites. It allows anybody to publicly or [b]privately[/b] publish content via "channels", which are the fundamental, cryptographically secured identities that provide authentication independently of the hubs which host them. This revolutionary liberation of online identity from individual servers and domains is called "nomadic identity", and it is powered by the Zot protocol, a new framework for decentralised access control with fine-grained, extensible permissions.
 
-[h3]Right... so what is Hubzilla?[/h3]
+[h3]Right... so what is $Projectname?[/h3]
 From the practical perspective of hub members who use the software, $Projectname offers a variety of familiar, integrated web apps and services, including: 
 [ul]
 [li]social networking discussion threads[/li]
@@ -15,14 +15,9 @@ While all of these apps and services can be found in other software packages, on
 [h3]Software Stack[/h3]
 The $Projectname software stack is a relatively standard webserver application written primarily in PHP/MySQL and [url=https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt]requiring little more than a web server, a MySQL-compatible database, and the PHP scripting language[/url]. It is designed to be easily installable by those with basic website administration skills on typical shared hosting platforms with a broad range of computing hardware. It is also easily extended via plugins and themes and other third-party tools. 
 
-[h3]Additional Resources and Links[/h3]
-[list][*][url=http://hubzilla.org]Hubzilla project website[/url]
-[*][url=https://github.com/redmatrix/hubzilla]Hubzilla core code repository[/url]
-[*][url=https://github.com/redmatrix/hubzilla-addons]Hubzilla official addons repository[/url][/list]
-
 [h3]Glossary[/h3]
 [dl terms="b"]
-[*= hub] An instance of the Hubzilla software running on a standard web server
+[*= hub] An instance of this software running on a standard web server
 
 [*= grid] The global network of hubs that exchange information with each other using the Zot protocol.
 
diff --git a/doc/about/hubzilla_project.bb b/doc/about/project.bb
similarity index 100%
rename from doc/about/hubzilla_project.bb
rename to doc/about/project.bb
diff --git a/doc/toc.html b/doc/toc.html
index 3c9c5c299..285794689 100644
--- a/doc/toc.html
+++ b/doc/toc.html
@@ -7,8 +7,8 @@
         </div>
         <div id="about" class="panel-collapse collapse in">
             <ul class="list-group">
-                <li class="doco-list-group-item"><a href="/help/about/about_hubzilla">About Hubzilla</a></li>
-                <li class="doco-list-group-item"><a href="/help/about/hubzilla_project">Hubzilla project</a></li>
+                <li class="doco-list-group-item"><a href="/help/about/about">About</a></li>
+                <li class="doco-list-group-item"><a href="/help/about/project">Project</a></li>
                 <li class="doco-list-group-item"><a href="/help/about/about_hub">About this hub</a></li>
             </ul>
         </div>
diff --git a/include/help.php b/include/help.php
index e4725575d..ab31e9400 100644
--- a/include/help.php
+++ b/include/help.php
@@ -57,7 +57,7 @@ function get_help_content($tocpath = false) {
 		if(! $text) {
 			$doctype = 'bbcode';
 			$text = load_doc_file('doc/main.bb');
-			goaway('/help/about/about_hubzilla');
+			goaway('/help/about/about');
 			\App::$page['title'] = t('Help');
 		}
 

From f4cd4184f81581c44d92fb7d8a40d8e5de8656ff Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 17:45:18 -0700
Subject: [PATCH 012/299] update readme

---
 README.md | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 54f80bebe..01524f8c8 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,5 @@
-![Hubzilla](images/hubzilla-banner.png)
 
-Hubzilla - Community Server
-===========================
+red
+===
 
-<p align="center" markdown="1">
-<em><a href="https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt">Installing Hubzilla</a></em> 
-</p>
-
-
-**What is Hubzilla?**
-
-Hubzilla is a general purpose communication server integrated with a web publishing system and a decentralised permission system. If this sounds like a bunch of technical mumbo-jumbo to you, just think of it as an independent platform for sharing stuff online. 
-
-Hubzilla contains some social network bits, some cloud storage bits, some blog and forum bits, and some content management bits. These are all integrated within a common privacy framework - and it is all decentralised. 
-
-Everything you publish or share can be restricted to those channels and people you wish to share them with; and these permissions work completely invisibly - even with channels on different servers or other communications services.
-
-Migration and live backups of your connections, settings, and everything you publish are built-in, so you never need worry about server failure. 
-
-Hubzilla is completely decentralised and open source, for you modify or adapt to your needs and desires. Plugins, themes, and numerous configuration options extend the overall capabilities to do anything you can imagine. 
-
-
-**Who Are We?**
-
-The Hubzilla community consists of passionate volunteers creating an open source commons of decentralised services which are highly integrated and can rival the feature set of large centralised providers. We do our best to provide ethical software which places you in control of your online communications and privacy expectations.
-
-
-[![Build Status](https://travis-ci.org/redmatrix/hubzilla.svg)](https://travis-ci.org/redmatrix/hubzilla)
+This is red.
\ No newline at end of file

From 4bb90dffc13f8c2252a55ea26466088d70379130 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 17:45:51 -0700
Subject: [PATCH 013/299] update license

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 25c4bf1a3..bb0e40327 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017 the Hubzilla Community
+Copyright (c) 2010-2017 Mike Macgirvin
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

From 1ee76cb5066870db9ea427e00e5c18edfb292496 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 20:54:48 -0700
Subject: [PATCH 014/299] remove more hardwired branding

---
 doc/tutorials/personal_channel.html | 10 ++---
 include/network.php                 | 52 ++++++++++-----------
 include/photos.php                  | 70 +++++++++++++++--------------
 3 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/doc/tutorials/personal_channel.html b/doc/tutorials/personal_channel.html
index f2ad87077..9dbc2aaec 100644
--- a/doc/tutorials/personal_channel.html
+++ b/doc/tutorials/personal_channel.html
@@ -6,7 +6,7 @@ to a personal channel in a natural way.</p>
 <h3 id="Create_a_new_channel">Create a new channel</h3>
 
 <p>When you log in for the first time after registering, you must create a channel. 
-(Alternatively you can load https://grid.reticu.li/new_channel)</p>
+(Alternatively you can visit https://your_website/new_channel)</p>
 
 <p><img class="img-responsive" src="/help/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png" alt="image"></p>
 
@@ -76,7 +76,7 @@ so you can specify exactly who can access this post.</p>
 <h3 id="Use_an_uploaded_image_as_a_channel_cover_photo">Use an uploaded image as a channel cover photo</h3>
 
 <p>One way to add some pizzazz your channel is to add a cover photo that visitors will 
-see when they load your channel page. Hubzilla's integrated cloud file system 
+see when they load your channel page. The integrated cloud file system 
 allows you to choose an existing photo for this purpose.</p>
 
 <p>Visit your photos in the <strong>Photos</strong> app</p>
@@ -99,9 +99,9 @@ channel page will fade in as you scroll down.</p>
 
 <h3 id="Make_a_connection">Make a connection</h3>
 
-<p>Making connections between channels to share things is what Hubzilla is all about. 
+<p>Making connections between channels to share things is what social communications are all about. 
 Making a connection is simple. If you do not already know how to reach a channel's home
-page, you might try a directory search by opening the <strong>Directory</strong> link on the right 
+page, you might try a directory search by opening the <strong>Directory</strong> link from the menu on the right 
 side of the top navbar.</p>
 
 <p><img class="img-responsive" src="/help/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png" alt="image"></p>
@@ -160,4 +160,4 @@ editor by pressing the edit button beside the <strong>Delete</strong> button.</p
 
 <p><img class="img-responsive" src="/help/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png" alt="image"></p>
 
-        
\ No newline at end of file
+        
diff --git a/include/network.php b/include/network.php
index 4d0bc6f0b..bce59d38c 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1611,33 +1611,33 @@ function get_site_info() {
 
 
 
-	$data = Array(
-		'version' => $version,
-		'version_tag' => $tag,
-		'server_role' => Zotlabs\Lib\System::get_server_role(),
-		'commit' => $commit,
-		'url' => z_root(),
-		'plugins' => $visible_plugins,
-		'register_policy' =>  $register_policy[get_config('system','register_policy')],
-		'invitation_only' => intval(get_config('system','invitation_only')),
-		'directory_mode' =>  $directory_mode[get_config('system','directory_mode')],
-		'language' => get_config('system','language'),
-		'rss_connections' => intval(get_config('system','feed_contacts')),
-		'expiration' => $site_expire,
+	$data = [
+		'url'                          => z_root(),
+		'platform'                     => Zotlabs\Lib\System::get_platform_name(),
+		'site_name'                    => (($site_name) ? $site_name : ''),
+		'version'                      => $version,
+		'version_tag'                  => $tag,
+		'server_role'                  => Zotlabs\Lib\System::get_server_role(),
+		'commit'                       => $commit,
+		'plugins'                      => $visible_plugins,
+		'register_policy'              =>  $register_policy[get_config('system','register_policy')],
+		'invitation_only'              => intval(get_config('system','invitation_only')),
+		'directory_mode'               =>  $directory_mode[get_config('system','directory_mode')],
+		'language'                     => get_config('system','language'),
+		'rss_connections'              => intval(get_config('system','feed_contacts')),
+		'expiration'                   => $site_expire,
 		'default_service_restrictions' => $service_class,
-		'locked_features' => $locked_features,
-		'admin' => $admin,
-		'site_name' => (($site_name) ? $site_name : ''),
-		'platform' => Zotlabs\Lib\System::get_platform_name(),
-		'dbdriver' => DBA::$dba->getdriver(),
-		'lastpoll' => get_config('system','lastpoll'),
-		'info' => (($site_info) ? $site_info : ''),
-		'channels_total' => $channels_total_stat,
-		'channels_active_halfyear' => $channels_active_halfyear_stat,
-		'channels_active_monthly' => $channels_active_monthly_stat,
-		'local_posts' => $local_posts_stat,
-		'hide_in_statistics' => $hide_in_statistics
-	);
+		'locked_features'              => $locked_features,
+		'admin'                        => $admin,
+		'dbdriver'                     => DBA::$dba->getdriver(),
+		'lastpoll'                     => get_config('system','lastpoll'),
+		'info'                         => (($site_info) ? $site_info : ''),
+		'channels_total'               => $channels_total_stat,
+		'channels_active_halfyear'     => $channels_active_halfyear_stat,
+		'channels_active_monthly'      => $channels_active_monthly_stat,
+		'local_posts'                  => $local_posts_stat,
+		'hide_in_statistics'           => $hide_in_statistics
+	];
 	return $data;
 }
 
diff --git a/include/photos.php b/include/photos.php
index c0f7dc8c4..68ff32924 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -17,6 +17,7 @@ require_once('include/text.php');
  * @param array $args
  * @return array
  */
+
 function photo_upload($channel, $observer, $args) {
 
 	$ret = array('success' => false);
@@ -28,9 +29,6 @@ function photo_upload($channel, $observer, $args) {
 		return $ret;
 	}
 
-
-//call_hooks('photo_upload_begin', $args);
-
 	/*
 	 * Determine the album to use
 	 */
@@ -90,8 +88,6 @@ function photo_upload($channel, $observer, $args) {
 	} else {
 		$f = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => '');
 
-//		call_hooks('photo_upload_file',$f);
-
 		if (x($f,'src') && x($f,'filesize')) {
 			$src      = $f['src'];
 			$filename = $f['filename'];
@@ -374,38 +370,38 @@ function photo_upload($channel, $observer, $args) {
 	else {
 		$mid = item_message_id();
 
-		$arr = array();
+		$arr = [
+			'aid'             => $account_id,
+			'uid'             => $channel_id,
+			'mid'             => $mid,
+			'parent_mid'      => $mid,
+			'item_hidden'     => $item_hidden,
+			'resource_type'   => 'photo',
+			'resource_id'     => $photo_hash,
+			'owner_xchan'     => $channel['channel_hash'],
+			'author_xchan'    => $observer['xchan_hash'],
+			'title'           => $title,
+			'allow_cid'       => $ac['allow_cid'],
+			'allow_gid'       => $ac['allow_gid'],
+			'deny_cid'        => $ac['deny_cid'],
+			'deny_gid'        => $ac['deny_gid'],
+			'verb'            => ACTIVITY_POST,
+			'obj_type'        => ACTIVITY_OBJ_PHOTO,
+			'obj'             => json_encode($object),
+			'tgt_type'        => ACTIVITY_OBJ_ALBUM,
+			'target'	      => json_encode($target),
+			'item_wall'       => $visible,
+			'item_origin'     => 1,
+			'item_thread_top' => 1,
+			'item_private'    => intval($acl->is_private()),
+			'body'            => $summary
+		];
+
+		$arr['plink']           = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']);
 
 		if($lat && $lon)
 			$arr['coord'] = $lat . ' ' . $lon;
 
-		$arr['aid']             = $account_id;
-		$arr['uid']             = $channel_id;
-		$arr['mid']             = $mid;
-		$arr['parent_mid']      = $mid;
-		$arr['item_hidden']     = $item_hidden;
-		$arr['resource_type']   = 'photo';
-		$arr['resource_id']     = $photo_hash;
-		$arr['owner_xchan']     = $channel['channel_hash'];
-		$arr['author_xchan']    = $observer['xchan_hash'];
-		$arr['title']           = $title;
-		$arr['allow_cid']       = $ac['allow_cid'];
-		$arr['allow_gid']       = $ac['allow_gid'];
-		$arr['deny_cid']        = $ac['deny_cid'];
-		$arr['deny_gid']        = $ac['deny_gid'];
-		$arr['verb']            = ACTIVITY_POST;
-		$arr['obj_type']	    = ACTIVITY_OBJ_PHOTO;
-		$arr['obj']		        = json_encode($object);
-		$arr['tgt_type']        = ACTIVITY_OBJ_ALBUM;
-		$arr['target']	        = json_encode($target);
-		$arr['item_wall']       = 1;
-		$arr['item_origin']     = 1;
-		$arr['item_thread_top'] = 1;
-		$arr['item_private']    = intval($acl->is_private());
-		$arr['plink']           = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']);
-		$arr['body']		= $summary;
-
-
 		// this one is tricky because the item and the photo have the same permissions, those of the photo.
 		// Use the channel read_stream permissions to get the correct public_policy for the item and recalculate the
 		// private flag accordingly. This may cause subtle bugs due to custom permissions roles. We want to use
@@ -451,6 +447,7 @@ function photo_upload($channel, $observer, $args) {
  *   * \e boolean \b success
  *   * \e array \b albums
  */
+
 function photos_albums_list($channel, $observer, $sort_key = 'album', $direction = 'asc') {
 
 	$channel_id     = $channel['channel_id'];
@@ -531,6 +528,7 @@ function photos_album_widget($channelx,$observer,$sortkey = 'album',$direction =
  * @param string $album default empty
  * @return boolean|array
  */
+
 function photos_list_photos($channel, $observer, $album = '') {
 
 	$channel_id     = $channel['channel_id'];
@@ -570,6 +568,7 @@ function photos_list_photos($channel, $observer, $album = '') {
  * @param string $album name of the album
  * @return boolean
  */
+
 function photos_album_exists($channel_id, $album) {
 	$r = q("SELECT id FROM photo WHERE album = '%s' AND uid = %d limit 1",
 		dbesc($album),
@@ -589,6 +588,7 @@ function photos_album_exists($channel_id, $album) {
  * @param string $newname The new name of the album
  * @return bool|array
  */
+
 function photos_album_rename($channel_id, $oldname, $newname) {
 	return q("UPDATE photo SET album = '%s' WHERE album = '%s' AND uid = %d",
 		dbesc($newname),
@@ -607,6 +607,7 @@ function photos_album_rename($channel_id, $oldname, $newname) {
  * @param string $remote_xchan
  * @return string|boolean
  */
+
 function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') {
 
 	if ($remote_xchan) {
@@ -642,6 +643,7 @@ function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') {
  * @param boolean $visible default false
  * @return int item_id
  */
+
 function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
 
 	// Create item container
@@ -697,7 +699,7 @@ function getGps($exifCoord, $hemi) {
 
 function getGpstimestamp($exifCoord) {
 
-    $hours = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0;
+    $hours   = count($exifCoord) > 0 ? gps2Num($exifCoord[0]) : 0;
     $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0;
     $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0;
 

From fc533107ed49735aad5ba39bf02b87ed7ac870b6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 12 Mar 2017 21:55:24 -0700
Subject: [PATCH 015/299] better handling of mimetype security

---
 Zotlabs/Lib/System.php         |  2 --
 Zotlabs/Module/Editwebpage.php |  2 --
 Zotlabs/Module/Item.php        | 23 +++++++----------------
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/Zotlabs/Lib/System.php b/Zotlabs/Lib/System.php
index 865cb9a30..3d5b18506 100644
--- a/Zotlabs/Lib/System.php
+++ b/Zotlabs/Lib/System.php
@@ -54,8 +54,6 @@ class System {
 		return 'https://github.com/redmatrix/hubzilla';
 	}
 
-
-
 	static public function get_server_role() {
 		return 'pro';
 	}
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
index 3d4af107d..97f4a32ff 100644
--- a/Zotlabs/Module/Editwebpage.php
+++ b/Zotlabs/Module/Editwebpage.php
@@ -130,8 +130,6 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 	
 		$layout = $itm[0]['layout_mid'];
 	
-		$tpl = get_markup_template("jot.tpl");
-
 		$rp = 'webpages/' . $which;
 
 		$x = array(
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 4725ecb38..afac1542d 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -480,22 +480,13 @@ class Item extends \Zotlabs\Web\Controller {
 	
 		$execflag = false;
 	
-		if($mimetype !== 'text/bbcode') {
-			$z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
-				intval($profile_uid)
-			);
-			if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
-				if($uid && (get_account_id() == $z[0]['account_id'])) {
-					$execflag = true;
-				}
-				else {
-					notice( t('Executable content type not permitted to this channel.') . EOL);
-					if($api_source)
-						return ( [ 'success' => false, 'message' => 'forbidden content type' ] );	
-					if(x($_REQUEST,'return')) 
-						goaway(z_root() . "/" . $return_path );
-					killme();
-				}
+		$z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id 
+			where channel_id = %d limit 1",
+			intval($profile_uid)
+		);
+		if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
+			if($uid && (intval(get_account_id()) == intval($z[0]['account_id']))) {
+				$execflag = true;
 			}
 		}
 	

From 6c641b1834539c65edb35dd43a6afa7620e73e1c Mon Sep 17 00:00:00 2001
From: zotlabs <root@sillystring.adeis.uow.edu.au>
Date: Tue, 14 Mar 2017 09:09:05 +1100
Subject: [PATCH 016/299] move oauth2 to vendor

---
 composer.json                                 |    3 +-
 composer.lock                                 | 2851 +----------------
 library/oauth2/.gitignore                     |    5 -
 library/oauth2/.travis.yml                    |   30 -
 library/oauth2/phpunit.xml                    |   25 -
 vendor/autoload.php                           |    2 +-
 .../bshaffer/oauth2-server-php}/CHANGELOG.md  |   30 +
 .../bshaffer/oauth2-server-php}/LICENSE       |    0
 .../bshaffer/oauth2-server-php}/README.md     |    0
 .../bshaffer/oauth2-server-php/composer.json  |   34 +
 .../src/OAuth2/Autoloader.php                 |    0
 .../ClientAssertionTypeInterface.php          |    0
 .../OAuth2/ClientAssertionType/HttpBasic.php  |    0
 .../OAuth2/Controller/AuthorizeController.php |    7 +-
 .../AuthorizeControllerInterface.php          |    0
 .../OAuth2/Controller/ResourceController.php  |    2 +-
 .../ResourceControllerInterface.php           |    0
 .../src/OAuth2/Controller/TokenController.php |   35 +-
 .../Controller/TokenControllerInterface.php   |    0
 .../OAuth2/Encryption/EncryptionInterface.php |    0
 .../src/OAuth2/Encryption/FirebaseJwt.php     |    0
 .../src/OAuth2/Encryption/Jwt.php             |    0
 .../OAuth2/GrantType/AuthorizationCode.php    |    4 +-
 .../OAuth2/GrantType/ClientCredentials.php    |    0
 .../OAuth2/GrantType/GrantTypeInterface.php   |    0
 .../src/OAuth2/GrantType/JwtBearer.php        |    0
 .../src/OAuth2/GrantType/RefreshToken.php     |    0
 .../src/OAuth2/GrantType/UserCredentials.php  |    0
 .../OpenID/Controller/AuthorizeController.php |    0
 .../AuthorizeControllerInterface.php          |    0
 .../OpenID/Controller/UserInfoController.php  |    0
 .../UserInfoControllerInterface.php           |    0
 .../OpenID/GrantType/AuthorizationCode.php    |    0
 .../OpenID/ResponseType/AuthorizationCode.php |    0
 .../AuthorizationCodeInterface.php            |    0
 .../OpenID/ResponseType/CodeIdToken.php       |    0
 .../ResponseType/CodeIdTokenInterface.php     |    0
 .../OAuth2/OpenID/ResponseType/IdToken.php    |    0
 .../OpenID/ResponseType/IdTokenInterface.php  |    0
 .../OpenID/ResponseType/IdTokenToken.php      |    0
 .../ResponseType/IdTokenTokenInterface.php    |    0
 .../Storage/AuthorizationCodeInterface.php    |    0
 .../OpenID/Storage/UserClaimsInterface.php    |    0
 .../oauth2-server-php}/src/OAuth2/Request.php |    0
 .../src/OAuth2/RequestInterface.php           |    0
 .../src/OAuth2/Response.php                   |    2 +-
 .../src/OAuth2/ResponseInterface.php          |    0
 .../src/OAuth2/ResponseType/AccessToken.php   |    8 +-
 .../ResponseType/AccessTokenInterface.php     |    0
 .../OAuth2/ResponseType/AuthorizationCode.php |    6 +-
 .../AuthorizationCodeInterface.php            |    0
 .../OAuth2/ResponseType/JwtAccessToken.php    |    0
 .../ResponseType/ResponseTypeInterface.php    |    0
 .../oauth2-server-php}/src/OAuth2/Scope.php   |    0
 .../src/OAuth2/ScopeInterface.php             |    0
 .../oauth2-server-php}/src/OAuth2/Server.php  |   99 +-
 .../OAuth2/Storage/AccessTokenInterface.php   |    0
 .../Storage/AuthorizationCodeInterface.php    |    2 +-
 .../src/OAuth2/Storage/Cassandra.php          |    2 +-
 .../Storage/ClientCredentialsInterface.php    |    0
 .../src/OAuth2/Storage/ClientInterface.php    |    0
 .../src/OAuth2/Storage/CouchbaseDB.php        |    0
 .../src/OAuth2/Storage/DynamoDB.php           |    0
 .../src/OAuth2/Storage/JwtAccessToken.php     |    0
 .../Storage/JwtAccessTokenInterface.php       |    0
 .../src/OAuth2/Storage/JwtBearerInterface.php |    0
 .../src/OAuth2/Storage/Memory.php             |    0
 .../src/OAuth2/Storage/Mongo.php              |   53 +
 .../src/OAuth2/Storage/MongoDB.php            |  380 +++
 .../src/OAuth2/Storage/Pdo.php                |    0
 .../src/OAuth2/Storage/PublicKeyInterface.php |    0
 .../src/OAuth2/Storage/Redis.php              |    0
 .../OAuth2/Storage/RefreshTokenInterface.php  |    2 +-
 .../src/OAuth2/Storage/ScopeInterface.php     |    0
 .../Storage/UserCredentialsInterface.php      |    0
 .../src/OAuth2/TokenType/Bearer.php           |    0
 .../src/OAuth2/TokenType/Mac.php              |    0
 .../OAuth2/TokenType/TokenTypeInterface.php   |    0
 .../test/OAuth2/AutoloadTest.php              |    0
 .../Controller/AuthorizeControllerTest.php    |    0
 .../Controller/ResourceControllerTest.php     |    3 +-
 .../OAuth2/Controller/TokenControllerTest.php |    0
 .../OAuth2/Encryption/FirebaseJwtTest.php     |    0
 .../test/OAuth2/Encryption/JwtTest.php        |    0
 .../GrantType/AuthorizationCodeTest.php       |   16 +
 .../GrantType/ClientCredentialsTest.php       |    0
 .../test/OAuth2/GrantType/ImplicitTest.php    |    0
 .../test/OAuth2/GrantType/JwtBearerTest.php   |    0
 .../OAuth2/GrantType/RefreshTokenTest.php     |    0
 .../OAuth2/GrantType/UserCredentialsTest.php  |    0
 .../Controller/AuthorizeControllerTest.php    |    0
 .../Controller/UserInfoControllerTest.php     |    0
 .../GrantType/AuthorizationCodeTest.php       |    0
 .../OpenID/ResponseType/CodeIdTokenTest.php   |    0
 .../OpenID/ResponseType/IdTokenTest.php       |    0
 .../OpenID/ResponseType/IdTokenTokenTest.php  |    0
 .../OpenID/Storage/AuthorizationCodeTest.php  |    0
 .../OAuth2/OpenID/Storage/UserClaimsTest.php  |    0
 .../test/OAuth2/RequestTest.php               |    0
 .../test/OAuth2/ResponseTest.php              |    0
 .../OAuth2/ResponseType/AccessTokenTest.php   |    0
 .../ResponseType/JwtAccessTokenTest.php       |    0
 .../test/OAuth2/ScopeTest.php                 |    0
 .../test/OAuth2/ServerTest.php                |    0
 .../test/OAuth2/Storage/AccessTokenTest.php   |    0
 .../OAuth2/Storage/AuthorizationCodeTest.php  |    0
 .../OAuth2/Storage/ClientCredentialsTest.php  |    0
 .../test/OAuth2/Storage/ClientTest.php        |    0
 .../test/OAuth2/Storage/DynamoDBTest.php      |    0
 .../OAuth2/Storage/JwtAccessTokenTest.php     |    0
 .../test/OAuth2/Storage/JwtBearerTest.php     |    0
 .../test/OAuth2/Storage/PdoTest.php           |    0
 .../test/OAuth2/Storage/PublicKeyTest.php     |    0
 .../test/OAuth2/Storage/RefreshTokenTest.php  |    0
 .../test/OAuth2/Storage/ScopeTest.php         |    0
 .../OAuth2/Storage/UserCredentialsTest.php    |    0
 .../test/OAuth2/TokenType/BearerTest.php      |    0
 .../oauth2-server-php}/test/bootstrap.php     |    0
 .../oauth2-server-php}/test/cleanup.php       |    0
 .../test/config/keys/id_rsa                   |    0
 .../test/config/keys/id_rsa.pub               |    0
 .../test/config/storage.json                  |    7 +
 .../test/lib/OAuth2/Request/TestRequest.php   |    0
 .../test/lib/OAuth2/Storage/BaseTest.php      |    2 +
 .../test/lib/OAuth2/Storage/Bootstrap.php     |  103 +-
 .../test/lib/OAuth2/Storage/NullStorage.php   |    0
 vendor/composer/ClassLoader.php               |   48 +-
 vendor/composer/LICENSE                       |  444 ++-
 vendor/composer/autoload_classmap.php         |  619 ----
 vendor/composer/autoload_namespaces.php       |    1 +
 vendor/composer/autoload_real.php             |   35 +-
 vendor/composer/installed.json                |   76 +-
 132 files changed, 1324 insertions(+), 3612 deletions(-)
 delete mode 100644 library/oauth2/.gitignore
 delete mode 100644 library/oauth2/.travis.yml
 delete mode 100644 library/oauth2/phpunit.xml
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/CHANGELOG.md (84%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/LICENSE (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/README.md (100%)
 create mode 100644 vendor/bshaffer/oauth2-server-php/composer.json
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Autoloader.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ClientAssertionType/ClientAssertionTypeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ClientAssertionType/HttpBasic.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Controller/AuthorizeController.php (98%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Controller/AuthorizeControllerInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Controller/ResourceController.php (98%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Controller/ResourceControllerInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Controller/TokenController.php (93%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Controller/TokenControllerInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Encryption/EncryptionInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Encryption/FirebaseJwt.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Encryption/Jwt.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/GrantType/AuthorizationCode.php (93%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/GrantType/ClientCredentials.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/GrantType/GrantTypeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/GrantType/JwtBearer.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/GrantType/RefreshToken.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/GrantType/UserCredentials.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/Controller/AuthorizeController.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/Controller/AuthorizeControllerInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/Controller/UserInfoController.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/Controller/UserInfoControllerInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/GrantType/AuthorizationCode.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/ResponseType/AuthorizationCode.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/ResponseType/AuthorizationCodeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/ResponseType/CodeIdToken.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/ResponseType/CodeIdTokenInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/ResponseType/IdToken.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/ResponseType/IdTokenInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/ResponseType/IdTokenToken.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/ResponseType/IdTokenTokenInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/Storage/AuthorizationCodeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/OpenID/Storage/UserClaimsInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Request.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/RequestInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Response.php (99%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ResponseInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ResponseType/AccessToken.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ResponseType/AccessTokenInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ResponseType/AuthorizationCode.php (96%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ResponseType/AuthorizationCodeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ResponseType/JwtAccessToken.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ResponseType/ResponseTypeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Scope.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/ScopeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Server.php (90%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/AccessTokenInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/AuthorizationCodeInterface.php (98%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/Cassandra.php (99%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/ClientCredentialsInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/ClientInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/CouchbaseDB.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/DynamoDB.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/JwtAccessToken.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/JwtAccessTokenInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/JwtBearerInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/Memory.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/Mongo.php (87%)
 create mode 100644 vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/MongoDB.php
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/Pdo.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/PublicKeyInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/Redis.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/RefreshTokenInterface.php (98%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/ScopeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/Storage/UserCredentialsInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/TokenType/Bearer.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/TokenType/Mac.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/src/OAuth2/TokenType/TokenTypeInterface.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/AutoloadTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Controller/AuthorizeControllerTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Controller/ResourceControllerTest.php (98%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Controller/TokenControllerTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Encryption/FirebaseJwtTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Encryption/JwtTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/GrantType/AuthorizationCodeTest.php (92%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/GrantType/ClientCredentialsTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/GrantType/ImplicitTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/GrantType/JwtBearerTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/GrantType/RefreshTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/GrantType/UserCredentialsTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/OpenID/ResponseType/IdTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/OpenID/Storage/AuthorizationCodeTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/OpenID/Storage/UserClaimsTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/RequestTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/ResponseTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/ResponseType/AccessTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/ResponseType/JwtAccessTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/ScopeTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/ServerTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/AccessTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/AuthorizationCodeTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/ClientCredentialsTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/ClientTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/DynamoDBTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/JwtAccessTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/JwtBearerTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/PdoTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/PublicKeyTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/RefreshTokenTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/ScopeTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/Storage/UserCredentialsTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/OAuth2/TokenType/BearerTest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/bootstrap.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/cleanup.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/config/keys/id_rsa (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/config/keys/id_rsa.pub (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/config/storage.json (97%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/lib/OAuth2/Request/TestRequest.php (100%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/lib/OAuth2/Storage/BaseTest.php (92%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/lib/OAuth2/Storage/Bootstrap.php (92%)
 rename {library/oauth2 => vendor/bshaffer/oauth2-server-php}/test/lib/OAuth2/Storage/NullStorage.php (100%)

diff --git a/composer.json b/composer.json
index b59c81bba..e7577c41c 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
 		"ext-openssl" : "*",
 		"sabre/dav" : "~3.2",
 		"michelf/php-markdown" : "^1.7",
-		"pixel418/markdownify": "^2.2"
+		"pixel418/markdownify": "^2.2",
+		"bshaffer/oauth2-server-php": "~1.8"
 	},
 	"require-dev" : {
 		"php" : ">=5.6",
diff --git a/composer.lock b/composer.lock
index 06fb17410..9f19b6f15 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,65 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "c0cafbf9fd702be588f6b392b9742cb6",
+    "hash": "85f6331e3e91b178ea0072065780747b",
+    "content-hash": "5aca7c342f023e1c3377a67c1812f5ff",
     "packages": [
+        {
+            "name": "bshaffer/oauth2-server-php",
+            "version": "v1.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bshaffer/oauth2-server-php.git",
+                "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/8856aed1a98d6da596ae3f9b8095b5c7a1581697",
+                "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "~2.8",
+                "firebase/php-jwt": "~2.2",
+                "mongodb/mongodb": "^1.1",
+                "predis/predis": "dev-master",
+                "thobbs/phpcassa": "dev-master"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage",
+                "firebase/php-jwt": "~1.1 is required to use MondoDB storage",
+                "predis/predis": "Required to use Redis storage",
+                "thobbs/phpcassa": "Required to use Cassandra storage"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "OAuth2": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brent Shaffer",
+                    "email": "bshafs@gmail.com",
+                    "homepage": "http://brentertainment.com"
+                }
+            ],
+            "description": "OAuth2 Server for PHP",
+            "homepage": "http://github.com/bshaffer/oauth2-server-php",
+            "keywords": [
+                "auth",
+                "oauth",
+                "oauth2"
+            ],
+            "time": "2017-01-06 23:20:00"
+        },
         {
             "name": "michelf/php-markdown",
             "version": "1.7.0",
@@ -55,7 +112,7 @@
             "keywords": [
                 "markdown"
             ],
-            "time": "2016-10-29T18:58:20+00:00"
+            "time": "2016-10-29 18:58:20"
         },
         {
             "name": "pixel418/markdownify",
@@ -111,7 +168,7 @@
                 "markdown",
                 "markdownify"
             ],
-            "time": "2016-09-21T13:01:43+00:00"
+            "time": "2016-09-21 13:01:43"
         },
         {
             "name": "psr/log",
@@ -158,7 +215,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2016-10-10 12:19:37"
         },
         {
             "name": "sabre/dav",
@@ -241,7 +298,7 @@
                 "framework",
                 "iCalendar"
             ],
-            "time": "2016-06-28T02:44:05+00:00"
+            "time": "2016-06-28 02:44:05"
         },
         {
             "name": "sabre/event",
@@ -298,7 +355,7 @@
                 "promise",
                 "signal"
             ],
-            "time": "2015-11-05T20:14:39+00:00"
+            "time": "2015-11-05 20:14:39"
         },
         {
             "name": "sabre/http",
@@ -353,7 +410,7 @@
             "keywords": [
                 "http"
             ],
-            "time": "2016-01-06T23:00:08+00:00"
+            "time": "2016-01-06 23:00:08"
         },
         {
             "name": "sabre/uri",
@@ -404,7 +461,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-03-08T02:29:27+00:00"
+            "time": "2016-03-08 02:29:27"
         },
         {
             "name": "sabre/vobject",
@@ -501,7 +558,7 @@
                 "xCal",
                 "xCard"
             ],
-            "time": "2016-07-15T19:52:17+00:00"
+            "time": "2016-07-15 19:52:17"
         },
         {
             "name": "sabre/xml",
@@ -564,2778 +621,10 @@
                 "dom",
                 "xml"
             ],
-            "time": "2016-10-09T22:57:52+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "behat/behat",
-            "version": "v3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Behat.git",
-                "reference": "15a3a1857457eaa29cdf41564a5e421effb09526"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Behat/zipball/15a3a1857457eaa29cdf41564a5e421effb09526",
-                "reference": "15a3a1857457eaa29cdf41564a5e421effb09526",
-                "shasum": ""
-            },
-            "require": {
-                "behat/gherkin": "^4.4.4",
-                "behat/transliterator": "~1.0",
-                "container-interop/container-interop": "^1.1",
-                "ext-mbstring": "*",
-                "php": ">=5.3.3",
-                "symfony/class-loader": "~2.1||~3.0",
-                "symfony/config": "~2.3||~3.0",
-                "symfony/console": "~2.5||~3.0",
-                "symfony/dependency-injection": "~2.1||~3.0",
-                "symfony/event-dispatcher": "~2.1||~3.0",
-                "symfony/translation": "~2.3||~3.0",
-                "symfony/yaml": "~2.1||~3.0"
-            },
-            "require-dev": {
-                "herrera-io/box": "~1.6.1",
-                "phpunit/phpunit": "~4.5",
-                "symfony/process": "~2.5|~3.0"
-            },
-            "suggest": {
-                "behat/mink-extension": "for integration with Mink testing framework",
-                "behat/symfony2-extension": "for integration with Symfony2 web framework",
-                "behat/yii-extension": "for integration with Yii web framework"
-            },
-            "bin": [
-                "bin/behat"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Behat": "src/",
-                    "Behat\\Testwork": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Scenario-oriented BDD framework for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "Agile",
-                "BDD",
-                "ScenarioBDD",
-                "Scrum",
-                "StoryBDD",
-                "User story",
-                "business",
-                "development",
-                "documentation",
-                "examples",
-                "symfony",
-                "testing"
-            ],
-            "time": "2016-12-25T13:43:52+00:00"
-        },
-        {
-            "name": "behat/gherkin",
-            "version": "v4.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
-                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3",
-                "symfony/yaml": "~2.3|~3"
-            },
-            "suggest": {
-                "symfony/yaml": "If you want to parse features, represented in YAML files"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Gherkin": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Gherkin DSL parser for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "Cucumber",
-                "DSL",
-                "gherkin",
-                "parser"
-            ],
-            "time": "2016-10-30T11:50:56+00:00"
-        },
-        {
-            "name": "behat/mink",
-            "version": "v1.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/Mink.git",
-                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9",
-                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1",
-                "symfony/css-selector": "~2.1|~3.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7|~3.0"
-            },
-            "suggest": {
-                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
-                "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
-                "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Behat\\Mink\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Browser controller/emulator abstraction for PHP",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "browser",
-                "testing",
-                "web"
-            ],
-            "time": "2016-03-05T08:26:18+00:00"
-        },
-        {
-            "name": "behat/mink-browserkit-driver",
-            "version": "v1.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
-                "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/10e67fb4a295efcd62ea0bf16025a85ea19534fb",
-                "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb",
-                "shasum": ""
-            },
-            "require": {
-                "behat/mink": "^1.7.1@dev",
-                "php": ">=5.3.6",
-                "symfony/browser-kit": "~2.3|~3.0",
-                "symfony/dom-crawler": "~2.3|~3.0"
-            },
-            "require-dev": {
-                "silex/silex": "~1.2",
-                "symfony/phpunit-bridge": "~2.7|~3.0"
-            },
-            "type": "mink-driver",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Behat\\Mink\\Driver\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Symfony2 BrowserKit driver for Mink framework",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "Mink",
-                "Symfony2",
-                "browser",
-                "testing"
-            ],
-            "time": "2016-03-05T08:59:47+00:00"
-        },
-        {
-            "name": "behat/mink-extension",
-            "version": "v2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/MinkExtension.git",
-                "reference": "5b4bda64ff456104564317e212c823e45cad9d59"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/5b4bda64ff456104564317e212c823e45cad9d59",
-                "reference": "5b4bda64ff456104564317e212c823e45cad9d59",
-                "shasum": ""
-            },
-            "require": {
-                "behat/behat": "~3.0,>=3.0.5",
-                "behat/mink": "~1.5",
-                "php": ">=5.3.2",
-                "symfony/config": "~2.2|~3.0"
-            },
-            "require-dev": {
-                "behat/mink-goutte-driver": "~1.1",
-                "phpspec/phpspec": "~2.0"
-            },
-            "type": "behat-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\MinkExtension": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christophe Coevoet",
-                    "email": "stof@notk.org"
-                },
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com"
-                }
-            ],
-            "description": "Mink extension for Behat",
-            "homepage": "http://extensions.behat.org/mink",
-            "keywords": [
-                "browser",
-                "gui",
-                "test",
-                "web"
-            ],
-            "time": "2016-02-15T07:55:18+00:00"
-        },
-        {
-            "name": "behat/mink-goutte-driver",
-            "version": "v1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/MinkGoutteDriver.git",
-                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
-                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
-                "shasum": ""
-            },
-            "require": {
-                "behat/mink": "~1.6@dev",
-                "behat/mink-browserkit-driver": "~1.2@dev",
-                "fabpot/goutte": "~1.0.4|~2.0|~3.1",
-                "php": ">=5.3.1"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7|~3.0"
-            },
-            "type": "mink-driver",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Behat\\Mink\\Driver\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Goutte driver for Mink framework",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "browser",
-                "goutte",
-                "headless",
-                "testing"
-            ],
-            "time": "2016-03-05T09:04:22+00:00"
-        },
-        {
-            "name": "behat/transliterator",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Transliterator.git",
-                "reference": "868e05be3a9f25ba6424c2dd4849567f50715003"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/868e05be3a9f25ba6424c2dd4849567f50715003",
-                "reference": "868e05be3a9f25ba6424c2dd4849567f50715003",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Transliterator": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Artistic-1.0"
-            ],
-            "description": "String transliterator",
-            "keywords": [
-                "i18n",
-                "slug",
-                "transliterator"
-            ],
-            "time": "2015-09-28T16:26:35+00:00"
-        },
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/container": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14T19:40:03+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14T21:17:01+00:00"
-        },
-        {
-            "name": "fabpot/goutte",
-            "version": "v3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/Goutte.git",
-                "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/db5c28f4a010b4161d507d5304e28a7ebf211638",
-                "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "^6.0",
-                "php": ">=5.5.0",
-                "symfony/browser-kit": "~2.1|~3.0",
-                "symfony/css-selector": "~2.1|~3.0",
-                "symfony/dom-crawler": "~2.1|~3.0"
-            },
-            "type": "application",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Goutte\\": "Goutte"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "A simple PHP Web Scraper",
-            "homepage": "https://github.com/FriendsOfPHP/Goutte",
-            "keywords": [
-                "scraper"
-            ],
-            "time": "2017-01-03T13:21:43+00:00"
-        },
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "6.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
-                "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.3.1",
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "^4.0",
-                "psr/log": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.2-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2016-10-08T15:01:37+00:00"
-        },
-        {
-            "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle promises library",
-            "keywords": [
-                "promise"
-            ],
-            "time": "2016-12-20T10:07:11+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "04a6d1a00ea5da0727ee94309a9f0d3dbaecb569"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/04a6d1a00ea5da0727ee94309a9f0d3dbaecb569",
-                "reference": "04a6d1a00ea5da0727ee94309a9f0d3dbaecb569",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
-            "keywords": [
-                "http",
-                "message",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
-            ],
-            "time": "2017-02-21T01:20:32+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "doctrine/collections": "1.*",
-                "phpunit/phpunit": "~4.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "homepage": "https://github.com/myclabs/DeepCopy",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2017-01-26T22:05:40+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2015-12-27T11:43:31+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
-                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.2.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2016-09-30T07:12:33+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
-                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2016-11-25T06:54:22+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.6.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
-                "sebastian/recursion-context": "^1.0|^2.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.0",
-                "phpunit/phpunit": "^4.8 || ^5.6.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2016-11-21T14:58:47+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "4.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ca060f645beeddebedb1885c97bf163e93264c35"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca060f645beeddebedb1885c97bf163e93264c35",
-                "reference": "ca060f645beeddebedb1885c97bf163e93264c35",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
-                "sebastian/code-unit-reverse-lookup": "~1.0",
-                "sebastian/environment": "^1.3.2 || ^2.0",
-                "sebastian/version": "~1.0|~2.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "^5.4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.4.0",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2017-02-23T07:38:02+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2016-10-03T07:40:28+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4|~5"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2016-05-12T18:03:57+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "284fb0679dd25fb5ffb56dad92c72860c0a22f1b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/284fb0679dd25fb5ffb56dad92c72860c0a22f1b",
-                "reference": "284fb0679dd25fb5ffb56dad92c72860c0a22f1b",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2017-02-23T06:14:45+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "5.7.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4906b8faf23e42612182fd212eb6f4c0f2954b57",
-                "reference": "4906b8faf23e42612182fd212eb6f4c0f2954b57",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "myclabs/deep-copy": "~1.3",
-                "php": "^5.6 || ^7.0",
-                "phpspec/prophecy": "^1.6.2",
-                "phpunit/php-code-coverage": "^4.0.4",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^3.2",
-                "sebastian/comparator": "^1.2.4",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "^1.3.4 || ^2.0",
-                "sebastian/exporter": "~2.0",
-                "sebastian/global-state": "^1.1",
-                "sebastian/object-enumerator": "~2.0",
-                "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "~1.0.3|~2.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2"
-            },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
-            "suggest": {
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.7.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2017-02-19T07:22:16+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "3.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
-                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-text-template": "^1.2",
-                "sebastian/exporter": "^1.2 || ^2.0"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2016-12-08T20:27:08+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "time": "2017-02-14T16:28:37+00:00"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2016-08-06T14:39:51+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2016-02-13T06:45:14+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2017-01-29T09:50:25+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-12-08T07:14:41+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
-                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-11-26T07:53:53+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
-                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~2.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-11-19T08:54:04+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12T03:26:01+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
-                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6",
-                "sebastian/recursion-context": "~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-02-18T15:18:39+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
-                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-11-19T07:33:16+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
-        },
-        {
-            "name": "symfony/browser-kit",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "394a2475a3a89089353fde5714a7f402fbb83880"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/394a2475a3a89089353fde5714a7f402fbb83880",
-                "reference": "394a2475a3a89089353fde5714a7f402fbb83880",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/dom-crawler": "~2.8|~3.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\BrowserKit\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony BrowserKit Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-31T21:49:23+00:00"
-        },
-        {
-            "name": "symfony/class-loader",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/class-loader.git",
-                "reference": "2847d56f518ad5721bf85aa9174b3aa3fd12aa03"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/2847d56f518ad5721bf85aa9174b3aa3fd12aa03",
-                "reference": "2847d56f518ad5721bf85aa9174b3aa3fd12aa03",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "require-dev": {
-                "symfony/finder": "~2.8|~3.0",
-                "symfony/polyfill-apcu": "~1.1"
-            },
-            "suggest": {
-                "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\ClassLoader\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony ClassLoader Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-21T17:06:35+00:00"
-        },
-        {
-            "name": "symfony/config",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/config.git",
-                "reference": "9f99453e77771e629af8a25eeb0a6c4ed1e19da2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/9f99453e77771e629af8a25eeb0a6c4ed1e19da2",
-                "reference": "9f99453e77771e629af8a25eeb0a6c4ed1e19da2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/filesystem": "~2.8|~3.0"
-            },
-            "require-dev": {
-                "symfony/yaml": "~3.0"
-            },
-            "suggest": {
-                "symfony/yaml": "To use the yaml reference dumper"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Config\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Config Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-02-14T16:27:43+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
-                "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/debug": "~2.8|~3.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/filesystem": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/filesystem": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-02-16T14:07:22+00:00"
-        },
-        {
-            "name": "symfony/css-selector",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
-                "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:32:22+00:00"
-        },
-        {
-            "name": "symfony/debug",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug.git",
-                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
-                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "psr/log": "~1.0"
-            },
-            "conflict": {
-                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
-            },
-            "require-dev": {
-                "symfony/class-loader": "~2.8|~3.0",
-                "symfony/http-kernel": "~2.8|~3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Debug\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Debug Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-02-16T16:34:18+00:00"
-        },
-        {
-            "name": "symfony/dependency-injection",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "130aa55b8ed7e6d0d75b0ed37256cec687a22f41"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/130aa55b8ed7e6d0d75b0ed37256cec687a22f41",
-                "reference": "130aa55b8ed7e6d0d75b0ed37256cec687a22f41",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "conflict": {
-                "symfony/yaml": "<3.2"
-            },
-            "require-dev": {
-                "symfony/config": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/yaml": "~3.2"
-            },
-            "suggest": {
-                "symfony/config": "",
-                "symfony/expression-language": "For using expressions in service container configuration",
-                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DependencyInjection\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DependencyInjection Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-02-16T22:46:52+00:00"
-        },
-        {
-            "name": "symfony/dom-crawler",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "b814b41373fc4e535aff8c765abe39545216f391"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b814b41373fc4e535aff8c765abe39545216f391",
-                "reference": "b814b41373fc4e535aff8c765abe39545216f391",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/css-selector": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DomCrawler\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DomCrawler Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-21T17:14:11+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9137eb3a3328e413212826d63eeeb0217836e2b6",
-                "reference": "9137eb3a3328e413212826d63eeeb0217836e2b6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/dependency-injection": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/stopwatch": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-02T20:32:22+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "a0c6ef2dc78d33b58d91d3a49f49797a184d06f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/a0c6ef2dc78d33b58d91d3a49f49797a184d06f4",
-                "reference": "a0c6ef2dc78d33b58d91d3a49f49797a184d06f4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-01-08T20:47:33+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-11-14T01:06:16+00:00"
-        },
-        {
-            "name": "symfony/translation",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/translation.git",
-                "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/d6825c6bb2f1da13f564678f9f236fe8242c0029",
-                "reference": "d6825c6bb2f1da13f564678f9f236fe8242c0029",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "conflict": {
-                "symfony/config": "<2.8"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/intl": "~2.8|~3.0",
-                "symfony/yaml": "~2.8|~3.0"
-            },
-            "suggest": {
-                "psr/log": "To use logging capability in translator",
-                "symfony/config": "",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Translation\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Translation Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-02-16T22:46:52+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
-                "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "require-dev": {
-                "symfony/console": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-02-16T22:46:52+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
-                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2016-11-23T20:04:58+00:00"
+            "time": "2016-10-09 22:57:52"
         }
     ],
+    "packages-dev": null,
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
@@ -3353,7 +642,5 @@
         "ext-xml": "*",
         "ext-openssl": "*"
     },
-    "platform-dev": {
-        "php": ">=5.6"
-    }
+    "platform-dev": []
 }
diff --git a/library/oauth2/.gitignore b/library/oauth2/.gitignore
deleted file mode 100644
index c43a667d4..000000000
--- a/library/oauth2/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Test Files #
-test/config/test.sqlite
-vendor
-composer.lock
-.idea
diff --git a/library/oauth2/.travis.yml b/library/oauth2/.travis.yml
deleted file mode 100644
index dd4aae4a6..000000000
--- a/library/oauth2/.travis.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-language: php
-sudo: false
-cache:
-  directories:
-    - $HOME/.composer/cache
-    - vendor
-php:
-- 5.3
-- 5.4
-- 5.5
-- 5.6
-- 7
-- hhvm
-env:
-  global:
-  - SKIP_MONGO_TESTS=1
-  - secure: Bc5ZqvZ1YYpoPZNNuU2eCB8DS6vBYrAdfBtTenBs5NSxzb+Vjven4kWakbzaMvZjb/Ib7Uph7DGuOtJXpmxnvBXPLd707LZ89oFWN/yqQlZKCcm8iErvJCB5XL+/ONHj2iPdR242HJweMcat6bMCwbVWoNDidjtWMH0U2mYFy3M=
-  - secure: R3bXlymyFiY2k2jf7+fv/J8i34wtXTkmD4mCr5Ps/U+vn9axm2VtvR2Nj+r7LbRjn61gzFE/xIVjYft/wOyBOYwysrfriydrnRVS0owh6y+7EyOyQWbRX11vVQMf8o31QCQE5BY58V5AJZW3MjoOL0FVlTgySJiJvdw6Pv18v+E=
-services:
-- mongodb
-- redis-server
-- cassandra
-before_install:
-- phpenv config-rm xdebug.ini || return 0
-install:
-- composer install --no-interaction
-before_script:
-- psql -c 'create database oauth2_server_php;' -U postgres
-after_script:
-- php test/cleanup.php
diff --git a/library/oauth2/phpunit.xml b/library/oauth2/phpunit.xml
deleted file mode 100644
index e36403f0a..000000000
--- a/library/oauth2/phpunit.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="test/bootstrap.php"
->
-  <testsuites>
-    <testsuite name="Oauth2 Test Suite">
-      <directory>./test/OAuth2/</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">./src/OAuth2/</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 8b4926c3d..063a1b7e1 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__ . '/composer' . '/autoload_real.php';
 
 return ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d::getLoader();
diff --git a/library/oauth2/CHANGELOG.md b/vendor/bshaffer/oauth2-server-php/CHANGELOG.md
similarity index 84%
rename from library/oauth2/CHANGELOG.md
rename to vendor/bshaffer/oauth2-server-php/CHANGELOG.md
index 03d925e06..4fddd72c9 100644
--- a/library/oauth2/CHANGELOG.md
+++ b/vendor/bshaffer/oauth2-server-php/CHANGELOG.md
@@ -8,6 +8,23 @@ To see the files changed for a given bug, go to https://github.com/bshaffer/oaut
 To get the diff between two versions, go to https://github.com/bshaffer/oauth2-server-php/compare/v1.0...v1.1
 To get the diff for a specific change, go to https://github.com/bshaffer/oauth2-server-php/commit/XXX where XXX is the change hash
 
+* 1.9.0 (2016-01-06)
+
+  PR: https://github.com/bshaffer/oauth2-server-php/pull/788
+
+  * bug #645 - Allow null for client_secret
+  * bug #651 - Fix bug in isPublicClient of Cassandra Storage
+  * bug #670 - Bug in client's scope restriction
+  * bug #672 - Implemented method to override the password hashing algorithm
+  * bug #698 - Fix Token Response's Content-Type to application/json
+  * bug #729 - Ensures unsetAccessToken and unsetRefreshToken return a bool
+  * bug #749 - Fix UserClaims for CodeIdToken
+  * bug #784 - RFC6750 compatibility
+  * bug #776 - Fix "redirect_uri_mismatch" for URIs with encoded characters
+  * bug #759 - no access token supplied to resource controller results in empty request body
+  * bug #773 - Use OpenSSL random method before attempting Mcrypt's.
+  * bug #790 - Add mongo db
+
 * 1.8.0 (2015-09-18)
 
   PR: https://github.com/bshaffer/oauth2-server-php/pull/643
@@ -93,6 +110,19 @@ To get the diff for a specific change, go to https://github.com/bshaffer/oauth2-
   * bug #333 fixes Pdo storage for getClientKey
   * bug #336 fixes Redis storage for expireAuthorizationCode
 
+* 1.3 (2014-02-27)
+
+  PR: https://github.com/bshaffer/oauth2-server-php/pull/325
+
+  * bug #311 adds cassandra storage
+  * bug #298 fixes response code for user credentials grant type
+  * bug #318 adds 'use_crypto_tokens' config to Server class for better DX
+  * bug #320 pass client_id to getDefaultScope
+  * bug #324 better feedback when running tests
+  * bug #335 adds support for non-expiring refresh tokens
+  * bug #333 fixes Pdo storage for getClientKey
+  * bug #336 fixes Redis storage for expireAuthorizationCode
+
 * 1.2 (2014-01-03)
 
   PR: https://github.com/bshaffer/oauth2-server-php/pull/288
diff --git a/library/oauth2/LICENSE b/vendor/bshaffer/oauth2-server-php/LICENSE
similarity index 100%
rename from library/oauth2/LICENSE
rename to vendor/bshaffer/oauth2-server-php/LICENSE
diff --git a/library/oauth2/README.md b/vendor/bshaffer/oauth2-server-php/README.md
similarity index 100%
rename from library/oauth2/README.md
rename to vendor/bshaffer/oauth2-server-php/README.md
diff --git a/vendor/bshaffer/oauth2-server-php/composer.json b/vendor/bshaffer/oauth2-server-php/composer.json
new file mode 100644
index 000000000..561699f5e
--- /dev/null
+++ b/vendor/bshaffer/oauth2-server-php/composer.json
@@ -0,0 +1,34 @@
+{
+    "name": "bshaffer/oauth2-server-php",
+    "description":"OAuth2 Server for PHP",
+    "keywords":["oauth","oauth2","auth"],
+    "type":"library",
+    "license":"MIT",
+    "authors":[
+        {
+            "name":"Brent Shaffer",
+            "email": "bshafs@gmail.com",
+            "homepage":"http://brentertainment.com"
+        }
+    ],
+    "homepage": "http://github.com/bshaffer/oauth2-server-php",
+    "autoload": {
+        "psr-0": { "OAuth2": "src/" }
+    },
+    "require":{
+        "php":">=5.3.9"
+    },
+    "require-dev": {
+        "aws/aws-sdk-php": "~2.8",
+        "firebase/php-jwt": "~2.2",
+        "predis/predis": "dev-master",
+        "thobbs/phpcassa": "dev-master",
+        "mongodb/mongodb": "^1.1"
+    },
+    "suggest": {
+        "predis/predis": "Required to use Redis storage",
+        "thobbs/phpcassa": "Required to use Cassandra storage",
+        "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage",
+        "firebase/php-jwt": "~1.1 is required to use MondoDB storage"
+    }
+}
diff --git a/library/oauth2/src/OAuth2/Autoloader.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Autoloader.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Autoloader.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Autoloader.php
diff --git a/library/oauth2/src/OAuth2/ClientAssertionType/ClientAssertionTypeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ClientAssertionType/ClientAssertionTypeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ClientAssertionType/ClientAssertionTypeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ClientAssertionType/ClientAssertionTypeInterface.php
diff --git a/library/oauth2/src/OAuth2/ClientAssertionType/HttpBasic.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ClientAssertionType/HttpBasic.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ClientAssertionType/HttpBasic.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ClientAssertionType/HttpBasic.php
diff --git a/library/oauth2/src/OAuth2/Controller/AuthorizeController.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/AuthorizeController.php
similarity index 98%
rename from library/oauth2/src/OAuth2/Controller/AuthorizeController.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/AuthorizeController.php
index a9a722587..ea7f54a87 100644
--- a/library/oauth2/src/OAuth2/Controller/AuthorizeController.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/AuthorizeController.php
@@ -126,6 +126,11 @@ class AuthorizeController implements AuthorizeControllerInterface
         return $params;
     }
 
+    /**
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
     public function validateAuthorizeRequest(RequestInterface $request, ResponseInterface $response)
     {
         // Make sure a valid client id was supplied (we can not redirect because we were unable to verify the URI)
@@ -333,7 +338,7 @@ class AuthorizeController implements AuthorizeControllerInterface
             return false; // if either one is missing, assume INVALID
         }
 
-        $registered_uris = explode(' ', $registeredUriString);
+        $registered_uris = preg_split('/\s+/', $registeredUriString);
         foreach ($registered_uris as $registered_uri) {
             if ($this->config['require_exact_redirect_uri']) {
                 // the input uri is validated against the registered uri using exact match
diff --git a/library/oauth2/src/OAuth2/Controller/AuthorizeControllerInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/AuthorizeControllerInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Controller/AuthorizeControllerInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/AuthorizeControllerInterface.php
diff --git a/library/oauth2/src/OAuth2/Controller/ResourceController.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceController.php
similarity index 98%
rename from library/oauth2/src/OAuth2/Controller/ResourceController.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceController.php
index e8588188f..3cfaaaf12 100644
--- a/library/oauth2/src/OAuth2/Controller/ResourceController.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceController.php
@@ -83,7 +83,7 @@ class ResourceController implements ResourceControllerInterface
             } elseif (!isset($token["expires"]) || !isset($token["client_id"])) {
                 $response->setError(401, 'malformed_token', 'Malformed token (missing "expires")');
             } elseif (time() > $token["expires"]) {
-                $response->setError(401, 'expired_token', 'The access token provided has expired');
+                $response->setError(401, 'invalid_token', 'The access token provided has expired');
             } else {
                 return $token;
             }
diff --git a/library/oauth2/src/OAuth2/Controller/ResourceControllerInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceControllerInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Controller/ResourceControllerInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceControllerInterface.php
diff --git a/library/oauth2/src/OAuth2/Controller/TokenController.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/TokenController.php
similarity index 93%
rename from library/oauth2/src/OAuth2/Controller/TokenController.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/TokenController.php
index 42dab892f..5d2d731fe 100644
--- a/library/oauth2/src/OAuth2/Controller/TokenController.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/TokenController.php
@@ -12,14 +12,33 @@ use OAuth2\RequestInterface;
 use OAuth2\ResponseInterface;
 
 /**
- * @see OAuth2\Controller\TokenControllerInterface
+ * @see \OAuth2\Controller\TokenControllerInterface
  */
 class TokenController implements TokenControllerInterface
 {
+    /**
+     * @var AccessTokenInterface
+     */
     protected $accessToken;
+
+    /**
+     * @var array
+     */
     protected $grantTypes;
+
+    /**
+     * @var ClientAssertionTypeInterface
+     */
     protected $clientAssertionType;
+
+    /**
+     * @var Scope|ScopeInterface
+     */
     protected $scopeUtil;
+
+    /**
+     * @var ClientInterface
+     */
     protected $clientStorage;
 
     public function __construct(AccessTokenInterface $accessToken, ClientInterface $clientStorage, array $grantTypes = array(), ClientAssertionTypeInterface $clientAssertionType = null, ScopeInterface $scopeUtil = null)
@@ -64,11 +83,11 @@ class TokenController implements TokenControllerInterface
      * This would be called from the "/token" endpoint as defined in the spec.
      * You can call your endpoint whatever you want.
      *
-     * @param $request - RequestInterface
-     * Request object to grant access token
+     * @param RequestInterface $request Request object to grant access token
+     * @param ResponseInterface $response
      *
-     * @throws InvalidArgumentException
-     * @throws LogicException
+     * @throws \InvalidArgumentException
+     * @throws \LogicException
      *
      * @see http://tools.ietf.org/html/rfc6749#section-4
      * @see http://tools.ietf.org/html/rfc6749#section-10.6
@@ -208,10 +227,8 @@ class TokenController implements TokenControllerInterface
     /**
      * addGrantType
      *
-     * @param grantType - OAuth2\GrantTypeInterface
-     * the grant type to add for the specified identifier
-     * @param identifier - string
-     * a string passed in as "grant_type" in the response that will call this grantType
+     * @param GrantTypeInterface $grantType the grant type to add for the specified identifier
+     * @param string $identifier a string passed in as "grant_type" in the response that will call this grantType
      */
     public function addGrantType(GrantTypeInterface $grantType, $identifier = null)
     {
diff --git a/library/oauth2/src/OAuth2/Controller/TokenControllerInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/TokenControllerInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Controller/TokenControllerInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/TokenControllerInterface.php
diff --git a/library/oauth2/src/OAuth2/Encryption/EncryptionInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Encryption/EncryptionInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Encryption/EncryptionInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Encryption/EncryptionInterface.php
diff --git a/library/oauth2/src/OAuth2/Encryption/FirebaseJwt.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Encryption/FirebaseJwt.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Encryption/FirebaseJwt.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Encryption/FirebaseJwt.php
diff --git a/library/oauth2/src/OAuth2/Encryption/Jwt.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Encryption/Jwt.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Encryption/Jwt.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Encryption/Jwt.php
diff --git a/library/oauth2/src/OAuth2/GrantType/AuthorizationCode.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/AuthorizationCode.php
similarity index 93%
rename from library/oauth2/src/OAuth2/GrantType/AuthorizationCode.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/AuthorizationCode.php
index e8995204c..cae9f787d 100644
--- a/library/oauth2/src/OAuth2/GrantType/AuthorizationCode.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/AuthorizationCode.php
@@ -17,7 +17,7 @@ class AuthorizationCode implements GrantTypeInterface
     protected $authCode;
 
     /**
-     * @param OAuth2\Storage\AuthorizationCodeInterface $storage REQUIRED Storage class for retrieving authorization code information
+     * @param \OAuth2\Storage\AuthorizationCodeInterface $storage REQUIRED Storage class for retrieving authorization code information
      */
     public function __construct(AuthorizationCodeInterface $storage)
     {
@@ -49,7 +49,7 @@ class AuthorizationCode implements GrantTypeInterface
          * @uri - http://tools.ietf.org/html/rfc6749#section-4.1.3
          */
         if (isset($authCode['redirect_uri']) && $authCode['redirect_uri']) {
-            if (!$request->request('redirect_uri') || urldecode($request->request('redirect_uri')) != $authCode['redirect_uri']) {
+            if (!$request->request('redirect_uri') || urldecode($request->request('redirect_uri')) != urldecode($authCode['redirect_uri'])) {
                 $response->setError(400, 'redirect_uri_mismatch', "The redirect URI is missing or do not match", "#section-4.1.3");
 
                 return false;
diff --git a/library/oauth2/src/OAuth2/GrantType/ClientCredentials.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/ClientCredentials.php
similarity index 100%
rename from library/oauth2/src/OAuth2/GrantType/ClientCredentials.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/ClientCredentials.php
diff --git a/library/oauth2/src/OAuth2/GrantType/GrantTypeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/GrantTypeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/GrantType/GrantTypeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/GrantTypeInterface.php
diff --git a/library/oauth2/src/OAuth2/GrantType/JwtBearer.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/JwtBearer.php
similarity index 100%
rename from library/oauth2/src/OAuth2/GrantType/JwtBearer.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/JwtBearer.php
diff --git a/library/oauth2/src/OAuth2/GrantType/RefreshToken.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/RefreshToken.php
similarity index 100%
rename from library/oauth2/src/OAuth2/GrantType/RefreshToken.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/RefreshToken.php
diff --git a/library/oauth2/src/OAuth2/GrantType/UserCredentials.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/UserCredentials.php
similarity index 100%
rename from library/oauth2/src/OAuth2/GrantType/UserCredentials.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/GrantType/UserCredentials.php
diff --git a/library/oauth2/src/OAuth2/OpenID/Controller/AuthorizeController.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Controller/AuthorizeController.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/Controller/AuthorizeController.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Controller/AuthorizeController.php
diff --git a/library/oauth2/src/OAuth2/OpenID/Controller/AuthorizeControllerInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Controller/AuthorizeControllerInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/Controller/AuthorizeControllerInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Controller/AuthorizeControllerInterface.php
diff --git a/library/oauth2/src/OAuth2/OpenID/Controller/UserInfoController.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Controller/UserInfoController.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/Controller/UserInfoController.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Controller/UserInfoController.php
diff --git a/library/oauth2/src/OAuth2/OpenID/Controller/UserInfoControllerInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Controller/UserInfoControllerInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/Controller/UserInfoControllerInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Controller/UserInfoControllerInterface.php
diff --git a/library/oauth2/src/OAuth2/OpenID/GrantType/AuthorizationCode.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/GrantType/AuthorizationCode.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/GrantType/AuthorizationCode.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/GrantType/AuthorizationCode.php
diff --git a/library/oauth2/src/OAuth2/OpenID/ResponseType/AuthorizationCode.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/AuthorizationCode.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/ResponseType/AuthorizationCode.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/AuthorizationCode.php
diff --git a/library/oauth2/src/OAuth2/OpenID/ResponseType/AuthorizationCodeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/AuthorizationCodeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/ResponseType/AuthorizationCodeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/AuthorizationCodeInterface.php
diff --git a/library/oauth2/src/OAuth2/OpenID/ResponseType/CodeIdToken.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/CodeIdToken.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/ResponseType/CodeIdToken.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/CodeIdToken.php
diff --git a/library/oauth2/src/OAuth2/OpenID/ResponseType/CodeIdTokenInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/CodeIdTokenInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/ResponseType/CodeIdTokenInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/CodeIdTokenInterface.php
diff --git a/library/oauth2/src/OAuth2/OpenID/ResponseType/IdToken.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/IdToken.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/ResponseType/IdToken.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/IdToken.php
diff --git a/library/oauth2/src/OAuth2/OpenID/ResponseType/IdTokenInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/IdTokenInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/ResponseType/IdTokenInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/IdTokenInterface.php
diff --git a/library/oauth2/src/OAuth2/OpenID/ResponseType/IdTokenToken.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/IdTokenToken.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/ResponseType/IdTokenToken.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/IdTokenToken.php
diff --git a/library/oauth2/src/OAuth2/OpenID/ResponseType/IdTokenTokenInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/IdTokenTokenInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/ResponseType/IdTokenTokenInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/ResponseType/IdTokenTokenInterface.php
diff --git a/library/oauth2/src/OAuth2/OpenID/Storage/AuthorizationCodeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Storage/AuthorizationCodeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/Storage/AuthorizationCodeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Storage/AuthorizationCodeInterface.php
diff --git a/library/oauth2/src/OAuth2/OpenID/Storage/UserClaimsInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Storage/UserClaimsInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/OpenID/Storage/UserClaimsInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/OpenID/Storage/UserClaimsInterface.php
diff --git a/library/oauth2/src/OAuth2/Request.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Request.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Request.php
diff --git a/library/oauth2/src/OAuth2/RequestInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/RequestInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/RequestInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/RequestInterface.php
diff --git a/library/oauth2/src/OAuth2/Response.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Response.php
similarity index 99%
rename from library/oauth2/src/OAuth2/Response.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Response.php
index d8eabe79e..fc1e62a98 100644
--- a/library/oauth2/src/OAuth2/Response.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Response.php
@@ -176,7 +176,7 @@ class Response implements ResponseInterface
     {
         switch ($format) {
             case 'json':
-                return json_encode($this->parameters);
+                return $this->parameters ? json_encode($this->parameters) : '';
             case 'xml':
                 // this only works for single-level arrays
                 $xml = new \SimpleXMLElement('<response/>');
diff --git a/library/oauth2/src/OAuth2/ResponseInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ResponseInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseInterface.php
diff --git a/library/oauth2/src/OAuth2/ResponseType/AccessToken.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AccessToken.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ResponseType/AccessToken.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AccessToken.php
index b235ad0c5..98f51218f 100644
--- a/library/oauth2/src/OAuth2/ResponseType/AccessToken.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AccessToken.php
@@ -114,14 +114,14 @@ class AccessToken implements AccessTokenInterface
      */
     protected function generateAccessToken()
     {
-        if (function_exists('mcrypt_create_iv')) {
-            $randomData = mcrypt_create_iv(20, MCRYPT_DEV_URANDOM);
+        if (function_exists('openssl_random_pseudo_bytes')) {
+            $randomData = openssl_random_pseudo_bytes(20);
             if ($randomData !== false && strlen($randomData) === 20) {
                 return bin2hex($randomData);
             }
         }
-        if (function_exists('openssl_random_pseudo_bytes')) {
-            $randomData = openssl_random_pseudo_bytes(20);
+        if (function_exists('mcrypt_create_iv')) {
+            $randomData = mcrypt_create_iv(20, MCRYPT_DEV_URANDOM);
             if ($randomData !== false && strlen($randomData) === 20) {
                 return bin2hex($randomData);
             }
diff --git a/library/oauth2/src/OAuth2/ResponseType/AccessTokenInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AccessTokenInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ResponseType/AccessTokenInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AccessTokenInterface.php
diff --git a/library/oauth2/src/OAuth2/ResponseType/AuthorizationCode.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AuthorizationCode.php
similarity index 96%
rename from library/oauth2/src/OAuth2/ResponseType/AuthorizationCode.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AuthorizationCode.php
index 6a305fd75..52aeb4be5 100644
--- a/library/oauth2/src/OAuth2/ResponseType/AuthorizationCode.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AuthorizationCode.php
@@ -85,10 +85,10 @@ class AuthorizationCode implements AuthorizationCodeInterface
     protected function generateAuthorizationCode()
     {
         $tokenLen = 40;
-        if (function_exists('mcrypt_create_iv')) {
-            $randomData = mcrypt_create_iv(100, MCRYPT_DEV_URANDOM);
-        } elseif (function_exists('openssl_random_pseudo_bytes')) {
+        if (function_exists('openssl_random_pseudo_bytes')) {
             $randomData = openssl_random_pseudo_bytes(100);
+        } elseif (function_exists('mcrypt_create_iv')) {
+            $randomData = mcrypt_create_iv(100, MCRYPT_DEV_URANDOM);
         } elseif (@file_exists('/dev/urandom')) { // Get 100 bytes of random data
             $randomData = file_get_contents('/dev/urandom', false, null, 0, 100) . uniqid(mt_rand(), true);
         } else {
diff --git a/library/oauth2/src/OAuth2/ResponseType/AuthorizationCodeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AuthorizationCodeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ResponseType/AuthorizationCodeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/AuthorizationCodeInterface.php
diff --git a/library/oauth2/src/OAuth2/ResponseType/JwtAccessToken.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/JwtAccessToken.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ResponseType/JwtAccessToken.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/JwtAccessToken.php
diff --git a/library/oauth2/src/OAuth2/ResponseType/ResponseTypeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/ResponseTypeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ResponseType/ResponseTypeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ResponseType/ResponseTypeInterface.php
diff --git a/library/oauth2/src/OAuth2/Scope.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Scope.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Scope.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Scope.php
diff --git a/library/oauth2/src/OAuth2/ScopeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/ScopeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/ScopeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/ScopeInterface.php
diff --git a/library/oauth2/src/OAuth2/Server.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Server.php
similarity index 90%
rename from library/oauth2/src/OAuth2/Server.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Server.php
index 171a4f069..9cfcb83a5 100644
--- a/library/oauth2/src/OAuth2/Server.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Server.php
@@ -47,20 +47,50 @@ class Server implements ResourceControllerInterface,
     UserInfoControllerInterface
 {
     // misc properties
+    /**
+     * @var Response
+     */
     protected $response;
+
+    /**
+     * @var array
+     */
     protected $config;
+
+    /**
+     * @var array
+     */
     protected $storages;
 
     // servers
+    /**
+     * @var AuthorizeControllerInterface
+     */
     protected $authorizeController;
+
+    /**
+     * @var TokenControllerInterface
+     */
     protected $tokenController;
+
+    /**
+     * @var ResourceControllerInterface
+     */
     protected $resourceController;
+
+    /**
+     * @var UserInfoControllerInterface
+     */
     protected $userInfoController;
 
     // config classes
     protected $grantTypes;
     protected $responseTypes;
     protected $tokenType;
+
+    /**
+     * @var ScopeInterface
+     */
     protected $scopeUtil;
     protected $clientAssertionType;
 
@@ -92,9 +122,9 @@ class Server implements ResourceControllerInterface,
      * @param array                                                   $grantTypes          An array of OAuth2\GrantType\GrantTypeInterface to use for granting access tokens
      * @param array                                                   $responseTypes       Response types to use.  array keys should be "code" and and "token" for
      *                                                                                     Access Token and Authorization Code response types
-     * @param OAuth2\TokenType\TokenTypeInterface                     $tokenType           The token type object to use. Valid token types are "bearer" and "mac"
-     * @param OAuth2\ScopeInterface                                   $scopeUtil           The scope utility class to use to validate scope
-     * @param OAuth2\ClientAssertionType\ClientAssertionTypeInterface $clientAssertionType The method in which to verify the client identity.  Default is HttpBasic
+     * @param \OAuth2\TokenType\TokenTypeInterface                     $tokenType           The token type object to use. Valid token types are "bearer" and "mac"
+     * @param \OAuth2\ScopeInterface                                   $scopeUtil           The scope utility class to use to validate scope
+     * @param \OAuth2\ClientAssertionType\ClientAssertionTypeInterface $clientAssertionType The method in which to verify the client identity.  Default is HttpBasic
      *
      * @ingroup oauth2_section_7
      */
@@ -180,6 +210,8 @@ class Server implements ResourceControllerInterface,
 
     /**
      * every getter deserves a setter
+     *
+     * @param AuthorizeControllerInterface $authorizeController
      */
     public function setAuthorizeController(AuthorizeControllerInterface $authorizeController)
     {
@@ -188,6 +220,8 @@ class Server implements ResourceControllerInterface,
 
     /**
      * every getter deserves a setter
+     *
+     * @param TokenControllerInterface $tokenController
      */
     public function setTokenController(TokenControllerInterface $tokenController)
     {
@@ -196,6 +230,8 @@ class Server implements ResourceControllerInterface,
 
     /**
      * every getter deserves a setter
+     *
+     * @param ResourceControllerInterface $resourceController
      */
     public function setResourceController(ResourceControllerInterface $resourceController)
     {
@@ -204,6 +240,8 @@ class Server implements ResourceControllerInterface,
 
     /**
      * every getter deserves a setter
+     *
+     * @param UserInfoControllerInterface $userInfoController
      */
     public function setUserInfoController(UserInfoControllerInterface $userInfoController)
     {
@@ -214,14 +252,16 @@ class Server implements ResourceControllerInterface,
      * Return claims about the authenticated end-user.
      * This would be called from the "/UserInfo" endpoint as defined in the spec.
      *
-     * @param $request - OAuth2\RequestInterface
+     * @param $request - \OAuth2\RequestInterface
      * Request object to grant access token
      *
-     * @param $response - OAuth2\ResponseInterface
+     * @param $response - \OAuth2\ResponseInterface
      * Response object containing error messages (failure) or user claims (success)
      *
-     * @throws InvalidArgumentException
-     * @throws LogicException
+     * @return ResponseInterface
+     *
+     * @throws \InvalidArgumentException
+     * @throws \LogicException
      *
      * @see http://openid.net/specs/openid-connect-core-1_0.html#UserInfo
      */
@@ -238,14 +278,16 @@ class Server implements ResourceControllerInterface,
      * This would be called from the "/token" endpoint as defined in the spec.
      * Obviously, you can call your endpoint whatever you want.
      *
-     * @param $request - OAuth2\RequestInterface
+     * @param $request - \OAuth2\RequestInterface
      * Request object to grant access token
      *
-     * @param $response - OAuth2\ResponseInterface
+     * @param $response - \OAuth2\ResponseInterface
      * Response object containing error messages (failure) or access token (success)
      *
-     * @throws InvalidArgumentException
-     * @throws LogicException
+     * @return ResponseInterface
+     *
+     * @throws \InvalidArgumentException
+     * @throws \LogicException
      *
      * @see http://tools.ietf.org/html/rfc6749#section-4
      * @see http://tools.ietf.org/html/rfc6749#section-10.6
@@ -306,11 +348,14 @@ class Server implements ResourceControllerInterface,
      * list of space-delimited strings.
      * - state: (optional) An opaque value used by the client to maintain
      * state between the request and callback.
+     * @param ResponseInterface $response
      * @param $is_authorized
      * TRUE or FALSE depending on whether the user authorized the access.
      * @param $user_id
      * Identifier of user who authorized the client
      *
+     * @return Response
+     *
      * @see http://tools.ietf.org/html/rfc6749#section-4
      *
      * @ingroup oauth2_section_4
@@ -464,6 +509,8 @@ class Server implements ResourceControllerInterface,
 
     /**
      * every getter deserves a setter
+     *
+     * @param ScopeInterface $scopeUtil
      */
     public function setScopeUtil($scopeUtil)
     {
@@ -473,7 +520,7 @@ class Server implements ResourceControllerInterface,
     protected function createDefaultAuthorizeController()
     {
         if (!isset($this->storages['client'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the authorize server");
+            throw new \LogicException('You must supply a storage object implementing \OAuth2\Storage\ClientInterface to use the authorize server');
         }
         if (0 == count($this->responseTypes)) {
             $this->responseTypes = $this->getDefaultResponseTypes();
@@ -505,7 +552,7 @@ class Server implements ResourceControllerInterface,
             foreach ($this->grantTypes as $grantType) {
                 if (!$grantType instanceof ClientAssertionTypeInterface) {
                     if (!isset($this->storages['client_credentials'])) {
-                        throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientCredentialsInterface to use the token server");
+                        throw new \LogicException('You must supply a storage object implementing OAuth2\Storage\ClientCredentialsInterface to use the token server');
                     }
                     $config = array_intersect_key($this->config, array_flip(explode(' ', 'allow_credentials_in_request_body allow_public_clients')));
                     $this->clientAssertionType = new HttpBasic($this->storages['client_credentials'], $config);
@@ -515,7 +562,7 @@ class Server implements ResourceControllerInterface,
         }
 
         if (!isset($this->storages['client'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the token server");
+            throw new \LogicException('You must supply a storage object implementing OAuth2\Storage\ClientInterface to use the token server');
         }
 
         $accessTokenResponseType = $this->getAccessTokenResponseType();
@@ -531,7 +578,7 @@ class Server implements ResourceControllerInterface,
                 $this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
             }
         } elseif (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the resource server");
+            throw new \LogicException('You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the resource server');
         }
 
         if (!$this->tokenType) {
@@ -551,11 +598,11 @@ class Server implements ResourceControllerInterface,
                 $this->storages['access_token'] = $this->createDefaultJwtAccessTokenStorage();
             }
         } elseif (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the UserInfo server");
+            throw new \LogicException('You must supply a storage object implementing OAuth2\Storage\AccessTokenInterface or use JwtAccessTokens to use the UserInfo server');
         }
 
         if (!isset($this->storages['user_claims'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use the UserInfo server");
+            throw new \LogicException('You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use the UserInfo server');
         }
 
         if (!$this->tokenType) {
@@ -593,7 +640,7 @@ class Server implements ResourceControllerInterface,
             $config = array_intersect_key($this->config, array_flip(explode(' ', 'enforce_redirect auth_code_lifetime')));
             if ($this->config['use_openid_connect']) {
                 if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
-                    throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
+                    throw new \LogicException('Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when "use_openid_connect" is true');
                 }
                 $responseTypes['code'] = new OpenIDAuthorizationCodeResponseType($this->storages['authorization_code'], $config);
                 $responseTypes['code id_token'] = new CodeIdToken($responseTypes['code'], $responseTypes['id_token']);
@@ -603,7 +650,7 @@ class Server implements ResourceControllerInterface,
         }
 
         if (count($responseTypes) == 0) {
-            throw new \LogicException("You must supply an array of response_types in the constructor or implement a OAuth2\Storage\AuthorizationCodeInterface storage object or set 'allow_implicit' to true and implement a OAuth2\Storage\AccessTokenInterface storage object");
+            throw new \LogicException('You must supply an array of response_types in the constructor or implement a OAuth2\Storage\AuthorizationCodeInterface storage object or set "allow_implicit" to true and implement a OAuth2\Storage\AccessTokenInterface storage object');
         }
 
         return $responseTypes;
@@ -630,7 +677,7 @@ class Server implements ResourceControllerInterface,
         if (isset($this->storages['authorization_code'])) {
             if ($this->config['use_openid_connect']) {
                 if (!$this->storages['authorization_code'] instanceof OpenIDAuthorizationCodeInterface) {
-                    throw new \LogicException("Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when 'use_openid_connect' is true");
+                    throw new \LogicException('Your authorization_code storage must implement OAuth2\OpenID\Storage\AuthorizationCodeInterface to work when "use_openid_connect" is true');
                 }
                 $grantTypes['authorization_code'] = new OpenIDAuthorizationCodeGrantType($this->storages['authorization_code']);
             } else {
@@ -639,7 +686,7 @@ class Server implements ResourceControllerInterface,
         }
 
         if (count($grantTypes) == 0) {
-            throw new \LogicException("Unable to build default grant types - You must supply an array of grant_types in the constructor");
+            throw new \LogicException('Unable to build default grant types - You must supply an array of grant_types in the constructor');
         }
 
         return $grantTypes;
@@ -682,7 +729,7 @@ class Server implements ResourceControllerInterface,
     protected function createDefaultJwtAccessTokenStorage()
     {
         if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
+            throw new \LogicException('You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens');
         }
         $tokenStorage = null;
         if (!empty($this->config['store_encrypted_token_string']) && isset($this->storages['access_token'])) {
@@ -698,7 +745,7 @@ class Server implements ResourceControllerInterface,
     protected function createDefaultJwtAccessTokenResponseType()
     {
         if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens");
+            throw new \LogicException('You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use crypto tokens');
         }
 
         $tokenStorage = null;
@@ -719,7 +766,7 @@ class Server implements ResourceControllerInterface,
     protected function createDefaultAccessTokenResponseType()
     {
         if (!isset($this->storages['access_token'])) {
-            throw new \LogicException("You must supply a response type implementing OAuth2\ResponseType\AccessTokenInterface, or a storage object implementing OAuth2\Storage\AccessTokenInterface to use the token server");
+            throw new \LogicException('You must supply a response type implementing OAuth2\ResponseType\AccessTokenInterface, or a storage object implementing OAuth2\Storage\AccessTokenInterface to use the token server');
         }
 
         $refreshStorage = null;
@@ -736,10 +783,10 @@ class Server implements ResourceControllerInterface,
     protected function createDefaultIdTokenResponseType()
     {
         if (!isset($this->storages['user_claims'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use openid connect");
+            throw new \LogicException('You must supply a storage object implementing OAuth2\OpenID\Storage\UserClaimsInterface to use openid connect');
         }
         if (!isset($this->storages['public_key'])) {
-            throw new \LogicException("You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use openid connect");
+            throw new \LogicException('You must supply a storage object implementing OAuth2\Storage\PublicKeyInterface to use openid connect');
         }
 
         $config = array_intersect_key($this->config, array_flip(explode(' ', 'issuer id_lifetime')));
diff --git a/library/oauth2/src/OAuth2/Storage/AccessTokenInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/AccessTokenInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/AccessTokenInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/AccessTokenInterface.php
diff --git a/library/oauth2/src/OAuth2/Storage/AuthorizationCodeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/AuthorizationCodeInterface.php
similarity index 98%
rename from library/oauth2/src/OAuth2/Storage/AuthorizationCodeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/AuthorizationCodeInterface.php
index 3beb0e437..edc7c70e5 100644
--- a/library/oauth2/src/OAuth2/Storage/AuthorizationCodeInterface.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/AuthorizationCodeInterface.php
@@ -71,7 +71,7 @@ interface AuthorizationCodeInterface
     public function setAuthorizationCode($code, $client_id, $user_id, $redirect_uri, $expires, $scope = null);
 
     /**
-     * once an Authorization Code is used, it must be exipired
+     * once an Authorization Code is used, it must be expired
      *
      * @see http://tools.ietf.org/html/rfc6749#section-4.1.2
      *
diff --git a/library/oauth2/src/OAuth2/Storage/Cassandra.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Cassandra.php
similarity index 99%
rename from library/oauth2/src/OAuth2/Storage/Cassandra.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Cassandra.php
index 602e8a058..c5048c08d 100644
--- a/library/oauth2/src/OAuth2/Storage/Cassandra.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Cassandra.php
@@ -240,7 +240,7 @@ class Cassandra implements AuthorizationCodeInterface,
             return false;
         }
 
-        return empty($client['client_secret']);;
+        return empty($client['client_secret']);
     }
 
     /* ClientInterface */
diff --git a/library/oauth2/src/OAuth2/Storage/ClientCredentialsInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ClientCredentialsInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/ClientCredentialsInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ClientCredentialsInterface.php
diff --git a/library/oauth2/src/OAuth2/Storage/ClientInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ClientInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/ClientInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ClientInterface.php
diff --git a/library/oauth2/src/OAuth2/Storage/CouchbaseDB.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/CouchbaseDB.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/CouchbaseDB.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/CouchbaseDB.php
diff --git a/library/oauth2/src/OAuth2/Storage/DynamoDB.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/DynamoDB.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/DynamoDB.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/DynamoDB.php
diff --git a/library/oauth2/src/OAuth2/Storage/JwtAccessToken.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/JwtAccessToken.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/JwtAccessToken.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/JwtAccessToken.php
diff --git a/library/oauth2/src/OAuth2/Storage/JwtAccessTokenInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/JwtAccessTokenInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/JwtAccessTokenInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/JwtAccessTokenInterface.php
diff --git a/library/oauth2/src/OAuth2/Storage/JwtBearerInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/JwtBearerInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/JwtBearerInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/JwtBearerInterface.php
diff --git a/library/oauth2/src/OAuth2/Storage/Memory.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Memory.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/Memory.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Memory.php
diff --git a/library/oauth2/src/OAuth2/Storage/Mongo.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Mongo.php
similarity index 87%
rename from library/oauth2/src/OAuth2/Storage/Mongo.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Mongo.php
index cef35e5e9..eea06e315 100644
--- a/library/oauth2/src/OAuth2/Storage/Mongo.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Mongo.php
@@ -22,6 +22,7 @@ class Mongo implements AuthorizationCodeInterface,
     UserCredentialsInterface,
     RefreshTokenInterface,
     JwtBearerInterface,
+    PublicKeyInterface,
     OpenIDAuthorizationCodeInterface
 {
     protected $db;
@@ -46,6 +47,7 @@ class Mongo implements AuthorizationCodeInterface,
             'refresh_token_table' => 'oauth_refresh_tokens',
             'code_table' => 'oauth_authorization_codes',
             'user_table' => 'oauth_users',
+            'key_table' => 'oauth_keys',
             'jwt_table' => 'oauth_jwt',
         ), $config);
     }
@@ -336,4 +338,55 @@ class Mongo implements AuthorizationCodeInterface,
         //TODO: Needs mongodb implementation.
         throw new \Exception('setJti() for the MongoDB driver is currently unimplemented.');
     }
+
+    public function getPublicKey($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['public_key'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? false : $result['public_key'];
+    }
+
+    public function getPrivateKey($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['private_key'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? false : $result['private_key'];
+    }
+
+    public function getEncryptionAlgorithm($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['encryption_algorithm'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? 'RS256' : $result['encryption_algorithm'];
+    }
 }
diff --git a/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/MongoDB.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/MongoDB.php
new file mode 100644
index 000000000..64f740fc1
--- /dev/null
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/MongoDB.php
@@ -0,0 +1,380 @@
+<?php
+
+namespace OAuth2\Storage;
+
+use MongoDB\Client;
+use MongoDB\Database;
+use OAuth2\OpenID\Storage\AuthorizationCodeInterface as OpenIDAuthorizationCodeInterface;
+
+/**
+ * Simple MongoDB storage for all storage types
+ *
+ * NOTE: This class is meant to get users started
+ * quickly. If your application requires further
+ * customization, extend this class or create your own.
+ *
+ * NOTE: Passwords are stored in plaintext, which is never
+ * a good idea.  Be sure to override this for your application
+ *
+ * @author Julien Chaumond <chaumond@gmail.com>
+ */
+class MongoDB implements AuthorizationCodeInterface,
+    UserCredentialsInterface,
+    AccessTokenInterface,
+    ClientCredentialsInterface,
+    RefreshTokenInterface,
+    JwtBearerInterface,
+    PublicKeyInterface,
+    OpenIDAuthorizationCodeInterface
+{
+    protected $db;
+    protected $config;
+
+    public function __construct($connection, $config = array())
+    {
+        if ($connection instanceof Database) {
+            $this->db = $connection;
+        } else {
+            if (!is_array($connection)) {
+                throw new \InvalidArgumentException('First argument to OAuth2\Storage\Mongo must be an instance of MongoDB\Database or a configuration array');
+            }
+            $server = sprintf('mongodb://%s:%d', $connection['host'], $connection['port']);
+            $m = new Client($server);
+            $this->db = $m->selectDatabase($connection['database']);
+        }
+        $this->config = array_merge(array(
+            'client_table' => 'oauth_clients',
+            'access_token_table' => 'oauth_access_tokens',
+            'refresh_token_table' => 'oauth_refresh_tokens',
+            'code_table' => 'oauth_authorization_codes',
+            'user_table' => 'oauth_users',
+            'jwt_table' => 'oauth_jwt',
+            'jti_table' => 'oauth_jti',
+            'scope_table'  => 'oauth_scopes',
+            'key_table'  => 'oauth_keys',
+        ), $config);
+    }
+
+    /* ClientCredentialsInterface */
+    public function checkClientCredentials($client_id, $client_secret = null)
+    {
+        if ($result = $this->collection('client_table')->findOne(array('client_id' => $client_id))) {
+            return $result['client_secret'] == $client_secret;
+        }
+        return false;
+    }
+
+    public function isPublicClient($client_id)
+    {
+        if (!$result = $this->collection('client_table')->findOne(array('client_id' => $client_id))) {
+            return false;
+        }
+        return empty($result['client_secret']);
+    }
+
+    /* ClientInterface */
+    public function getClientDetails($client_id)
+    {
+        $result = $this->collection('client_table')->findOne(array('client_id' => $client_id));
+        return is_null($result) ? false : $result;
+    }
+
+    public function setClientDetails($client_id, $client_secret = null, $redirect_uri = null, $grant_types = null, $scope = null, $user_id = null)
+    {
+        if ($this->getClientDetails($client_id)) {
+            $result = $this->collection('client_table')->updateOne(
+                array('client_id' => $client_id),
+                array('$set' => array(
+                    'client_secret' => $client_secret,
+                    'redirect_uri'  => $redirect_uri,
+                    'grant_types'   => $grant_types,
+                    'scope'         => $scope,
+                    'user_id'       => $user_id,
+                ))
+            );
+            return $result->getMatchedCount() > 0;
+        }
+        $client = array(
+            'client_id'     => $client_id,
+            'client_secret' => $client_secret,
+            'redirect_uri'  => $redirect_uri,
+            'grant_types'   => $grant_types,
+            'scope'         => $scope,
+            'user_id'       => $user_id,
+        );
+        $result = $this->collection('client_table')->insertOne($client);
+        return $result->getInsertedCount() > 0;
+    }
+
+    public function checkRestrictedGrantType($client_id, $grant_type)
+    {
+        $details = $this->getClientDetails($client_id);
+        if (isset($details['grant_types'])) {
+            $grant_types = explode(' ', $details['grant_types']);
+            return in_array($grant_type, $grant_types);
+        }
+        // if grant_types are not defined, then none are restricted
+        return true;
+    }
+
+    /* AccessTokenInterface */
+    public function getAccessToken($access_token)
+    {
+        $token = $this->collection('access_token_table')->findOne(array('access_token' => $access_token));
+        return is_null($token) ? false : $token;
+    }
+
+    public function setAccessToken($access_token, $client_id, $user_id, $expires, $scope = null)
+    {
+        // if it exists, update it.
+        if ($this->getAccessToken($access_token)) {
+            $result = $this->collection('access_token_table')->updateOne(
+                array('access_token' => $access_token),
+                array('$set' => array(
+                    'client_id' => $client_id,
+                    'expires' => $expires,
+                    'user_id' => $user_id,
+                    'scope' => $scope
+                ))
+            );
+            return $result->getMatchedCount() > 0;
+        }
+        $token = array(
+            'access_token' => $access_token,
+            'client_id' => $client_id,
+            'expires' => $expires,
+            'user_id' => $user_id,
+            'scope' => $scope
+        );
+        $result = $this->collection('access_token_table')->insertOne($token);
+        return $result->getInsertedCount() > 0;
+    }
+
+    public function unsetAccessToken($access_token)
+    {
+        $result = $this->collection('access_token_table')->deleteOne(array(
+            'access_token' => $access_token
+        ));
+        return $result->getDeletedCount() > 0;
+    }
+
+    /* AuthorizationCodeInterface */
+    public function getAuthorizationCode($code)
+    {
+        $code = $this->collection('code_table')->findOne(array(
+            'authorization_code' => $code
+        ));
+        return is_null($code) ? false : $code;
+    }
+
+    public function setAuthorizationCode($code, $client_id, $user_id, $redirect_uri, $expires, $scope = null, $id_token = null)
+    {
+        // if it exists, update it.
+        if ($this->getAuthorizationCode($code)) {
+            $result = $this->collection('code_table')->updateOne(
+                array('authorization_code' => $code),
+                array('$set' => array(
+                    'client_id' => $client_id,
+                    'user_id' => $user_id,
+                    'redirect_uri' => $redirect_uri,
+                    'expires' => $expires,
+                    'scope' => $scope,
+                    'id_token' => $id_token,
+                ))
+            );
+            return $result->getMatchedCount() > 0;
+        }
+        $token = array(
+            'authorization_code' => $code,
+            'client_id' => $client_id,
+            'user_id' => $user_id,
+            'redirect_uri' => $redirect_uri,
+            'expires' => $expires,
+            'scope' => $scope,
+            'id_token' => $id_token,
+        );
+        $result = $this->collection('code_table')->insertOne($token);
+        return $result->getInsertedCount() > 0;
+    }
+
+    public function expireAuthorizationCode($code)
+    {
+        $result = $this->collection('code_table')->deleteOne(array(
+            'authorization_code' => $code
+        ));
+        return $result->getDeletedCount() > 0;
+    }
+
+    /* UserCredentialsInterface */
+    public function checkUserCredentials($username, $password)
+    {
+        if ($user = $this->getUser($username)) {
+            return $this->checkPassword($user, $password);
+        }
+        return false;
+    }
+
+    public function getUserDetails($username)
+    {
+        if ($user = $this->getUser($username)) {
+            $user['user_id'] = $user['username'];
+        }
+        return $user;
+    }
+
+    /* RefreshTokenInterface */
+    public function getRefreshToken($refresh_token)
+    {
+        $token = $this->collection('refresh_token_table')->findOne(array(
+            'refresh_token' => $refresh_token
+        ));
+        return is_null($token) ? false : $token;
+    }
+
+    public function setRefreshToken($refresh_token, $client_id, $user_id, $expires, $scope = null)
+    {
+        $token = array(
+            'refresh_token' => $refresh_token,
+            'client_id' => $client_id,
+            'user_id' => $user_id,
+            'expires' => $expires,
+            'scope' => $scope
+        );
+        $result = $this->collection('refresh_token_table')->insertOne($token);
+        return $result->getInsertedCount() > 0;
+    }
+
+    public function unsetRefreshToken($refresh_token)
+    {
+        $result = $this->collection('refresh_token_table')->deleteOne(array(
+            'refresh_token' => $refresh_token
+        ));
+        return $result->getDeletedCount() > 0;
+    }
+
+    // plaintext passwords are bad!  Override this for your application
+    protected function checkPassword($user, $password)
+    {
+        return $user['password'] == $password;
+    }
+
+    public function getUser($username)
+    {
+        $result = $this->collection('user_table')->findOne(array('username' => $username));
+        return is_null($result) ? false : $result;
+    }
+
+    public function setUser($username, $password, $firstName = null, $lastName = null)
+    {
+        if ($this->getUser($username)) {
+            $result = $this->collection('user_table')->updateOne(
+                array('username' => $username),
+                array('$set' => array(
+                    'password' => $password,
+                    'first_name' => $firstName,
+                    'last_name' => $lastName
+                ))
+            );
+
+            return $result->getMatchedCount() > 0;
+        }
+
+        $user = array(
+            'username' => $username,
+            'password' => $password,
+            'first_name' => $firstName,
+            'last_name' => $lastName
+        );
+        $result = $this->collection('user_table')->insertOne($user);
+        return $result->getInsertedCount() > 0;
+    }
+
+    public function getClientKey($client_id, $subject)
+    {
+        $result = $this->collection('jwt_table')->findOne(array(
+            'client_id' => $client_id,
+            'subject' => $subject
+        ));
+        return is_null($result) ? false : $result['key'];
+    }
+
+    public function getClientScope($client_id)
+    {
+        if (!$clientDetails = $this->getClientDetails($client_id)) {
+            return false;
+        }
+        if (isset($clientDetails['scope'])) {
+            return $clientDetails['scope'];
+        }
+        return null;
+    }
+
+    public function getJti($client_id, $subject, $audience, $expires, $jti)
+    {
+        //TODO: Needs mongodb implementation.
+        throw new \Exception('getJti() for the MongoDB driver is currently unimplemented.');
+    }
+
+    public function setJti($client_id, $subject, $audience, $expires, $jti)
+    {
+        //TODO: Needs mongodb implementation.
+        throw new \Exception('setJti() for the MongoDB driver is currently unimplemented.');
+    }
+
+    public function getPublicKey($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['public_key'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? false : $result['public_key'];
+    }
+
+    public function getPrivateKey($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['private_key'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? false : $result['private_key'];
+    }
+
+    public function getEncryptionAlgorithm($client_id = null)
+    {
+        if ($client_id) {
+            $result = $this->collection('key_table')->findOne(array(
+                'client_id' => $client_id
+            ));
+            if ($result) {
+                return $result['encryption_algorithm'];
+            }
+        }
+
+        $result = $this->collection('key_table')->findOne(array(
+            'client_id' => null
+        ));
+        return is_null($result) ? 'RS256' : $result['encryption_algorithm'];
+    }
+
+    // Helper function to access a MongoDB collection by `type`:
+    protected function collection($name)
+    {
+        return $this->db->{$this->config[$name]};
+    }
+}
\ No newline at end of file
diff --git a/library/oauth2/src/OAuth2/Storage/Pdo.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Pdo.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/Pdo.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Pdo.php
diff --git a/library/oauth2/src/OAuth2/Storage/PublicKeyInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/PublicKeyInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/PublicKeyInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/PublicKeyInterface.php
diff --git a/library/oauth2/src/OAuth2/Storage/Redis.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Redis.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/Redis.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/Redis.php
diff --git a/library/oauth2/src/OAuth2/Storage/RefreshTokenInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/RefreshTokenInterface.php
similarity index 98%
rename from library/oauth2/src/OAuth2/Storage/RefreshTokenInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/RefreshTokenInterface.php
index 0273f2125..e6407e440 100644
--- a/library/oauth2/src/OAuth2/Storage/RefreshTokenInterface.php
+++ b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/RefreshTokenInterface.php
@@ -74,7 +74,7 @@ interface RefreshTokenInterface
      * and provide a descriptive fail message.
      *
      * @param $refresh_token
-     * Refresh token to be expirse.
+     * Refresh token to be expired.
      *
      * @ingroup oauth2_section_6
      */
diff --git a/library/oauth2/src/OAuth2/Storage/ScopeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ScopeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/ScopeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/ScopeInterface.php
diff --git a/library/oauth2/src/OAuth2/Storage/UserCredentialsInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/UserCredentialsInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/Storage/UserCredentialsInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/Storage/UserCredentialsInterface.php
diff --git a/library/oauth2/src/OAuth2/TokenType/Bearer.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Bearer.php
similarity index 100%
rename from library/oauth2/src/OAuth2/TokenType/Bearer.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Bearer.php
diff --git a/library/oauth2/src/OAuth2/TokenType/Mac.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Mac.php
similarity index 100%
rename from library/oauth2/src/OAuth2/TokenType/Mac.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/Mac.php
diff --git a/library/oauth2/src/OAuth2/TokenType/TokenTypeInterface.php b/vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/TokenTypeInterface.php
similarity index 100%
rename from library/oauth2/src/OAuth2/TokenType/TokenTypeInterface.php
rename to vendor/bshaffer/oauth2-server-php/src/OAuth2/TokenType/TokenTypeInterface.php
diff --git a/library/oauth2/test/OAuth2/AutoloadTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/AutoloadTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/AutoloadTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/AutoloadTest.php
diff --git a/library/oauth2/test/OAuth2/Controller/AuthorizeControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Controller/AuthorizeControllerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/AuthorizeControllerTest.php
diff --git a/library/oauth2/test/OAuth2/Controller/ResourceControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/ResourceControllerTest.php
similarity index 98%
rename from library/oauth2/test/OAuth2/Controller/ResourceControllerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/ResourceControllerTest.php
index ee6d96ff8..b277514a5 100644
--- a/library/oauth2/test/OAuth2/Controller/ResourceControllerTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/ResourceControllerTest.php
@@ -20,6 +20,7 @@ class ResourceControllerTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($response->getStatusCode(), 401);
         $this->assertNull($response->getParameter('error'));
         $this->assertNull($response->getParameter('error_description'));
+        $this->assertEquals('', $response->getResponseBody());
     }
 
     public function testMalformedHeader()
@@ -100,7 +101,7 @@ class ResourceControllerTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($allow);
 
         $this->assertEquals($response->getStatusCode(), 401);
-        $this->assertEquals($response->getParameter('error'), 'expired_token');
+        $this->assertEquals($response->getParameter('error'), 'invalid_token');
         $this->assertEquals($response->getParameter('error_description'), 'The access token provided has expired');
     }
 
diff --git a/library/oauth2/test/OAuth2/Controller/TokenControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/TokenControllerTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Controller/TokenControllerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Controller/TokenControllerTest.php
diff --git a/library/oauth2/test/OAuth2/Encryption/FirebaseJwtTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Encryption/FirebaseJwtTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/FirebaseJwtTest.php
diff --git a/library/oauth2/test/OAuth2/Encryption/JwtTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Encryption/JwtTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Encryption/JwtTest.php
diff --git a/library/oauth2/test/OAuth2/GrantType/AuthorizationCodeTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/AuthorizationCodeTest.php
similarity index 92%
rename from library/oauth2/test/OAuth2/GrantType/AuthorizationCodeTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/AuthorizationCodeTest.php
index 740989635..356b8e53c 100644
--- a/library/oauth2/test/OAuth2/GrantType/AuthorizationCodeTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/AuthorizationCodeTest.php
@@ -93,6 +93,22 @@ class AuthorizationCodeTest extends \PHPUnit_Framework_TestCase
         $this->assertArrayHasKey('access_token', $token);
     }
 
+    public function testValidRedirectUri()
+    {
+        $server = $this->getTestServer();
+        $request = TestRequest::createPost(array(
+            'grant_type'    => 'authorization_code', // valid grant type
+            'client_id'     => 'Test Client ID', // valid client id
+            'redirect_uri'  => 'http://brentertainment.com/voil%C3%A0', // valid client id
+            'client_secret' => 'TestSecret', // valid client secret
+            'code'          => 'testcode-redirect-uri', // valid code
+        ));
+        $token = $server->grantAccessToken($request, new Response());
+
+        $this->assertNotNull($token);
+        $this->assertArrayHasKey('access_token', $token);
+    }
+
     public function testValidCodeNoScope()
     {
         $server = $this->getTestServer();
diff --git a/library/oauth2/test/OAuth2/GrantType/ClientCredentialsTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ClientCredentialsTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/GrantType/ClientCredentialsTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ClientCredentialsTest.php
diff --git a/library/oauth2/test/OAuth2/GrantType/ImplicitTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ImplicitTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/GrantType/ImplicitTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/ImplicitTest.php
diff --git a/library/oauth2/test/OAuth2/GrantType/JwtBearerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/GrantType/JwtBearerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/JwtBearerTest.php
diff --git a/library/oauth2/test/OAuth2/GrantType/RefreshTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/RefreshTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/GrantType/RefreshTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/RefreshTokenTest.php
diff --git a/library/oauth2/test/OAuth2/GrantType/UserCredentialsTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/UserCredentialsTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/GrantType/UserCredentialsTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/GrantType/UserCredentialsTest.php
diff --git a/library/oauth2/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/AuthorizeControllerTest.php
diff --git a/library/oauth2/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Controller/UserInfoControllerTest.php
diff --git a/library/oauth2/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/GrantType/AuthorizationCodeTest.php
diff --git a/library/oauth2/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/CodeIdTokenTest.php
diff --git a/library/oauth2/test/OAuth2/OpenID/ResponseType/IdTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/OpenID/ResponseType/IdTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTest.php
diff --git a/library/oauth2/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/ResponseType/IdTokenTokenTest.php
diff --git a/library/oauth2/test/OAuth2/OpenID/Storage/AuthorizationCodeTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Storage/AuthorizationCodeTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/OpenID/Storage/AuthorizationCodeTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Storage/AuthorizationCodeTest.php
diff --git a/library/oauth2/test/OAuth2/OpenID/Storage/UserClaimsTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Storage/UserClaimsTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/OpenID/Storage/UserClaimsTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/OpenID/Storage/UserClaimsTest.php
diff --git a/library/oauth2/test/OAuth2/RequestTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/RequestTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/RequestTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/RequestTest.php
diff --git a/library/oauth2/test/OAuth2/ResponseTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/ResponseTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseTest.php
diff --git a/library/oauth2/test/OAuth2/ResponseType/AccessTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseType/AccessTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/ResponseType/AccessTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseType/AccessTokenTest.php
diff --git a/library/oauth2/test/OAuth2/ResponseType/JwtAccessTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseType/JwtAccessTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/ResponseType/JwtAccessTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/ResponseType/JwtAccessTokenTest.php
diff --git a/library/oauth2/test/OAuth2/ScopeTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ScopeTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/ScopeTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/ScopeTest.php
diff --git a/library/oauth2/test/OAuth2/ServerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/ServerTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/ServerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/ServerTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/AccessTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/AccessTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/AccessTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/AccessTokenTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/AuthorizationCodeTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/AuthorizationCodeTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/AuthorizationCodeTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/AuthorizationCodeTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/ClientCredentialsTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/ClientCredentialsTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/ClientCredentialsTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/ClientCredentialsTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/ClientTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/ClientTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/ClientTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/ClientTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/DynamoDBTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/DynamoDBTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/DynamoDBTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/DynamoDBTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/JwtAccessTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/JwtAccessTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/JwtAccessTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/JwtAccessTokenTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/JwtBearerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/JwtBearerTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/JwtBearerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/JwtBearerTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/PdoTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PdoTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/PdoTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PdoTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/PublicKeyTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PublicKeyTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/PublicKeyTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/PublicKeyTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/RefreshTokenTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/RefreshTokenTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/RefreshTokenTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/RefreshTokenTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/ScopeTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/ScopeTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/ScopeTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/ScopeTest.php
diff --git a/library/oauth2/test/OAuth2/Storage/UserCredentialsTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/UserCredentialsTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/Storage/UserCredentialsTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/Storage/UserCredentialsTest.php
diff --git a/library/oauth2/test/OAuth2/TokenType/BearerTest.php b/vendor/bshaffer/oauth2-server-php/test/OAuth2/TokenType/BearerTest.php
similarity index 100%
rename from library/oauth2/test/OAuth2/TokenType/BearerTest.php
rename to vendor/bshaffer/oauth2-server-php/test/OAuth2/TokenType/BearerTest.php
diff --git a/library/oauth2/test/bootstrap.php b/vendor/bshaffer/oauth2-server-php/test/bootstrap.php
similarity index 100%
rename from library/oauth2/test/bootstrap.php
rename to vendor/bshaffer/oauth2-server-php/test/bootstrap.php
diff --git a/library/oauth2/test/cleanup.php b/vendor/bshaffer/oauth2-server-php/test/cleanup.php
similarity index 100%
rename from library/oauth2/test/cleanup.php
rename to vendor/bshaffer/oauth2-server-php/test/cleanup.php
diff --git a/library/oauth2/test/config/keys/id_rsa b/vendor/bshaffer/oauth2-server-php/test/config/keys/id_rsa
similarity index 100%
rename from library/oauth2/test/config/keys/id_rsa
rename to vendor/bshaffer/oauth2-server-php/test/config/keys/id_rsa
diff --git a/library/oauth2/test/config/keys/id_rsa.pub b/vendor/bshaffer/oauth2-server-php/test/config/keys/id_rsa.pub
similarity index 100%
rename from library/oauth2/test/config/keys/id_rsa.pub
rename to vendor/bshaffer/oauth2-server-php/test/config/keys/id_rsa.pub
diff --git a/library/oauth2/test/config/storage.json b/vendor/bshaffer/oauth2-server-php/test/config/storage.json
similarity index 97%
rename from library/oauth2/test/config/storage.json
rename to vendor/bshaffer/oauth2-server-php/test/config/storage.json
index a31d3bca2..52d3f2399 100644
--- a/library/oauth2/test/config/storage.json
+++ b/vendor/bshaffer/oauth2-server-php/test/config/storage.json
@@ -32,6 +32,13 @@
             "redirect_uri": "",
             "expires": "9999999999",
             "id_token": "test_id_token"
+        },
+        "testcode-redirect-uri": {
+            "client_id": "Test Client ID",
+            "user_id": "",
+            "redirect_uri": "http://brentertainment.com/voil%C3%A0",
+            "expires": "9999999999",
+            "id_token": "IDTOKEN"
         }
     },
     "client_credentials" : {
diff --git a/library/oauth2/test/lib/OAuth2/Request/TestRequest.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Request/TestRequest.php
similarity index 100%
rename from library/oauth2/test/lib/OAuth2/Request/TestRequest.php
rename to vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Request/TestRequest.php
diff --git a/library/oauth2/test/lib/OAuth2/Storage/BaseTest.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
similarity index 92%
rename from library/oauth2/test/lib/OAuth2/Storage/BaseTest.php
rename to vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
index 921d52500..f0b1274a2 100755
--- a/library/oauth2/test/lib/OAuth2/Storage/BaseTest.php
+++ b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/BaseTest.php
@@ -11,6 +11,7 @@ abstract class BaseTest extends \PHPUnit_Framework_TestCase
         $mysql = Bootstrap::getInstance()->getMysqlPdo();
         $postgres = Bootstrap::getInstance()->getPostgresPdo();
         $mongo = Bootstrap::getInstance()->getMongo();
+        $mongoDb = Bootstrap::getInstance()->getMongoDB();
         $redis = Bootstrap::getInstance()->getRedisStorage();
         $cassandra = Bootstrap::getInstance()->getCassandraStorage();
         $dynamodb = Bootstrap::getInstance()->getDynamoDbStorage();
@@ -25,6 +26,7 @@ abstract class BaseTest extends \PHPUnit_Framework_TestCase
             array($mysql),
             array($postgres),
             array($mongo),
+            array($mongoDb),
             array($redis),
             array($cassandra),
             array($dynamodb),
diff --git a/library/oauth2/test/lib/OAuth2/Storage/Bootstrap.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php
similarity index 92%
rename from library/oauth2/test/lib/OAuth2/Storage/Bootstrap.php
rename to vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php
index 4ac9022b1..3d7bdd4e9 100755
--- a/library/oauth2/test/lib/OAuth2/Storage/Bootstrap.php
+++ b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/Bootstrap.php
@@ -11,6 +11,7 @@ class Bootstrap
     private $sqlite;
     private $postgres;
     private $mongo;
+    private $mongoDb;
     private $redis;
     private $cassandra;
     private $configDir;
@@ -137,13 +138,12 @@ class Bootstrap
     public function getMongo()
     {
         if (!$this->mongo) {
-            $skipMongo = $this->getEnvVar('SKIP_MONGO_TESTS');
-            if (!$skipMongo && class_exists('MongoClient')) {
+            if (class_exists('MongoClient')) {
                 $mongo = new \MongoClient('mongodb://localhost:27017', array('connect' => false));
                 if ($this->testMongoConnection($mongo)) {
-                    $db = $mongo->oauth2_server_php;
-                    $this->removeMongoDb($db);
-                    $this->createMongoDb($db);
+                    $db = $mongo->oauth2_server_php_legacy;
+                    $this->removeMongo($db);
+                    $this->createMongo($db);
 
                     $this->mongo = new Mongo($db);
                 } else {
@@ -157,6 +157,28 @@ class Bootstrap
         return $this->mongo;
     }
 
+    public function getMongoDb()
+    {
+        if (!$this->mongoDb) {
+            if (class_exists('MongoDB\Client')) {
+                $mongoDb = new \MongoDB\Client('mongodb://localhost:27017');
+                if ($this->testMongoDBConnection($mongoDb)) {
+                    $db = $mongoDb->oauth2_server_php;
+                    $this->removeMongoDb($db);
+                    $this->createMongoDb($db);
+
+                    $this->mongoDb = new MongoDB($db);
+                } else {
+                    $this->mongoDb = new NullStorage('MongoDB', 'Unable to connect to mongo server on "localhost:27017"');
+                }
+            } else {
+                $this->mongoDb = new NullStorage('MongoDB', 'Missing MongoDB php extension. Please install mongodb.so');
+            }
+        }
+
+        return $this->mongoDb;
+    }
+
     private function testMongoConnection(\MongoClient $mongo)
     {
         try {
@@ -168,6 +190,11 @@ class Bootstrap
         return true;
     }
 
+    private function testMongoDBConnection(\MongoDB\Client $mongo)
+    {
+        return true;
+    }
+
     public function getCouchbase()
     {
         if (!$this->couchbase) {
@@ -442,7 +469,7 @@ class Bootstrap
         $cb->delete('oauth_refresh_tokens-refreshtoken');
     }
 
-    private function createMongoDb(\MongoDB $db)
+    private function createMongo(\MongoDB $db)
     {
         $db->oauth_clients->insert(array(
             'client_id' => "oauth_test_client",
@@ -468,13 +495,70 @@ class Bootstrap
             'email_verified' => true,
         ));
 
+        $db->oauth_keys->insert(array(
+            'client_id'   => null,
+            'public_key' => $this->getTestPublicKey(),
+            'private_key' => $this->getTestPrivateKey(),
+            'encryption_algorithm' => 'RS256'
+        ));
+
         $db->oauth_jwt->insert(array(
             'client_id' => 'oauth_test_client',
-            'key'       => $this->getTestPublicKey(),
+            'key' => $this->getTestPublicKey(),
             'subject'   => 'test_subject',
         ));
     }
 
+    public function removeMongo(\MongoDB $db)
+    {
+        $db->drop();
+    }
+
+    private function createMongoDB(\MongoDB\Database $db)
+    {
+        $db->oauth_clients->insertOne(array(
+            'client_id' => "oauth_test_client",
+            'client_secret' => "testpass",
+            'redirect_uri' => "http://example.com",
+            'grant_types' => 'implicit password'
+        ));
+
+        $db->oauth_access_tokens->insertOne(array(
+            'access_token' => "testtoken",
+            'client_id' => "Some Client"
+        ));
+
+        $db->oauth_authorization_codes->insertOne(array(
+            'authorization_code' => "testcode",
+            'client_id' => "Some Client"
+        ));
+
+        $db->oauth_users->insertOne(array(
+            'username' => 'testuser',
+            'password' => 'password',
+            'email' => 'testuser@test.com',
+            'email_verified' => true,
+        ));
+
+        $db->oauth_keys->insertOne(array(
+            'client_id'   => null,
+            'public_key' => $this->getTestPublicKey(),
+            'private_key' => $this->getTestPrivateKey(),
+            'encryption_algorithm' => 'RS256'
+        ));
+
+        $db->oauth_jwt->insertOne(array(
+            'client_id' => 'oauth_test_client',
+            'key' => $this->getTestPublicKey(),
+            'subject'   => 'test_subject',
+        ));
+    }
+
+    public function removeMongoDB(\MongoDB\Database $db)
+    {
+        $db->drop();
+    }
+
     private function createRedisDb(Redis $storage)
     {
         $storage->setClientDetails("oauth_test_client", "testpass", "http://example.com", 'implicit password');
@@ -500,11 +584,6 @@ class Bootstrap
         $storage->setClientKey('oauth_test_client', $this->getTestPublicKey(), 'test_subject');
     }
 
-    public function removeMongoDb(\MongoDB $db)
-    {
-        $db->drop();
-    }
-
     public function getTestPublicKey()
     {
         return file_get_contents(__DIR__.'/../../../config/keys/id_rsa.pub');
diff --git a/library/oauth2/test/lib/OAuth2/Storage/NullStorage.php b/vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/NullStorage.php
similarity index 100%
rename from library/oauth2/test/lib/OAuth2/Storage/NullStorage.php
rename to vendor/bshaffer/oauth2-server-php/test/lib/OAuth2/Storage/NullStorage.php
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 4626994fd..ff6ecfb82 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -53,9 +53,8 @@ class ClassLoader
 
     private $useIncludePath = false;
     private $classMap = array();
+
     private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
 
     public function getPrefixes()
     {
@@ -272,26 +271,6 @@ class ClassLoader
         return $this->classMapAuthoritative;
     }
 
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
     /**
      * Registers this instance as an autoloader.
      *
@@ -334,34 +313,29 @@ class ClassLoader
      */
     public function findFile($class)
     {
+        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+        if ('\\' == $class[0]) {
+            $class = substr($class, 1);
+        }
+
         // class map lookup
         if (isset($this->classMap[$class])) {
             return $this->classMap[$class];
         }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+        if ($this->classMapAuthoritative) {
             return false;
         }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
 
         $file = $this->findFileWithExtension($class, '.php');
 
         // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
+        if ($file === null && defined('HHVM_VERSION')) {
             $file = $this->findFileWithExtension($class, '.hh');
         }
 
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
+        if ($file === null) {
             // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
+            return $this->classMap[$class] = false;
         }
 
         return $file;
@@ -425,8 +399,6 @@ class ClassLoader
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
-
-        return false;
     }
 }
 
diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE
index 1a2812488..ee274f1d3 100644
--- a/vendor/composer/LICENSE
+++ b/vendor/composer/LICENSE
@@ -1,21 +1,433 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Composer
+Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be>
+Source: https://github.com/composer/composer
 
-Copyright (c) 2016 Nils Adermann, Jordi Boggiano
+Files: *
+Copyright: 2016, Nils Adermann <naderman@naderman.de>
+           2016, Jordi Boggiano <j.boggiano@seld.be>
+License: Expat
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
+Files: res/cacert.pem
+Copyright: 2015, Mozilla Foundation
+License: MPL-2.0
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+Files: src/Composer/Util/RemoteFilesystem.php
+       src/Composer/Util/TlsHelper.php
+Copyright: 2016, Nils Adermann <naderman@naderman.de>
+           2016, Jordi Boggiano <j.boggiano@seld.be>
+           2013, Evan Coury <me@evancoury.com>
+License: Expat and BSD-2-Clause
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+ .
+     * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is furnished
+ to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+License: MPL-2.0
+ 1. Definitions
+ --------------
+ .
+ 1.1. "Contributor"
+     means each individual or legal entity that creates, contributes to
+     the creation of, or owns Covered Software.
+ .
+ 1.2. "Contributor Version"
+     means the combination of the Contributions of others (if any) used
+     by a Contributor and that particular Contributor's Contribution.
+ .
+ 1.3. "Contribution"
+     means Covered Software of a particular Contributor.
+ .
+ 1.4. "Covered Software"
+     means Source Code Form to which the initial Contributor has attached
+     the notice in Exhibit A, the Executable Form of such Source Code
+     Form, and Modifications of such Source Code Form, in each case
+     including portions thereof.
+ .
+ 1.5. "Incompatible With Secondary Licenses"
+     means
+ .
+     (a) that the initial Contributor has attached the notice described
+         in Exhibit B to the Covered Software; or
+ .
+     (b) that the Covered Software was made available under the terms of
+         version 1.1 or earlier of the License, but not also under the
+         terms of a Secondary License.
+ .
+ 1.6. "Executable Form"
+     means any form of the work other than Source Code Form.
+ .
+ 1.7. "Larger Work"
+     means a work that combines Covered Software with other material, in
+     a separate file or files, that is not Covered Software.
+ .
+ 1.8. "License"
+     means this document.
+ .
+ 1.9. "Licensable"
+     means having the right to grant, to the maximum extent possible,
+     whether at the time of the initial grant or subsequently, any and
+     all of the rights conveyed by this License.
+ .
+ 1.10. "Modifications"
+     means any of the following:
+ .
+     (a) any file in Source Code Form that results from an addition to,
+         deletion from, or modification of the contents of Covered
+         Software; or
+ .
+     (b) any new file in Source Code Form that contains any Covered
+         Software.
+ .
+ 1.11. "Patent Claims" of a Contributor
+     means any patent claim(s), including without limitation, method,
+     process, and apparatus claims, in any patent Licensable by such
+     Contributor that would be infringed, but for the grant of the
+     License, by the making, using, selling, offering for sale, having
+     made, import, or transfer of either its Contributions or its
+     Contributor Version.
+ .
+ 1.12. "Secondary License"
+     means either the GNU General Public License, Version 2.0, the GNU
+     Lesser General Public License, Version 2.1, the GNU Affero General
+     Public License, Version 3.0, or any later versions of those
+     licenses.
+ .
+ 1.13. "Source Code Form"
+     means the form of the work preferred for making modifications.
+ .
+ 1.14. "You" (or "Your")
+     means an individual or a legal entity exercising rights under this
+     License. For legal entities, "You" includes any entity that
+     controls, is controlled by, or is under common control with You. For
+     purposes of this definition, "control" means (a) the power, direct
+     or indirect, to cause the direction or management of such entity,
+     whether by contract or otherwise, or (b) ownership of more than
+     fifty percent (50%) of the outstanding shares or beneficial
+     ownership of such entity.
+ .
+ 2. License Grants and Conditions
+ --------------------------------
+ .
+ 2.1. Grants
+ .
+ Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+ .
+ (a) under intellectual property rights (other than patent or trademark)
+     Licensable by such Contributor to use, reproduce, make available,
+     modify, display, perform, distribute, and otherwise exploit its
+     Contributions, either on an unmodified basis, with Modifications, or
+     as part of a Larger Work; and
+ .
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
+     for sale, have made, import, and otherwise transfer either its
+     Contributions or its Contributor Version.
+ .
+ 2.2. Effective Date
+ .
+ The licenses granted in Section 2.1 with respect to any Contribution
+ become effective for each Contribution on the date the Contributor first
+ distributes such Contribution.
+ .
+ 2.3. Limitations on Grant Scope
+ .
+ The licenses granted in this Section 2 are the only rights granted under
+ this License. No additional rights or licenses will be implied from the
+ distribution or licensing of Covered Software under this License.
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
+ Contributor:
+ .
+ (a) for any code that a Contributor has removed from Covered Software;
+     or
+ .
+ (b) for infringements caused by: (i) Your and any other third party's
+     modifications of Covered Software, or (ii) the combination of its
+     Contributions with other software (except as part of its Contributor
+     Version); or
+ .
+ (c) under Patent Claims infringed by Covered Software in the absence of
+     its Contributions.
+ .
+ This License does not grant any rights in the trademarks, service marks,
+ or logos of any Contributor (except as may be necessary to comply with
+ the notice requirements in Section 3.4).
+ .
+ 2.4. Subsequent Licenses
+ .
+ No Contributor makes additional grants as a result of Your choice to
+ distribute the Covered Software under a subsequent version of this
+ License (see Section 10.2) or under the terms of a Secondary License (if
+ permitted under the terms of Section 3.3).
+ .
+ 2.5. Representation
+ .
+ Each Contributor represents that the Contributor believes its
+ Contributions are its original creation(s) or it has sufficient rights
+ to grant the rights to its Contributions conveyed by this License.
+ .
+ 2.6. Fair Use
+ .
+ This License is not intended to limit any rights You have under
+ applicable copyright doctrines of fair use, fair dealing, or other
+ equivalents.
+ .
+ 2.7. Conditions
+ .
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+ in Section 2.1.
+ .
+ 3. Responsibilities
+ -------------------
+ .
+ 3.1. Distribution of Source Form
+ .
+ All distribution of Covered Software in Source Code Form, including any
+ Modifications that You create or to which You contribute, must be under
+ the terms of this License. You must inform recipients that the Source
+ Code Form of the Covered Software is governed by the terms of this
+ License, and how they can obtain a copy of this License. You may not
+ attempt to alter or restrict the recipients' rights in the Source Code
+ Form.
+ .
+ 3.2. Distribution of Executable Form
+ .
+ If You distribute Covered Software in Executable Form then:
+ .
+ (a) such Covered Software must also be made available in Source Code
+     Form, as described in Section 3.1, and You must inform recipients of
+     the Executable Form how they can obtain a copy of such Source Code
+     Form by reasonable means in a timely manner, at a charge no more
+     than the cost of distribution to the recipient; and
+ .
+ (b) You may distribute such Executable Form under the terms of this
+     License, or sublicense it under different terms, provided that the
+     license for the Executable Form does not attempt to limit or alter
+     the recipients' rights in the Source Code Form under this License.
+ .
+ 3.3. Distribution of a Larger Work
+ .
+ You may create and distribute a Larger Work under terms of Your choice,
+ provided that You also comply with the requirements of this License for
+ the Covered Software. If the Larger Work is a combination of Covered
+ Software with a work governed by one or more Secondary Licenses, and the
+ Covered Software is not Incompatible With Secondary Licenses, this
+ License permits You to additionally distribute such Covered Software
+ under the terms of such Secondary License(s), so that the recipient of
+ the Larger Work may, at their option, further distribute the Covered
+ Software under the terms of either this License or such Secondary
+ License(s).
+ .
+ 3.4. Notices
+ .
+ You may not remove or alter the substance of any license notices
+ (including copyright notices, patent notices, disclaimers of warranty,
+ or limitations of liability) contained within the Source Code Form of
+ the Covered Software, except that You may alter any license notices to
+ the extent required to remedy known factual inaccuracies.
+ .
+ 3.5. Application of Additional Terms
+ .
+ You may choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of Covered
+ Software. However, You may do so only on Your own behalf, and not on
+ behalf of any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity, or liability obligation is offered by
+ You alone, and You hereby agree to indemnify every Contributor for any
+ liability incurred by such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer. You may include additional
+ disclaimers of warranty and limitations of liability specific to any
+ jurisdiction.
+ .
+ 4. Inability to Comply Due to Statute or Regulation
+ ---------------------------------------------------
+ .
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Software due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description must
+ be placed in a text file included with all distributions of the Covered
+ Software under this License. Except to the extent prohibited by statute
+ or regulation, such description must be sufficiently detailed for a
+ recipient of ordinary skill to be able to understand it.
+ .
+ 5. Termination
+ --------------
+ .
+ 5.1. The rights granted under this License will terminate automatically
+ if You fail to comply with any of its terms. However, if You become
+ compliant, then the rights granted under this License from a particular
+ Contributor are reinstated (a) provisionally, unless and until such
+ Contributor explicitly and finally terminates Your grants, and (b) on an
+ ongoing basis, if such Contributor fails to notify You of the
+ non-compliance by some reasonable means prior to 60 days after You have
+ come back into compliance. Moreover, Your grants from a particular
+ Contributor are reinstated on an ongoing basis if such Contributor
+ notifies You of the non-compliance by some reasonable means, this is the
+ first time You have received notice of non-compliance with this License
+ from such Contributor, and You become compliant prior to 30 days after
+ Your receipt of the notice.
+ .
+ 5.2. If You initiate litigation against any entity by asserting a patent
+ infringement claim (excluding declaratory judgment actions,
+ counter-claims, and cross-claims) alleging that a Contributor Version
+ directly or indirectly infringes any patent, then the rights granted to
+ You by any and all Contributors for the Covered Software under Section
+ 2.1 of this License shall terminate.
+ .
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+ end user license agreements (excluding distributors and resellers) which
+ have been validly granted by You or Your distributors under this License
+ prior to termination shall survive termination.
+ .
+  ************************************************************************
+  *                                                                      *
+  *  6. Disclaimer of Warranty                                           *
+  *  -------------------------                                           *
+  *                                                                      *
+  *  Covered Software is provided under this License on an "as is"       *
+  *  basis, without warranty of any kind, either expressed, implied, or  *
+  *  statutory, including, without limitation, warranties that the       *
+  *  Covered Software is free of defects, merchantable, fit for a        *
+  *  particular purpose or non-infringing. The entire risk as to the     *
+  *  quality and performance of the Covered Software is with You.        *
+  *  Should any Covered Software prove defective in any respect, You     *
+  *  (not any Contributor) assume the cost of any necessary servicing,   *
+  *  repair, or correction. This disclaimer of warranty constitutes an   *
+  *  essential part of this License. No use of any Covered Software is   *
+  *  authorized under this License except under this disclaimer.         *
+  *                                                                      *
+  ************************************************************************
+ .
+  ************************************************************************
+  *                                                                      *
+  *  7. Limitation of Liability                                          *
+  *  --------------------------                                          *
+  *                                                                      *
+  *  Under no circumstances and under no legal theory, whether tort      *
+  *  (including negligence), contract, or otherwise, shall any           *
+  *  Contributor, or anyone who distributes Covered Software as          *
+  *  permitted above, be liable to You for any direct, indirect,         *
+  *  special, incidental, or consequential damages of any character      *
+  *  including, without limitation, damages for lost profits, loss of    *
+  *  goodwill, work stoppage, computer failure or malfunction, or any    *
+  *  and all other commercial damages or losses, even if such party      *
+  *  shall have been informed of the possibility of such damages. This   *
+  *  limitation of liability shall not apply to liability for death or   *
+  *  personal injury resulting from such party's negligence to the       *
+  *  extent applicable law prohibits such limitation. Some               *
+  *  jurisdictions do not allow the exclusion or limitation of           *
+  *  incidental or consequential damages, so this exclusion and          *
+  *  limitation may not apply to You.                                    *
+  *                                                                      *
+  ************************************************************************
+ .
+ 8. Litigation
+ -------------
+ .
+ Any litigation relating to this License may be brought only in the
+ courts of a jurisdiction where the defendant maintains its principal
+ place of business and such litigation shall be governed by laws of that
+ jurisdiction, without reference to its conflict-of-law provisions.
+ Nothing in this Section shall prevent a party's ability to bring
+ cross-claims or counter-claims.
+ .
+ 9. Miscellaneous
+ ----------------
+ .
+ This License represents the complete agreement concerning the subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. Any law or regulation which provides
+ that the language of a contract shall be construed against the drafter
+ shall not be used to construe this License against a Contributor.
+ .
+ 10. Versions of the License
+ ---------------------------
+ .
+ 10.1. New Versions
+ .
+ Mozilla Foundation is the license steward. Except as provided in Section
+ 10.3, no one other than the license steward has the right to modify or
+ publish new versions of this License. Each version will be given a
+ distinguishing version number.
+ .
+ 10.2. Effect of New Versions
+ .
+ You may distribute the Covered Software under the terms of the version
+ of the License under which You originally received the Covered Software,
+ or under the terms of any subsequent version published by the license
+ steward.
+ .
+ 10.3. Modified Versions
+ .
+ If you create software not governed by this License, and you want to
+ create a new license for such software, you may create and use a
+ modified version of this License if you rename the license and remove
+ any references to the name of the license steward (except to note that
+ such modified license differs from this License).
+ .
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
+ Licenses
+ .
+ If You choose to distribute Source Code Form that is Incompatible With
+ Secondary Licenses under the terms of this version of the License, the
+ notice described in Exhibit B of this License must be attached.
+ .
+ Exhibit A - Source Code Form License Notice
+ -------------------------------------------
+ .
+   This Source Code Form is subject to the terms of the Mozilla Public
+   License, v. 2.0. If a copy of the MPL was not distributed with this
+   file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ .
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to look
+ for such a notice.
+ .
+ You may add additional accurate notices of copyright ownership.
+ .
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
+ ---------------------------------------------------------
+ .
+   This Source Code Form is "Incompatible With Secondary Licenses", as
+   defined by the Mozilla Public License, v. 2.0.
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 2adb2fe53..7a91153b0 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,623 +6,4 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Hubzilla\\Import\\Import' => $baseDir . '/include/Import/Importer.php',
-    'Markdownify\\Converter' => $vendorDir . '/pixel418/markdownify/src/Converter.php',
-    'Markdownify\\ConverterExtra' => $vendorDir . '/pixel418/markdownify/src/ConverterExtra.php',
-    'Markdownify\\Parser' => $vendorDir . '/pixel418/markdownify/src/Parser.php',
-    'Michelf\\Markdown' => $vendorDir . '/michelf/php-markdown/Michelf/Markdown.php',
-    'Michelf\\MarkdownExtra' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownExtra.php',
-    'Michelf\\MarkdownInterface' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownInterface.php',
-    'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
-    'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
-    'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
-    'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php',
-    'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php',
-    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
-    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
-    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
-    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Sabre\\CalDAV\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php',
-    'Sabre\\CalDAV\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/BackendInterface.php',
-    'Sabre\\CalDAV\\Backend\\NotificationSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php',
-    'Sabre\\CalDAV\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/PDO.php',
-    'Sabre\\CalDAV\\Backend\\SchedulingSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SchedulingSupport.php',
-    'Sabre\\CalDAV\\Backend\\SharingSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SharingSupport.php',
-    'Sabre\\CalDAV\\Backend\\SimplePDO' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SimplePDO.php',
-    'Sabre\\CalDAV\\Backend\\SubscriptionSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php',
-    'Sabre\\CalDAV\\Backend\\SyncSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SyncSupport.php',
-    'Sabre\\CalDAV\\Calendar' => $vendorDir . '/sabre/dav/lib/CalDAV/Calendar.php',
-    'Sabre\\CalDAV\\CalendarHome' => $vendorDir . '/sabre/dav/lib/CalDAV/CalendarHome.php',
-    'Sabre\\CalDAV\\CalendarObject' => $vendorDir . '/sabre/dav/lib/CalDAV/CalendarObject.php',
-    'Sabre\\CalDAV\\CalendarQueryValidator' => $vendorDir . '/sabre/dav/lib/CalDAV/CalendarQueryValidator.php',
-    'Sabre\\CalDAV\\CalendarRoot' => $vendorDir . '/sabre/dav/lib/CalDAV/CalendarRoot.php',
-    'Sabre\\CalDAV\\Exception\\InvalidComponentType' => $vendorDir . '/sabre/dav/lib/CalDAV/Exception/InvalidComponentType.php',
-    'Sabre\\CalDAV\\ICSExportPlugin' => $vendorDir . '/sabre/dav/lib/CalDAV/ICSExportPlugin.php',
-    'Sabre\\CalDAV\\ICalendar' => $vendorDir . '/sabre/dav/lib/CalDAV/ICalendar.php',
-    'Sabre\\CalDAV\\ICalendarObject' => $vendorDir . '/sabre/dav/lib/CalDAV/ICalendarObject.php',
-    'Sabre\\CalDAV\\ICalendarObjectContainer' => $vendorDir . '/sabre/dav/lib/CalDAV/ICalendarObjectContainer.php',
-    'Sabre\\CalDAV\\ISharedCalendar' => $vendorDir . '/sabre/dav/lib/CalDAV/ISharedCalendar.php',
-    'Sabre\\CalDAV\\Notifications\\Collection' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/Collection.php',
-    'Sabre\\CalDAV\\Notifications\\ICollection' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/ICollection.php',
-    'Sabre\\CalDAV\\Notifications\\INode' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/INode.php',
-    'Sabre\\CalDAV\\Notifications\\Node' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/Node.php',
-    'Sabre\\CalDAV\\Notifications\\Plugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/Plugin.php',
-    'Sabre\\CalDAV\\Plugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Plugin.php',
-    'Sabre\\CalDAV\\Principal\\Collection' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/Collection.php',
-    'Sabre\\CalDAV\\Principal\\IProxyRead' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/IProxyRead.php',
-    'Sabre\\CalDAV\\Principal\\IProxyWrite' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/IProxyWrite.php',
-    'Sabre\\CalDAV\\Principal\\ProxyRead' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/ProxyRead.php',
-    'Sabre\\CalDAV\\Principal\\ProxyWrite' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/ProxyWrite.php',
-    'Sabre\\CalDAV\\Principal\\User' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/User.php',
-    'Sabre\\CalDAV\\Schedule\\IInbox' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/IInbox.php',
-    'Sabre\\CalDAV\\Schedule\\IMipPlugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php',
-    'Sabre\\CalDAV\\Schedule\\IOutbox' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/IOutbox.php',
-    'Sabre\\CalDAV\\Schedule\\ISchedulingObject' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/ISchedulingObject.php',
-    'Sabre\\CalDAV\\Schedule\\Inbox' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/Inbox.php',
-    'Sabre\\CalDAV\\Schedule\\Outbox' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/Outbox.php',
-    'Sabre\\CalDAV\\Schedule\\Plugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/Plugin.php',
-    'Sabre\\CalDAV\\Schedule\\SchedulingObject' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php',
-    'Sabre\\CalDAV\\SharedCalendar' => $vendorDir . '/sabre/dav/lib/CalDAV/SharedCalendar.php',
-    'Sabre\\CalDAV\\SharingPlugin' => $vendorDir . '/sabre/dav/lib/CalDAV/SharingPlugin.php',
-    'Sabre\\CalDAV\\Subscriptions\\ISubscription' => $vendorDir . '/sabre/dav/lib/CalDAV/Subscriptions/ISubscription.php',
-    'Sabre\\CalDAV\\Subscriptions\\Plugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Subscriptions/Plugin.php',
-    'Sabre\\CalDAV\\Subscriptions\\Subscription' => $vendorDir . '/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php',
-    'Sabre\\CalDAV\\Xml\\Filter\\CalendarData' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Filter/CalendarData.php',
-    'Sabre\\CalDAV\\Xml\\Filter\\CompFilter' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Filter/CompFilter.php',
-    'Sabre\\CalDAV\\Xml\\Filter\\ParamFilter' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php',
-    'Sabre\\CalDAV\\Xml\\Filter\\PropFilter' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php',
-    'Sabre\\CalDAV\\Xml\\Notification\\Invite' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php',
-    'Sabre\\CalDAV\\Xml\\Notification\\InviteReply' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php',
-    'Sabre\\CalDAV\\Xml\\Notification\\NotificationInterface' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Notification/NotificationInterface.php',
-    'Sabre\\CalDAV\\Xml\\Notification\\SystemStatus' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Notification/SystemStatus.php',
-    'Sabre\\CalDAV\\Xml\\Property\\AllowedSharingModes' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/AllowedSharingModes.php',
-    'Sabre\\CalDAV\\Xml\\Property\\EmailAddressSet' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/EmailAddressSet.php',
-    'Sabre\\CalDAV\\Xml\\Property\\Invite' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/Invite.php',
-    'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php',
-    'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php',
-    'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarData' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarData.php',
-    'Sabre\\CalDAV\\Xml\\Property\\SupportedCollationSet' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/SupportedCollationSet.php',
-    'Sabre\\CalDAV\\Xml\\Request\\CalendarMultiGetReport' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/CalendarMultiGetReport.php',
-    'Sabre\\CalDAV\\Xml\\Request\\CalendarQueryReport' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/CalendarQueryReport.php',
-    'Sabre\\CalDAV\\Xml\\Request\\FreeBusyQueryReport' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/FreeBusyQueryReport.php',
-    'Sabre\\CalDAV\\Xml\\Request\\InviteReply' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php',
-    'Sabre\\CalDAV\\Xml\\Request\\MkCalendar' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/MkCalendar.php',
-    'Sabre\\CalDAV\\Xml\\Request\\Share' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/Share.php',
-    'Sabre\\CardDAV\\AddressBook' => $vendorDir . '/sabre/dav/lib/CardDAV/AddressBook.php',
-    'Sabre\\CardDAV\\AddressBookHome' => $vendorDir . '/sabre/dav/lib/CardDAV/AddressBookHome.php',
-    'Sabre\\CardDAV\\AddressBookRoot' => $vendorDir . '/sabre/dav/lib/CardDAV/AddressBookRoot.php',
-    'Sabre\\CardDAV\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/CardDAV/Backend/AbstractBackend.php',
-    'Sabre\\CardDAV\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/CardDAV/Backend/BackendInterface.php',
-    'Sabre\\CardDAV\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/CardDAV/Backend/PDO.php',
-    'Sabre\\CardDAV\\Backend\\SyncSupport' => $vendorDir . '/sabre/dav/lib/CardDAV/Backend/SyncSupport.php',
-    'Sabre\\CardDAV\\Card' => $vendorDir . '/sabre/dav/lib/CardDAV/Card.php',
-    'Sabre\\CardDAV\\IAddressBook' => $vendorDir . '/sabre/dav/lib/CardDAV/IAddressBook.php',
-    'Sabre\\CardDAV\\ICard' => $vendorDir . '/sabre/dav/lib/CardDAV/ICard.php',
-    'Sabre\\CardDAV\\IDirectory' => $vendorDir . '/sabre/dav/lib/CardDAV/IDirectory.php',
-    'Sabre\\CardDAV\\Plugin' => $vendorDir . '/sabre/dav/lib/CardDAV/Plugin.php',
-    'Sabre\\CardDAV\\VCFExportPlugin' => $vendorDir . '/sabre/dav/lib/CardDAV/VCFExportPlugin.php',
-    'Sabre\\CardDAV\\Xml\\Filter\\AddressData' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php',
-    'Sabre\\CardDAV\\Xml\\Filter\\ParamFilter' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php',
-    'Sabre\\CardDAV\\Xml\\Filter\\PropFilter' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php',
-    'Sabre\\CardDAV\\Xml\\Property\\SupportedAddressData' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php',
-    'Sabre\\CardDAV\\Xml\\Property\\SupportedCollationSet' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php',
-    'Sabre\\CardDAV\\Xml\\Request\\AddressBookMultiGetReport' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php',
-    'Sabre\\CardDAV\\Xml\\Request\\AddressBookQueryReport' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php',
-    'Sabre\\DAVACL\\ACLTrait' => $vendorDir . '/sabre/dav/lib/DAVACL/ACLTrait.php',
-    'Sabre\\DAVACL\\AbstractPrincipalCollection' => $vendorDir . '/sabre/dav/lib/DAVACL/AbstractPrincipalCollection.php',
-    'Sabre\\DAVACL\\Exception\\AceConflict' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/AceConflict.php',
-    'Sabre\\DAVACL\\Exception\\NeedPrivileges' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/NeedPrivileges.php',
-    'Sabre\\DAVACL\\Exception\\NoAbstract' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/NoAbstract.php',
-    'Sabre\\DAVACL\\Exception\\NotRecognizedPrincipal' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/NotRecognizedPrincipal.php',
-    'Sabre\\DAVACL\\Exception\\NotSupportedPrivilege' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/NotSupportedPrivilege.php',
-    'Sabre\\DAVACL\\FS\\Collection' => $vendorDir . '/sabre/dav/lib/DAVACL/FS/Collection.php',
-    'Sabre\\DAVACL\\FS\\File' => $vendorDir . '/sabre/dav/lib/DAVACL/FS/File.php',
-    'Sabre\\DAVACL\\FS\\HomeCollection' => $vendorDir . '/sabre/dav/lib/DAVACL/FS/HomeCollection.php',
-    'Sabre\\DAVACL\\IACL' => $vendorDir . '/sabre/dav/lib/DAVACL/IACL.php',
-    'Sabre\\DAVACL\\IPrincipal' => $vendorDir . '/sabre/dav/lib/DAVACL/IPrincipal.php',
-    'Sabre\\DAVACL\\IPrincipalCollection' => $vendorDir . '/sabre/dav/lib/DAVACL/IPrincipalCollection.php',
-    'Sabre\\DAVACL\\Plugin' => $vendorDir . '/sabre/dav/lib/DAVACL/Plugin.php',
-    'Sabre\\DAVACL\\Principal' => $vendorDir . '/sabre/dav/lib/DAVACL/Principal.php',
-    'Sabre\\DAVACL\\PrincipalBackend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalBackend/AbstractBackend.php',
-    'Sabre\\DAVACL\\PrincipalBackend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php',
-    'Sabre\\DAVACL\\PrincipalBackend\\CreatePrincipalSupport' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalBackend/CreatePrincipalSupport.php',
-    'Sabre\\DAVACL\\PrincipalBackend\\PDO' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php',
-    'Sabre\\DAVACL\\PrincipalCollection' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalCollection.php',
-    'Sabre\\DAVACL\\Xml\\Property\\Acl' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/Acl.php',
-    'Sabre\\DAVACL\\Xml\\Property\\AclRestrictions' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/AclRestrictions.php',
-    'Sabre\\DAVACL\\Xml\\Property\\CurrentUserPrivilegeSet' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/CurrentUserPrivilegeSet.php',
-    'Sabre\\DAVACL\\Xml\\Property\\Principal' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/Principal.php',
-    'Sabre\\DAVACL\\Xml\\Property\\SupportedPrivilegeSet' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php',
-    'Sabre\\DAVACL\\Xml\\Request\\AclPrincipalPropSetReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php',
-    'Sabre\\DAVACL\\Xml\\Request\\ExpandPropertyReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/ExpandPropertyReport.php',
-    'Sabre\\DAVACL\\Xml\\Request\\PrincipalMatchReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php',
-    'Sabre\\DAVACL\\Xml\\Request\\PrincipalPropertySearchReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/PrincipalPropertySearchReport.php',
-    'Sabre\\DAVACL\\Xml\\Request\\PrincipalSearchPropertySetReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php',
-    'Sabre\\DAV\\Auth\\Backend\\AbstractBasic' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/AbstractBasic.php',
-    'Sabre\\DAV\\Auth\\Backend\\AbstractBearer' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/AbstractBearer.php',
-    'Sabre\\DAV\\Auth\\Backend\\AbstractDigest' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php',
-    'Sabre\\DAV\\Auth\\Backend\\Apache' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/Apache.php',
-    'Sabre\\DAV\\Auth\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/BackendInterface.php',
-    'Sabre\\DAV\\Auth\\Backend\\BasicCallBack' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/BasicCallBack.php',
-    'Sabre\\DAV\\Auth\\Backend\\File' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/File.php',
-    'Sabre\\DAV\\Auth\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/PDO.php',
-    'Sabre\\DAV\\Auth\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Plugin.php',
-    'Sabre\\DAV\\Browser\\GuessContentType' => $vendorDir . '/sabre/dav/lib/DAV/Browser/GuessContentType.php',
-    'Sabre\\DAV\\Browser\\HtmlOutput' => $vendorDir . '/sabre/dav/lib/DAV/Browser/HtmlOutput.php',
-    'Sabre\\DAV\\Browser\\HtmlOutputHelper' => $vendorDir . '/sabre/dav/lib/DAV/Browser/HtmlOutputHelper.php',
-    'Sabre\\DAV\\Browser\\MapGetToPropFind' => $vendorDir . '/sabre/dav/lib/DAV/Browser/MapGetToPropFind.php',
-    'Sabre\\DAV\\Browser\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Browser/Plugin.php',
-    'Sabre\\DAV\\Browser\\PropFindAll' => $vendorDir . '/sabre/dav/lib/DAV/Browser/PropFindAll.php',
-    'Sabre\\DAV\\Client' => $vendorDir . '/sabre/dav/lib/DAV/Client.php',
-    'Sabre\\DAV\\Collection' => $vendorDir . '/sabre/dav/lib/DAV/Collection.php',
-    'Sabre\\DAV\\CorePlugin' => $vendorDir . '/sabre/dav/lib/DAV/CorePlugin.php',
-    'Sabre\\DAV\\Exception' => $vendorDir . '/sabre/dav/lib/DAV/Exception.php',
-    'Sabre\\DAV\\Exception\\BadRequest' => $vendorDir . '/sabre/dav/lib/DAV/Exception/BadRequest.php',
-    'Sabre\\DAV\\Exception\\Conflict' => $vendorDir . '/sabre/dav/lib/DAV/Exception/Conflict.php',
-    'Sabre\\DAV\\Exception\\ConflictingLock' => $vendorDir . '/sabre/dav/lib/DAV/Exception/ConflictingLock.php',
-    'Sabre\\DAV\\Exception\\Forbidden' => $vendorDir . '/sabre/dav/lib/DAV/Exception/Forbidden.php',
-    'Sabre\\DAV\\Exception\\InsufficientStorage' => $vendorDir . '/sabre/dav/lib/DAV/Exception/InsufficientStorage.php',
-    'Sabre\\DAV\\Exception\\InvalidResourceType' => $vendorDir . '/sabre/dav/lib/DAV/Exception/InvalidResourceType.php',
-    'Sabre\\DAV\\Exception\\InvalidSyncToken' => $vendorDir . '/sabre/dav/lib/DAV/Exception/InvalidSyncToken.php',
-    'Sabre\\DAV\\Exception\\LengthRequired' => $vendorDir . '/sabre/dav/lib/DAV/Exception/LengthRequired.php',
-    'Sabre\\DAV\\Exception\\LockTokenMatchesRequestUri' => $vendorDir . '/sabre/dav/lib/DAV/Exception/LockTokenMatchesRequestUri.php',
-    'Sabre\\DAV\\Exception\\Locked' => $vendorDir . '/sabre/dav/lib/DAV/Exception/Locked.php',
-    'Sabre\\DAV\\Exception\\MethodNotAllowed' => $vendorDir . '/sabre/dav/lib/DAV/Exception/MethodNotAllowed.php',
-    'Sabre\\DAV\\Exception\\NotAuthenticated' => $vendorDir . '/sabre/dav/lib/DAV/Exception/NotAuthenticated.php',
-    'Sabre\\DAV\\Exception\\NotFound' => $vendorDir . '/sabre/dav/lib/DAV/Exception/NotFound.php',
-    'Sabre\\DAV\\Exception\\NotImplemented' => $vendorDir . '/sabre/dav/lib/DAV/Exception/NotImplemented.php',
-    'Sabre\\DAV\\Exception\\PaymentRequired' => $vendorDir . '/sabre/dav/lib/DAV/Exception/PaymentRequired.php',
-    'Sabre\\DAV\\Exception\\PreconditionFailed' => $vendorDir . '/sabre/dav/lib/DAV/Exception/PreconditionFailed.php',
-    'Sabre\\DAV\\Exception\\ReportNotSupported' => $vendorDir . '/sabre/dav/lib/DAV/Exception/ReportNotSupported.php',
-    'Sabre\\DAV\\Exception\\RequestedRangeNotSatisfiable' => $vendorDir . '/sabre/dav/lib/DAV/Exception/RequestedRangeNotSatisfiable.php',
-    'Sabre\\DAV\\Exception\\ServiceUnavailable' => $vendorDir . '/sabre/dav/lib/DAV/Exception/ServiceUnavailable.php',
-    'Sabre\\DAV\\Exception\\TooManyMatches' => $vendorDir . '/sabre/dav/lib/DAV/Exception/TooManyMatches.php',
-    'Sabre\\DAV\\Exception\\UnsupportedMediaType' => $vendorDir . '/sabre/dav/lib/DAV/Exception/UnsupportedMediaType.php',
-    'Sabre\\DAV\\FSExt\\Directory' => $vendorDir . '/sabre/dav/lib/DAV/FSExt/Directory.php',
-    'Sabre\\DAV\\FSExt\\File' => $vendorDir . '/sabre/dav/lib/DAV/FSExt/File.php',
-    'Sabre\\DAV\\FS\\Directory' => $vendorDir . '/sabre/dav/lib/DAV/FS/Directory.php',
-    'Sabre\\DAV\\FS\\File' => $vendorDir . '/sabre/dav/lib/DAV/FS/File.php',
-    'Sabre\\DAV\\FS\\Node' => $vendorDir . '/sabre/dav/lib/DAV/FS/Node.php',
-    'Sabre\\DAV\\File' => $vendorDir . '/sabre/dav/lib/DAV/File.php',
-    'Sabre\\DAV\\ICollection' => $vendorDir . '/sabre/dav/lib/DAV/ICollection.php',
-    'Sabre\\DAV\\IExtendedCollection' => $vendorDir . '/sabre/dav/lib/DAV/IExtendedCollection.php',
-    'Sabre\\DAV\\IFile' => $vendorDir . '/sabre/dav/lib/DAV/IFile.php',
-    'Sabre\\DAV\\IMoveTarget' => $vendorDir . '/sabre/dav/lib/DAV/IMoveTarget.php',
-    'Sabre\\DAV\\IMultiGet' => $vendorDir . '/sabre/dav/lib/DAV/IMultiGet.php',
-    'Sabre\\DAV\\INode' => $vendorDir . '/sabre/dav/lib/DAV/INode.php',
-    'Sabre\\DAV\\IProperties' => $vendorDir . '/sabre/dav/lib/DAV/IProperties.php',
-    'Sabre\\DAV\\IQuota' => $vendorDir . '/sabre/dav/lib/DAV/IQuota.php',
-    'Sabre\\DAV\\Locks\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/AbstractBackend.php',
-    'Sabre\\DAV\\Locks\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/BackendInterface.php',
-    'Sabre\\DAV\\Locks\\Backend\\File' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/File.php',
-    'Sabre\\DAV\\Locks\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/PDO.php',
-    'Sabre\\DAV\\Locks\\LockInfo' => $vendorDir . '/sabre/dav/lib/DAV/Locks/LockInfo.php',
-    'Sabre\\DAV\\Locks\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Plugin.php',
-    'Sabre\\DAV\\MkCol' => $vendorDir . '/sabre/dav/lib/DAV/MkCol.php',
-    'Sabre\\DAV\\Mount\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Mount/Plugin.php',
-    'Sabre\\DAV\\Node' => $vendorDir . '/sabre/dav/lib/DAV/Node.php',
-    'Sabre\\DAV\\PartialUpdate\\IPatchSupport' => $vendorDir . '/sabre/dav/lib/DAV/PartialUpdate/IPatchSupport.php',
-    'Sabre\\DAV\\PartialUpdate\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/PartialUpdate/Plugin.php',
-    'Sabre\\DAV\\PropFind' => $vendorDir . '/sabre/dav/lib/DAV/PropFind.php',
-    'Sabre\\DAV\\PropPatch' => $vendorDir . '/sabre/dav/lib/DAV/PropPatch.php',
-    'Sabre\\DAV\\PropertyStorage\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/DAV/PropertyStorage/Backend/BackendInterface.php',
-    'Sabre\\DAV\\PropertyStorage\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php',
-    'Sabre\\DAV\\PropertyStorage\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/PropertyStorage/Plugin.php',
-    'Sabre\\DAV\\Server' => $vendorDir . '/sabre/dav/lib/DAV/Server.php',
-    'Sabre\\DAV\\ServerPlugin' => $vendorDir . '/sabre/dav/lib/DAV/ServerPlugin.php',
-    'Sabre\\DAV\\Sharing\\ISharedNode' => $vendorDir . '/sabre/dav/lib/DAV/Sharing/ISharedNode.php',
-    'Sabre\\DAV\\Sharing\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Sharing/Plugin.php',
-    'Sabre\\DAV\\SimpleCollection' => $vendorDir . '/sabre/dav/lib/DAV/SimpleCollection.php',
-    'Sabre\\DAV\\SimpleFile' => $vendorDir . '/sabre/dav/lib/DAV/SimpleFile.php',
-    'Sabre\\DAV\\StringUtil' => $vendorDir . '/sabre/dav/lib/DAV/StringUtil.php',
-    'Sabre\\DAV\\Sync\\ISyncCollection' => $vendorDir . '/sabre/dav/lib/DAV/Sync/ISyncCollection.php',
-    'Sabre\\DAV\\Sync\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Sync/Plugin.php',
-    'Sabre\\DAV\\TemporaryFileFilterPlugin' => $vendorDir . '/sabre/dav/lib/DAV/TemporaryFileFilterPlugin.php',
-    'Sabre\\DAV\\Tree' => $vendorDir . '/sabre/dav/lib/DAV/Tree.php',
-    'Sabre\\DAV\\UUIDUtil' => $vendorDir . '/sabre/dav/lib/DAV/UUIDUtil.php',
-    'Sabre\\DAV\\Version' => $vendorDir . '/sabre/dav/lib/DAV/Version.php',
-    'Sabre\\DAV\\Xml\\Element\\Prop' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Element/Prop.php',
-    'Sabre\\DAV\\Xml\\Element\\Response' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Element/Response.php',
-    'Sabre\\DAV\\Xml\\Element\\Sharee' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Element/Sharee.php',
-    'Sabre\\DAV\\Xml\\Property\\Complex' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/Complex.php',
-    'Sabre\\DAV\\Xml\\Property\\GetLastModified' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/GetLastModified.php',
-    'Sabre\\DAV\\Xml\\Property\\Href' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/Href.php',
-    'Sabre\\DAV\\Xml\\Property\\Invite' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/Invite.php',
-    'Sabre\\DAV\\Xml\\Property\\LocalHref' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/LocalHref.php',
-    'Sabre\\DAV\\Xml\\Property\\LockDiscovery' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/LockDiscovery.php',
-    'Sabre\\DAV\\Xml\\Property\\ResourceType' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/ResourceType.php',
-    'Sabre\\DAV\\Xml\\Property\\ShareAccess' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php',
-    'Sabre\\DAV\\Xml\\Property\\SupportedLock' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/SupportedLock.php',
-    'Sabre\\DAV\\Xml\\Property\\SupportedMethodSet' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php',
-    'Sabre\\DAV\\Xml\\Property\\SupportedReportSet' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/SupportedReportSet.php',
-    'Sabre\\DAV\\Xml\\Request\\Lock' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/Lock.php',
-    'Sabre\\DAV\\Xml\\Request\\MkCol' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/MkCol.php',
-    'Sabre\\DAV\\Xml\\Request\\PropFind' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/PropFind.php',
-    'Sabre\\DAV\\Xml\\Request\\PropPatch' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/PropPatch.php',
-    'Sabre\\DAV\\Xml\\Request\\ShareResource' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/ShareResource.php',
-    'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php',
-    'Sabre\\DAV\\Xml\\Response\\MultiStatus' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Response/MultiStatus.php',
-    'Sabre\\DAV\\Xml\\Service' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Service.php',
-    'Sabre\\Event\\EventEmitter' => $vendorDir . '/sabre/event/lib/EventEmitter.php',
-    'Sabre\\Event\\EventEmitterInterface' => $vendorDir . '/sabre/event/lib/EventEmitterInterface.php',
-    'Sabre\\Event\\EventEmitterTrait' => $vendorDir . '/sabre/event/lib/EventEmitterTrait.php',
-    'Sabre\\Event\\Loop\\Loop' => $vendorDir . '/sabre/event/lib/Loop/Loop.php',
-    'Sabre\\Event\\Promise' => $vendorDir . '/sabre/event/lib/Promise.php',
-    'Sabre\\Event\\PromiseAlreadyResolvedException' => $vendorDir . '/sabre/event/lib/PromiseAlreadyResolvedException.php',
-    'Sabre\\Event\\Version' => $vendorDir . '/sabre/event/lib/Version.php',
-    'Sabre\\HTTP\\Auth\\AWS' => $vendorDir . '/sabre/http/lib/Auth/AWS.php',
-    'Sabre\\HTTP\\Auth\\AbstractAuth' => $vendorDir . '/sabre/http/lib/Auth/AbstractAuth.php',
-    'Sabre\\HTTP\\Auth\\Basic' => $vendorDir . '/sabre/http/lib/Auth/Basic.php',
-    'Sabre\\HTTP\\Auth\\Bearer' => $vendorDir . '/sabre/http/lib/Auth/Bearer.php',
-    'Sabre\\HTTP\\Auth\\Digest' => $vendorDir . '/sabre/http/lib/Auth/Digest.php',
-    'Sabre\\HTTP\\Client' => $vendorDir . '/sabre/http/lib/Client.php',
-    'Sabre\\HTTP\\ClientException' => $vendorDir . '/sabre/http/lib/ClientException.php',
-    'Sabre\\HTTP\\ClientHttpException' => $vendorDir . '/sabre/http/lib/ClientHttpException.php',
-    'Sabre\\HTTP\\HttpException' => $vendorDir . '/sabre/http/lib/HttpException.php',
-    'Sabre\\HTTP\\Message' => $vendorDir . '/sabre/http/lib/Message.php',
-    'Sabre\\HTTP\\MessageDecoratorTrait' => $vendorDir . '/sabre/http/lib/MessageDecoratorTrait.php',
-    'Sabre\\HTTP\\MessageInterface' => $vendorDir . '/sabre/http/lib/MessageInterface.php',
-    'Sabre\\HTTP\\Request' => $vendorDir . '/sabre/http/lib/Request.php',
-    'Sabre\\HTTP\\RequestDecorator' => $vendorDir . '/sabre/http/lib/RequestDecorator.php',
-    'Sabre\\HTTP\\RequestInterface' => $vendorDir . '/sabre/http/lib/RequestInterface.php',
-    'Sabre\\HTTP\\Response' => $vendorDir . '/sabre/http/lib/Response.php',
-    'Sabre\\HTTP\\ResponseDecorator' => $vendorDir . '/sabre/http/lib/ResponseDecorator.php',
-    'Sabre\\HTTP\\ResponseInterface' => $vendorDir . '/sabre/http/lib/ResponseInterface.php',
-    'Sabre\\HTTP\\Sapi' => $vendorDir . '/sabre/http/lib/Sapi.php',
-    'Sabre\\HTTP\\URLUtil' => $vendorDir . '/sabre/http/lib/URLUtil.php',
-    'Sabre\\HTTP\\Util' => $vendorDir . '/sabre/http/lib/Util.php',
-    'Sabre\\HTTP\\Version' => $vendorDir . '/sabre/http/lib/Version.php',
-    'Sabre\\Uri\\Version' => $vendorDir . '/sabre/uri/lib/Version.php',
-    'Sabre\\VObject\\BirthdayCalendarGenerator' => $vendorDir . '/sabre/vobject/lib/BirthdayCalendarGenerator.php',
-    'Sabre\\VObject\\Cli' => $vendorDir . '/sabre/vobject/lib/Cli.php',
-    'Sabre\\VObject\\Component' => $vendorDir . '/sabre/vobject/lib/Component.php',
-    'Sabre\\VObject\\Component\\Available' => $vendorDir . '/sabre/vobject/lib/Component/Available.php',
-    'Sabre\\VObject\\Component\\VAlarm' => $vendorDir . '/sabre/vobject/lib/Component/VAlarm.php',
-    'Sabre\\VObject\\Component\\VAvailability' => $vendorDir . '/sabre/vobject/lib/Component/VAvailability.php',
-    'Sabre\\VObject\\Component\\VCalendar' => $vendorDir . '/sabre/vobject/lib/Component/VCalendar.php',
-    'Sabre\\VObject\\Component\\VCard' => $vendorDir . '/sabre/vobject/lib/Component/VCard.php',
-    'Sabre\\VObject\\Component\\VEvent' => $vendorDir . '/sabre/vobject/lib/Component/VEvent.php',
-    'Sabre\\VObject\\Component\\VFreeBusy' => $vendorDir . '/sabre/vobject/lib/Component/VFreeBusy.php',
-    'Sabre\\VObject\\Component\\VJournal' => $vendorDir . '/sabre/vobject/lib/Component/VJournal.php',
-    'Sabre\\VObject\\Component\\VTimeZone' => $vendorDir . '/sabre/vobject/lib/Component/VTimeZone.php',
-    'Sabre\\VObject\\Component\\VTodo' => $vendorDir . '/sabre/vobject/lib/Component/VTodo.php',
-    'Sabre\\VObject\\DateTimeParser' => $vendorDir . '/sabre/vobject/lib/DateTimeParser.php',
-    'Sabre\\VObject\\Document' => $vendorDir . '/sabre/vobject/lib/Document.php',
-    'Sabre\\VObject\\ElementList' => $vendorDir . '/sabre/vobject/lib/ElementList.php',
-    'Sabre\\VObject\\EofException' => $vendorDir . '/sabre/vobject/lib/EofException.php',
-    'Sabre\\VObject\\FreeBusyData' => $vendorDir . '/sabre/vobject/lib/FreeBusyData.php',
-    'Sabre\\VObject\\FreeBusyGenerator' => $vendorDir . '/sabre/vobject/lib/FreeBusyGenerator.php',
-    'Sabre\\VObject\\ITip\\Broker' => $vendorDir . '/sabre/vobject/lib/ITip/Broker.php',
-    'Sabre\\VObject\\ITip\\ITipException' => $vendorDir . '/sabre/vobject/lib/ITip/ITipException.php',
-    'Sabre\\VObject\\ITip\\Message' => $vendorDir . '/sabre/vobject/lib/ITip/Message.php',
-    'Sabre\\VObject\\ITip\\SameOrganizerForAllComponentsException' => $vendorDir . '/sabre/vobject/lib/ITip/SameOrganizerForAllComponentsException.php',
-    'Sabre\\VObject\\InvalidDataException' => $vendorDir . '/sabre/vobject/lib/InvalidDataException.php',
-    'Sabre\\VObject\\Node' => $vendorDir . '/sabre/vobject/lib/Node.php',
-    'Sabre\\VObject\\PHPUnitAssertions' => $vendorDir . '/sabre/vobject/lib/PHPUnitAssertions.php',
-    'Sabre\\VObject\\Parameter' => $vendorDir . '/sabre/vobject/lib/Parameter.php',
-    'Sabre\\VObject\\ParseException' => $vendorDir . '/sabre/vobject/lib/ParseException.php',
-    'Sabre\\VObject\\Parser\\Json' => $vendorDir . '/sabre/vobject/lib/Parser/Json.php',
-    'Sabre\\VObject\\Parser\\MimeDir' => $vendorDir . '/sabre/vobject/lib/Parser/MimeDir.php',
-    'Sabre\\VObject\\Parser\\Parser' => $vendorDir . '/sabre/vobject/lib/Parser/Parser.php',
-    'Sabre\\VObject\\Parser\\XML' => $vendorDir . '/sabre/vobject/lib/Parser/XML.php',
-    'Sabre\\VObject\\Parser\\XML\\Element\\KeyValue' => $vendorDir . '/sabre/vobject/lib/Parser/XML/Element/KeyValue.php',
-    'Sabre\\VObject\\Property' => $vendorDir . '/sabre/vobject/lib/Property.php',
-    'Sabre\\VObject\\Property\\Binary' => $vendorDir . '/sabre/vobject/lib/Property/Binary.php',
-    'Sabre\\VObject\\Property\\Boolean' => $vendorDir . '/sabre/vobject/lib/Property/Boolean.php',
-    'Sabre\\VObject\\Property\\FlatText' => $vendorDir . '/sabre/vobject/lib/Property/FlatText.php',
-    'Sabre\\VObject\\Property\\FloatValue' => $vendorDir . '/sabre/vobject/lib/Property/FloatValue.php',
-    'Sabre\\VObject\\Property\\ICalendar\\CalAddress' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/CalAddress.php',
-    'Sabre\\VObject\\Property\\ICalendar\\Date' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/Date.php',
-    'Sabre\\VObject\\Property\\ICalendar\\DateTime' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/DateTime.php',
-    'Sabre\\VObject\\Property\\ICalendar\\Duration' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/Duration.php',
-    'Sabre\\VObject\\Property\\ICalendar\\Period' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/Period.php',
-    'Sabre\\VObject\\Property\\ICalendar\\Recur' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/Recur.php',
-    'Sabre\\VObject\\Property\\IntegerValue' => $vendorDir . '/sabre/vobject/lib/Property/IntegerValue.php',
-    'Sabre\\VObject\\Property\\Text' => $vendorDir . '/sabre/vobject/lib/Property/Text.php',
-    'Sabre\\VObject\\Property\\Time' => $vendorDir . '/sabre/vobject/lib/Property/Time.php',
-    'Sabre\\VObject\\Property\\Unknown' => $vendorDir . '/sabre/vobject/lib/Property/Unknown.php',
-    'Sabre\\VObject\\Property\\Uri' => $vendorDir . '/sabre/vobject/lib/Property/Uri.php',
-    'Sabre\\VObject\\Property\\UtcOffset' => $vendorDir . '/sabre/vobject/lib/Property/UtcOffset.php',
-    'Sabre\\VObject\\Property\\VCard\\Date' => $vendorDir . '/sabre/vobject/lib/Property/VCard/Date.php',
-    'Sabre\\VObject\\Property\\VCard\\DateAndOrTime' => $vendorDir . '/sabre/vobject/lib/Property/VCard/DateAndOrTime.php',
-    'Sabre\\VObject\\Property\\VCard\\DateTime' => $vendorDir . '/sabre/vobject/lib/Property/VCard/DateTime.php',
-    'Sabre\\VObject\\Property\\VCard\\LanguageTag' => $vendorDir . '/sabre/vobject/lib/Property/VCard/LanguageTag.php',
-    'Sabre\\VObject\\Property\\VCard\\TimeStamp' => $vendorDir . '/sabre/vobject/lib/Property/VCard/TimeStamp.php',
-    'Sabre\\VObject\\Reader' => $vendorDir . '/sabre/vobject/lib/Reader.php',
-    'Sabre\\VObject\\Recur\\EventIterator' => $vendorDir . '/sabre/vobject/lib/Recur/EventIterator.php',
-    'Sabre\\VObject\\Recur\\MaxInstancesExceededException' => $vendorDir . '/sabre/vobject/lib/Recur/MaxInstancesExceededException.php',
-    'Sabre\\VObject\\Recur\\NoInstancesException' => $vendorDir . '/sabre/vobject/lib/Recur/NoInstancesException.php',
-    'Sabre\\VObject\\Recur\\RDateIterator' => $vendorDir . '/sabre/vobject/lib/Recur/RDateIterator.php',
-    'Sabre\\VObject\\Recur\\RRuleIterator' => $vendorDir . '/sabre/vobject/lib/Recur/RRuleIterator.php',
-    'Sabre\\VObject\\Settings' => $vendorDir . '/sabre/vobject/lib/Settings.php',
-    'Sabre\\VObject\\Splitter\\ICalendar' => $vendorDir . '/sabre/vobject/lib/Splitter/ICalendar.php',
-    'Sabre\\VObject\\Splitter\\SplitterInterface' => $vendorDir . '/sabre/vobject/lib/Splitter/SplitterInterface.php',
-    'Sabre\\VObject\\Splitter\\VCard' => $vendorDir . '/sabre/vobject/lib/Splitter/VCard.php',
-    'Sabre\\VObject\\StringUtil' => $vendorDir . '/sabre/vobject/lib/StringUtil.php',
-    'Sabre\\VObject\\TimeZoneUtil' => $vendorDir . '/sabre/vobject/lib/TimeZoneUtil.php',
-    'Sabre\\VObject\\UUIDUtil' => $vendorDir . '/sabre/vobject/lib/UUIDUtil.php',
-    'Sabre\\VObject\\VCardConverter' => $vendorDir . '/sabre/vobject/lib/VCardConverter.php',
-    'Sabre\\VObject\\Version' => $vendorDir . '/sabre/vobject/lib/Version.php',
-    'Sabre\\VObject\\Writer' => $vendorDir . '/sabre/vobject/lib/Writer.php',
-    'Sabre\\Xml\\ContextStackTrait' => $vendorDir . '/sabre/xml/lib/ContextStackTrait.php',
-    'Sabre\\Xml\\Element' => $vendorDir . '/sabre/xml/lib/Element.php',
-    'Sabre\\Xml\\Element\\Base' => $vendorDir . '/sabre/xml/lib/Element/Base.php',
-    'Sabre\\Xml\\Element\\Cdata' => $vendorDir . '/sabre/xml/lib/Element/Cdata.php',
-    'Sabre\\Xml\\Element\\Elements' => $vendorDir . '/sabre/xml/lib/Element/Elements.php',
-    'Sabre\\Xml\\Element\\KeyValue' => $vendorDir . '/sabre/xml/lib/Element/KeyValue.php',
-    'Sabre\\Xml\\Element\\Uri' => $vendorDir . '/sabre/xml/lib/Element/Uri.php',
-    'Sabre\\Xml\\Element\\XmlFragment' => $vendorDir . '/sabre/xml/lib/Element/XmlFragment.php',
-    'Sabre\\Xml\\LibXMLException' => $vendorDir . '/sabre/xml/lib/LibXMLException.php',
-    'Sabre\\Xml\\ParseException' => $vendorDir . '/sabre/xml/lib/ParseException.php',
-    'Sabre\\Xml\\Reader' => $vendorDir . '/sabre/xml/lib/Reader.php',
-    'Sabre\\Xml\\Service' => $vendorDir . '/sabre/xml/lib/Service.php',
-    'Sabre\\Xml\\Version' => $vendorDir . '/sabre/xml/lib/Version.php',
-    'Sabre\\Xml\\Writer' => $vendorDir . '/sabre/xml/lib/Writer.php',
-    'Sabre\\Xml\\XmlDeserializable' => $vendorDir . '/sabre/xml/lib/XmlDeserializable.php',
-    'Sabre\\Xml\\XmlSerializable' => $vendorDir . '/sabre/xml/lib/XmlSerializable.php',
-    'Test\\Markdownify\\ConverterExtraTest' => $vendorDir . '/pixel418/markdownify/test/ConverterExtraTest.php',
-    'Test\\Markdownify\\ConverterTest' => $vendorDir . '/pixel418/markdownify/test/ConverterTest.php',
-    'Test\\Markdownify\\ConverterTestCase' => $vendorDir . '/pixel418/markdownify/test/ConverterTestCase.php',
-    'Zotlabs\\Access\\AccessList' => $baseDir . '/Zotlabs/Access/AccessList.php',
-    'Zotlabs\\Access\\PermissionLimits' => $baseDir . '/Zotlabs/Access/PermissionLimits.php',
-    'Zotlabs\\Access\\PermissionRoles' => $baseDir . '/Zotlabs/Access/PermissionRoles.php',
-    'Zotlabs\\Access\\Permissions' => $baseDir . '/Zotlabs/Access/Permissions.php',
-    'Zotlabs\\Daemon\\Addon' => $baseDir . '/Zotlabs/Daemon/Addon.php',
-    'Zotlabs\\Daemon\\Checksites' => $baseDir . '/Zotlabs/Daemon/Checksites.php',
-    'Zotlabs\\Daemon\\Cli_suggest' => $baseDir . '/Zotlabs/Daemon/Cli_suggest.php',
-    'Zotlabs\\Daemon\\Cron' => $baseDir . '/Zotlabs/Daemon/Cron.php',
-    'Zotlabs\\Daemon\\Cron_daily' => $baseDir . '/Zotlabs/Daemon/Cron_daily.php',
-    'Zotlabs\\Daemon\\Cron_weekly' => $baseDir . '/Zotlabs/Daemon/Cron_weekly.php',
-    'Zotlabs\\Daemon\\Cronhooks' => $baseDir . '/Zotlabs/Daemon/Cronhooks.php',
-    'Zotlabs\\Daemon\\CurlAuth' => $baseDir . '/Zotlabs/Daemon/CurlAuth.php',
-    'Zotlabs\\Daemon\\Deliver' => $baseDir . '/Zotlabs/Daemon/Deliver.php',
-    'Zotlabs\\Daemon\\Deliver_hooks' => $baseDir . '/Zotlabs/Daemon/Deliver_hooks.php',
-    'Zotlabs\\Daemon\\Directory' => $baseDir . '/Zotlabs/Daemon/Directory.php',
-    'Zotlabs\\Daemon\\Expire' => $baseDir . '/Zotlabs/Daemon/Expire.php',
-    'Zotlabs\\Daemon\\Externals' => $baseDir . '/Zotlabs/Daemon/Externals.php',
-    'Zotlabs\\Daemon\\Gprobe' => $baseDir . '/Zotlabs/Daemon/Gprobe.php',
-    'Zotlabs\\Daemon\\Importdoc' => $baseDir . '/Zotlabs/Daemon/Importdoc.php',
-    'Zotlabs\\Daemon\\Master' => $baseDir . '/Zotlabs/Daemon/Master.php',
-    'Zotlabs\\Daemon\\Notifier' => $baseDir . '/Zotlabs/Daemon/Notifier.php',
-    'Zotlabs\\Daemon\\Onedirsync' => $baseDir . '/Zotlabs/Daemon/Onedirsync.php',
-    'Zotlabs\\Daemon\\Onepoll' => $baseDir . '/Zotlabs/Daemon/Onepoll.php',
-    'Zotlabs\\Daemon\\Poller' => $baseDir . '/Zotlabs/Daemon/Poller.php',
-    'Zotlabs\\Daemon\\Queue' => $baseDir . '/Zotlabs/Daemon/Queue.php',
-    'Zotlabs\\Daemon\\Ratenotif' => $baseDir . '/Zotlabs/Daemon/Ratenotif.php',
-    'Zotlabs\\Extend\\Hook' => $baseDir . '/Zotlabs/Extend/Hook.php',
-    'Zotlabs\\Identity\\BasicId\\BasicId' => $baseDir . '/Zotlabs/Identity/BasicId.php',
-    'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => $baseDir . '/Zotlabs/Identity/ProfilePhoto.php',
-    'Zotlabs\\Lib\\AConfig' => $baseDir . '/Zotlabs/Lib/AConfig.php',
-    'Zotlabs\\Lib\\AbConfig' => $baseDir . '/Zotlabs/Lib/AbConfig.php',
-    'Zotlabs\\Lib\\Api_router' => $baseDir . '/Zotlabs/Lib/Api_router.php',
-    'Zotlabs\\Lib\\Apps' => $baseDir . '/Zotlabs/Lib/Apps.php',
-    'Zotlabs\\Lib\\Cache' => $baseDir . '/Zotlabs/Lib/Cache.php',
-    'Zotlabs\\Lib\\Chatroom' => $baseDir . '/Zotlabs/Lib/Chatroom.php',
-    'Zotlabs\\Lib\\Config' => $baseDir . '/Zotlabs/Lib/Config.php',
-    'Zotlabs\\Lib\\Enotify' => $baseDir . '/Zotlabs/Lib/Enotify.php',
-    'Zotlabs\\Lib\\ExtendedZip' => $baseDir . '/Zotlabs/Lib/ExtendedZip.php',
-    'Zotlabs\\Lib\\IConfig' => $baseDir . '/Zotlabs/Lib/IConfig.php',
-    'Zotlabs\\Lib\\NativeWiki' => $baseDir . '/Zotlabs/Lib/NativeWiki.php',
-    'Zotlabs\\Lib\\NativeWikiPage' => $baseDir . '/Zotlabs/Lib/NativeWikiPage.php',
-    'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php',
-    'Zotlabs\\Lib\\Permcat' => $baseDir . '/Zotlabs/Lib/Permcat.php',
-    'Zotlabs\\Lib\\PermissionDescription' => $baseDir . '/Zotlabs/Lib/PermissionDescription.php',
-    'Zotlabs\\Lib\\ProtoDriver' => $baseDir . '/Zotlabs/Lib/ProtoDriver.php',
-    'Zotlabs\\Lib\\SuperCurl' => $baseDir . '/Zotlabs/Lib/SuperCurl.php',
-    'Zotlabs\\Lib\\System' => $baseDir . '/Zotlabs/Lib/System.php',
-    'Zotlabs\\Lib\\Techlevels' => $baseDir . '/Zotlabs/Lib/Techlevels.php',
-    'Zotlabs\\Lib\\ThreadItem' => $baseDir . '/Zotlabs/Lib/ThreadItem.php',
-    'Zotlabs\\Lib\\ThreadStream' => $baseDir . '/Zotlabs/Lib/ThreadStream.php',
-    'Zotlabs\\Lib\\XConfig' => $baseDir . '/Zotlabs/Lib/XConfig.php',
-    'Zotlabs\\Lib\\ZotDriver' => $baseDir . '/Zotlabs/Lib/ZotDriver.php',
-    'Zotlabs\\Module\\Achievements' => $baseDir . '/Zotlabs/Module/Achievements.php',
-    'Zotlabs\\Module\\Acl' => $baseDir . '/Zotlabs/Module/Acl.php',
-    'Zotlabs\\Module\\Admin' => $baseDir . '/Zotlabs/Module/Admin.php',
-    'Zotlabs\\Module\\Admin\\Account_edit' => $baseDir . '/Zotlabs/Module/Admin/Account_edit.php',
-    'Zotlabs\\Module\\Admin\\Accounts' => $baseDir . '/Zotlabs/Module/Admin/Accounts.php',
-    'Zotlabs\\Module\\Admin\\Channels' => $baseDir . '/Zotlabs/Module/Admin/Channels.php',
-    'Zotlabs\\Module\\Admin\\Dbsync' => $baseDir . '/Zotlabs/Module/Admin/Dbsync.php',
-    'Zotlabs\\Module\\Admin\\Features' => $baseDir . '/Zotlabs/Module/Admin/Features.php',
-    'Zotlabs\\Module\\Admin\\Logs' => $baseDir . '/Zotlabs/Module/Admin/Logs.php',
-    'Zotlabs\\Module\\Admin\\Plugins' => $baseDir . '/Zotlabs/Module/Admin/Plugins.php',
-    'Zotlabs\\Module\\Admin\\Profs' => $baseDir . '/Zotlabs/Module/Admin/Profs.php',
-    'Zotlabs\\Module\\Admin\\Queue' => $baseDir . '/Zotlabs/Module/Admin/Queue.php',
-    'Zotlabs\\Module\\Admin\\Security' => $baseDir . '/Zotlabs/Module/Admin/Security.php',
-    'Zotlabs\\Module\\Admin\\Site' => $baseDir . '/Zotlabs/Module/Admin/Site.php',
-    'Zotlabs\\Module\\Admin\\Themes' => $baseDir . '/Zotlabs/Module/Admin/Themes.php',
-    'Zotlabs\\Module\\Api' => $baseDir . '/Zotlabs/Module/Api.php',
-    'Zotlabs\\Module\\Appman' => $baseDir . '/Zotlabs/Module/Appman.php',
-    'Zotlabs\\Module\\Apps' => $baseDir . '/Zotlabs/Module/Apps.php',
-    'Zotlabs\\Module\\Attach' => $baseDir . '/Zotlabs/Module/Attach.php',
-    'Zotlabs\\Module\\Authtest' => $baseDir . '/Zotlabs/Module/Authtest.php',
-    'Zotlabs\\Module\\Block' => $baseDir . '/Zotlabs/Module/Block.php',
-    'Zotlabs\\Module\\Blocks' => $baseDir . '/Zotlabs/Module/Blocks.php',
-    'Zotlabs\\Module\\Bookmarks' => $baseDir . '/Zotlabs/Module/Bookmarks.php',
-    'Zotlabs\\Module\\Branchtopic' => $baseDir . '/Zotlabs/Module/Branchtopic.php',
-    'Zotlabs\\Module\\Cal' => $baseDir . '/Zotlabs/Module/Cal.php',
-    'Zotlabs\\Module\\Channel' => $baseDir . '/Zotlabs/Module/Channel.php',
-    'Zotlabs\\Module\\Chanview' => $baseDir . '/Zotlabs/Module/Chanview.php',
-    'Zotlabs\\Module\\Chat' => $baseDir . '/Zotlabs/Module/Chat.php',
-    'Zotlabs\\Module\\Chatsvc' => $baseDir . '/Zotlabs/Module/Chatsvc.php',
-    'Zotlabs\\Module\\Cloud' => $baseDir . '/Zotlabs/Module/Cloud.php',
-    'Zotlabs\\Module\\Common' => $baseDir . '/Zotlabs/Module/Common.php',
-    'Zotlabs\\Module\\Connect' => $baseDir . '/Zotlabs/Module/Connect.php',
-    'Zotlabs\\Module\\Connections' => $baseDir . '/Zotlabs/Module/Connections.php',
-    'Zotlabs\\Module\\Connedit' => $baseDir . '/Zotlabs/Module/Connedit.php',
-    'Zotlabs\\Module\\Contactgroup' => $baseDir . '/Zotlabs/Module/Contactgroup.php',
-    'Zotlabs\\Module\\Cover_photo' => $baseDir . '/Zotlabs/Module/Cover_photo.php',
-    'Zotlabs\\Module\\Dav' => $baseDir . '/Zotlabs/Module/Dav.php',
-    'Zotlabs\\Module\\Directory' => $baseDir . '/Zotlabs/Module/Directory.php',
-    'Zotlabs\\Module\\Dirsearch' => $baseDir . '/Zotlabs/Module/Dirsearch.php',
-    'Zotlabs\\Module\\Display' => $baseDir . '/Zotlabs/Module/Display.php',
-    'Zotlabs\\Module\\Dreport' => $baseDir . '/Zotlabs/Module/Dreport.php',
-    'Zotlabs\\Module\\Editblock' => $baseDir . '/Zotlabs/Module/Editblock.php',
-    'Zotlabs\\Module\\Editlayout' => $baseDir . '/Zotlabs/Module/Editlayout.php',
-    'Zotlabs\\Module\\Editpost' => $baseDir . '/Zotlabs/Module/Editpost.php',
-    'Zotlabs\\Module\\Editwebpage' => $baseDir . '/Zotlabs/Module/Editwebpage.php',
-    'Zotlabs\\Module\\Embedphotos' => $baseDir . '/Zotlabs/Module/Embedphotos.php',
-    'Zotlabs\\Module\\Events' => $baseDir . '/Zotlabs/Module/Events.php',
-    'Zotlabs\\Module\\Fbrowser' => $baseDir . '/Zotlabs/Module/Fbrowser.php',
-    'Zotlabs\\Module\\Feed' => $baseDir . '/Zotlabs/Module/Feed.php',
-    'Zotlabs\\Module\\Fhublocs' => $baseDir . '/Zotlabs/Module/Fhublocs.php',
-    'Zotlabs\\Module\\File_upload' => $baseDir . '/Zotlabs/Module/File_upload.php',
-    'Zotlabs\\Module\\Filer' => $baseDir . '/Zotlabs/Module/Filer.php',
-    'Zotlabs\\Module\\Filerm' => $baseDir . '/Zotlabs/Module/Filerm.php',
-    'Zotlabs\\Module\\Filestorage' => $baseDir . '/Zotlabs/Module/Filestorage.php',
-    'Zotlabs\\Module\\Follow' => $baseDir . '/Zotlabs/Module/Follow.php',
-    'Zotlabs\\Module\\Getfile' => $baseDir . '/Zotlabs/Module/Getfile.php',
-    'Zotlabs\\Module\\Group' => $baseDir . '/Zotlabs/Module/Group.php',
-    'Zotlabs\\Module\\Hcard' => $baseDir . '/Zotlabs/Module/Hcard.php',
-    'Zotlabs\\Module\\Help' => $baseDir . '/Zotlabs/Module/Help.php',
-    'Zotlabs\\Module\\Home' => $baseDir . '/Zotlabs/Module/Home.php',
-    'Zotlabs\\Module\\Hostxrd' => $baseDir . '/Zotlabs/Module/Hostxrd.php',
-    'Zotlabs\\Module\\Impel' => $baseDir . '/Zotlabs/Module/Impel.php',
-    'Zotlabs\\Module\\Import' => $baseDir . '/Zotlabs/Module/Import.php',
-    'Zotlabs\\Module\\Import_items' => $baseDir . '/Zotlabs/Module/Import_items.php',
-    'Zotlabs\\Module\\Invite' => $baseDir . '/Zotlabs/Module/Invite.php',
-    'Zotlabs\\Module\\Item' => $baseDir . '/Zotlabs/Module/Item.php',
-    'Zotlabs\\Module\\Lang' => $baseDir . '/Zotlabs/Module/Lang.php',
-    'Zotlabs\\Module\\Layouts' => $baseDir . '/Zotlabs/Module/Layouts.php',
-    'Zotlabs\\Module\\Like' => $baseDir . '/Zotlabs/Module/Like.php',
-    'Zotlabs\\Module\\Linkinfo' => $baseDir . '/Zotlabs/Module/Linkinfo.php',
-    'Zotlabs\\Module\\Lockview' => $baseDir . '/Zotlabs/Module/Lockview.php',
-    'Zotlabs\\Module\\Locs' => $baseDir . '/Zotlabs/Module/Locs.php',
-    'Zotlabs\\Module\\Login' => $baseDir . '/Zotlabs/Module/Login.php',
-    'Zotlabs\\Module\\Lostpass' => $baseDir . '/Zotlabs/Module/Lostpass.php',
-    'Zotlabs\\Module\\Magic' => $baseDir . '/Zotlabs/Module/Magic.php',
-    'Zotlabs\\Module\\Mail' => $baseDir . '/Zotlabs/Module/Mail.php',
-    'Zotlabs\\Module\\Manage' => $baseDir . '/Zotlabs/Module/Manage.php',
-    'Zotlabs\\Module\\Menu' => $baseDir . '/Zotlabs/Module/Menu.php',
-    'Zotlabs\\Module\\Message' => $baseDir . '/Zotlabs/Module/Message.php',
-    'Zotlabs\\Module\\Mitem' => $baseDir . '/Zotlabs/Module/Mitem.php',
-    'Zotlabs\\Module\\Mood' => $baseDir . '/Zotlabs/Module/Mood.php',
-    'Zotlabs\\Module\\Network' => $baseDir . '/Zotlabs/Module/Network.php',
-    'Zotlabs\\Module\\New_channel' => $baseDir . '/Zotlabs/Module/New_channel.php',
-    'Zotlabs\\Module\\Nojs' => $baseDir . '/Zotlabs/Module/Nojs.php',
-    'Zotlabs\\Module\\Notes' => $baseDir . '/Zotlabs/Module/Notes.php',
-    'Zotlabs\\Module\\Notifications' => $baseDir . '/Zotlabs/Module/Notifications.php',
-    'Zotlabs\\Module\\Notify' => $baseDir . '/Zotlabs/Module/Notify.php',
-    'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php',
-    'Zotlabs\\Module\\Oep' => $baseDir . '/Zotlabs/Module/Oep.php',
-    'Zotlabs\\Module\\Oexchange' => $baseDir . '/Zotlabs/Module/Oexchange.php',
-    'Zotlabs\\Module\\Online' => $baseDir . '/Zotlabs/Module/Online.php',
-    'Zotlabs\\Module\\Page' => $baseDir . '/Zotlabs/Module/Page.php',
-    'Zotlabs\\Module\\Pconfig' => $baseDir . '/Zotlabs/Module/Pconfig.php',
-    'Zotlabs\\Module\\Pdledit' => $baseDir . '/Zotlabs/Module/Pdledit.php',
-    'Zotlabs\\Module\\Permcat' => $baseDir . '/Zotlabs/Module/Permcat.php',
-    'Zotlabs\\Module\\Photo' => $baseDir . '/Zotlabs/Module/Photo.php',
-    'Zotlabs\\Module\\Photos' => $baseDir . '/Zotlabs/Module/Photos.php',
-    'Zotlabs\\Module\\Ping' => $baseDir . '/Zotlabs/Module/Ping.php',
-    'Zotlabs\\Module\\Poco' => $baseDir . '/Zotlabs/Module/Poco.php',
-    'Zotlabs\\Module\\Poke' => $baseDir . '/Zotlabs/Module/Poke.php',
-    'Zotlabs\\Module\\Post' => $baseDir . '/Zotlabs/Module/Post.php',
-    'Zotlabs\\Module\\Prate' => $baseDir . '/Zotlabs/Module/Prate.php',
-    'Zotlabs\\Module\\Pretheme' => $baseDir . '/Zotlabs/Module/Pretheme.php',
-    'Zotlabs\\Module\\Probe' => $baseDir . '/Zotlabs/Module/Probe.php',
-    'Zotlabs\\Module\\Profile' => $baseDir . '/Zotlabs/Module/Profile.php',
-    'Zotlabs\\Module\\Profile_photo' => $baseDir . '/Zotlabs/Module/Profile_photo.php',
-    'Zotlabs\\Module\\Profiles' => $baseDir . '/Zotlabs/Module/Profiles.php',
-    'Zotlabs\\Module\\Profperm' => $baseDir . '/Zotlabs/Module/Profperm.php',
-    'Zotlabs\\Module\\Pubsites' => $baseDir . '/Zotlabs/Module/Pubsites.php',
-    'Zotlabs\\Module\\Pubstream' => $baseDir . '/Zotlabs/Module/Pubstream.php',
-    'Zotlabs\\Module\\Randprof' => $baseDir . '/Zotlabs/Module/Randprof.php',
-    'Zotlabs\\Module\\Rate' => $baseDir . '/Zotlabs/Module/Rate.php',
-    'Zotlabs\\Module\\Ratings' => $baseDir . '/Zotlabs/Module/Ratings.php',
-    'Zotlabs\\Module\\Ratingsearch' => $baseDir . '/Zotlabs/Module/Ratingsearch.php',
-    'Zotlabs\\Module\\Rbmark' => $baseDir . '/Zotlabs/Module/Rbmark.php',
-    'Zotlabs\\Module\\React' => $baseDir . '/Zotlabs/Module/React.php',
-    'Zotlabs\\Module\\Regdir' => $baseDir . '/Zotlabs/Module/Regdir.php',
-    'Zotlabs\\Module\\Register' => $baseDir . '/Zotlabs/Module/Register.php',
-    'Zotlabs\\Module\\Regmod' => $baseDir . '/Zotlabs/Module/Regmod.php',
-    'Zotlabs\\Module\\Regver' => $baseDir . '/Zotlabs/Module/Regver.php',
-    'Zotlabs\\Module\\Removeaccount' => $baseDir . '/Zotlabs/Module/Removeaccount.php',
-    'Zotlabs\\Module\\Removeme' => $baseDir . '/Zotlabs/Module/Removeme.php',
-    'Zotlabs\\Module\\Rmagic' => $baseDir . '/Zotlabs/Module/Rmagic.php',
-    'Zotlabs\\Module\\Rpost' => $baseDir . '/Zotlabs/Module/Rpost.php',
-    'Zotlabs\\Module\\Search' => $baseDir . '/Zotlabs/Module/Search.php',
-    'Zotlabs\\Module\\Search_ac' => $baseDir . '/Zotlabs/Module/Search_ac.php',
-    'Zotlabs\\Module\\Service_limits' => $baseDir . '/Zotlabs/Module/Service_limits.php',
-    'Zotlabs\\Module\\Settings' => $baseDir . '/Zotlabs/Module/Settings.php',
-    'Zotlabs\\Module\\Settings\\Account' => $baseDir . '/Zotlabs/Module/Settings/Account.php',
-    'Zotlabs\\Module\\Settings\\Channel' => $baseDir . '/Zotlabs/Module/Settings/Channel.php',
-    'Zotlabs\\Module\\Settings\\Display' => $baseDir . '/Zotlabs/Module/Settings/Display.php',
-    'Zotlabs\\Module\\Settings\\Featured' => $baseDir . '/Zotlabs/Module/Settings/Featured.php',
-    'Zotlabs\\Module\\Settings\\Features' => $baseDir . '/Zotlabs/Module/Settings/Features.php',
-    'Zotlabs\\Module\\Settings\\Oauth' => $baseDir . '/Zotlabs/Module/Settings/Oauth.php',
-    'Zotlabs\\Module\\Settings\\Permcats' => $baseDir . '/Zotlabs/Module/Settings/Permcats.php',
-    'Zotlabs\\Module\\Settings\\Tokens' => $baseDir . '/Zotlabs/Module/Settings/Tokens.php',
-    'Zotlabs\\Module\\Setup' => $baseDir . '/Zotlabs/Module/Setup.php',
-    'Zotlabs\\Module\\Share' => $baseDir . '/Zotlabs/Module/Share.php',
-    'Zotlabs\\Module\\Sharedwithme' => $baseDir . '/Zotlabs/Module/Sharedwithme.php',
-    'Zotlabs\\Module\\Siteinfo' => $baseDir . '/Zotlabs/Module/Siteinfo.php',
-    'Zotlabs\\Module\\Siteinfo_json' => $baseDir . '/Zotlabs/Module/Siteinfo_json.php',
-    'Zotlabs\\Module\\Sitelist' => $baseDir . '/Zotlabs/Module/Sitelist.php',
-    'Zotlabs\\Module\\Smilies' => $baseDir . '/Zotlabs/Module/Smilies.php',
-    'Zotlabs\\Module\\Snap' => $baseDir . '/Zotlabs/Module/Snap.php',
-    'Zotlabs\\Module\\Sources' => $baseDir . '/Zotlabs/Module/Sources.php',
-    'Zotlabs\\Module\\Sslify' => $baseDir . '/Zotlabs/Module/Sslify.php',
-    'Zotlabs\\Module\\Starred' => $baseDir . '/Zotlabs/Module/Starred.php',
-    'Zotlabs\\Module\\Subthread' => $baseDir . '/Zotlabs/Module/Subthread.php',
-    'Zotlabs\\Module\\Suggest' => $baseDir . '/Zotlabs/Module/Suggest.php',
-    'Zotlabs\\Module\\Tagger' => $baseDir . '/Zotlabs/Module/Tagger.php',
-    'Zotlabs\\Module\\Tagrm' => $baseDir . '/Zotlabs/Module/Tagrm.php',
-    'Zotlabs\\Module\\Tasks' => $baseDir . '/Zotlabs/Module/Tasks.php',
-    'Zotlabs\\Module\\Theme_info' => $baseDir . '/Zotlabs/Module/Theme_info.php',
-    'Zotlabs\\Module\\Thing' => $baseDir . '/Zotlabs/Module/Thing.php',
-    'Zotlabs\\Module\\Toggle_mobile' => $baseDir . '/Zotlabs/Module/Toggle_mobile.php',
-    'Zotlabs\\Module\\Toggle_safesearch' => $baseDir . '/Zotlabs/Module/Toggle_safesearch.php',
-    'Zotlabs\\Module\\Uexport' => $baseDir . '/Zotlabs/Module/Uexport.php',
-    'Zotlabs\\Module\\Update_channel' => $baseDir . '/Zotlabs/Module/Update_channel.php',
-    'Zotlabs\\Module\\Update_display' => $baseDir . '/Zotlabs/Module/Update_display.php',
-    'Zotlabs\\Module\\Update_home' => $baseDir . '/Zotlabs/Module/Update_home.php',
-    'Zotlabs\\Module\\Update_network' => $baseDir . '/Zotlabs/Module/Update_network.php',
-    'Zotlabs\\Module\\Update_pubstream' => $baseDir . '/Zotlabs/Module/Update_pubstream.php',
-    'Zotlabs\\Module\\Update_search' => $baseDir . '/Zotlabs/Module/Update_search.php',
-    'Zotlabs\\Module\\View' => $baseDir . '/Zotlabs/Module/View.php',
-    'Zotlabs\\Module\\Viewconnections' => $baseDir . '/Zotlabs/Module/Viewconnections.php',
-    'Zotlabs\\Module\\Viewsrc' => $baseDir . '/Zotlabs/Module/Viewsrc.php',
-    'Zotlabs\\Module\\Wall_attach' => $baseDir . '/Zotlabs/Module/Wall_attach.php',
-    'Zotlabs\\Module\\Wall_upload' => $baseDir . '/Zotlabs/Module/Wall_upload.php',
-    'Zotlabs\\Module\\Webfinger' => $baseDir . '/Zotlabs/Module/Webfinger.php',
-    'Zotlabs\\Module\\Webpages' => $baseDir . '/Zotlabs/Module/Webpages.php',
-    'Zotlabs\\Module\\Well_known' => $baseDir . '/Zotlabs/Module/Well_known.php',
-    'Zotlabs\\Module\\Wfinger' => $baseDir . '/Zotlabs/Module/Wfinger.php',
-    'Zotlabs\\Module\\Wiki' => $baseDir . '/Zotlabs/Module/Wiki.php',
-    'Zotlabs\\Module\\Xchan' => $baseDir . '/Zotlabs/Module/Xchan.php',
-    'Zotlabs\\Module\\Xpoco' => $baseDir . '/Zotlabs/Module/Xpoco.php',
-    'Zotlabs\\Module\\Xrd' => $baseDir . '/Zotlabs/Module/Xrd.php',
-    'Zotlabs\\Module\\Xref' => $baseDir . '/Zotlabs/Module/Xref.php',
-    'Zotlabs\\Module\\Zfinger' => $baseDir . '/Zotlabs/Module/Zfinger.php',
-    'Zotlabs\\Module\\Zotfeed' => $baseDir . '/Zotlabs/Module/Zotfeed.php',
-    'Zotlabs\\Module\\Zping' => $baseDir . '/Zotlabs/Module/Zping.php',
-    'Zotlabs\\Render\\Comanche' => $baseDir . '/Zotlabs/Render/Comanche.php',
-    'Zotlabs\\Render\\SimpleTemplate' => $baseDir . '/Zotlabs/Render/SimpleTemplate.php',
-    'Zotlabs\\Render\\SmartyInterface' => $baseDir . '/Zotlabs/Render/SmartyInterface.php',
-    'Zotlabs\\Render\\SmartyTemplate' => $baseDir . '/Zotlabs/Render/SmartyTemplate.php',
-    'Zotlabs\\Render\\TemplateEngine' => $baseDir . '/Zotlabs/Render/TemplateEngine.php',
-    'Zotlabs\\Render\\Theme' => $baseDir . '/Zotlabs/Render/Theme.php',
-    'Zotlabs\\Storage\\BasicAuth' => $baseDir . '/Zotlabs/Storage/BasicAuth.php',
-    'Zotlabs\\Storage\\Browser' => $baseDir . '/Zotlabs/Storage/Browser.php',
-    'Zotlabs\\Storage\\CalDAVClient' => $baseDir . '/Zotlabs/Storage/CalDAVClient.php',
-    'Zotlabs\\Storage\\Directory' => $baseDir . '/Zotlabs/Storage/Directory.php',
-    'Zotlabs\\Storage\\File' => $baseDir . '/Zotlabs/Storage/File.php',
-    'Zotlabs\\Storage\\GitRepo' => $baseDir . '/Zotlabs/Storage/GitRepo.php',
-    'Zotlabs\\Text\\Tagadelic' => $baseDir . '/Zotlabs/Text/Tagadelic.php',
-    'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php',
-    'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php',
-    'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php',
-    'Zotlabs\\Web\\HttpMeta' => $baseDir . '/Zotlabs/Web/HttpMeta.php',
-    'Zotlabs\\Web\\Router' => $baseDir . '/Zotlabs/Web/Router.php',
-    'Zotlabs\\Web\\Session' => $baseDir . '/Zotlabs/Web/Session.php',
-    'Zotlabs\\Web\\SessionHandler' => $baseDir . '/Zotlabs/Web/SessionHandler.php',
-    'Zotlabs\\Web\\SubModule' => $baseDir . '/Zotlabs/Web/SubModule.php',
-    'Zotlabs\\Web\\WebServer' => $baseDir . '/Zotlabs/Web/WebServer.php',
-    'Zotlabs\\Zot\\Auth' => $baseDir . '/Zotlabs/Zot/Auth.php',
-    'Zotlabs\\Zot\\DReport' => $baseDir . '/Zotlabs/Zot/DReport.php',
-    'Zotlabs\\Zot\\Finger' => $baseDir . '/Zotlabs/Zot/Finger.php',
-    'Zotlabs\\Zot\\IHandler' => $baseDir . '/Zotlabs/Zot/IHandler.php',
-    'Zotlabs\\Zot\\Receiver' => $baseDir . '/Zotlabs/Zot/Receiver.php',
-    'Zotlabs\\Zot\\Verify' => $baseDir . '/Zotlabs/Zot/Verify.php',
-    'Zotlabs\\Zot\\ZotHandler' => $baseDir . '/Zotlabs/Zot/ZotHandler.php',
 );
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 01914946c..d880bb6f5 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -6,5 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'OAuth2' => array($vendorDir . '/bshaffer/oauth2-server-php/src'),
     'Michelf' => array($vendorDir . '/michelf/php-markdown'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index bcae78e29..6200547d3 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -23,35 +23,24 @@ class ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit7b34d7e50a62201ec5d5e526a5b8b35d', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+        $map = require __DIR__ . '/autoload_namespaces.php';
+        foreach ($map as $namespace => $path) {
+            $loader->set($namespace, $path);
+        }
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
+        $map = require __DIR__ . '/autoload_psr4.php';
+        foreach ($map as $namespace => $path) {
+            $loader->setPsr4($namespace, $path);
+        }
 
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
+        $classMap = require __DIR__ . '/autoload_classmap.php';
+        if ($classMap) {
+            $loader->addClassMap($classMap);
         }
 
         $loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
+        $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $fileIdentifier => $file) {
             composerRequire7b34d7e50a62201ec5d5e526a5b8b35d($fileIdentifier, $file);
         }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 0fb88e5a1..a03d306b4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -21,7 +21,7 @@
             "phpunit/phpunit": "*",
             "sabre/cs": "~0.0.1"
         },
-        "time": "2016-03-08T02:29:27+00:00",
+        "time": "2016-03-08 02:29:27",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -79,7 +79,7 @@
         "suggest": {
             "hoa/bench": "If you would like to run the benchmark scripts"
         },
-        "time": "2016-07-15T19:52:17+00:00",
+        "time": "2016-07-15 19:52:17",
         "bin": [
             "bin/vobject",
             "bin/generate_vcards"
@@ -173,7 +173,7 @@
             "phpunit/phpunit": "*",
             "sabre/cs": "~0.0.4"
         },
-        "time": "2015-11-05T20:14:39+00:00",
+        "time": "2015-11-05 20:14:39",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -238,7 +238,7 @@
         "suggest": {
             "ext-curl": " to make http requests with the Client class"
         },
-        "time": "2016-01-06T23:00:08+00:00",
+        "time": "2016-01-06 23:00:08",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -310,7 +310,7 @@
             "ext-curl": "*",
             "ext-pdo": "*"
         },
-        "time": "2016-06-28T02:44:05+00:00",
+        "time": "2016-06-28 02:44:05",
         "bin": [
             "bin/sabredav",
             "bin/naturalselection"
@@ -379,7 +379,7 @@
             "phpunit/phpunit": "*",
             "sabre/cs": "~1.0.0"
         },
-        "time": "2016-10-09T22:57:52+00:00",
+        "time": "2016-10-09 22:57:52",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -435,7 +435,7 @@
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2016-10-10T12:19:37+00:00",
+        "time": "2016-10-10 12:19:37",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -484,7 +484,7 @@
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2016-10-29T18:58:20+00:00",
+        "time": "2016-10-29 18:58:20",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -540,7 +540,7 @@
         "require-dev": {
             "phpunit/phpunit": "^4.8"
         },
-        "time": "2016-09-21T13:01:43+00:00",
+        "time": "2016-09-21 13:01:43",
         "type": "lib",
         "installation-source": "dist",
         "autoload": {
@@ -576,5 +576,63 @@
             "markdown",
             "markdownify"
         ]
+    },
+    {
+        "name": "bshaffer/oauth2-server-php",
+        "version": "v1.9.0",
+        "version_normalized": "1.9.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/bshaffer/oauth2-server-php.git",
+            "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/8856aed1a98d6da596ae3f9b8095b5c7a1581697",
+            "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "aws/aws-sdk-php": "~2.8",
+            "firebase/php-jwt": "~2.2",
+            "mongodb/mongodb": "^1.1",
+            "predis/predis": "dev-master",
+            "thobbs/phpcassa": "dev-master"
+        },
+        "suggest": {
+            "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage",
+            "firebase/php-jwt": "~1.1 is required to use MondoDB storage",
+            "predis/predis": "Required to use Redis storage",
+            "thobbs/phpcassa": "Required to use Cassandra storage"
+        },
+        "time": "2017-01-06 23:20:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "OAuth2": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Brent Shaffer",
+                "email": "bshafs@gmail.com",
+                "homepage": "http://brentertainment.com"
+            }
+        ],
+        "description": "OAuth2 Server for PHP",
+        "homepage": "http://github.com/bshaffer/oauth2-server-php",
+        "keywords": [
+            "auth",
+            "oauth",
+            "oauth2"
+        ]
     }
 ]

From 58aa0f3e1a52a0c20016a4330100231ad505e6e4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 16:19:47 -0700
Subject: [PATCH 017/299] code_allowed is a real mess. Start the cleanup by
 remving the account level code allow and limiting to specific channels only.
 This reduces the possibility of cross channel security issues coming into
 play. Then provide a single function for checking the code permission. This
 is only partially done as we often need to check against the observer or
 logged in channel as well as the resource owner to ensure that this only
 returns true for local channels which also own the requested resource.

---
 Zotlabs/Module/Impel.php   | 14 ++------------
 Zotlabs/Module/Item.php    | 14 ++------------
 boot.php                   |  1 -
 doc/database/db_account.bb |  1 -
 include/channel.php        | 17 +++++++++++++++++
 include/import.php         | 34 +++-------------------------------
 include/text.php           | 26 ++++----------------------
 7 files changed, 28 insertions(+), 79 deletions(-)

diff --git a/Zotlabs/Module/Impel.php b/Zotlabs/Module/Impel.php
index 197d9f859..77f488d26 100644
--- a/Zotlabs/Module/Impel.php
+++ b/Zotlabs/Module/Impel.php
@@ -144,18 +144,8 @@ class Impel extends \Zotlabs\Web\Controller {
 		
 			// Verify ability to use html or php!!!
 	
-		    $execflag = false;
-	
-			if($arr['mimetype'] === 'application/x-php') {
-				$z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
-					intval(local_channel())
-				);
-	
-				if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
-					$execflag = true;
-				}
-			}
-	
+			$execflag = ((intval($channel['channel_id']) == intval(local_channel()) && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false);
+
 			$i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
 				dbesc($arr['mid']),
 				intval(local_channel())
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index afac1542d..43cf535a4 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -478,18 +478,8 @@ class Item extends \Zotlabs\Web\Controller {
 	
 		// Verify ability to use html or php!!!
 	
-		$execflag = false;
-	
-		$z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id 
-			where channel_id = %d limit 1",
-			intval($profile_uid)
-		);
-		if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
-			if($uid && (intval(get_account_id()) == intval($z[0]['account_id']))) {
-				$execflag = true;
-			}
-		}
-	
+		$execflag = ((intval($channel['channel_id']) == intval($profile_uid) && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false);
+
 		$gacl = $acl->get();
 		$str_contact_allow = $gacl['allow_cid'];
 		$str_group_allow   = $gacl['allow_gid'];
diff --git a/boot.php b/boot.php
index a80bfbed3..e19ffddb0 100755
--- a/boot.php
+++ b/boot.php
@@ -541,7 +541,6 @@ define ( 'ACCOUNT_PENDING',      0x0010 );
  * Account roles
  */
 
-define ( 'ACCOUNT_ROLE_ALLOWCODE', 0x0001 );
 define ( 'ACCOUNT_ROLE_SYSTEM',    0x0002 );
 define ( 'ACCOUNT_ROLE_DEVELOPER', 0x0004 );
 define ( 'ACCOUNT_ROLE_ADMIN',     0x1000 );
diff --git a/doc/database/db_account.bb b/doc/database/db_account.bb
index 354f2d3a8..35d7a9eb3 100644
--- a/doc/database/db_account.bb
+++ b/doc/database/db_account.bb
@@ -58,7 +58,6 @@ define ( 'ACCOUNT_PENDING',      0x0010 );
  * Account roles
  */
 
-define ( 'ACCOUNT_ROLE_ALLOWCODE', 0x0001 ); // 1 - this account can create content with PHP/Javascript
 define ( 'ACCOUNT_ROLE_SYSTEM',    0x0002 ); // 2 - this is the special system account
 define ( 'ACCOUNT_ROLE_DEVELOPER', 0x0004 );
 define ( 'ACCOUNT_ROLE_ADMIN',     0x1000 ); // 4096 - this account is an administrator
diff --git a/include/channel.php b/include/channel.php
index b838f8393..ceb5eeb7a 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2252,3 +2252,20 @@ function channel_remove($channel_id, $local = true, $unset_session=false) {
 	}
 
 }
+
+/*
+ * This checks if a channel is allowed to publish executable code.
+ * It is up to the caller to determine if the observer or local_channel 
+ * is in fact the resource owner whose channel_id is being checked
+ */
+
+function channel_codeallowed($channel_id) {
+
+	if(! intval($channel_id))
+		return false;
+
+	$x = channelx_by_n($channel_id);
+	if(($x) && ($x['channel_pageflags'] & PAGE_ALLOWCODE))
+		return true;
+	return false;
+}
\ No newline at end of file
diff --git a/include/import.php b/include/import.php
index 5c73b7ca3..bbe930864 100644
--- a/include/import.php
+++ b/include/import.php
@@ -534,16 +534,8 @@ function sync_chatrooms($channel,$chatrooms) {
 function import_items($channel,$items,$sync = false,$relocate = null) {
 
 	if($channel && $items) {
-		$allow_code = false;
-		$r = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id 
-			where channel_id = %d limit 1",
-			intval($channel['channel_id'])
-		);
-		if($r) {
-			if(($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE)) {
-				$allow_code = true;
-			}
-		}
+		
+		$allow_code = channel_codeallowed($channel['channel_id']);
 
 		$deliver = false;  // Don't deliver any messages or notifications when importing
 
@@ -1358,28 +1350,8 @@ function import_webpage_element($element, $channel, $type) {
 	}
 
 	// Verify ability to use html or php!!!
-	$execflag = false;
-	if($arr['mimetype'] === 'application/x-php' || $arr['mimetype'] === 'text/html') {
-		$z = q("select account_id, account_roles, channel_pageflags from account "
-			. "left join channel on channel_account_id = account_id where channel_id = %d limit 1", 
-			intval(local_channel())
-		);
 
-		if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) {
-			$execflag = true;
-		}
-		else {
-			logger('Unable to import element "' . $name .'" because AllowCode permission is denied.');
-			notice( t('Unable to import element "' . $name .'" because AllowCode permission is denied.') . EOL);
-			$element['import_success'] = 0;
-			return $element;
-		}
-	}
-		
-//	$z = q("select * from iconfig where v = '%s' and k = '%s' and cat = 'system' limit 1", 
-//		dbesc($name), 
-//		dbesc($namespace)
-//	);
+	$execflag = channel_codeallowed(local_channel());
 
 	$i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", 
 		dbesc($arr['mid']), 
diff --git a/include/text.php b/include/text.php
index fe3206b32..6715eca22 100644
--- a/include/text.php
+++ b/include/text.php
@@ -104,15 +104,11 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
 		return $s;
 	}
 
-	$r = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1",
+	$r = q("select channel_pageflags from channel where channel_id = %d limit 1",
 		intval($channel_id)
 	);
-	if($r) {
-		if(($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE)) {
-			if(local_channel() && (get_account_id() == $r[0]['account_id'])) {
-				return $s;
-			}
-		}
+	if(($r) && (local_channel() == $channel_id) && ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE)) {
+		return $s;
 	}
 
 	if($type === 'text/html')
@@ -1795,23 +1791,9 @@ function mimetype_select($channel_id, $current = 'text/bbcode') {
 	);
 
 
-	if(App::$is_sys) {
+	if((App::$is_sys) || (channel_codeallowed($channel_id) && $channel_id == local_channel())){
 		$x[] = 'application/x-php';
 	}
-	else {
-		$r = q("select account_id, account_roles, channel_pageflags from account left join channel on account_id = channel_account_id where
-			channel_id = %d limit 1",
-			intval($channel_id)
-		);
-
-		if($r) {
-			if(($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE)) {
-				if(local_channel() && get_account_id() == $r[0]['account_id']) {
-					$x[] = 'application/x-php';
-				}
-			}
-		}
-	}
 
 	foreach($x as $y) {
 		$selected = (($y == $current) ? ' selected="selected" ' : '');

From 41fd72920995cd2844f0262c03685edf45f93723 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 18:40:07 -0700
Subject: [PATCH 018/299] remove the unimplemented upload limit site settings

---
 view/tpl/admin_site.tpl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 0bb3ceb15..1cdb4a56b 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -71,9 +71,6 @@
 	{{include file="field_select.tpl" field=$access_policy}}
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	
 	<h3>{{$corporate}}</h3>
 	{{include file="field_checkbox.tpl" field=$verify_email}}
 	{{include file="field_checkbox.tpl" field=$feed_contacts}}

From a153368814b9753e06ab4731fd2b19a1c394b1b1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 18:58:23 -0700
Subject: [PATCH 019/299] make redbasic compatible with red 5.x

---
 view/theme/redbasic/php/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 95d5a2001..c76e77cf1 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -5,7 +5,7 @@
  *   * Description: Hubzilla standard theme
  *   * Version: 2.0
  *   * MinVersion: 2.2RC
- *   * MaxVersion: 3.0
+ *   * MaxVersion: 6.0
  *   * Author: Fabrixxm
  *   * Maintainer: Mike Macgirvin
  *   * Maintainer: Mario Vavti

From ab58c95d27e46b0fb37215d4c7b78ab370537cb6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 00:22:57 -0700
Subject: [PATCH 020/299] get rid of some cruft in boot.php

---
 boot.php | 79 ++++++++++++--------------------------------------------
 1 file changed, 17 insertions(+), 62 deletions(-)

diff --git a/boot.php b/boot.php
index e19ffddb0..9ebc7e5b6 100755
--- a/boot.php
+++ b/boot.php
@@ -5,14 +5,13 @@
  */
 
 /**
- * Hubzilla.
  *
- * Hubzilla is an open source decentralised communications
+ * This is an open source decentralised communications
  * platform combined with a decentralised identity/authentication framework
  * wrapped in an extensible content management system, providing website designers
  * the ability to embed fully decentralised communications and social tools
  * into many traditional website designs (blogs, forums, small business
- * websites, charitable organisations, etc.). Hubzilla also provides DNS mobility
+ * websites, charitable organisations, etc.). Also provided is DNS mobility
  * and internet scale privacy/access control.
  *
  * This allows any individual website to participate in a matrix of linked
@@ -126,7 +125,9 @@ define ( 'LANGUAGE_DETECT_MIN_CONFIDENCE', 0.01 );
  * either more or less restrictive.
  */
 
-define ( 'STORAGE_DEFAULT_PERMISSIONS',   0770 );
+if(! defined('STORAGE_DEFAULT_PERMISSIONS')) {
+	define ( 'STORAGE_DEFAULT_PERMISSIONS',   0770 );
+}
 
 
 /**
@@ -148,12 +149,6 @@ define ( 'STORAGE_DEFAULT_PERMISSIONS',   0770 );
 define ( 'MAX_IMAGE_LENGTH',        -1  );
 
 
-/**
- * Not yet used
- */
-
-define ( 'DEFAULT_DB_ENGINE',  'MyISAM'  );
-
 /**
  * log levels
  */
@@ -183,15 +178,6 @@ define ( 'ACCESS_PAID',            1 );
 define ( 'ACCESS_FREE',            2 );
 define ( 'ACCESS_TIERED',          3 );
 
-/**
- * relationship types
- */
-
-define ( 'CONTACT_IS_FOLLOWER', 1);
-define ( 'CONTACT_IS_SHARING',  2);
-define ( 'CONTACT_IS_FRIEND',   3);
-
-
 /**
  * DB update return values
  */
@@ -518,14 +504,6 @@ define ( 'ACTIVITY_OBJ_THING',   NAMESPACE_ZOT  . '/activity/thing' );
 define ( 'ACTIVITY_OBJ_LOCATION',NAMESPACE_ZOT  . '/activity/location' );
 define ( 'ACTIVITY_OBJ_FILE',    NAMESPACE_ZOT  . '/activity/file' );
 
-/**
- * item weight for query ordering
- */
-
-define ( 'GRAVITY_PARENT',       0);
-define ( 'GRAVITY_LIKE',         3);
-define ( 'GRAVITY_COMMENT',      6);
-
 /**
  * Account Flags
  */
@@ -550,16 +528,16 @@ define ( 'ACCOUNT_ROLE_ADMIN',     0x1000 );
  */
 
 define ( 'ITEM_VISIBLE',         0x0000);
-//define ( 'ITEM_HIDDEN',          0x0001);
+define ( 'ITEM_HIDDEN',          0x0001);
 define ( 'ITEM_BLOCKED',         0x0002);
 define ( 'ITEM_MODERATED',       0x0004);
 define ( 'ITEM_SPAM',            0x0008);
-//define ( 'ITEM_DELETED',         0x0010);
+define ( 'ITEM_DELETED',         0x0010);
 define ( 'ITEM_UNPUBLISHED',     0x0020);
-//define ( 'ITEM_WEBPAGE',         0x0040);	// is a static web page, not a conversational item
+define ( 'ITEM_WEBPAGE',         0x0040);	// is a static web page, not a conversational item
 define ( 'ITEM_DELAYED_PUBLISH', 0x0080);
 define ( 'ITEM_BUILDBLOCK',      0x0100);	// Named thusly to make sure nobody confuses this with ITEM_BLOCKED
-//define ( 'ITEM_PDL',			 0x0200);	// Page Description Language - e.g. Comanche
+define ( 'ITEM_PDL',			 0x0200);	// Page Description Language - e.g. Comanche
 define ( 'ITEM_BUG',			 0x0400);	// Is a bug, can be used by the internal bug tracker
 define ( 'ITEM_PENDING_REMOVE',  0x0800);   // deleted, notification period has lapsed
 define ( 'ITEM_DOC',             0x1000);   // hubzilla only, define here so that item import does the right thing
@@ -710,6 +688,7 @@ function startup() {
  * which is now static (although currently constructed at startup). We are only converting
  * 'system' config settings.
  */
+
 class miniApp {
 	public $config = array('system' => array());
 
@@ -1785,18 +1764,6 @@ function local_channel() {
 	return false;
 }
 
-/**
- * local_user() got deprecated and replaced by local_channel().
- *
- * @deprecated since v2.1, use local_channel()
- * @see local_channel()
- */
-function local_user() {
-	logger('local_user() is DEPRECATED, use local_channel()');
-	return local_channel();
-}
-
-
 /**
  * @brief Returns a xchan_hash (visitor_id) of remote authenticated visitor
  * or false.
@@ -1818,18 +1785,6 @@ function remote_channel() {
 	return false;
 }
 
-/**
- * remote_user() got deprecated and replaced by remote_channel().
- *
- * @deprecated since v2.1, use remote_channel()
- * @see remote_channel()
- */
-function remote_user() {
-	logger('remote_user() is DEPRECATED, use remote_channel()');
-	return remote_channel();
-}
-
-
 /**
  * Contents of $s are displayed prominently on the page the next time
  * a page is loaded. Usually used for errors or alerts.
@@ -2319,7 +2274,7 @@ function construct_page(&$a) {
 }
 
 /**
- * @brief Returns Hubzilla's root directory.
+ * @brief Returns appplication root directory.
  *
  * @return string
  */
@@ -2335,7 +2290,7 @@ function appdirpath() {
 function head_set_icon($icon) {
 
 	App::$data['pageicon'] = $icon;
-//	logger('head_set_icon: ' . $icon);
+
 }
 
 /**
@@ -2411,10 +2366,10 @@ function z_get_temp_dir() {
 function z_check_cert() {
 
 	if(strpos(z_root(),'https://') !== false) {
-		$x = z_fetch_url(z_root() . '/siteinfo/json');
+		$x = z_fetch_url(z_root() . '/siteinfo.json');
 		if(! $x['success']) {
 			$recurse = 0;
-			$y = z_fetch_url(z_root() . '/siteinfo/json',false,$recurse,array('novalidate' => true));
+			$y = z_fetch_url(z_root() . '/siteinfo.json',false,$recurse,array('novalidate' => true));
 			if($y['success'])
 				cert_bad_email();
 		}
@@ -2425,9 +2380,9 @@ function z_check_cert() {
 /**
  * @brief Send email to admin if server has an invalid certificate.
  *
- * If a Hubzilla hub is available over https it must have a publicly valid
- * certificate.
+ * If a hub is available over https it must have a publicly valid certificate.
  */
+
 function cert_bad_email() {
 
 	$email_tpl = get_intltext_template("cert_bad_eml.tpl");
@@ -2437,7 +2392,7 @@ function cert_bad_email() {
 		'$error' => t('Website SSL certificate is not valid. Please correct.')
 	));
 
-	$subject = email_header_encode(sprintf(t('[hubzilla] Website SSL error for %s'), App::get_hostname()));
+	$subject = email_header_encode(sprintf(t('[$Projectname] Website SSL error for %s'), App::get_hostname()));
 	mail(App::$config['system']['admin_email'], $subject, $email_msg,
 		'From: Administrator' . '@' . App::get_hostname() . "\n"
 		. 'Content-type: text/plain; charset=UTF-8' . "\n"

From 1244b0e36af95226ba22f86025d2b24ab09003e6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 00:23:44 -0700
Subject: [PATCH 021/299] class MarkdownSoap to safely store markdown by
 purifying and preserving (escaped) what may be unsafe code in codeblocks. The
 stored item needs to be unescaped just prior to calling the markdown-to-html
 processor

---
 Zotlabs/Lib/MarkdownSoap.php | 86 ++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 Zotlabs/Lib/MarkdownSoap.php

diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
new file mode 100644
index 000000000..d0481eb4d
--- /dev/null
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+/**
+ * MarkdownSoap
+ * Purify Markdown for storage
+ *   $x = newMarkdownSoap($string_to_be_cleansed);
+ *   $text = $x->clean();
+ *
+ * What this does:
+ * 1. extracts code blocks and privately escapes them from processing
+ * 2. Run html purifier on the content
+ * 3. put back the code blocks
+ * 4. run htmlspecialchars on the entire content for safe storage
+ *
+ * At render time: 
+ *    $markdown = \Zotlabs\Lib\MarkdownSoap::unescape($text);
+ *    $html = \Michelf\MarkdownExtra::DefaultTransform($markdown);
+ */
+
+
+
+class MarkdownSoap {
+
+	private $token;
+
+	private $str;
+
+	function __construct($s) {
+		$this->str  = $s;
+		$this->token = random_string(20);
+	}
+
+
+	function clean() {
+		$x = $this->extract_code($this->str);
+		$x = $this->purify($x);
+		$x = $this->putback_code($x);		
+		$x = $this->escape($x);
+		
+		return $x;
+	}
+
+	function extract_code($s) {
+			
+		$text = preg_replace_callback('{
+					(?:\n\n|\A\n?)
+					(	            # $1 = the code block -- one or more lines, starting with a space/tab
+					  (?>
+						[ ]{'.'4'.'}  # Lines must start with a tab or a tab-width of spaces
+						.*\n+
+					  )+
+					)
+					((?=^[ ]{0,'.'4'.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+				}xm',
+				[ $this , 'encode_code' ], $s);
+
+		return $text;
+	}
+	
+	function encode_code($matches) {
+		return $this->token . ';' . base64_encode($matches[1]) . ';' ;
+	}
+
+	function decode_code($matches) {
+		return base64_decode($matches[1]);
+	}
+
+	function putback_code($s) {
+		$text = preg_replace_callback('{' . $this->token . '\;(.*?)\;}xm',[ $this, 'decode_code' ], $s);
+		return $text;
+	}
+
+	function purify($s) {
+		return purify_html($s);
+	}
+
+	function escape($s) {
+		return htmlspecialchars($s,ENT_QUOTES);
+	}
+
+	static public function unescape($s) {
+		return htmlspecialchars_decode($s,ENT_QUOTES);
+	}
+}

From 2f5f1a4d641c5873c308d6ab58ae239f2758e1e4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 16:14:05 -0700
Subject: [PATCH 022/299] fix group by item query

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

diff --git a/include/items.php b/include/items.php
index 58305aa63..1037f9814 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3674,7 +3674,7 @@ function zot_feed($uid,$observer_hash,$arr) {
 	if(! is_sys_channel($uid))
 		$sql_extra = item_permissions_sql($uid,$observer_hash);
 
-	$limit = " LIMIT 100 ";
+	$limit = " LIMIT 5000 ";
 
 	if($mindate > NULL_DATE) {
 		$sql_extra .= " and ( created > '$mindate' or changed > '$mindate' ) ";
@@ -3686,15 +3686,7 @@ function zot_feed($uid,$observer_hash,$arr) {
 	}
 
 
-	$items = array();
-
-	/** @FIXME re-unite these SQL statements. There is no need for them to be separate. The mySQL is convoluted with misuse of group by. As it stands, there is a slight difference where the postgres version doesn't remove the duplicate parents up to 100. In practice this doesn't matter. It could be made to match behavior by adding "distinct on (parent) " to the front of the selection list, at a not-worth-it performance penalty (page temp results to disk). duplicates are still ignored in the in() clause, you just get less than 100 parents if there are many children. */
-
-	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
-		$groupby = '';
-	} else {
-		$groupby = 'GROUP BY parent';
-	}
+	$items = [];
 
 	$item_normal = item_normal();
 
@@ -3703,7 +3695,7 @@ function zot_feed($uid,$observer_hash,$arr) {
 			WHERE uid != %d
 			$item_normal
 			AND item_wall = 1
-			and item_private = 0 $sql_extra $groupby ORDER BY created ASC $limit",
+			and item_private = 0 $sql_extra ORDER BY created ASC $limit",
 			intval($uid)
 		);
 	}
@@ -3711,19 +3703,25 @@ function zot_feed($uid,$observer_hash,$arr) {
 		$r = q("SELECT parent, created, postopts from item
 			WHERE uid = %d $item_normal
 			AND item_wall = 1
-			$sql_extra $groupby ORDER BY created ASC $limit",
+			$sql_extra ORDER BY created ASC $limit",
 			intval($uid)
 		);
 	}
 
+	$parents = [];
+
 	if($r) {
-		for($x = 0; $x < count($r); $x ++) {
-			if(strpos($r[$x]['postopts'],'nodeliver') !== false) {
-				unset($r[$x]);
-			}
+		foreach($r as $rv) {
+			if(array_key_exists($rv['parent'],$parents))
+				continue;
+			if(strpos($rv['postopts'],'nodeliver') !== false)
+				continue;
+			$parents[$rv['parent']] = $rv;
+			if(count($parents) > 200)
+				break;
 		}
 
-		$parents_str = ids_to_querystr($r,'parent');
+		$parents_str = ids_to_querystr($parents,'parent');
 		$sys_query = ((is_sys_channel($uid)) ? $sql_extra : '');
 		$item_normal = item_normal();
 

From 2c73b457ef0943d46804480a0aa016f64c11edbf Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 17:07:29 -0700
Subject: [PATCH 023/299] input filter updates

---
 Zotlabs/Lib/MarkdownSoap.php   |  2 +-
 Zotlabs/Lib/NativeWikiPage.php | 31 +-----------
 Zotlabs/Module/Item.php        | 21 ++------
 Zotlabs/Module/Wiki.php        |  1 +
 include/items.php              | 91 +++++++++++++++-------------------
 include/text.php               | 18 ++++---
 6 files changed, 59 insertions(+), 105 deletions(-)

diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index d0481eb4d..2dcaaec9a 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -5,7 +5,7 @@ namespace Zotlabs\Lib;
 /**
  * MarkdownSoap
  * Purify Markdown for storage
- *   $x = newMarkdownSoap($string_to_be_cleansed);
+ *   $x = new MarkdownSoap($string_to_be_cleansed);
  *   $text = $x->clean();
  *
  * What this does:
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index 941ade90c..9f54081a1 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -307,34 +307,6 @@ class NativeWikiPage {
 		return null;
 	}
 
-
-
-	static public function prepare_content($s) {
-			
-		$text = preg_replace_callback('{
-					(?:\n\n|\A\n?)
-					(	            # $1 = the code block -- one or more lines, starting with a space/tab
-					  (?>
-						[ ]{'.'4'.'}  # Lines must start with a tab or a tab-width of spaces
-						.*\n+
-					  )+
-					)
-					((?=^[ ]{0,'.'4'.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
-				}xm',
-				'self::nwiki_prepare_content_callback', $s);
-	
-		return $text;
-	}
-	
-	static public function nwiki_prepare_content_callback($matches) {
-		$codeblock = $matches[1];
-	
-		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES, UTF8, false);
-		return "\n\n" . $codeblock ;
-	}
-	
-	
-	
 	static public function save_page($arr) {
 
 		$pageUrlName   = ((array_key_exists('pageUrlName',$arr))   ? $arr['pageUrlName']   : '');
@@ -352,7 +324,8 @@ class NativeWikiPage {
 
 		$mimetype = $w['mimeType'];
 		if($mimetype === 'text/markdown') {
-			$content = purify_html(Zlib\NativeWikiPage::prepare_content($content));
+			$x = new Zlib\MarkdownSoap($content);
+			$content = $x->clean();
 		}
 		else {
 			$content = escape_tags($content);
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 43cf535a4..71f410b2a 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -471,15 +471,16 @@ class Item extends \Zotlabs\Web\Controller {
 		if(! $mimetype)
 			$mimetype = 'text/bbcode';
 	
+
+		$execflag = ((intval($uid) == intval($profile_uid) 
+			&& ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false);
+
 		if($preview) {
-			$body = z_input_filter($profile_uid,$body,$mimetype);
+			$body = z_input_filter($body,$mimetype,$execflag);
 		}
 	
-	
 		// Verify ability to use html or php!!!
 	
-		$execflag = ((intval($channel['channel_id']) == intval($profile_uid) && ($channel['channel_pageflags'] & PAGE_ALLOWCODE)) ? true : false);
-
 		$gacl = $acl->get();
 		$str_contact_allow = $gacl['allow_cid'];
 		$str_group_allow   = $gacl['allow_gid'];
@@ -843,18 +844,6 @@ class Item extends \Zotlabs\Web\Controller {
 		if(mb_strlen($datarray['title']) > 255)
 			$datarray['title'] = mb_substr($datarray['title'],0,255);
 	
-		if(array_key_exists('item_private',$datarray) && $datarray['item_private']) {
-	
-			$datarray['body'] = trim(z_input_filter($datarray['uid'],$datarray['body'],$datarray['mimetype']));
-	
-			if($uid) {
-				if($channel['channel_hash'] === $datarray['author_xchan']) {
-					$datarray['sig'] = base64url_encode(rsa_sign($datarray['body'],$channel['channel_prvkey']));
-					$datarray['item_verified'] = 1;
-				}
-			}
-		}
-	
 		if($webpage) {
 			Zlib\IConfig::Set($datarray,'system', webpage_to_namespace($webpage),
 				(($pagetitle) ? $pagetitle : substr($datarray['mid'],0,16)),true);
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 5e7307c7b..79ec5ba25 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -243,6 +243,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 					$renderedContent = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))), argv(0) . '/' . argv(1) . '/' . $wikiUrlName);
 				}
 				else {
+					$content = Zlib\MarkdownSoap::unescape($content);
 					$html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(MarkdownExtra::defaultTransform(Zlib\NativeWikiPage::bbcode($content)))));
 					$renderedContent = Zlib\NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName);
 				}
diff --git a/include/items.php b/include/items.php
index 1037f9814..c978805cd 100755
--- a/include/items.php
+++ b/include/items.php
@@ -334,18 +334,6 @@ function post_activity_item($arr,$allow_code = false,$deliver = true) {
 	if(! array_key_exists('mimetype',$arr))
 		$arr['mimetype'] = 'text/bbcode';
 
-	if(array_key_exists('item_private',$arr) && $arr['item_private']) {
-
-		$arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
-
-		if($channel) {
-			if($channel['channel_hash'] === $arr['author_xchan']) {
-				$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
-				$arr['item_verified'] = 1;
-			}
-		}
-	}
-
 	$arr['mid']          = ((x($arr,'mid')) ? $arr['mid'] : item_message_id());
 	$arr['parent_mid']   = ((x($arr,'parent_mid')) ? $arr['parent_mid'] : $arr['mid']);
 	$arr['thr_parent']   = ((x($arr,'thr_parent')) ? $arr['thr_parent'] : $arr['mid']);
@@ -1483,35 +1471,36 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 	// obsolete, but needed so as not to throw not-null constraints on some database driveres
 	$arr['item_flags']    = ((x($arr,'item_flags'))    ? intval($arr['item_flags'])          : 0 );
 
-	// only detect language if we have text content, and if the post is private but not yet
-	// obscured, make it so.
 
-	if((! array_key_exists('item_obscured',$arr)) || $arr['item_obscured'] == 0) {
 
-		$arr['lang'] = detect_language($arr['body']);
-		// apply the input filter here - if it is obscured it has been filtered already
-		$arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
+	$arr['lang'] = detect_language($arr['body']);
+	// apply the input filter here
+	$arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec));
 
-		if(local_channel() && (local_channel() == $arr['uid']) && (! $arr['sig'])) {
+	if(local_channel() && (local_channel() == $arr['uid'])) {
+		if(! $arr['sig']) {
 			$channel = App::get_channel();
 			if($channel['channel_hash'] === $arr['author_xchan']) {
 				$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
 				$arr['item_verified'] = 1;
 			}
 		}
+	}
 
-		$allowed_languages = get_pconfig($arr['uid'],'system','allowed_languages');
+	if(! array_key_exists('sig',$arr))
+		$arr['sig'] = '';
 
-		if((is_array($allowed_languages)) && ($arr['lang']) && (! array_key_exists($arr['lang'],$allowed_languages))) {
-			$translate = array('item' => $arr, 'from' => $arr['lang'], 'to' => $allowed_languages, 'translated' => false);
-			call_hooks('item_translate', $translate);
-			if((! $translate['translated']) && (intval(get_pconfig($arr['uid'],'system','reject_disallowed_languages')))) {
-				logger('item_store: language ' . $arr['lang'] . ' not accepted for uid ' . $arr['uid']);
-				$ret['message'] = 'language not accepted';
-				return $ret;
-			}
-			$arr = $translate['item'];
+	$allowed_languages = get_pconfig($arr['uid'],'system','allowed_languages');
+
+	if((is_array($allowed_languages)) && ($arr['lang']) && (! array_key_exists($arr['lang'],$allowed_languages))) {
+		$translate = array('item' => $arr, 'from' => $arr['lang'], 'to' => $allowed_languages, 'translated' => false);
+		call_hooks('item_translate', $translate);
+		if((! $translate['translated']) && (intval(get_pconfig($arr['uid'],'system','reject_disallowed_languages')))) {
+			logger('item_store: language ' . $arr['lang'] . ' not accepted for uid ' . $arr['uid']);
+			$ret['message'] = 'language not accepted';
+			return $ret;
 		}
+		$arr = $translate['item'];
 	}
 
 	if((x($arr,'obj')) && is_array($arr['obj'])) {
@@ -1907,35 +1896,33 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) {
 		return $ret;
 	}
 
-    if((! array_key_exists('item_obscured', $arr)) || $arr['item_obscured'] == 0) {
 
-		$arr['lang'] = detect_language($arr['body']);
+	$arr['lang'] = detect_language($arr['body']);
 
-        // apply the input filter here - if it is obscured it has been filtered already
-        $arr['body'] = trim(z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']));
+	// apply the input filter here
+	$arr['body'] = trim($arr['body'],$arr['mimetype'],$allow_exec);
 
-		if(local_channel() && (local_channel() == $arr['uid']) && (! $arr['sig'])) {
-            $channel = App::get_channel();
-            if($channel['channel_hash'] === $arr['author_xchan']) {
-                $arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
-                $arr['item_verified'] = 1;
-            }
-        }
-
-		$allowed_languages = get_pconfig($arr['uid'],'system','allowed_languages');
-
-		if((is_array($allowed_languages)) && ($arr['lang']) && (! array_key_exists($arr['lang'],$allowed_languages))) {
-			$translate = array('item' => $arr, 'from' => $arr['lang'], 'to' => $allowed_languages, 'translated' => false);
-			call_hooks('item_translate', $translate);
-			if((! $translate['translated']) && (intval(get_pconfig($arr['uid'],'system','reject_disallowed_languages')))) {
-				logger('item_store: language ' . $arr['lang'] . ' not accepted for uid ' . $arr['uid']);
-				$ret['message'] = 'language not accepted';
-				return $ret;
-			}
-			$arr = $translate['item'];
+	if(local_channel() && (local_channel() == $arr['uid']) && (! $arr['sig'])) {
+		$channel = App::get_channel();
+		if($channel['channel_hash'] === $arr['author_xchan']) {
+			$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
+			$arr['item_verified'] = 1;
 		}
 	}
 
+	$allowed_languages = get_pconfig($arr['uid'],'system','allowed_languages');
+
+	if((is_array($allowed_languages)) && ($arr['lang']) && (! array_key_exists($arr['lang'],$allowed_languages))) {
+		$translate = array('item' => $arr, 'from' => $arr['lang'], 'to' => $allowed_languages, 'translated' => false);
+		call_hooks('item_translate', $translate);
+		if((! $translate['translated']) && (intval(get_pconfig($arr['uid'],'system','reject_disallowed_languages')))) {
+			logger('item_store: language ' . $arr['lang'] . ' not accepted for uid ' . $arr['uid']);
+			$ret['message'] = 'language not accepted';
+			return $ret;
+		}
+		$arr = $translate['item'];
+	}
+
 	if((x($arr,'obj')) && is_array($arr['obj'])) {
 		activity_sanitise($arr['obj']);
 		$arr['obj'] = json_encode($arr['obj']);
diff --git a/include/text.php b/include/text.php
index 6715eca22..500c87ad5 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3,6 +3,7 @@
  * @file include/text.php
  */
 
+use \Zotlabs\Lib as Zlib;
 use \Michelf\MarkdownExtra;
 
 require_once("include/bbcode.php");
@@ -89,12 +90,10 @@ function escape_tags($string) {
 }
 
 
-function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
+function z_input_filter($s,$type = 'text/bbcode',$allow_code = false) {
 
 	if($type === 'text/bbcode')
 		return escape_tags($s);
-	if($type === 'text/markdown')
-		return escape_tags($s);
 	if($type == 'text/plain')
 		return escape_tags($s);
 	if($type == 'application/x-pdl')
@@ -104,13 +103,17 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') {
 		return $s;
 	}
 
-	$r = q("select channel_pageflags from channel where channel_id = %d limit 1",
-		intval($channel_id)
-	);
-	if(($r) && (local_channel() == $channel_id) && ($r[0]['channel_pageflags'] & PAGE_ALLOWCODE)) {
+	if($allow_code) {
+		if($type === 'text/markdown')
+			return htmlspecialchars($s,ENT_QUOTES);
 		return $s;
 	}
 
+	if($type === 'text/markdown') {
+		$x = new Zlib\MarkdownSoap($s);
+		return $x->clean();
+	}
+
 	if($type === 'text/html')
 		return purify_html($s);
 
@@ -1636,6 +1639,7 @@ function prepare_text($text, $content_type = 'text/bbcode', $cache = false) {
 			break;
 
 		case 'text/markdown':
+			$text = Zlib\MarkdownSoap::unescape($text);
 			$s = MarkdownExtra::defaultTransform($text);
 			break;
 

From e891380ed571082612859554fb8fa805dc822b1a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 18:42:51 -0700
Subject: [PATCH 024/299] dim class was un-themed

---
 view/theme/redbasic/css/style.css | 2 +-
 view/tpl/admin_channels.tpl       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c632dbc74..1c185a5d5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1104,7 +1104,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
 .contact-block-content {
 	margin-top: 10px;
 }
-.contact-block-img.archived, .app-deleted {
+.contact-block-img.archived, .app-deleted, .dim {
 	opacity: 0.3;
 	filter:alpha(opacity=30);
 }
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index f15742f78..452e0eeec 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -35,7 +35,7 @@
 						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
 						<td class="tools">
 							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
 							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
 						</td>
 					</tr>

From 32a9487ff9901bcd59d65a410becbed832dd2e2f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 18:46:50 -0700
Subject: [PATCH 025/299] use dim for the button border also

---
 view/tpl/admin_channels.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 452e0eeec..f15742f78 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -35,7 +35,7 @@
 						<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
 						<td class="tools">
 							<a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
-							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
 							<a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
 						</td>
 					</tr>

From e399de8ad4a17c4fa07f7ad41c879278f6ce5458 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 21:40:11 -0700
Subject: [PATCH 026/299] store os_path and display_path with files

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

diff --git a/include/attach.php b/include/attach.php
index 79313ab1a..f8227fb4b 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -705,8 +705,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	$os_relpath .= $hash;
 
 	// not yet used
-	$os_path = '';
-	$display_path = '';
+	$os_path = ltrim($os_relpath,'/');
+
+	$display_path = $pathname . '/' . $filename;
 
 	if($src)
 		@file_put_contents($os_basepath . $os_relpath,@file_get_contents($src));

From fa89b8f66d98f8d74ce9283314649d4916652df9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 22:02:28 -0700
Subject: [PATCH 027/299] add os_path and display_path to photos, fix some
 issues with multiple path separators after cloud/nickname in the content
 field of attach and photos

---
 include/attach.php             |  9 ++--
 include/photo/photo_driver.php | 88 +---------------------------------
 include/photos.php             | 11 +++--
 3 files changed, 12 insertions(+), 96 deletions(-)

diff --git a/include/attach.php b/include/attach.php
index f8227fb4b..cbcdbc399 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -702,11 +702,10 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		$os_relpath .= $folder_hash . '/';
 	}
 
-	$os_relpath .= $hash;
-
-	// not yet used
-	$os_path = ltrim($os_relpath,'/');
+	$os_relpath  .= $hash;
+	$os_relpath   = ltrim($os_relpath,'/');
 
+	$os_path      = $os_relpath;
 	$display_path = $pathname . '/' . $filename;
 
 	if($src)
@@ -811,7 +810,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	if($is_photo) {
 
-		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options );
+		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_syspath' => $os_basepath . $os_relpath, 'os_path' => $os_path, 'display_path' => $display_path, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options );
 		if($arr['contact_allow'])
 			$args['contact_allow'] = $arr['contact_allow'];
 		if($arr['group_allow'])
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index c8b3c3782..923e34dbe 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -380,7 +380,7 @@ abstract class photo_driver {
 				dbesc($p['album']),
 				intval($this->getHeight()),
 				intval($this->getWidth()),
-				(intval($p['os_storage']) ? dbescbin($p['os_path']) : dbescbin($this->imageString())),
+				(intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())),
 				intval($p['os_storage']),
 				intval(strlen($this->imageString())),
 				intval($p['imgscale']),
@@ -411,7 +411,7 @@ abstract class photo_driver {
 				dbesc($p['album']),
 				intval($this->getHeight()),
 				intval($this->getWidth()),
-				(intval($p['os_storage']) ? dbescbin($p['os_path']) : dbescbin($this->imageString())),
+				(intval($p['os_storage']) ? dbescbin($p['os_syspath']) : dbescbin($this->imageString())),
 				intval($p['os_storage']),
 				intval(strlen($this->imageString())),
 				intval($p['imgscale']),
@@ -429,90 +429,6 @@ abstract class photo_driver {
 		return $r;
 	}
 
-
-	// should be obsolete now
-
-	public function store($aid, $uid, $xchan, $rid, $filename, $album, $scale, $usage = PHOTO_NORMAL, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '') {
-
-		$x = q("select id from photo where resource_id = '%s' and uid = %d and xchan = '%s' and imgscale = %d limit 1",
-				dbesc($rid),
-				intval($uid),
-				dbesc($xchan),
-				intval($scale)
-		);
-		if(count($x)) {
-			$r = q("UPDATE photo
-				set aid = %d,
-				uid = %d,
-				xchan = '%s',
-				resource_id = '%s',
-				created = '%s',
-				edited = '%s',
-				filename = '%s',
-				mimetype = '%s',
-				album = '%s',
-				height = %d,
-				width = %d,
-				content = '%s',
-				filesize = %d,
-				imgscale = %d,
-				photo_usage = %d,
-				allow_cid = '%s',
-				allow_gid = '%s',
-				deny_cid = '%s',
-				deny_gid = '%s'
-				where id = %d",
-
-				intval($aid),
-				intval($uid),
-				dbesc($xchan),
-				dbesc($rid),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc(basename($filename)),
-				dbesc($this->getType()),
-				dbesc($album),
-				intval($this->getHeight()),
-				intval($this->getWidth()),
-				dbescbin($this->imageString()),
-				intval(strlen($this->imageString())),
-				intval($scale),
-				intval($photo_usage),
-				dbesc($allow_cid),
-				dbesc($allow_gid),
-				dbesc($deny_cid),
-				dbesc($deny_gid),
-				intval($x[0]['id'])
-			);
-		}
-		else {
-			$r = q("INSERT INTO photo
-				( aid, uid, xchan, resource_id, created, edited, filename, mimetype, album, height, width, content, filesize, imgscale, photo_usage, allow_cid, allow_gid, deny_cid, deny_gid )
-				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s' )",
-				intval($aid),
-				intval($uid),
-				dbesc($xchan),
-				dbesc($rid),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert()),
-				dbesc(basename($filename)),
-				dbesc($this->getType()),
-				dbesc($album),
-				intval($this->getHeight()),
-				intval($this->getWidth()),
-				dbescbin($this->imageString()),
-				intval(strlen($this->imageString())),
-				intval($scale),
-				intval($photo_usage),
-				dbesc($allow_cid),
-				dbesc($allow_gid),
-				dbesc($deny_cid),
-				dbesc($deny_gid)
-			);
-		}
-		return $r;
-	}
-
 }
 
 
diff --git a/include/photos.php b/include/photos.php
index 68ff32924..46007fd42 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -65,8 +65,8 @@ function photo_upload($channel, $observer, $args) {
 
 	$os_storage = 0;
 
-	if($args['os_path'] && $args['getimagesize']) {
-		$imagedata = @file_get_contents($args['os_path']);
+	if($args['os_syspath'] && $args['getimagesize']) {
+		$imagedata = @file_get_contents($args['os_syspath']);
 		$filename = $args['filename'];
 		$filesize = strlen($imagedata);
 		// this is going to be deleted if it exists
@@ -149,7 +149,7 @@ function photo_upload($channel, $observer, $args) {
 		return $ret;
 	}
 
-	$exif = $ph->orient(($args['os_path']) ? $args['os_path'] : $src);
+	$exif = $ph->orient(($args['os_syspath']) ? $args['os_syspath'] : $src);
 
 	@unlink($src);
 
@@ -176,7 +176,8 @@ function photo_upload($channel, $observer, $args) {
 		'filename' => $filename, 'album' => $album, 'imgscale' => 0, 'photo_usage' => PHOTO_NORMAL,
 		'allow_cid' => $ac['allow_cid'], 'allow_gid' => $ac['allow_gid'],
 		'deny_cid' => $ac['deny_cid'], 'deny_gid' => $ac['deny_gid'],
-		'os_storage' => $os_storage, 'os_path' => $args['os_path']
+		'os_storage' => $os_storage, 'os_syspath' => $args['os_syspath'],
+		'os_path' => $args['os_path'], 'display_path' => $args['display_path']
 	);
 	if($args['created'])
 		$p['created'] = $args['created'];
@@ -201,7 +202,7 @@ function photo_upload($channel, $observer, $args) {
 		$errors = true;
 
 	unset($p['os_storage']);
-	unset($p['os_path']);
+	unset($p['os_syspath']);
 
 	if(($width > 1024 || $height > 1024) && (! $errors))
 		$ph->scaleImage(1024);

From 6078d02c3ac8ead59dbbecab2eb5de88ad7a1efc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 01:20:21 -0700
Subject: [PATCH 028/299] more work related to attach/photo and os_path,
 display_path and general code cleanup

---
 Zotlabs/Module/Cover_photo.php   | 64 ++++++++++++++++----------------
 Zotlabs/Module/Profile_photo.php | 12 +++---
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php
index 72ec1020d..47bce6c2b 100644
--- a/Zotlabs/Module/Cover_photo.php
+++ b/Zotlabs/Module/Cover_photo.php
@@ -23,19 +23,17 @@ require_once('include/channel.php');
 class Cover_photo extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
 		if(! local_channel()) {
 			return;
 		}
 	
 		$channel = \App::get_channel();
-		profile_load($channel['channel_address']);
-	
+		profile_load($channel['channel_address']);	
 	}
 	
-	/* @brief Evaluate posted values
+	/**
+	 * @brief Evaluate posted values
 	 *
-	 * @param $a Current application
 	 * @return void
 	 *
 	 */
@@ -130,8 +128,15 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 	
 					$aid = get_account_id();
 	
-					$p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'],
-						'filename' => $base_image['filename'], 'album' => t('Cover Photos'));
+					$p = [ 
+						'aid'          => $aid, 
+						'uid'          => local_channel(), 
+						'resource_id'  => $base_image['resource_id'],
+						'filename'     => $base_image['filename'], 
+						'album'        => t('Cover Photos'),
+						'os_path'      => $base_image['os_path'],
+						'display_path' => $base_image['display_path']
+					];
 	
 					$p['imgscale'] = 7;
 					$p['photo_usage'] = PHOTO_COVER;
@@ -195,11 +200,10 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 			$os_storage = false;
 	
 			foreach($i as $ii) {
-				$smallest = intval($ii['imgscale']);
+				$smallest   = intval($ii['imgscale']);
 				$os_storage = intval($ii['os_storage']);
-				$imagedata = $ii['content'];
-				$filetype = $ii['mimetype'];
-	
+				$imagedata  = $ii['content'];
+				$filetype   = $ii['mimetype'];
 			}
 		}
 	
@@ -263,10 +267,10 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 	}
 	
 	
-	/* @brief Generate content of profile-photo view
+	/**
+	 * @brief Generate content of profile-photo view
 	 *
-	 * @param $a Current application
-	 * @return void
+	 * @return string
 	 *
 	 */
 	
@@ -350,15 +354,15 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 			$tpl = get_markup_template('cover_photo.tpl');
 	
 			$o .= replace_macros($tpl,array(
-				'$user' => \App::$channel['channel_address'],
-				'$lbl_upfile' => t('Upload File:'),
-				'$lbl_profiles' => t('Select a profile:'),
-				'$title' => t('Upload Cover Photo'),
-				'$submit' => t('Upload'),
-				'$profiles' => $profiles,
+				'$user'                => \App::$channel['channel_address'],
+				'$lbl_upfile'          => t('Upload File:'),
+				'$lbl_profiles'        => t('Select a profile:'),
+				'$title'               => t('Upload Cover Photo'),
+				'$submit'              => t('Upload'),
+				'$profiles'            => $profiles,
 				'$form_security_token' => get_form_security_token("cover_photo"),
-	// FIXME - yuk  
-				'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . z_root() . '">' . t('skip this step') . '</a>' : '<a href="'. z_root() . '/photos/' . \App::$channel['channel_address'] . '">' . t('select a photo from your photo albums') . '</a>')
+					/// @FIXME - yuk  
+				'$select'              => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . z_root() . '">' . t('skip this step') . '</a>' : '<a href="'. z_root() . '/photos/' . \App::$channel['channel_address'] . '">' . t('select a photo from your photo albums') . '</a>')
 			));
 			
 			call_hooks('cover_photo_content_end', $o);
@@ -370,14 +374,14 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 			$resolution = 3;
 			$tpl = get_markup_template("cropcover.tpl");
 			$o .= replace_macros($tpl,array(
-				'$filename' => $filename,
-				'$profile' => intval($_REQUEST['profile']),
-				'$resource' => \App::$data['imagecrop'] . '-3',
-				'$image_url' => z_root() . '/photo/' . $filename,
-				'$title' => t('Crop Image'),
-				'$desc' => t('Please adjust the image cropping for optimum viewing.'),
+				'$filename'            => $filename,
+				'$profile'             => intval($_REQUEST['profile']),
+				'$resource'            => \App::$data['imagecrop'] . '-3',
+				'$image_url'           => z_root() . '/photo/' . $filename,
+				'$title'               => t('Crop Image'),
+				'$desc'                => t('Please adjust the image cropping for optimum viewing.'),
 				'$form_security_token' => get_form_security_token("cover_photo"),
-				'$done' => t('Done Editing')
+				'$done'                => t('Done Editing')
 			));
 			return $o;
 		}
@@ -393,8 +397,6 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 	 *
 	 */
 	
-	
-	
 	function cover_photo_crop_ui_head(&$a, $ph, $hash, $smallest){
 	
 		$max_length = get_config('system','max_image_length');
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index 438580917..e8f0e5186 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -108,11 +108,13 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 					$aid = get_account_id();
 	
 					$p = [ 
-						'aid'         => $aid, 
-						'uid'         => local_channel(), 
-						'resource_id' => $base_image['resource_id'],
-						'filename'    => $base_image['filename'], 
-						'album'       => t('Profile Photos')
+						'aid'          => $aid, 
+						'uid'          => local_channel(), 
+						'resource_id'  => $base_image['resource_id'],
+						'filename'     => $base_image['filename'], 
+						'album'        => t('Profile Photos'),
+						'os_path'      => $base_image['os_path'],
+						'display_path' => $base_image['display_path']
 					];
 	
 					$p['imgscale']    = PHOTO_RES_PROFILE_300;

From bcd02edd8032ba3a3de40cbc35dda3529da00a7c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 15:53:03 -0700
Subject: [PATCH 029/299] ensure z_input_filter is called exactly once, since
 we now depend on the number of htmlspecialchars operations for markdown
 content. Also ensure that the content is escaped the correct number of times
 on imported items.

---
 include/items.php  | 64 +++++++++++++++++++++++++++++++---------------
 include/photos.php |  9 +++++++
 2 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/include/items.php b/include/items.php
index c978805cd..ace8b2fb2 100755
--- a/include/items.php
+++ b/include/items.php
@@ -528,11 +528,6 @@ function get_item_elements($x,$allow_code = false) {
 
 	$arr = array();
 
-	if($allow_code)
-		$arr['body'] = $x['body'];
-	else
-		$arr['body'] = (($x['body']) ? htmlspecialchars($x['body'],ENT_COMPAT,'UTF-8',false) : '');
-
 	$key = get_config('system','pubkey');
 
 	$maxlen = get_max_import_size();
@@ -640,7 +635,17 @@ function get_item_elements($x,$allow_code = false) {
 			return array();
 	}
 
+	// Check signature on the body text received. 
+	// This presents an issue that we aren't verifying the text that is actually displayed
+	// on this site. We are however verifying the received text was exactly as received.
+	// We have every right to strip content that poses a security risk. You are welcome to
+	// create a plugin to verify the content after filtering if this offends you.  
+
 	if($arr['sig']) {
+
+		// check the supplied signature against the supplied content.
+		// Note that we will purify the content which could change it.
+
 		$r = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
 			dbesc($arr['author_xchan'])
 		);
@@ -650,6 +655,14 @@ function get_item_elements($x,$allow_code = false) {
 			logger('get_item_elements: message verification failed.');
 	}
 
+	// if the input is markdown, remove one level of html escaping.
+	// It will be re-applied in item_store() and/or item_store_update().
+	// Do this after signature checking as the original signature
+	// was generated on the escaped content.
+
+	if($arr['mimetype'] === 'text/markdown')
+		$arr['body'] = \Zotlabs\Lib\MarkdownSoap::unescape($arr['body']);
+
 	if(array_key_exists('revision',$x)) {
 
 		// extended export encoding
@@ -1475,14 +1488,20 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 
 	$arr['lang'] = detect_language($arr['body']);
 	// apply the input filter here
-	$arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec));
 
-	if(local_channel() && (local_channel() == $arr['uid'])) {
-		if(! $arr['sig']) {
-			$channel = App::get_channel();
-			if($channel['channel_hash'] === $arr['author_xchan']) {
-				$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
-				$arr['item_verified'] = 1;
+	if(array_key_exists('input_filtered_signed',$arr)) {
+		unset($arr['input_filtered_signed']);
+	}
+	else {
+		$arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec));
+
+		if(local_channel() && (local_channel() == $arr['uid'])) {
+			if(! $arr['sig']) {
+				$channel = App::get_channel();
+				if($channel['channel_hash'] === $arr['author_xchan']) {
+					$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
+					$arr['item_verified'] = 1;
+				}
 			}
 		}
 	}
@@ -1896,17 +1915,22 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) {
 		return $ret;
 	}
 
-
 	$arr['lang'] = detect_language($arr['body']);
 
-	// apply the input filter here
-	$arr['body'] = trim($arr['body'],$arr['mimetype'],$allow_exec);
+	if(array_key_exists('input_filtered_signed',$arr)) {
+		unset($arr['input_filtered_signed']);
+	}
+	else {
+		$arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec));
 
-	if(local_channel() && (local_channel() == $arr['uid']) && (! $arr['sig'])) {
-		$channel = App::get_channel();
-		if($channel['channel_hash'] === $arr['author_xchan']) {
-			$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
-			$arr['item_verified'] = 1;
+		if(local_channel() && (local_channel() == $arr['uid'])) {
+			if(! $arr['sig']) {
+				$channel = App::get_channel();
+				if($channel['channel_hash'] === $arr['author_xchan']) {
+					$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
+					$arr['item_verified'] = 1;
+				}
+			}
 		}
 	}
 
diff --git a/include/photos.php b/include/photos.php
index 46007fd42..c0f0ec8a9 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -333,12 +333,15 @@ function photo_upload($channel, $observer, $args) {
 			if($item['mid'] === $item['parent_mid']) {
 
 				$item['body'] = $summary;
+				$item['mimetype'] = 'text/bbcode';
 				$item['obj_type'] = ACTIVITY_OBJ_PHOTO;
 				$item['obj']	= json_encode($object);
 
 				$item['tgt_type'] = ACTIVITY_OBJ_ALBUM;
 				$item['target']	= json_encode($target);
 
+				$item['body'] = trim(z_input_filter($item['body'],$item['mimetype'],false));
+
 				if($item['author_xchan'] === $channel['channel_hash']) {
 					$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
 					$item['item_verified']  = 1;
@@ -346,6 +349,12 @@ function photo_upload($channel, $observer, $args) {
 				else {
 					$item['sig'] = '';
 				}
+
+				// notify item_store or item_store_update that the input has been filtered and signed already.
+				// The signing procedure in those functions uses local_channel() which may not apply here.
+
+				$item['input_filtered_signed'] = true;
+
 				$force = true;
 
 			}

From df6c07aaadda2e89d2843bae136f813c909637ba Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 16:55:47 -0700
Subject: [PATCH 030/299] Comanche: allow widgets to be class based and stored
 appropriately in Zotlabs

---
 Zotlabs/Render/Comanche.php | 14 ++++++++++++++
 Zotlabs/Widget/Notes.php    | 23 +++++++++++++++++++++++
 include/widgets.php         | 16 ----------------
 3 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 Zotlabs/Widget/Notes.php

diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php
index 5826063fd..899fbd8aa 100644
--- a/Zotlabs/Render/Comanche.php
+++ b/Zotlabs/Render/Comanche.php
@@ -410,6 +410,20 @@ class Comanche {
 			}
 		}
 
+		$clsname = ucfirst($name);
+		$nsname = "Zotlabs\\Widget\\" . $clsname;
+		if(file_exists('Zotlabs/SiteWidget/' . $clsname . '.php'))
+			require_once('Zotlabs/SiteWidget/' . $clsname . '.php');
+		elseif(file_exists('Zotlabs/Widget/' . $clsname . '.php'))
+			require_once('Zotlabs/Widget/' . $clsname . '.php');
+		if(class_exists($nsname)) {
+			$x = new $nsname;
+			$f = 'widget';
+			if(method_exists($x,$f)) {
+				return $x->$f($vars);
+			}
+		} 
+
 		$func = 'widget_' . trim($name);
 
 		if(! function_exists($func)) {
diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php
new file mode 100644
index 000000000..5c83a550f
--- /dev/null
+++ b/Zotlabs/Widget/Notes.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Notes {
+
+	function widget($arr) {
+		if(! local_channel())
+			return '';
+		if(! feature_enabled(local_channel(),'private_notes'))
+			return '';
+
+		$text = get_pconfig(local_channel(),'notes','text');
+
+		$o = replace_macros(get_markup_template('notes.tpl'), array(
+			'$banner' => t('Notes'),
+			'$text' => $text,
+			'$save' => t('Save'),
+		));
+
+		return $o;
+	}
+}
diff --git a/include/widgets.php b/include/widgets.php
index f05c7c0ee..b5389e60d 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -174,22 +174,6 @@ function widget_follow($args) {
 }
 
 
-function widget_notes($arr) {
-	if(! local_channel())
-		return '';
-	if(! feature_enabled(local_channel(),'private_notes'))
-		return '';
-
-	$text = get_pconfig(local_channel(),'notes','text');
-
-	$o = replace_macros(get_markup_template('notes.tpl'), array(
-		'$banner' => t('Notes'),
-		'$text' => $text,
-		'$save' => t('Save'),
-	));
-
-	return $o;
-}
 
 
 function widget_savedsearch($arr) {

From 14f16a7ef0ce1412fcccdabf6a44dd83efee9c60 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 17:05:16 -0700
Subject: [PATCH 031/299] use absolute namespace

---
 Zotlabs/Render/Comanche.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php
index 899fbd8aa..60a7b232c 100644
--- a/Zotlabs/Render/Comanche.php
+++ b/Zotlabs/Render/Comanche.php
@@ -411,7 +411,8 @@ class Comanche {
 		}
 
 		$clsname = ucfirst($name);
-		$nsname = "Zotlabs\\Widget\\" . $clsname;
+		$nsname = "\\Zotlabs\\Widget\\" . $clsname;
+
 		if(file_exists('Zotlabs/SiteWidget/' . $clsname . '.php'))
 			require_once('Zotlabs/SiteWidget/' . $clsname . '.php');
 		elseif(file_exists('Zotlabs/Widget/' . $clsname . '.php'))

From 8d4744d115036dd7ec4169f8b1fdebebac6fb602 Mon Sep 17 00:00:00 2001
From: zotlabs <root@sillystring.adeis.uow.edu.au>
Date: Thu, 16 Mar 2017 11:42:06 +1100
Subject: [PATCH 032/299] new composer.lock for red

---
 composer.lock                                 | 3633 +++++++++++++++++
 vendor/composer/autoload_classmap.php         |  616 ---
 vendor/composer/installed.json                |  589 +--
 vendor/sabre/dav/.travis.yml                  |    7 +-
 vendor/sabre/dav/CHANGELOG.md                 |   56 +-
 vendor/sabre/dav/README.md                    |    2 +
 vendor/sabre/dav/bin/build.php                |    0
 vendor/sabre/dav/bin/googlecode_upload.py     |    0
 vendor/sabre/dav/bin/migrateto20.php          |    0
 vendor/sabre/dav/bin/migrateto21.php          |    0
 vendor/sabre/dav/bin/migrateto30.php          |    0
 vendor/sabre/dav/bin/migrateto32.php          |    0
 vendor/sabre/dav/bin/sabredav.php             |    0
 vendor/sabre/dav/composer.json                |    4 +-
 .../lib/CalDAV/Backend/AbstractBackend.php    |    6 +-
 .../CalDAV/Backend/NotificationSupport.php    |    4 +-
 vendor/sabre/dav/lib/CalDAV/Backend/PDO.php   |   70 +-
 .../dav/lib/CalDAV/Backend/SharingSupport.php |    6 +-
 .../dav/lib/CalDAV/Backend/SimplePDO.php      |   14 +-
 .../CalDAV/Backend/SubscriptionSupport.php    |    2 +-
 vendor/sabre/dav/lib/CalDAV/Calendar.php      |    2 +-
 vendor/sabre/dav/lib/CalDAV/CalendarHome.php  |    8 +-
 .../sabre/dav/lib/CalDAV/CalendarObject.php   |    2 +-
 .../dav/lib/CalDAV/CalendarQueryValidator.php |    4 +-
 vendor/sabre/dav/lib/CalDAV/CalendarRoot.php  |    2 +-
 .../CalDAV/Exception/InvalidComponentType.php |    2 +-
 .../sabre/dav/lib/CalDAV/ICSExportPlugin.php  |    6 +-
 .../lib/CalDAV/Notifications/Collection.php   |    4 +-
 .../dav/lib/CalDAV/Notifications/INode.php    |    8 +-
 .../dav/lib/CalDAV/Notifications/Node.php     |   12 +-
 .../dav/lib/CalDAV/Notifications/Plugin.php   |    4 +-
 vendor/sabre/dav/lib/CalDAV/Plugin.php        |   10 +-
 .../dav/lib/CalDAV/Principal/ProxyRead.php    |    4 +-
 .../dav/lib/CalDAV/Principal/ProxyWrite.php   |    4 +-
 .../dav/lib/CalDAV/Schedule/IMipPlugin.php    |    2 +-
 .../sabre/dav/lib/CalDAV/Schedule/Inbox.php   |    6 +-
 .../sabre/dav/lib/CalDAV/Schedule/Outbox.php  |    2 +-
 .../sabre/dav/lib/CalDAV/Schedule/Plugin.php  |   43 +-
 .../lib/CalDAV/Schedule/SchedulingObject.php  |    2 +-
 vendor/sabre/dav/lib/CalDAV/SharingPlugin.php |    3 +-
 .../dav/lib/CalDAV/Subscriptions/Plugin.php   |    2 +-
 .../lib/CalDAV/Subscriptions/Subscription.php |   16 +-
 .../lib/CalDAV/Xml/Filter/CalendarData.php    |    8 +-
 .../dav/lib/CalDAV/Xml/Filter/CompFilter.php  |    8 +-
 .../dav/lib/CalDAV/Xml/Filter/ParamFilter.php |    4 +-
 .../dav/lib/CalDAV/Xml/Filter/PropFilter.php  |    8 +-
 .../lib/CalDAV/Xml/Notification/Invite.php    |   10 +-
 .../CalDAV/Xml/Notification/InviteReply.php   |    6 +-
 .../Notification/NotificationInterface.php    |    2 +-
 .../CalDAV/Xml/Notification/SystemStatus.php  |    2 +-
 .../Xml/Property/AllowedSharingModes.php      |    8 +-
 .../CalDAV/Xml/Property/EmailAddressSet.php   |    4 +-
 .../dav/lib/CalDAV/Xml/Property/Invite.php    |   13 +-
 .../Xml/Property/ScheduleCalendarTransp.php   |   10 +-
 .../SupportedCalendarComponentSet.php         |    8 +-
 .../Xml/Property/SupportedCalendarData.php    |    8 +-
 .../Xml/Property/SupportedCollationSet.php    |    6 +-
 .../Xml/Request/CalendarMultiGetReport.php    |    6 +-
 .../Xml/Request/CalendarQueryReport.php       |    8 +-
 .../Xml/Request/FreeBusyQueryReport.php       |    2 +-
 .../lib/CalDAV/Xml/Request/InviteReply.php    |    4 +-
 .../dav/lib/CalDAV/Xml/Request/MkCalendar.php |    6 +-
 .../dav/lib/CalDAV/Xml/Request/Share.php      |    2 +-
 vendor/sabre/dav/lib/CardDAV/AddressBook.php  |    2 +-
 .../sabre/dav/lib/CardDAV/AddressBookHome.php |    2 +-
 .../sabre/dav/lib/CardDAV/AddressBookRoot.php |    2 +-
 .../lib/CardDAV/Backend/BackendInterface.php  |    2 +-
 vendor/sabre/dav/lib/CardDAV/Backend/PDO.php  |    6 +-
 vendor/sabre/dav/lib/CardDAV/Card.php         |    2 +-
 vendor/sabre/dav/lib/CardDAV/Plugin.php       |   19 +-
 .../sabre/dav/lib/CardDAV/VCFExportPlugin.php |    4 +-
 .../lib/CardDAV/Xml/Filter/AddressData.php    |    8 +-
 .../lib/CardDAV/Xml/Filter/ParamFilter.php    |    6 +-
 .../dav/lib/CardDAV/Xml/Filter/PropFilter.php |    6 +-
 .../Xml/Property/SupportedAddressData.php     |    6 +-
 .../Xml/Property/SupportedCollationSet.php    |    4 +-
 .../Xml/Request/AddressBookMultiGetReport.php |    2 +-
 .../Xml/Request/AddressBookQueryReport.php    |   13 +-
 .../lib/DAV/Auth/Backend/AbstractDigest.php   |    2 +-
 vendor/sabre/dav/lib/DAV/Auth/Backend/PDO.php |    2 +-
 vendor/sabre/dav/lib/DAV/Auth/Plugin.php      |    6 +-
 .../dav/lib/DAV/Browser/GuessContentType.php  |    4 +-
 .../dav/lib/DAV/Browser/MapGetToPropFind.php  |    2 +-
 vendor/sabre/dav/lib/DAV/Browser/Plugin.php   |   62 +-
 .../sabre/dav/lib/DAV/Browser/PropFindAll.php |    2 +-
 vendor/sabre/dav/lib/DAV/Client.php           |    6 +-
 vendor/sabre/dav/lib/DAV/Collection.php       |    2 +-
 vendor/sabre/dav/lib/DAV/CorePlugin.php       |   30 +-
 .../lib/DAV/Exception/InvalidResourceType.php |    2 +-
 vendor/sabre/dav/lib/DAV/FS/Node.php          |    2 +-
 vendor/sabre/dav/lib/DAV/File.php             |    2 +-
 vendor/sabre/dav/lib/DAV/IFile.php            |    4 +-
 vendor/sabre/dav/lib/DAV/IMoveTarget.php      |    2 +-
 .../sabre/dav/lib/DAV/Locks/Backend/PDO.php   |    4 +-
 vendor/sabre/dav/lib/DAV/Locks/Plugin.php     |    6 +-
 vendor/sabre/dav/lib/DAV/MkCol.php            |    1 +
 vendor/sabre/dav/lib/DAV/Mount/Plugin.php     |    2 +-
 vendor/sabre/dav/lib/DAV/Node.php             |    4 +-
 .../dav/lib/DAV/PartialUpdate/Plugin.php      |    2 +-
 vendor/sabre/dav/lib/DAV/PropFind.php         |    2 +-
 .../Backend/BackendInterface.php              |    2 +-
 .../lib/DAV/PropertyStorage/Backend/PDO.php   |    2 +-
 .../dav/lib/DAV/PropertyStorage/Plugin.php    |   13 +-
 vendor/sabre/dav/lib/DAV/Server.php           |  101 +-
 vendor/sabre/dav/lib/DAV/Sharing/Plugin.php   |    4 +-
 vendor/sabre/dav/lib/DAV/Sync/Plugin.php      |    2 +-
 .../dav/lib/DAV/TemporaryFileFilterPlugin.php |    8 +-
 vendor/sabre/dav/lib/DAV/Version.php          |    2 +-
 vendor/sabre/dav/lib/DAV/Xml/Element/Prop.php |    6 +-
 .../dav/lib/DAV/Xml/Element/Response.php      |    2 +-
 .../sabre/dav/lib/DAV/Xml/Element/Sharee.php  |    4 +-
 .../dav/lib/DAV/Xml/Property/Complex.php      |    2 +-
 .../lib/DAV/Xml/Property/GetLastModified.php  |    8 +-
 .../sabre/dav/lib/DAV/Xml/Property/Href.php   |   10 +-
 .../sabre/dav/lib/DAV/Xml/Property/Invite.php |    6 +-
 .../dav/lib/DAV/Xml/Property/LocalHref.php    |    4 +-
 .../dav/lib/DAV/Xml/Property/ResourceType.php |    4 +-
 .../dav/lib/DAV/Xml/Property/ShareAccess.php  |    6 +-
 .../lib/DAV/Xml/Property/SupportedLock.php    |    8 +-
 .../DAV/Xml/Property/SupportedMethodSet.php   |    4 +-
 .../DAV/Xml/Property/SupportedReportSet.php   |    4 +-
 vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php |    2 +-
 .../sabre/dav/lib/DAV/Xml/Request/MkCol.php   |    6 +-
 .../dav/lib/DAV/Xml/Request/PropFind.php      |    2 +-
 .../dav/lib/DAV/Xml/Request/PropPatch.php     |   10 +-
 .../dav/lib/DAV/Xml/Request/ShareResource.php |    4 +-
 .../DAV/Xml/Request/SyncCollectionReport.php  |    8 +-
 .../dav/lib/DAV/Xml/Response/MultiStatus.php  |    2 +-
 .../Exception/NotRecognizedPrincipal.php      |    2 +-
 vendor/sabre/dav/lib/DAVACL/FS/Collection.php |    4 +-
 vendor/sabre/dav/lib/DAVACL/FS/File.php       |    2 +-
 .../dav/lib/DAVACL/FS/HomeCollection.php      |    2 +-
 vendor/sabre/dav/lib/DAVACL/Plugin.php        |   38 +-
 vendor/sabre/dav/lib/DAVACL/Principal.php     |    2 +-
 .../PrincipalBackend/BackendInterface.php     |    2 +-
 .../dav/lib/DAVACL/PrincipalBackend/PDO.php   |    8 +-
 .../dav/lib/DAVACL/PrincipalCollection.php    |    2 +-
 .../sabre/dav/lib/DAVACL/Xml/Property/Acl.php |    6 +-
 .../DAVACL/Xml/Property/AclRestrictions.php   |    6 +-
 .../Xml/Property/CurrentUserPrivilegeSet.php  |    6 +-
 .../dav/lib/DAVACL/Xml/Property/Principal.php |    4 +-
 .../Xml/Property/SupportedPrivilegeSet.php    |   11 +-
 .../Xml/Request/AclPrincipalPropSetReport.php |    6 +-
 .../Xml/Request/ExpandPropertyReport.php      |    2 +-
 .../Xml/Request/PrincipalMatchReport.php      |    6 +-
 .../Request/PrincipalPropertySearchReport.php |    4 +-
 .../PrincipalSearchPropertySetReport.php      |    4 +-
 .../Sabre/CalDAV/Backend/AbstractPDOTest.php  |   14 +-
 .../dav/tests/Sabre/CalDAV/Backend/Mock.php   |    2 +-
 .../tests/Sabre/CalDAV/CalendarObjectTest.php |    2 +-
 .../CalDAV/CalendarQueryValidatorTest.php     |    3 +
 .../tests/Sabre/CalDAV/FreeBusyReportTest.php |    4 +-
 .../Sabre/CalDAV/ICSExportPluginTest.php      |    2 +-
 .../dav/tests/Sabre/CalDAV/PluginTest.php     |    6 +-
 .../tests/Sabre/CalDAV/SharingPluginTest.php  |    4 +-
 .../Sabre/CardDAV/AddressBookQueryTest.php    |   51 +-
 .../tests/Sabre/CardDAV/AddressBookTest.php   |    6 +-
 .../dav/tests/Sabre/CardDAV/Backend/Mock.php  |   13 +-
 .../dav/tests/Sabre/CardDAV/MultiGetTest.php  |    2 +-
 .../CardDAV/SogoStripContentTypeTest.php      |    2 +-
 .../Sabre/CardDAV/ValidateFilterTest.php      |    5 +
 .../tests/Sabre/CardDAV/ValidateVCardTest.php |   10 +-
 .../dav/tests/Sabre/DAV/Auth/Backend/Mock.php |    2 +
 .../dav/tests/Sabre/DAV/Auth/PluginTest.php   |    2 +-
 .../sabre/dav/tests/Sabre/DAV/ClientTest.php  |    6 +-
 .../tests/Sabre/DAV/Exception/LockedTest.php  |    2 +-
 .../sabre/dav/tests/Sabre/DAV/Issue33Test.php |    2 +-
 .../dav/tests/Sabre/DAV/Locks/MSWordTest.php  |    8 +-
 .../dav/tests/Sabre/DAV/Locks/PluginTest.php  |    6 +-
 .../dav/tests/Sabre/DAV/Mock/Collection.php   |    3 +
 .../sabre/dav/tests/Sabre/DAV/Mock/File.php   |    7 +-
 .../DAV/PartialUpdate/SpecificationTest.php   |    5 +
 .../dav/tests/Sabre/DAV/ServerEventsTest.php  |    8 +-
 .../dav/tests/Sabre/DAV/ServerRangeTest.php   |    2 +-
 .../dav/tests/Sabre/DAV/StringUtilTest.php    |    7 +
 vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php |    5 +-
 .../Sabre/DAVACL/PrincipalBackend/Mock.php    |    2 +-
 vendor/sabre/http/.travis.yml                 |    4 +-
 vendor/sabre/http/CHANGELOG.md                |    8 +-
 vendor/sabre/http/LICENSE                     |    2 +-
 vendor/sabre/http/composer.json               |    1 +
 vendor/sabre/http/lib/Message.php             |   12 +-
 .../sabre/http/lib/MessageDecoratorTrait.php  |    7 +-
 vendor/sabre/http/lib/MessageInterface.php    |    3 +-
 vendor/sabre/http/lib/Request.php             |    2 +-
 vendor/sabre/http/lib/Response.php            |    3 +-
 vendor/sabre/http/lib/ResponseInterface.php   |    2 +-
 vendor/sabre/http/lib/URLUtil.php             |    2 +-
 vendor/sabre/http/lib/Util.php                |    2 +-
 vendor/sabre/http/lib/Version.php             |    2 +-
 vendor/sabre/http/lib/functions.php           |    4 +-
 vendor/sabre/uri/.travis.yml                  |    2 +-
 vendor/sabre/uri/CHANGELOG.md                 |   23 +
 vendor/sabre/uri/LICENSE                      |    2 +-
 vendor/sabre/uri/README.md                    |    8 -
 vendor/sabre/uri/composer.json                |    4 +-
 vendor/sabre/uri/lib/InvalidUriException.php  |   17 +
 vendor/sabre/uri/lib/Version.php              |    2 +-
 vendor/sabre/uri/lib/functions.php            |   99 +-
 vendor/sabre/vobject/.travis.yml              |    3 +-
 vendor/sabre/vobject/CHANGELOG.md             |   18 +-
 .../sabre/vobject/bin/fetch_windows_zones.php |    2 +-
 vendor/sabre/vobject/composer.json            |    4 +-
 .../vobject/lib/BirthdayCalendarGenerator.php |    8 +-
 vendor/sabre/vobject/lib/Component/VAlarm.php |    4 +-
 .../sabre/vobject/lib/Component/VCalendar.php |  112 +-
 vendor/sabre/vobject/lib/Component/VCard.php  |   44 +-
 vendor/sabre/vobject/lib/DateTimeParser.php   |   14 +-
 .../sabre/vobject/lib/FreeBusyGenerator.php   |    6 +-
 vendor/sabre/vobject/lib/Parameter.php        |    2 +-
 vendor/sabre/vobject/lib/Parser/Json.php      |    2 +-
 vendor/sabre/vobject/lib/Parser/MimeDir.php   |    4 +-
 vendor/sabre/vobject/lib/Parser/XML.php       |   22 +-
 .../lib/Property/ICalendar/Duration.php       |    2 +-
 .../vobject/lib/Property/ICalendar/Period.php |    2 +-
 .../vobject/lib/Property/ICalendar/Recur.php  |   48 +
 vendor/sabre/vobject/lib/Property/Text.php    |    4 +-
 vendor/sabre/vobject/lib/Property/Uri.php     |    2 +-
 .../lib/Property/VCard/DateAndOrTime.php      |   24 +-
 .../sabre/vobject/lib/Recur/EventIterator.php |    6 +-
 .../sabre/vobject/lib/Recur/RRuleIterator.php |   93 +-
 vendor/sabre/vobject/lib/TimeZoneUtil.php     |   10 +
 vendor/sabre/vobject/lib/Version.php          |    2 +-
 .../vobject/lib/timezonedata/lotuszones.php   |  158 +-
 .../vobject/lib/timezonedata/windowszones.php |   32 +-
 225 files changed, 5218 insertions(+), 1692 deletions(-)
 create mode 100644 composer.lock
 mode change 100644 => 100755 vendor/sabre/dav/bin/build.php
 mode change 100644 => 100755 vendor/sabre/dav/bin/googlecode_upload.py
 mode change 100644 => 100755 vendor/sabre/dav/bin/migrateto20.php
 mode change 100644 => 100755 vendor/sabre/dav/bin/migrateto21.php
 mode change 100644 => 100755 vendor/sabre/dav/bin/migrateto30.php
 mode change 100644 => 100755 vendor/sabre/dav/bin/migrateto32.php
 mode change 100644 => 100755 vendor/sabre/dav/bin/sabredav.php
 create mode 100644 vendor/sabre/uri/lib/InvalidUriException.php

diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000000000..c9c4eb230
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,3633 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "46492fdee6fa6ef4ef6612a0f0006c2b",
+    "content-hash": "b0d4055ddb064eafb50cf58cf939e1e5",
+    "packages": [
+        {
+            "name": "bshaffer/oauth2-server-php",
+            "version": "v1.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bshaffer/oauth2-server-php.git",
+                "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bshaffer/oauth2-server-php/zipball/8856aed1a98d6da596ae3f9b8095b5c7a1581697",
+                "reference": "8856aed1a98d6da596ae3f9b8095b5c7a1581697",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "~2.8",
+                "firebase/php-jwt": "~2.2",
+                "mongodb/mongodb": "^1.1",
+                "predis/predis": "dev-master",
+                "thobbs/phpcassa": "dev-master"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "~2.8 is required to use DynamoDB storage",
+                "firebase/php-jwt": "~1.1 is required to use MondoDB storage",
+                "predis/predis": "Required to use Redis storage",
+                "thobbs/phpcassa": "Required to use Cassandra storage"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "OAuth2": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brent Shaffer",
+                    "email": "bshafs@gmail.com",
+                    "homepage": "http://brentertainment.com"
+                }
+            ],
+            "description": "OAuth2 Server for PHP",
+            "homepage": "http://github.com/bshaffer/oauth2-server-php",
+            "keywords": [
+                "auth",
+                "oauth",
+                "oauth2"
+            ],
+            "time": "2017-01-06 23:20:00"
+        },
+        {
+            "name": "michelf/php-markdown",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/michelf/php-markdown.git",
+                "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1f51cc520948f66cd2af8cbc45a5ee175e774220",
+                "reference": "1f51cc520948f66cd2af8cbc45a5ee175e774220",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-lib": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Michelf": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Michel Fortin",
+                    "email": "michel.fortin@michelf.ca",
+                    "homepage": "https://michelf.ca/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "John Gruber",
+                    "homepage": "https://daringfireball.net/"
+                }
+            ],
+            "description": "PHP Markdown",
+            "homepage": "https://michelf.ca/projects/php-markdown/",
+            "keywords": [
+                "markdown"
+            ],
+            "time": "2016-10-29 18:58:20"
+        },
+        {
+            "name": "pixel418/markdownify",
+            "version": "v2.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Elephant418/Markdownify.git",
+                "reference": "0160677f04c784550dd10fd72fdf3994967db848"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Elephant418/Markdownify/zipball/0160677f04c784550dd10fd72fdf3994967db848",
+                "reference": "0160677f04c784550dd10fd72fdf3994967db848",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8"
+            },
+            "type": "lib",
+            "autoload": {
+                "psr-4": {
+                    "Markdownify\\": "src",
+                    "Test\\Markdownify\\": "test"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Peter Kruithof",
+                    "email": "pkruithof@gmail.com",
+                    "homepage": "http://pkruithof.tumblr.com/"
+                },
+                {
+                    "name": "Milian Wolff",
+                    "email": "mail@milianw.de",
+                    "homepage": "http://milianw.de"
+                },
+                {
+                    "name": "Thomas Zilliox",
+                    "email": "hello@tzi.fr",
+                    "homepage": "http://tzi.fr"
+                }
+            ],
+            "description": "The HTML to Markdown converter for PHP ",
+            "homepage": "https://github.com/elephant418/Markdownify",
+            "keywords": [
+                "markdown",
+                "markdownify"
+            ],
+            "time": "2016-09-21 13:01:43"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2016-10-10 12:19:37"
+        },
+        {
+            "name": "sabre/dav",
+            "version": "3.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-dav.git",
+                "reference": "e987775e619728f12205606c9cc3ee565ffb1516"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516",
+                "reference": "e987775e619728f12205606c9cc3ee565ffb1516",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-date": "*",
+                "ext-dom": "*",
+                "ext-iconv": "*",
+                "ext-mbstring": "*",
+                "ext-pcre": "*",
+                "ext-simplexml": "*",
+                "ext-spl": "*",
+                "lib-libxml": ">=2.7.0",
+                "php": ">=5.5.0",
+                "psr/log": "^1.0",
+                "sabre/event": ">=2.0.0, <4.0.0",
+                "sabre/http": "^4.2.1",
+                "sabre/uri": "^1.0.1",
+                "sabre/vobject": "^4.1.0",
+                "sabre/xml": "^1.4.0"
+            },
+            "require-dev": {
+                "evert/phpdoc-md": "~0.1.0",
+                "monolog/monolog": "^1.18",
+                "phpunit/phpunit": "> 4.8, <6.0.0",
+                "sabre/cs": "^1.0.0"
+            },
+            "suggest": {
+                "ext-curl": "*",
+                "ext-pdo": "*"
+            },
+            "bin": [
+                "bin/sabredav",
+                "bin/naturalselection"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\DAV\\": "lib/DAV/",
+                    "Sabre\\DAVACL\\": "lib/DAVACL/",
+                    "Sabre\\CalDAV\\": "lib/CalDAV/",
+                    "Sabre\\CardDAV\\": "lib/CardDAV/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "WebDAV Framework for PHP",
+            "homepage": "http://sabre.io/",
+            "keywords": [
+                "CalDAV",
+                "CardDAV",
+                "WebDAV",
+                "framework",
+                "iCalendar"
+            ],
+            "time": "2017-02-15 03:06:08"
+        },
+        {
+            "name": "sabre/event",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-event.git",
+                "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-event/zipball/831d586f5a442dceacdcf5e9c4c36a4db99a3534",
+                "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*",
+                "sabre/cs": "~0.0.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\Event\\": "lib/"
+                },
+                "files": [
+                    "lib/coroutine.php",
+                    "lib/Loop/functions.php",
+                    "lib/Promise/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "sabre/event is a library for lightweight event-based programming",
+            "homepage": "http://sabre.io/event/",
+            "keywords": [
+                "EventEmitter",
+                "async",
+                "events",
+                "hooks",
+                "plugin",
+                "promise",
+                "signal"
+            ],
+            "time": "2015-11-05 20:14:39"
+        },
+        {
+            "name": "sabre/http",
+            "version": "4.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-http.git",
+                "reference": "dd50e7260356f4599d40270826f9548b23efa204"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-http/zipball/dd50e7260356f4599d40270826f9548b23efa204",
+                "reference": "dd50e7260356f4599d40270826f9548b23efa204",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-mbstring": "*",
+                "php": ">=5.4",
+                "sabre/event": ">=1.0.0,<4.0.0",
+                "sabre/uri": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.3",
+                "sabre/cs": "~0.0.1"
+            },
+            "suggest": {
+                "ext-curl": " to make http requests with the Client class"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/functions.php"
+                ],
+                "psr-4": {
+                    "Sabre\\HTTP\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The sabre/http library provides utilities for dealing with http requests and responses. ",
+            "homepage": "https://github.com/fruux/sabre-http",
+            "keywords": [
+                "http"
+            ],
+            "time": "2017-01-02 19:38:42"
+        },
+        {
+            "name": "sabre/uri",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-uri.git",
+                "reference": "ada354d83579565949d80b2e15593c2371225e61"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-uri/zipball/ada354d83579565949d80b2e15593c2371225e61",
+                "reference": "ada354d83579565949d80b2e15593c2371225e61",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=4.0,<6.0",
+                "sabre/cs": "~1.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/functions.php"
+                ],
+                "psr-4": {
+                    "Sabre\\Uri\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Functions for making sense out of URIs.",
+            "homepage": "http://sabre.io/uri/",
+            "keywords": [
+                "rfc3986",
+                "uri",
+                "url"
+            ],
+            "time": "2017-02-20 19:59:28"
+        },
+        {
+            "name": "sabre/vobject",
+            "version": "4.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-vobject.git",
+                "reference": "d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c",
+                "reference": "d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": ">=5.5",
+                "sabre/xml": ">=1.5 <3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*",
+                "sabre/cs": "^1.0.0"
+            },
+            "suggest": {
+                "hoa/bench": "If you would like to run the benchmark scripts"
+            },
+            "bin": [
+                "bin/vobject",
+                "bin/generate_vcards"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\VObject\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Dominik Tobschall",
+                    "email": "dominik@fruux.com",
+                    "homepage": "http://tobschall.de/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net",
+                    "homepage": "http://mnt.io/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
+            "homepage": "http://sabre.io/vobject/",
+            "keywords": [
+                "availability",
+                "freebusy",
+                "iCalendar",
+                "ical",
+                "ics",
+                "jCal",
+                "jCard",
+                "recurrence",
+                "rfc2425",
+                "rfc2426",
+                "rfc2739",
+                "rfc4770",
+                "rfc5545",
+                "rfc5546",
+                "rfc6321",
+                "rfc6350",
+                "rfc6351",
+                "rfc6474",
+                "rfc6638",
+                "rfc6715",
+                "rfc6868",
+                "vCalendar",
+                "vCard",
+                "vcf",
+                "xCal",
+                "xCard"
+            ],
+            "time": "2016-12-06 04:14:09"
+        },
+        {
+            "name": "sabre/xml",
+            "version": "1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-xml.git",
+                "reference": "59b20e5bbace9912607481634f97d05a776ffca7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-xml/zipball/59b20e5bbace9912607481634f97d05a776ffca7",
+                "reference": "59b20e5bbace9912607481634f97d05a776ffca7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlreader": "*",
+                "ext-xmlwriter": "*",
+                "lib-libxml": ">=2.6.20",
+                "php": ">=5.5.5",
+                "sabre/uri": ">=1.0,<3.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*",
+                "sabre/cs": "~1.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\Xml\\": "lib/"
+                },
+                "files": [
+                    "lib/Deserializer/functions.php",
+                    "lib/Serializer/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Markus Staab",
+                    "email": "markus.staab@redaxo.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "sabre/xml is an XML library that you may not hate.",
+            "homepage": "https://sabre.io/xml/",
+            "keywords": [
+                "XMLReader",
+                "XMLWriter",
+                "dom",
+                "xml"
+            ],
+            "time": "2016-10-09 22:57:52"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "behat/behat",
+            "version": "v3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Behat.git",
+                "reference": "15a3a1857457eaa29cdf41564a5e421effb09526"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Behat/zipball/15a3a1857457eaa29cdf41564a5e421effb09526",
+                "reference": "15a3a1857457eaa29cdf41564a5e421effb09526",
+                "shasum": ""
+            },
+            "require": {
+                "behat/gherkin": "^4.4.4",
+                "behat/transliterator": "~1.0",
+                "container-interop/container-interop": "^1.1",
+                "ext-mbstring": "*",
+                "php": ">=5.3.3",
+                "symfony/class-loader": "~2.1||~3.0",
+                "symfony/config": "~2.3||~3.0",
+                "symfony/console": "~2.5||~3.0",
+                "symfony/dependency-injection": "~2.1||~3.0",
+                "symfony/event-dispatcher": "~2.1||~3.0",
+                "symfony/translation": "~2.3||~3.0",
+                "symfony/yaml": "~2.1||~3.0"
+            },
+            "require-dev": {
+                "herrera-io/box": "~1.6.1",
+                "phpunit/phpunit": "~4.5",
+                "symfony/process": "~2.5|~3.0"
+            },
+            "suggest": {
+                "behat/mink-extension": "for integration with Mink testing framework",
+                "behat/symfony2-extension": "for integration with Symfony2 web framework",
+                "behat/yii-extension": "for integration with Yii web framework"
+            },
+            "bin": [
+                "bin/behat"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Behat": "src/",
+                    "Behat\\Testwork": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Scenario-oriented BDD framework for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "Agile",
+                "BDD",
+                "ScenarioBDD",
+                "Scrum",
+                "StoryBDD",
+                "User story",
+                "business",
+                "development",
+                "documentation",
+                "examples",
+                "symfony",
+                "testing"
+            ],
+            "time": "2016-12-25 13:43:52"
+        },
+        {
+            "name": "behat/gherkin",
+            "version": "v4.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Gherkin.git",
+                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74",
+                "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5|~5",
+                "symfony/phpunit-bridge": "~2.7|~3",
+                "symfony/yaml": "~2.3|~3"
+            },
+            "suggest": {
+                "symfony/yaml": "If you want to parse features, represented in YAML files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Gherkin": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Gherkin DSL parser for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "Cucumber",
+                "DSL",
+                "gherkin",
+                "parser"
+            ],
+            "time": "2016-10-30 11:50:56"
+        },
+        {
+            "name": "behat/mink",
+            "version": "v1.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/minkphp/Mink.git",
+                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e6930b9c74693dff7f4e58577e1b1743399f3ff9",
+                "reference": "e6930b9c74693dff7f4e58577e1b1743399f3ff9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1",
+                "symfony/css-selector": "~2.1|~3.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7|~3.0"
+            },
+            "suggest": {
+                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
+                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
+                "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
+                "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Behat\\Mink\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Browser controller/emulator abstraction for PHP",
+            "homepage": "http://mink.behat.org/",
+            "keywords": [
+                "browser",
+                "testing",
+                "web"
+            ],
+            "time": "2016-03-05 08:26:18"
+        },
+        {
+            "name": "behat/mink-browserkit-driver",
+            "version": "v1.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
+                "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/10e67fb4a295efcd62ea0bf16025a85ea19534fb",
+                "reference": "10e67fb4a295efcd62ea0bf16025a85ea19534fb",
+                "shasum": ""
+            },
+            "require": {
+                "behat/mink": "^1.7.1@dev",
+                "php": ">=5.3.6",
+                "symfony/browser-kit": "~2.3|~3.0",
+                "symfony/dom-crawler": "~2.3|~3.0"
+            },
+            "require-dev": {
+                "silex/silex": "~1.2",
+                "symfony/phpunit-bridge": "~2.7|~3.0"
+            },
+            "type": "mink-driver",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Behat\\Mink\\Driver\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Symfony2 BrowserKit driver for Mink framework",
+            "homepage": "http://mink.behat.org/",
+            "keywords": [
+                "Mink",
+                "Symfony2",
+                "browser",
+                "testing"
+            ],
+            "time": "2016-03-05 08:59:47"
+        },
+        {
+            "name": "behat/mink-extension",
+            "version": "v2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/MinkExtension.git",
+                "reference": "5b4bda64ff456104564317e212c823e45cad9d59"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/5b4bda64ff456104564317e212c823e45cad9d59",
+                "reference": "5b4bda64ff456104564317e212c823e45cad9d59",
+                "shasum": ""
+            },
+            "require": {
+                "behat/behat": "~3.0,>=3.0.5",
+                "behat/mink": "~1.5",
+                "php": ">=5.3.2",
+                "symfony/config": "~2.2|~3.0"
+            },
+            "require-dev": {
+                "behat/mink-goutte-driver": "~1.1",
+                "phpspec/phpspec": "~2.0"
+            },
+            "type": "behat-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\MinkExtension": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christophe Coevoet",
+                    "email": "stof@notk.org"
+                },
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com"
+                }
+            ],
+            "description": "Mink extension for Behat",
+            "homepage": "http://extensions.behat.org/mink",
+            "keywords": [
+                "browser",
+                "gui",
+                "test",
+                "web"
+            ],
+            "time": "2016-02-15 07:55:18"
+        },
+        {
+            "name": "behat/mink-goutte-driver",
+            "version": "v1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/minkphp/MinkGoutteDriver.git",
+                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
+                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
+                "shasum": ""
+            },
+            "require": {
+                "behat/mink": "~1.6@dev",
+                "behat/mink-browserkit-driver": "~1.2@dev",
+                "fabpot/goutte": "~1.0.4|~2.0|~3.1",
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7|~3.0"
+            },
+            "type": "mink-driver",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Behat\\Mink\\Driver\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Goutte driver for Mink framework",
+            "homepage": "http://mink.behat.org/",
+            "keywords": [
+                "browser",
+                "goutte",
+                "headless",
+                "testing"
+            ],
+            "time": "2016-03-05 09:04:22"
+        },
+        {
+            "name": "behat/transliterator",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Transliterator.git",
+                "reference": "868e05be3a9f25ba6424c2dd4849567f50715003"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Transliterator/zipball/868e05be3a9f25ba6424c2dd4849567f50715003",
+                "reference": "868e05be3a9f25ba6424c2dd4849567f50715003",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Transliterator": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Artistic-1.0"
+            ],
+            "description": "String transliterator",
+            "keywords": [
+                "i18n",
+                "slug",
+                "transliterator"
+            ],
+            "time": "2015-09-28 16:26:35"
+        },
+        {
+            "name": "container-interop/container-interop",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/container-interop/container-interop.git",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "shasum": ""
+            },
+            "require": {
+                "psr/container": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Container\\": "src/Interop/Container/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+            "homepage": "https://github.com/container-interop/container-interop",
+            "time": "2017-02-14 19:40:03"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
+        {
+            "name": "fabpot/goutte",
+            "version": "v3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfPHP/Goutte.git",
+                "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/db5c28f4a010b4161d507d5304e28a7ebf211638",
+                "reference": "db5c28f4a010b4161d507d5304e28a7ebf211638",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "php": ">=5.5.0",
+                "symfony/browser-kit": "~2.1|~3.0",
+                "symfony/css-selector": "~2.1|~3.0",
+                "symfony/dom-crawler": "~2.1|~3.0"
+            },
+            "type": "application",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Goutte\\": "Goutte"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "A simple PHP Web Scraper",
+            "homepage": "https://github.com/FriendsOfPHP/Goutte",
+            "keywords": [
+                "scraper"
+            ],
+            "time": "2017-01-03 13:21:43"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006",
+                "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.4",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.0",
+                "psr/log": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.2-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2017-02-28 22:50:30"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20 10:07:11"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/0d6c7ca039329247e4f0f8f8f6506810e8248855",
+                "reference": "0d6c7ca039329247e4f0f8f8f6506810e8248855",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2017-02-27 10:51:17"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-01-26 22:05:40"
+        },
+        {
+            "name": "php-mock/php-mock",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-mock/php-mock.git",
+                "reference": "22d297231118e6fd5b9db087fbe1ef866c2b95d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-mock/php-mock/zipball/22d297231118e6fd5b9db087fbe1ef866c2b95d2",
+                "reference": "22d297231118e6fd5b9db087fbe1ef866c2b95d2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "phpunit/php-text-template": "^1"
+            },
+            "replace": {
+                "malkusch/php-mock": "*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7"
+            },
+            "suggest": {
+                "php-mock/php-mock-phpunit": "Allows integration into PHPUnit testcase with the trait PHPMock."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpmock\\": [
+                        "classes/",
+                        "tests/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "WTFPL"
+            ],
+            "authors": [
+                {
+                    "name": "Markus Malkusch",
+                    "email": "markus@malkusch.de",
+                    "homepage": "http://markus.malkusch.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP-Mock can mock built-in PHP functions (e.g. time()). PHP-Mock relies on PHP's namespace fallback policy. No further extension is needed.",
+            "homepage": "https://github.com/php-mock/php-mock",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "function",
+                "mock",
+                "stub",
+                "test",
+                "test double"
+            ],
+            "time": "2017-02-17 20:52:52"
+        },
+        {
+            "name": "php-mock/php-mock-integration",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-mock/php-mock-integration.git",
+                "reference": "5a0d7d7755f823bc2a230cfa45058b40f9013bc4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-mock/php-mock-integration/zipball/5a0d7d7755f823bc2a230cfa45058b40f9013bc4",
+                "reference": "5a0d7d7755f823bc2a230cfa45058b40f9013bc4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "php-mock/php-mock": "^2",
+                "phpunit/php-text-template": "^1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4|^5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpmock\\integration\\": "classes/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "WTFPL"
+            ],
+            "authors": [
+                {
+                    "name": "Markus Malkusch",
+                    "email": "markus@malkusch.de",
+                    "homepage": "http://markus.malkusch.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Integration package for PHP-Mock",
+            "homepage": "https://github.com/php-mock/php-mock-integration",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "function",
+                "mock",
+                "stub",
+                "test",
+                "test double"
+            ],
+            "time": "2017-02-17 21:31:34"
+        },
+        {
+            "name": "php-mock/php-mock-phpunit",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-mock/php-mock-phpunit.git",
+                "reference": "173781abdc632c59200253e12e2b991ae6a4574f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/173781abdc632c59200253e12e2b991ae6a4574f",
+                "reference": "173781abdc632c59200253e12e2b991ae6a4574f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7",
+                "php-mock/php-mock-integration": "^2",
+                "phpunit/phpunit": "^6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpmock\\phpunit\\": "classes/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "WTFPL"
+            ],
+            "authors": [
+                {
+                    "name": "Markus Malkusch",
+                    "email": "markus@malkusch.de",
+                    "homepage": "http://markus.malkusch.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Mock built-in PHP functions (e.g. time()) with PHPUnit. This package relies on PHP's namespace fallback policy. No further extension is needed.",
+            "homepage": "https://github.com/php-mock/php-mock-phpunit",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "function",
+                "mock",
+                "phpunit",
+                "stub",
+                "test",
+                "test double"
+            ],
+            "time": "2017-02-17 22:44:38"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-09-30 07:12:33"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-11-25 06:54:22"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073",
+                "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2017-03-02 20:05:34"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "5.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "4e99e1c4f9b05cbf4d6e84b100b3ff4107cf8cd1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4e99e1c4f9b05cbf4d6e84b100b3ff4107cf8cd1",
+                "reference": "4e99e1c4f9b05cbf4d6e84b100b3ff4107cf8cd1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-token-stream": "^1.4.11 || ^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0",
+                "sebastian/environment": "^2.0",
+                "sebastian/version": "^2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": "^2.5",
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-03-06 14:22:16"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2016-10-03 07:40:28"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26 11:10:40"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-02-27 10:12:30"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "6.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "9bd36d990884d8fb3313232e0002ed4cdf79f428"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9bd36d990884d8fb3313232e0002ed4cdf79f428",
+                "reference": "9bd36d990884d8fb3313232e0002ed4cdf79f428",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "^1.3",
+                "php": "^7.0",
+                "phpspec/prophecy": "^1.7",
+                "phpunit/php-code-coverage": "^5.0",
+                "phpunit/php-file-iterator": "^1.4",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^4.0",
+                "sebastian/comparator": "^2.0",
+                "sebastian/diff": "^1.2",
+                "sebastian/environment": "^2.0",
+                "sebastian/exporter": "^3.0",
+                "sebastian/global-state": "^1.1 || ^2.0",
+                "sebastian/object-enumerator": "^3.0.2",
+                "sebastian/resource-operations": "^1.0",
+                "sebastian/version": "^2.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2",
+                "phpunit/dbunit": "<3.0"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "^1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-03-15 13:04:13"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "4.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "eabce450df194817a7d7e27e19013569a903a2bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/eabce450df194817a7d7e27e19013569a903a2bf",
+                "reference": "eabce450df194817a7d7e27e19013569a903a2bf",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^3.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2017-03-03 06:30:20"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "time": "2017-02-14 16:28:37"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06 14:39:51"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04 06:30:41"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "20f84f468cb67efee293246e6a09619b891f55f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/20f84f468cb67efee293246e6a09619b891f55f0",
+                "reference": "20f84f468cb67efee293246e6a09619b891f55f0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/diff": "^1.2",
+                "sebastian/exporter": "^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-03-03 06:26:08"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08 07:14:41"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-11-26 07:53:53"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "b82d077cb3459e393abcf4867ae8f7230dcb51f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/b82d077cb3459e393abcf4867ae8f7230dcb51f6",
+                "reference": "b82d077cb3459e393abcf4867ae8f7230dcb51f6",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2017-03-03 06:25:06"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12 03:26:01"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "31dd3379d16446c5d86dec32ab1ad1f378581ad8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/31dd3379d16446c5d86dec32ab1ad1f378581ad8",
+                "reference": "31dd3379d16446c5d86dec32ab1ad1f378581ad8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "sebastian/object-reflector": "^1.0",
+                "sebastian/recursion-context": "^3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2017-03-12 15:17:29"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "2201553542d60d25db9c5b2c54330df776648008"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/2201553542d60d25db9c5b2c54330df776648008",
+                "reference": "2201553542d60d25db9c5b2c54330df776648008",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "time": "2017-03-12 15:10:22"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2017-03-03 06:23:57"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28 20:34:47"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03 07:35:21"
+        },
+        {
+            "name": "symfony/browser-kit",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/browser-kit.git",
+                "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2fe0caa60c1a1dfeefd0425741182687a9b382b8",
+                "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/dom-crawler": "~2.8|~3.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~2.8|~3.0",
+                "symfony/process": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\BrowserKit\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony BrowserKit Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-21 09:12:04"
+        },
+        {
+            "name": "symfony/class-loader",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/class-loader.git",
+                "reference": "c29a5bc6ca14cfff1f5e3d7781ed74b6e898d2b9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/c29a5bc6ca14cfff1f5e3d7781ed74b6e898d2b9",
+                "reference": "c29a5bc6ca14cfff1f5e3d7781ed74b6e898d2b9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/finder": "~2.8|~3.0",
+                "symfony/polyfill-apcu": "~1.1"
+            },
+            "suggest": {
+                "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\ClassLoader\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony ClassLoader Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18 17:28:00"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "741d6d4cd1414d67d48eb71aba6072b46ba740c2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/741d6d4cd1414d67d48eb71aba6072b46ba740c2",
+                "reference": "741d6d4cd1414d67d48eb71aba6072b46ba740c2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/filesystem": "~2.8|~3.0"
+            },
+            "require-dev": {
+                "symfony/yaml": "~3.0"
+            },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Config Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-01 18:18:25"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/28fb243a2b5727774ca309ec2d92da240f1af0dd",
+                "reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/debug": "~2.8|~3.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.8|~3.0",
+                "symfony/filesystem": "~2.8|~3.0",
+                "symfony/process": "~2.8|~3.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/filesystem": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-06 19:30:27"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/a48f13dc83c168f1253a5d2a5a4fb46c36244c4c",
+                "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony CssSelector Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-21 09:12:04"
+        },
+        {
+            "name": "symfony/debug",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "b90c9f91ad8ac37d9f114e369042d3226b34dc1a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/b90c9f91ad8ac37d9f114e369042d3226b34dc1a",
+                "reference": "b90c9f91ad8ac37d9f114e369042d3226b34dc1a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "psr/log": "~1.0"
+            },
+            "conflict": {
+                "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
+            },
+            "require-dev": {
+                "symfony/class-loader": "~2.8|~3.0",
+                "symfony/http-kernel": "~2.8|~3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Debug Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18 17:28:00"
+        },
+        {
+            "name": "symfony/dependency-injection",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "74e0935e414ad33d5e82074212c0eedb4681a691"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/74e0935e414ad33d5e82074212c0eedb4681a691",
+                "reference": "74e0935e414ad33d5e82074212c0eedb4681a691",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "conflict": {
+                "symfony/yaml": "<3.2"
+            },
+            "require-dev": {
+                "symfony/config": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/yaml": "~3.2"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DependencyInjection\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony DependencyInjection Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-05 00:06:55"
+        },
+        {
+            "name": "symfony/dom-crawler",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/403944e294cf4ceb3b8447f54cbad88ea7b99cee",
+                "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/css-selector": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DomCrawler\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony DomCrawler Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-21 09:12:04"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d",
+                "reference": "b7a1b9e0a0f623ce43b4c8d775eb138f190c9d8d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.8|~3.0",
+                "symfony/dependency-injection": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/stopwatch": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-21 09:12:04"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "bc0f17bed914df2cceb989972c3b996043c4da4a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/bc0f17bed914df2cceb989972c3b996043c4da4a",
+                "reference": "bc0f17bed914df2cceb989972c3b996043c4da4a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-06 19:30:27"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-11-14 01:06:16"
+        },
+        {
+            "name": "symfony/translation",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/translation.git",
+                "reference": "0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690",
+                "reference": "0e1b15ce8fbf3890f4ccdac430ed5e07fdfe0690",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/config": "<2.8"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.8|~3.0",
+                "symfony/intl": "^2.8.18|^3.2.5",
+                "symfony/yaml": "~2.8|~3.0"
+            },
+            "suggest": {
+                "psr/log": "To use logging capability in translator",
+                "symfony/config": "",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Translation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Translation Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-04 12:23:14"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.2.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a",
+                "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/console": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-03-07 16:47:02"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2016-11-23 20:04:58"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "behat/behat": 0,
+        "behat/mink-extension": 0,
+        "behat/mink-goutte-driver": 0
+    },
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.5",
+        "ext-curl": "*",
+        "ext-gd": "*",
+        "ext-mbstring": "*",
+        "ext-xml": "*",
+        "ext-openssl": "*"
+    },
+    "platform-dev": {
+        "php": ">=7.0"
+    }
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 28ef0d2bf..7a91153b0 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,620 +6,4 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Hubzilla\\Import\\Import' => $baseDir . '/include/Import/Importer.php',
-    'Markdownify\\Converter' => $vendorDir . '/pixel418/markdownify/src/Converter.php',
-    'Markdownify\\ConverterExtra' => $vendorDir . '/pixel418/markdownify/src/ConverterExtra.php',
-    'Markdownify\\Parser' => $vendorDir . '/pixel418/markdownify/src/Parser.php',
-    'Michelf\\Markdown' => $vendorDir . '/michelf/php-markdown/Michelf/Markdown.php',
-    'Michelf\\MarkdownExtra' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownExtra.php',
-    'Michelf\\MarkdownInterface' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownInterface.php',
-    'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
-    'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
-    'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
-    'Psr\\Log\\LoggerAwareInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareInterface.php',
-    'Psr\\Log\\LoggerAwareTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerAwareTrait.php',
-    'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
-    'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
-    'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
-    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Sabre\\CalDAV\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php',
-    'Sabre\\CalDAV\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/BackendInterface.php',
-    'Sabre\\CalDAV\\Backend\\NotificationSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php',
-    'Sabre\\CalDAV\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/PDO.php',
-    'Sabre\\CalDAV\\Backend\\SchedulingSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SchedulingSupport.php',
-    'Sabre\\CalDAV\\Backend\\SharingSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SharingSupport.php',
-    'Sabre\\CalDAV\\Backend\\SimplePDO' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SimplePDO.php',
-    'Sabre\\CalDAV\\Backend\\SubscriptionSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php',
-    'Sabre\\CalDAV\\Backend\\SyncSupport' => $vendorDir . '/sabre/dav/lib/CalDAV/Backend/SyncSupport.php',
-    'Sabre\\CalDAV\\Calendar' => $vendorDir . '/sabre/dav/lib/CalDAV/Calendar.php',
-    'Sabre\\CalDAV\\CalendarHome' => $vendorDir . '/sabre/dav/lib/CalDAV/CalendarHome.php',
-    'Sabre\\CalDAV\\CalendarObject' => $vendorDir . '/sabre/dav/lib/CalDAV/CalendarObject.php',
-    'Sabre\\CalDAV\\CalendarQueryValidator' => $vendorDir . '/sabre/dav/lib/CalDAV/CalendarQueryValidator.php',
-    'Sabre\\CalDAV\\CalendarRoot' => $vendorDir . '/sabre/dav/lib/CalDAV/CalendarRoot.php',
-    'Sabre\\CalDAV\\Exception\\InvalidComponentType' => $vendorDir . '/sabre/dav/lib/CalDAV/Exception/InvalidComponentType.php',
-    'Sabre\\CalDAV\\ICSExportPlugin' => $vendorDir . '/sabre/dav/lib/CalDAV/ICSExportPlugin.php',
-    'Sabre\\CalDAV\\ICalendar' => $vendorDir . '/sabre/dav/lib/CalDAV/ICalendar.php',
-    'Sabre\\CalDAV\\ICalendarObject' => $vendorDir . '/sabre/dav/lib/CalDAV/ICalendarObject.php',
-    'Sabre\\CalDAV\\ICalendarObjectContainer' => $vendorDir . '/sabre/dav/lib/CalDAV/ICalendarObjectContainer.php',
-    'Sabre\\CalDAV\\ISharedCalendar' => $vendorDir . '/sabre/dav/lib/CalDAV/ISharedCalendar.php',
-    'Sabre\\CalDAV\\Notifications\\Collection' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/Collection.php',
-    'Sabre\\CalDAV\\Notifications\\ICollection' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/ICollection.php',
-    'Sabre\\CalDAV\\Notifications\\INode' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/INode.php',
-    'Sabre\\CalDAV\\Notifications\\Node' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/Node.php',
-    'Sabre\\CalDAV\\Notifications\\Plugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Notifications/Plugin.php',
-    'Sabre\\CalDAV\\Plugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Plugin.php',
-    'Sabre\\CalDAV\\Principal\\Collection' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/Collection.php',
-    'Sabre\\CalDAV\\Principal\\IProxyRead' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/IProxyRead.php',
-    'Sabre\\CalDAV\\Principal\\IProxyWrite' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/IProxyWrite.php',
-    'Sabre\\CalDAV\\Principal\\ProxyRead' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/ProxyRead.php',
-    'Sabre\\CalDAV\\Principal\\ProxyWrite' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/ProxyWrite.php',
-    'Sabre\\CalDAV\\Principal\\User' => $vendorDir . '/sabre/dav/lib/CalDAV/Principal/User.php',
-    'Sabre\\CalDAV\\Schedule\\IInbox' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/IInbox.php',
-    'Sabre\\CalDAV\\Schedule\\IMipPlugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php',
-    'Sabre\\CalDAV\\Schedule\\IOutbox' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/IOutbox.php',
-    'Sabre\\CalDAV\\Schedule\\ISchedulingObject' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/ISchedulingObject.php',
-    'Sabre\\CalDAV\\Schedule\\Inbox' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/Inbox.php',
-    'Sabre\\CalDAV\\Schedule\\Outbox' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/Outbox.php',
-    'Sabre\\CalDAV\\Schedule\\Plugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/Plugin.php',
-    'Sabre\\CalDAV\\Schedule\\SchedulingObject' => $vendorDir . '/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php',
-    'Sabre\\CalDAV\\SharedCalendar' => $vendorDir . '/sabre/dav/lib/CalDAV/SharedCalendar.php',
-    'Sabre\\CalDAV\\SharingPlugin' => $vendorDir . '/sabre/dav/lib/CalDAV/SharingPlugin.php',
-    'Sabre\\CalDAV\\Subscriptions\\ISubscription' => $vendorDir . '/sabre/dav/lib/CalDAV/Subscriptions/ISubscription.php',
-    'Sabre\\CalDAV\\Subscriptions\\Plugin' => $vendorDir . '/sabre/dav/lib/CalDAV/Subscriptions/Plugin.php',
-    'Sabre\\CalDAV\\Subscriptions\\Subscription' => $vendorDir . '/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php',
-    'Sabre\\CalDAV\\Xml\\Filter\\CalendarData' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Filter/CalendarData.php',
-    'Sabre\\CalDAV\\Xml\\Filter\\CompFilter' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Filter/CompFilter.php',
-    'Sabre\\CalDAV\\Xml\\Filter\\ParamFilter' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php',
-    'Sabre\\CalDAV\\Xml\\Filter\\PropFilter' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php',
-    'Sabre\\CalDAV\\Xml\\Notification\\Invite' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php',
-    'Sabre\\CalDAV\\Xml\\Notification\\InviteReply' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php',
-    'Sabre\\CalDAV\\Xml\\Notification\\NotificationInterface' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Notification/NotificationInterface.php',
-    'Sabre\\CalDAV\\Xml\\Notification\\SystemStatus' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Notification/SystemStatus.php',
-    'Sabre\\CalDAV\\Xml\\Property\\AllowedSharingModes' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/AllowedSharingModes.php',
-    'Sabre\\CalDAV\\Xml\\Property\\EmailAddressSet' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/EmailAddressSet.php',
-    'Sabre\\CalDAV\\Xml\\Property\\Invite' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/Invite.php',
-    'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php',
-    'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php',
-    'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarData' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarData.php',
-    'Sabre\\CalDAV\\Xml\\Property\\SupportedCollationSet' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Property/SupportedCollationSet.php',
-    'Sabre\\CalDAV\\Xml\\Request\\CalendarMultiGetReport' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/CalendarMultiGetReport.php',
-    'Sabre\\CalDAV\\Xml\\Request\\CalendarQueryReport' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/CalendarQueryReport.php',
-    'Sabre\\CalDAV\\Xml\\Request\\FreeBusyQueryReport' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/FreeBusyQueryReport.php',
-    'Sabre\\CalDAV\\Xml\\Request\\InviteReply' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php',
-    'Sabre\\CalDAV\\Xml\\Request\\MkCalendar' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/MkCalendar.php',
-    'Sabre\\CalDAV\\Xml\\Request\\Share' => $vendorDir . '/sabre/dav/lib/CalDAV/Xml/Request/Share.php',
-    'Sabre\\CardDAV\\AddressBook' => $vendorDir . '/sabre/dav/lib/CardDAV/AddressBook.php',
-    'Sabre\\CardDAV\\AddressBookHome' => $vendorDir . '/sabre/dav/lib/CardDAV/AddressBookHome.php',
-    'Sabre\\CardDAV\\AddressBookRoot' => $vendorDir . '/sabre/dav/lib/CardDAV/AddressBookRoot.php',
-    'Sabre\\CardDAV\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/CardDAV/Backend/AbstractBackend.php',
-    'Sabre\\CardDAV\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/CardDAV/Backend/BackendInterface.php',
-    'Sabre\\CardDAV\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/CardDAV/Backend/PDO.php',
-    'Sabre\\CardDAV\\Backend\\SyncSupport' => $vendorDir . '/sabre/dav/lib/CardDAV/Backend/SyncSupport.php',
-    'Sabre\\CardDAV\\Card' => $vendorDir . '/sabre/dav/lib/CardDAV/Card.php',
-    'Sabre\\CardDAV\\IAddressBook' => $vendorDir . '/sabre/dav/lib/CardDAV/IAddressBook.php',
-    'Sabre\\CardDAV\\ICard' => $vendorDir . '/sabre/dav/lib/CardDAV/ICard.php',
-    'Sabre\\CardDAV\\IDirectory' => $vendorDir . '/sabre/dav/lib/CardDAV/IDirectory.php',
-    'Sabre\\CardDAV\\Plugin' => $vendorDir . '/sabre/dav/lib/CardDAV/Plugin.php',
-    'Sabre\\CardDAV\\VCFExportPlugin' => $vendorDir . '/sabre/dav/lib/CardDAV/VCFExportPlugin.php',
-    'Sabre\\CardDAV\\Xml\\Filter\\AddressData' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php',
-    'Sabre\\CardDAV\\Xml\\Filter\\ParamFilter' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php',
-    'Sabre\\CardDAV\\Xml\\Filter\\PropFilter' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php',
-    'Sabre\\CardDAV\\Xml\\Property\\SupportedAddressData' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php',
-    'Sabre\\CardDAV\\Xml\\Property\\SupportedCollationSet' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php',
-    'Sabre\\CardDAV\\Xml\\Request\\AddressBookMultiGetReport' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php',
-    'Sabre\\CardDAV\\Xml\\Request\\AddressBookQueryReport' => $vendorDir . '/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php',
-    'Sabre\\DAVACL\\ACLTrait' => $vendorDir . '/sabre/dav/lib/DAVACL/ACLTrait.php',
-    'Sabre\\DAVACL\\AbstractPrincipalCollection' => $vendorDir . '/sabre/dav/lib/DAVACL/AbstractPrincipalCollection.php',
-    'Sabre\\DAVACL\\Exception\\AceConflict' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/AceConflict.php',
-    'Sabre\\DAVACL\\Exception\\NeedPrivileges' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/NeedPrivileges.php',
-    'Sabre\\DAVACL\\Exception\\NoAbstract' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/NoAbstract.php',
-    'Sabre\\DAVACL\\Exception\\NotRecognizedPrincipal' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/NotRecognizedPrincipal.php',
-    'Sabre\\DAVACL\\Exception\\NotSupportedPrivilege' => $vendorDir . '/sabre/dav/lib/DAVACL/Exception/NotSupportedPrivilege.php',
-    'Sabre\\DAVACL\\FS\\Collection' => $vendorDir . '/sabre/dav/lib/DAVACL/FS/Collection.php',
-    'Sabre\\DAVACL\\FS\\File' => $vendorDir . '/sabre/dav/lib/DAVACL/FS/File.php',
-    'Sabre\\DAVACL\\FS\\HomeCollection' => $vendorDir . '/sabre/dav/lib/DAVACL/FS/HomeCollection.php',
-    'Sabre\\DAVACL\\IACL' => $vendorDir . '/sabre/dav/lib/DAVACL/IACL.php',
-    'Sabre\\DAVACL\\IPrincipal' => $vendorDir . '/sabre/dav/lib/DAVACL/IPrincipal.php',
-    'Sabre\\DAVACL\\IPrincipalCollection' => $vendorDir . '/sabre/dav/lib/DAVACL/IPrincipalCollection.php',
-    'Sabre\\DAVACL\\Plugin' => $vendorDir . '/sabre/dav/lib/DAVACL/Plugin.php',
-    'Sabre\\DAVACL\\Principal' => $vendorDir . '/sabre/dav/lib/DAVACL/Principal.php',
-    'Sabre\\DAVACL\\PrincipalBackend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalBackend/AbstractBackend.php',
-    'Sabre\\DAVACL\\PrincipalBackend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php',
-    'Sabre\\DAVACL\\PrincipalBackend\\CreatePrincipalSupport' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalBackend/CreatePrincipalSupport.php',
-    'Sabre\\DAVACL\\PrincipalBackend\\PDO' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php',
-    'Sabre\\DAVACL\\PrincipalCollection' => $vendorDir . '/sabre/dav/lib/DAVACL/PrincipalCollection.php',
-    'Sabre\\DAVACL\\Xml\\Property\\Acl' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/Acl.php',
-    'Sabre\\DAVACL\\Xml\\Property\\AclRestrictions' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/AclRestrictions.php',
-    'Sabre\\DAVACL\\Xml\\Property\\CurrentUserPrivilegeSet' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/CurrentUserPrivilegeSet.php',
-    'Sabre\\DAVACL\\Xml\\Property\\Principal' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/Principal.php',
-    'Sabre\\DAVACL\\Xml\\Property\\SupportedPrivilegeSet' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php',
-    'Sabre\\DAVACL\\Xml\\Request\\AclPrincipalPropSetReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php',
-    'Sabre\\DAVACL\\Xml\\Request\\ExpandPropertyReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/ExpandPropertyReport.php',
-    'Sabre\\DAVACL\\Xml\\Request\\PrincipalMatchReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php',
-    'Sabre\\DAVACL\\Xml\\Request\\PrincipalPropertySearchReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/PrincipalPropertySearchReport.php',
-    'Sabre\\DAVACL\\Xml\\Request\\PrincipalSearchPropertySetReport' => $vendorDir . '/sabre/dav/lib/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php',
-    'Sabre\\DAV\\Auth\\Backend\\AbstractBasic' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/AbstractBasic.php',
-    'Sabre\\DAV\\Auth\\Backend\\AbstractBearer' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/AbstractBearer.php',
-    'Sabre\\DAV\\Auth\\Backend\\AbstractDigest' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php',
-    'Sabre\\DAV\\Auth\\Backend\\Apache' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/Apache.php',
-    'Sabre\\DAV\\Auth\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/BackendInterface.php',
-    'Sabre\\DAV\\Auth\\Backend\\BasicCallBack' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/BasicCallBack.php',
-    'Sabre\\DAV\\Auth\\Backend\\File' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/File.php',
-    'Sabre\\DAV\\Auth\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Backend/PDO.php',
-    'Sabre\\DAV\\Auth\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Auth/Plugin.php',
-    'Sabre\\DAV\\Browser\\GuessContentType' => $vendorDir . '/sabre/dav/lib/DAV/Browser/GuessContentType.php',
-    'Sabre\\DAV\\Browser\\HtmlOutput' => $vendorDir . '/sabre/dav/lib/DAV/Browser/HtmlOutput.php',
-    'Sabre\\DAV\\Browser\\HtmlOutputHelper' => $vendorDir . '/sabre/dav/lib/DAV/Browser/HtmlOutputHelper.php',
-    'Sabre\\DAV\\Browser\\MapGetToPropFind' => $vendorDir . '/sabre/dav/lib/DAV/Browser/MapGetToPropFind.php',
-    'Sabre\\DAV\\Browser\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Browser/Plugin.php',
-    'Sabre\\DAV\\Browser\\PropFindAll' => $vendorDir . '/sabre/dav/lib/DAV/Browser/PropFindAll.php',
-    'Sabre\\DAV\\Client' => $vendorDir . '/sabre/dav/lib/DAV/Client.php',
-    'Sabre\\DAV\\Collection' => $vendorDir . '/sabre/dav/lib/DAV/Collection.php',
-    'Sabre\\DAV\\CorePlugin' => $vendorDir . '/sabre/dav/lib/DAV/CorePlugin.php',
-    'Sabre\\DAV\\Exception' => $vendorDir . '/sabre/dav/lib/DAV/Exception.php',
-    'Sabre\\DAV\\Exception\\BadRequest' => $vendorDir . '/sabre/dav/lib/DAV/Exception/BadRequest.php',
-    'Sabre\\DAV\\Exception\\Conflict' => $vendorDir . '/sabre/dav/lib/DAV/Exception/Conflict.php',
-    'Sabre\\DAV\\Exception\\ConflictingLock' => $vendorDir . '/sabre/dav/lib/DAV/Exception/ConflictingLock.php',
-    'Sabre\\DAV\\Exception\\Forbidden' => $vendorDir . '/sabre/dav/lib/DAV/Exception/Forbidden.php',
-    'Sabre\\DAV\\Exception\\InsufficientStorage' => $vendorDir . '/sabre/dav/lib/DAV/Exception/InsufficientStorage.php',
-    'Sabre\\DAV\\Exception\\InvalidResourceType' => $vendorDir . '/sabre/dav/lib/DAV/Exception/InvalidResourceType.php',
-    'Sabre\\DAV\\Exception\\InvalidSyncToken' => $vendorDir . '/sabre/dav/lib/DAV/Exception/InvalidSyncToken.php',
-    'Sabre\\DAV\\Exception\\LengthRequired' => $vendorDir . '/sabre/dav/lib/DAV/Exception/LengthRequired.php',
-    'Sabre\\DAV\\Exception\\LockTokenMatchesRequestUri' => $vendorDir . '/sabre/dav/lib/DAV/Exception/LockTokenMatchesRequestUri.php',
-    'Sabre\\DAV\\Exception\\Locked' => $vendorDir . '/sabre/dav/lib/DAV/Exception/Locked.php',
-    'Sabre\\DAV\\Exception\\MethodNotAllowed' => $vendorDir . '/sabre/dav/lib/DAV/Exception/MethodNotAllowed.php',
-    'Sabre\\DAV\\Exception\\NotAuthenticated' => $vendorDir . '/sabre/dav/lib/DAV/Exception/NotAuthenticated.php',
-    'Sabre\\DAV\\Exception\\NotFound' => $vendorDir . '/sabre/dav/lib/DAV/Exception/NotFound.php',
-    'Sabre\\DAV\\Exception\\NotImplemented' => $vendorDir . '/sabre/dav/lib/DAV/Exception/NotImplemented.php',
-    'Sabre\\DAV\\Exception\\PaymentRequired' => $vendorDir . '/sabre/dav/lib/DAV/Exception/PaymentRequired.php',
-    'Sabre\\DAV\\Exception\\PreconditionFailed' => $vendorDir . '/sabre/dav/lib/DAV/Exception/PreconditionFailed.php',
-    'Sabre\\DAV\\Exception\\ReportNotSupported' => $vendorDir . '/sabre/dav/lib/DAV/Exception/ReportNotSupported.php',
-    'Sabre\\DAV\\Exception\\RequestedRangeNotSatisfiable' => $vendorDir . '/sabre/dav/lib/DAV/Exception/RequestedRangeNotSatisfiable.php',
-    'Sabre\\DAV\\Exception\\ServiceUnavailable' => $vendorDir . '/sabre/dav/lib/DAV/Exception/ServiceUnavailable.php',
-    'Sabre\\DAV\\Exception\\TooManyMatches' => $vendorDir . '/sabre/dav/lib/DAV/Exception/TooManyMatches.php',
-    'Sabre\\DAV\\Exception\\UnsupportedMediaType' => $vendorDir . '/sabre/dav/lib/DAV/Exception/UnsupportedMediaType.php',
-    'Sabre\\DAV\\FSExt\\Directory' => $vendorDir . '/sabre/dav/lib/DAV/FSExt/Directory.php',
-    'Sabre\\DAV\\FSExt\\File' => $vendorDir . '/sabre/dav/lib/DAV/FSExt/File.php',
-    'Sabre\\DAV\\FS\\Directory' => $vendorDir . '/sabre/dav/lib/DAV/FS/Directory.php',
-    'Sabre\\DAV\\FS\\File' => $vendorDir . '/sabre/dav/lib/DAV/FS/File.php',
-    'Sabre\\DAV\\FS\\Node' => $vendorDir . '/sabre/dav/lib/DAV/FS/Node.php',
-    'Sabre\\DAV\\File' => $vendorDir . '/sabre/dav/lib/DAV/File.php',
-    'Sabre\\DAV\\ICollection' => $vendorDir . '/sabre/dav/lib/DAV/ICollection.php',
-    'Sabre\\DAV\\IExtendedCollection' => $vendorDir . '/sabre/dav/lib/DAV/IExtendedCollection.php',
-    'Sabre\\DAV\\IFile' => $vendorDir . '/sabre/dav/lib/DAV/IFile.php',
-    'Sabre\\DAV\\IMoveTarget' => $vendorDir . '/sabre/dav/lib/DAV/IMoveTarget.php',
-    'Sabre\\DAV\\IMultiGet' => $vendorDir . '/sabre/dav/lib/DAV/IMultiGet.php',
-    'Sabre\\DAV\\INode' => $vendorDir . '/sabre/dav/lib/DAV/INode.php',
-    'Sabre\\DAV\\IProperties' => $vendorDir . '/sabre/dav/lib/DAV/IProperties.php',
-    'Sabre\\DAV\\IQuota' => $vendorDir . '/sabre/dav/lib/DAV/IQuota.php',
-    'Sabre\\DAV\\Locks\\Backend\\AbstractBackend' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/AbstractBackend.php',
-    'Sabre\\DAV\\Locks\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/BackendInterface.php',
-    'Sabre\\DAV\\Locks\\Backend\\File' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/File.php',
-    'Sabre\\DAV\\Locks\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Backend/PDO.php',
-    'Sabre\\DAV\\Locks\\LockInfo' => $vendorDir . '/sabre/dav/lib/DAV/Locks/LockInfo.php',
-    'Sabre\\DAV\\Locks\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Locks/Plugin.php',
-    'Sabre\\DAV\\MkCol' => $vendorDir . '/sabre/dav/lib/DAV/MkCol.php',
-    'Sabre\\DAV\\Mount\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Mount/Plugin.php',
-    'Sabre\\DAV\\Node' => $vendorDir . '/sabre/dav/lib/DAV/Node.php',
-    'Sabre\\DAV\\PartialUpdate\\IPatchSupport' => $vendorDir . '/sabre/dav/lib/DAV/PartialUpdate/IPatchSupport.php',
-    'Sabre\\DAV\\PartialUpdate\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/PartialUpdate/Plugin.php',
-    'Sabre\\DAV\\PropFind' => $vendorDir . '/sabre/dav/lib/DAV/PropFind.php',
-    'Sabre\\DAV\\PropPatch' => $vendorDir . '/sabre/dav/lib/DAV/PropPatch.php',
-    'Sabre\\DAV\\PropertyStorage\\Backend\\BackendInterface' => $vendorDir . '/sabre/dav/lib/DAV/PropertyStorage/Backend/BackendInterface.php',
-    'Sabre\\DAV\\PropertyStorage\\Backend\\PDO' => $vendorDir . '/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php',
-    'Sabre\\DAV\\PropertyStorage\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/PropertyStorage/Plugin.php',
-    'Sabre\\DAV\\Server' => $vendorDir . '/sabre/dav/lib/DAV/Server.php',
-    'Sabre\\DAV\\ServerPlugin' => $vendorDir . '/sabre/dav/lib/DAV/ServerPlugin.php',
-    'Sabre\\DAV\\Sharing\\ISharedNode' => $vendorDir . '/sabre/dav/lib/DAV/Sharing/ISharedNode.php',
-    'Sabre\\DAV\\Sharing\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Sharing/Plugin.php',
-    'Sabre\\DAV\\SimpleCollection' => $vendorDir . '/sabre/dav/lib/DAV/SimpleCollection.php',
-    'Sabre\\DAV\\SimpleFile' => $vendorDir . '/sabre/dav/lib/DAV/SimpleFile.php',
-    'Sabre\\DAV\\StringUtil' => $vendorDir . '/sabre/dav/lib/DAV/StringUtil.php',
-    'Sabre\\DAV\\Sync\\ISyncCollection' => $vendorDir . '/sabre/dav/lib/DAV/Sync/ISyncCollection.php',
-    'Sabre\\DAV\\Sync\\Plugin' => $vendorDir . '/sabre/dav/lib/DAV/Sync/Plugin.php',
-    'Sabre\\DAV\\TemporaryFileFilterPlugin' => $vendorDir . '/sabre/dav/lib/DAV/TemporaryFileFilterPlugin.php',
-    'Sabre\\DAV\\Tree' => $vendorDir . '/sabre/dav/lib/DAV/Tree.php',
-    'Sabre\\DAV\\UUIDUtil' => $vendorDir . '/sabre/dav/lib/DAV/UUIDUtil.php',
-    'Sabre\\DAV\\Version' => $vendorDir . '/sabre/dav/lib/DAV/Version.php',
-    'Sabre\\DAV\\Xml\\Element\\Prop' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Element/Prop.php',
-    'Sabre\\DAV\\Xml\\Element\\Response' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Element/Response.php',
-    'Sabre\\DAV\\Xml\\Element\\Sharee' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Element/Sharee.php',
-    'Sabre\\DAV\\Xml\\Property\\Complex' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/Complex.php',
-    'Sabre\\DAV\\Xml\\Property\\GetLastModified' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/GetLastModified.php',
-    'Sabre\\DAV\\Xml\\Property\\Href' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/Href.php',
-    'Sabre\\DAV\\Xml\\Property\\Invite' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/Invite.php',
-    'Sabre\\DAV\\Xml\\Property\\LocalHref' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/LocalHref.php',
-    'Sabre\\DAV\\Xml\\Property\\LockDiscovery' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/LockDiscovery.php',
-    'Sabre\\DAV\\Xml\\Property\\ResourceType' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/ResourceType.php',
-    'Sabre\\DAV\\Xml\\Property\\ShareAccess' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php',
-    'Sabre\\DAV\\Xml\\Property\\SupportedLock' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/SupportedLock.php',
-    'Sabre\\DAV\\Xml\\Property\\SupportedMethodSet' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php',
-    'Sabre\\DAV\\Xml\\Property\\SupportedReportSet' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Property/SupportedReportSet.php',
-    'Sabre\\DAV\\Xml\\Request\\Lock' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/Lock.php',
-    'Sabre\\DAV\\Xml\\Request\\MkCol' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/MkCol.php',
-    'Sabre\\DAV\\Xml\\Request\\PropFind' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/PropFind.php',
-    'Sabre\\DAV\\Xml\\Request\\PropPatch' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/PropPatch.php',
-    'Sabre\\DAV\\Xml\\Request\\ShareResource' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/ShareResource.php',
-    'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php',
-    'Sabre\\DAV\\Xml\\Response\\MultiStatus' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Response/MultiStatus.php',
-    'Sabre\\DAV\\Xml\\Service' => $vendorDir . '/sabre/dav/lib/DAV/Xml/Service.php',
-    'Sabre\\Event\\EventEmitter' => $vendorDir . '/sabre/event/lib/EventEmitter.php',
-    'Sabre\\Event\\EventEmitterInterface' => $vendorDir . '/sabre/event/lib/EventEmitterInterface.php',
-    'Sabre\\Event\\EventEmitterTrait' => $vendorDir . '/sabre/event/lib/EventEmitterTrait.php',
-    'Sabre\\Event\\Loop\\Loop' => $vendorDir . '/sabre/event/lib/Loop/Loop.php',
-    'Sabre\\Event\\Promise' => $vendorDir . '/sabre/event/lib/Promise.php',
-    'Sabre\\Event\\PromiseAlreadyResolvedException' => $vendorDir . '/sabre/event/lib/PromiseAlreadyResolvedException.php',
-    'Sabre\\Event\\Version' => $vendorDir . '/sabre/event/lib/Version.php',
-    'Sabre\\HTTP\\Auth\\AWS' => $vendorDir . '/sabre/http/lib/Auth/AWS.php',
-    'Sabre\\HTTP\\Auth\\AbstractAuth' => $vendorDir . '/sabre/http/lib/Auth/AbstractAuth.php',
-    'Sabre\\HTTP\\Auth\\Basic' => $vendorDir . '/sabre/http/lib/Auth/Basic.php',
-    'Sabre\\HTTP\\Auth\\Bearer' => $vendorDir . '/sabre/http/lib/Auth/Bearer.php',
-    'Sabre\\HTTP\\Auth\\Digest' => $vendorDir . '/sabre/http/lib/Auth/Digest.php',
-    'Sabre\\HTTP\\Client' => $vendorDir . '/sabre/http/lib/Client.php',
-    'Sabre\\HTTP\\ClientException' => $vendorDir . '/sabre/http/lib/ClientException.php',
-    'Sabre\\HTTP\\ClientHttpException' => $vendorDir . '/sabre/http/lib/ClientHttpException.php',
-    'Sabre\\HTTP\\HttpException' => $vendorDir . '/sabre/http/lib/HttpException.php',
-    'Sabre\\HTTP\\Message' => $vendorDir . '/sabre/http/lib/Message.php',
-    'Sabre\\HTTP\\MessageDecoratorTrait' => $vendorDir . '/sabre/http/lib/MessageDecoratorTrait.php',
-    'Sabre\\HTTP\\MessageInterface' => $vendorDir . '/sabre/http/lib/MessageInterface.php',
-    'Sabre\\HTTP\\Request' => $vendorDir . '/sabre/http/lib/Request.php',
-    'Sabre\\HTTP\\RequestDecorator' => $vendorDir . '/sabre/http/lib/RequestDecorator.php',
-    'Sabre\\HTTP\\RequestInterface' => $vendorDir . '/sabre/http/lib/RequestInterface.php',
-    'Sabre\\HTTP\\Response' => $vendorDir . '/sabre/http/lib/Response.php',
-    'Sabre\\HTTP\\ResponseDecorator' => $vendorDir . '/sabre/http/lib/ResponseDecorator.php',
-    'Sabre\\HTTP\\ResponseInterface' => $vendorDir . '/sabre/http/lib/ResponseInterface.php',
-    'Sabre\\HTTP\\Sapi' => $vendorDir . '/sabre/http/lib/Sapi.php',
-    'Sabre\\HTTP\\URLUtil' => $vendorDir . '/sabre/http/lib/URLUtil.php',
-    'Sabre\\HTTP\\Util' => $vendorDir . '/sabre/http/lib/Util.php',
-    'Sabre\\HTTP\\Version' => $vendorDir . '/sabre/http/lib/Version.php',
-    'Sabre\\Uri\\Version' => $vendorDir . '/sabre/uri/lib/Version.php',
-    'Sabre\\VObject\\BirthdayCalendarGenerator' => $vendorDir . '/sabre/vobject/lib/BirthdayCalendarGenerator.php',
-    'Sabre\\VObject\\Cli' => $vendorDir . '/sabre/vobject/lib/Cli.php',
-    'Sabre\\VObject\\Component' => $vendorDir . '/sabre/vobject/lib/Component.php',
-    'Sabre\\VObject\\Component\\Available' => $vendorDir . '/sabre/vobject/lib/Component/Available.php',
-    'Sabre\\VObject\\Component\\VAlarm' => $vendorDir . '/sabre/vobject/lib/Component/VAlarm.php',
-    'Sabre\\VObject\\Component\\VAvailability' => $vendorDir . '/sabre/vobject/lib/Component/VAvailability.php',
-    'Sabre\\VObject\\Component\\VCalendar' => $vendorDir . '/sabre/vobject/lib/Component/VCalendar.php',
-    'Sabre\\VObject\\Component\\VCard' => $vendorDir . '/sabre/vobject/lib/Component/VCard.php',
-    'Sabre\\VObject\\Component\\VEvent' => $vendorDir . '/sabre/vobject/lib/Component/VEvent.php',
-    'Sabre\\VObject\\Component\\VFreeBusy' => $vendorDir . '/sabre/vobject/lib/Component/VFreeBusy.php',
-    'Sabre\\VObject\\Component\\VJournal' => $vendorDir . '/sabre/vobject/lib/Component/VJournal.php',
-    'Sabre\\VObject\\Component\\VTimeZone' => $vendorDir . '/sabre/vobject/lib/Component/VTimeZone.php',
-    'Sabre\\VObject\\Component\\VTodo' => $vendorDir . '/sabre/vobject/lib/Component/VTodo.php',
-    'Sabre\\VObject\\DateTimeParser' => $vendorDir . '/sabre/vobject/lib/DateTimeParser.php',
-    'Sabre\\VObject\\Document' => $vendorDir . '/sabre/vobject/lib/Document.php',
-    'Sabre\\VObject\\ElementList' => $vendorDir . '/sabre/vobject/lib/ElementList.php',
-    'Sabre\\VObject\\EofException' => $vendorDir . '/sabre/vobject/lib/EofException.php',
-    'Sabre\\VObject\\FreeBusyData' => $vendorDir . '/sabre/vobject/lib/FreeBusyData.php',
-    'Sabre\\VObject\\FreeBusyGenerator' => $vendorDir . '/sabre/vobject/lib/FreeBusyGenerator.php',
-    'Sabre\\VObject\\ITip\\Broker' => $vendorDir . '/sabre/vobject/lib/ITip/Broker.php',
-    'Sabre\\VObject\\ITip\\ITipException' => $vendorDir . '/sabre/vobject/lib/ITip/ITipException.php',
-    'Sabre\\VObject\\ITip\\Message' => $vendorDir . '/sabre/vobject/lib/ITip/Message.php',
-    'Sabre\\VObject\\ITip\\SameOrganizerForAllComponentsException' => $vendorDir . '/sabre/vobject/lib/ITip/SameOrganizerForAllComponentsException.php',
-    'Sabre\\VObject\\InvalidDataException' => $vendorDir . '/sabre/vobject/lib/InvalidDataException.php',
-    'Sabre\\VObject\\Node' => $vendorDir . '/sabre/vobject/lib/Node.php',
-    'Sabre\\VObject\\PHPUnitAssertions' => $vendorDir . '/sabre/vobject/lib/PHPUnitAssertions.php',
-    'Sabre\\VObject\\Parameter' => $vendorDir . '/sabre/vobject/lib/Parameter.php',
-    'Sabre\\VObject\\ParseException' => $vendorDir . '/sabre/vobject/lib/ParseException.php',
-    'Sabre\\VObject\\Parser\\Json' => $vendorDir . '/sabre/vobject/lib/Parser/Json.php',
-    'Sabre\\VObject\\Parser\\MimeDir' => $vendorDir . '/sabre/vobject/lib/Parser/MimeDir.php',
-    'Sabre\\VObject\\Parser\\Parser' => $vendorDir . '/sabre/vobject/lib/Parser/Parser.php',
-    'Sabre\\VObject\\Parser\\XML' => $vendorDir . '/sabre/vobject/lib/Parser/XML.php',
-    'Sabre\\VObject\\Parser\\XML\\Element\\KeyValue' => $vendorDir . '/sabre/vobject/lib/Parser/XML/Element/KeyValue.php',
-    'Sabre\\VObject\\Property' => $vendorDir . '/sabre/vobject/lib/Property.php',
-    'Sabre\\VObject\\Property\\Binary' => $vendorDir . '/sabre/vobject/lib/Property/Binary.php',
-    'Sabre\\VObject\\Property\\Boolean' => $vendorDir . '/sabre/vobject/lib/Property/Boolean.php',
-    'Sabre\\VObject\\Property\\FlatText' => $vendorDir . '/sabre/vobject/lib/Property/FlatText.php',
-    'Sabre\\VObject\\Property\\FloatValue' => $vendorDir . '/sabre/vobject/lib/Property/FloatValue.php',
-    'Sabre\\VObject\\Property\\ICalendar\\CalAddress' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/CalAddress.php',
-    'Sabre\\VObject\\Property\\ICalendar\\Date' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/Date.php',
-    'Sabre\\VObject\\Property\\ICalendar\\DateTime' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/DateTime.php',
-    'Sabre\\VObject\\Property\\ICalendar\\Duration' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/Duration.php',
-    'Sabre\\VObject\\Property\\ICalendar\\Period' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/Period.php',
-    'Sabre\\VObject\\Property\\ICalendar\\Recur' => $vendorDir . '/sabre/vobject/lib/Property/ICalendar/Recur.php',
-    'Sabre\\VObject\\Property\\IntegerValue' => $vendorDir . '/sabre/vobject/lib/Property/IntegerValue.php',
-    'Sabre\\VObject\\Property\\Text' => $vendorDir . '/sabre/vobject/lib/Property/Text.php',
-    'Sabre\\VObject\\Property\\Time' => $vendorDir . '/sabre/vobject/lib/Property/Time.php',
-    'Sabre\\VObject\\Property\\Unknown' => $vendorDir . '/sabre/vobject/lib/Property/Unknown.php',
-    'Sabre\\VObject\\Property\\Uri' => $vendorDir . '/sabre/vobject/lib/Property/Uri.php',
-    'Sabre\\VObject\\Property\\UtcOffset' => $vendorDir . '/sabre/vobject/lib/Property/UtcOffset.php',
-    'Sabre\\VObject\\Property\\VCard\\Date' => $vendorDir . '/sabre/vobject/lib/Property/VCard/Date.php',
-    'Sabre\\VObject\\Property\\VCard\\DateAndOrTime' => $vendorDir . '/sabre/vobject/lib/Property/VCard/DateAndOrTime.php',
-    'Sabre\\VObject\\Property\\VCard\\DateTime' => $vendorDir . '/sabre/vobject/lib/Property/VCard/DateTime.php',
-    'Sabre\\VObject\\Property\\VCard\\LanguageTag' => $vendorDir . '/sabre/vobject/lib/Property/VCard/LanguageTag.php',
-    'Sabre\\VObject\\Property\\VCard\\TimeStamp' => $vendorDir . '/sabre/vobject/lib/Property/VCard/TimeStamp.php',
-    'Sabre\\VObject\\Reader' => $vendorDir . '/sabre/vobject/lib/Reader.php',
-    'Sabre\\VObject\\Recur\\EventIterator' => $vendorDir . '/sabre/vobject/lib/Recur/EventIterator.php',
-    'Sabre\\VObject\\Recur\\MaxInstancesExceededException' => $vendorDir . '/sabre/vobject/lib/Recur/MaxInstancesExceededException.php',
-    'Sabre\\VObject\\Recur\\NoInstancesException' => $vendorDir . '/sabre/vobject/lib/Recur/NoInstancesException.php',
-    'Sabre\\VObject\\Recur\\RDateIterator' => $vendorDir . '/sabre/vobject/lib/Recur/RDateIterator.php',
-    'Sabre\\VObject\\Recur\\RRuleIterator' => $vendorDir . '/sabre/vobject/lib/Recur/RRuleIterator.php',
-    'Sabre\\VObject\\Settings' => $vendorDir . '/sabre/vobject/lib/Settings.php',
-    'Sabre\\VObject\\Splitter\\ICalendar' => $vendorDir . '/sabre/vobject/lib/Splitter/ICalendar.php',
-    'Sabre\\VObject\\Splitter\\SplitterInterface' => $vendorDir . '/sabre/vobject/lib/Splitter/SplitterInterface.php',
-    'Sabre\\VObject\\Splitter\\VCard' => $vendorDir . '/sabre/vobject/lib/Splitter/VCard.php',
-    'Sabre\\VObject\\StringUtil' => $vendorDir . '/sabre/vobject/lib/StringUtil.php',
-    'Sabre\\VObject\\TimeZoneUtil' => $vendorDir . '/sabre/vobject/lib/TimeZoneUtil.php',
-    'Sabre\\VObject\\UUIDUtil' => $vendorDir . '/sabre/vobject/lib/UUIDUtil.php',
-    'Sabre\\VObject\\VCardConverter' => $vendorDir . '/sabre/vobject/lib/VCardConverter.php',
-    'Sabre\\VObject\\Version' => $vendorDir . '/sabre/vobject/lib/Version.php',
-    'Sabre\\VObject\\Writer' => $vendorDir . '/sabre/vobject/lib/Writer.php',
-    'Sabre\\Xml\\ContextStackTrait' => $vendorDir . '/sabre/xml/lib/ContextStackTrait.php',
-    'Sabre\\Xml\\Element' => $vendorDir . '/sabre/xml/lib/Element.php',
-    'Sabre\\Xml\\Element\\Base' => $vendorDir . '/sabre/xml/lib/Element/Base.php',
-    'Sabre\\Xml\\Element\\Cdata' => $vendorDir . '/sabre/xml/lib/Element/Cdata.php',
-    'Sabre\\Xml\\Element\\Elements' => $vendorDir . '/sabre/xml/lib/Element/Elements.php',
-    'Sabre\\Xml\\Element\\KeyValue' => $vendorDir . '/sabre/xml/lib/Element/KeyValue.php',
-    'Sabre\\Xml\\Element\\Uri' => $vendorDir . '/sabre/xml/lib/Element/Uri.php',
-    'Sabre\\Xml\\Element\\XmlFragment' => $vendorDir . '/sabre/xml/lib/Element/XmlFragment.php',
-    'Sabre\\Xml\\LibXMLException' => $vendorDir . '/sabre/xml/lib/LibXMLException.php',
-    'Sabre\\Xml\\ParseException' => $vendorDir . '/sabre/xml/lib/ParseException.php',
-    'Sabre\\Xml\\Reader' => $vendorDir . '/sabre/xml/lib/Reader.php',
-    'Sabre\\Xml\\Service' => $vendorDir . '/sabre/xml/lib/Service.php',
-    'Sabre\\Xml\\Version' => $vendorDir . '/sabre/xml/lib/Version.php',
-    'Sabre\\Xml\\Writer' => $vendorDir . '/sabre/xml/lib/Writer.php',
-    'Sabre\\Xml\\XmlDeserializable' => $vendorDir . '/sabre/xml/lib/XmlDeserializable.php',
-    'Sabre\\Xml\\XmlSerializable' => $vendorDir . '/sabre/xml/lib/XmlSerializable.php',
-    'Zotlabs\\Access\\AccessList' => $baseDir . '/Zotlabs/Access/AccessList.php',
-    'Zotlabs\\Access\\PermissionLimits' => $baseDir . '/Zotlabs/Access/PermissionLimits.php',
-    'Zotlabs\\Access\\PermissionRoles' => $baseDir . '/Zotlabs/Access/PermissionRoles.php',
-    'Zotlabs\\Access\\Permissions' => $baseDir . '/Zotlabs/Access/Permissions.php',
-    'Zotlabs\\Daemon\\Addon' => $baseDir . '/Zotlabs/Daemon/Addon.php',
-    'Zotlabs\\Daemon\\Checksites' => $baseDir . '/Zotlabs/Daemon/Checksites.php',
-    'Zotlabs\\Daemon\\Cli_suggest' => $baseDir . '/Zotlabs/Daemon/Cli_suggest.php',
-    'Zotlabs\\Daemon\\Cron' => $baseDir . '/Zotlabs/Daemon/Cron.php',
-    'Zotlabs\\Daemon\\Cron_daily' => $baseDir . '/Zotlabs/Daemon/Cron_daily.php',
-    'Zotlabs\\Daemon\\Cron_weekly' => $baseDir . '/Zotlabs/Daemon/Cron_weekly.php',
-    'Zotlabs\\Daemon\\Cronhooks' => $baseDir . '/Zotlabs/Daemon/Cronhooks.php',
-    'Zotlabs\\Daemon\\CurlAuth' => $baseDir . '/Zotlabs/Daemon/CurlAuth.php',
-    'Zotlabs\\Daemon\\Deliver' => $baseDir . '/Zotlabs/Daemon/Deliver.php',
-    'Zotlabs\\Daemon\\Deliver_hooks' => $baseDir . '/Zotlabs/Daemon/Deliver_hooks.php',
-    'Zotlabs\\Daemon\\Directory' => $baseDir . '/Zotlabs/Daemon/Directory.php',
-    'Zotlabs\\Daemon\\Expire' => $baseDir . '/Zotlabs/Daemon/Expire.php',
-    'Zotlabs\\Daemon\\Externals' => $baseDir . '/Zotlabs/Daemon/Externals.php',
-    'Zotlabs\\Daemon\\Gprobe' => $baseDir . '/Zotlabs/Daemon/Gprobe.php',
-    'Zotlabs\\Daemon\\Importdoc' => $baseDir . '/Zotlabs/Daemon/Importdoc.php',
-    'Zotlabs\\Daemon\\Master' => $baseDir . '/Zotlabs/Daemon/Master.php',
-    'Zotlabs\\Daemon\\Notifier' => $baseDir . '/Zotlabs/Daemon/Notifier.php',
-    'Zotlabs\\Daemon\\Onedirsync' => $baseDir . '/Zotlabs/Daemon/Onedirsync.php',
-    'Zotlabs\\Daemon\\Onepoll' => $baseDir . '/Zotlabs/Daemon/Onepoll.php',
-    'Zotlabs\\Daemon\\Poller' => $baseDir . '/Zotlabs/Daemon/Poller.php',
-    'Zotlabs\\Daemon\\Queue' => $baseDir . '/Zotlabs/Daemon/Queue.php',
-    'Zotlabs\\Daemon\\Ratenotif' => $baseDir . '/Zotlabs/Daemon/Ratenotif.php',
-    'Zotlabs\\Extend\\Hook' => $baseDir . '/Zotlabs/Extend/Hook.php',
-    'Zotlabs\\Identity\\BasicId\\BasicId' => $baseDir . '/Zotlabs/Identity/BasicId.php',
-    'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => $baseDir . '/Zotlabs/Identity/ProfilePhoto.php',
-    'Zotlabs\\Lib\\AConfig' => $baseDir . '/Zotlabs/Lib/AConfig.php',
-    'Zotlabs\\Lib\\AbConfig' => $baseDir . '/Zotlabs/Lib/AbConfig.php',
-    'Zotlabs\\Lib\\Api_router' => $baseDir . '/Zotlabs/Lib/Api_router.php',
-    'Zotlabs\\Lib\\Apps' => $baseDir . '/Zotlabs/Lib/Apps.php',
-    'Zotlabs\\Lib\\Cache' => $baseDir . '/Zotlabs/Lib/Cache.php',
-    'Zotlabs\\Lib\\Chatroom' => $baseDir . '/Zotlabs/Lib/Chatroom.php',
-    'Zotlabs\\Lib\\Config' => $baseDir . '/Zotlabs/Lib/Config.php',
-    'Zotlabs\\Lib\\Enotify' => $baseDir . '/Zotlabs/Lib/Enotify.php',
-    'Zotlabs\\Lib\\ExtendedZip' => $baseDir . '/Zotlabs/Lib/ExtendedZip.php',
-    'Zotlabs\\Lib\\IConfig' => $baseDir . '/Zotlabs/Lib/IConfig.php',
-    'Zotlabs\\Lib\\NativeWiki' => $baseDir . '/Zotlabs/Lib/NativeWiki.php',
-    'Zotlabs\\Lib\\NativeWikiPage' => $baseDir . '/Zotlabs/Lib/NativeWikiPage.php',
-    'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php',
-    'Zotlabs\\Lib\\Permcat' => $baseDir . '/Zotlabs/Lib/Permcat.php',
-    'Zotlabs\\Lib\\PermissionDescription' => $baseDir . '/Zotlabs/Lib/PermissionDescription.php',
-    'Zotlabs\\Lib\\ProtoDriver' => $baseDir . '/Zotlabs/Lib/ProtoDriver.php',
-    'Zotlabs\\Lib\\SuperCurl' => $baseDir . '/Zotlabs/Lib/SuperCurl.php',
-    'Zotlabs\\Lib\\System' => $baseDir . '/Zotlabs/Lib/System.php',
-    'Zotlabs\\Lib\\Techlevels' => $baseDir . '/Zotlabs/Lib/Techlevels.php',
-    'Zotlabs\\Lib\\ThreadItem' => $baseDir . '/Zotlabs/Lib/ThreadItem.php',
-    'Zotlabs\\Lib\\ThreadStream' => $baseDir . '/Zotlabs/Lib/ThreadStream.php',
-    'Zotlabs\\Lib\\XConfig' => $baseDir . '/Zotlabs/Lib/XConfig.php',
-    'Zotlabs\\Lib\\ZotDriver' => $baseDir . '/Zotlabs/Lib/ZotDriver.php',
-    'Zotlabs\\Module\\Achievements' => $baseDir . '/Zotlabs/Module/Achievements.php',
-    'Zotlabs\\Module\\Acl' => $baseDir . '/Zotlabs/Module/Acl.php',
-    'Zotlabs\\Module\\Admin' => $baseDir . '/Zotlabs/Module/Admin.php',
-    'Zotlabs\\Module\\Admin\\Account_edit' => $baseDir . '/Zotlabs/Module/Admin/Account_edit.php',
-    'Zotlabs\\Module\\Admin\\Accounts' => $baseDir . '/Zotlabs/Module/Admin/Accounts.php',
-    'Zotlabs\\Module\\Admin\\Channels' => $baseDir . '/Zotlabs/Module/Admin/Channels.php',
-    'Zotlabs\\Module\\Admin\\Dbsync' => $baseDir . '/Zotlabs/Module/Admin/Dbsync.php',
-    'Zotlabs\\Module\\Admin\\Features' => $baseDir . '/Zotlabs/Module/Admin/Features.php',
-    'Zotlabs\\Module\\Admin\\Logs' => $baseDir . '/Zotlabs/Module/Admin/Logs.php',
-    'Zotlabs\\Module\\Admin\\Plugins' => $baseDir . '/Zotlabs/Module/Admin/Plugins.php',
-    'Zotlabs\\Module\\Admin\\Profs' => $baseDir . '/Zotlabs/Module/Admin/Profs.php',
-    'Zotlabs\\Module\\Admin\\Queue' => $baseDir . '/Zotlabs/Module/Admin/Queue.php',
-    'Zotlabs\\Module\\Admin\\Security' => $baseDir . '/Zotlabs/Module/Admin/Security.php',
-    'Zotlabs\\Module\\Admin\\Site' => $baseDir . '/Zotlabs/Module/Admin/Site.php',
-    'Zotlabs\\Module\\Admin\\Themes' => $baseDir . '/Zotlabs/Module/Admin/Themes.php',
-    'Zotlabs\\Module\\Api' => $baseDir . '/Zotlabs/Module/Api.php',
-    'Zotlabs\\Module\\Appman' => $baseDir . '/Zotlabs/Module/Appman.php',
-    'Zotlabs\\Module\\Apps' => $baseDir . '/Zotlabs/Module/Apps.php',
-    'Zotlabs\\Module\\Attach' => $baseDir . '/Zotlabs/Module/Attach.php',
-    'Zotlabs\\Module\\Authtest' => $baseDir . '/Zotlabs/Module/Authtest.php',
-    'Zotlabs\\Module\\Block' => $baseDir . '/Zotlabs/Module/Block.php',
-    'Zotlabs\\Module\\Blocks' => $baseDir . '/Zotlabs/Module/Blocks.php',
-    'Zotlabs\\Module\\Bookmarks' => $baseDir . '/Zotlabs/Module/Bookmarks.php',
-    'Zotlabs\\Module\\Branchtopic' => $baseDir . '/Zotlabs/Module/Branchtopic.php',
-    'Zotlabs\\Module\\Cal' => $baseDir . '/Zotlabs/Module/Cal.php',
-    'Zotlabs\\Module\\Channel' => $baseDir . '/Zotlabs/Module/Channel.php',
-    'Zotlabs\\Module\\Chanview' => $baseDir . '/Zotlabs/Module/Chanview.php',
-    'Zotlabs\\Module\\Chat' => $baseDir . '/Zotlabs/Module/Chat.php',
-    'Zotlabs\\Module\\Chatsvc' => $baseDir . '/Zotlabs/Module/Chatsvc.php',
-    'Zotlabs\\Module\\Cloud' => $baseDir . '/Zotlabs/Module/Cloud.php',
-    'Zotlabs\\Module\\Common' => $baseDir . '/Zotlabs/Module/Common.php',
-    'Zotlabs\\Module\\Connect' => $baseDir . '/Zotlabs/Module/Connect.php',
-    'Zotlabs\\Module\\Connections' => $baseDir . '/Zotlabs/Module/Connections.php',
-    'Zotlabs\\Module\\Connedit' => $baseDir . '/Zotlabs/Module/Connedit.php',
-    'Zotlabs\\Module\\Contactgroup' => $baseDir . '/Zotlabs/Module/Contactgroup.php',
-    'Zotlabs\\Module\\Cover_photo' => $baseDir . '/Zotlabs/Module/Cover_photo.php',
-    'Zotlabs\\Module\\Dav' => $baseDir . '/Zotlabs/Module/Dav.php',
-    'Zotlabs\\Module\\Directory' => $baseDir . '/Zotlabs/Module/Directory.php',
-    'Zotlabs\\Module\\Dirsearch' => $baseDir . '/Zotlabs/Module/Dirsearch.php',
-    'Zotlabs\\Module\\Display' => $baseDir . '/Zotlabs/Module/Display.php',
-    'Zotlabs\\Module\\Dreport' => $baseDir . '/Zotlabs/Module/Dreport.php',
-    'Zotlabs\\Module\\Editblock' => $baseDir . '/Zotlabs/Module/Editblock.php',
-    'Zotlabs\\Module\\Editlayout' => $baseDir . '/Zotlabs/Module/Editlayout.php',
-    'Zotlabs\\Module\\Editpost' => $baseDir . '/Zotlabs/Module/Editpost.php',
-    'Zotlabs\\Module\\Editwebpage' => $baseDir . '/Zotlabs/Module/Editwebpage.php',
-    'Zotlabs\\Module\\Embedphotos' => $baseDir . '/Zotlabs/Module/Embedphotos.php',
-    'Zotlabs\\Module\\Events' => $baseDir . '/Zotlabs/Module/Events.php',
-    'Zotlabs\\Module\\Fbrowser' => $baseDir . '/Zotlabs/Module/Fbrowser.php',
-    'Zotlabs\\Module\\Feed' => $baseDir . '/Zotlabs/Module/Feed.php',
-    'Zotlabs\\Module\\Fhublocs' => $baseDir . '/Zotlabs/Module/Fhublocs.php',
-    'Zotlabs\\Module\\File_upload' => $baseDir . '/Zotlabs/Module/File_upload.php',
-    'Zotlabs\\Module\\Filer' => $baseDir . '/Zotlabs/Module/Filer.php',
-    'Zotlabs\\Module\\Filerm' => $baseDir . '/Zotlabs/Module/Filerm.php',
-    'Zotlabs\\Module\\Filestorage' => $baseDir . '/Zotlabs/Module/Filestorage.php',
-    'Zotlabs\\Module\\Follow' => $baseDir . '/Zotlabs/Module/Follow.php',
-    'Zotlabs\\Module\\Getfile' => $baseDir . '/Zotlabs/Module/Getfile.php',
-    'Zotlabs\\Module\\Group' => $baseDir . '/Zotlabs/Module/Group.php',
-    'Zotlabs\\Module\\Hcard' => $baseDir . '/Zotlabs/Module/Hcard.php',
-    'Zotlabs\\Module\\Help' => $baseDir . '/Zotlabs/Module/Help.php',
-    'Zotlabs\\Module\\Home' => $baseDir . '/Zotlabs/Module/Home.php',
-    'Zotlabs\\Module\\Hostxrd' => $baseDir . '/Zotlabs/Module/Hostxrd.php',
-    'Zotlabs\\Module\\Impel' => $baseDir . '/Zotlabs/Module/Impel.php',
-    'Zotlabs\\Module\\Import' => $baseDir . '/Zotlabs/Module/Import.php',
-    'Zotlabs\\Module\\Import_items' => $baseDir . '/Zotlabs/Module/Import_items.php',
-    'Zotlabs\\Module\\Invite' => $baseDir . '/Zotlabs/Module/Invite.php',
-    'Zotlabs\\Module\\Item' => $baseDir . '/Zotlabs/Module/Item.php',
-    'Zotlabs\\Module\\Lang' => $baseDir . '/Zotlabs/Module/Lang.php',
-    'Zotlabs\\Module\\Layouts' => $baseDir . '/Zotlabs/Module/Layouts.php',
-    'Zotlabs\\Module\\Like' => $baseDir . '/Zotlabs/Module/Like.php',
-    'Zotlabs\\Module\\Linkinfo' => $baseDir . '/Zotlabs/Module/Linkinfo.php',
-    'Zotlabs\\Module\\Lockview' => $baseDir . '/Zotlabs/Module/Lockview.php',
-    'Zotlabs\\Module\\Locs' => $baseDir . '/Zotlabs/Module/Locs.php',
-    'Zotlabs\\Module\\Login' => $baseDir . '/Zotlabs/Module/Login.php',
-    'Zotlabs\\Module\\Lostpass' => $baseDir . '/Zotlabs/Module/Lostpass.php',
-    'Zotlabs\\Module\\Magic' => $baseDir . '/Zotlabs/Module/Magic.php',
-    'Zotlabs\\Module\\Mail' => $baseDir . '/Zotlabs/Module/Mail.php',
-    'Zotlabs\\Module\\Manage' => $baseDir . '/Zotlabs/Module/Manage.php',
-    'Zotlabs\\Module\\Menu' => $baseDir . '/Zotlabs/Module/Menu.php',
-    'Zotlabs\\Module\\Message' => $baseDir . '/Zotlabs/Module/Message.php',
-    'Zotlabs\\Module\\Mitem' => $baseDir . '/Zotlabs/Module/Mitem.php',
-    'Zotlabs\\Module\\Mood' => $baseDir . '/Zotlabs/Module/Mood.php',
-    'Zotlabs\\Module\\Network' => $baseDir . '/Zotlabs/Module/Network.php',
-    'Zotlabs\\Module\\New_channel' => $baseDir . '/Zotlabs/Module/New_channel.php',
-    'Zotlabs\\Module\\Nojs' => $baseDir . '/Zotlabs/Module/Nojs.php',
-    'Zotlabs\\Module\\Notes' => $baseDir . '/Zotlabs/Module/Notes.php',
-    'Zotlabs\\Module\\Notifications' => $baseDir . '/Zotlabs/Module/Notifications.php',
-    'Zotlabs\\Module\\Notify' => $baseDir . '/Zotlabs/Module/Notify.php',
-    'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php',
-    'Zotlabs\\Module\\Oep' => $baseDir . '/Zotlabs/Module/Oep.php',
-    'Zotlabs\\Module\\Oexchange' => $baseDir . '/Zotlabs/Module/Oexchange.php',
-    'Zotlabs\\Module\\Online' => $baseDir . '/Zotlabs/Module/Online.php',
-    'Zotlabs\\Module\\Page' => $baseDir . '/Zotlabs/Module/Page.php',
-    'Zotlabs\\Module\\Pconfig' => $baseDir . '/Zotlabs/Module/Pconfig.php',
-    'Zotlabs\\Module\\Pdledit' => $baseDir . '/Zotlabs/Module/Pdledit.php',
-    'Zotlabs\\Module\\Permcat' => $baseDir . '/Zotlabs/Module/Permcat.php',
-    'Zotlabs\\Module\\Photo' => $baseDir . '/Zotlabs/Module/Photo.php',
-    'Zotlabs\\Module\\Photos' => $baseDir . '/Zotlabs/Module/Photos.php',
-    'Zotlabs\\Module\\Ping' => $baseDir . '/Zotlabs/Module/Ping.php',
-    'Zotlabs\\Module\\Poco' => $baseDir . '/Zotlabs/Module/Poco.php',
-    'Zotlabs\\Module\\Poke' => $baseDir . '/Zotlabs/Module/Poke.php',
-    'Zotlabs\\Module\\Post' => $baseDir . '/Zotlabs/Module/Post.php',
-    'Zotlabs\\Module\\Prate' => $baseDir . '/Zotlabs/Module/Prate.php',
-    'Zotlabs\\Module\\Pretheme' => $baseDir . '/Zotlabs/Module/Pretheme.php',
-    'Zotlabs\\Module\\Probe' => $baseDir . '/Zotlabs/Module/Probe.php',
-    'Zotlabs\\Module\\Profile' => $baseDir . '/Zotlabs/Module/Profile.php',
-    'Zotlabs\\Module\\Profile_photo' => $baseDir . '/Zotlabs/Module/Profile_photo.php',
-    'Zotlabs\\Module\\Profiles' => $baseDir . '/Zotlabs/Module/Profiles.php',
-    'Zotlabs\\Module\\Profperm' => $baseDir . '/Zotlabs/Module/Profperm.php',
-    'Zotlabs\\Module\\Pubsites' => $baseDir . '/Zotlabs/Module/Pubsites.php',
-    'Zotlabs\\Module\\Pubstream' => $baseDir . '/Zotlabs/Module/Pubstream.php',
-    'Zotlabs\\Module\\Randprof' => $baseDir . '/Zotlabs/Module/Randprof.php',
-    'Zotlabs\\Module\\Rate' => $baseDir . '/Zotlabs/Module/Rate.php',
-    'Zotlabs\\Module\\Ratings' => $baseDir . '/Zotlabs/Module/Ratings.php',
-    'Zotlabs\\Module\\Ratingsearch' => $baseDir . '/Zotlabs/Module/Ratingsearch.php',
-    'Zotlabs\\Module\\Rbmark' => $baseDir . '/Zotlabs/Module/Rbmark.php',
-    'Zotlabs\\Module\\React' => $baseDir . '/Zotlabs/Module/React.php',
-    'Zotlabs\\Module\\Regdir' => $baseDir . '/Zotlabs/Module/Regdir.php',
-    'Zotlabs\\Module\\Register' => $baseDir . '/Zotlabs/Module/Register.php',
-    'Zotlabs\\Module\\Regmod' => $baseDir . '/Zotlabs/Module/Regmod.php',
-    'Zotlabs\\Module\\Regver' => $baseDir . '/Zotlabs/Module/Regver.php',
-    'Zotlabs\\Module\\Removeaccount' => $baseDir . '/Zotlabs/Module/Removeaccount.php',
-    'Zotlabs\\Module\\Removeme' => $baseDir . '/Zotlabs/Module/Removeme.php',
-    'Zotlabs\\Module\\Rmagic' => $baseDir . '/Zotlabs/Module/Rmagic.php',
-    'Zotlabs\\Module\\Rpost' => $baseDir . '/Zotlabs/Module/Rpost.php',
-    'Zotlabs\\Module\\Search' => $baseDir . '/Zotlabs/Module/Search.php',
-    'Zotlabs\\Module\\Search_ac' => $baseDir . '/Zotlabs/Module/Search_ac.php',
-    'Zotlabs\\Module\\Service_limits' => $baseDir . '/Zotlabs/Module/Service_limits.php',
-    'Zotlabs\\Module\\Settings' => $baseDir . '/Zotlabs/Module/Settings.php',
-    'Zotlabs\\Module\\Settings\\Account' => $baseDir . '/Zotlabs/Module/Settings/Account.php',
-    'Zotlabs\\Module\\Settings\\Channel' => $baseDir . '/Zotlabs/Module/Settings/Channel.php',
-    'Zotlabs\\Module\\Settings\\Display' => $baseDir . '/Zotlabs/Module/Settings/Display.php',
-    'Zotlabs\\Module\\Settings\\Featured' => $baseDir . '/Zotlabs/Module/Settings/Featured.php',
-    'Zotlabs\\Module\\Settings\\Features' => $baseDir . '/Zotlabs/Module/Settings/Features.php',
-    'Zotlabs\\Module\\Settings\\Oauth' => $baseDir . '/Zotlabs/Module/Settings/Oauth.php',
-    'Zotlabs\\Module\\Settings\\Permcats' => $baseDir . '/Zotlabs/Module/Settings/Permcats.php',
-    'Zotlabs\\Module\\Settings\\Tokens' => $baseDir . '/Zotlabs/Module/Settings/Tokens.php',
-    'Zotlabs\\Module\\Setup' => $baseDir . '/Zotlabs/Module/Setup.php',
-    'Zotlabs\\Module\\Share' => $baseDir . '/Zotlabs/Module/Share.php',
-    'Zotlabs\\Module\\Sharedwithme' => $baseDir . '/Zotlabs/Module/Sharedwithme.php',
-    'Zotlabs\\Module\\Siteinfo' => $baseDir . '/Zotlabs/Module/Siteinfo.php',
-    'Zotlabs\\Module\\Siteinfo_json' => $baseDir . '/Zotlabs/Module/Siteinfo_json.php',
-    'Zotlabs\\Module\\Sitelist' => $baseDir . '/Zotlabs/Module/Sitelist.php',
-    'Zotlabs\\Module\\Smilies' => $baseDir . '/Zotlabs/Module/Smilies.php',
-    'Zotlabs\\Module\\Snap' => $baseDir . '/Zotlabs/Module/Snap.php',
-    'Zotlabs\\Module\\Sources' => $baseDir . '/Zotlabs/Module/Sources.php',
-    'Zotlabs\\Module\\Sslify' => $baseDir . '/Zotlabs/Module/Sslify.php',
-    'Zotlabs\\Module\\Starred' => $baseDir . '/Zotlabs/Module/Starred.php',
-    'Zotlabs\\Module\\Subthread' => $baseDir . '/Zotlabs/Module/Subthread.php',
-    'Zotlabs\\Module\\Suggest' => $baseDir . '/Zotlabs/Module/Suggest.php',
-    'Zotlabs\\Module\\Tagger' => $baseDir . '/Zotlabs/Module/Tagger.php',
-    'Zotlabs\\Module\\Tagrm' => $baseDir . '/Zotlabs/Module/Tagrm.php',
-    'Zotlabs\\Module\\Tasks' => $baseDir . '/Zotlabs/Module/Tasks.php',
-    'Zotlabs\\Module\\Theme_info' => $baseDir . '/Zotlabs/Module/Theme_info.php',
-    'Zotlabs\\Module\\Thing' => $baseDir . '/Zotlabs/Module/Thing.php',
-    'Zotlabs\\Module\\Toggle_mobile' => $baseDir . '/Zotlabs/Module/Toggle_mobile.php',
-    'Zotlabs\\Module\\Toggle_safesearch' => $baseDir . '/Zotlabs/Module/Toggle_safesearch.php',
-    'Zotlabs\\Module\\Uexport' => $baseDir . '/Zotlabs/Module/Uexport.php',
-    'Zotlabs\\Module\\Update_channel' => $baseDir . '/Zotlabs/Module/Update_channel.php',
-    'Zotlabs\\Module\\Update_display' => $baseDir . '/Zotlabs/Module/Update_display.php',
-    'Zotlabs\\Module\\Update_home' => $baseDir . '/Zotlabs/Module/Update_home.php',
-    'Zotlabs\\Module\\Update_network' => $baseDir . '/Zotlabs/Module/Update_network.php',
-    'Zotlabs\\Module\\Update_pubstream' => $baseDir . '/Zotlabs/Module/Update_pubstream.php',
-    'Zotlabs\\Module\\Update_search' => $baseDir . '/Zotlabs/Module/Update_search.php',
-    'Zotlabs\\Module\\View' => $baseDir . '/Zotlabs/Module/View.php',
-    'Zotlabs\\Module\\Viewconnections' => $baseDir . '/Zotlabs/Module/Viewconnections.php',
-    'Zotlabs\\Module\\Viewsrc' => $baseDir . '/Zotlabs/Module/Viewsrc.php',
-    'Zotlabs\\Module\\Wall_attach' => $baseDir . '/Zotlabs/Module/Wall_attach.php',
-    'Zotlabs\\Module\\Wall_upload' => $baseDir . '/Zotlabs/Module/Wall_upload.php',
-    'Zotlabs\\Module\\Webfinger' => $baseDir . '/Zotlabs/Module/Webfinger.php',
-    'Zotlabs\\Module\\Webpages' => $baseDir . '/Zotlabs/Module/Webpages.php',
-    'Zotlabs\\Module\\Well_known' => $baseDir . '/Zotlabs/Module/Well_known.php',
-    'Zotlabs\\Module\\Wfinger' => $baseDir . '/Zotlabs/Module/Wfinger.php',
-    'Zotlabs\\Module\\Wiki' => $baseDir . '/Zotlabs/Module/Wiki.php',
-    'Zotlabs\\Module\\Xchan' => $baseDir . '/Zotlabs/Module/Xchan.php',
-    'Zotlabs\\Module\\Xpoco' => $baseDir . '/Zotlabs/Module/Xpoco.php',
-    'Zotlabs\\Module\\Xrd' => $baseDir . '/Zotlabs/Module/Xrd.php',
-    'Zotlabs\\Module\\Xref' => $baseDir . '/Zotlabs/Module/Xref.php',
-    'Zotlabs\\Module\\Zfinger' => $baseDir . '/Zotlabs/Module/Zfinger.php',
-    'Zotlabs\\Module\\Zotfeed' => $baseDir . '/Zotlabs/Module/Zotfeed.php',
-    'Zotlabs\\Module\\Zping' => $baseDir . '/Zotlabs/Module/Zping.php',
-    'Zotlabs\\Render\\Comanche' => $baseDir . '/Zotlabs/Render/Comanche.php',
-    'Zotlabs\\Render\\SimpleTemplate' => $baseDir . '/Zotlabs/Render/SimpleTemplate.php',
-    'Zotlabs\\Render\\SmartyInterface' => $baseDir . '/Zotlabs/Render/SmartyInterface.php',
-    'Zotlabs\\Render\\SmartyTemplate' => $baseDir . '/Zotlabs/Render/SmartyTemplate.php',
-    'Zotlabs\\Render\\TemplateEngine' => $baseDir . '/Zotlabs/Render/TemplateEngine.php',
-    'Zotlabs\\Render\\Theme' => $baseDir . '/Zotlabs/Render/Theme.php',
-    'Zotlabs\\Storage\\BasicAuth' => $baseDir . '/Zotlabs/Storage/BasicAuth.php',
-    'Zotlabs\\Storage\\Browser' => $baseDir . '/Zotlabs/Storage/Browser.php',
-    'Zotlabs\\Storage\\CalDAVClient' => $baseDir . '/Zotlabs/Storage/CalDAVClient.php',
-    'Zotlabs\\Storage\\Directory' => $baseDir . '/Zotlabs/Storage/Directory.php',
-    'Zotlabs\\Storage\\File' => $baseDir . '/Zotlabs/Storage/File.php',
-    'Zotlabs\\Storage\\GitRepo' => $baseDir . '/Zotlabs/Storage/GitRepo.php',
-    'Zotlabs\\Text\\Tagadelic' => $baseDir . '/Zotlabs/Text/Tagadelic.php',
-    'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php',
-    'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php',
-    'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php',
-    'Zotlabs\\Web\\HttpMeta' => $baseDir . '/Zotlabs/Web/HttpMeta.php',
-    'Zotlabs\\Web\\Router' => $baseDir . '/Zotlabs/Web/Router.php',
-    'Zotlabs\\Web\\Session' => $baseDir . '/Zotlabs/Web/Session.php',
-    'Zotlabs\\Web\\SessionHandler' => $baseDir . '/Zotlabs/Web/SessionHandler.php',
-    'Zotlabs\\Web\\SubModule' => $baseDir . '/Zotlabs/Web/SubModule.php',
-    'Zotlabs\\Web\\WebServer' => $baseDir . '/Zotlabs/Web/WebServer.php',
-    'Zotlabs\\Zot\\Auth' => $baseDir . '/Zotlabs/Zot/Auth.php',
-    'Zotlabs\\Zot\\DReport' => $baseDir . '/Zotlabs/Zot/DReport.php',
-    'Zotlabs\\Zot\\Finger' => $baseDir . '/Zotlabs/Zot/Finger.php',
-    'Zotlabs\\Zot\\IHandler' => $baseDir . '/Zotlabs/Zot/IHandler.php',
-    'Zotlabs\\Zot\\Receiver' => $baseDir . '/Zotlabs/Zot/Receiver.php',
-    'Zotlabs\\Zot\\Verify' => $baseDir . '/Zotlabs/Zot/Verify.php',
-    'Zotlabs\\Zot\\ZotHandler' => $baseDir . '/Zotlabs/Zot/ZotHandler.php',
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index a03d306b4..1a0de2cb8 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,156 +1,4 @@
 [
-    {
-        "name": "sabre/uri",
-        "version": "1.1.0",
-        "version_normalized": "1.1.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fruux/sabre-uri.git",
-            "reference": "9012116434d84ef6e5e37a89dfdbfbe2204a8704"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-uri/zipball/9012116434d84ef6e5e37a89dfdbfbe2204a8704",
-            "reference": "9012116434d84ef6e5e37a89dfdbfbe2204a8704",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.7"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "*",
-            "sabre/cs": "~0.0.1"
-        },
-        "time": "2016-03-08 02:29:27",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "lib/functions.php"
-            ],
-            "psr-4": {
-                "Sabre\\Uri\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ],
-        "description": "Functions for making sense out of URIs.",
-        "homepage": "http://sabre.io/uri/",
-        "keywords": [
-            "rfc3986",
-            "uri",
-            "url"
-        ]
-    },
-    {
-        "name": "sabre/vobject",
-        "version": "4.1.1",
-        "version_normalized": "4.1.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fruux/sabre-vobject.git",
-            "reference": "a3a59b06947f122af2d45d52b72172cdc1efd68f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/a3a59b06947f122af2d45d52b72172cdc1efd68f",
-            "reference": "a3a59b06947f122af2d45d52b72172cdc1efd68f",
-            "shasum": ""
-        },
-        "require": {
-            "ext-mbstring": "*",
-            "php": ">=5.5",
-            "sabre/xml": "~1.1"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "*",
-            "sabre/cs": "~0.0.3"
-        },
-        "suggest": {
-            "hoa/bench": "If you would like to run the benchmark scripts"
-        },
-        "time": "2016-07-15 19:52:17",
-        "bin": [
-            "bin/vobject",
-            "bin/generate_vcards"
-        ],
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "4.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Sabre\\VObject\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            },
-            {
-                "name": "Dominik Tobschall",
-                "email": "dominik@fruux.com",
-                "homepage": "http://tobschall.de/",
-                "role": "Developer"
-            },
-            {
-                "name": "Ivan Enderlin",
-                "email": "ivan.enderlin@hoa-project.net",
-                "homepage": "http://mnt.io/",
-                "role": "Developer"
-            }
-        ],
-        "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
-        "homepage": "http://sabre.io/vobject/",
-        "keywords": [
-            "availability",
-            "freebusy",
-            "iCalendar",
-            "ical",
-            "ics",
-            "jCal",
-            "jCard",
-            "recurrence",
-            "rfc2425",
-            "rfc2426",
-            "rfc2739",
-            "rfc4770",
-            "rfc5545",
-            "rfc5546",
-            "rfc6321",
-            "rfc6350",
-            "rfc6351",
-            "rfc6474",
-            "rfc6638",
-            "rfc6715",
-            "rfc6868",
-            "vCalendar",
-            "vCard",
-            "vcf",
-            "xCal",
-            "xCard"
-        ]
-    },
     {
         "name": "sabre/event",
         "version": "3.0.0",
@@ -210,148 +58,6 @@
             "signal"
         ]
     },
-    {
-        "name": "sabre/http",
-        "version": "4.2.1",
-        "version_normalized": "4.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fruux/sabre-http.git",
-            "reference": "2e93bc8321524c67be4ca5b8415daebd4c8bf85e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-http/zipball/2e93bc8321524c67be4ca5b8415daebd4c8bf85e",
-            "reference": "2e93bc8321524c67be4ca5b8415daebd4c8bf85e",
-            "shasum": ""
-        },
-        "require": {
-            "ext-mbstring": "*",
-            "php": ">=5.4",
-            "sabre/event": ">=1.0.0,<4.0.0",
-            "sabre/uri": "~1.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.3",
-            "sabre/cs": "~0.0.1"
-        },
-        "suggest": {
-            "ext-curl": " to make http requests with the Client class"
-        },
-        "time": "2016-01-06 23:00:08",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "lib/functions.php"
-            ],
-            "psr-4": {
-                "Sabre\\HTTP\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ],
-        "description": "The sabre/http library provides utilities for dealing with http requests and responses. ",
-        "homepage": "https://github.com/fruux/sabre-http",
-        "keywords": [
-            "http"
-        ]
-    },
-    {
-        "name": "sabre/dav",
-        "version": "3.2.0",
-        "version_normalized": "3.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fruux/sabre-dav.git",
-            "reference": "5b9737cc2f0182e368d14c80df7f6b2d77dc1457"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/5b9737cc2f0182e368d14c80df7f6b2d77dc1457",
-            "reference": "5b9737cc2f0182e368d14c80df7f6b2d77dc1457",
-            "shasum": ""
-        },
-        "require": {
-            "ext-ctype": "*",
-            "ext-date": "*",
-            "ext-dom": "*",
-            "ext-iconv": "*",
-            "ext-mbstring": "*",
-            "ext-pcre": "*",
-            "ext-simplexml": "*",
-            "ext-spl": "*",
-            "lib-libxml": ">=2.7.0",
-            "php": ">=5.5.0",
-            "psr/log": "^1.0",
-            "sabre/event": ">=2.0.0, <4.0.0",
-            "sabre/http": "^4.2.1",
-            "sabre/uri": "^1.0.1",
-            "sabre/vobject": "^4.1.0",
-            "sabre/xml": "^1.4.0"
-        },
-        "require-dev": {
-            "evert/phpdoc-md": "~0.1.0",
-            "monolog/monolog": "^1.18",
-            "phpunit/phpunit": "> 4.8, <=6.0.0",
-            "sabre/cs": "~0.0.5"
-        },
-        "suggest": {
-            "ext-curl": "*",
-            "ext-pdo": "*"
-        },
-        "time": "2016-06-28 02:44:05",
-        "bin": [
-            "bin/sabredav",
-            "bin/naturalselection"
-        ],
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.1.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Sabre\\DAV\\": "lib/DAV/",
-                "Sabre\\DAVACL\\": "lib/DAVACL/",
-                "Sabre\\CalDAV\\": "lib/CalDAV/",
-                "Sabre\\CardDAV\\": "lib/CardDAV/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ],
-        "description": "WebDAV Framework for PHP",
-        "homepage": "http://sabre.io/",
-        "keywords": [
-            "CalDAV",
-            "CardDAV",
-            "WebDAV",
-            "framework",
-            "iCalendar"
-        ]
-    },
     {
         "name": "sabre/xml",
         "version": "1.5.0",
@@ -634,5 +340,300 @@
             "oauth",
             "oauth2"
         ]
+    },
+    {
+        "name": "sabre/uri",
+        "version": "1.2.1",
+        "version_normalized": "1.2.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fruux/sabre-uri.git",
+            "reference": "ada354d83579565949d80b2e15593c2371225e61"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fruux/sabre-uri/zipball/ada354d83579565949d80b2e15593c2371225e61",
+            "reference": "ada354d83579565949d80b2e15593c2371225e61",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.4.7"
+        },
+        "require-dev": {
+            "phpunit/phpunit": ">=4.0,<6.0",
+            "sabre/cs": "~1.0.0"
+        },
+        "time": "2017-02-20 19:59:28",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "lib/functions.php"
+            ],
+            "psr-4": {
+                "Sabre\\Uri\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Evert Pot",
+                "email": "me@evertpot.com",
+                "homepage": "http://evertpot.com/",
+                "role": "Developer"
+            }
+        ],
+        "description": "Functions for making sense out of URIs.",
+        "homepage": "http://sabre.io/uri/",
+        "keywords": [
+            "rfc3986",
+            "uri",
+            "url"
+        ]
+    },
+    {
+        "name": "sabre/vobject",
+        "version": "4.1.2",
+        "version_normalized": "4.1.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fruux/sabre-vobject.git",
+            "reference": "d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c",
+            "reference": "d0fde2fafa2a3dad1f559c2d1c2591d4fd75ae3c",
+            "shasum": ""
+        },
+        "require": {
+            "ext-mbstring": "*",
+            "php": ">=5.5",
+            "sabre/xml": ">=1.5 <3.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "*",
+            "sabre/cs": "^1.0.0"
+        },
+        "suggest": {
+            "hoa/bench": "If you would like to run the benchmark scripts"
+        },
+        "time": "2016-12-06 04:14:09",
+        "bin": [
+            "bin/vobject",
+            "bin/generate_vcards"
+        ],
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "4.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Sabre\\VObject\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Evert Pot",
+                "email": "me@evertpot.com",
+                "homepage": "http://evertpot.com/",
+                "role": "Developer"
+            },
+            {
+                "name": "Dominik Tobschall",
+                "email": "dominik@fruux.com",
+                "homepage": "http://tobschall.de/",
+                "role": "Developer"
+            },
+            {
+                "name": "Ivan Enderlin",
+                "email": "ivan.enderlin@hoa-project.net",
+                "homepage": "http://mnt.io/",
+                "role": "Developer"
+            }
+        ],
+        "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
+        "homepage": "http://sabre.io/vobject/",
+        "keywords": [
+            "availability",
+            "freebusy",
+            "iCalendar",
+            "ical",
+            "ics",
+            "jCal",
+            "jCard",
+            "recurrence",
+            "rfc2425",
+            "rfc2426",
+            "rfc2739",
+            "rfc4770",
+            "rfc5545",
+            "rfc5546",
+            "rfc6321",
+            "rfc6350",
+            "rfc6351",
+            "rfc6474",
+            "rfc6638",
+            "rfc6715",
+            "rfc6868",
+            "vCalendar",
+            "vCard",
+            "vcf",
+            "xCal",
+            "xCard"
+        ]
+    },
+    {
+        "name": "sabre/http",
+        "version": "4.2.2",
+        "version_normalized": "4.2.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fruux/sabre-http.git",
+            "reference": "dd50e7260356f4599d40270826f9548b23efa204"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fruux/sabre-http/zipball/dd50e7260356f4599d40270826f9548b23efa204",
+            "reference": "dd50e7260356f4599d40270826f9548b23efa204",
+            "shasum": ""
+        },
+        "require": {
+            "ext-ctype": "*",
+            "ext-mbstring": "*",
+            "php": ">=5.4",
+            "sabre/event": ">=1.0.0,<4.0.0",
+            "sabre/uri": "~1.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.3",
+            "sabre/cs": "~0.0.1"
+        },
+        "suggest": {
+            "ext-curl": " to make http requests with the Client class"
+        },
+        "time": "2017-01-02 19:38:42",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "lib/functions.php"
+            ],
+            "psr-4": {
+                "Sabre\\HTTP\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Evert Pot",
+                "email": "me@evertpot.com",
+                "homepage": "http://evertpot.com/",
+                "role": "Developer"
+            }
+        ],
+        "description": "The sabre/http library provides utilities for dealing with http requests and responses. ",
+        "homepage": "https://github.com/fruux/sabre-http",
+        "keywords": [
+            "http"
+        ]
+    },
+    {
+        "name": "sabre/dav",
+        "version": "3.2.2",
+        "version_normalized": "3.2.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fruux/sabre-dav.git",
+            "reference": "e987775e619728f12205606c9cc3ee565ffb1516"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516",
+            "reference": "e987775e619728f12205606c9cc3ee565ffb1516",
+            "shasum": ""
+        },
+        "require": {
+            "ext-ctype": "*",
+            "ext-date": "*",
+            "ext-dom": "*",
+            "ext-iconv": "*",
+            "ext-mbstring": "*",
+            "ext-pcre": "*",
+            "ext-simplexml": "*",
+            "ext-spl": "*",
+            "lib-libxml": ">=2.7.0",
+            "php": ">=5.5.0",
+            "psr/log": "^1.0",
+            "sabre/event": ">=2.0.0, <4.0.0",
+            "sabre/http": "^4.2.1",
+            "sabre/uri": "^1.0.1",
+            "sabre/vobject": "^4.1.0",
+            "sabre/xml": "^1.4.0"
+        },
+        "require-dev": {
+            "evert/phpdoc-md": "~0.1.0",
+            "monolog/monolog": "^1.18",
+            "phpunit/phpunit": "> 4.8, <6.0.0",
+            "sabre/cs": "^1.0.0"
+        },
+        "suggest": {
+            "ext-curl": "*",
+            "ext-pdo": "*"
+        },
+        "time": "2017-02-15 03:06:08",
+        "bin": [
+            "bin/sabredav",
+            "bin/naturalselection"
+        ],
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Sabre\\DAV\\": "lib/DAV/",
+                "Sabre\\DAVACL\\": "lib/DAVACL/",
+                "Sabre\\CalDAV\\": "lib/CalDAV/",
+                "Sabre\\CardDAV\\": "lib/CardDAV/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Evert Pot",
+                "email": "me@evertpot.com",
+                "homepage": "http://evertpot.com/",
+                "role": "Developer"
+            }
+        ],
+        "description": "WebDAV Framework for PHP",
+        "homepage": "http://sabre.io/",
+        "keywords": [
+            "CalDAV",
+            "CardDAV",
+            "WebDAV",
+            "framework",
+            "iCalendar"
+        ]
     }
 ]
diff --git a/vendor/sabre/dav/.travis.yml b/vendor/sabre/dav/.travis.yml
index a9189c981..85637048a 100644
--- a/vendor/sabre/dav/.travis.yml
+++ b/vendor/sabre/dav/.travis.yml
@@ -2,7 +2,9 @@ language: php
 php:
   - 5.5
   - 5.6
-  - 7
+  - 7.0
+  - 7.1
+
 
 env:
   matrix:
@@ -19,7 +21,6 @@ before_script:
   - mysql -e 'create database sabredav_test'
   - psql -c "create database sabredav_test" -U postgres
   - psql -c "create user sabredav with PASSWORD 'sabredav';GRANT ALL PRIVILEGES ON DATABASE sabredav_test TO sabredav" -U postgres
-  - phpenv config-rm xdebug.ini; true
   #  - composer self-update
   - composer update --prefer-dist $LOWEST_DEPS
 
@@ -28,7 +29,7 @@ before_script:
 
 script:
   - ./bin/phpunit --configuration tests/phpunit.xml.dist $TEST_DEPS
-  - ./bin/sabre-cs-fixer fix lib/ --dry-run --diff
+  - ./bin/sabre-cs-fixer fix . --dry-run --diff
 
 cache:
   directories:
diff --git a/vendor/sabre/dav/CHANGELOG.md b/vendor/sabre/dav/CHANGELOG.md
index d8a3898c3..0bccc995c 100644
--- a/vendor/sabre/dav/CHANGELOG.md
+++ b/vendor/sabre/dav/CHANGELOG.md
@@ -1,6 +1,28 @@
 ChangeLog
 =========
 
+3.2.2 (2017-02-14)
+------------------
+
+* #943: Fix CardDAV XML reporting bug, which was affecting several CardDAV
+  clients. Bug was introduced in 3.2.1.
+* The zip release ships with [sabre/vobject 4.1.2][vobj],
+  [sabre/http 4.2.2][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.2.0][uri] and [sabre/xml 1.5.0][xml].
+
+
+3.2.1 (2017-01-28)
+------------------
+
+* #877: Fix for syncing large calendars when using the Sqlite PDO backend.
+  (@theseer).
+* #889 Added support for filtering vCard properties in the addressbook-query
+  REPORT (@DeepDiver1975).
+* The zip release ships with [sabre/vobject 4.1.2][vobj],
+  [sabre/http 4.2.2][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.2.0][uri] and [sabre/xml 1.5.0][xml].
+
+
 3.2.0 (2016-06-27)
 ------------------
 
@@ -88,6 +110,9 @@ ChangeLog
 ------------------
 
 * Fixed: Creating a new calendar on some MySQL configurations caused an error.
+* #889 Added support for filtering vCard properties in the addressbook-query
+  REPORT (@DeepDiver1975).
+
 
 
 3.1.4 (2016-05-28)
@@ -200,6 +225,13 @@ ChangeLog
   [sabre/uri 1.0.1][uri] and [sabre/xml 1.1.0][xml].
 
 
+3.0.10 (2016-??-??)
+------------------
+
+* #889 Added support for filtering vCard properties in the addressbook-query
+  REPORT (@DeepDiver1975).
+
+
 3.0.9 (2016-04-06)
 ------------------
 
@@ -463,11 +495,13 @@ ChangeLog
 * #193: Fix `Sabre\DAV\FSExt\Directory::getQuotaInfo()` on windows.
 
 
-2.1.11 (2016-??-??)
+2.1.11 (2016-10-06)
 -------------------
 
 * #805: It wasn't possible to create calendars that hold events, journals and
   todos using MySQL, because the `components` column was 1 byte too small.
+* The zip release ships with [sabre/vobject 3.5.3][vobj],
+  [sabre/http 3.0.5][http], and [sabre/event 2.0.2][evnt].
 
 
 2.1.10 (2016-03-10)
@@ -475,6 +509,8 @@ ChangeLog
 
 * #784: Sync logs for address books were not correctly cleaned up after
   deleting them.
+* The zip release ships with [sabre/vobject 3.5.0][vobj],
+  [sabre/http 3.0.5][http], and [sabre/event 2.0.2][evnt].
 
 
 2.1.9 (2016-01-25)
@@ -627,7 +663,7 @@ ChangeLog
 * Added: Automatically converting between vCard 3, 4 and jCard using the
   `Accept:` header, in CardDAV reports, and automatically converting from
   jCard to vCard upon `PUT`. It's important to note that your backends _may_
-  now recieve both vCard 3.0 and 4.0.
+  now receive both vCard 3.0 and 4.0.
 * Added: #444. Collections can now opt-in to support high-speed `MOVE`.
 * Changed: PropertyStorage backends now have a `move` method.
 * Added: `beforeMove`, and `afterMove` events.
@@ -812,7 +848,7 @@ ChangeLog
 * Added: Support for the `{DAV:}supported-method-set` property server-wide.
 * Making it easier for implementors to override how the CardDAV addressbook
   home is located.
-* Fixed: Issue #422 Preconditions were not being set on PUT on non-existant
+* Fixed: Issue #422 Preconditions were not being set on PUT on non-existent
   files. Not really a chance for data-loss, but incorrect nevertheless.
 * Fixed: Issue #428: Etag check with `If:` fails if the target is a collection.
 * Fixed: Issues #430, #431, #433: Locks plugin didn't not properly release
@@ -1024,7 +1060,7 @@ ChangeLog
 * Added: Sharee's can now also read out the list of invites for a shared
   calendar.
 * Added: The Proxy principal classes now both implement an interface, for
-  greater flexiblity.
+  greater flexibility.
 
 
 1.7.13 (2014-07-28)
@@ -1042,7 +1078,7 @@ ChangeLog
   Sabre_DAV_PartialUpdate_IFile interface is now deprecated and will be removed
   in a future version.
 * Fixed: Restoring old setting after changing libxml_disable_entity_loader.
-* Fixed: Issue #422: Preconditions were not being set on PUT on non-existant
+* Fixed: Issue #422: Preconditions were not being set on PUT on non-existent
   files. Not really a chance for data-loss, but incorrect nevertheless.
 * Fixed: Issue #427: Now checking preconditions on DELETE requests.
 * Fixed: Issue #428: Etag check with If: fails if the target is a collection.
@@ -1121,7 +1157,7 @@ ChangeLog
 ------------------
 
 * The zip release ships with sabre/vobject 2.0.5.
-* Changed: To be compatibile with MS Office 2011 for Mac, a workaround was
+* Changed: To be compatible with MS Office 2011 for Mac, a workaround was
   removed that was added to support old versions of Windows XP (pre-SP3).
   Indeed! We needed a crazy workaround to work with one MS product in the past,
   and we can't keep that workaround to be compatible with another MS product.
@@ -1129,7 +1165,7 @@ ChangeLog
 * Fixed: Range requests now work for non-seekable streams. (Thanks Alfred
   Klomp).
 * Fixed: Changed serialization of {DAV:}getlastmodified and {DAV:}supportedlock
-  to improve compatiblity with MS Office 2011 for Mac.
+  to improve compatibility with MS Office 2011 for Mac.
 * Changed: reverted the automatic translation of 'DAV:' xml namespaces to
   'urn:DAV' when parsing files. Issues were reported with libxml 2.6.32, on a
   relatively recent debian release, so we'll wait till 2015 to take this one out
@@ -2006,7 +2042,7 @@ ChangeLog
 -------------------
 
 * Fixed: Issue 34: Invalid Lock-Token header response.
-* Added: Issue 35: Addign SabreDAV version to HTTP OPTIONS responses.
+* Added: Issue 35: Adding SabreDAV version to HTTP OPTIONS responses.
 
 
 1.0.9 (2010-03-19)
@@ -2220,7 +2256,7 @@ ChangeLog
 * Added: Simple HTML directory plugin, for browser access.
 * Added: Server class now sends back standard pre-condition error xml bodies.
   This was new since RFC4918.
-* Added: Sabre_DAV_Tree_Aggregrate, which can 'host' multiple Tree objects into
+* Added: Sabre_DAV_Tree_Aggregate, which can 'host' multiple Tree objects into
   one.
 * Added: simple basis for HTTP REPORT method. This method is not used yet, but
   can be used by plugins to add reports.
@@ -2237,7 +2273,7 @@ ChangeLog
   8.2.
 * Fixed: TemporaryFileFilter now lets through GET's if they actually exist on
   the backend. (r274)
-* FIxed: Some methods didn't get passed through in the FilterTree (r283).
+* Fixed: Some methods didn't get passed through in the FilterTree (r283).
 * Fixed: LockManager is now slightly more complex, Tree classes slightly less.
   (r287)
 
diff --git a/vendor/sabre/dav/README.md b/vendor/sabre/dav/README.md
index 8edcd4073..86a0fe9a6 100644
--- a/vendor/sabre/dav/README.md
+++ b/vendor/sabre/dav/README.md
@@ -10,6 +10,7 @@ Full documentation can be found on the website:
 
 http://sabre.io/
 
+
 Build status
 ------------
 
@@ -30,6 +31,7 @@ Documentation
 * [Introduction](http://sabre.io/dav/).
 * [Installation](http://sabre.io/dav/install/).
 
+
 Made at fruux
 -------------
 
diff --git a/vendor/sabre/dav/bin/build.php b/vendor/sabre/dav/bin/build.php
old mode 100644
new mode 100755
diff --git a/vendor/sabre/dav/bin/googlecode_upload.py b/vendor/sabre/dav/bin/googlecode_upload.py
old mode 100644
new mode 100755
diff --git a/vendor/sabre/dav/bin/migrateto20.php b/vendor/sabre/dav/bin/migrateto20.php
old mode 100644
new mode 100755
diff --git a/vendor/sabre/dav/bin/migrateto21.php b/vendor/sabre/dav/bin/migrateto21.php
old mode 100644
new mode 100755
diff --git a/vendor/sabre/dav/bin/migrateto30.php b/vendor/sabre/dav/bin/migrateto30.php
old mode 100644
new mode 100755
diff --git a/vendor/sabre/dav/bin/migrateto32.php b/vendor/sabre/dav/bin/migrateto32.php
old mode 100644
new mode 100755
diff --git a/vendor/sabre/dav/bin/sabredav.php b/vendor/sabre/dav/bin/sabredav.php
old mode 100644
new mode 100755
diff --git a/vendor/sabre/dav/composer.json b/vendor/sabre/dav/composer.json
index f85d9655e..fca0e07fb 100644
--- a/vendor/sabre/dav/composer.json
+++ b/vendor/sabre/dav/composer.json
@@ -32,9 +32,9 @@
         "psr/log": "^1.0"
     },
     "require-dev" : {
-        "phpunit/phpunit" : "> 4.8, <=6.0.0",
+        "phpunit/phpunit" : "> 4.8, <6.0.0",
         "evert/phpdoc-md" : "~0.1.0",
-        "sabre/cs"        : "~0.0.5",
+        "sabre/cs"        : "^1.0.0",
         "monolog/monolog": "^1.18"
     },
     "suggest" : {
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php b/vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
index d58b4a46e..311b1c415 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Backend;
 
-use Sabre\VObject;
 use Sabre\CalDAV;
+use Sabre\VObject;
 
 /**
  * Abstract Calendaring backend. Extend this class to create your own backends.
@@ -26,9 +26,9 @@ abstract class AbstractBackend implements BackendInterface {
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
-     * @param string $path
+     * @param mixed $calendarId
      * @param \Sabre\DAV\PropPatch $propPatch
      * @return void
      */
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php b/vendor/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php
index 9c00a89ef..bf2ef27a0 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php
@@ -49,8 +49,8 @@ interface NotificationSupport extends BackendInterface {
      * If the user chose to accept the share, this method should return the
      * newly created calendar url.
      *
-     * @param string href The sharee who is replying (often a mailto: address)
-     * @param int status One of the SharingPlugin::STATUS_* constants
+     * @param string $href The sharee who is replying (often a mailto: address)
+     * @param int $status One of the SharingPlugin::STATUS_* constants
      * @param string $calendarUri The url to the calendar thats being shared
      * @param string $inReplyTo The unique id this message is a response to
      * @param string $summary A description of the reply
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php b/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
index 95f1d49a6..458440588 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
@@ -5,8 +5,8 @@ namespace Sabre\CalDAV\Backend;
 use Sabre\CalDAV;
 use Sabre\DAV;
 use Sabre\DAV\Exception\Forbidden;
-use Sabre\VObject;
 use Sabre\DAV\Xml\Element\Sharee;
+use Sabre\VObject;
 
 /**
  * PDO CalDAV backend
@@ -296,7 +296,7 @@ SQL
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param mixed $calendarId
      * @param \Sabre\DAV\PropPatch $propPatch
@@ -481,13 +481,13 @@ SQL
         if (!$row) return null;
 
         return [
-            'id'            => $row['id'],
-            'uri'           => $row['uri'],
-            'lastmodified'  => (int)$row['lastmodified'],
-            'etag'          => '"' . $row['etag'] . '"',
-            'size'          => (int)$row['size'],
-            'calendardata'  => $row['calendardata'],
-            'component'     => strtolower($row['componenttype']),
+            'id'           => $row['id'],
+            'uri'          => $row['uri'],
+            'lastmodified' => (int)$row['lastmodified'],
+            'etag'         => '"' . $row['etag'] . '"',
+            'size'         => (int)$row['size'],
+            'calendardata' => $row['calendardata'],
+            'component'    => strtolower($row['componenttype']),
          ];
 
     }
@@ -511,27 +511,29 @@ SQL
         }
         list($calendarId, $instanceId) = $calendarId;
 
-        $query = 'SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ? AND uri IN (';
-        // Inserting a whole bunch of question marks
-        $query .= implode(',', array_fill(0, count($uris), '?'));
-        $query .= ')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute(array_merge([$calendarId], $uris));
-
         $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+        foreach (array_chunk($uris, 900) as $chunk) {
+            $query = 'SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ? AND uri IN (';
+            // Inserting a whole bunch of question marks
+            $query .= implode(',', array_fill(0, count($chunk), '?'));
+            $query .= ')';
 
-            $result[] = [
-                'id'           => $row['id'],
-                'uri'          => $row['uri'],
-                'lastmodified' => (int)$row['lastmodified'],
-                'etag'         => '"' . $row['etag'] . '"',
-                'size'         => (int)$row['size'],
-                'calendardata' => $row['calendardata'],
-                'component'    => strtolower($row['componenttype']),
-            ];
+            $stmt = $this->pdo->prepare($query);
+            $stmt->execute(array_merge([$calendarId], $chunk));
 
+            while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+                $result[] = [
+                    'id'           => $row['id'],
+                    'uri'          => $row['uri'],
+                    'lastmodified' => (int)$row['lastmodified'],
+                    'etag'         => '"' . $row['etag'] . '"',
+                    'size'         => (int)$row['size'],
+                    'calendardata' => $row['calendardata'],
+                    'component'    => strtolower($row['componenttype']),
+                ];
+
+            }
         }
         return $result;
 
@@ -686,7 +688,7 @@ SQL
                 }
 
             }
-            
+
             // Ensure Occurence values are positive
             if ($firstOccurence < 0) $firstOccurence = 0;
             if ($lastOccurence < 0) $lastOccurence = 0;
@@ -769,7 +771,7 @@ SQL
      * Note that especially time-range-filters may be difficult to parse. A
      * time-range filter specified on a VEVENT must for instance also handle
      * recurrence rules correctly.
-     * A good example of how to interprete all these filters can also simply
+     * A good example of how to interpret all these filters can also simply
      * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
      * as possible, so it gives you a good idea on what type of stuff you need
      * to think of.
@@ -969,7 +971,7 @@ SQL;
 
         // Current synctoken
         $stmt = $this->pdo->prepare('SELECT synctoken FROM ' . $this->calendarTableName . ' WHERE id = ?');
-        $stmt->execute([ $calendarId ]);
+        $stmt->execute([$calendarId]);
         $currentToken = $stmt->fetchColumn(0);
 
         if (is_null($currentToken)) return null;
@@ -1181,7 +1183,7 @@ SQL;
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param mixed $subscriptionId
      * @param \Sabre\DAV\PropPatch $propPatch
@@ -1327,7 +1329,7 @@ SQL;
     function createSchedulingObject($principalUri, $objectUri, $objectData) {
 
         $stmt = $this->pdo->prepare('INSERT INTO ' . $this->schedulingObjectTableName . ' (principaluri, calendardata, uri, lastmodified, etag, size) VALUES (?, ?, ?, ?, ?, ?)');
-        $stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData) ]);
+        $stmt->execute([$principalUri, $objectData, $objectUri, time(), md5($objectData), strlen($objectData)]);
 
     }
 
@@ -1483,7 +1485,7 @@ SQL;
                 'inviteStatus' => (int)$row['share_invitestatus'],
                 'properties'   =>
                     !empty($row['share_displayname'])
-                    ?  [ '{DAV:}displayname' => $row['share_displayname'] ]
+                    ? ['{DAV:}displayname' => $row['share_displayname']]
                     : [],
                 'principal' => $row['principaluri'],
             ]);
@@ -1502,7 +1504,7 @@ SQL;
      */
     function setPublishStatus($calendarId, $value) {
 
-        throw new \Sabre\DAV\Exception\NotImplemented('Not implemented');
+        throw new DAV\Exception\NotImplemented('Not implemented');
 
     }
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/SharingSupport.php b/vendor/sabre/dav/lib/CalDAV/Backend/SharingSupport.php
index 8b6e074e0..278ec2564 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/SharingSupport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/SharingSupport.php
@@ -11,9 +11,9 @@ namespace Sabre\CalDAV\Backend;
  * 1. Return shared calendars for users.
  * 2. For every calendar, return calendar-resource-uri. This strings is a URI or
  *    relative URI reference that must be unique for every calendar, but
- *    identical for every instance of the same shared calenar.
- * 3. For every calenar, you must return a share-access element. This element
- *    should contain one of the Sabre\DAV\Sharing\Plugin:ACCESS_* contants and
+ *    identical for every instance of the same shared calendar.
+ * 3. For every calendar, you must return a share-access element. This element
+ *    should contain one of the Sabre\DAV\Sharing\Plugin:ACCESS_* constants and
  *    indicates the access level the user has.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/SimplePDO.php b/vendor/sabre/dav/lib/CalDAV/Backend/SimplePDO.php
index f8238ea9a..d21f7f916 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/SimplePDO.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/SimplePDO.php
@@ -8,7 +8,7 @@ use Sabre\DAV;
 /**
  * Simple PDO CalDAV backend.
  *
- * This class is basically the most minmum example to get a caldav backend up
+ * This class is basically the most minimum example to get a caldav backend up
  * and running. This class uses the following schema (MySQL example):
  *
  * CREATE TABLE simple_calendars (
@@ -209,12 +209,12 @@ class SimplePDO extends AbstractBackend {
         if (!$row) return null;
 
         return [
-            'id'            => $row['id'],
-            'uri'           => $row['uri'],
-            'etag'          => '"' . md5($row['calendardata']) . '"',
-            'calendarid'    => $calendarId,
-            'size'          => strlen($row['calendardata']),
-            'calendardata'  => $row['calendardata'],
+            'id'           => $row['id'],
+            'uri'          => $row['uri'],
+            'etag'         => '"' . md5($row['calendardata']) . '"',
+            'calendarid'   => $calendarId,
+            'size'         => strlen($row['calendardata']),
+            'calendardata' => $row['calendardata'],
          ];
 
     }
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php b/vendor/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php
index a39289f5e..d77a2fe0f 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php
@@ -70,7 +70,7 @@ interface SubscriptionSupport extends BackendInterface {
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param mixed $subscriptionId
      * @param \Sabre\DAV\PropPatch $propPatch
diff --git a/vendor/sabre/dav/lib/CalDAV/Calendar.php b/vendor/sabre/dav/lib/CalDAV/Calendar.php
index 90ace0d21..7467900cc 100644
--- a/vendor/sabre/dav/lib/CalDAV/Calendar.php
+++ b/vendor/sabre/dav/lib/CalDAV/Calendar.php
@@ -3,8 +3,8 @@
 namespace Sabre\CalDAV;
 
 use Sabre\DAV;
-use Sabre\DAVACL;
 use Sabre\DAV\PropPatch;
+use Sabre\DAVACL;
 
 /**
  * This object represents a CalDAV calendar.
diff --git a/vendor/sabre/dav/lib/CalDAV/CalendarHome.php b/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
index 0a4bfb68f..ffd7f72fb 100644
--- a/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
+++ b/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
@@ -27,7 +27,7 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
     /**
      * CalDAV backend
      *
-     * @var Sabre\CalDAV\Backend\BackendInterface
+     * @var Backend\BackendInterface
      */
     protected $caldavBackend;
 
@@ -42,7 +42,7 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
      * Constructor
      *
      * @param Backend\BackendInterface $caldavBackend
-     * @param mixed $userUri
+     * @param array $principalInfo
      */
     function __construct(Backend\BackendInterface $caldavBackend, $principalInfo) {
 
@@ -334,8 +334,8 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
      * This method should return the url of the newly created calendar if the
      * share was accepted.
      *
-     * @param string href The sharee who is replying (often a mailto: address)
-     * @param int status One of the SharingPlugin::STATUS_* constants
+     * @param string $href The sharee who is replying (often a mailto: address)
+     * @param int    $status One of the SharingPlugin::STATUS_* constants
      * @param string $calendarUri The url to the calendar thats being shared
      * @param string $inReplyTo The unique id this message is a response to
      * @param string $summary A description of the reply
diff --git a/vendor/sabre/dav/lib/CalDAV/CalendarObject.php b/vendor/sabre/dav/lib/CalDAV/CalendarObject.php
index 001b35112..9d6532a35 100644
--- a/vendor/sabre/dav/lib/CalDAV/CalendarObject.php
+++ b/vendor/sabre/dav/lib/CalDAV/CalendarObject.php
@@ -16,7 +16,7 @@ class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\
     /**
      * Sabre\CalDAV\Backend\BackendInterface
      *
-     * @var Sabre\CalDAV\Backend\AbstractBackend
+     * @var Backend\AbstractBackend
      */
     protected $caldavBackend;
 
diff --git a/vendor/sabre/dav/lib/CalDAV/CalendarQueryValidator.php b/vendor/sabre/dav/lib/CalDAV/CalendarQueryValidator.php
index f3c7524d2..df8008fe2 100644
--- a/vendor/sabre/dav/lib/CalDAV/CalendarQueryValidator.php
+++ b/vendor/sabre/dav/lib/CalDAV/CalendarQueryValidator.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV;
 
-use Sabre\VObject;
 use DateTime;
+use Sabre\VObject;
 
 /**
  * CalendarQuery Validator
@@ -25,7 +25,7 @@ class CalendarQueryValidator {
      *
      * The list of filters must be formatted as parsed by \Sabre\CalDAV\CalendarQueryParser
      *
-     * @param VObject\Component $vObject
+     * @param VObject\Component\VCalendar $vObject
      * @param array $filters
      * @return bool
      */
diff --git a/vendor/sabre/dav/lib/CalDAV/CalendarRoot.php b/vendor/sabre/dav/lib/CalDAV/CalendarRoot.php
index 0ac50e41d..1d6b2ac9f 100644
--- a/vendor/sabre/dav/lib/CalDAV/CalendarRoot.php
+++ b/vendor/sabre/dav/lib/CalDAV/CalendarRoot.php
@@ -22,7 +22,7 @@ class CalendarRoot extends \Sabre\DAVACL\AbstractPrincipalCollection {
     /**
      * CalDAV backend
      *
-     * @var Sabre\CalDAV\Backend\BackendInterface
+     * @var Backend\BackendInterface
      */
     protected $caldavBackend;
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Exception/InvalidComponentType.php b/vendor/sabre/dav/lib/CalDAV/Exception/InvalidComponentType.php
index 5ce8a93f5..7aff2edab 100644
--- a/vendor/sabre/dav/lib/CalDAV/Exception/InvalidComponentType.php
+++ b/vendor/sabre/dav/lib/CalDAV/Exception/InvalidComponentType.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Exception;
 
-use Sabre\DAV;
 use Sabre\CalDAV;
+use Sabre\DAV;
 
 /**
  * InvalidComponentType
diff --git a/vendor/sabre/dav/lib/CalDAV/ICSExportPlugin.php b/vendor/sabre/dav/lib/CalDAV/ICSExportPlugin.php
index a3a824c71..fc8b971f3 100644
--- a/vendor/sabre/dav/lib/CalDAV/ICSExportPlugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/ICSExportPlugin.php
@@ -2,13 +2,13 @@
 
 namespace Sabre\CalDAV;
 
+use DateTime;
 use DateTimeZone;
 use Sabre\DAV;
-use Sabre\VObject;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
-use Sabre\DAV\Exception\BadRequest;
-use DateTime;
+use Sabre\VObject;
 
 /**
  * ICS Exporter
diff --git a/vendor/sabre/dav/lib/CalDAV/Notifications/Collection.php b/vendor/sabre/dav/lib/CalDAV/Notifications/Collection.php
index 5fda61dfa..557832a5a 100644
--- a/vendor/sabre/dav/lib/CalDAV/Notifications/Collection.php
+++ b/vendor/sabre/dav/lib/CalDAV/Notifications/Collection.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Notifications;
 
-use Sabre\DAV;
 use Sabre\CalDAV;
+use Sabre\DAV;
 use Sabre\DAVACL;
 
 /**
@@ -27,7 +27,7 @@ class Collection extends DAV\Collection implements ICollection, DAVACL\IACL {
     /**
      * The notification backend
      *
-     * @var Sabre\CalDAV\Backend\NotificationSupport
+     * @var CalDAV\Backend\NotificationSupport
      */
     protected $caldavBackend;
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Notifications/INode.php b/vendor/sabre/dav/lib/CalDAV/Notifications/INode.php
index f9986b714..783b92be9 100644
--- a/vendor/sabre/dav/lib/CalDAV/Notifications/INode.php
+++ b/vendor/sabre/dav/lib/CalDAV/Notifications/INode.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\CalDAV\Notifications;
 
+use Sabre\CalDAV\Xml\Notification\NotificationInterface;
+
 /**
  * This node represents a single notification.
  *
@@ -20,16 +22,16 @@ interface INode {
 
     /**
      * This method must return an xml element, using the
-     * Sabre\CalDAV\Notifications\INotificationType classes.
+     * Sabre\CalDAV\Xml\Notification\NotificationInterface classes.
      *
-     * @return INotificationType
+     * @return NotificationInterface
      */
     function getNotificationType();
 
     /**
      * Returns the etag for the notification.
      *
-     * The etag must be surrounded by litteral double-quotes.
+     * The etag must be surrounded by literal double-quotes.
      *
      * @return string
      */
diff --git a/vendor/sabre/dav/lib/CalDAV/Notifications/Node.php b/vendor/sabre/dav/lib/CalDAV/Notifications/Node.php
index 11df0c94b..ad7ddf8f5 100644
--- a/vendor/sabre/dav/lib/CalDAV/Notifications/Node.php
+++ b/vendor/sabre/dav/lib/CalDAV/Notifications/Node.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\CalDAV\Notifications;
 
-use Sabre\DAV;
 use Sabre\CalDAV;
 use Sabre\CalDAV\Xml\Notification\NotificationInterface;
+use Sabre\DAV;
 use Sabre\DAVACL;
 
 /**
@@ -25,14 +25,14 @@ class Node extends DAV\File implements INode, DAVACL\IACL {
     /**
      * The notification backend
      *
-     * @var Sabre\CalDAV\Backend\NotificationSupport
+     * @var CalDAV\Backend\NotificationSupport
      */
     protected $caldavBackend;
 
     /**
      * The actual notification
      *
-     * @var Sabre\CalDAV\Notifications\INotificationType
+     * @var NotificationInterface
      */
     protected $notification;
 
@@ -61,7 +61,7 @@ class Node extends DAV\File implements INode, DAVACL\IACL {
     /**
      * Returns the path name for this notification
      *
-     * @return id
+     * @return string
      */
     function getName() {
 
@@ -84,9 +84,9 @@ class Node extends DAV\File implements INode, DAVACL\IACL {
 
     /**
      * This method must return an xml element, using the
-     * Sabre\CalDAV\Notifications\INotificationType classes.
+     * Sabre\CalDAV\Xml\Notification\NotificationInterface classes.
      *
-     * @return INotificationType
+     * @return NotificationInterface
      */
     function getNotificationType() {
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Notifications/Plugin.php b/vendor/sabre/dav/lib/CalDAV/Notifications/Plugin.php
index 546bf927f..e742351f5 100644
--- a/vendor/sabre/dav/lib/CalDAV/Notifications/Plugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Notifications/Plugin.php
@@ -3,10 +3,10 @@
 namespace Sabre\CalDAV\Notifications;
 
 use Sabre\DAV;
-use Sabre\DAV\PropFind;
 use Sabre\DAV\INode as BaseINode;
-use Sabre\DAV\ServerPlugin;
+use Sabre\DAV\PropFind;
 use Sabre\DAV\Server;
+use Sabre\DAV\ServerPlugin;
 use Sabre\DAVACL;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
diff --git a/vendor/sabre/dav/lib/CalDAV/Plugin.php b/vendor/sabre/dav/lib/CalDAV/Plugin.php
index 71ba75206..def11d52d 100644
--- a/vendor/sabre/dav/lib/CalDAV/Plugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Plugin.php
@@ -9,11 +9,11 @@ use Sabre\DAV\INode;
 use Sabre\DAV\MkCol;
 use Sabre\DAV\Xml\Property\LocalHref;
 use Sabre\DAVACL;
-use Sabre\VObject;
 use Sabre\HTTP;
-use Sabre\Uri;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
+use Sabre\Uri;
+use Sabre\VObject;
 
 /**
  * CalDAV plugin
@@ -302,8 +302,8 @@ class Plugin extends DAV\ServerPlugin {
 
         $this->server->createCollection($path, new MkCol($resourceType, $properties));
 
-        $this->server->httpResponse->setStatus(201);
-        $this->server->httpResponse->setHeader('Content-Length', 0);
+        $response->setStatus(201);
+        $response->setHeader('Content-Length', 0);
 
         // This breaks the method chain.
         return false;
@@ -926,7 +926,7 @@ class Plugin extends DAV\ServerPlugin {
             );
         }
 
-        // We use an extra variable to allow event handles to tell us wether
+        // We use an extra variable to allow event handles to tell us whether
         // the object was modified or not.
         //
         // This helps us determine if we need to re-serialize the object.
diff --git a/vendor/sabre/dav/lib/CalDAV/Principal/ProxyRead.php b/vendor/sabre/dav/lib/CalDAV/Principal/ProxyRead.php
index 93f0fe095..e3881831e 100644
--- a/vendor/sabre/dav/lib/CalDAV/Principal/ProxyRead.php
+++ b/vendor/sabre/dav/lib/CalDAV/Principal/ProxyRead.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Principal;
 
-use Sabre\DAVACL;
 use Sabre\DAV;
+use Sabre\DAVACL;
 
 /**
  * ProxyRead principal
@@ -84,8 +84,8 @@ class ProxyRead implements IProxyRead {
     /**
      * Renames the node
      *
-     * @throws DAV\Exception\Forbidden
      * @param string $name The new name
+     * @throws DAV\Exception\Forbidden
      * @return void
      */
     function setName($name) {
diff --git a/vendor/sabre/dav/lib/CalDAV/Principal/ProxyWrite.php b/vendor/sabre/dav/lib/CalDAV/Principal/ProxyWrite.php
index 8124c05e0..43dd9bf07 100644
--- a/vendor/sabre/dav/lib/CalDAV/Principal/ProxyWrite.php
+++ b/vendor/sabre/dav/lib/CalDAV/Principal/ProxyWrite.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Principal;
 
-use Sabre\DAVACL;
 use Sabre\DAV;
+use Sabre\DAVACL;
 
 /**
  * ProxyWrite principal
@@ -84,8 +84,8 @@ class ProxyWrite implements IProxyWrite {
     /**
      * Renames the node
      *
-     * @throws DAV\Exception\Forbidden
      * @param string $name The new name
+     * @throws DAV\Exception\Forbidden
      * @return void
      */
     function setName($name) {
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php b/vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php
index ffb1fe45b..6f5acb29a 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -181,7 +181,7 @@ class IMipPlugin extends DAV\ServerPlugin {
 
         return [
             'name'        => $this->getPluginName(),
-            'description' => 'Email delivery (rfc6037) for CalDAV scheduling',
+            'description' => 'Email delivery (rfc6047) for CalDAV scheduling',
             'link'        => 'http://sabre.io/dav/scheduling/',
         ];
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/Inbox.php b/vendor/sabre/dav/lib/CalDAV/Schedule/Inbox.php
index 6b374ea3f..81b017307 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/Inbox.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/Inbox.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Schedule;
 
-use Sabre\DAV;
 use Sabre\CalDAV;
-use Sabre\DAVACL;
 use Sabre\CalDAV\Backend;
+use Sabre\DAV;
+use Sabre\DAVACL;
 use Sabre\VObject;
 
 /**
@@ -83,7 +83,7 @@ class Inbox extends DAV\Collection implements IInbox {
      * Data will either be supplied as a stream resource, or in certain cases
      * as a string. Keep in mind that you may have to support either.
      *
-     * After succesful creation of the file, you may choose to return the ETag
+     * After successful creation of the file, you may choose to return the ETag
      * of the new file here.
      *
      * The returned ETag must be surrounded by double-quotes (The quotes should
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/Outbox.php b/vendor/sabre/dav/lib/CalDAV/Schedule/Outbox.php
index 29eefa744..888ea3086 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/Outbox.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/Outbox.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Schedule;
 
-use Sabre\DAV;
 use Sabre\CalDAV;
+use Sabre\DAV;
 use Sabre\DAVACL;
 
 /**
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php b/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
index 47511140f..0b991e619 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
@@ -3,29 +3,28 @@
 namespace Sabre\CalDAV\Schedule;
 
 use DateTimeZone;
-use Sabre\DAV\Server;
-use Sabre\DAV\ServerPlugin;
-use Sabre\DAV\Sharing;
-use Sabre\DAV\PropFind;
-use Sabre\DAV\PropPatch;
-use Sabre\DAV\INode;
-use Sabre\DAV\Xml\Property\Href;
-use Sabre\DAV\Xml\Property\LocalHref;
-use Sabre\HTTP\RequestInterface;
-use Sabre\HTTP\ResponseInterface;
-use Sabre\VObject;
-use Sabre\VObject\Reader;
-use Sabre\VObject\Component\VCalendar;
-use Sabre\VObject\ITip;
-use Sabre\VObject\ITip\Message;
-use Sabre\DAVACL;
 use Sabre\CalDAV\ICalendar;
 use Sabre\CalDAV\ICalendarObject;
 use Sabre\CalDAV\Xml\Property\ScheduleCalendarTransp;
-use Sabre\DAV\Exception\NotFound;
-use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\Exception\NotImplemented;
+use Sabre\DAV\INode;
+use Sabre\DAV\PropFind;
+use Sabre\DAV\PropPatch;
+use Sabre\DAV\Server;
+use Sabre\DAV\ServerPlugin;
+use Sabre\DAV\Sharing;
+use Sabre\DAV\Xml\Property\LocalHref;
+use Sabre\DAVACL;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+use Sabre\VObject;
+use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\ITip;
+use Sabre\VObject\ITip\Message;
+use Sabre\VObject\Reader;
 
 /**
  * CalDAV scheduling plugin.
@@ -377,7 +376,7 @@ class Plugin extends ServerPlugin {
     /**
      * This method is responsible for delivering the ITip message.
      *
-     * @param ITip\Message $itipMessage
+     * @param ITip\Message $iTipMessage
      * @return void
      */
     function deliver(ITip\Message $iTipMessage) {
@@ -890,8 +889,8 @@ class Plugin extends ServerPlugin {
      *   * 3.7;description
      *
      * @param string $email address
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
+     * @param \DateTimeInterface $start
+     * @param \DateTimeInterface $end
      * @param VObject\Component $request
      * @return array
      */
@@ -1059,7 +1058,7 @@ class Plugin extends ServerPlugin {
 
         return [
             'name'        => $this->getPluginName(),
-            'description' => 'Adds calendar-auto-schedule, as defined in rf6868',
+            'description' => 'Adds calendar-auto-schedule, as defined in rfc6638',
             'link'        => 'http://sabre.io/dav/scheduling/',
         ];
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php b/vendor/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php
index 6d9d3d5ec..0cd05a965 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php
@@ -42,7 +42,7 @@ class SchedulingObject extends \Sabre\CalDAV\CalendarObject implements IScheduli
      *   * lastmodified - (optional) format as a unix timestamp.
      *   * acl - (optional) Use this to override the default ACL for the node.
      *
-     * @param Backend\BackendInterface $caldavBackend
+     * @param Backend\SchedulingSupport $caldavBackend
      * @param array $objectData
      */
     function __construct(Backend\SchedulingSupport $caldavBackend, array $objectData) {
diff --git a/vendor/sabre/dav/lib/CalDAV/SharingPlugin.php b/vendor/sabre/dav/lib/CalDAV/SharingPlugin.php
index 6f7df02bc..5cce79678 100644
--- a/vendor/sabre/dav/lib/CalDAV/SharingPlugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/SharingPlugin.php
@@ -3,7 +3,6 @@
 namespace Sabre\CalDAV;
 
 use Sabre\DAV;
-use Sabre\DAV\Xml\Property\Href;
 use Sabre\DAV\Xml\Property\LocalHref;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
@@ -29,7 +28,7 @@ class SharingPlugin extends DAV\ServerPlugin {
     /**
      * Reference to SabreDAV server object.
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Subscriptions/Plugin.php b/vendor/sabre/dav/lib/CalDAV/Subscriptions/Plugin.php
index 7abbfb1f9..877d96c6c 100644
--- a/vendor/sabre/dav/lib/CalDAV/Subscriptions/Plugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Subscriptions/Plugin.php
@@ -4,8 +4,8 @@ namespace Sabre\CalDAV\Subscriptions;
 
 use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
-use Sabre\DAV\ServerPlugin;
 use Sabre\DAV\Server;
+use Sabre\DAV\ServerPlugin;
 
 /**
  * This plugin adds calendar-subscription support to your CalDAV server.
diff --git a/vendor/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php b/vendor/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php
index 3bb3451f3..6a1851ed8 100644
--- a/vendor/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php
+++ b/vendor/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php
@@ -2,12 +2,12 @@
 
 namespace Sabre\CalDAV\Subscriptions;
 
-use Sabre\DAV\Collection;
-use Sabre\DAV\Xml\Property\Href;
-use Sabre\DAV\PropPatch;
-use Sabre\DAVACL\IACL;
-use Sabre\DAVACL\ACLTrait;
 use Sabre\CalDAV\Backend\SubscriptionSupport;
+use Sabre\DAV\Collection;
+use Sabre\DAV\PropPatch;
+use Sabre\DAV\Xml\Property\Href;
+use Sabre\DAVACL\ACLTrait;
+use Sabre\DAVACL\IACL;
 
 /**
  * Subscription Node
@@ -25,7 +25,7 @@ class Subscription extends Collection implements ISubscription, IACL {
     /**
      * caldavBackend
      *
-     * @var SupportsSubscriptions
+     * @var SubscriptionSupport
      */
     protected $caldavBackend;
 
@@ -40,7 +40,7 @@ class Subscription extends Collection implements ISubscription, IACL {
      * Constructor
      *
      * @param SubscriptionSupport $caldavBackend
-     * @param array $calendarInfo
+     * @param array $subscriptionInfo
      */
     function __construct(SubscriptionSupport $caldavBackend, array $subscriptionInfo) {
 
@@ -104,7 +104,7 @@ class Subscription extends Collection implements ISubscription, IACL {
     /**
      * Returns an array with all the child nodes
      *
-     * @return DAV\INode[]
+     * @return \Sabre\DAV\INode[]
      */
     function getChildren() {
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/CalendarData.php b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/CalendarData.php
index 9babcf15c..9669be304 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/CalendarData.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/CalendarData.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Filter;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\VObject\DateTimeParser;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CalDAV\Plugin;
-use Sabre\VObject\DateTimeParser;
 
 /**
  * CalendarData parser.
@@ -30,7 +30,7 @@ class CalendarData implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/CompFilter.php b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/CompFilter.php
index c9b27dbfd..c21ede66b 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/CompFilter.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/CompFilter.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Filter;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\VObject\DateTimeParser;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CalDAV\Plugin;
-use Sabre\VObject\DateTimeParser;
 
 /**
  * CompFilter parser.
@@ -27,7 +27,7 @@ class CompFilter implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php
index eb7f564df..bf422cf05 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\CalDAV\Xml\Filter;
 
+use Sabre\CalDAV\Plugin;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\CalDAV\Plugin;
 
 /**
  * PropFilter parser.
@@ -25,7 +25,7 @@ class ParamFilter implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php
index 4c2e1b172..db9207295 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Filter;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\VObject\DateTimeParser;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CalDAV\Plugin;
-use Sabre\VObject\DateTimeParser;
 
 /**
  * PropFilter parser.
@@ -27,7 +27,7 @@ class PropFilter implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
index 1ca64f3e8..92a9ac7b7 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Notification;
 
-use Sabre\Xml\Writer;
-use Sabre\CalDAV\SharingPlugin as SharingPlugin;
 use Sabre\CalDAV;
+use Sabre\CalDAV\SharingPlugin as SharingPlugin;
 use Sabre\DAV;
+use Sabre\Xml\Writer;
 
 /**
  * This class represents the cs:invite-notification notification element.
@@ -107,7 +107,7 @@ class Invite implements NotificationInterface {
     /**
      * The list of supported components
      *
-     * @var Sabre\CalDAV\Property\SupportedCalendarComponentSet
+     * @var CalDAV\Xml\Property\SupportedCalendarComponentSet
      */
     protected $supportedComponents;
 
@@ -166,12 +166,12 @@ class Invite implements NotificationInterface {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
index 51bfc178a..f4b10a396 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Notification;
 
-use Sabre\Xml\Writer;
 use Sabre\CalDAV;
 use Sabre\CalDAV\SharingPlugin;
 use Sabre\DAV;
+use Sabre\Xml\Writer;
 
 /**
  * This class represents the cs:invite-reply notification element.
@@ -117,12 +117,12 @@ class InviteReply implements NotificationInterface {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/NotificationInterface.php b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/NotificationInterface.php
index 1c08f12fd..b98f9c888 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/NotificationInterface.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/NotificationInterface.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Xml\Notification;
 
-use Sabre\Xml\XmlSerializable;
 use Sabre\Xml\Writer;
+use Sabre\Xml\XmlSerializable;
 
 /**
  * This interface reflects a single notification type.
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/SystemStatus.php b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/SystemStatus.php
index d41702e07..8c945dd68 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/SystemStatus.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/SystemStatus.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Xml\Notification;
 
-use Sabre\Xml\Writer;
 use Sabre\CalDAV\Plugin;
+use Sabre\Xml\Writer;
 
 /**
  * SystemStatus notification
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/AllowedSharingModes.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/AllowedSharingModes.php
index c2a2d565e..54e5a116a 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/AllowedSharingModes.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/AllowedSharingModes.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
-use Sabre\Xml\XmlSerializable;
-use Sabre\Xml\Writer;
 use Sabre\CalDAV\Plugin;
+use Sabre\Xml\Writer;
+use Sabre\Xml\XmlSerializable;
 
 /**
  * AllowedSharingModes
@@ -53,12 +53,12 @@ class AllowedSharingModes implements XmlSerializable {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/EmailAddressSet.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/EmailAddressSet.php
index f577a9919..fc6f1d505 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/EmailAddressSet.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/EmailAddressSet.php
@@ -49,12 +49,12 @@ class EmailAddressSet implements XmlSerializable {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
index 40ff6b936..4f33c464c 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
@@ -2,10 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
-use Sabre\Xml\XmlSerializable;
-use Sabre\Xml\Writer;
 use Sabre\CalDAV\Plugin;
 use Sabre\DAV;
+use Sabre\DAV\Xml\Element\Sharee;
+use Sabre\Xml\Writer;
+use Sabre\Xml\XmlSerializable;
 
 /**
  * Invite property
@@ -51,12 +52,12 @@ class Invite implements XmlSerializable {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -75,7 +76,7 @@ class Invite implements XmlSerializable {
 
         foreach ($this->sharees as $sharee) {
 
-            if ($sharee->access === \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER) {
+            if ($sharee->access === DAV\Sharing\Plugin::ACCESS_SHAREDOWNER) {
                 $writer->startElement($cs . 'organizer');
             } else {
                 $writer->startElement($cs . 'user');
@@ -109,7 +110,7 @@ class Invite implements XmlSerializable {
 
             }
 
-            $href = new \Sabre\DAV\Xml\Property\Href($sharee->href);
+            $href = new DAV\Xml\Property\Href($sharee->href);
             $href->xmlSerialize($writer);
 
             if (isset($sharee->properties['{DAV:}displayname'])) {
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php
index a82b8eff7..10c20be55 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\Xml\Deserializer;
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
-use Sabre\Xml\Deserializer;
 use Sabre\Xml\Writer;
-use Sabre\CalDAV\Plugin;
 
 /**
  * schedule-calendar-transp property.
@@ -62,12 +62,12 @@ class ScheduleCalendarTransp implements Element {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -96,7 +96,7 @@ class ScheduleCalendarTransp implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php
index 7a26e767e..7fc25c5f0 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
+use Sabre\CalDAV\Plugin;
 use Sabre\Xml\Element;
 use Sabre\Xml\ParseException;
 use Sabre\Xml\Reader;
 use Sabre\Xml\Writer;
-use Sabre\CalDAV\Plugin;
 
 /**
  * SupportedCalendarComponentSet property.
@@ -55,12 +55,12 @@ class SupportedCalendarComponentSet implements Element {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -88,7 +88,7 @@ class SupportedCalendarComponentSet implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarData.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarData.php
index b0c407fd6..d123ba4c0 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarData.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarData.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
-use Sabre\Xml\XmlSerializable;
-use Sabre\Xml\Writer;
 use Sabre\CalDAV\Plugin;
+use Sabre\Xml\Writer;
+use Sabre\Xml\XmlSerializable;
 
 /**
  * Supported-calendar-data property
@@ -23,12 +23,12 @@ use Sabre\CalDAV\Plugin;
 class SupportedCalendarData implements XmlSerializable {
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCollationSet.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCollationSet.php
index 71de25a62..af10860d0 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCollationSet.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/SupportedCollationSet.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
+use Sabre\CalDAV\Plugin;
 use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
-use Sabre\CalDAV\Plugin;
 
 /**
  * supported-collation-set property
@@ -22,12 +22,12 @@ use Sabre\CalDAV\Plugin;
 class SupportedCollationSet implements XmlSerializable {
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/CalendarMultiGetReport.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/CalendarMultiGetReport.php
index 79b3bb3ac..6d3c5d508 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/CalendarMultiGetReport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/CalendarMultiGetReport.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
-use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Reader;
 use Sabre\CalDAV\Plugin;
 use Sabre\Uri;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * CalendarMultiGetReport request parser.
@@ -64,7 +64,7 @@ class CalendarMultiGetReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/CalendarQueryReport.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/CalendarQueryReport.php
index 848a4dc46..e0b1c7950 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/CalendarQueryReport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/CalendarQueryReport.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
-use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Reader;
-use Sabre\DAV\Exception\BadRequest;
 use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * CalendarQueryReport request parser.
@@ -64,7 +64,7 @@ class CalendarQueryReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/FreeBusyQueryReport.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/FreeBusyQueryReport.php
index e3b27d08e..0f6c1e074 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/FreeBusyQueryReport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/FreeBusyQueryReport.php
@@ -38,7 +38,7 @@ class FreeBusyQueryReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
index 2ecf6c2bb..db32cc6a5 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
@@ -6,9 +6,9 @@ use Sabre\CalDAV\Plugin;
 use Sabre\CalDAV\SharingPlugin;
 use Sabre\DAV;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\Xml\Element\KeyValue;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Element\KeyValue;
 
 /**
  * Invite-reply POST request parser
@@ -82,7 +82,7 @@ class InviteReply implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/MkCalendar.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/MkCalendar.php
index 7b745db55..ce7fafde9 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/MkCalendar.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/MkCalendar.php
@@ -39,7 +39,7 @@ class MkCalendar implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
@@ -62,8 +62,8 @@ class MkCalendar implements XmlDeserializable {
         $self = new self();
 
         $elementMap = $reader->elementMap;
-        $elementMap['{DAV:}prop']   = 'Sabre\DAV\Xml\Element\Prop';
-        $elementMap['{DAV:}set']    = 'Sabre\Xml\Element\KeyValue';
+        $elementMap['{DAV:}prop'] = 'Sabre\DAV\Xml\Element\Prop';
+        $elementMap['{DAV:}set'] = 'Sabre\Xml\Element\KeyValue';
         $elems = $reader->parseInnerTree($elementMap);
 
         foreach ($elems as $elem) {
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
index b5d9a133c..e0bd8e0af 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
@@ -41,7 +41,7 @@ class Share implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBook.php b/vendor/sabre/dav/lib/CardDAV/AddressBook.php
index 6dd098618..c9d28a091 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBook.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBook.php
@@ -60,7 +60,7 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
      * Returns a card
      *
      * @param string $name
-     * @return \ICard
+     * @return Card
      */
     function getChild($name) {
 
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php b/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
index 888a44a40..d770c0ffe 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
@@ -127,7 +127,7 @@ class AddressBookHome extends DAV\Collection implements DAV\IExtendedCollection,
      *
      * @param string $name
      * @todo needs optimizing
-     * @return \AddressBook
+     * @return AddressBook
      */
     function getChild($name) {
 
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBookRoot.php b/vendor/sabre/dav/lib/CardDAV/AddressBookRoot.php
index 4a33df4ec..a9f1183da 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBookRoot.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBookRoot.php
@@ -18,7 +18,7 @@ class AddressBookRoot extends DAVACL\AbstractPrincipalCollection {
     /**
      * Principal Backend
      *
-     * @var Sabre\DAVACL\PrincipalBackend\BackendInteface
+     * @var DAVACL\PrincipalBackend\BackendInterface
      */
     protected $principalBackend;
 
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php b/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
index 54e42b899..18c0c0a99 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
@@ -46,7 +46,7 @@ interface BackendInterface {
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param string $addressBookId
      * @param \Sabre\DAV\PropPatch $propPatch
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php b/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
index 7c3feff93..13487e9da 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
@@ -93,7 +93,7 @@ class PDO extends AbstractBackend implements SyncSupport {
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param string $addressBookId
      * @param \Sabre\DAV\PropPatch $propPatch
@@ -240,7 +240,7 @@ class PDO extends AbstractBackend implements SyncSupport {
     }
 
     /**
-     * Returns a specfic card.
+     * Returns a specific card.
      *
      * The same set of properties must be returned as with getCards. The only
      * exception is that 'carddata' is absolutely required.
@@ -466,7 +466,7 @@ class PDO extends AbstractBackend implements SyncSupport {
 
         // Current synctoken
         $stmt = $this->pdo->prepare('SELECT synctoken FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
-        $stmt->execute([ $addressBookId ]);
+        $stmt->execute([$addressBookId]);
         $currentToken = $stmt->fetchColumn(0);
 
         if (is_null($currentToken)) return null;
diff --git a/vendor/sabre/dav/lib/CardDAV/Card.php b/vendor/sabre/dav/lib/CardDAV/Card.php
index 0a040be6b..42a2d7b6a 100644
--- a/vendor/sabre/dav/lib/CardDAV/Card.php
+++ b/vendor/sabre/dav/lib/CardDAV/Card.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CardDAV;
 
-use Sabre\DAVACL;
 use Sabre\DAV;
+use Sabre\DAVACL;
 
 /**
  * The Card object represents a single Card from an addressbook
diff --git a/vendor/sabre/dav/lib/CardDAV/Plugin.php b/vendor/sabre/dav/lib/CardDAV/Plugin.php
index 0507df100..272ae71fa 100644
--- a/vendor/sabre/dav/lib/CardDAV/Plugin.php
+++ b/vendor/sabre/dav/lib/CardDAV/Plugin.php
@@ -43,7 +43,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Server class
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
@@ -490,7 +490,8 @@ class Plugin extends DAV\ServerPlugin {
 
                 $props[200]['{' . self::NS_CARDDAV . '}address-data'] = $this->convertVCard(
                     $props[200]['{' . self::NS_CARDDAV . '}address-data'],
-                    $vcardType
+                    $vcardType,
+                    $report->addressDataProperties
                 );
 
             }
@@ -845,14 +846,26 @@ class Plugin extends DAV\ServerPlugin {
      *
      * @param string|resource $data
      * @param string $target
+     * @param array $propertiesFilter
      * @return string
      */
-    protected function convertVCard($data, $target) {
+    protected function convertVCard($data, $target, array $propertiesFilter = null) {
 
         if (is_resource($data)) {
             $data = stream_get_contents($data);
         }
         $input = VObject\Reader::read($data);
+        if (!empty($propertiesFilter)) {
+            $propertiesFilter = array_merge(['UID', 'VERSION', 'FN'], $propertiesFilter);
+            $keys = array_unique(array_map(function($child) {
+                return $child->name;
+            }, $input->children()));
+            $keys = array_diff($keys, $propertiesFilter);
+            foreach ($keys as $key) {
+                unset($input->$key);
+            }
+            $data = $input->serialize();
+        }
         $output = null;
         try {
 
diff --git a/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php b/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
index d015589ad..2d61db6ac 100644
--- a/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
+++ b/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
@@ -3,9 +3,9 @@
 namespace Sabre\CardDAV;
 
 use Sabre\DAV;
-use Sabre\VObject;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
+use Sabre\VObject;
 
 /**
  * VCF Exporter
@@ -24,7 +24,7 @@ class VCFExportPlugin extends DAV\ServerPlugin {
     /**
      * Reference to Server class
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
index 34028db85..a130cd61d 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
@@ -26,7 +26,7 @@ class AddressData implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
@@ -51,7 +51,11 @@ class AddressData implements XmlDeserializable {
             'version'     => $reader->getAttribute('version') ?: '3.0',
         ];
 
-        $reader->next();
+        $elems = (array)$reader->parseInnerTree();
+        $result['addressDataProperties'] = array_map(function($element) {
+            return $element['attributes']['name'];
+        }, $elems);
+
         return $result;
 
     }
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php
index 9646ae3e6..936e26917 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\CardDAV\Xml\Filter;
 
+use Sabre\CardDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CardDAV\Plugin;
 
 /**
  * ParamFilter parser.
@@ -26,7 +26,7 @@ abstract class ParamFilter implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php
index c162da160..d7799429d 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\CardDAV\Xml\Filter;
 
+use Sabre\CardDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CardDAV\Plugin;
 
 /**
  * PropFilter parser.
@@ -26,7 +26,7 @@ class PropFilter implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php b/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php
index 6ff57b6e3..aecd8a09f 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\CardDAV\Xml\Property;
 
+use Sabre\CardDAV\Plugin;
 use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
-use Sabre\CardDAV\Plugin;
 
 /**
  * Supported-address-data property
@@ -49,12 +49,12 @@ class SupportedAddressData implements XmlSerializable {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php b/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php
index 1fc064900..778aa2b64 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php
@@ -18,12 +18,12 @@ use Sabre\Xml\XmlSerializable;
 class SupportedCollationSet implements XmlSerializable {
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
index c97c5eb4f..0115a0107 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
@@ -54,7 +54,7 @@ class AddressBookMultiGetReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php
index a68ac5800..09fad008a 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\CardDAV\Xml\Request;
 
+use Sabre\CardDAV\Plugin;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CardDAV\Plugin;
 
 /**
  * AddressBookQueryReport request parser.
@@ -28,6 +28,13 @@ class AddressBookQueryReport implements XmlDeserializable {
      */
     public $properties;
 
+    /**
+     * An array with requested vcard properties.
+     *
+     * @var array
+     */
+    public $addressDataProperties = [];
+
     /**
      * List of property/component filters.
      *
@@ -92,7 +99,7 @@ class AddressBookQueryReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php b/vendor/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php
index 85c5f30d5..4b47f56c9 100644
--- a/vendor/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php
+++ b/vendor/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-use Sabre\HTTP;
 use Sabre\DAV;
+use Sabre\HTTP;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 
diff --git a/vendor/sabre/dav/lib/DAV/Auth/Backend/PDO.php b/vendor/sabre/dav/lib/DAV/Auth/Backend/PDO.php
index 76ad89391..c2f6de974 100644
--- a/vendor/sabre/dav/lib/DAV/Auth/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/DAV/Auth/Backend/PDO.php
@@ -31,7 +31,7 @@ class PDO extends AbstractDigest {
      *
      * If the filename argument is passed in, it will parse out the specified file fist.
      *
-     * @param PDO $pdo
+     * @param \PDO $pdo
      */
     function __construct(\PDO $pdo) {
 
diff --git a/vendor/sabre/dav/lib/DAV/Auth/Plugin.php b/vendor/sabre/dav/lib/DAV/Auth/Plugin.php
index 4b5f35ac3..bbb5d180d 100644
--- a/vendor/sabre/dav/lib/DAV/Auth/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Auth/Plugin.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\DAV\Auth;
 
-use Sabre\HTTP\RequestInterface;
-use Sabre\HTTP\ResponseInterface;
 use Sabre\DAV\Exception\NotAuthenticated;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 
 /**
  * This plugin provides Authentication for a WebDAV server.
@@ -181,7 +181,7 @@ class Plugin extends ServerPlugin {
      *
      * If login was not successful, the second item in the array will contain a
      * an array with strings. The strings are a list of reasons why login was
-     * unsuccesful. For every auth backend there will be one reason, so usually
+     * unsuccessful. For every auth backend there will be one reason, so usually
      * there's just one.
      *
      * @param RequestInterface $request
diff --git a/vendor/sabre/dav/lib/DAV/Browser/GuessContentType.php b/vendor/sabre/dav/lib/DAV/Browser/GuessContentType.php
index 01cddc230..3ba2aee25 100644
--- a/vendor/sabre/dav/lib/DAV/Browser/GuessContentType.php
+++ b/vendor/sabre/dav/lib/DAV/Browser/GuessContentType.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\DAV\Browser;
 
-use Sabre\HTTP\URLUtil;
 use Sabre\DAV;
-use Sabre\DAV\PropFind;
 use Sabre\DAV\Inode;
+use Sabre\DAV\PropFind;
+use Sabre\HTTP\URLUtil;
 
 /**
  * GuessContentType plugin
diff --git a/vendor/sabre/dav/lib/DAV/Browser/MapGetToPropFind.php b/vendor/sabre/dav/lib/DAV/Browser/MapGetToPropFind.php
index 38ee63bcd..61327c49a 100644
--- a/vendor/sabre/dav/lib/DAV/Browser/MapGetToPropFind.php
+++ b/vendor/sabre/dav/lib/DAV/Browser/MapGetToPropFind.php
@@ -21,7 +21,7 @@ class MapGetToPropFind extends DAV\ServerPlugin {
     /**
      * reference to server class
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
diff --git a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
index 49359a045..545ad5633 100644
--- a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
@@ -4,9 +4,9 @@ namespace Sabre\DAV\Browser;
 
 use Sabre\DAV;
 use Sabre\DAV\MkCol;
-use Sabre\HTTP\URLUtil;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
+use Sabre\HTTP\URLUtil;
 
 /**
  * Browser Plugin
@@ -26,7 +26,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * reference to server class
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
@@ -112,7 +112,7 @@ class Plugin extends DAV\ServerPlugin {
         $getVars = $request->getQueryParameters();
 
         // CSP headers
-        $this->server->httpResponse->setHeader('Content-Security-Policy', "default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';");
+        $response->setHeader('Content-Security-Policy', "default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';");
 
         $sabreAction = isset($getVars['sabreAction']) ? $getVars['sabreAction'] : null;
 
@@ -317,7 +317,7 @@ class Plugin extends DAV\ServerPlugin {
 
                 $buttonActions = '';
                 if ($subProps['subNode'] instanceof DAV\IFile) {
-                    $buttonActions =  '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
+                    $buttonActions = '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
                 }
                 $this->server->emit('browserButtonActions', [$subProps['fullPath'], $subProps['subNode'], &$buttonActions]);
 
@@ -414,11 +414,14 @@ class Plugin extends DAV\ServerPlugin {
      *
      * @param string $title
      * @param string $path
-     * @return void
+     * @return string
      */
     function generateHeader($title, $path = null) {
 
-        $version = DAV\Version::VERSION;
+        $version = '';
+        if (DAV\Server::$exposeVersion) {
+            $version = DAV\Version::VERSION;
+        }
 
         $vars = [
             'title'     => $this->escapeHTML($title),
@@ -475,7 +478,10 @@ HTML;
      */
     function generateFooter() {
 
-        $version = DAV\Version::VERSION;
+        $version = '';
+        if (DAV\Server::$exposeVersion) {
+            $version = DAV\Version::VERSION;
+        }
         return <<<HTML
 <footer>Generated by SabreDAV $version (c)2007-2016 <a href="http://sabre.io/">http://sabre.io/</a></footer>
 </body>
@@ -506,23 +512,21 @@ HTML;
         if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
             return;
 
-        ob_start();
-        echo '<form method="post" action="">
-        <h3>Create new folder</h3>
-        <input type="hidden" name="sabreAction" value="mkcol" />
-        <label>Name:</label> <input type="text" name="name" /><br />
-        <input type="submit" value="create" />
-        </form>
-        <form method="post" action="" enctype="multipart/form-data">
-        <h3>Upload file</h3>
-        <input type="hidden" name="sabreAction" value="put" />
-        <label>Name (optional):</label> <input type="text" name="name" /><br />
-        <label>File:</label> <input type="file" name="file" /><br />
-        <input type="submit" value="upload" />
-        </form>
-        ';
-
-        $output .= ob_get_clean();
+        $output .= <<<HTML
+<form method="post" action="">
+<h3>Create new folder</h3>
+<input type="hidden" name="sabreAction" value="mkcol" />
+<label>Name:</label> <input type="text" name="name" /><br />
+<input type="submit" value="create" />
+</form>
+<form method="post" action="" enctype="multipart/form-data">
+<h3>Upload file</h3>
+<input type="hidden" name="sabreAction" value="put" />
+<label>Name (optional):</label> <input type="text" name="name" /><br />
+<label>File:</label> <input type="file" name="file" /><br />
+<input type="submit" value="upload" />
+</form>
+HTML;
 
     }
 
@@ -543,8 +547,8 @@ HTML;
      * This method returns a local pathname to an asset.
      *
      * @param string $assetName
-     * @return string
      * @throws DAV\Exception\NotFound
+     * @return string
      */
     protected function getLocalAssetPath($assetName) {
 
@@ -575,9 +579,9 @@ HTML;
         // Rudimentary mime type detection
         $mime = 'application/octet-stream';
         $map = [
-            'ico'  => 'image/vnd.microsoft.icon',
-            'png'  => 'image/png',
-            'css'  => 'text/css',
+            'ico' => 'image/vnd.microsoft.icon',
+            'png' => 'image/png',
+            'css' => 'text/css',
         ];
 
         $ext = substr($assetName, strrpos($assetName, '.') + 1);
@@ -623,7 +627,7 @@ HTML;
      * Maps a resource type to a human-readable string and icon.
      *
      * @param array $resourceTypes
-     * @param INode $node
+     * @param DAV\INode $node
      * @return array
      */
     private function mapResourceType(array $resourceTypes, $node) {
diff --git a/vendor/sabre/dav/lib/DAV/Browser/PropFindAll.php b/vendor/sabre/dav/lib/DAV/Browser/PropFindAll.php
index 1ac439672..c14b7f2f9 100644
--- a/vendor/sabre/dav/lib/DAV/Browser/PropFindAll.php
+++ b/vendor/sabre/dav/lib/DAV/Browser/PropFindAll.php
@@ -28,7 +28,7 @@ class PropFindAll extends PropFind {
     /**
      * Handles a specific property.
      *
-     * This method checks wether the specified property was requested in this
+     * This method checks whether the specified property was requested in this
      * PROPFIND request, and if so, it will call the callback and use the
      * return value for it's value.
      *
diff --git a/vendor/sabre/dav/lib/DAV/Client.php b/vendor/sabre/dav/lib/DAV/Client.php
index 08d5d4702..175ad1bc4 100644
--- a/vendor/sabre/dav/lib/DAV/Client.php
+++ b/vendor/sabre/dav/lib/DAV/Client.php
@@ -231,7 +231,7 @@ class Client extends HTTP\Client {
         $response = $this->send($request);
 
         if ((int)$response->getStatus() >= 400) {
-            throw new \Sabre\HTTP\ClientHttpException($response);
+            throw new HTTP\ClientHttpException($response);
         }
 
         $result = $this->parseMultiStatus($response->getBodyAsString());
@@ -281,7 +281,7 @@ class Client extends HTTP\Client {
         $response = $this->send($request);
 
         if ($response->getStatus() >= 400) {
-            throw new \Sabre\HTTP\ClientHttpException($response);
+            throw new HTTP\ClientHttpException($response);
         }
 
         if ($response->getStatus() === 207) {
@@ -303,7 +303,7 @@ class Client extends HTTP\Client {
             }
             if ($errorProperties) {
 
-                throw new \Sabre\HTTP\ClientException('PROPPATCH failed. The following properties errored: ' . implode(', ', $errorProperties));
+                throw new HTTP\ClientException('PROPPATCH failed. The following properties errored: ' . implode(', ', $errorProperties));
             }
         }
         return true;
diff --git a/vendor/sabre/dav/lib/DAV/Collection.php b/vendor/sabre/dav/lib/DAV/Collection.php
index a46bcc342..35c90b5af 100644
--- a/vendor/sabre/dav/lib/DAV/Collection.php
+++ b/vendor/sabre/dav/lib/DAV/Collection.php
@@ -68,7 +68,7 @@ abstract class Collection extends Node implements ICollection {
      * Data will either be supplied as a stream resource, or in certain cases
      * as a string. Keep in mind that you may have to support either.
      *
-     * After succesful creation of the file, you may choose to return the ETag
+     * After successful creation of the file, you may choose to return the ETag
      * of the new file here.
      *
      * The returned ETag must be surrounded by double-quotes (The quotes should
diff --git a/vendor/sabre/dav/lib/DAV/CorePlugin.php b/vendor/sabre/dav/lib/DAV/CorePlugin.php
index a1b052915..676cdd04a 100644
--- a/vendor/sabre/dav/lib/DAV/CorePlugin.php
+++ b/vendor/sabre/dav/lib/DAV/CorePlugin.php
@@ -165,7 +165,7 @@ class CorePlugin extends ServerPlugin {
             } else {
 
                 $start = $nodeSize - $range[1];
-                $end  = $nodeSize - 1;
+                $end = $nodeSize - 1;
 
                 if ($start < 0) $start = 0;
 
@@ -194,7 +194,7 @@ class CorePlugin extends ServerPlugin {
             $response->setBody($body);
 
         }
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -224,7 +224,7 @@ class CorePlugin extends ServerPlugin {
         $response->setHeader('Content-Length', '0');
         $response->setStatus(200);
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -264,7 +264,7 @@ class CorePlugin extends ServerPlugin {
             $response->setHeader('X-Sabre-Real-Status', $e->getHTTPCode());
         }
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -290,7 +290,7 @@ class CorePlugin extends ServerPlugin {
         $response->setStatus(204);
         $response->setHeader('Content-Length', '0');
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -333,7 +333,7 @@ class CorePlugin extends ServerPlugin {
         // The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
         if (!$this->server->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
 
-        $newProperties = $this->server->getPropertiesForPath($path, $propFindXml->properties, $depth);
+        $newProperties = $this->server->getPropertiesIteratorForPath($path, $propFindXml->properties, $depth);
 
         // This is a multi-status response
         $response->setStatus(207);
@@ -355,7 +355,7 @@ class CorePlugin extends ServerPlugin {
         $data = $this->server->generateMultiStatus($newProperties, $minimal);
         $response->setBody($data);
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -390,7 +390,7 @@ class CorePlugin extends ServerPlugin {
         if ($prefer['return'] === 'minimal') {
 
             // If return-minimal is specified, we only have to check if the
-            // request was succesful, and don't need to return the
+            // request was successful, and don't need to return the
             // multi-status.
             $ok = true;
             foreach ($result as $prop => $code) {
@@ -427,7 +427,7 @@ class CorePlugin extends ServerPlugin {
             $this->server->generateMultiStatus([$multiStatus])
         );
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -533,7 +533,7 @@ class CorePlugin extends ServerPlugin {
 
         }
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -602,7 +602,7 @@ class CorePlugin extends ServerPlugin {
             $response->setStatus(201);
         }
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -653,7 +653,7 @@ class CorePlugin extends ServerPlugin {
         $response->setHeader('Content-Length', '0');
         $response->setStatus($moveInfo['destinationExists'] ? 204 : 201);
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -688,7 +688,7 @@ class CorePlugin extends ServerPlugin {
         $response->setHeader('Content-Length', '0');
         $response->setStatus($copyInfo['destinationExists'] ? 204 : 201);
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -722,7 +722,7 @@ class CorePlugin extends ServerPlugin {
 
         }
 
-        // Sending back false will interupt the event chain and tell the server
+        // Sending back false will interrupt the event chain and tell the server
         // we've handled this method.
         return false;
 
@@ -740,7 +740,7 @@ class CorePlugin extends ServerPlugin {
      */
     function propPatchProtectedPropertyCheck($path, PropPatch $propPatch) {
 
-        // Comparing the mutation list to the list of propetected properties.
+        // Comparing the mutation list to the list of protected properties.
         $mutations = $propPatch->getMutations();
 
         $protected = array_intersect(
diff --git a/vendor/sabre/dav/lib/DAV/Exception/InvalidResourceType.php b/vendor/sabre/dav/lib/DAV/Exception/InvalidResourceType.php
index 505fe5c10..6324d9f3a 100644
--- a/vendor/sabre/dav/lib/DAV/Exception/InvalidResourceType.php
+++ b/vendor/sabre/dav/lib/DAV/Exception/InvalidResourceType.php
@@ -19,7 +19,7 @@ class InvalidResourceType extends Forbidden {
     /**
      * This method allows the exception to include additional information into the WebDAV error response
      *
-     * @param DAV\Server $server
+     * @param \Sabre\DAV\Server $server
      * @param \DOMElement $errorNode
      * @return void
      */
diff --git a/vendor/sabre/dav/lib/DAV/FS/Node.php b/vendor/sabre/dav/lib/DAV/FS/Node.php
index 831c11911..424718f96 100644
--- a/vendor/sabre/dav/lib/DAV/FS/Node.php
+++ b/vendor/sabre/dav/lib/DAV/FS/Node.php
@@ -43,7 +43,7 @@ abstract class Node implements DAV\INode {
      */
     function getName() {
 
-        list(, $name)  = URLUtil::splitPath($this->path);
+        list(, $name) = URLUtil::splitPath($this->path);
         return $name;
 
     }
diff --git a/vendor/sabre/dav/lib/DAV/File.php b/vendor/sabre/dav/lib/DAV/File.php
index 675956b22..5161fbd51 100644
--- a/vendor/sabre/dav/lib/DAV/File.php
+++ b/vendor/sabre/dav/lib/DAV/File.php
@@ -19,7 +19,7 @@ abstract class File extends Node implements IFile {
      *
      * The data argument is a readable stream resource.
      *
-     * After a succesful put operation, you may choose to return an ETag. The
+     * After a successful put operation, you may choose to return an ETag. The
      * etag must always be surrounded by double-quotes. These quotes must
      * appear in the actual string you're returning.
      *
diff --git a/vendor/sabre/dav/lib/DAV/IFile.php b/vendor/sabre/dav/lib/DAV/IFile.php
index 37e7cd33c..19d8d8637 100644
--- a/vendor/sabre/dav/lib/DAV/IFile.php
+++ b/vendor/sabre/dav/lib/DAV/IFile.php
@@ -20,7 +20,7 @@ interface IFile extends INode {
      *
      * The data argument is a readable stream resource.
      *
-     * After a succesful put operation, you may choose to return an ETag. The
+     * After a successful put operation, you may choose to return an ETag. The
      * etag must always be surrounded by double-quotes. These quotes must
      * appear in the actual string you're returning.
      *
@@ -32,7 +32,7 @@ interface IFile extends INode {
      * different object on a subsequent GET you are strongly recommended to not
      * return an ETag, and just return null.
      *
-     * @param resource|data $data
+     * @param resource|string $data
      * @return string|null
      */
     function put($data);
diff --git a/vendor/sabre/dav/lib/DAV/IMoveTarget.php b/vendor/sabre/dav/lib/DAV/IMoveTarget.php
index f0f67bc26..92fde1d5c 100644
--- a/vendor/sabre/dav/lib/DAV/IMoveTarget.php
+++ b/vendor/sabre/dav/lib/DAV/IMoveTarget.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV;
  * nodes may be moved into this collection".
  *
  * The benefit of this, is that sabre/dav will by default perform a move, by
- * tranfersing an entire directory tree, copying every collection, and deleting
+ * transferring an entire directory tree, copying every collection, and deleting
  * every item.
  *
  * If a backend supports a better optimized move operation, this can trigger
diff --git a/vendor/sabre/dav/lib/DAV/Locks/Backend/PDO.php b/vendor/sabre/dav/lib/DAV/Locks/Backend/PDO.php
index a01d9bae4..510f266f7 100644
--- a/vendor/sabre/dav/lib/DAV/Locks/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/DAV/Locks/Backend/PDO.php
@@ -33,7 +33,7 @@ class PDO extends AbstractBackend {
     /**
      * Constructor
      *
-     * @param PDO $pdo
+     * @param \PDO $pdo
      */
     function __construct(\PDO $pdo) {
 
@@ -102,7 +102,7 @@ class PDO extends AbstractBackend {
             $lockInfo->created = $row['created'];
             $lockInfo->scope = $row['scope'];
             $lockInfo->depth = $row['depth'];
-            $lockInfo->uri   = $row['uri'];
+            $lockInfo->uri = $row['uri'];
             $lockList[] = $lockInfo;
 
         }
diff --git a/vendor/sabre/dav/lib/DAV/Locks/Plugin.php b/vendor/sabre/dav/lib/DAV/Locks/Plugin.php
index 4855b7076..41a3bf3fa 100644
--- a/vendor/sabre/dav/lib/DAV/Locks/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Locks/Plugin.php
@@ -25,14 +25,14 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * locksBackend
      *
-     * @var Backend\Backend\Interface
+     * @var Backend\BackendInterface
      */
     protected $locksBackend;
 
     /**
      * server
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
@@ -256,7 +256,7 @@ class Plugin extends DAV\ServerPlugin {
         $response->setStatus($newFile ? 201 : 200);
         $response->setBody($this->generateLockResponse($lockInfo));
 
-        // Returning false will interupt the event chain and mark this method
+        // Returning false will interrupt the event chain and mark this method
         // as 'handled'.
         return false;
 
diff --git a/vendor/sabre/dav/lib/DAV/MkCol.php b/vendor/sabre/dav/lib/DAV/MkCol.php
index c79055418..042e14bca 100644
--- a/vendor/sabre/dav/lib/DAV/MkCol.php
+++ b/vendor/sabre/dav/lib/DAV/MkCol.php
@@ -61,6 +61,7 @@ class MkCol extends PropPatch {
      * checked.
      *
      * @param string|string[] $resourceType
+     * @return bool
      */
     function hasResourceType($resourceType) {
 
diff --git a/vendor/sabre/dav/lib/DAV/Mount/Plugin.php b/vendor/sabre/dav/lib/DAV/Mount/Plugin.php
index 8e06acb9f..dc923ad85 100644
--- a/vendor/sabre/dav/lib/DAV/Mount/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Mount/Plugin.php
@@ -20,7 +20,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Reference to Server class
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
diff --git a/vendor/sabre/dav/lib/DAV/Node.php b/vendor/sabre/dav/lib/DAV/Node.php
index ba270e8f9..ef6eea18e 100644
--- a/vendor/sabre/dav/lib/DAV/Node.php
+++ b/vendor/sabre/dav/lib/DAV/Node.php
@@ -29,7 +29,7 @@ abstract class Node implements INode {
     /**
      * Deletes the current node
      *
-     * @throws Sabre\DAV\Exception\Forbidden
+     * @throws Exception\Forbidden
      * @return void
      */
     function delete() {
@@ -41,8 +41,8 @@ abstract class Node implements INode {
     /**
      * Renames the node
      *
-     * @throws Sabre\DAV\Exception\Forbidden
      * @param string $name The new name
+     * @throws Exception\Forbidden
      * @return void
      */
     function setName($name) {
diff --git a/vendor/sabre/dav/lib/DAV/PartialUpdate/Plugin.php b/vendor/sabre/dav/lib/DAV/PartialUpdate/Plugin.php
index 24ba970b1..9c129d705 100644
--- a/vendor/sabre/dav/lib/DAV/PartialUpdate/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/PartialUpdate/Plugin.php
@@ -29,7 +29,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Reference to server
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
diff --git a/vendor/sabre/dav/lib/DAV/PropFind.php b/vendor/sabre/dav/lib/DAV/PropFind.php
index 8ae6b6cfd..0940a1ce2 100644
--- a/vendor/sabre/dav/lib/DAV/PropFind.php
+++ b/vendor/sabre/dav/lib/DAV/PropFind.php
@@ -72,7 +72,7 @@ class PropFind {
     /**
      * Handles a specific property.
      *
-     * This method checks wether the specified property was requested in this
+     * This method checks whether the specified property was requested in this
      * PROPFIND request, and if so, it will call the callback and use the
      * return value for it's value.
      *
diff --git a/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/BackendInterface.php b/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/BackendInterface.php
index 31ecafdb2..b15d7fef9 100644
--- a/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/BackendInterface.php
@@ -23,7 +23,7 @@ interface BackendInterface {
      * This method received a PropFind object, which contains all the
      * information about the properties that need to be fetched.
      *
-     * Ususually you would just want to call 'get404Properties' on this object,
+     * Usually you would just want to call 'get404Properties' on this object,
      * as this will give you the _exact_ list of properties that need to be
      * fetched, and haven't yet.
      *
diff --git a/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php b/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php
index 2fe843884..6f3f1feaf 100644
--- a/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php
@@ -66,7 +66,7 @@ class PDO implements BackendInterface {
      * This method received a PropFind object, which contains all the
      * information about the properties that need to be fetched.
      *
-     * Ususually you would just want to call 'get404Properties' on this object,
+     * Usually you would just want to call 'get404Properties' on this object,
      * as this will give you the _exact_ list of properties that need to be
      * fetched, and haven't yet.
      *
diff --git a/vendor/sabre/dav/lib/DAV/PropertyStorage/Plugin.php b/vendor/sabre/dav/lib/DAV/PropertyStorage/Plugin.php
index 0c28b7882..a66a14113 100644
--- a/vendor/sabre/dav/lib/DAV/PropertyStorage/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/PropertyStorage/Plugin.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\DAV\PropertyStorage;
 
+use Sabre\DAV\INode;
+use Sabre\DAV\PropFind;
+use Sabre\DAV\PropPatch;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
-use Sabre\DAV\PropPatch;
-use Sabre\DAV\PropFind;
-use Sabre\DAV\INode;
 
 /**
  * PropertyStorage Plugin.
@@ -30,13 +30,18 @@ class Plugin extends ServerPlugin {
      * paths, you can use a pathFilter to do this.
      *
      * The pathFilter should be a callable. The callable retrieves a path as
-     * its argument, and should return true or false wether it allows
+     * its argument, and should return true or false whether it allows
      * properties to be stored.
      *
      * @var callable
      */
     public $pathFilter;
 
+    /**
+     * @var Backend\BackendInterface
+     */
+    public $backend;
+
     /**
      * Creates the plugin
      *
diff --git a/vendor/sabre/dav/lib/DAV/Server.php b/vendor/sabre/dav/lib/DAV/Server.php
index 024b7a557..6805ec0b0 100644
--- a/vendor/sabre/dav/lib/DAV/Server.php
+++ b/vendor/sabre/dav/lib/DAV/Server.php
@@ -2,16 +2,16 @@
 
 namespace Sabre\DAV;
 
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Sabre\Event\EventEmitter;
 use Sabre\HTTP;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 use Sabre\HTTP\URLUtil;
 use Sabre\Uri;
-use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
-use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
 
 /**
  * Main DAV server class
@@ -37,7 +37,7 @@ class Server extends EventEmitter implements LoggerAwareInterface {
     /**
      * The tree object
      *
-     * @var Sabre\DAV\Tree
+     * @var Tree
      */
     public $tree;
 
@@ -51,21 +51,21 @@ class Server extends EventEmitter implements LoggerAwareInterface {
     /**
      * httpResponse
      *
-     * @var Sabre\HTTP\Response
+     * @var HTTP\Response
      */
     public $httpResponse;
 
     /**
      * httpRequest
      *
-     * @var Sabre\HTTP\Request
+     * @var HTTP\Request
      */
     public $httpRequest;
 
     /**
      * PHP HTTP Sapi
      *
-     * @var Sabre\HTTP\Sapi
+     * @var HTTP\Sapi
      */
     public $sapi;
 
@@ -437,7 +437,7 @@ class Server extends EventEmitter implements LoggerAwareInterface {
     }
 
     /**
-     * Returns the PSR-3 logger objcet.
+     * Returns the PSR-3 logger object.
      *
      * @return LoggerInterface
      */
@@ -455,7 +455,7 @@ class Server extends EventEmitter implements LoggerAwareInterface {
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
-     * @param $sendResponse Whether to send the HTTP response to the DAV client.
+     * @param bool $sendResponse Whether to send the HTTP response to the DAV client.
      * @return void
      */
     function invokeMethod(RequestInterface $request, ResponseInterface $response, $sendResponse = true) {
@@ -681,18 +681,18 @@ class Server extends EventEmitter implements LoggerAwareInterface {
             // can be true or false
             'respond-async' => false,
             // Could be set to 'representation' or 'minimal'.
-            'return'        => null,
+            'return' => null,
             // Used as a timeout, is usually a number.
-            'wait'          => null,
+            'wait' => null,
             // can be 'strict' or 'lenient'.
-            'handling'      => false,
+            'handling' => false,
         ];
 
         if ($prefer = $this->httpRequest->getHeader('Prefer')) {
 
             $result = array_merge(
                 $result,
-                \Sabre\HTTP\parsePrefer($prefer)
+                HTTP\parsePrefer($prefer)
             );
 
         } elseif ($this->httpRequest->getHeader('Brief') == 't') {
@@ -794,6 +794,7 @@ class Server extends EventEmitter implements LoggerAwareInterface {
      *
      * @param string $path
      * @param array $propertyNames
+     * @return array
      */
     function getProperties($path, $propertyNames) {
 
@@ -877,12 +878,14 @@ class Server extends EventEmitter implements LoggerAwareInterface {
     /**
      * Small helper to support PROPFIND with DEPTH_INFINITY.
      *
-     * @param array[] $propFindRequests
      * @param PropFind $propFind
-     * @return void
+     * @param array $yieldFirst
+     * @return \Iterator
      */
-    private function addPathNodesRecursively(&$propFindRequests, PropFind $propFind) {
-
+    private function generatePathNodes(PropFind $propFind, array $yieldFirst = null) {
+        if ($yieldFirst !== null) {
+            yield $yieldFirst;
+        }
         $newDepth = $propFind->getDepth();
         $path = $propFind->getPath();
 
@@ -900,13 +903,15 @@ class Server extends EventEmitter implements LoggerAwareInterface {
             }
             $subPropFind->setPath($subPath);
 
-            $propFindRequests[] = [
+            yield [
                 $subPropFind,
                 $childNode
             ];
 
             if (($newDepth === self::DEPTH_INFINITY || $newDepth >= 1) && $childNode instanceof ICollection) {
-                $this->addPathNodesRecursively($propFindRequests, $subPropFind);
+                foreach ($this->generatePathNodes($subPropFind) as $subItem) {
+                    yield $subItem;
+                }
             }
 
         }
@@ -925,9 +930,31 @@ class Server extends EventEmitter implements LoggerAwareInterface {
      * @param array $propertyNames
      * @param int $depth
      * @return array
+     *
+     * @deprecated Use getPropertiesIteratorForPath() instead (as it's more memory efficient)
+     * @see getPropertiesIteratorForPath()
      */
     function getPropertiesForPath($path, $propertyNames = [], $depth = 0) {
 
+        return iterator_to_array($this->getPropertiesIteratorForPath($path, $propertyNames, $depth));
+
+    }
+    /**
+     * Returns a list of properties for a given path
+     *
+     * The path that should be supplied should have the baseUrl stripped out
+     * The list of properties should be supplied in Clark notation. If the list is empty
+     * 'allprops' is assumed.
+     *
+     * If a depth of 1 is requested child elements will also be returned.
+     *
+     * @param string $path
+     * @param array $propertyNames
+     * @param int $depth
+     * @return \Iterator
+     */
+    function getPropertiesIteratorForPath($path, $propertyNames = [], $depth = 0) {
+
         // The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
         if (!$this->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
 
@@ -944,11 +971,9 @@ class Server extends EventEmitter implements LoggerAwareInterface {
         ]];
 
         if (($depth > 0 || $depth === self::DEPTH_INFINITY) && $parentNode instanceof ICollection) {
-            $this->addPathNodesRecursively($propFindRequests, $propFind);
+            $propFindRequests = $this->generatePathNodes(clone $propFind, current($propFindRequests));
         }
 
-        $returnPropertyList = [];
-
         foreach ($propFindRequests as $propFindRequest) {
 
             list($propFind, $node) = $propFindRequest;
@@ -965,13 +990,11 @@ class Server extends EventEmitter implements LoggerAwareInterface {
                 if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
                     $result['href'] .= '/';
                 }
-                $returnPropertyList[] = $result;
+                yield $result;
             }
 
         }
 
-        return $returnPropertyList;
-
     }
 
     /**
@@ -1430,7 +1453,7 @@ class Server extends EventEmitter implements LoggerAwareInterface {
         // Plugins are responsible for validating all the tokens.
         // If a plugin deemed a token 'valid', it will set 'validToken' to
         // true.
-        $this->emit('validateTokens', [ $request, &$ifConditions ]);
+        $this->emit('validateTokens', [$request, &$ifConditions]);
 
         // Now we're going to analyze the result.
 
@@ -1450,7 +1473,7 @@ class Server extends EventEmitter implements LoggerAwareInterface {
                 if (!$token['etag']) {
                     $etagValid = true;
                 }
-                // Checking the ETag, only if the token was already deamed
+                // Checking the ETag, only if the token was already deemed
                 // valid and there is one.
                 if ($token['etag'] && $tokenValid) {
 
@@ -1626,13 +1649,18 @@ class Server extends EventEmitter implements LoggerAwareInterface {
      *
      * If 'strip404s' is set to true, all 404 responses will be removed.
      *
-     * @param array $fileProperties The list with nodes
-     * @param bool strip404s
+     * @param array|\Traversable $fileProperties The list with nodes
+     * @param bool $strip404s
      * @return string
      */
-    function generateMultiStatus(array $fileProperties, $strip404s = false) {
+    function generateMultiStatus($fileProperties, $strip404s = false) {
 
-        $xml = [];
+        $w = $this->xml->getWriter();
+        $w->openMemory();
+        $w->contextUri = $this->baseUri;
+        $w->startDocument();
+
+        $w->startElement('{DAV:}multistatus');
 
         foreach ($fileProperties as $entry) {
 
@@ -1645,13 +1673,14 @@ class Server extends EventEmitter implements LoggerAwareInterface {
                 ltrim($href, '/'),
                 $entry
             );
-            $xml[] = [
+            $w->write([
                 'name'  => '{DAV:}response',
                 'value' => $response
-            ];
-
+            ]);
         }
-        return $this->xml->write('{DAV:}multistatus', $xml, $this->baseUri);
+        $w->endElement();
+
+        return $w->outputMemory();
 
     }
 
diff --git a/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php b/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php
index 354d06a56..ef5702c57 100644
--- a/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php
@@ -8,8 +8,8 @@ use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
-use Sabre\DAV\Xml\Property;
 use Sabre\DAV\Xml\Element\Sharee;
+use Sabre\DAV\Xml\Property;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 
@@ -40,7 +40,7 @@ class Plugin extends ServerPlugin {
     /**
      * Reference to SabreDAV server object.
      *
-     * @var Sabre\DAV\Server
+     * @var Server
      */
     protected $server;
 
diff --git a/vendor/sabre/dav/lib/DAV/Sync/Plugin.php b/vendor/sabre/dav/lib/DAV/Sync/Plugin.php
index 4a141c72b..8e4b1aa64 100644
--- a/vendor/sabre/dav/lib/DAV/Sync/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Sync/Plugin.php
@@ -3,8 +3,8 @@
 namespace Sabre\DAV\Sync;
 
 use Sabre\DAV;
-use Sabre\HTTP\RequestInterface;
 use Sabre\DAV\Xml\Request\SyncCollectionReport;
+use Sabre\HTTP\RequestInterface;
 
 /**
  * This plugin all WebDAV-sync capabilities to the Server.
diff --git a/vendor/sabre/dav/lib/DAV/TemporaryFileFilterPlugin.php b/vendor/sabre/dav/lib/DAV/TemporaryFileFilterPlugin.php
index c5b8aa1ca..7b453d105 100644
--- a/vendor/sabre/dav/lib/DAV/TemporaryFileFilterPlugin.php
+++ b/vendor/sabre/dav/lib/DAV/TemporaryFileFilterPlugin.php
@@ -14,7 +14,7 @@ use Sabre\HTTP\URLUtil;
  * a WebDAV share as a disk.
  *
  * It will intercept these files and place them in a separate directory.
- * these files are not deleted automatically, so it is adviceable to
+ * these files are not deleted automatically, so it is advisable to
  * delete these after they are not accessed for 24 hours.
  *
  * Currently it supports:
@@ -51,7 +51,7 @@ class TemporaryFileFilterPlugin extends ServerPlugin {
     /**
      * A reference to the main Server class
      *
-     * @var Sabre\DAV\Server
+     * @var \Sabre\DAV\Server
      */
     protected $server;
 
@@ -134,12 +134,12 @@ class TemporaryFileFilterPlugin extends ServerPlugin {
      *
      * @param string $uri
      * @param resource $data
-     * @param DAV\ICollection $parentNode
+     * @param ICollection $parent
      * @param bool $modified Should be set to true, if this event handler
      *                       changed &$data.
      * @return bool
      */
-    function beforeCreateFile($uri, $data, $parent, $modified) {
+    function beforeCreateFile($uri, $data, ICollection $parent, $modified) {
 
         if ($tempPath = $this->isTempFile($uri)) {
 
diff --git a/vendor/sabre/dav/lib/DAV/Version.php b/vendor/sabre/dav/lib/DAV/Version.php
index 2fda85db8..89918e5bc 100644
--- a/vendor/sabre/dav/lib/DAV/Version.php
+++ b/vendor/sabre/dav/lib/DAV/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '3.2.0';
+    const VERSION = '3.2.2';
 
 }
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Element/Prop.php b/vendor/sabre/dav/lib/DAV/Xml/Element/Prop.php
index db5332c50..71ef03e3f 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Element/Prop.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Element/Prop.php
@@ -3,8 +3,8 @@
 namespace Sabre\DAV\Xml\Element;
 
 use Sabre\DAV\Xml\Property\Complex;
-use Sabre\Xml\XmlDeserializable;
 use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * This class is responsible for decoding the {DAV:}prop element as it appears
@@ -22,7 +22,7 @@ class Prop implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
@@ -90,7 +90,7 @@ class Prop implements XmlDeserializable {
         if (array_key_exists($name, $reader->elementMap)) {
             $deserializer = $reader->elementMap[$name];
             if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
-                $value = call_user_func([ $deserializer, 'xmlDeserialize' ], $reader);
+                $value = call_user_func([$deserializer, 'xmlDeserialize'], $reader);
             } elseif (is_callable($deserializer)) {
                 $value = call_user_func($deserializer, $reader);
             } else {
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Element/Response.php b/vendor/sabre/dav/lib/DAV/Xml/Element/Response.php
index 97a2bb59f..ce97ae943 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Element/Response.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Element/Response.php
@@ -160,7 +160,7 @@ class Response implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Element/Sharee.php b/vendor/sabre/dav/lib/DAV/Xml/Element/Sharee.php
index dcfd7bd2e..e187bf11c 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Element/Sharee.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Element/Sharee.php
@@ -105,7 +105,7 @@ class Sharee implements Element {
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -146,7 +146,7 @@ class Sharee implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/Complex.php b/vendor/sabre/dav/lib/DAV/Xml/Property/Complex.php
index 1d9202082..258806e4a 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/Complex.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/Complex.php
@@ -20,7 +20,7 @@ class Complex extends XmlFragment {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/GetLastModified.php b/vendor/sabre/dav/lib/DAV/Xml/Property/GetLastModified.php
index 2db47269f..101a0f0c9 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/GetLastModified.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/GetLastModified.php
@@ -2,12 +2,12 @@
 
 namespace Sabre\DAV\Xml\Property;
 
+use DateTime;
+use DateTimeZone;
+use Sabre\HTTP;
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
 use Sabre\Xml\Writer;
-use Sabre\HTTP;
-use DateTime;
-use DateTimeZone;
 
 /**
  * This property represents the {DAV:}getlastmodified property.
@@ -83,7 +83,7 @@ class GetLastModified implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php b/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
index 0027f72e1..6c4f11b87 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
@@ -4,10 +4,10 @@ namespace Sabre\DAV\Xml\Property;
 
 use Sabre\DAV\Browser\HtmlOutput;
 use Sabre\DAV\Browser\HtmlOutputHelper;
+use Sabre\Uri;
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
 use Sabre\Xml\Writer;
-use Sabre\Uri;
 
 /**
  * Href property
@@ -40,7 +40,7 @@ class Href implements Element, HtmlOutput {
      * If auto-prefix is set to false, the hrefs will be treated as absolute
      * and not relative to the servers base uri.
      *
-     * @param string|string[] $href
+     * @param string|string[] $hrefs
      */
     function __construct($hrefs) {
 
@@ -74,12 +74,12 @@ class Href implements Element, HtmlOutput {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -128,7 +128,7 @@ class Href implements Element, HtmlOutput {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/Invite.php b/vendor/sabre/dav/lib/DAV/Xml/Property/Invite.php
index 0616ff113..6adad3650 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/Invite.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/Invite.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\DAV\Xml\Property;
 
-use Sabre\DAV\Sharing\Sharee;
-use Sabre\Xml\XmlSerializable;
+use Sabre\DAV\Xml\Element\Sharee;
 use Sabre\Xml\Writer;
+use Sabre\Xml\XmlSerializable;
 
 /**
  * This class represents the {DAV:}invite property.
@@ -46,7 +46,7 @@ class Invite implements XmlSerializable {
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/LocalHref.php b/vendor/sabre/dav/lib/DAV/Xml/Property/LocalHref.php
index 76a27b95d..00d2fa708 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/LocalHref.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/LocalHref.php
@@ -8,7 +8,7 @@ use Sabre\HTTP;
  * LocalHref property
  *
  * Like the Href property, this element represents {DAV:}href. The difference
- * is that this is used stricly for paths on the server. The LocalHref property
+ * is that this is used strictly for paths on the server. The LocalHref property
  * will prepare the path so it's a valid URI.
  *
  * These two objects behave identically:
@@ -32,7 +32,7 @@ class LocalHref extends Href {
      * If auto-prefix is set to false, the hrefs will be treated as absolute
      * and not relative to the servers base uri.
      *
-     * @param string|string[] $href
+     * @param string|string[] $hrefs
      */
     function __construct($hrefs) {
 
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/ResourceType.php b/vendor/sabre/dav/lib/DAV/Xml/Property/ResourceType.php
index 302888321..ce640ff32 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/ResourceType.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/ResourceType.php
@@ -28,7 +28,7 @@ class ResourceType extends Element\Elements implements HtmlOutput {
      *
      * The resourcetype must be specified in clark-notation
      *
-     * @param array|string|null $resourceType
+     * @param array|string|null $resourceTypes
      */
     function __construct($resourceTypes = null) {
 
@@ -77,7 +77,7 @@ class ResourceType extends Element\Elements implements HtmlOutput {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php b/vendor/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php
index a3fc6b0e1..939062f76 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\DAV\Xml\Property;
 
-use Sabre\DAV\Sharing\Plugin as SharingPlugin;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\Sharing\Plugin as SharingPlugin;
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
 use Sabre\Xml\Writer;
@@ -62,7 +62,7 @@ class ShareAccess implements Element {
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -102,7 +102,7 @@ class ShareAccess implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedLock.php b/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedLock.php
index f6d01aa37..677fdde4b 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedLock.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedLock.php
@@ -21,12 +21,12 @@ use Sabre\Xml\XmlSerializable;
 class SupportedLock implements XmlSerializable {
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -43,11 +43,11 @@ class SupportedLock implements XmlSerializable {
 
         $writer->writeElement('{DAV:}lockentry', [
             '{DAV:}lockscope' => ['{DAV:}exclusive' => null],
-            '{DAV:}locktype'  => ['{DAV:}write'     => null],
+            '{DAV:}locktype'  => ['{DAV:}write' => null],
         ]);
         $writer->writeElement('{DAV:}lockentry', [
             '{DAV:}lockscope' => ['{DAV:}shared' => null],
-            '{DAV:}locktype'  => ['{DAV:}write'  => null],
+            '{DAV:}locktype'  => ['{DAV:}write' => null],
         ]);
 
     }
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php b/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php
index 7641f3739..1a3878ef7 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php
@@ -67,12 +67,12 @@ class SupportedMethodSet implements XmlSerializable, HtmlOutput {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedReportSet.php b/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedReportSet.php
index ebf27300d..96383ec96 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedReportSet.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedReportSet.php
@@ -98,12 +98,12 @@ class SupportedReportSet implements XmlSerializable, HtmlOutput {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php b/vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php
index 76df98d13..c315a9a45 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php
@@ -38,7 +38,7 @@ class Lock implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/MkCol.php b/vendor/sabre/dav/lib/DAV/Xml/Request/MkCol.php
index 5db239061..9490bf58c 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/MkCol.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/MkCol.php
@@ -40,7 +40,7 @@ class MkCol implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
@@ -63,8 +63,8 @@ class MkCol implements XmlDeserializable {
         $self = new self();
 
         $elementMap = $reader->elementMap;
-        $elementMap['{DAV:}prop']   = 'Sabre\DAV\Xml\Element\Prop';
-        $elementMap['{DAV:}set']    = 'Sabre\Xml\Element\KeyValue';
+        $elementMap['{DAV:}prop'] = 'Sabre\DAV\Xml\Element\Prop';
+        $elementMap['{DAV:}set'] = 'Sabre\Xml\Element\KeyValue';
         $elementMap['{DAV:}remove'] = 'Sabre\Xml\Element\KeyValue';
 
         $elems = $reader->parseInnerTree($elementMap);
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/PropFind.php b/vendor/sabre/dav/lib/DAV/Xml/Request/PropFind.php
index ad3ad7c43..f1b5b6fdc 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/PropFind.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/PropFind.php
@@ -36,7 +36,7 @@ class PropFind implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/PropPatch.php b/vendor/sabre/dav/lib/DAV/Xml/Request/PropPatch.php
index 07a05f887..821b9e047 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/PropPatch.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/PropPatch.php
@@ -29,12 +29,12 @@ class PropPatch implements Element {
     public $properties = [];
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -68,7 +68,7 @@ class PropPatch implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
@@ -91,8 +91,8 @@ class PropPatch implements Element {
         $self = new self();
 
         $elementMap = $reader->elementMap;
-        $elementMap['{DAV:}prop']   = 'Sabre\DAV\Xml\Element\Prop';
-        $elementMap['{DAV:}set']    = 'Sabre\Xml\Element\KeyValue';
+        $elementMap['{DAV:}prop'] = 'Sabre\DAV\Xml\Element\Prop';
+        $elementMap['{DAV:}set'] = 'Sabre\Xml\Element\KeyValue';
         $elementMap['{DAV:}remove'] = 'Sabre\Xml\Element\KeyValue';
 
         $elems = $reader->parseInnerTree($elementMap);
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php b/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php
index 965e5857c..526a4eb6f 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\DAV\Xml\Request;
 
+use Sabre\DAV\Xml\Element\Sharee;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Xml\Element\Sharee;
 
 /**
  * ShareResource request parser.
@@ -40,7 +40,7 @@ class ShareResource implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php b/vendor/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php
index 3092ada47..830293a01 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\DAV\Xml\Request;
 
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\Xml\Element\KeyValue;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Element\KeyValue;
-use Sabre\DAV\Exception\BadRequest;
 
 /**
  * SyncCollection request parser.
@@ -51,7 +51,7 @@ class SyncCollectionReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
@@ -75,7 +75,7 @@ class SyncCollectionReport implements XmlDeserializable {
 
         $reader->pushContext();
 
-        $reader->elementMap['{DAV:}prop']   = 'Sabre\Xml\Element\Elements';
+        $reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Element\Elements';
         $elems = KeyValue::xmlDeserialize($reader);
 
         $reader->popContext();
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Response/MultiStatus.php b/vendor/sabre/dav/lib/DAV/Xml/Response/MultiStatus.php
index 16a3d4a68..cf5a0453b 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Response/MultiStatus.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Response/MultiStatus.php
@@ -99,7 +99,7 @@ class MultiStatus implements Element {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAVACL/Exception/NotRecognizedPrincipal.php b/vendor/sabre/dav/lib/DAVACL/Exception/NotRecognizedPrincipal.php
index 4349bf101..d7ae188ae 100644
--- a/vendor/sabre/dav/lib/DAVACL/Exception/NotRecognizedPrincipal.php
+++ b/vendor/sabre/dav/lib/DAVACL/Exception/NotRecognizedPrincipal.php
@@ -5,7 +5,7 @@ namespace Sabre\DAVACL\Exception;
 use Sabre\DAV;
 
 /**
- * If a client tried to set a privilege assigned to a non-existant principal,
+ * If a client tried to set a privilege assigned to a non-existent principal,
  * this exception will be thrown.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
diff --git a/vendor/sabre/dav/lib/DAVACL/FS/Collection.php b/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
index 1c08b43b1..b4fe7a1b0 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\DAVACL\FS;
 
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\FSExt\Directory as BaseCollection;
 use Sabre\DAVACL\ACLTrait;
 use Sabre\DAVACL\IACL;
-use Sabre\DAV\Exception\Forbidden;
-use Sabre\DAV\Exception\NotFound;
 
 /**
  * This is an ACL-enabled collection.
diff --git a/vendor/sabre/dav/lib/DAVACL/FS/File.php b/vendor/sabre/dav/lib/DAVACL/FS/File.php
index 387597bf7..aaf2ae148 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/File.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/File.php
@@ -3,8 +3,8 @@
 namespace Sabre\DAVACL\FS;
 
 use Sabre\DAV\FSExt\File as BaseFile;
-use Sabre\DAVACL\IACL;
 use Sabre\DAVACL\ACLTrait;
+use Sabre\DAVACL\IACL;
 
 /**
  * This is an ACL-enabled file node.
diff --git a/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php b/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
index 9e21353ea..201235e5a 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
@@ -72,7 +72,7 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
      * supplied by the authentication backend.
      *
      * @param array $principalInfo
-     * @return \Sabre\DAVACL\INode
+     * @return \Sabre\DAV\INode
      */
     function getChildForPrincipal(array $principalInfo) {
 
diff --git a/vendor/sabre/dav/lib/DAVACL/Plugin.php b/vendor/sabre/dav/lib/DAVACL/Plugin.php
index 8e912309e..a2aa118d7 100644
--- a/vendor/sabre/dav/lib/DAVACL/Plugin.php
+++ b/vendor/sabre/dav/lib/DAVACL/Plugin.php
@@ -3,11 +3,12 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\Exception\NotAuthenticated;
+use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\INode;
 use Sabre\DAV\Xml\Property\Href;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\DAV\Exception\NotFound;
-use Sabre\DAV\Exception\NotAuthenticated;
 use Sabre\DAVACL\Exception\NeedPrivileges;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
@@ -53,7 +54,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Reference to server object.
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
@@ -228,14 +229,14 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Returns the standard users' principal.
      *
-     * This is one authorative principal url for the current user.
+     * This is one authoritative principal url for the current user.
      * This method will return null if the user wasn't logged in.
      *
      * @return string|null
      */
     function getCurrentUserPrincipal() {
 
-        /** @var $authPlugin Sabre\DAV\Auth\Plugin */
+        /** @var $authPlugin \Sabre\DAV\Auth\Plugin */
         $authPlugin = $this->server->getPlugin('auth');
         if (!$authPlugin) {
             return null;
@@ -283,8 +284,7 @@ class Plugin extends DAV\ServerPlugin {
      *
      * These rules are used for all nodes that don't implement the IACL interface.
      *
-     * @param array $acl
-     * @return void
+     * @return array
      */
     function getDefaultAcl() {
 
@@ -299,7 +299,7 @@ class Plugin extends DAV\ServerPlugin {
      * set of rules allow anyone to do anything, as long as they are
      * authenticated.
      *
-     * var array
+     * @var array
      */
     protected $defaultAcl = [
         [
@@ -321,7 +321,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Returns all the principal groups the specified principal is a member of.
      *
-     * @param string $principal
+     * @param string $mainPrincipal
      * @return array
      */
     function getPrincipalMembership($mainPrincipal) {
@@ -365,7 +365,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Find out of a principal equals another principal.
      *
-     * This is a quick way to find out wether a principal URI is part of a
+     * This is a quick way to find out whether a principal URI is part of a
      * group, or any subgroups.
      *
      * The first argument is the principal URI you want to check against. For
@@ -373,10 +373,10 @@ class Plugin extends DAV\ServerPlugin {
      * which you want to find out of it is the same as the first principal, or
      * in a member of the first principal's group or subgroups.
      *
-     * So the arguments are not interchangable. If principal A is in group B,
+     * So the arguments are not interchangeable. If principal A is in group B,
      * passing 'B', 'A' will yield true, but 'A', 'B' is false.
      *
-     * If the sceond argument is not passed, we will use the current user
+     * If the second argument is not passed, we will use the current user
      * principal.
      *
      * @param string $checkPrincipal
@@ -412,8 +412,8 @@ class Plugin extends DAV\ServerPlugin {
      *    ]
      * ]
      *
-     * Privileges can be nested using "aggregrates". Doing so means that
-     * if you assign someone the aggregrating privilege, all the
+     * Privileges can be nested using "aggregates". Doing so means that
+     * if you assign someone the aggregating privilege, all the
      * sub-privileges will automatically be granted.
      *
      * Marking a privilege as abstract means that the privilege cannot be
@@ -484,7 +484,7 @@ class Plugin extends DAV\ServerPlugin {
                     ],
                 ],
             ];
-            if ($node instanceof \Sabre\DAV\ICollection) {
+            if ($node instanceof DAV\ICollection) {
                 $supportedPrivileges['{DAV:}write']['aggregates']['{DAV:}bind'] = [
                     'abstract'   => false,
                     'aggregates' => [],
@@ -494,7 +494,7 @@ class Plugin extends DAV\ServerPlugin {
                     'aggregates' => [],
                 ];
             }
-            if ($node instanceof \Sabre\DAVACL\IACL) {
+            if ($node instanceof IACL) {
                 $supportedPrivileges['{DAV:}write']['aggregates']['{DAV:}write-acl'] = [
                     'abstract'   => false,
                     'aggregates' => [],
@@ -980,8 +980,6 @@ class Plugin extends DAV\ServerPlugin {
      *
      * @param DAV\PropFind $propFind
      * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
      * @TODO really should be broken into multiple methods, or even a class.
      * @return bool
      */
@@ -1423,7 +1421,7 @@ class Plugin extends DAV\ServerPlugin {
                     ];
                 }
 
-                // Replacing the property with its expannded form.
+                // Replacing the property with its expanded form.
                 $node[200][$propertyName] = $childProps;
 
             }
diff --git a/vendor/sabre/dav/lib/DAVACL/Principal.php b/vendor/sabre/dav/lib/DAVACL/Principal.php
index 6ebb30907..d7db94999 100644
--- a/vendor/sabre/dav/lib/DAVACL/Principal.php
+++ b/vendor/sabre/dav/lib/DAVACL/Principal.php
@@ -41,7 +41,7 @@ class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
     /**
      * Creates the principal object
      *
-     * @param IPrincipalBackend $principalBackend
+     * @param PrincipalBackend\BackendInterface $principalBackend
      * @param array $principalProperties
      */
     function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = []) {
diff --git a/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php b/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
index 2cb83071a..40b6e33ea 100644
--- a/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
@@ -53,7 +53,7 @@ interface BackendInterface {
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param string $path
      * @param \Sabre\DAV\PropPatch $propPatch
diff --git a/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php b/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php
index a491dc88f..eb0df888b 100644
--- a/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php
+++ b/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php
@@ -11,7 +11,7 @@ use Sabre\HTTP\URLUtil;
  *
  *
  * This backend assumes all principals are in a single collection. The default collection
- * is 'principals/', but this can be overriden.
+ * is 'principals/', but this can be overridden.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
@@ -65,7 +65,7 @@ class PDO extends AbstractBackend implements CreatePrincipalSupport {
     /**
      * Sets up the backend.
      *
-     * @param PDO $pdo
+     * @param \PDO $pdo
      */
     function __construct(\PDO $pdo) {
 
@@ -171,7 +171,7 @@ class PDO extends AbstractBackend implements CreatePrincipalSupport {
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param string $path
      * @param DAV\PropPatch $propPatch
@@ -307,7 +307,7 @@ class PDO extends AbstractBackend implements CreatePrincipalSupport {
             case "mailto":
                 $query = 'SELECT uri FROM ' . $this->tableName . ' WHERE lower(email)=lower(?)';
                 $stmt = $this->pdo->prepare($query);
-                $stmt->execute([ $value ]);
+                $stmt->execute([$value]);
             
                 while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
                     // Checking if the principal is in the prefix
diff --git a/vendor/sabre/dav/lib/DAVACL/PrincipalCollection.php b/vendor/sabre/dav/lib/DAVACL/PrincipalCollection.php
index d8a90153a..ee5b88a90 100644
--- a/vendor/sabre/dav/lib/DAVACL/PrincipalCollection.php
+++ b/vendor/sabre/dav/lib/DAVACL/PrincipalCollection.php
@@ -57,7 +57,7 @@ class PrincipalCollection extends AbstractPrincipalCollection implements IExtend
      *
      * @param string $name
      * @param MkCol $mkCol
-     * @throws Exception\InvalidResourceType
+     * @throws InvalidResourceType
      * @return void
      */
     function createExtendedCollection($name, MkCol $mkCol) {
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Property/Acl.php b/vendor/sabre/dav/lib/DAVACL/Xml/Property/Acl.php
index 9f5e40df1..0e1c30ccf 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Property/Acl.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Property/Acl.php
@@ -78,12 +78,12 @@ class Acl implements Element, HtmlOutput {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -149,7 +149,7 @@ class Acl implements Element, HtmlOutput {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Property/AclRestrictions.php b/vendor/sabre/dav/lib/DAVACL/Xml/Property/AclRestrictions.php
index f669cc5e1..8d5854c23 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Property/AclRestrictions.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Property/AclRestrictions.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\DAVACL\Xml\Property;
 
-use Sabre\Xml\XmlSerializable;
 use Sabre\Xml\Writer;
+use Sabre\Xml\XmlSerializable;
 
 /**
  * AclRestrictions property
@@ -17,12 +17,12 @@ use Sabre\Xml\Writer;
 class AclRestrictions implements XmlSerializable {
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Property/CurrentUserPrivilegeSet.php b/vendor/sabre/dav/lib/DAVACL/Xml/Property/CurrentUserPrivilegeSet.php
index 0a95eb2b7..74c09cee1 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Property/CurrentUserPrivilegeSet.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Property/CurrentUserPrivilegeSet.php
@@ -41,12 +41,12 @@ class CurrentUserPrivilegeSet implements Element, HtmlOutput {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -99,7 +99,7 @@ class CurrentUserPrivilegeSet implements Element, HtmlOutput {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Property/Principal.php b/vendor/sabre/dav/lib/DAVACL/Xml/Property/Principal.php
index d32249d8b..04d22165d 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Property/Principal.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Property/Principal.php
@@ -85,12 +85,12 @@ class Principal extends DAV\Xml\Property\Href {
 
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php b/vendor/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php
index 55e7783ae..b963cc8c3 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php
@@ -4,8 +4,8 @@ namespace Sabre\DAVACL\Xml\Property;
 
 use Sabre\DAV\Browser\HtmlOutput;
 use Sabre\DAV\Browser\HtmlOutputHelper;
-use Sabre\Xml\XmlSerializable;
 use Sabre\Xml\Writer;
+use Sabre\Xml\XmlSerializable;
 
 /**
  * SupportedPrivilegeSet property
@@ -53,12 +53,12 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -73,7 +73,7 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
      */
     function xmlSerialize(Writer $writer) {
 
-        $this->serializePriv($writer, '{DAV:}all', [ 'aggregates' => $this->privileges]);
+        $this->serializePriv($writer, '{DAV:}all', ['aggregates' => $this->privileges]);
 
     }
 
@@ -114,7 +114,7 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
 
         ob_start();
         echo "<ul class=\"tree\">";
-        $traverse('{DAV:}all', [ 'aggregates' => $this->getValue() ]);
+        $traverse('{DAV:}all', ['aggregates' => $this->getValue()]);
         echo "</ul>\n";
 
         return ob_get_clean();
@@ -129,6 +129,7 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
      * This is a recursive function.
      *
      * @param Writer $writer
+     * @param string $privName
      * @param array $privilege
      * @return void
      */
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php b/vendor/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php
index f01c1e6ab..0aa2f29a5 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\Xml\Request;
 
-use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Reader;
 use Sabre\Xml\Deserializer;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * AclPrincipalPropSet request parser.
@@ -24,7 +24,7 @@ class AclPrincipalPropSetReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Request/ExpandPropertyReport.php b/vendor/sabre/dav/lib/DAVACL/Xml/Request/ExpandPropertyReport.php
index 3f535e301..a9938ba5b 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Request/ExpandPropertyReport.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Request/ExpandPropertyReport.php
@@ -35,7 +35,7 @@ class ExpandPropertyReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php b/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php
index 5c4e88189..1be15ab2d 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\Xml\Request;
 
-use Sabre\Xml\XmlDeserializable;
-use Sabre\Xml\Reader;
 use Sabre\Xml\Deserializer;
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
 
 /**
  * PrincipalMatchReport request parser.
@@ -55,7 +55,7 @@ class PrincipalMatchReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalPropertySearchReport.php b/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalPropertySearchReport.php
index 1e7aa4481..b0cf0e408 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalPropertySearchReport.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalPropertySearchReport.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\Xml\Request;
 
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
 
 /**
  * PrincipalSearchPropertySetReport request parser.
@@ -56,7 +56,7 @@ class PrincipalPropertySearchReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php b/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php
index ade157b19..64d1f7f86 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\Xml\Request;
 
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
 
 /**
  * PrincipalSearchPropertySetReport request parser.
@@ -23,7 +23,7 @@ class PrincipalSearchPropertySetReport implements XmlDeserializable {
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
index 2a00f7925..406dbe0e8 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
@@ -280,7 +280,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             ],
         ];
 
-        $result = $backend->getMultipleCalendarObjects($returnedId, [ 'id-1', 'id-2' ]);
+        $result = $backend->getMultipleCalendarObjects($returnedId, ['id-1', 'id-2']);
 
         foreach ($check as $index => $props) {
 
@@ -441,7 +441,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
     /**
      * @depends testCreateCalendarObject
      */
-    function testCreateCalendarObjectInfiniteReccurence() {
+    function testCreateCalendarObjectInfiniteRecurrence() {
 
         $backend = new PDO($this->pdo);
         $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
@@ -470,7 +470,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
     /**
      * @depends testCreateCalendarObject
      */
-    function testCreateCalendarObjectEndingReccurence() {
+    function testCreateCalendarObjectEndingRecurrence() {
 
         $backend = new PDO($this->pdo);
         $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
@@ -1246,8 +1246,8 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             $calendar['id'],
             [
                 new Sharee([
-                    'href'         => 'mailto:user@example.org',
-                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
+                    'href'   => 'mailto:user@example.org',
+                    'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
                 ])
             ]
         );
@@ -1263,8 +1263,8 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             $calendar['id'],
             [
                 new Sharee([
-                    'href'         => 'principals/user2',
-                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
+                    'href'   => 'principals/user2',
+                    'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
                 ])
             ]
         );
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
index d4dcc07dc..cc665cd8f 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CalDAV\Backend;
 
-use Sabre\DAV;
 use Sabre\CalDAV;
+use Sabre\DAV;
 
 class Mock extends AbstractBackend {
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
index 0d98922ff..c92cde661 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
@@ -114,7 +114,7 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
         $obj = $children[0];
         $obj->delete();
 
-        $children2 =  $this->calendar->getChildren();
+        $children2 = $this->calendar->getChildren();
         $this->assertEquals(count($children) - 1, count($children2));
 
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
index 4c2558a9b..f3305163b 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
@@ -21,6 +21,9 @@ ICS;
     }
 
     /**
+     * @param string $icalObject
+     * @param array $filters
+     * @param int $outcome
      * @dataProvider provider
      */
     function testValid($icalObject, $filters, $outcome) {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
index 7a756774f..7604c7f4c 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
@@ -11,11 +11,11 @@ require_once 'Sabre/HTTP/ResponseMock.php';
 class FreeBusyReportTest extends \PHPUnit_Framework_TestCase {
 
     /**
-     * @var Sabre\CalDAV\Plugin
+     * @var Plugin
      */
     protected $plugin;
     /**
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
index 9719529fb..75412577e 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
@@ -3,9 +3,9 @@
 namespace Sabre\CalDAV;
 
 use Sabre\DAV;
+use Sabre\DAVACL;
 use Sabre\HTTP;
 use Sabre\VObject;
-use Sabre\DAVACL;
 
 class ICSExportPluginTest extends \Sabre\DAVServerTest {
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
index 8d538dee5..859f6aa0c 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
@@ -2,11 +2,11 @@
 
 namespace Sabre\CalDAV;
 
-use Sabre\DAVACL;
-use Sabre\DAV;
-use Sabre\HTTP;
 use DateTime;
 use DateTimeZone;
+use Sabre\DAV;
+use Sabre\DAVACL;
+use Sabre\HTTP;
 
 class PluginTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
index 6e9e88419..9589176a3 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
@@ -194,8 +194,8 @@ RRR;
         $this->assertEquals(
             [
                 new Sharee([
-                    'href'         => 'mailto:joe@example.org',
-                    'properties'   => [
+                    'href'       => 'mailto:joe@example.org',
+                    'properties' => [
                         '{DAV:}displayname' => 'Joe Shmoe',
                     ],
                     'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
index 2c3171bf3..f8da38a16 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CardDAV;
 
-use Sabre\HTTP;
 use Sabre\DAV;
+use Sabre\HTTP;
 
 require_once 'Sabre/CardDAV/AbstractPluginTest.php';
 require_once 'Sabre/HTTP/ResponseMock.php';
@@ -288,14 +288,14 @@ class AddressBookQueryTest extends AbstractPluginTest {
         );
 
         $request->setBody(
-'<?xml version="1.0"?>
+            '<?xml version="1.0"?>
 <c:addressbook-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:carddav">
     <d:prop>
       <c:address-data content-type="application/vcard+json" />
       <d:getetag />
     </d:prop>
 </c:addressbook-query>'
-            );
+        );
 
         $response = new HTTP\ResponseMock();
 
@@ -305,6 +305,51 @@ class AddressBookQueryTest extends AbstractPluginTest {
         $this->server->exec();
 
         $this->assertEquals(415, $response->status, 'Incorrect status code. Full response body:' . $response->body);
+    }
+
+    function testAddressBookProperties() {
+
+        $request = new HTTP\Request(
+            'REPORT',
+            '/addressbooks/user1/book3',
+            ['Depth' => '1']
+        );
+
+        $request->setBody(
+            '<?xml version="1.0"?>
+<c:addressbook-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:carddav">
+    <d:prop>
+      <c:address-data>
+          <c:prop name="FN"/>
+          <c:prop name="BDAY"/>
+      </c:address-data>
+      <d:getetag />
+    </d:prop>
+</c:addressbook-query>'
+        );
+
+        $response = new HTTP\ResponseMock();
+
+        $this->server->httpRequest = $request;
+        $this->server->httpResponse = $response;
+
+        $this->server->exec();
+
+        $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
+
+        // using the client for parsing
+        $client = new DAV\Client(['baseUri' => '/']);
+
+        $result = $client->parseMultiStatus($response->body);
+
+        $this->assertEquals([
+            '/addressbooks/user1/book3/card3' => [
+                200 => [
+                    '{DAV:}getetag'                                => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nFN:Test-Card\nEMAIL;TYPE=home:bar@example.org\nEND:VCARD") . '"',
+                    '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\r\nVERSION:3.0\r\nUID:12345\r\nFN:Test-Card\r\nEND:VCARD\r\n",
+                ],
+            ],
+        ], $result);
 
     }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
index 1a36fd10c..1f0064dd3 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
@@ -85,7 +85,7 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
     function testDelete() {
 
         $this->ab->delete();
-        $this->assertEquals([], $this->backend->addressBooks);
+        $this->assertEquals(1, count($this->backend->addressBooks));
 
     }
 
@@ -175,7 +175,7 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
         $backend = new Backend\PDO(
             $this->getPDO()
         );
-        $ab = new AddressBook($backend, [ 'id' => 1, '{DAV:}sync-token' => 2]);
+        $ab = new AddressBook($backend, ['id' => 1, '{DAV:}sync-token' => 2]);
         $this->assertEquals(2, $ab->getSyncToken());
     }
 
@@ -187,7 +187,7 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
         $backend = new Backend\PDO(
             $this->getPDO()
         );
-        $ab = new AddressBook($backend, [ 'id' => 1, '{http://sabredav.org/ns}sync-token' => 2]);
+        $ab = new AddressBook($backend, ['id' => 1, '{http://sabredav.org/ns}sync-token' => 2]);
         $this->assertEquals(2, $ab->getSyncToken());
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
index 840b898e8..8638dc74a 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
@@ -20,6 +20,12 @@ class Mock extends AbstractBackend {
                     'principaluri'      => 'principals/user1',
                     '{DAV:}displayname' => 'd-name',
                 ],
+                [
+                    'id'                => 'bar',
+                    'uri'               => 'book3',
+                    'principaluri'      => 'principals/user1',
+                    '{DAV:}displayname' => 'd-name',
+                ],
             ];
 
             $card2 = fopen('php://memory', 'r+');
@@ -30,6 +36,9 @@ class Mock extends AbstractBackend {
                     'card1' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD",
                     'card2' => $card2,
                 ],
+                'bar' => [
+                    'card3' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nFN:Test-Card\nEMAIL;TYPE=home:bar@example.org\nEND:VCARD",
+                ],
             ];
         }
 
@@ -58,7 +67,7 @@ class Mock extends AbstractBackend {
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param string $addressBookId
      * @param \Sabre\DAV\PropPatch $propPatch
@@ -117,7 +126,7 @@ class Mock extends AbstractBackend {
      * calculating them. If they are specified, you can also ommit carddata.
      * This may speed up certain requests, especially with large cards.
      *
-     * @param mixed $addressbookId
+     * @param mixed $addressBookId
      * @return array
      */
     function getCards($addressBookId) {
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
index d79239d0f..2d57c6ae7 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CardDAV;
 
-use Sabre\HTTP;
 use Sabre\DAV;
+use Sabre\HTTP;
 
 require_once 'Sabre/HTTP/ResponseMock.php';
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
index 0ba4fd669..d4bc48098 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\CardDAV;
 
-use Sabre\HTTP;
 use Sabre\DAV\PropFind;
+use Sabre\HTTP;
 
 class SogoStripContentTypeTest extends \Sabre\DAVServerTest {
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
index 57ac21b4a..03c468f86 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
@@ -7,6 +7,11 @@ require_once 'Sabre/CardDAV/AbstractPluginTest.php';
 class ValidateFilterTest extends AbstractPluginTest {
 
     /**
+     * @param string $input
+     * @param array $filters
+     * @param string $test
+     * @param bool $result
+     * @param string|null $message
      * @dataProvider data
      */
     function testFilter($input, $filters, $test, $result, $message = null) {
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
index dda8a0c37..acba2cfc8 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
@@ -3,8 +3,8 @@
 namespace Sabre\CardDAV;
 
 use Sabre\DAV;
-use Sabre\HTTP;
 use Sabre\DAVACL;
+use Sabre\HTTP;
 
 require_once 'Sabre/HTTP/ResponseMock.php';
 
@@ -293,10 +293,10 @@ VCF;
         $response = $this->request($request, 204);
 
         $expected = [
-            'uri'          => 'blabla.vcf',
-            'carddata'     => $body,
-            'size'         => strlen($body),
-            'etag'         => '"' . md5($body) . '"',
+            'uri'      => 'blabla.vcf',
+            'carddata' => $body,
+            'size'     => strlen($body),
+            'etag'     => '"' . md5($body) . '"',
         ];
 
         $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1', 'blabla.vcf'));
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
index b30b3f143..369bc249e 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
@@ -76,6 +76,8 @@ class Mock implements BackendInterface {
      * append your own WWW-Authenticate header instead of overwriting the
      * existing one.
      *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
      * @return void
      */
     function challenge(RequestInterface $request, ResponseInterface $response) {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
index b566dd757..743446127 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\DAV\Auth;
 
-use Sabre\HTTP;
 use Sabre\DAV;
+use Sabre\HTTP;
 
 class PluginTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
index 4cf27dfaa..687f61e2f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
@@ -224,7 +224,7 @@ XML;
 XML;
 
         $client->response = new Response(207, [], $responseBody);
-        $result = $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null], 1);
+        $result = $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null]);
         $this->assertTrue($result);
         $request = $client->request;
         $this->assertEquals('PROPPATCH', $request->getMethod());
@@ -246,7 +246,7 @@ XML;
         ]);
 
         $client->response = new Response(403, [], '');
-        $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null], 1);
+        $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null]);
 
     }
 
@@ -276,7 +276,7 @@ XML;
 XML;
 
         $client->response = new Response(207, [], $responseBody);
-        $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null], 1);
+        $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null]);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php
index 8788475cb..174a561b5 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\DAV\Exception;
 
-use Sabre\DAV;
 use DOMDocument;
+use Sabre\DAV;
 
 class LockedTest extends \PHPUnit_Framework_TestCase {
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php b/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
index edd09e634..ba2cf3dc1 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
@@ -99,7 +99,7 @@ class Issue33Test extends \PHPUnit_Framework_TestCase {
         $server->sapi = new HTTP\SapiMock();
         $server->exec();
 
-        $this->assertTrue(file_exists(SABRE_TEMPDIR  . '/issue33/' . urldecode('%C3%A0fo%C3%B3')));
+        $this->assertTrue(file_exists(SABRE_TEMPDIR . '/issue33/' . urldecode('%C3%A0fo%C3%B3')));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
index f08f19da5..1111db5b5 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\DAV\Locks;
 
-use Sabre\HTTP;
 use Sabre\DAV;
+use Sabre\HTTP;
 
 require_once 'Sabre/HTTP/ResponseMock.php';
 require_once 'Sabre/TestUtil.php';
@@ -112,9 +112,9 @@ class MSWordTest extends \PHPUnit_Framework_TestCase {
     function getPutRequest($lockToken) {
 
         $request = HTTP\Sapi::createFromServerArray([
-           'REQUEST_METHOD'    => 'PUT',
-           'REQUEST_URI'       => '/Nouveau%20Microsoft%20Office%20Excel%20Worksheet.xlsx',
-           'HTTP_IF'           => 'If: (' . $lockToken . ')',
+           'REQUEST_METHOD' => 'PUT',
+           'REQUEST_URI'    => '/Nouveau%20Microsoft%20Office%20Excel%20Worksheet.xlsx',
+           'HTTP_IF'        => 'If: (' . $lockToken . ')',
         ]);
         $request->setBody('FAKE BODY');
         return $request;
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
index 6511d4e7d..dbbf6757a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\DAV\Locks;
 
-use Sabre\HTTP;
 use Sabre\DAV;
+use Sabre\HTTP;
 
 require_once 'Sabre/DAV/AbstractServer.php';
 
@@ -168,7 +168,7 @@ class PluginTest extends DAV\AbstractServer {
         $this->response = new HTTP\ResponseMock();
         $this->server->httpResponse = $this->response;
 
-        $request = new HTTP\Request('LOCK', '/test.txt', ['If' => '(' . $lockToken . ')' ]);
+        $request = new HTTP\Request('LOCK', '/test.txt', ['If' => '(' . $lockToken . ')']);
         $request->setBody('');
 
         $this->server->httpRequest = $request;
@@ -203,7 +203,7 @@ class PluginTest extends DAV\AbstractServer {
         $this->response = new HTTP\ResponseMock();
         $this->server->httpResponse = $this->response;
 
-        $request = new HTTP\Request('LOCK', '/test.txt', ['If' => '(' . $lockToken . 'foobar) (<opaquelocktoken:anotherbadtoken>)' ]);
+        $request = new HTTP\Request('LOCK', '/test.txt', ['If' => '(' . $lockToken . 'foobar) (<opaquelocktoken:anotherbadtoken>)']);
         $request->setBody('');
 
         $this->server->httpRequest = $request;
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Mock/Collection.php b/vendor/sabre/dav/tests/Sabre/DAV/Mock/Collection.php
index 6ccab4f66..fded5e474 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Mock/Collection.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Mock/Collection.php
@@ -30,6 +30,7 @@ class Collection extends DAV\Collection {
      *
      * @param string $name
      * @param array $children
+     * @param Collection $parent
      * @return void
      */
     function __construct($name, array $children = [], Collection $parent = null) {
@@ -122,6 +123,8 @@ class Collection extends DAV\Collection {
 
     /**
      * Adds an already existing node to this collection.
+     *
+     * @param \Sabre\DAV\INode $node
      */
     function addNode(\Sabre\DAV\INode $node) {
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Mock/File.php b/vendor/sabre/dav/tests/Sabre/DAV/Mock/File.php
index 23855e3c5..a624b6b6b 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Mock/File.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Mock/File.php
@@ -24,7 +24,9 @@ class File extends DAV\File {
      * Creates the object
      *
      * @param string $name
-     * @param array $children
+     * @param resource $contents
+     * @param Collection $parent
+     * @param int $lastModified
      * @return void
      */
     function __construct($name, $contents, Collection $parent = null, $lastModified = -1) {
@@ -57,6 +59,7 @@ class File extends DAV\File {
     /**
      * Changes the name of the node.
      *
+     * @param string $name
      * @return void
      */
     function setName($name) {
@@ -70,7 +73,7 @@ class File extends DAV\File {
      *
      * The data argument is a readable stream resource.
      *
-     * After a succesful put operation, you may choose to return an ETag. The
+     * After a successful put operation, you may choose to return an ETag. The
      * etag must always be surrounded by double-quotes. These quotes must
      * appear in the actual string you're returning.
      *
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
index ca8ca3f6e..2c6274173 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
@@ -38,6 +38,11 @@ class SpecificationTest extends \PHPUnit_Framework_TestCase {
     }
 
     /**
+     * @param string $headerValue
+     * @param string $httpStatus
+     * @param string $endResult
+     * @param int $contentLength
+     *
      * @dataProvider data
      */
     function testUpdateRange($headerValue, $httpStatus, $endResult, $contentLength = 4) {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
index 4c576f108..42759647a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
@@ -39,8 +39,8 @@ class ServerEventsTest extends AbstractServer {
         $this->server->on('afterResponse', [$mock, 'afterResponseCallback']);
 
         $this->server->httpRequest = HTTP\Sapi::createFromServerArray([
-            'REQUEST_METHOD'    => 'GET',
-            'REQUEST_URI'       => '/test.txt',
+            'REQUEST_METHOD' => 'GET',
+            'REQUEST_URI'    => '/test.txt',
         ]);
 
         $this->server->exec();
@@ -118,8 +118,8 @@ class ServerEventsTest extends AbstractServer {
             );
         } catch (Exception $e) {}
 
-        $this->assertEquals(2, $k);
-
+        // Fun fact, PHP 7.1 changes the order when sorting-by-callback.
+        $this->assertTrue($k >= 2 && $k <= 3);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php
index bafbef6e4..81224d687 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php
@@ -144,7 +144,7 @@ class ServerRangeTest extends \Sabre\DAVServerTest {
             'Content-Length'  => [4],
             'Content-Range'   => ['bytes 2-5/12'],
             // 'ETag'            => ['"' . md5('Test contents') . '"'],
-            'Last-Modified'   => [$this->lastModified],
+            'Last-Modified' => [$this->lastModified],
             ],
             $response->getHeaders()
         );
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php b/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
index 8888f0276..e98fe9048 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
@@ -5,6 +5,13 @@ namespace Sabre\DAV;
 class StringUtilTest extends \PHPUnit_Framework_TestCase {
 
     /**
+     * @param string $haystack
+     * @param string $needle
+     * @param string $collation
+     * @param string $matchType
+     * @param string $result
+     * @throws Exception\BadRequest
+     *
      * @dataProvider dataset
      */
     function testTextMatch($haystack, $needle, $collation, $matchType, $result) {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
index ad33200c8..e719e38d5 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
@@ -200,8 +200,8 @@ class TreeFileTester extends File implements IProperties {
      * To update specific properties, call the 'handle' method on this object.
      * Read the PropPatch documentation for more information.
      *
-     * @param array $mutations
-     * @return bool|array
+     * @param PropPatch $propPatch
+     * @return void
      */
     function propPatch(PropPatch $propPatch) {
 
@@ -220,6 +220,7 @@ class TreeMultiGetTester extends TreeDirectoryTester implements IMultiGet {
      *
      * If any children are not found, you do not have to return them.
      *
+     * @param array $paths
      * @return array
      */
     function getMultipleChildren(array $paths) {
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
index afb094a39..1464f4c26 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
@@ -128,7 +128,7 @@ class Mock extends AbstractBackend {
      * Calling the handle method is like telling the PropPatch object "I
      * promise I can handle updating this property".
      *
-     * Read the PropPatch documenation for more info and examples.
+     * Read the PropPatch documentation for more info and examples.
      *
      * @param string $path
      * @param \Sabre\DAV\PropPatch $propPatch
diff --git a/vendor/sabre/http/.travis.yml b/vendor/sabre/http/.travis.yml
index 490e42e1e..8ae84d90f 100644
--- a/vendor/sabre/http/.travis.yml
+++ b/vendor/sabre/http/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.5
   - 5.6
   - 7
+  - 7.1
   - hhvm
 
 matrix:
@@ -16,7 +17,8 @@ env:
 
 
 before_script:
-    - composer self-update
+    - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
+#    - composer self-update
     - composer update --prefer-source $PREFER_LOWEST
 
 script:
diff --git a/vendor/sabre/http/CHANGELOG.md b/vendor/sabre/http/CHANGELOG.md
index 9a751d8fb..63d85afe3 100644
--- a/vendor/sabre/http/CHANGELOG.md
+++ b/vendor/sabre/http/CHANGELOG.md
@@ -1,19 +1,25 @@
 ChangeLog
 =========
 
+4.2.2 (2017-01-02)
+------------------
+
+* #72: Handling clients that send invalid `Content-Length` headers.
+
+
 4.2.1 (2016-01-06)
 ------------------
 
 * #56: `getBodyAsString` now returns at most as many bytes as the contents of
   the `Content-Length` header. This allows users to pass much larger strings
   without having to copy and truncate them.
+* The client now sets a default `User-Agent` header identifying this library.
 
 
 4.2.0 (2016-01-04)
 ------------------
 
 * This package now supports sabre/event 3.0.
-* The client now sets a default `User-Agent` header identifying this library.
 
 
 4.1.0 (2015-09-04)
diff --git a/vendor/sabre/http/LICENSE b/vendor/sabre/http/LICENSE
index 19812ad7a..864041b22 100644
--- a/vendor/sabre/http/LICENSE
+++ b/vendor/sabre/http/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2009-2016 fruux GmbH (https://fruux.com/)
+Copyright (C) 2009-2017 fruux GmbH (https://fruux.com/)
 
 All rights reserved.
 
diff --git a/vendor/sabre/http/composer.json b/vendor/sabre/http/composer.json
index b061194cf..507d5d28d 100644
--- a/vendor/sabre/http/composer.json
+++ b/vendor/sabre/http/composer.json
@@ -7,6 +7,7 @@
     "require" : {
         "php"          : ">=5.4",
         "ext-mbstring" : "*",
+        "ext-ctype"    : "*",
         "sabre/event"  : ">=1.0.0,<4.0.0",
         "sabre/uri"    : "~1.0"
     },
diff --git a/vendor/sabre/http/lib/Message.php b/vendor/sabre/http/lib/Message.php
index 5c6887d8a..45bd18398 100644
--- a/vendor/sabre/http/lib/Message.php
+++ b/vendor/sabre/http/lib/Message.php
@@ -75,12 +75,11 @@ abstract class Message implements MessageInterface {
             return '';
         }
         $contentLength = $this->getHeader('Content-Length');
-        if (null === $contentLength) {
-            return stream_get_contents($body);
-        } else {
+        if (is_int($contentLength) || ctype_digit($contentLength)) {
             return stream_get_contents($body, $contentLength);
+        } else {
+            return stream_get_contents($body);
         }
-
     }
 
     /**
@@ -189,7 +188,7 @@ abstract class Message implements MessageInterface {
     /**
      * Updates a HTTP header.
      *
-     * The case-sensitity of the name value must be retained as-is.
+     * The case-sensitivity of the name value must be retained as-is.
      *
      * If the header already existed, it will be overwritten.
      *
@@ -270,10 +269,11 @@ abstract class Message implements MessageInterface {
     /**
      * Removes a HTTP header.
      *
-     * The specified header name must be treated as case-insenstive.
+     * The specified header name must be treated as case-insensitive.
      * This method should return true if the header was successfully deleted,
      * and false if the header did not exist.
      *
+     * @param string $name
      * @return bool
      */
     function removeHeader($name) {
diff --git a/vendor/sabre/http/lib/MessageDecoratorTrait.php b/vendor/sabre/http/lib/MessageDecoratorTrait.php
index f104af38d..1cb32da22 100644
--- a/vendor/sabre/http/lib/MessageDecoratorTrait.php
+++ b/vendor/sabre/http/lib/MessageDecoratorTrait.php
@@ -144,7 +144,7 @@ trait MessageDecoratorTrait {
     /**
      * Updates a HTTP header.
      *
-     * The case-sensitity of the name value must be retained as-is.
+     * The case-sensitivity of the name value must be retained as-is.
      *
      * If the header already existed, it will be overwritten.
      *
@@ -210,15 +210,16 @@ trait MessageDecoratorTrait {
     /**
      * Removes a HTTP header.
      *
-     * The specified header name must be treated as case-insenstive.
+     * The specified header name must be treated as case-insensitive.
      * This method should return true if the header was successfully deleted,
      * and false if the header did not exist.
      *
+     * @param string $name
      * @return bool
      */
     function removeHeader($name) {
 
-        $this->inner->removeHeader($name);
+        return $this->inner->removeHeader($name);
 
     }
 
diff --git a/vendor/sabre/http/lib/MessageInterface.php b/vendor/sabre/http/lib/MessageInterface.php
index 55d8485c1..df55beb2f 100644
--- a/vendor/sabre/http/lib/MessageInterface.php
+++ b/vendor/sabre/http/lib/MessageInterface.php
@@ -44,7 +44,7 @@ interface MessageInterface {
     /**
      * Updates the body resource with a new stream.
      *
-     * @param resource $body
+     * @param resource|string $body
      * @return void
      */
     function setBody($body);
@@ -153,6 +153,7 @@ interface MessageInterface {
      * This method should return true if the header was successfully deleted,
      * and false if the header did not exist.
      *
+     * @param string $name
      * @return bool
      */
     function removeHeader($name);
diff --git a/vendor/sabre/http/lib/Request.php b/vendor/sabre/http/lib/Request.php
index 8bcaf32a6..dfa3d5b48 100644
--- a/vendor/sabre/http/lib/Request.php
+++ b/vendor/sabre/http/lib/Request.php
@@ -301,7 +301,7 @@ class Request extends Message implements RequestInterface {
             foreach ($value as $v) {
                 if ($key === 'Authorization') {
                     list($v) = explode(' ', $v, 2);
-                    $v  .= ' REDACTED';
+                    $v .= ' REDACTED';
                 }
                 $out .= $key . ": " . $v . "\r\n";
             }
diff --git a/vendor/sabre/http/lib/Response.php b/vendor/sabre/http/lib/Response.php
index d2ba6d40d..01920d8d9 100644
--- a/vendor/sabre/http/lib/Response.php
+++ b/vendor/sabre/http/lib/Response.php
@@ -100,7 +100,6 @@ class Response extends Message implements ResponseInterface {
      * @param string|int $status
      * @param array $headers
      * @param resource $body
-     * @return void
      */
     function __construct($status = null, array $headers = null, $body = null) {
 
@@ -145,7 +144,7 @@ class Response extends Message implements ResponseInterface {
      * added.
      *
      * @param string|int $status
-     * @throws \InvalidArgumentExeption
+     * @throws \InvalidArgumentException
      * @return void
      */
     function setStatus($status) {
diff --git a/vendor/sabre/http/lib/ResponseInterface.php b/vendor/sabre/http/lib/ResponseInterface.php
index c0ecc35ae..411cdc06c 100644
--- a/vendor/sabre/http/lib/ResponseInterface.php
+++ b/vendor/sabre/http/lib/ResponseInterface.php
@@ -37,7 +37,7 @@ interface ResponseInterface extends MessageInterface {
      * added.
      *
      * @param string|int $status
-     * @throws \InvalidArgumentExeption
+     * @throws \InvalidArgumentException
      * @return void
      */
     function setStatus($status);
diff --git a/vendor/sabre/http/lib/URLUtil.php b/vendor/sabre/http/lib/URLUtil.php
index 474856348..85c0e1150 100644
--- a/vendor/sabre/http/lib/URLUtil.php
+++ b/vendor/sabre/http/lib/URLUtil.php
@@ -10,7 +10,7 @@ use Sabre\URI;
  * Note: this class is deprecated. All its functionality moved to functions.php
  * or sabre\uri.
  *
- * @deprectated
+ * @deprecated
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
diff --git a/vendor/sabre/http/lib/Util.php b/vendor/sabre/http/lib/Util.php
index 83bde50a4..e3f13a645 100644
--- a/vendor/sabre/http/lib/Util.php
+++ b/vendor/sabre/http/lib/Util.php
@@ -31,7 +31,7 @@ class Util {
      * Deprecated! Use negotiateContentType.
      *
      * @deprecated Use \Sabre\HTTP\NegotiateContentType
-     * @param string|null $acceptHeader
+     * @param string|null $acceptHeaderValue
      * @param array $availableOptions
      * @return string|null
      */
diff --git a/vendor/sabre/http/lib/Version.php b/vendor/sabre/http/lib/Version.php
index 789ee4543..a5a427405 100644
--- a/vendor/sabre/http/lib/Version.php
+++ b/vendor/sabre/http/lib/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '4.2.1';
+    const VERSION = '4.2.2';
 
 }
diff --git a/vendor/sabre/http/lib/functions.php b/vendor/sabre/http/lib/functions.php
index 1ec123f2e..d94119623 100644
--- a/vendor/sabre/http/lib/functions.php
+++ b/vendor/sabre/http/lib/functions.php
@@ -79,7 +79,7 @@ function toDate(DateTime $dateTime) {
     // We need to clone it, as we don't want to affect the existing
     // DateTime.
     $dateTime = clone $dateTime;
-    $dateTime->setTimeZone(new \DateTimeZone('GMT'));
+    $dateTime->setTimezone(new \DateTimeZone('GMT'));
     return $dateTime->format('D, d M Y H:i:s \G\M\T');
 
 }
@@ -216,7 +216,7 @@ function negotiateContentType($acceptHeaderValue, array $availableOptions) {
  * Parameters are currently discarded. There's no known prefer value that
  * uses them.
  *
- * @param string|string[] $header
+ * @param string|string[] $input
  * @return array
  */
 function parsePrefer($input) {
diff --git a/vendor/sabre/uri/.travis.yml b/vendor/sabre/uri/.travis.yml
index f7d1a0657..75c8270df 100644
--- a/vendor/sabre/uri/.travis.yml
+++ b/vendor/sabre/uri/.travis.yml
@@ -3,8 +3,8 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - hhvm
   - 7
+  - 7.1
 
 script:
   - ./bin/phpunit --configuration tests/phpunit.xml.dist
diff --git a/vendor/sabre/uri/CHANGELOG.md b/vendor/sabre/uri/CHANGELOG.md
index 9fa510dc2..92aaa7507 100644
--- a/vendor/sabre/uri/CHANGELOG.md
+++ b/vendor/sabre/uri/CHANGELOG.md
@@ -1,6 +1,29 @@
 ChangeLog
 =========
 
+1.2.1 (2017-02-20)
+------------------
+
+* #16: Correctly parse urls that are only a fragment `#`.
+
+
+1.2.0 (2016-12-06)
+------------------
+
+* Now throwing `InvalidUriException` if a uri passed to the `parse` function
+  is invalid or could not be parsed.
+* #11: Fix support for URIs that start with a triple slash. PHP's `parse_uri()`
+  doesn't support them, so we now have a pure-php fallback in case it fails.
+* #9: Fix support for relative URI's that have a non-uri encoded colon `:` in
+  them.
+
+
+1.1.1 (2016-10-27)
+------------------
+
+* #10: Correctly support file:// URIs in the build() method. (@yuloh)
+
+
 1.1.0 (2016-03-07)
 ------------------
 
diff --git a/vendor/sabre/uri/LICENSE b/vendor/sabre/uri/LICENSE
index 9a3a91946..087996be7 100644
--- a/vendor/sabre/uri/LICENSE
+++ b/vendor/sabre/uri/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2014-2016 fruux GmbH (https://fruux.com/)
+Copyright (C) 2014-2017 fruux GmbH (https://fruux.com/)
 
 All rights reserved.
 
diff --git a/vendor/sabre/uri/README.md b/vendor/sabre/uri/README.md
index 76f55d8e4..aa21bfe06 100644
--- a/vendor/sabre/uri/README.md
+++ b/vendor/sabre/uri/README.md
@@ -25,14 +25,6 @@ Further reading
 * [Usage][8]
 
 
-Build status
-------------
-
-| branch | status |
-| ------ | ------ |
-| master | [![Build Status](https://travis-ci.org/fruux/sabre-uri.svg?branch=master)](https://travis-ci.org/fruux/sabre-uri) |
-
-
 Questions?
 ----------
 
diff --git a/vendor/sabre/uri/composer.json b/vendor/sabre/uri/composer.json
index 7b48acb71..49d69e723 100644
--- a/vendor/sabre/uri/composer.json
+++ b/vendor/sabre/uri/composer.json
@@ -32,8 +32,8 @@
         }
     },
     "require-dev": {
-        "sabre/cs": "~0.0.1",
-        "phpunit/phpunit" : "*"
+        "sabre/cs": "~1.0.0",
+        "phpunit/phpunit" : ">=4.0,<6.0"
     },
     "config" : {
         "bin-dir" : "bin/"
diff --git a/vendor/sabre/uri/lib/InvalidUriException.php b/vendor/sabre/uri/lib/InvalidUriException.php
new file mode 100644
index 000000000..0385fd462
--- /dev/null
+++ b/vendor/sabre/uri/lib/InvalidUriException.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Sabre\Uri;
+
+/**
+ * Invalid Uri
+ *
+ * This is thrown when an attempt was made to use Sabre\Uri parse a uri that
+ * it could not.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (https://evertpot.com/)
+ * @license http://sabre.io/license/
+ */
+class InvalidUriException extends \Exception {
+
+}
diff --git a/vendor/sabre/uri/lib/Version.php b/vendor/sabre/uri/lib/Version.php
index 88678d4d5..fa544538b 100644
--- a/vendor/sabre/uri/lib/Version.php
+++ b/vendor/sabre/uri/lib/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '1.1.0';
+    const VERSION = '1.2.1';
 
 }
diff --git a/vendor/sabre/uri/lib/functions.php b/vendor/sabre/uri/lib/functions.php
index 06181aef0..39b4a6f08 100644
--- a/vendor/sabre/uri/lib/functions.php
+++ b/vendor/sabre/uri/lib/functions.php
@@ -45,8 +45,8 @@ function resolve($basePath, $newPath) {
     $newParts = [];
 
     $newParts['scheme'] = $pick('scheme');
-    $newParts['host']   = $pick('host');
-    $newParts['port']   = $pick('port');
+    $newParts['host'] = $pick('host');
+    $newParts['port'] = $pick('port');
 
     $path = '';
     if ($delta['path']) {
@@ -193,8 +193,13 @@ function parse($uri) {
         $uri
     );
 
+    $result = parse_url($uri);
+    if (!$result) {
+        $result = _parse_fallback($uri);
+    }
+
     return
-        parse_url($uri) + [
+         $result + [
             'scheme'   => null,
             'host'     => null,
             'path'     => null,
@@ -233,7 +238,7 @@ function build(array $parts) {
         $uri = $parts['scheme'] . ':';
 
     }
-    if ($authority) {
+    if ($authority || (!empty($parts['scheme']) && $parts['scheme'] === 'file')) {
         // No scheme, but there is a host.
         $uri .= '//' . $authority;
 
@@ -280,3 +285,89 @@ function split($path) {
     return [null,null];
 
 }
+
+/**
+ * This function is another implementation of parse_url, except this one is
+ * fully written in PHP.
+ *
+ * The reason is that the PHP bug team is not willing to admit that there are
+ * bugs in the parse_url implementation.
+ *
+ * This function is only called if the main parse method fails. It's pretty
+ * crude and probably slow, so the original parse_url is usually preferred.
+ *
+ * @param string $uri
+ * @return array
+ */
+function _parse_fallback($uri) {
+
+    // Normally a URI must be ASCII, however. However, often it's not and
+    // parse_url might corrupt these strings.
+    //
+    // For that reason we take any non-ascii characters from the uri and
+    // uriencode them first.
+    $uri = preg_replace_callback(
+        '/[^[:ascii:]]/u',
+        function($matches) {
+            return rawurlencode($matches[0]);
+        },
+        $uri
+    );
+
+    $result = [
+        'scheme'   => null,
+        'host'     => null,
+        'port'     => null,
+        'user'     => null,
+        'path'     => null,
+        'fragment' => null,
+        'query'    => null,
+    ];
+
+    if (preg_match('% ^([A-Za-z][A-Za-z0-9+-\.]+): %x', $uri, $matches)) {
+
+        $result['scheme'] = $matches[1];
+        // Take what's left.
+        $uri = substr($uri, strlen($result['scheme']) + 1);
+
+    }
+
+    // Taking off a fragment part
+    if (strpos($uri, '#') !== false) {
+        list($uri, $result['fragment']) = explode('#', $uri, 2);
+    }
+    // Taking off the query part
+    if (strpos($uri, '?') !== false) {
+        list($uri, $result['query']) = explode('?', $uri, 2);
+    }
+
+    if (substr($uri, 0, 3) === '///') {
+      // The triple slash uris are a bit unusual, but we have special handling
+      // for them.
+      $result['path'] = substr($uri, 2);
+      $result['host'] = '';
+    } elseif (substr($uri, 0, 2) === '//') {
+        // Uris that have an authority part.
+        $regex = '
+          %^
+            //
+            (?: (?<user> [^:@]+) (: (?<pass> [^@]+)) @)?
+            (?<host> ( [^:/]* | \[ [^\]]+ \] ))
+            (?: : (?<port> [0-9]+))?
+            (?<path> / .*)?
+          $%x
+        ';
+        if (!preg_match($regex, $uri, $matches)) {
+            throw new InvalidUriException('Invalid, or could not parse URI');
+        }
+        if ($matches['host']) $result['host'] = $matches['host'];
+        if ($matches['port']) $result['port'] = (int)$matches['port'];
+        if (isset($matches['path'])) $result['path'] = $matches['path'];
+        if ($matches['user']) $result['user'] = $matches['user'];
+        if ($matches['pass']) $result['pass'] = $matches['pass'];
+    } else {
+        $result['path'] = $uri;
+    }
+
+    return $result;
+}
diff --git a/vendor/sabre/vobject/.travis.yml b/vendor/sabre/vobject/.travis.yml
index b7266a878..3c5b32157 100644
--- a/vendor/sabre/vobject/.travis.yml
+++ b/vendor/sabre/vobject/.travis.yml
@@ -2,7 +2,8 @@ language: php
 php:
   - 5.5
   - 5.6
-  - 7
+  - 7.0
+  - 7.1
 
 sudo: false
 
diff --git a/vendor/sabre/vobject/CHANGELOG.md b/vendor/sabre/vobject/CHANGELOG.md
index 4c72680f8..c8f4cb4be 100644
--- a/vendor/sabre/vobject/CHANGELOG.md
+++ b/vendor/sabre/vobject/CHANGELOG.md
@@ -1,6 +1,22 @@
 ChangeLog
 =========
 
+4.1.2 (2016-12-15)
+------------------
+
+* #340: Support for `BYYEARDAY` recurrence when `FREQ=YEARLY`. (@PHPGangsta)
+* #341: Support for `BYWEEKNO` recurrence when `FREQ=YEARLY`. (@PHPGangsta)
+* Updated to the latest windows timezone data mappings.
+* #344: Auto-detecting more Outlook 365-generated timezone identifiers.
+  (@jpirkey)
+* #348: `FreeBusyGenerator` can now accept streams.
+* Support sabre/xml 1.5 and 2.0.
+* #355: Support `DateTimeInterface` in more places where only `DateTime` was
+  supported. (@gharlan).
+* #351: Fixing an inclusive/exclusive problem with `isInTimeRange` and
+  `fastForward` with all-day events. (@strokyl, thanks you are brilliant).
+
+
 4.1.1 (2016-07-15)
 ------------------
 
@@ -143,7 +159,7 @@ ChangeLog
   and `IntegerValue` to allow PHP 7 compatibility.
 
 
-3.5.3 (????-??-??)
+3.5.3 (2016-10-06)
 ------------------
 
 * #331: Fix dealing with multiple overridden instances falling on the same
diff --git a/vendor/sabre/vobject/bin/fetch_windows_zones.php b/vendor/sabre/vobject/bin/fetch_windows_zones.php
index 1b1fdc37c..3f2a00f7a 100755
--- a/vendor/sabre/vobject/bin/fetch_windows_zones.php
+++ b/vendor/sabre/vobject/bin/fetch_windows_zones.php
@@ -36,7 +36,7 @@ fwrite($f, " *\n");
 fwrite($f, " * Last update: " . date(DATE_W3C) . "\n");
 fwrite($f, " * Source: " . $windowsZonesUrl . "\n");
 fwrite($f, " *\n");
-fwrite($f, " * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).\n");
+fwrite($f, " * @copyright Copyright (C) fruux GmbH (https://fruux.com/).\n");
 fwrite($f, " * @license http://sabre.io/license/ Modified BSD License\n");
 fwrite($f, " */\n");
 fwrite($f, "\n");
diff --git a/vendor/sabre/vobject/composer.json b/vendor/sabre/vobject/composer.json
index bd6348a82..cfa4a712d 100644
--- a/vendor/sabre/vobject/composer.json
+++ b/vendor/sabre/vobject/composer.json
@@ -34,11 +34,11 @@
     "require" : {
         "php"          : ">=5.5",
         "ext-mbstring" : "*",
-        "sabre/xml"    : "~1.1"
+        "sabre/xml"    : ">=1.5 <3.0"
     },
     "require-dev" : {
         "phpunit/phpunit" : "*",
-        "sabre/cs"        : "~0.0.3"
+        "sabre/cs"        : "^1.0.0"
 
     },
     "suggest" : {
diff --git a/vendor/sabre/vobject/lib/BirthdayCalendarGenerator.php b/vendor/sabre/vobject/lib/BirthdayCalendarGenerator.php
index afa41ab1c..553912249 100644
--- a/vendor/sabre/vobject/lib/BirthdayCalendarGenerator.php
+++ b/vendor/sabre/vobject/lib/BirthdayCalendarGenerator.php
@@ -159,10 +159,10 @@ class BirthdayCalendarGenerator {
 
             // Create event.
             $event = $calendar->add('VEVENT', [
-                'SUMMARY'      => sprintf($this->format, $object->FN->getValue()),
-                'DTSTART'      => new \DateTime($object->BDAY->getValue()),
-                'RRULE'        => 'FREQ=YEARLY',
-                'TRANSP'       => 'TRANSPARENT',
+                'SUMMARY' => sprintf($this->format, $object->FN->getValue()),
+                'DTSTART' => new \DateTime($object->BDAY->getValue()),
+                'RRULE'   => 'FREQ=YEARLY',
+                'TRANSP'  => 'TRANSPARENT',
             ]);
 
             // add VALUE=date
diff --git a/vendor/sabre/vobject/lib/Component/VAlarm.php b/vendor/sabre/vobject/lib/Component/VAlarm.php
index 8cbd572e6..faa8a5e74 100644
--- a/vendor/sabre/vobject/lib/Component/VAlarm.php
+++ b/vendor/sabre/vobject/lib/Component/VAlarm.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\VObject\Component;
 
+use DateTimeImmutable;
+use DateTimeInterface;
 use Sabre\VObject;
 use Sabre\VObject\InvalidDataException;
-use DateTimeInterface;
-use DateTimeImmutable;
 
 /**
  * VAlarm component.
diff --git a/vendor/sabre/vobject/lib/Component/VCalendar.php b/vendor/sabre/vobject/lib/Component/VCalendar.php
index 988db9dc2..1b3137d38 100644
--- a/vendor/sabre/vobject/lib/Component/VCalendar.php
+++ b/vendor/sabre/vobject/lib/Component/VCalendar.php
@@ -6,10 +6,10 @@ use DateTimeInterface;
 use DateTimeZone;
 use Sabre\VObject;
 use Sabre\VObject\Component;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property;
 use Sabre\VObject\Recur\EventIterator;
 use Sabre\VObject\Recur\NoInstancesException;
-use Sabre\VObject\InvalidDataException;
 
 /**
  * The VCalendar component.
@@ -54,21 +54,21 @@ class VCalendar extends VObject\Document {
      * @var array
      */
     static $valueMap = [
-        'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
-        'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
-        'CAL-ADDRESS'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
-        'DATE'             => 'Sabre\\VObject\\Property\\ICalendar\\Date',
-        'DATE-TIME'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DURATION'         => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
-        'PERIOD'           => 'Sabre\\VObject\\Property\\ICalendar\\Period',
-        'RECUR'            => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
-        'TEXT'             => 'Sabre\\VObject\\Property\\Text',
-        'TIME'             => 'Sabre\\VObject\\Property\\Time',
-        'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
-        'URI'              => 'Sabre\\VObject\\Property\\Uri',
-        'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
+        'BINARY'      => 'Sabre\\VObject\\Property\\Binary',
+        'BOOLEAN'     => 'Sabre\\VObject\\Property\\Boolean',
+        'CAL-ADDRESS' => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
+        'DATE'        => 'Sabre\\VObject\\Property\\ICalendar\\Date',
+        'DATE-TIME'   => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+        'DURATION'    => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
+        'FLOAT'       => 'Sabre\\VObject\\Property\\FloatValue',
+        'INTEGER'     => 'Sabre\\VObject\\Property\\IntegerValue',
+        'PERIOD'      => 'Sabre\\VObject\\Property\\ICalendar\\Period',
+        'RECUR'       => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
+        'TEXT'        => 'Sabre\\VObject\\Property\\Text',
+        'TIME'        => 'Sabre\\VObject\\Property\\Time',
+        'UNKNOWN'     => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
+        'URI'         => 'Sabre\\VObject\\Property\\Uri',
+        'UTC-OFFSET'  => 'Sabre\\VObject\\Property\\UtcOffset',
     ];
 
     /**
@@ -78,40 +78,40 @@ class VCalendar extends VObject\Document {
      */
     static $propertyMap = [
         // Calendar properties
-        'CALSCALE'      => 'Sabre\\VObject\\Property\\FlatText',
-        'METHOD'        => 'Sabre\\VObject\\Property\\FlatText',
-        'PRODID'        => 'Sabre\\VObject\\Property\\FlatText',
-        'VERSION'       => 'Sabre\\VObject\\Property\\FlatText',
+        'CALSCALE' => 'Sabre\\VObject\\Property\\FlatText',
+        'METHOD'   => 'Sabre\\VObject\\Property\\FlatText',
+        'PRODID'   => 'Sabre\\VObject\\Property\\FlatText',
+        'VERSION'  => 'Sabre\\VObject\\Property\\FlatText',
 
         // Component properties
-        'ATTACH'            => 'Sabre\\VObject\\Property\\Uri',
-        'CATEGORIES'        => 'Sabre\\VObject\\Property\\Text',
-        'CLASS'             => 'Sabre\\VObject\\Property\\FlatText',
-        'COMMENT'           => 'Sabre\\VObject\\Property\\FlatText',
-        'DESCRIPTION'       => 'Sabre\\VObject\\Property\\FlatText',
-        'GEO'               => 'Sabre\\VObject\\Property\\FloatValue',
-        'LOCATION'          => 'Sabre\\VObject\\Property\\FlatText',
-        'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\IntegerValue',
-        'PRIORITY'          => 'Sabre\\VObject\\Property\\IntegerValue',
-        'RESOURCES'         => 'Sabre\\VObject\\Property\\Text',
-        'STATUS'            => 'Sabre\\VObject\\Property\\FlatText',
-        'SUMMARY'           => 'Sabre\\VObject\\Property\\FlatText',
+        'ATTACH'           => 'Sabre\\VObject\\Property\\Uri',
+        'CATEGORIES'       => 'Sabre\\VObject\\Property\\Text',
+        'CLASS'            => 'Sabre\\VObject\\Property\\FlatText',
+        'COMMENT'          => 'Sabre\\VObject\\Property\\FlatText',
+        'DESCRIPTION'      => 'Sabre\\VObject\\Property\\FlatText',
+        'GEO'              => 'Sabre\\VObject\\Property\\FloatValue',
+        'LOCATION'         => 'Sabre\\VObject\\Property\\FlatText',
+        'PERCENT-COMPLETE' => 'Sabre\\VObject\\Property\\IntegerValue',
+        'PRIORITY'         => 'Sabre\\VObject\\Property\\IntegerValue',
+        'RESOURCES'        => 'Sabre\\VObject\\Property\\Text',
+        'STATUS'           => 'Sabre\\VObject\\Property\\FlatText',
+        'SUMMARY'          => 'Sabre\\VObject\\Property\\FlatText',
 
         // Date and Time Component Properties
-        'COMPLETED'     => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTEND'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DUE'           => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DTSTART'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'DURATION'      => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FREEBUSY'      => 'Sabre\\VObject\\Property\\ICalendar\\Period',
-        'TRANSP'        => 'Sabre\\VObject\\Property\\FlatText',
+        'COMPLETED' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+        'DTEND'     => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+        'DUE'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+        'DTSTART'   => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+        'DURATION'  => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
+        'FREEBUSY'  => 'Sabre\\VObject\\Property\\ICalendar\\Period',
+        'TRANSP'    => 'Sabre\\VObject\\Property\\FlatText',
 
         // Time Zone Component Properties
-        'TZID'          => 'Sabre\\VObject\\Property\\FlatText',
-        'TZNAME'        => 'Sabre\\VObject\\Property\\FlatText',
-        'TZOFFSETFROM'  => 'Sabre\\VObject\\Property\\UtcOffset',
-        'TZOFFSETTO'    => 'Sabre\\VObject\\Property\\UtcOffset',
-        'TZURL'         => 'Sabre\\VObject\\Property\\Uri',
+        'TZID'         => 'Sabre\\VObject\\Property\\FlatText',
+        'TZNAME'       => 'Sabre\\VObject\\Property\\FlatText',
+        'TZOFFSETFROM' => 'Sabre\\VObject\\Property\\UtcOffset',
+        'TZOFFSETTO'   => 'Sabre\\VObject\\Property\\UtcOffset',
+        'TZURL'        => 'Sabre\\VObject\\Property\\Uri',
 
         // Relationship Component Properties
         'ATTENDEE'      => 'Sabre\\VObject\\Property\\ICalendar\\CalAddress',
@@ -123,15 +123,15 @@ class VCalendar extends VObject\Document {
         'UID'           => 'Sabre\\VObject\\Property\\FlatText',
 
         // Recurrence Component Properties
-        'EXDATE'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RDATE'         => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'RRULE'         => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
-        'EXRULE'        => 'Sabre\\VObject\\Property\\ICalendar\\Recur', // Deprecated since rfc5545
+        'EXDATE' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+        'RDATE'  => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+        'RRULE'  => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
+        'EXRULE' => 'Sabre\\VObject\\Property\\ICalendar\\Recur', // Deprecated since rfc5545
 
         // Alarm Component Properties
-        'ACTION'        => 'Sabre\\VObject\\Property\\FlatText',
-        'REPEAT'        => 'Sabre\\VObject\\Property\\IntegerValue',
-        'TRIGGER'       => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
+        'ACTION'  => 'Sabre\\VObject\\Property\\FlatText',
+        'REPEAT'  => 'Sabre\\VObject\\Property\\IntegerValue',
+        'TRIGGER' => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
 
         // Change Management Component Properties
         'CREATED'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
@@ -143,13 +143,13 @@ class VCalendar extends VObject\Document {
         'REQUEST-STATUS' => 'Sabre\\VObject\\Property\\Text',
 
         // Additions from draft-daboo-valarm-extensions-04
-        'ALARM-AGENT'    => 'Sabre\\VObject\\Property\\Text',
-        'ACKNOWLEDGED'   => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'PROXIMITY'      => 'Sabre\\VObject\\Property\\Text',
-        'DEFAULT-ALARM'  => 'Sabre\\VObject\\Property\\Boolean',
+        'ALARM-AGENT'   => 'Sabre\\VObject\\Property\\Text',
+        'ACKNOWLEDGED'  => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
+        'PROXIMITY'     => 'Sabre\\VObject\\Property\\Text',
+        'DEFAULT-ALARM' => 'Sabre\\VObject\\Property\\Boolean',
 
         // Additions from draft-daboo-calendar-availability-05
-        'BUSYTYPE'       => 'Sabre\\VObject\\Property\\Text',
+        'BUSYTYPE' => 'Sabre\\VObject\\Property\\Text',
 
     ];
 
diff --git a/vendor/sabre/vobject/lib/Component/VCard.php b/vendor/sabre/vobject/lib/Component/VCard.php
index 3c05191a9..4f620de10 100644
--- a/vendor/sabre/vobject/lib/Component/VCard.php
+++ b/vendor/sabre/vobject/lib/Component/VCard.php
@@ -74,19 +74,19 @@ class VCard extends VObject\Document {
     static $propertyMap = [
 
         // vCard 2.1 properties and up
-        'N'       => 'Sabre\\VObject\\Property\\Text',
-        'FN'      => 'Sabre\\VObject\\Property\\FlatText',
-        'PHOTO'   => 'Sabre\\VObject\\Property\\Binary',
-        'BDAY'    => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
-        'ADR'     => 'Sabre\\VObject\\Property\\Text',
-        'LABEL'   => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-        'TEL'     => 'Sabre\\VObject\\Property\\FlatText',
-        'EMAIL'   => 'Sabre\\VObject\\Property\\FlatText',
-        'MAILER'  => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
-        'GEO'     => 'Sabre\\VObject\\Property\\FlatText',
-        'TITLE'   => 'Sabre\\VObject\\Property\\FlatText',
-        'ROLE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'LOGO'    => 'Sabre\\VObject\\Property\\Binary',
+        'N'      => 'Sabre\\VObject\\Property\\Text',
+        'FN'     => 'Sabre\\VObject\\Property\\FlatText',
+        'PHOTO'  => 'Sabre\\VObject\\Property\\Binary',
+        'BDAY'   => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
+        'ADR'    => 'Sabre\\VObject\\Property\\Text',
+        'LABEL'  => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+        'TEL'    => 'Sabre\\VObject\\Property\\FlatText',
+        'EMAIL'  => 'Sabre\\VObject\\Property\\FlatText',
+        'MAILER' => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
+        'GEO'    => 'Sabre\\VObject\\Property\\FlatText',
+        'TITLE'  => 'Sabre\\VObject\\Property\\FlatText',
+        'ROLE'   => 'Sabre\\VObject\\Property\\FlatText',
+        'LOGO'   => 'Sabre\\VObject\\Property\\Binary',
         // 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
                                  // not supported at the moment
         'ORG'     => 'Sabre\\VObject\\Property\\Text',
@@ -107,13 +107,13 @@ class VCard extends VObject\Document {
         'CLASS'       => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
 
         // rfc2739 properties
-        'FBURL'        => 'Sabre\\VObject\\Property\\Uri',
-        'CAPURI'       => 'Sabre\\VObject\\Property\\Uri',
-        'CALURI'       => 'Sabre\\VObject\\Property\\Uri',
-        'CALADRURI'    => 'Sabre\\VObject\\Property\\Uri',
+        'FBURL'     => 'Sabre\\VObject\\Property\\Uri',
+        'CAPURI'    => 'Sabre\\VObject\\Property\\Uri',
+        'CALURI'    => 'Sabre\\VObject\\Property\\Uri',
+        'CALADRURI' => 'Sabre\\VObject\\Property\\Uri',
 
         // rfc4770 properties
-        'IMPP'         => 'Sabre\\VObject\\Property\\Uri',
+        'IMPP' => 'Sabre\\VObject\\Property\\Uri',
 
         // vCard 4.0 properties
         'SOURCE'       => 'Sabre\\VObject\\Property\\Uri',
@@ -127,9 +127,9 @@ class VCard extends VObject\Document {
         'RELATED'      => 'Sabre\\VObject\\Property\\Uri',
 
         // rfc6474 properties
-        'BIRTHPLACE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'DEATHPLACE'    => 'Sabre\\VObject\\Property\\FlatText',
-        'DEATHDATE'     => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
+        'BIRTHPLACE' => 'Sabre\\VObject\\Property\\FlatText',
+        'DEATHPLACE' => 'Sabre\\VObject\\Property\\FlatText',
+        'DEATHDATE'  => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
 
         // rfc6715 properties
         'EXPERTISE'     => 'Sabre\\VObject\\Property\\FlatText',
@@ -368,7 +368,7 @@ class VCard extends VObject\Document {
             // FN is commented out, because it's already handled by the
             // validate function, which may also try to repair it.
             // 'FN'           => '+',
-            'UID'          => '?',
+            'UID' => '?',
         ];
 
     }
diff --git a/vendor/sabre/vobject/lib/DateTimeParser.php b/vendor/sabre/vobject/lib/DateTimeParser.php
index 443bbb660..f9a802d25 100644
--- a/vendor/sabre/vobject/lib/DateTimeParser.php
+++ b/vendor/sabre/vobject/lib/DateTimeParser.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\VObject;
 
+use DateInterval;
 use DateTimeImmutable;
 use DateTimeZone;
-use DateInterval;
 
 /**
  * DateTimeParser.
@@ -509,7 +509,7 @@ class DateTimeParser {
     static function parseVCardDateAndOrTime($date) {
 
         // \d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d
-        $valueDate     = '/^(?J)(?:' .
+        $valueDate = '/^(?J)(?:' .
                          '(?<year>\d{4})(?<month>\d\d)(?<date>\d\d)' .
                          '|(?<year>\d{4})-(?<month>\d\d)' .
                          '|--(?<month>\d\d)(?<date>\d\d)?' .
@@ -517,7 +517,7 @@ class DateTimeParser {
                          ')$/';
 
         // (\d\d(\d\d(\d\d)?)?|-\d\d(\d\d)?|--\d\d)(Z|[+\-]\d\d(\d\d)?)?
-        $valueTime     = '/^(?J)(?:' .
+        $valueTime = '/^(?J)(?:' .
                          '((?<hour>\d\d)((?<minute>\d\d)(?<second>\d\d)?)?' .
                          '|-(?<minute>\d\d)(?<second>\d\d)?' .
                          '|--(?<second>\d\d))' .
@@ -554,12 +554,12 @@ class DateTimeParser {
         ];
 
         // The $valueDateTime expression has a bug with (?J) so we simulate it.
-        $parts['date0']  = &$parts['date'];
-        $parts['date1']  = &$parts['date'];
-        $parts['date2']  = &$parts['date'];
+        $parts['date0'] = &$parts['date'];
+        $parts['date1'] = &$parts['date'];
+        $parts['date2'] = &$parts['date'];
         $parts['month0'] = &$parts['month'];
         $parts['month1'] = &$parts['month'];
-        $parts['year0']  = &$parts['year'];
+        $parts['year0'] = &$parts['year'];
 
         foreach ($parts as $part => &$value) {
             if (!empty($matches[$part])) {
diff --git a/vendor/sabre/vobject/lib/FreeBusyGenerator.php b/vendor/sabre/vobject/lib/FreeBusyGenerator.php
index e33621090..e30b136c4 100644
--- a/vendor/sabre/vobject/lib/FreeBusyGenerator.php
+++ b/vendor/sabre/vobject/lib/FreeBusyGenerator.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject;
 
-use DateTimeInterface;
 use DateTimeImmutable;
+use DateTimeInterface;
 use DateTimeZone;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Recur\EventIterator;
@@ -152,7 +152,7 @@ class FreeBusyGenerator {
         $this->objects = [];
         foreach ($objects as $object) {
 
-            if (is_string($object)) {
+            if (is_string($object) || is_resource($object)) {
                 $this->objects[] = Reader::read($object);
             } elseif ($object instanceof Component) {
                 $this->objects[] = $object;
@@ -292,7 +292,7 @@ class FreeBusyGenerator {
                 list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
                 if (
                     (is_null($higherStart) || $higherStart < $compStart) &&
-                    (is_null($higherEnd)   || $higherEnd > $compEnd)
+                    (is_null($higherEnd) || $higherEnd > $compEnd)
                 ) {
 
                     // Component is fully covered by a higher priority
diff --git a/vendor/sabre/vobject/lib/Parameter.php b/vendor/sabre/vobject/lib/Parameter.php
index 270643eab..a99a33eec 100644
--- a/vendor/sabre/vobject/lib/Parameter.php
+++ b/vendor/sabre/vobject/lib/Parameter.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject;
 
-use Sabre\Xml;
 use ArrayIterator;
+use Sabre\Xml;
 
 /**
  * VObject Parameter.
diff --git a/vendor/sabre/vobject/lib/Parser/Json.php b/vendor/sabre/vobject/lib/Parser/Json.php
index 370c981a8..a77258a2e 100644
--- a/vendor/sabre/vobject/lib/Parser/Json.php
+++ b/vendor/sabre/vobject/lib/Parser/Json.php
@@ -4,8 +4,8 @@ namespace Sabre\VObject\Parser;
 
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
-use Sabre\VObject\ParseException;
 use Sabre\VObject\EofException;
+use Sabre\VObject\ParseException;
 
 /**
  * Json Parser.
diff --git a/vendor/sabre/vobject/lib/Parser/MimeDir.php b/vendor/sabre/vobject/lib/Parser/MimeDir.php
index 6a7f9317b..fa75a1a3b 100644
--- a/vendor/sabre/vobject/lib/Parser/MimeDir.php
+++ b/vendor/sabre/vobject/lib/Parser/MimeDir.php
@@ -2,12 +2,12 @@
 
 namespace Sabre\VObject\Parser;
 
-use Sabre\VObject\ParseException;
-use Sabre\VObject\EofException;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Document;
+use Sabre\VObject\EofException;
+use Sabre\VObject\ParseException;
 
 /**
  * MimeDir parser.
diff --git a/vendor/sabre/vobject/lib/Parser/XML.php b/vendor/sabre/vobject/lib/Parser/XML.php
index 060a7fe2e..5ac423984 100644
--- a/vendor/sabre/vobject/lib/Parser/XML.php
+++ b/vendor/sabre/vobject/lib/Parser/XML.php
@@ -20,7 +20,7 @@ use Sabre\Xml as SabreXml;
  */
 class XML extends Parser {
 
-    const XCAL_NAMESPACE  = 'urn:ietf:params:xml:ns:icalendar-2.0';
+    const XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0';
     const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
 
     /**
@@ -100,7 +100,7 @@ class XML extends Parser {
                 foreach ($this->input['value'] as &$vCard) {
 
                     $this->root = new VCard(['version' => '4.0'], false);
-                    $this->pointer  = &$vCard;
+                    $this->pointer = &$vCard;
                     $this->parseVCardComponents($this->root);
 
                     // We just parse the first <vcard /> element.
@@ -172,10 +172,10 @@ class XML extends Parser {
 
             list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
 
-            $propertyName       = $tagName;
-            $propertyValue      = [];
+            $propertyName = $tagName;
+            $propertyValue = [];
             $propertyParameters = [];
-            $propertyType       = 'text';
+            $propertyType = 'text';
 
             // A property which is not part of the standard.
             if ($namespace !== self::XCAL_NAMESPACE
@@ -253,8 +253,8 @@ class XML extends Parser {
             switch ($propertyNameExtended) {
 
                 case 'xcal:geo':
-                    $propertyType               = 'float';
-                    $propertyValue['latitude']  = 0;
+                    $propertyType = 'float';
+                    $propertyValue['latitude'] = 0;
                     $propertyValue['longitude'] = 0;
 
                     foreach ($xmlProperty['value'] as $xmlRequestChild) {
@@ -296,7 +296,7 @@ class XML extends Parser {
                         if ('period' === $tagName) {
 
                             $propertyParameters['value'] = 'PERIOD';
-                            $propertyValue[]             = implode('/', $specialChild['value']);
+                            $propertyValue[] = implode('/', $specialChild['value']);
 
                         }
                         else {
@@ -306,7 +306,7 @@ class XML extends Parser {
                     break;
 
                 default:
-                    $propertyType  = static::getTagName($xmlProperty['value'][0]['name']);
+                    $propertyType = static::getTagName($xmlProperty['value'][0]['name']);
 
                     foreach ($xmlProperty['value'] as $value) {
                         $propertyValue[] = $value['value'];
@@ -343,7 +343,7 @@ class XML extends Parser {
 
         foreach ($components as $component) {
 
-            $componentName    = static::getTagName($component['name']);
+            $componentName = static::getTagName($component['name']);
             $currentComponent = $this->root->createComponent(
                 $componentName,
                 null,
@@ -404,7 +404,7 @@ class XML extends Parser {
             $reader->elementMap['{' . self::XCAL_NAMESPACE . '}recur']
                 = 'Sabre\VObject\Parser\XML\Element\KeyValue';
             $reader->xml($input);
-            $input  = $reader->parse();
+            $input = $reader->parse();
 
         }
 
diff --git a/vendor/sabre/vobject/lib/Property/ICalendar/Duration.php b/vendor/sabre/vobject/lib/Property/ICalendar/Duration.php
index 66d366960..7b7e1ce8e 100644
--- a/vendor/sabre/vobject/lib/Property/ICalendar/Duration.php
+++ b/vendor/sabre/vobject/lib/Property/ICalendar/Duration.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
-use Sabre\VObject\Property;
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\Property;
 
 /**
  * Duration property.
diff --git a/vendor/sabre/vobject/lib/Property/ICalendar/Period.php b/vendor/sabre/vobject/lib/Property/ICalendar/Period.php
index a4561d929..d35b425aa 100644
--- a/vendor/sabre/vobject/lib/Property/ICalendar/Period.php
+++ b/vendor/sabre/vobject/lib/Property/ICalendar/Period.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
-use Sabre\VObject\Property;
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\Property;
 use Sabre\Xml;
 
 /**
diff --git a/vendor/sabre/vobject/lib/Property/ICalendar/Recur.php b/vendor/sabre/vobject/lib/Property/ICalendar/Recur.php
index 8392a5cc1..434b77088 100644
--- a/vendor/sabre/vobject/lib/Property/ICalendar/Recur.php
+++ b/vendor/sabre/vobject/lib/Property/ICalendar/Recur.php
@@ -287,6 +287,54 @@ class Recur extends Property {
                         }
                     }
                 }
+                // if there is no valid entry left, remove the whole value
+                if (is_array($value) && empty($values[$key])) {
+                    unset($values[$key]);
+                }
+            } elseif ($key == 'BYWEEKNO') {
+                $byWeekNo = (array)$value;
+                foreach ($byWeekNo as $i => $v) {
+                    if (!is_numeric($v) || (int)$v < -53 || (int)$v == 0 || (int)$v > 53) {
+                        $warnings[] = [
+                            'level'   => $repair ? 1 : 3,
+                            'message' => 'BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!',
+                            'node'    => $this
+                        ];
+                        if ($repair) {
+                            if (is_array($value)) {
+                                unset($values[$key][$i]);
+                            } else {
+                                unset($values[$key]);
+                            }
+                        }
+                    }
+                }
+                // if there is no valid entry left, remove the whole value
+                if (is_array($value) && empty($values[$key])) {
+                    unset($values[$key]);
+                }
+            } elseif ($key == 'BYYEARDAY') {
+                $byYearDay = (array)$value;
+                foreach ($byYearDay as $i => $v) {
+                    if (!is_numeric($v) || (int)$v < -366 || (int)$v == 0 || (int)$v > 366) {
+                        $warnings[] = [
+                            'level'   => $repair ? 1 : 3,
+                            'message' => 'BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!',
+                            'node'    => $this
+                        ];
+                        if ($repair) {
+                            if (is_array($value)) {
+                                unset($values[$key][$i]);
+                            } else {
+                                unset($values[$key]);
+                            }
+                        }
+                    }
+                }
+                // if there is no valid entry left, remove the whole value
+                if (is_array($value) && empty($values[$key])) {
+                    unset($values[$key]);
+                }
             }
 
         }
diff --git a/vendor/sabre/vobject/lib/Property/Text.php b/vendor/sabre/vobject/lib/Property/Text.php
index abc17563f..476dcde4d 100644
--- a/vendor/sabre/vobject/lib/Property/Text.php
+++ b/vendor/sabre/vobject/lib/Property/Text.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\VObject\Property;
 
-use Sabre\VObject\Property;
 use Sabre\VObject\Component;
-use Sabre\VObject\Parser\MimeDir;
 use Sabre\VObject\Document;
+use Sabre\VObject\Parser\MimeDir;
+use Sabre\VObject\Property;
 use Sabre\Xml;
 
 /**
diff --git a/vendor/sabre/vobject/lib/Property/Uri.php b/vendor/sabre/vobject/lib/Property/Uri.php
index 58e676e60..88fcfaab8 100644
--- a/vendor/sabre/vobject/lib/Property/Uri.php
+++ b/vendor/sabre/vobject/lib/Property/Uri.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Property;
 
-use Sabre\VObject\Property;
 use Sabre\VObject\Parameter;
+use Sabre\VObject\Property;
 
 /**
  * URI property.
diff --git a/vendor/sabre/vobject/lib/Property/VCard/DateAndOrTime.php b/vendor/sabre/vobject/lib/Property/VCard/DateAndOrTime.php
index 650e19cbf..3b4ae3bb5 100644
--- a/vendor/sabre/vobject/lib/Property/VCard/DateAndOrTime.php
+++ b/vendor/sabre/vobject/lib/Property/VCard/DateAndOrTime.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\VObject\Property\VCard;
 
-use DateTimeInterface;
-use DateTimeImmutable;
 use DateTime;
+use DateTimeImmutable;
+use DateTimeInterface;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property;
@@ -45,7 +45,7 @@ class DateAndOrTime extends Property {
     /**
      * Sets a multi-valued property.
      *
-     * You may also specify DateTime objects here.
+     * You may also specify DateTimeInterface objects here.
      *
      * @param array $parts
      *
@@ -56,7 +56,7 @@ class DateAndOrTime extends Property {
         if (count($parts) > 1) {
             throw new \InvalidArgumentException('Only one value allowed');
         }
-        if (isset($parts[0]) && $parts[0] instanceof \DateTime) {
+        if (isset($parts[0]) && $parts[0] instanceof DateTimeInterface) {
             $this->setDateTime($parts[0]);
         } else {
             parent::setParts($parts);
@@ -69,15 +69,15 @@ class DateAndOrTime extends Property {
      *
      * This may be either a single, or multiple strings in an array.
      *
-     * Instead of strings, you may also use DateTime here.
+     * Instead of strings, you may also use DateTimeInterface here.
      *
-     * @param string|array|\DateTime $value
+     * @param string|array|DateTimeInterface $value
      *
      * @return void
      */
     function setValue($value) {
 
-        if ($value instanceof \DateTime) {
+        if ($value instanceof DateTimeInterface) {
             $this->setDateTime($value);
         } else {
             parent::setValue($value);
@@ -261,8 +261,8 @@ class DateAndOrTime extends Property {
     protected function xmlSerializeValue(Xml\Writer $writer) {
 
         $valueType = strtolower($this->getValueType());
-        $parts     = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
-        $value     = '';
+        $parts = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
+        $value = '';
 
         // $d = defined
         $d = function($part) use ($parts) {
@@ -280,7 +280,7 @@ class DateAndOrTime extends Property {
         // value-date = element date {
         //     xsd:string { pattern = "\d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d" }
         //   }
-        if (($d('year') ||  $d('month')  ||  $d('date'))
+        if (($d('year') || $d('month') || $d('date'))
             && (!$d('hour') && !$d('minute') && !$d('second') && !$d('timezone'))) {
 
             if ($d('year') && $d('month') && $d('date')) {
@@ -298,8 +298,8 @@ class DateAndOrTime extends Property {
         //     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
         //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
         //   }
-        } elseif ((!$d('year') && !$d('month')  && !$d('date'))
-                  && ($d('hour') ||  $d('minute') ||  $d('second'))) {
+        } elseif ((!$d('year') && !$d('month') && !$d('date'))
+                  && ($d('hour') || $d('minute') || $d('second'))) {
 
             if ($d('hour')) {
                 $value .= $r('hour') . $r('minute') . $r('second');
diff --git a/vendor/sabre/vobject/lib/Recur/EventIterator.php b/vendor/sabre/vobject/lib/Recur/EventIterator.php
index f91c336bc..d313305a0 100644
--- a/vendor/sabre/vobject/lib/Recur/EventIterator.php
+++ b/vendor/sabre/vobject/lib/Recur/EventIterator.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\VObject\Recur;
 
-use DateTimeZone;
 use DateTimeImmutable;
 use DateTimeInterface;
+use DateTimeZone;
 use InvalidArgumentException;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VEvent;
@@ -43,6 +43,8 @@ use Sabre\VObject\Settings;
  *     * BYSETPOS
  *   * FREQ=YEARLY
  *     * BYMONTH
+ *     * BYYEARDAY
+ *     * BYWEEKNO
  *     * BYMONTHDAY (only if BYMONTH is also set)
  *     * BYDAY (only if BYMONTH is also set)
  *
@@ -407,7 +409,7 @@ class EventIterator implements \Iterator {
      */
     function fastForward(DateTimeInterface $dateTime) {
 
-        while ($this->valid() && $this->getDtEnd() < $dateTime) {
+        while ($this->valid() && $this->getDtEnd() <= $dateTime) {
             $this->next();
         }
 
diff --git a/vendor/sabre/vobject/lib/Recur/RRuleIterator.php b/vendor/sabre/vobject/lib/Recur/RRuleIterator.php
index 4c89f3ce4..20f34ef42 100644
--- a/vendor/sabre/vobject/lib/Recur/RRuleIterator.php
+++ b/vendor/sabre/vobject/lib/Recur/RRuleIterator.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\VObject\Recur;
 
-use DateTimeInterface;
 use DateTimeImmutable;
+use DateTimeInterface;
 use Iterator;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;
@@ -374,8 +374,8 @@ class RRuleIterator implements Iterator {
             $currentHour = $this->currentDate->format('G');
 
         } while (
-            ($this->byDay   && !in_array($currentDay, $recurrenceDays)) ||
-            ($this->byHour  && !in_array($currentHour, $recurrenceHours)) ||
+            ($this->byDay && !in_array($currentDay, $recurrenceDays)) ||
+            ($this->byHour && !in_array($currentHour, $recurrenceHours)) ||
             ($this->byMonth && !in_array($currentMonth, $recurrenceMonths))
         );
 
@@ -537,6 +537,83 @@ class RRuleIterator implements Iterator {
 
             }
 
+            if ($this->byWeekNo !== null) { // byWeekNo is an array with values from -53 to -1, or 1 to 53
+                $dayOffsets = [];
+                if ($this->byDay) {
+                    foreach ($this->byDay as $byDay) {
+                        $dayOffsets[] = $this->dayMap[$byDay];
+                    }
+                } else {   // default is Monday
+                    $dayOffsets[] = 1;
+                }
+
+                $currentYear = $this->currentDate->format('Y');
+
+                while (true) {
+                    $checkDates = [];
+
+                    // loop through all WeekNo and Days to check all the combinations
+                    foreach ($this->byWeekNo as $byWeekNo) {
+                        foreach ($dayOffsets as $dayOffset) {
+                            $date = clone $this->currentDate;
+                            $date->setISODate($currentYear, $byWeekNo, $dayOffset);
+
+                            if ($date > $this->currentDate) {
+                                $checkDates[] = $date;
+                            }
+                        }
+                    }
+
+                    if (count($checkDates) > 0) {
+                        $this->currentDate = min($checkDates);
+                        return;
+                    }
+
+                    // if there is no date found, check the next year
+                    $currentYear += $this->interval;
+                }
+            }
+
+            if ($this->byYearDay !== null) { // byYearDay is an array with values from -366 to -1, or 1 to 366
+                $dayOffsets = [];
+                if ($this->byDay) {
+                    foreach ($this->byDay as $byDay) {
+                        $dayOffsets[] = $this->dayMap[$byDay];
+                    }
+                } else {   // default is Monday-Sunday
+                    $dayOffsets = [1,2,3,4,5,6,7];
+                }
+
+                $currentYear = $this->currentDate->format('Y');
+
+                while (true) {
+                    $checkDates = [];
+
+                    // loop through all YearDay and Days to check all the combinations
+                    foreach ($this->byYearDay as $byYearDay) {
+                        $date = clone $this->currentDate;
+                        $date->setDate($currentYear, 1, 1);
+                        if ($byYearDay > 0) {
+                            $date->add(new \DateInterval('P' . $byYearDay . 'D'));
+                        } else {
+                            $date->sub(new \DateInterval('P' . abs($byYearDay) . 'D'));
+                        }
+
+                        if ($date > $this->currentDate && in_array($date->format('N'), $dayOffsets)) {
+                            $checkDates[] = $date;
+                        }
+                    }
+
+                    if (count($checkDates) > 0) {
+                        $this->currentDate = min($checkDates);
+                        return;
+                    }
+
+                    // if there is no date found, check the next year
+                    $currentYear += $this->interval;
+                }
+            }
+
             // The easiest form
             $this->currentDate = $this->currentDate->modify('+' . $this->interval . ' years');
             return;
@@ -710,10 +787,20 @@ class RRuleIterator implements Iterator {
 
                 case 'BYYEARDAY' :
                     $this->byYearDay = (array)$value;
+                    foreach ($this->byYearDay as $byYearDay) {
+                        if (!is_numeric($byYearDay) || (int)$byYearDay < -366 || (int)$byYearDay == 0 || (int)$byYearDay > 366) {
+                            throw new InvalidDataException('BYYEARDAY in RRULE must have value(s) from 1 to 366, or -366 to -1!');
+                        }
+                    }
                     break;
 
                 case 'BYWEEKNO' :
                     $this->byWeekNo = (array)$value;
+                    foreach ($this->byWeekNo as $byWeekNo) {
+                        if (!is_numeric($byWeekNo) || (int)$byWeekNo < -53 || (int)$byWeekNo == 0 || (int)$byWeekNo > 53) {
+                            throw new InvalidDataException('BYWEEKNO in RRULE must have value(s) from 1 to 53, or -53 to -1!');
+                        }
+                    }
                     break;
 
                 case 'BYMONTH' :
diff --git a/vendor/sabre/vobject/lib/TimeZoneUtil.php b/vendor/sabre/vobject/lib/TimeZoneUtil.php
index 2a95ae898..925183e8d 100644
--- a/vendor/sabre/vobject/lib/TimeZoneUtil.php
+++ b/vendor/sabre/vobject/lib/TimeZoneUtil.php
@@ -165,6 +165,16 @@ class TimeZoneUtil {
             return new \DateTimeZone(self::$map[$tzid]);
         }
 
+        // Some Microsoft products prefix the offset first, so let's strip that off
+        // and see if it is our tzid map.  We don't want to check for this first just
+        // in case there are overrides in our tzid map.
+        if (preg_match('/^\((UTC|GMT)(\+|\-)[\d]{2}\:[\d]{2}\) (.*)/', $tzid, $matches)) {
+            $tzidAlternate = $matches[3];
+            if (isset(self::$map[$tzidAlternate])) {
+                return new \DateTimeZone(self::$map[$tzidAlternate]);
+            }
+        }
+
         // Maybe the author was hyper-lazy and just included an offset. We
         // support it, but we aren't happy about it.
         if (preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)) {
diff --git a/vendor/sabre/vobject/lib/Version.php b/vendor/sabre/vobject/lib/Version.php
index ca9f21960..346e2044d 100644
--- a/vendor/sabre/vobject/lib/Version.php
+++ b/vendor/sabre/vobject/lib/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number.
      */
-    const VERSION = '4.1.1';
+    const VERSION = '4.1.2';
 
 }
diff --git a/vendor/sabre/vobject/lib/timezonedata/lotuszones.php b/vendor/sabre/vobject/lib/timezonedata/lotuszones.php
index 7d0785f04..79d555a92 100644
--- a/vendor/sabre/vobject/lib/timezonedata/lotuszones.php
+++ b/vendor/sabre/vobject/lib/timezonedata/lotuszones.php
@@ -17,85 +17,85 @@ return [
     'Mexico Standard Time 2' => 'America/Chihuahua',
     'Mountain'               => 'America/Denver',
     // 'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
-    'US Mountain'            => 'America/Phoenix',
-    'Canada Central'         => 'America/Edmonton',
-    'Central America'        => 'America/Guatemala',
-    'Central'                => 'America/Chicago',
+    'US Mountain'     => 'America/Phoenix',
+    'Canada Central'  => 'America/Edmonton',
+    'Central America' => 'America/Guatemala',
+    'Central'         => 'America/Chicago',
     // 'Central Standard Time'  => 'America/Mexico_City', // conflict with windows timezones.
-    'Mexico'                 => 'America/Mexico_City',
-    'Eastern'                => 'America/New_York',
-    'SA Pacific'             => 'America/Bogota',
-    'US Eastern'             => 'America/Indiana/Indianapolis',
-    'Venezuela'              => 'America/Caracas',
-    'Atlantic'               => 'America/Halifax',
-    'Central Brazilian'      => 'America/Manaus',
-    'Pacific SA'             => 'America/Santiago',
-    'SA Western'             => 'America/La_Paz',
-    'Newfoundland'           => 'America/St_Johns',
-    'Argentina'              => 'America/Argentina/Buenos_Aires',
-    'E. South America'       => 'America/Belem',
-    'Greenland'              => 'America/Godthab',
-    'Montevideo'             => 'America/Montevideo',
-    'SA Eastern'             => 'America/Belem',
+    'Mexico'            => 'America/Mexico_City',
+    'Eastern'           => 'America/New_York',
+    'SA Pacific'        => 'America/Bogota',
+    'US Eastern'        => 'America/Indiana/Indianapolis',
+    'Venezuela'         => 'America/Caracas',
+    'Atlantic'          => 'America/Halifax',
+    'Central Brazilian' => 'America/Manaus',
+    'Pacific SA'        => 'America/Santiago',
+    'SA Western'        => 'America/La_Paz',
+    'Newfoundland'      => 'America/St_Johns',
+    'Argentina'         => 'America/Argentina/Buenos_Aires',
+    'E. South America'  => 'America/Belem',
+    'Greenland'         => 'America/Godthab',
+    'Montevideo'        => 'America/Montevideo',
+    'SA Eastern'        => 'America/Belem',
     // 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
-    'Azores'                 => 'Atlantic/Azores',
-    'Cape Verde'             => 'Atlantic/Cape_Verde',
-    'Greenwich'              => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
-    'Morocco'                => 'Africa/Casablanca',
-    'Central Europe'         => 'Europe/Prague',
-    'Central European'       => 'Europe/Sarajevo',
-    'Romance'                => 'Europe/Paris',
-    'W. Central Africa'      => 'Africa/Lagos', // Best guess
-    'W. Europe'              => 'Europe/Amsterdam',
-    'E. Europe'              => 'Europe/Minsk',
-    'Egypt'                  => 'Africa/Cairo',
-    'FLE'                    => 'Europe/Helsinki',
-    'GTB'                    => 'Europe/Athens',
-    'Israel'                 => 'Asia/Jerusalem',
-    'Jordan'                 => 'Asia/Amman',
-    'Middle East'            => 'Asia/Beirut',
-    'Namibia'                => 'Africa/Windhoek',
-    'South Africa'           => 'Africa/Harare',
-    'Arab'                   => 'Asia/Kuwait',
-    'Arabic'                 => 'Asia/Baghdad',
-    'E. Africa'              => 'Africa/Nairobi',
-    'Georgian'               => 'Asia/Tbilisi',
-    'Russian'                => 'Europe/Moscow',
-    'Iran'                   => 'Asia/Tehran',
-    'Arabian'                => 'Asia/Muscat',
-    'Armenian'               => 'Asia/Yerevan',
-    'Azerbijan'              => 'Asia/Baku',
-    'Caucasus'               => 'Asia/Yerevan',
-    'Mauritius'              => 'Indian/Mauritius',
-    'Afghanistan'            => 'Asia/Kabul',
-    'Ekaterinburg'           => 'Asia/Yekaterinburg',
-    'Pakistan'               => 'Asia/Karachi',
-    'West Asia'              => 'Asia/Tashkent',
-    'India'                  => 'Asia/Calcutta',
-    'Sri Lanka'              => 'Asia/Colombo',
-    'Nepal'                  => 'Asia/Kathmandu',
-    'Central Asia'           => 'Asia/Dhaka',
-    'N. Central Asia'        => 'Asia/Almaty',
-    'Myanmar'                => 'Asia/Rangoon',
-    'North Asia'             => 'Asia/Krasnoyarsk',
-    'SE Asia'                => 'Asia/Bangkok',
-    'China'                  => 'Asia/Shanghai',
-    'North Asia East'        => 'Asia/Irkutsk',
-    'Singapore'              => 'Asia/Singapore',
-    'Taipei'                 => 'Asia/Taipei',
-    'W. Australia'           => 'Australia/Perth',
-    'Korea'                  => 'Asia/Seoul',
-    'Tokyo'                  => 'Asia/Tokyo',
-    'Yakutsk'                => 'Asia/Yakutsk',
-    'AUS Central'            => 'Australia/Darwin',
-    'Cen. Australia'         => 'Australia/Adelaide',
-    'AUS Eastern'            => 'Australia/Sydney',
-    'E. Australia'           => 'Australia/Brisbane',
-    'Tasmania'               => 'Australia/Hobart',
-    'Vladivostok'            => 'Asia/Vladivostok',
-    'West Pacific'           => 'Pacific/Guam',
-    'Central Pacific'        => 'Asia/Magadan',
-    'Fiji'                   => 'Pacific/Fiji',
-    'New Zealand'            => 'Pacific/Auckland',
-    'Tonga'                  => 'Pacific/Tongatapu',
+    'Azores'            => 'Atlantic/Azores',
+    'Cape Verde'        => 'Atlantic/Cape_Verde',
+    'Greenwich'         => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
+    'Morocco'           => 'Africa/Casablanca',
+    'Central Europe'    => 'Europe/Prague',
+    'Central European'  => 'Europe/Sarajevo',
+    'Romance'           => 'Europe/Paris',
+    'W. Central Africa' => 'Africa/Lagos', // Best guess
+    'W. Europe'         => 'Europe/Amsterdam',
+    'E. Europe'         => 'Europe/Minsk',
+    'Egypt'             => 'Africa/Cairo',
+    'FLE'               => 'Europe/Helsinki',
+    'GTB'               => 'Europe/Athens',
+    'Israel'            => 'Asia/Jerusalem',
+    'Jordan'            => 'Asia/Amman',
+    'Middle East'       => 'Asia/Beirut',
+    'Namibia'           => 'Africa/Windhoek',
+    'South Africa'      => 'Africa/Harare',
+    'Arab'              => 'Asia/Kuwait',
+    'Arabic'            => 'Asia/Baghdad',
+    'E. Africa'         => 'Africa/Nairobi',
+    'Georgian'          => 'Asia/Tbilisi',
+    'Russian'           => 'Europe/Moscow',
+    'Iran'              => 'Asia/Tehran',
+    'Arabian'           => 'Asia/Muscat',
+    'Armenian'          => 'Asia/Yerevan',
+    'Azerbijan'         => 'Asia/Baku',
+    'Caucasus'          => 'Asia/Yerevan',
+    'Mauritius'         => 'Indian/Mauritius',
+    'Afghanistan'       => 'Asia/Kabul',
+    'Ekaterinburg'      => 'Asia/Yekaterinburg',
+    'Pakistan'          => 'Asia/Karachi',
+    'West Asia'         => 'Asia/Tashkent',
+    'India'             => 'Asia/Calcutta',
+    'Sri Lanka'         => 'Asia/Colombo',
+    'Nepal'             => 'Asia/Kathmandu',
+    'Central Asia'      => 'Asia/Dhaka',
+    'N. Central Asia'   => 'Asia/Almaty',
+    'Myanmar'           => 'Asia/Rangoon',
+    'North Asia'        => 'Asia/Krasnoyarsk',
+    'SE Asia'           => 'Asia/Bangkok',
+    'China'             => 'Asia/Shanghai',
+    'North Asia East'   => 'Asia/Irkutsk',
+    'Singapore'         => 'Asia/Singapore',
+    'Taipei'            => 'Asia/Taipei',
+    'W. Australia'      => 'Australia/Perth',
+    'Korea'             => 'Asia/Seoul',
+    'Tokyo'             => 'Asia/Tokyo',
+    'Yakutsk'           => 'Asia/Yakutsk',
+    'AUS Central'       => 'Australia/Darwin',
+    'Cen. Australia'    => 'Australia/Adelaide',
+    'AUS Eastern'       => 'Australia/Sydney',
+    'E. Australia'      => 'Australia/Brisbane',
+    'Tasmania'          => 'Australia/Hobart',
+    'Vladivostok'       => 'Asia/Vladivostok',
+    'West Pacific'      => 'Pacific/Guam',
+    'Central Pacific'   => 'Asia/Magadan',
+    'Fiji'              => 'Pacific/Fiji',
+    'New Zealand'       => 'Pacific/Auckland',
+    'Tonga'             => 'Pacific/Tongatapu',
 ];
diff --git a/vendor/sabre/vobject/lib/timezonedata/windowszones.php b/vendor/sabre/vobject/lib/timezonedata/windowszones.php
index ac69847cc..29f3a6cb8 100644
--- a/vendor/sabre/vobject/lib/timezonedata/windowszones.php
+++ b/vendor/sabre/vobject/lib/timezonedata/windowszones.php
@@ -3,28 +3,33 @@
 /**
  * Automatically generated timezone file
  *
- * Last update: 2015-07-27T16:56:36-04:00
+ * Last update: 2016-08-24T17:35:38-04:00
  * Source: http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml
  *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @license http://sabre.io/license/ Modified BSD License
  */
 
-return [
+return  [
   'AUS Central Standard Time'       => 'Australia/Darwin',
   'AUS Eastern Standard Time'       => 'Australia/Sydney',
   'Afghanistan Standard Time'       => 'Asia/Kabul',
   'Alaskan Standard Time'           => 'America/Anchorage',
+  'Aleutian Standard Time'          => 'America/Adak',
+  'Altai Standard Time'             => 'Asia/Barnaul',
   'Arab Standard Time'              => 'Asia/Riyadh',
   'Arabian Standard Time'           => 'Asia/Dubai',
   'Arabic Standard Time'            => 'Asia/Baghdad',
   'Argentina Standard Time'         => 'America/Buenos_Aires',
+  'Astrakhan Standard Time'         => 'Europe/Astrakhan',
   'Atlantic Standard Time'          => 'America/Halifax',
+  'Aus Central W. Standard Time'    => 'Australia/Eucla',
   'Azerbaijan Standard Time'        => 'Asia/Baku',
   'Azores Standard Time'            => 'Atlantic/Azores',
   'Bahia Standard Time'             => 'America/Bahia',
   'Bangladesh Standard Time'        => 'Asia/Dhaka',
   'Belarus Standard Time'           => 'Europe/Minsk',
+  'Bougainville Standard Time'      => 'Pacific/Bougainville',
   'Canada Central Standard Time'    => 'America/Regina',
   'Cape Verde Standard Time'        => 'Atlantic/Cape_Verde',
   'Caucasus Standard Time'          => 'Asia/Yerevan',
@@ -37,11 +42,15 @@ return [
   'Central Pacific Standard Time'   => 'Pacific/Guadalcanal',
   'Central Standard Time'           => 'America/Chicago',
   'Central Standard Time (Mexico)'  => 'America/Mexico_City',
+  'Chatham Islands Standard Time'   => 'Pacific/Chatham',
   'China Standard Time'             => 'Asia/Shanghai',
+  'Cuba Standard Time'              => 'America/Havana',
   'Dateline Standard Time'          => 'Etc/GMT+12',
   'E. Africa Standard Time'         => 'Africa/Nairobi',
   'E. Australia Standard Time'      => 'Australia/Brisbane',
+  'E. Europe Standard Time'         => 'Europe/Chisinau',
   'E. South America Standard Time'  => 'America/Sao_Paulo',
+  'Easter Island Standard Time'     => 'Pacific/Easter',
   'Eastern Standard Time'           => 'America/New_York',
   'Eastern Standard Time (Mexico)'  => 'America/Cancun',
   'Egypt Standard Time'             => 'Africa/Cairo',
@@ -53,6 +62,7 @@ return [
   'Georgian Standard Time'          => 'Asia/Tbilisi',
   'Greenland Standard Time'         => 'America/Godthab',
   'Greenwich Standard Time'         => 'Atlantic/Reykjavik',
+  'Haiti Standard Time'             => 'America/Port-au-Prince',
   'Hawaiian Standard Time'          => 'Pacific/Honolulu',
   'India Standard Time'             => 'Asia/Calcutta',
   'Iran Standard Time'              => 'Asia/Tehran',
@@ -62,7 +72,9 @@ return [
   'Korea Standard Time'             => 'Asia/Seoul',
   'Libya Standard Time'             => 'Africa/Tripoli',
   'Line Islands Standard Time'      => 'Pacific/Kiritimati',
+  'Lord Howe Standard Time'         => 'Australia/Lord_Howe',
   'Magadan Standard Time'           => 'Asia/Magadan',
+  'Marquesas Standard Time'         => 'Pacific/Marquesas',
   'Mauritius Standard Time'         => 'Indian/Mauritius',
   'Middle East Standard Time'       => 'Asia/Beirut',
   'Montevideo Standard Time'        => 'America/Montevideo',
@@ -75,11 +87,13 @@ return [
   'Nepal Standard Time'             => 'Asia/Katmandu',
   'New Zealand Standard Time'       => 'Pacific/Auckland',
   'Newfoundland Standard Time'      => 'America/St_Johns',
+  'Norfolk Standard Time'           => 'Pacific/Norfolk',
   'North Asia East Standard Time'   => 'Asia/Irkutsk',
   'North Asia Standard Time'        => 'Asia/Krasnoyarsk',
+  'North Korea Standard Time'       => 'Asia/Pyongyang',
   'Pacific SA Standard Time'        => 'America/Santiago',
   'Pacific Standard Time'           => 'America/Los_Angeles',
-  'Pacific Standard Time (Mexico)'  => 'America/Santa_Isabel',
+  'Pacific Standard Time (Mexico)'  => 'America/Tijuana',
   'Pakistan Standard Time'          => 'Asia/Karachi',
   'Paraguay Standard Time'          => 'America/Asuncion',
   'Romance Standard Time'           => 'Europe/Paris',
@@ -91,6 +105,8 @@ return [
   'SA Pacific Standard Time'        => 'America/Bogota',
   'SA Western Standard Time'        => 'America/La_Paz',
   'SE Asia Standard Time'           => 'Asia/Bangkok',
+  'Saint Pierre Standard Time'      => 'America/Miquelon',
+  'Sakhalin Standard Time'          => 'Asia/Sakhalin',
   'Samoa Standard Time'             => 'Pacific/Apia',
   'Singapore Standard Time'         => 'Asia/Singapore',
   'South Africa Standard Time'      => 'Africa/Johannesburg',
@@ -98,14 +114,20 @@ return [
   'Syria Standard Time'             => 'Asia/Damascus',
   'Taipei Standard Time'            => 'Asia/Taipei',
   'Tasmania Standard Time'          => 'Australia/Hobart',
+  'Tocantins Standard Time'         => 'America/Araguaina',
   'Tokyo Standard Time'             => 'Asia/Tokyo',
+  'Tomsk Standard Time'             => 'Asia/Tomsk',
   'Tonga Standard Time'             => 'Pacific/Tongatapu',
+  'Transbaikal Standard Time'       => 'Asia/Chita',
   'Turkey Standard Time'            => 'Europe/Istanbul',
+  'Turks And Caicos Standard Time'  => 'America/Grand_Turk',
   'US Eastern Standard Time'        => 'America/Indianapolis',
   'US Mountain Standard Time'       => 'America/Phoenix',
   'UTC'                             => 'Etc/GMT',
   'UTC+12'                          => 'Etc/GMT-12',
   'UTC-02'                          => 'Etc/GMT+2',
+  'UTC-08'                          => 'Etc/GMT+8',
+  'UTC-09'                          => 'Etc/GMT+9',
   'UTC-11'                          => 'Etc/GMT+11',
   'Ulaanbaatar Standard Time'       => 'Asia/Ulaanbaatar',
   'Venezuela Standard Time'         => 'America/Caracas',
@@ -113,7 +135,9 @@ return [
   'W. Australia Standard Time'      => 'Australia/Perth',
   'W. Central Africa Standard Time' => 'Africa/Lagos',
   'W. Europe Standard Time'         => 'Europe/Berlin',
+  'W. Mongolia Standard Time'       => 'Asia/Hovd',
   'West Asia Standard Time'         => 'Asia/Tashkent',
+  'West Bank Standard Time'         => 'Asia/Hebron',
   'West Pacific Standard Time'      => 'Pacific/Port_Moresby',
   'Yakutsk Standard Time'           => 'Asia/Yakutsk',
 ];

From 9cb9608209ab5f9fb123acc82a563ba54c450db1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 18:31:34 -0700
Subject: [PATCH 033/299] convert more widgets to classes

---
 Zotlabs/Widget/Collections.php |  51 +++++++++++++
 Zotlabs/Widget/Profile         |  13 ++++
 Zotlabs/Widget/Suggestions.php |  58 ++++++++++++++
 Zotlabs/Widget/Tagcloud.php    |  33 ++++++++
 Zotlabs/Widget/Zcard.php       |  11 +++
 include/widgets.php            | 133 ---------------------------------
 6 files changed, 166 insertions(+), 133 deletions(-)
 create mode 100644 Zotlabs/Widget/Collections.php
 create mode 100644 Zotlabs/Widget/Profile
 create mode 100644 Zotlabs/Widget/Suggestions.php
 create mode 100644 Zotlabs/Widget/Tagcloud.php
 create mode 100644 Zotlabs/Widget/Zcard.php

diff --git a/Zotlabs/Widget/Collections.php b/Zotlabs/Widget/Collections.php
new file mode 100644
index 000000000..d2b29679a
--- /dev/null
+++ b/Zotlabs/Widget/Collections.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Zotlabs\Widget;
+	
+require_once('include/group.php');
+
+class Collections {
+
+	function widget($args) {
+
+		$mode = ((array_key_exists('mode',$args)) ? $args['mode'] : 'conversation');
+		switch($mode) {
+			case 'conversation':
+					$every = argv(0);
+					$each = argv(0);
+					$edit = true;
+					$current = $_REQUEST['gid'];
+					$abook_id = 0;
+					$wmode = 0;
+					break;
+			case 'connections':
+					$every = 'connections';
+					$each = 'group';
+					$edit = true;
+					$current = $_REQUEST['gid'];
+					$abook_id = 0;
+					$wmode = 0;
+			case 'groups':
+					$every = 'connections';
+					$each = argv(0);
+					$edit = false;
+					$current = intval(argv(1));
+					$abook_id = 0;
+					$wmode = 1;
+					break;
+			case 'abook':
+					$every = 'connections';
+					$each = 'group';
+					$edit = false;
+					$current = 0;
+					$abook_id = \App::$poi['abook_xchan'];
+					$wmode = 1;
+					break;
+			default:
+				return '';
+				break;
+		}
+
+		return group_side($every, $each, $edit, $current, $abook_id, $wmode);
+	}
+}
diff --git a/Zotlabs/Widget/Profile b/Zotlabs/Widget/Profile
new file mode 100644
index 000000000..bffd910b6
--- /dev/null
+++ b/Zotlabs/Widget/Profile
@@ -0,0 +1,13 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Profile {
+
+	function widget($args) {
+		$block = observer_prohibited();
+		return profile_sidebar(\App::$profile, $block, true);
+	}
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Widget/Suggestions.php b/Zotlabs/Widget/Suggestions.php
new file mode 100644
index 000000000..5fb3d3e8b
--- /dev/null
+++ b/Zotlabs/Widget/Suggestions.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/socgraph.php');
+
+
+class Suggestions {
+
+	function widget($arr) {
+
+		if((! local_channel()) || (! feature_enabled(local_channel(),'suggest')))
+			return '';
+
+
+		$r = suggestion_query(local_channel(),get_observer_hash(),0,20);
+
+		if(! $r) {
+			return;
+		}
+
+		$arr = array();
+
+		// Get two random entries from the top 20 returned.
+		// We'll grab the first one and the one immediately following.
+		// This will throw some entropy intot he situation so you won't
+		// be looking at the same two mug shots every time the widget runs
+
+		$index = ((count($r) > 2) ? mt_rand(0,count($r) - 2) : 0);
+
+		for($x = $index; $x <= ($index+1); $x ++) {
+			$rr = $r[$x];
+			if(! $rr['xchan_url'])
+				break;
+
+			$connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr'];
+
+			$arr[] = array(
+				'url' => chanlink_url($rr['xchan_url']),
+				'profile' => $rr['xchan_url'],
+				'name' => $rr['xchan_name'],
+				'photo' => $rr['xchan_photo_m'],
+				'ignlnk' => z_root() . '/directory?ignore=' . $rr['xchan_hash'],
+				'conntxt' => t('Connect'),
+				'connlnk' => $connlnk,
+				'ignore' => t('Ignore/Hide')
+			);
+		}
+
+		$o = replace_macros(get_markup_template('suggest_widget.tpl'),array(
+			'$title' => t('Suggestions'),
+			'$more' => t('See more...'),
+			'$entries' => $arr
+		));
+
+		return $o;
+	}
+}
diff --git a/Zotlabs/Widget/Tagcloud.php b/Zotlabs/Widget/Tagcloud.php
new file mode 100644
index 000000000..cf7a4932e
--- /dev/null
+++ b/Zotlabs/Widget/Tagcloud.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+// @FIXME The problem with this widget is that we don't have a search function for webpages 
+// that we can send the links to. Then we should also provide an option to search webpages
+// and conversations.
+
+class Tagcloud {
+
+	function widget($args) {
+
+		$o = '';
+		$uid = \App::$profile_uid;
+		$count = ((x($args,'count')) ? intval($args['count']) : 24);
+		$flags = 0;
+		$type = TERM_CATEGORY;
+
+		// @FIXME there exists no $authors variable
+		$r = tagadelic($uid, $count, $authors, $owner, $flags, ITEM_TYPE_WEBPAGE, $type);
+
+		// @FIXME this should use a template
+
+		if($r) {
+			$o = '<div class="tagblock widget"><h3>' . t('Categories') . '</h3><div class="tags" align="center">';
+			foreach($r as $rv) {
+				$o .= '<span class="tag' . $rv[2] . '">' . $rv[0] .' </span> ' . "\r\n";
+			}
+			$o .= '</div></div>';
+		}
+		return $o;
+	}
+}
diff --git a/Zotlabs/Widget/Zcard.php b/Zotlabs/Widget/Zcard.php
new file mode 100644
index 000000000..12e53eaab
--- /dev/null
+++ b/Zotlabs/Widget/Zcard.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Zcard {
+
+	function widget($args) {
+		$channel = channelx_by_n(\App::$profile_uid);
+		return get_zcard($channel,get_observer_hash(),array('width' => 875));
+	}
+}
diff --git a/include/widgets.php b/include/widgets.php
index b5389e60d..86d3989ef 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -10,143 +10,10 @@ require_once('include/contact_widgets.php');
 require_once('include/attach.php');
 
 
-function widget_profile($args) {
-
-	$block = observer_prohibited();
-	return profile_sidebar(App::$profile, $block, true);
-}
-
-function widget_zcard($args) {
-
-	$block = observer_prohibited();
-	$channel = channelx_by_n(App::$profile_uid);
-	return get_zcard($channel,get_observer_hash(),array('width' => 875));
-}
 
 
 
 
-// FIXME The problem with the next widget is that we don't have a search function for webpages that we can send the links to.
-// Then we should also provide an option to search webpages and conversations.
-
-function widget_tagcloud($args) {
-
-	$o = '';
-	//$tab = 0;
-
-	$uid = App::$profile_uid;
-	$count = ((x($args,'count')) ? intval($args['count']) : 24);
-	$flags = 0;
-	$type = TERM_CATEGORY;
-
-	// FIXME there exists no $authors variable
-	$r = tagadelic($uid, $count, $authors, $owner, $flags, ITEM_TYPE_WEBPAGE, $type);
-
-	if($r) {
-		$o = '<div class="tagblock widget"><h3>' . t('Categories') . '</h3><div class="tags" align="center">';
-		foreach($r as $rr) {
-			$o .= '<span class="tag'.$rr[2].'">'.$rr[0].'</span> ' . "\r\n";
-		}
-		$o .= '</div></div>';
-	}
-	return $o;
-}
-
-function widget_collections($args) {
-	require_once('include/group.php');
-
-	$mode = ((array_key_exists('mode',$args)) ? $args['mode'] : 'conversation');
-	switch($mode) {
-		case 'conversation':
-				$every = argv(0);
-				$each = argv(0);
-				$edit = true;
-				$current = $_REQUEST['gid'];
-				$abook_id = 0;
-				$wmode = 0;
-				break;
-		case 'connections':
-				$every = 'connections';
-				$each = 'group';
-				$edit = true;
-				$current = $_REQUEST['gid'];
-				$abook_id = 0;
-				$wmode = 0;
-		case 'groups':
-				$every = 'connections';
-				$each = argv(0);
-				$edit = false;
-				$current = intval(argv(1));
-				$abook_id = 0;
-				$wmode = 1;
-				break;
-		case 'abook':
-				$every = 'connections';
-				$each = 'group';
-				$edit = false;
-				$current = 0;
-				$abook_id = App::$poi['abook_xchan'];
-				$wmode = 1;
-				break;
-		default:
-			return '';
-			break;
-	}
-
-	return group_side($every, $each, $edit, $current, $abook_id, $wmode);
-}
-
-function widget_suggestions($arr) {
-
-	if((! local_channel()) || (! feature_enabled(local_channel(),'suggest')))
-		return '';
-
-	require_once('include/socgraph.php');
-
-	$r = suggestion_query(local_channel(),get_observer_hash(),0,20);
-
-	if(! $r) {
-		return;
-	}
-
-	$arr = array();
-
-	// Get two random entries from the top 20 returned.
-	// We'll grab the first one and the one immediately following.
-	// This will throw some entropy intot he situation so you won't
-	// be looking at the same two mug shots every time the widget runs
-
-	$index = ((count($r) > 2) ? mt_rand(0,count($r) - 2) : 0);
-
-	for($x = $index; $x <= ($index+1); $x ++) {
-		$rr = $r[$x];
-		if(! $rr['xchan_url'])
-			break;
-
-		$connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr'];
-
-		$arr[] = array(
-			'url' => chanlink_url($rr['xchan_url']),
-			'profile' => $rr['xchan_url'],
-			'name' => $rr['xchan_name'],
-			'photo' => $rr['xchan_photo_m'],
-			'ignlnk' => z_root() . '/directory?ignore=' . $rr['xchan_hash'],
-			'conntxt' => t('Connect'),
-			'connlnk' => $connlnk,
-			'ignore' => t('Ignore/Hide')
-		);
-	}
-
-	$o = replace_macros(get_markup_template('suggest_widget.tpl'),array(
-		'$title' => t('Suggestions'),
-		'$more' => t('See more...'),
-		'$entries' => $arr
-	));
-
-	return $o;
-}
-
-
 function widget_follow($args) {
 	if(! local_channel())
 		return '';

From 664c762b35d894b6c055eb57a72f01dae97b48c3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 18:48:27 -0700
Subject: [PATCH 034/299] more widgets

---
 Zotlabs/Widget/Follow.php      |  37 ++++++++
 Zotlabs/Widget/Savedsearch.php |  91 +++++++++++++++++++
 Zotlabs/Widget/Sitesearch.php  |  38 ++++++++
 include/widgets.php            | 154 +--------------------------------
 util/typo.php                  |  25 ++----
 5 files changed, 172 insertions(+), 173 deletions(-)
 create mode 100644 Zotlabs/Widget/Follow.php
 create mode 100644 Zotlabs/Widget/Savedsearch.php
 create mode 100644 Zotlabs/Widget/Sitesearch.php

diff --git a/Zotlabs/Widget/Follow.php b/Zotlabs/Widget/Follow.php
new file mode 100644
index 000000000..c4aecc8e1
--- /dev/null
+++ b/Zotlabs/Widget/Follow.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Follow {
+
+	function widget($args) {
+		if(! local_channel())
+			return '';
+
+		$uid = \App::$channel['channel_id'];
+		$r = q("select count(*) as total from abook where abook_channel = %d and abook_self = 0 ",
+			intval($uid)
+		);
+
+		if($r)
+			$total_channels = $r[0]['total'];
+
+		$limit = service_class_fetch($uid,'total_channels');
+		if($limit !== false) {
+			$abook_usage_message = sprintf( t("You have %1$.0f of %2$.0f allowed connections."), $total_channels, $limit);
+		}
+		else {
+			$abook_usage_message = '';
+ 		}
+	
+		return replace_macros(get_markup_template('follow.tpl'),array(
+			'$connect' => t('Add New Connection'),
+			'$desc' => t('Enter channel address'),
+			'$hint' => t('Examples: bob@example.com, https://example.com/barbara'),
+			'$follow' => t('Connect'),
+			'$abook_usage_message' => $abook_usage_message
+		));
+	}
+}
+
diff --git a/Zotlabs/Widget/Savedsearch.php b/Zotlabs/Widget/Savedsearch.php
new file mode 100644
index 000000000..378c27139
--- /dev/null
+++ b/Zotlabs/Widget/Savedsearch.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Savedsearch {
+
+	function widget($arr) {
+
+		if((! local_channel()) || (! feature_enabled(local_channel(),'savedsearch')))
+			return '';
+
+		$search = ((x($_GET,'netsearch')) ? $_GET['netsearch'] : '');
+		if(! $search)
+			$search = ((x($_GET,'search')) ? $_GET['search'] : '');
+
+		if(x($_GET,'searchsave') && $search) {
+			$r = q("select * from term where uid = %d and ttype = %d and term = '%s' limit 1",
+				intval(local_channel()),
+				intval(TERM_SAVEDSEARCH),
+				dbesc($search)
+			);
+			if(! $r) {
+				q("insert into term ( uid,ttype,term ) values ( %d, %d, '%s') ",
+					intval(local_channel()),
+					intval(TERM_SAVEDSEARCH),
+					dbesc($search)
+				);
+			}
+		}
+
+		if(x($_GET,'searchremove') && $search) {
+			q("delete from term where uid = %d and ttype = %d and term = '%s'",
+				intval(local_channel()),
+				intval(TERM_SAVEDSEARCH),
+				dbesc($search)
+			);
+			$search = '';
+		}
+
+		$srchurl = \App::$query_string;
+
+		$srchurl =  rtrim(preg_replace('/searchsave\=[^\&].*?(\&|$)/is','',$srchurl),'&');
+		$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
+		$srchurl =  rtrim(preg_replace('/searchremove\=[^\&].*?(\&|$)/is','',$srchurl),'&');
+
+		$srchurl =  rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&');
+		$srchurl =  rtrim(preg_replace('/submit\=[^\&].*?(\&|$)/is','',$srchurl),'&');
+		$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
+
+
+		$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
+		$hasamp = ((strpos($srchurl,'&') !== false) ? true : false);
+
+		if(($hasamp) && (! $hasq))
+			$srchurl = substr($srchurl,0,strpos($srchurl,'&')) . '?f=&' . substr($srchurl,strpos($srchurl,'&')+1);
+
+		$o = '';
+
+		$r = q("select tid,term from term WHERE uid = %d and ttype = %d ",
+			intval(local_channel()),
+			intval(TERM_SAVEDSEARCH)
+		);
+
+		$saved = array();
+
+		if(count($r)) {
+			foreach($r as $rr) {
+				$saved[] = array(
+					'id'            => $rr['tid'],
+					'term'          => $rr['term'],
+					'dellink'       => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&amp;searchremove=1&amp;search=' . urlencode($rr['term']),
+					'srchlink'      => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&amp;search=' . urlencode($rr['term']),
+					'displayterm'   => htmlspecialchars($rr['term'], ENT_COMPAT,'UTF-8'),
+					'encodedterm'   => urlencode($rr['term']),
+					'delete'        => t('Remove term'),
+					'selected'      => ($search==$rr['term']),
+				);
+			}
+		}
+
+		$tpl = get_markup_template("saved_searches.tpl");
+		$o = replace_macros($tpl, array(
+			'$title'	 => t('Saved Searches'),
+			'$add'		 => t('add'),
+			'$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), true),
+			'$saved' 	 => $saved,
+		));
+
+		return $o;
+	}
+}
diff --git a/Zotlabs/Widget/Sitesearch.php b/Zotlabs/Widget/Sitesearch.php
new file mode 100644
index 000000000..b3a25d76a
--- /dev/null
+++ b/Zotlabs/Widget/Sitesearch.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Sitesearch {
+
+	function widget($arr) {
+
+		$search = ((x($_GET,'search')) ? $_GET['search'] : '');
+
+		$srchurl = \App::$query_string;
+
+		$srchurl =  rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&');
+		$srchurl =  rtrim(preg_replace('/submit\=[^\&].*?(\&|$)/is','',$srchurl),'&');
+		$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
+
+
+		$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
+		$hasamp = ((strpos($srchurl,'&') !== false) ? true : false);
+
+		if(($hasamp) && (! $hasq))
+			$srchurl = substr($srchurl,0,strpos($srchurl,'&')) . '?f=&' . substr($srchurl,strpos($srchurl,'&')+1);
+
+		$o = '';
+
+		$saved = array();
+
+		$tpl = get_markup_template("sitesearch.tpl");
+		$o = replace_macros($tpl, array(
+			'$title'	 => t('Search'),
+			'$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), false),
+			'$saved' 	 => $saved,
+		));
+
+		return $o;
+	}
+}
diff --git a/include/widgets.php b/include/widgets.php
index 86d3989ef..f0a207dcb 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -2,7 +2,7 @@
 /**
  * @file include/widgets.php
  *
- * @brief This file contains the widgets.
+ * @brief This file contains some widgets.
  */
 
 require_once('include/dir_fns.php');
@@ -10,158 +10,6 @@ require_once('include/contact_widgets.php');
 require_once('include/attach.php');
 
 
-
-
-
-
-function widget_follow($args) {
-	if(! local_channel())
-		return '';
-
-	$uid = App::$channel['channel_id'];
-	$r = q("select count(*) as total from abook where abook_channel = %d and abook_self = 0 ",
-		intval($uid)
-	);
-	if($r)
-		$total_channels = $r[0]['total'];
-	$limit = service_class_fetch($uid,'total_channels');
-	if($limit !== false) {
-		$abook_usage_message = sprintf( t("You have %1$.0f of %2$.0f allowed connections."), $total_channels, $limit);
-	}
-	else {
-		$abook_usage_message = '';
- 	}
-	return replace_macros(get_markup_template('follow.tpl'),array(
-		'$connect' => t('Add New Connection'),
-		'$desc' => t('Enter channel address'),
-		'$hint' => t('Examples: bob@example.com, https://example.com/barbara'),
-		'$follow' => t('Connect'),
-		'$abook_usage_message' => $abook_usage_message
-	));
-}
-
-
-
-
-function widget_savedsearch($arr) {
-	if((! local_channel()) || (! feature_enabled(local_channel(),'savedsearch')))
-		return '';
-
-	$search = ((x($_GET,'netsearch')) ? $_GET['netsearch'] : '');
-	if(! $search)
-		$search = ((x($_GET,'search')) ? $_GET['search'] : '');
-
-	if(x($_GET,'searchsave') && $search) {
-		$r = q("select * from term where uid = %d and ttype = %d and term = '%s' limit 1",
-			intval(local_channel()),
-			intval(TERM_SAVEDSEARCH),
-			dbesc($search)
-		);
-		if(! $r) {
-			q("insert into term ( uid,ttype,term ) values ( %d, %d, '%s') ",
-				intval(local_channel()),
-				intval(TERM_SAVEDSEARCH),
-				dbesc($search)
-			);
-		}
-	}
-
-	if(x($_GET,'searchremove') && $search) {
-		q("delete from term where uid = %d and ttype = %d and term = '%s'",
-			intval(local_channel()),
-			intval(TERM_SAVEDSEARCH),
-			dbesc($search)
-		);
-		$search = '';
-	}
-
-	$srchurl = App::$query_string;
-
-	$srchurl =  rtrim(preg_replace('/searchsave\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
-	$srchurl =  rtrim(preg_replace('/searchremove\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-
-	$srchurl =  rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl =  rtrim(preg_replace('/submit\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
-
-
-	$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
-	$hasamp = ((strpos($srchurl,'&') !== false) ? true : false);
-
-	if(($hasamp) && (! $hasq))
-		$srchurl = substr($srchurl,0,strpos($srchurl,'&')) . '?f=&' . substr($srchurl,strpos($srchurl,'&')+1);
-
-	$o = '';
-
-	$r = q("select tid,term from term WHERE uid = %d and ttype = %d ",
-		intval(local_channel()),
-		intval(TERM_SAVEDSEARCH)
-	);
-
-	$saved = array();
-
-	if(count($r)) {
-		foreach($r as $rr) {
-			$saved[] = array(
-				'id'            => $rr['tid'],
-				'term'          => $rr['term'],
-				'dellink'       => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&amp;searchremove=1&amp;search=' . urlencode($rr['term']),
-				'srchlink'      => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&amp;search=' . urlencode($rr['term']),
-				'displayterm'   => htmlspecialchars($rr['term'], ENT_COMPAT,'UTF-8'),
-				'encodedterm'   => urlencode($rr['term']),
-				'delete'        => t('Remove term'),
-				'selected'      => ($search==$rr['term']),
-			);
-		}
-	}
-
-	$tpl = get_markup_template("saved_searches.tpl");
-	$o = replace_macros($tpl, array(
-		'$title'	 => t('Saved Searches'),
-		'$add'		 => t('add'),
-		'$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), true),
-		'$saved' 	 => $saved,
-	));
-
-	return $o;
-}
-
-function widget_sitesearch($arr) {
-
-	$search = ((x($_GET,'search')) ? $_GET['search'] : '');
-
-	$srchurl = App::$query_string;
-
-	$srchurl =  rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl =  rtrim(preg_replace('/submit\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
-
-
-	$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
-	$hasamp = ((strpos($srchurl,'&') !== false) ? true : false);
-
-	if(($hasamp) && (! $hasq))
-		$srchurl = substr($srchurl,0,strpos($srchurl,'&')) . '?f=&' . substr($srchurl,strpos($srchurl,'&')+1);
-
-	$o = '';
-
-	$saved = array();
-
-	$tpl = get_markup_template("sitesearch.tpl");
-	$o = replace_macros($tpl, array(
-		'$title'	 => t('Search'),
-		'$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), false),
-		'$saved' 	 => $saved,
-	));
-
-	return $o;
-}
-
-
-
-
-
 function widget_filer($arr) {
 	if(! local_channel())
 		return '';
diff --git a/util/typo.php b/util/typo.php
index f9c9e5353..a8d363340 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -28,17 +28,18 @@
 		include_once($file);
 	}
 
-	echo "Directory: include/RedDAV\n";
-	$files = glob('include/RedDAV/*.php');
+	echo "Directory: include/photo\n";
+	$files = glob('include/photo/*.php');
 	foreach($files as $file) {
 		echo $file . "\n";
 		include_once($file);
 	}
 
+
 	echo "Directory: Zotlabs\n";
 	$files = glob('Zotlabs/*/*.php');
 	foreach($files as $file) {
-		if(strpos($file,'SiteModule') === false) {
+		if((strpos($file,'SiteModule') === false) || (strpos($file,'SiteWidget') === false)) {
 			echo $file . "\n";
 			include_once($file);
 		}
@@ -51,21 +52,6 @@
 		include_once($file);
 	}
 
-
-	echo "Directory: include/photo\n";
-	$files = glob('include/photo/*.php');
-	foreach($files as $file) {
-		echo $file . "\n";
-		include_once($file);
-	}
-
-//	echo "Directory: mod\n";
-//	$files = glob('mod/*.php');
-//	foreach($files as $file) {
-//		echo $file . "\n";
-//		include_once($file);
-//	}
-
 	echo "Directory: addon\n";
 	$dirs = glob('addon/*');
 
@@ -93,6 +79,5 @@
 
 	foreach($files as $file) {
 		echo $file . "\n";
-	passthru($phpath . ' util/typohelper.php ' . $file);
-//		include_once($file);
+		passthru($phpath . ' util/typohelper.php ' . $file);
 	}

From 0ee48f6a58ae21b6c27b122206cfd6e366abed40 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 19:13:16 -0700
Subject: [PATCH 035/299] filename issue

---
 Zotlabs/Widget/{Profile => Profile.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Zotlabs/Widget/{Profile => Profile.php} (100%)

diff --git a/Zotlabs/Widget/Profile b/Zotlabs/Widget/Profile.php
similarity index 100%
rename from Zotlabs/Widget/Profile
rename to Zotlabs/Widget/Profile.php

From 92d7c32f61e8d8a72141629e73bb3bba38546278 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 19:30:57 -0700
Subject: [PATCH 036/299] more widgets

---
 Zotlabs/Widget/Archive.php     | 55 ++++++++++++++++++++++
 Zotlabs/Widget/Filer.php       | 35 ++++++++++++++
 Zotlabs/Widget/Fullprofile.php | 16 +++++++
 include/widgets.php            | 83 ----------------------------------
 4 files changed, 106 insertions(+), 83 deletions(-)
 create mode 100644 Zotlabs/Widget/Archive.php
 create mode 100644 Zotlabs/Widget/Filer.php
 create mode 100644 Zotlabs/Widget/Fullprofile.php

diff --git a/Zotlabs/Widget/Archive.php b/Zotlabs/Widget/Archive.php
new file mode 100644
index 000000000..c151ca563
--- /dev/null
+++ b/Zotlabs/Widget/Archive.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Archive {
+
+	function widget($arr) {
+
+		$o = '';
+
+		if(! \App::$profile_uid) {
+			return '';
+		}
+
+		$uid = \App::$profile_uid;
+
+		if(! feature_enabled($uid,'archives'))
+			return '';
+
+		if(! perm_is_allowed($uid,get_observer_hash(),'view_stream'))
+			return '';
+
+		$wall = ((array_key_exists('wall', $arr)) ? intval($arr['wall']) : 0);
+		$style = ((array_key_exists('style', $arr)) ? $arr['style'] : 'select');
+		$showend = ((get_pconfig($uid,'system','archive_show_end_date')) ? true : false);
+		$mindate = get_pconfig($uid,'system','archive_mindate');
+		$visible_years = get_pconfig($uid,'system','archive_visible_years');
+		if(! $visible_years)
+			$visible_years = 5;
+
+		$url = z_root() . '/' . \App::$cmd;
+
+		$ret = list_post_dates($uid,$wall,$mindate);
+
+		if(! count($ret))
+			return '';
+
+		$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
+		$cutoff = ((array_key_exists($cutoff_year,$ret))? true : false);
+
+		$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
+			'$title' => t('Archives'),
+			'$size' => $visible_years,
+			'$cutoff_year' => $cutoff_year,
+			'$cutoff' => $cutoff,
+			'$url' => $url,
+			'$style' => $style,
+			'$showend' => $showend,
+			'$dates' => $ret
+		));
+		return $o;
+	}
+}
+
diff --git a/Zotlabs/Widget/Filer.php b/Zotlabs/Widget/Filer.php
new file mode 100644
index 000000000..cb9a0becf
--- /dev/null
+++ b/Zotlabs/Widget/Filer.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Filer {
+
+	function widget($arr) {
+		if(! local_channel())
+			return '';
+
+
+		$selected = ((x($_REQUEST,'file')) ? $_REQUEST['file'] : '');
+
+		$terms = array();
+		$r = q("select distinct term from term where uid = %d and ttype = %d order by term asc",
+			intval(local_channel()),
+			intval(TERM_FILE)
+		);
+		if(! $r)
+			return;
+
+		foreach($r as $rr)
+			$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
+
+		return replace_macros(get_markup_template('fileas_widget.tpl'),array(
+			'$title' => t('Saved Folders'),
+			'$desc' => '',
+			'$sel_all' => (($selected == '') ? 'selected' : ''),
+			'$all' => t('Everything'),
+			'$terms' => $terms,
+			'$base' => z_root() . '/' . \App::$cmd
+		));
+	}
+}
diff --git a/Zotlabs/Widget/Fullprofile.php b/Zotlabs/Widget/Fullprofile.php
new file mode 100644
index 000000000..d7340ef40
--- /dev/null
+++ b/Zotlabs/Widget/Fullprofile.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Fullprofile {
+
+	function widget($arr) {
+
+		if(! \App::$profile['profile_uid'])
+			return;
+
+		$block = observer_prohibited();
+
+		return profile_sidebar(\App::$profile, $block);
+	}
+}
diff --git a/include/widgets.php b/include/widgets.php
index f0a207dcb..1cf144aa6 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -10,91 +10,8 @@ require_once('include/contact_widgets.php');
 require_once('include/attach.php');
 
 
-function widget_filer($arr) {
-	if(! local_channel())
-		return '';
 
 
-	$selected = ((x($_REQUEST,'file')) ? $_REQUEST['file'] : '');
-
-	$terms = array();
-	$r = q("select distinct term from term where uid = %d and ttype = %d order by term asc",
-		intval(local_channel()),
-		intval(TERM_FILE)
-	);
-	if(! $r)
-		return;
-
-	foreach($r as $rr)
-		$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-
-	return replace_macros(get_markup_template('fileas_widget.tpl'),array(
-		'$title' => t('Saved Folders'),
-		'$desc' => '',
-		'$sel_all' => (($selected == '') ? 'selected' : ''),
-		'$all' => t('Everything'),
-		'$terms' => $terms,
-		'$base' => z_root() . '/' . App::$cmd
-	));
-}
-
-function widget_archive($arr) {
-
-	$o = '';
-
-	if(! App::$profile_uid) {
-		return '';
-	}
-
-	$uid = App::$profile_uid;
-
-	if(! feature_enabled($uid,'archives'))
-		return '';
-
-	if(! perm_is_allowed($uid,get_observer_hash(),'view_stream'))
-		return '';
-
-	$wall = ((array_key_exists('wall', $arr)) ? intval($arr['wall']) : 0);
-	$style = ((array_key_exists('style', $arr)) ? $arr['style'] : 'select');
-	$showend = ((get_pconfig($uid,'system','archive_show_end_date')) ? true : false);
-	$mindate = get_pconfig($uid,'system','archive_mindate');
-	$visible_years = get_pconfig($uid,'system','archive_visible_years');
-	if(! $visible_years)
-		$visible_years = 5;
-
-	$url = z_root() . '/' . App::$cmd;
-
-	$ret = list_post_dates($uid,$wall,$mindate);
-
-	if(! count($ret))
-		return '';
-
-	$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
-	$cutoff = ((array_key_exists($cutoff_year,$ret))? true : false);
-
-	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
-		'$title' => t('Archives'),
-		'$size' => $visible_years,
-		'$cutoff_year' => $cutoff_year,
-		'$cutoff' => $cutoff,
-		'$url' => $url,
-		'$style' => $style,
-		'$showend' => $showend,
-		'$dates' => $ret
-	));
-	return $o;
-}
-
-
-function widget_fullprofile($arr) {
-
-	if(! App::$profile['profile_uid'])
-		return;
-
-	$block = observer_prohibited();
-
-	return profile_sidebar(App::$profile, $block);
-}
 
 function widget_shortprofile($arr) {
 

From dfd626548fc903a4ecffe3241570957a2df9a37a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 20:11:28 -0700
Subject: [PATCH 037/299] more widget migrations

---
 Zotlabs/Widget/Appcategories.php | 49 +++++++++++++++++++++
 Zotlabs/Widget/Appcloud.php      | 13 ++++++
 Zotlabs/Widget/Categories.php    | 22 ++++++++++
 Zotlabs/Widget/Shortprofile.php  | 18 ++++++++
 include/widgets.php              | 73 --------------------------------
 5 files changed, 102 insertions(+), 73 deletions(-)
 create mode 100644 Zotlabs/Widget/Appcategories.php
 create mode 100644 Zotlabs/Widget/Appcloud.php
 create mode 100644 Zotlabs/Widget/Categories.php
 create mode 100644 Zotlabs/Widget/Shortprofile.php

diff --git a/Zotlabs/Widget/Appcategories.php b/Zotlabs/Widget/Appcategories.php
new file mode 100644
index 000000000..490ec1abc
--- /dev/null
+++ b/Zotlabs/Widget/Appcategories.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Appcategories {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return '';
+
+		$selected = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
+
+		// @FIXME ??? $srchurl undefined here - commented out until is reviewed
+		//$srchurl =  rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
+		//$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
+
+		// Leaving this line which negates the effect of the two invalid lines prior
+		$srchurl = z_root() . '/apps';
+
+		$terms = array();
+
+		$r = q("select distinct(term.term)
+	        from term join app on term.oid = app.id
+    	    where app_channel = %d
+        	and term.uid = app_channel
+	        and term.otype = %d
+    	    and term.term != 'nav_featured_app'
+        	order by term.term asc",
+			intval(local_channel()),
+		    intval(TERM_OBJ_APP)
+		);
+
+		if($r) {
+			foreach($r as $rr)
+				$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
+
+			return replace_macros(get_markup_template('categories_widget.tpl'),array(
+				'$title' => t('Categories'),
+				'$desc' => '',
+				'$sel_all' => (($selected == '') ? 'selected' : ''),
+				'$all' => t('Everything'),
+				'$terms' => $terms,
+				'$base' => $srchurl,
+
+			));
+		}
+	}
+}
diff --git a/Zotlabs/Widget/Appcloud.php b/Zotlabs/Widget/Appcloud.php
new file mode 100644
index 000000000..2a4671eee
--- /dev/null
+++ b/Zotlabs/Widget/Appcloud.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Appcloud {
+
+	function widget($arr) {
+		if(! local_channel())
+			return '';
+		return app_tagblock(z_root() . '/apps');
+	}
+}
+
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php
new file mode 100644
index 000000000..82fffccc8
--- /dev/null
+++ b/Zotlabs/Widget/Categories.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Categories {
+
+	function widget($arr) {
+
+		if((! \App::$profile['profile_uid']) 
+			|| (! perm_is_allowed(\App::$profile['profile_uid'],get_observer_hash(),'view_stream'))) {
+			return '';
+		}
+
+		$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
+		$srchurl = \App::$query_string;
+		$srchurl =  rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
+		$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
+
+		return categories_widget($srchurl, $cat);
+	}
+}
diff --git a/Zotlabs/Widget/Shortprofile.php b/Zotlabs/Widget/Shortprofile.php
new file mode 100644
index 000000000..9c2a46e75
--- /dev/null
+++ b/Zotlabs/Widget/Shortprofile.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Shortprofile {
+
+	function widget($arr) {
+
+		if(! \App::$profile['profile_uid'])
+			return;
+
+		$block = observer_prohibited();
+
+		return profile_sidebar(\App::$profile, $block, true, true);
+	}
+
+}
+
diff --git a/include/widgets.php b/include/widgets.php
index 1cf144aa6..db3e195d5 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -13,82 +13,9 @@ require_once('include/attach.php');
 
 
 
-function widget_shortprofile($arr) {
-
-	if(! App::$profile['profile_uid'])
-		return;
-
-	$block = observer_prohibited();
-
-	return profile_sidebar(App::$profile, $block, true, true);
-}
-
-
-function widget_categories($arr) {
-
-
-	if(App::$profile['profile_uid'] && (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),'view_stream')))
-		return '';
-
-	$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
-	$srchurl = App::$query_string;
-	$srchurl =  rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
-
-	return categories_widget($srchurl, $cat);
-
-}
-
-function widget_appcategories($arr) {
-
-	if(! local_channel())
-		return '';
-
-	$selected = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
-
-	$srchurl =  rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
-
-	$srchurl = z_root() . '/apps';
-
-	$terms = array();
-
-	$r = q("select distinct(term.term)
-        from term join app on term.oid = app.id
-        where app_channel = %d
-        and term.uid = app_channel
-        and term.otype = %d
-        and term.term != 'nav_featured_app'
-        order by term.term asc",
-		intval(local_channel()),
-	    intval(TERM_OBJ_APP)
-	);
-	if($r) {
-		foreach($r as $rr)
-			$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-
-		return replace_macros(get_markup_template('categories_widget.tpl'),array(
-			'$title' => t('Categories'),
-			'$desc' => '',
-			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => t('Everything'),
-			'$terms' => $terms,
-			'$base' => $srchurl,
-
-		));
-	}
 
 
 
-}
-
-
-
-function widget_appcloud($arr) {
-	if(! local_channel())
-		return '';
-	return app_tagblock(z_root() . '/apps');
-}
 
 
 function widget_tagcloud_wall($arr) {

From 16d750d1f6cf0d2866388269e02445630c4e3464 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 20:56:12 -0700
Subject: [PATCH 038/299] widgets cont.

---
 Zotlabs/Widget/Affinity.php      |  60 ++++++
 Zotlabs/Widget/Catcloud_wall.php |  19 ++
 Zotlabs/Widget/Conversations.php |  74 +++++++
 Zotlabs/Widget/Design_tools.php  |  21 ++
 Zotlabs/Widget/Eventstools.php   |  19 ++
 Zotlabs/Widget/Mailmenu.php      |  36 ++++
 Zotlabs/Widget/Photo_albums.php  |  25 +++
 Zotlabs/Widget/Settings_menu.php | 137 ++++++++++++
 Zotlabs/Widget/Tagcloud_wall.php |  20 ++
 include/widgets.php              | 345 -------------------------------
 10 files changed, 411 insertions(+), 345 deletions(-)
 create mode 100644 Zotlabs/Widget/Affinity.php
 create mode 100644 Zotlabs/Widget/Catcloud_wall.php
 create mode 100644 Zotlabs/Widget/Conversations.php
 create mode 100644 Zotlabs/Widget/Design_tools.php
 create mode 100644 Zotlabs/Widget/Eventstools.php
 create mode 100644 Zotlabs/Widget/Mailmenu.php
 create mode 100644 Zotlabs/Widget/Photo_albums.php
 create mode 100644 Zotlabs/Widget/Settings_menu.php
 create mode 100644 Zotlabs/Widget/Tagcloud_wall.php

diff --git a/Zotlabs/Widget/Affinity.php b/Zotlabs/Widget/Affinity.php
new file mode 100644
index 000000000..439ba1f33
--- /dev/null
+++ b/Zotlabs/Widget/Affinity.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Affinity {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return '';
+	
+		// Get default cmin value from pconfig, but allow GET parameter to override
+		$cmin = intval(get_pconfig(local_channel(),'affinity','cmin'));
+		$cmin = (($cmin) ? $cmin : 0);
+		$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : $cmin);
+	
+		// Get default cmax value from pconfig, but allow GET parameter to override
+		$cmax = intval(get_pconfig(local_channel(),'affinity','cmax'));
+		$cmax = (($cmax) ? $cmax : 99);
+		$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : $cmax);
+
+
+		if(feature_enabled(local_channel(),'affinity')) {
+
+			$labels = array(
+				t('Me'),
+				t('Family'),
+				t('Friends'),
+				t('Acquaintances'),
+				t('All')
+			);
+			call_hooks('affinity_labels',$labels);
+			$label_str = '';
+
+			if($labels) {
+				foreach($labels as $l) {
+					if($label_str) {
+						$label_str .= ", '|'";
+						$label_str .= ", '" . $l . "'";
+					}
+					else
+						$label_str .= "'" . $l . "'";
+				}
+			}
+
+			$tpl = get_markup_template('main_slider.tpl');
+			$x = replace_macros($tpl,array(
+				'$val' => $cmin . ',' . $cmax,
+				'$refresh' => t('Refresh'),
+				'$labels' => $label_str,
+			));
+		
+			$arr = array('html' => $x);
+			call_hooks('main_slider',$arr);
+			return $arr['html'];
+		}
+ 		return '';
+	}
+}
+ 
\ No newline at end of file
diff --git a/Zotlabs/Widget/Catcloud_wall.php b/Zotlabs/Widget/Catcloud_wall.php
new file mode 100644
index 000000000..3795987cc
--- /dev/null
+++ b/Zotlabs/Widget/Catcloud_wall.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Catcloud_wall {
+
+	function widget($arr) {
+
+		if((! \App::$profile['profile_uid']) || (! \App::$profile['channel_hash']))
+			return '';
+		if(! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_stream'))
+			return '';
+
+		$limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50);
+
+		return catblock(\App::$profile['profile_uid'], $limit, '', \App::$profile['channel_hash'], 'wall');
+	}
+
+}
diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php
new file mode 100644
index 000000000..fa59ce20c
--- /dev/null
+++ b/Zotlabs/Widget/Conversations.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Conversations {
+
+	function widget($arr) {
+
+		if (! local_channel())
+			return;
+
+		if(argc() > 1) {
+
+			switch(argv(1)) {
+				case 'combined':
+					$mailbox = 'combined';
+					$header = t('Conversations');
+					break;
+				case 'inbox':
+					$mailbox = 'inbox';
+					$header = t('Received Messages');
+					break;
+				case 'outbox':
+					$mailbox = 'outbox';
+					$header = t('Sent Messages');
+					break;
+				default:
+					$mailbox = 'combined';
+					$header = t('Conversations');
+					break;
+			}
+
+			require_once('include/message.php');
+
+			// private_messages_list() can do other more complicated stuff, for now keep it simple
+			$r = private_messages_list(local_channel(), $mailbox, App::$pager['start'], App::$pager['itemspage']);
+
+			if(! $r) {
+				info( t('No messages.') . EOL);
+				return $o;
+			}
+
+			$messages = array();
+
+			foreach($r as $rr) {
+
+				$messages[] = array(
+					'mailbox'      => $mailbox,
+					'id'           => $rr['id'],
+					'from_name'    => $rr['from']['xchan_name'],
+					'from_url'     => chanlink_hash($rr['from_xchan']),
+					'from_photo'   => $rr['from']['xchan_photo_s'],
+					'to_name'      => $rr['to']['xchan_name'],
+					'to_url'       => chanlink_hash($rr['to_xchan']),
+					'to_photo'     => $rr['to']['xchan_photo_s'],
+					'subject'      => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
+					'delete'       => t('Delete conversation'),
+					'body'         => $rr['body'],
+					'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
+					'seen'         => $rr['seen'],
+					'selected'     => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
+				);
+			}
+
+			$tpl = get_markup_template('mail_head.tpl');
+			$o .= replace_macros($tpl, array(
+				'$header' => $header,
+				'$messages' => $messages
+			));
+
+		}
+		return $o;
+	}
+}
\ No newline at end of file
diff --git a/Zotlabs/Widget/Design_tools.php b/Zotlabs/Widget/Design_tools.php
new file mode 100644
index 000000000..8ab6a235d
--- /dev/null
+++ b/Zotlabs/Widget/Design_tools.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Design_tools {
+
+	function widget($arr) {
+
+		// mod menu doesn't load a profile. For any modules which load a profile, check it.
+		// otherwise local_channel() is sufficient for permissions.
+
+		if(\App::$profile['profile_uid'])
+			if((\App::$profile['profile_uid'] != local_channel()) && (! \App::$is_sys))
+				return '';
+
+		if(! local_channel())
+			return '';
+
+		return design_tools();
+	}
+}
\ No newline at end of file
diff --git a/Zotlabs/Widget/Eventstools.php b/Zotlabs/Widget/Eventstools.php
new file mode 100644
index 000000000..7efd3f72e
--- /dev/null
+++ b/Zotlabs/Widget/Eventstools.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Eventstools {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return;
+
+		return replace_macros(get_markup_template('events_tools_side.tpl'), array(
+			'$title' => t('Events Tools'),
+			'$export' => t('Export Calendar'),
+			'$import' => t('Import Calendar'),
+			'$submit' => t('Submit')
+		));
+	}
+}
diff --git a/Zotlabs/Widget/Mailmenu.php b/Zotlabs/Widget/Mailmenu.php
new file mode 100644
index 000000000..512f7d9c0
--- /dev/null
+++ b/Zotlabs/Widget/Mailmenu.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Mailmenu {
+
+	function widget($arr) {
+
+		if (! local_channel())
+			return;
+
+		return replace_macros(get_markup_template('message_side.tpl'), array(
+			'$title' => t('Private Mail Menu'),
+			'$combined' => array(
+				'label' => t('Combined View'),
+				'url' => z_root() . '/mail/combined',
+				'sel' => (argv(1) == 'combined'),
+			),
+			'$inbox' => array(
+				'label' => t('Inbox'),
+				'url' => z_root() . '/mail/inbox',
+				'sel' => (argv(1) == 'inbox'),
+			),
+			'$outbox' => array(
+				'label' => t('Outbox'),
+				'url' => z_root() . '/mail/outbox',
+				'sel' => (argv(1) == 'outbox'),
+			),
+			'$new' => array(
+				'label' => t('New Message'),
+				'url' => z_root() . '/mail/new',
+				'sel'=> (argv(1) == 'new'),
+			)
+		));
+	}
+}
diff --git a/Zotlabs/Widget/Photo_albums.php b/Zotlabs/Widget/Photo_albums.php
new file mode 100644
index 000000000..2a746e492
--- /dev/null
+++ b/Zotlabs/Widget/Photo_albums.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/photos.php');
+
+class Photo_albums {
+
+	function widget($arr) {
+
+		if(! \App::$profile['profile_uid'])
+			return '';
+
+		$channelx = channelx_by_n(\App::$profile['profile_uid']);
+
+		if((! $channelx) || (! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_storage')))
+			return '';
+
+		$sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'album');
+		$direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc');
+
+		return photos_album_widget($channelx, \App::get_observer(),$sortkey,$direction);
+	}
+}
+
diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
new file mode 100644
index 000000000..753390c23
--- /dev/null
+++ b/Zotlabs/Widget/Settings_menu.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Settings_menu {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return;
+
+
+		$channel = \App::get_channel();
+
+		$abook_self_id = 0;
+
+		// Retrieve the 'self' address book entry for use in the auto-permissions link
+
+		$role = get_pconfig(local_channel(),'system','permissions_role');
+
+		$abk = q("select abook_id from abook where abook_channel = %d and abook_self = 1 limit 1",
+			intval(local_channel())
+		);
+		if($abk)
+			$abook_self_id = $abk[0]['abook_id'];
+
+		$x = q("select count(*) as total from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0 ",
+			dbesc($channel['channel_hash'])
+		);
+
+		$hublocs = (($x && $x[0]['total'] > 1) ? true : false);
+
+		$tabs = array(
+			array(
+				'label'	=> t('Account settings'),
+				'url' 	=> z_root().'/settings/account',
+				'selected'	=> ((argv(1) === 'account') ? 'active' : ''),
+			),
+
+			array(
+				'label'	=> t('Channel settings'),
+				'url' 	=> z_root().'/settings/channel',
+				'selected'	=> ((argv(1) === 'channel') ? 'active' : ''),
+			),
+
+		);
+
+		if(get_account_techlevel() > 0 && get_features()) {
+			$tabs[] = 	array(
+					'label'	=> t('Additional features'),
+					'url' 	=> z_root().'/settings/features',
+					'selected'	=> ((argv(1) === 'features') ? 'active' : ''),
+			);
+		}
+
+		$tabs[] =	array(
+			'label'	=> t('Feature/Addon settings'),
+			'url' 	=> z_root().'/settings/featured',
+			'selected'	=> ((argv(1) === 'featured') ? 'active' : ''),
+		);
+
+		$tabs[] =	array(
+			'label'	=> t('Display settings'),
+			'url' 	=> z_root().'/settings/display',
+			'selected'	=> ((argv(1) === 'display') ? 'active' : ''),
+		);
+
+		if($hublocs) {
+			$tabs[] = array(
+				'label' => t('Manage locations'),
+				'url' => z_root() . '/locs',
+				'selected' => ((argv(1) === 'locs') ? 'active' : ''),
+			);
+		}
+
+		$tabs[] =	array(
+			'label' => t('Export channel'),
+			'url' => z_root() . '/uexport',
+			'selected' => ''
+		);
+
+		$tabs[] =	array(
+			'label' => t('Connected apps'),
+			'url' => z_root() . '/settings/oauth',
+			'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
+		);
+
+		if(get_account_techlevel() > 2) {
+			$tabs[] =	array(
+				'label' => t('Guest Access Tokens'),
+				'url' => z_root() . '/settings/tokens',
+				'selected' => ((argv(1) === 'tokens') ? 'active' : ''),
+			);
+		}
+
+		if(feature_enabled(local_channel(),'permcats')) {
+			$tabs[] = array(
+				'label' => t('Permission Groups'),
+				'url' => z_root() . '/settings/permcats',
+				'selected' => ((argv(1) === 'permcats') ? 'active' : ''),
+			);
+		}
+
+
+		if($role === false || $role === 'custom') {
+			$tabs[] = array(
+				'label' => t('Connection Default Permissions'),
+				'url' => z_root() . '/connedit/' . $abook_self_id,
+				'selected' => ''
+			);
+		}
+
+		if(feature_enabled(local_channel(),'premium_channel')) {
+			$tabs[] = array(
+				'label' => t('Premium Channel Settings'),
+				'url' => z_root() . '/connect/' . $channel['channel_address'],
+				'selected' => ''
+			);
+		}
+
+		if(feature_enabled(local_channel(),'channel_sources')) {
+			$tabs[] = array(
+				'label' => t('Channel Sources'),
+				'url' => z_root() . '/sources',
+				'selected' => ''
+			);
+		}
+
+		$tabtpl = get_markup_template("generic_links_widget.tpl");
+		return replace_macros($tabtpl, array(
+			'$title' => t('Settings'),
+			'$class' => 'settings-widget',
+			'$items' => $tabs,
+		));
+	}
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Widget/Tagcloud_wall.php b/Zotlabs/Widget/Tagcloud_wall.php
new file mode 100644
index 000000000..7cff6ce09
--- /dev/null
+++ b/Zotlabs/Widget/Tagcloud_wall.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Tagcloud_wall {
+
+	function widget($arr) {
+
+		if((! \App::$profile['profile_uid']) || (! \App::$profile['channel_hash']))
+			return '';
+		if(! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_stream'))
+			return '';
+
+		$limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50);
+		if(feature_enabled(\App::$profile['profile_uid'], 'tagadelic'))
+			return wtagblock(\App::$profile['profile_uid'], $limit, '', \App::$profile['channel_hash'], 'wall');
+
+		return '';
+	}
+}
diff --git a/include/widgets.php b/include/widgets.php
index db3e195d5..6241f3a6b 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -18,348 +18,17 @@ require_once('include/attach.php');
 
 
 
-function widget_tagcloud_wall($arr) {
 
 
-	if((! App::$profile['profile_uid']) || (! App::$profile['channel_hash']))
-		return '';
-	if(! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream'))
-		return '';
 
-	$limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50);
-	if(feature_enabled(App::$profile['profile_uid'], 'tagadelic'))
-		return wtagblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash'], 'wall');
 
-	return '';
-}
 
-function widget_catcloud_wall($arr) {
 
 
-	if((! App::$profile['profile_uid']) || (! App::$profile['channel_hash']))
-		return '';
-	if(! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream'))
-		return '';
 
-	$limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50);
 
-	return catblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash'], 'wall');
-}
 
 
-function widget_affinity($arr) {
-
-	if(! local_channel())
-		return '';
-	
-	// Get default cmin value from pconfig, but allow GET parameter to override
-	$cmin = intval(get_pconfig(local_channel(),'affinity','cmin'));
-	$cmin = (($cmin) ? $cmin : 0);
-	$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : $cmin);
-	
-	// Get default cmax value from pconfig, but allow GET parameter to override
-	$cmax = intval(get_pconfig(local_channel(),'affinity','cmax'));
-	$cmax = (($cmax) ? $cmax : 99);
-	$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : $cmax);
-
-
-	if(feature_enabled(local_channel(),'affinity')) {
-
-		$labels = array(
-			t('Me'),
-			t('Family'),
-			t('Friends'),
-			t('Acquaintances'),
-			t('All')
-		);
-		call_hooks('affinity_labels',$labels);
-		$label_str = '';
-
-		if($labels) {
-			foreach($labels as $l) {
-				if($label_str) {
-					$label_str .= ", '|'";
-					$label_str .= ", '" . $l . "'";
-				}
-				else
-					$label_str .= "'" . $l . "'";
-			}
-		}
-
-		$tpl = get_markup_template('main_slider.tpl');
-		$x = replace_macros($tpl,array(
-			'$val' => $cmin . ',' . $cmax,
-			'$refresh' => t('Refresh'),
-			'$labels' => $label_str,
-		));
-		$arr = array('html' => $x);
-		call_hooks('main_slider',$arr);
-		return $arr['html'];
-	}
-
- 	return '';
-}
-
-
-function widget_settings_menu($arr) {
-
-	if(! local_channel())
-		return;
-
-
-	$channel = App::get_channel();
-
-	$abook_self_id = 0;
-
-	// Retrieve the 'self' address book entry for use in the auto-permissions link
-
-	$role = get_pconfig(local_channel(),'system','permissions_role');
-
-	$abk = q("select abook_id from abook where abook_channel = %d and abook_self = 1 limit 1",
-		intval(local_channel())
-	);
-	if($abk)
-		$abook_self_id = $abk[0]['abook_id'];
-
-	$x = q("select count(*) as total from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0 ",
-		dbesc($channel['channel_hash'])
-	);
-
-	$hublocs = (($x && $x[0]['total'] > 1) ? true : false);
-
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> z_root().'/settings/account',
-			'selected'	=> ((argv(1) === 'account') ? 'active' : ''),
-		),
-
-		array(
-			'label'	=> t('Channel settings'),
-			'url' 	=> z_root().'/settings/channel',
-			'selected'	=> ((argv(1) === 'channel') ? 'active' : ''),
-		),
-
-	);
-
-	if(get_account_techlevel() > 0 && get_features()) {
-		$tabs[] = 	array(
-				'label'	=> t('Additional features'),
-				'url' 	=> z_root().'/settings/features',
-				'selected'	=> ((argv(1) === 'features') ? 'active' : ''),
-		);
-	}
-
-	$tabs[] =	array(
-		'label'	=> t('Feature/Addon settings'),
-		'url' 	=> z_root().'/settings/featured',
-		'selected'	=> ((argv(1) === 'featured') ? 'active' : ''),
-	);
-
-	$tabs[] =	array(
-		'label'	=> t('Display settings'),
-		'url' 	=> z_root().'/settings/display',
-		'selected'	=> ((argv(1) === 'display') ? 'active' : ''),
-	);
-
-	if($hublocs) {
-		$tabs[] = array(
-			'label' => t('Manage locations'),
-			'url' => z_root() . '/locs',
-			'selected' => ((argv(1) === 'locs') ? 'active' : ''),
-		);
-	}
-
-	$tabs[] =	array(
-		'label' => t('Export channel'),
-		'url' => z_root() . '/uexport',
-		'selected' => ''
-	);
-
-	$tabs[] =	array(
-		'label' => t('Connected apps'),
-		'url' => z_root() . '/settings/oauth',
-		'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
-	);
-
-	if(get_account_techlevel() > 2) {
-		$tabs[] =	array(
-			'label' => t('Guest Access Tokens'),
-			'url' => z_root() . '/settings/tokens',
-			'selected' => ((argv(1) === 'tokens') ? 'active' : ''),
-		);
-	}
-
-	if(feature_enabled(local_channel(),'permcats')) {
-		$tabs[] = array(
-			'label' => t('Permission Groups'),
-			'url' => z_root() . '/settings/permcats',
-			'selected' => ((argv(1) === 'permcats') ? 'active' : ''),
-		);
-	}
-
-
-	if($role === false || $role === 'custom') {
-		$tabs[] = array(
-			'label' => t('Connection Default Permissions'),
-			'url' => z_root() . '/connedit/' . $abook_self_id,
-			'selected' => ''
-		);
-	}
-
-	if(feature_enabled(local_channel(),'premium_channel')) {
-		$tabs[] = array(
-			'label' => t('Premium Channel Settings'),
-			'url' => z_root() . '/connect/' . $channel['channel_address'],
-			'selected' => ''
-		);
-	}
-
-	if(feature_enabled(local_channel(),'channel_sources')) {
-		$tabs[] = array(
-			'label' => t('Channel Sources'),
-			'url' => z_root() . '/sources',
-			'selected' => ''
-		);
-	}
-
-	$tabtpl = get_markup_template("generic_links_widget.tpl");
-	return replace_macros($tabtpl, array(
-		'$title' => t('Settings'),
-		'$class' => 'settings-widget',
-		'$items' => $tabs,
-	));
-}
-
-
-function widget_mailmenu($arr) {
-	if (! local_channel())
-		return;
-
-
-	return replace_macros(get_markup_template('message_side.tpl'), array(
-		'$title' => t('Private Mail Menu'),
-		'$combined'=>array(
-			'label' => t('Combined View'),
-			'url' => z_root() . '/mail/combined',
-			'sel' => (argv(1) == 'combined'),
-		),
-		'$inbox'=>array(
-			'label' => t('Inbox'),
-			'url' => z_root() . '/mail/inbox',
-			'sel' => (argv(1) == 'inbox'),
-		),
-		'$outbox'=>array(
-			'label' => t('Outbox'),
-			'url' => z_root() . '/mail/outbox',
-			'sel' => (argv(1) == 'outbox'),
-		),
-		'$new'=>array(
-			'label' => t('New Message'),
-			'url' => z_root() . '/mail/new',
-			'sel'=> (argv(1) == 'new'),
-		)
-	));
-}
-
-
-function widget_conversations($arr) {
-	if (! local_channel())
-		return;
-
-	if(argc() > 1) {
-
-		switch(argv(1)) {
-			case 'combined':
-				$mailbox = 'combined';
-				$header = t('Conversations');
-				break;
-			case 'inbox':
-				$mailbox = 'inbox';
-				$header = t('Received Messages');
-				break;
-			case 'outbox':
-				$mailbox = 'outbox';
-				$header = t('Sent Messages');
-				break;
-			default:
-				$mailbox = 'combined';
-				$header = t('Conversations');
-				break;
-		}
-
-		require_once('include/message.php');
-
-		// private_messages_list() can do other more complicated stuff, for now keep it simple
-		$r = private_messages_list(local_channel(), $mailbox, App::$pager['start'], App::$pager['itemspage']);
-
-		if(! $r) {
-			info( t('No messages.') . EOL);
-			return $o;
-		}
-
-		$messages = array();
-
-		foreach($r as $rr) {
-
-			$messages[] = array(
-				'mailbox'      => $mailbox,
-				'id'           => $rr['id'],
-				'from_name'    => $rr['from']['xchan_name'],
-				'from_url'     => chanlink_hash($rr['from_xchan']),
-				'from_photo'   => $rr['from']['xchan_photo_s'],
-				'to_name'      => $rr['to']['xchan_name'],
-				'to_url'       => chanlink_hash($rr['to_xchan']),
-				'to_photo'     => $rr['to']['xchan_photo_s'],
-				'subject'      => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
-				'delete'       => t('Delete conversation'),
-				'body'         => $rr['body'],
-				'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
-				'seen'         => $rr['seen'],
-				'selected'     => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
-			);
-		}
-
-		$tpl = get_markup_template('mail_head.tpl');
-		$o .= replace_macros($tpl, array(
-			'$header' => $header,
-			'$messages' => $messages
-		));
-
-		//$o .= alt_pager($a,count($r));
-
-	}
-
-	return $o;
-}
-
-function widget_eventstools($arr) {
-	if (! local_channel())
-		return;
-
-	return replace_macros(get_markup_template('events_tools_side.tpl'), array(
-		'$title' => t('Events Tools'),
-		'$export' => t('Export Calendar'),
-		'$import' => t('Import Calendar'),
-		'$submit' => t('Submit')
-	));
-}
-
-function widget_design_tools($arr) {
-
-	// mod menu doesn't load a profile. For any modules which load a profile, check it.
-	// otherwise local_channel() is sufficient for permissions.
-
-	if(App::$profile['profile_uid'])
-		if((App::$profile['profile_uid'] != local_channel()) && (! App::$is_sys))
-			return '';
-
-	if(! local_channel())
-		return '';
-
-	return design_tools();
-}
-
 function widget_website_portation_tools($arr) {
 
 	// mod menu doesn't load a profile. For any modules which load a profile, check it.
@@ -380,20 +49,6 @@ function widget_findpeople($arr) {
 }
 
 
-function widget_photo_albums($arr) {
-
-	if(! App::$profile['profile_uid'])
-		return '';
-	$channelx = channelx_by_n(App::$profile['profile_uid']);
-	if((! $channelx) || (! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_storage')))
-		return '';
-	require_once('include/photos.php');
-	$sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'album');
-	$direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc');
-
-	return photos_album_widget($channelx, App::get_observer(),$sortkey,$direction);
-}
-
 
 function widget_vcard($arr) {
 	return vcard_from_xchan('', App::get_observer());

From f6b643e84ee1ce8b4e13f959e0d58804f4aabd3b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 21:26:28 -0700
Subject: [PATCH 039/299] widgets cont.

---
 Zotlabs/Widget/Admin.php             |  68 +++++++++
 Zotlabs/Widget/Chatroom_list.php     |  24 ++++
 Zotlabs/Widget/Chatroom_members.php  |  15 ++
 Zotlabs/Widget/Menu_preview.php      |  16 +++
 Zotlabs/Widget/Tasklist.php          |  30 ++++
 Zotlabs/Widget/Vcard.php             |  12 ++
 Zotlabs/Widget/Wiki_list.php         |  23 +++
 Zotlabs/Widget/Wiki_page_history.php |  27 ++++
 Zotlabs/Widget/Wiki_pages.php        |  59 ++++++++
 include/widgets.php                  | 208 ---------------------------
 10 files changed, 274 insertions(+), 208 deletions(-)
 create mode 100644 Zotlabs/Widget/Admin.php
 create mode 100644 Zotlabs/Widget/Chatroom_list.php
 create mode 100644 Zotlabs/Widget/Chatroom_members.php
 create mode 100644 Zotlabs/Widget/Menu_preview.php
 create mode 100644 Zotlabs/Widget/Tasklist.php
 create mode 100644 Zotlabs/Widget/Vcard.php
 create mode 100644 Zotlabs/Widget/Wiki_list.php
 create mode 100644 Zotlabs/Widget/Wiki_page_history.php
 create mode 100644 Zotlabs/Widget/Wiki_pages.php

diff --git a/Zotlabs/Widget/Admin.php b/Zotlabs/Widget/Admin.php
new file mode 100644
index 000000000..a761eebe3
--- /dev/null
+++ b/Zotlabs/Widget/Admin.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Admin {
+
+	function widget($arr) {
+
+		/*
+		 * Side bar links
+		 */
+
+		if(! is_site_admin()) {
+			return '';
+		}
+
+		$o = '';
+
+		// array( url, name, extra css classes )
+
+		$aside = [
+			'site'      => array(z_root() . '/admin/site/',     t('Site'),           'site'),
+			'accounts'  => array(z_root() . '/admin/accounts/', t('Accounts'),       'accounts', 'pending-update', t('Member registrations waiting for confirmation')),
+			'channels'  => array(z_root() . '/admin/channels/', t('Channels'),       'channels'),
+			'security'  => array(z_root() . '/admin/security/', t('Security'),       'security'),
+			'features'  => array(z_root() . '/admin/features/', t('Features'),       'features'),
+			'plugins'   => array(z_root() . '/admin/plugins/',  t('Plugins'),        'plugins'),
+			'themes'    => array(z_root() . '/admin/themes/',   t('Themes'),         'themes'),
+			'queue'     => array(z_root() . '/admin/queue',     t('Inspect queue'),  'queue'),
+			'profs'     => array(z_root() . '/admin/profs',     t('Profile Fields'), 'profs'),
+			'dbsync'    => array(z_root() . '/admin/dbsync/',   t('DB updates'),     'dbsync')
+		];
+
+		/* get plugins admin page */
+
+		$r = q("SELECT * FROM addon WHERE plugin_admin = 1");
+
+		$plugins = array();
+		if($r) {
+			foreach ($r as $h){
+				$plugin = $h['aname'];
+				$plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin');
+				// temp plugins with admin
+				\App::$plugins_admin[] = $plugin;
+			}
+		}
+
+		$logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs');
+
+		$arr = array('links' => $aside,'plugins' => $plugins,'logs' => $logs);
+		call_hooks('admin_aside',$arr);
+
+		$o .= replace_macros(get_markup_template('admin_aside.tpl'), array(
+			'$admin' => $aside,
+			'$admtxt' => t('Admin'),
+			'$plugadmtxt' => t('Plugin Features'),
+			'$plugins' => $plugins,
+			'$logtxt' => t('Logs'),
+			'$logs' => $logs,
+			'$h_pending' => t('Member registrations waiting for confirmation'),
+			'$admurl'=> z_root() . '/admin/'
+		));
+
+		return $o;
+
+	}
+}
+
diff --git a/Zotlabs/Widget/Chatroom_list.php b/Zotlabs/Widget/Chatroom_list.php
new file mode 100644
index 000000000..e2aad0e05
--- /dev/null
+++ b/Zotlabs/Widget/Chatroom_list.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Chatroom_list {
+
+	function widget($arr) {
+
+		if(! \App::$profile)
+			return '';
+
+		$r = \Zotlabs\Lib\Chatroom::roomlist(\App::$profile['profile_uid']);
+
+		if($r) {
+			return replace_macros(get_markup_template('chatroomlist.tpl'), array(
+				'$header' => t('Chatrooms'),
+				'$baseurl' => z_root(),
+				'$nickname' => \App::$profile['channel_address'],
+				'$items' => $r,
+				'$overview' => t('Overview')
+			));
+		}
+	}
+}
diff --git a/Zotlabs/Widget/Chatroom_members.php b/Zotlabs/Widget/Chatroom_members.php
new file mode 100644
index 000000000..8ed77fb3c
--- /dev/null
+++ b/Zotlabs/Widget/Chatroom_members.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Chatroom_members {
+
+	// The actual contents are filled in via AJAX
+
+	function widget() {
+		return replace_macros(get_markup_template('chatroom_members.tpl'), array(
+			'$header' => t('Chat Members')
+		));
+	}
+
+}
diff --git a/Zotlabs/Widget/Menu_preview.php b/Zotlabs/Widget/Menu_preview.php
new file mode 100644
index 000000000..51218f6cf
--- /dev/null
+++ b/Zotlabs/Widget/Menu_preview.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/menu.php');
+
+class Menu_preview {
+
+	function widget($arr) {
+		if(! \App::$data['menu_item'])
+			return;
+
+		return menu_render(\App::$data['menu_item']);
+	}
+
+}
diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php
new file mode 100644
index 000000000..6f7a8aaed
--- /dev/null
+++ b/Zotlabs/Widget/Tasklist.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/event.php');
+
+class Tasklist {
+
+	function widget($arr) {
+
+	if (! local_channel())
+		return;
+
+		$o .= '<script>var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});</script>';
+		$o .= '<script>function taskComplete(id) { $.post("tasks/complete/"+id, function(data) { tasksFetch();}); }
+			function tasksFetch() {
+				$.get("tasks/fetch" + ((tasksShowAll) ? "/all" : ""), function(data) {
+					$(".tasklist-tasks").html(data.html);
+				});
+			}
+			</script>';
+
+		$o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks">';
+		$o .= '</div><form id="tasklist-new-form" action="" ><input id="tasklist-new-summary" type="text" name="summary" value="" /></form>';
+		$o .= '</div>';
+		return $o;
+
+	}
+}
+
diff --git a/Zotlabs/Widget/Vcard.php b/Zotlabs/Widget/Vcard.php
new file mode 100644
index 000000000..cab05dfdd
--- /dev/null
+++ b/Zotlabs/Widget/Vcard.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Vcard {
+
+	function widget($arr) {
+		return vcard_from_xchan('', \App::get_observer());
+	}
+
+}
+
diff --git a/Zotlabs/Widget/Wiki_list.php b/Zotlabs/Widget/Wiki_list.php
new file mode 100644
index 000000000..62f32dbf0
--- /dev/null
+++ b/Zotlabs/Widget/Wiki_list.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Wiki_list {
+
+	function widget($arr) {
+
+		$channel = channelx_by_n(\App::$profile_uid);
+
+		$wikis = \Zotlabs\Lib\NativeWiki::listwikis($channel,get_observer_hash());
+
+		if($wikis) {
+			return replace_macros(get_markup_template('wikilist_widget.tpl'), array(
+				'$header' => t('Wiki List'),
+				'$channel' => $channel['channel_address'],
+				'$wikis' => $wikis['wikis']
+			));
+		}
+		return '';
+	}
+
+}
diff --git a/Zotlabs/Widget/Wiki_page_history.php b/Zotlabs/Widget/Wiki_page_history.php
new file mode 100644
index 000000000..dcec9a037
--- /dev/null
+++ b/Zotlabs/Widget/Wiki_page_history.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Wiki_page_history {
+
+	function widget($arr) {
+
+		$pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
+		$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+
+		$pageHistory = \Zotlabs\Lib\NativeWikiPage::page_history([
+			'channel_id'    => \App::$profile_uid, 
+			'observer_hash' => get_observer_hash(),
+			'resource_id'   => $resource_id,
+			'pageUrlName'   => $pageUrlName
+		]);
+
+		return replace_macros(get_markup_template('nwiki_page_history.tpl'), array(
+			'$pageHistory' => $pageHistory['history'],
+			'$permsWrite'  => $arr['permsWrite'],
+			'$name_lbl'    => t('Name'),
+			'$msg_label'   => t('Message','wiki_history')
+		));
+
+	}
+}
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
new file mode 100644
index 000000000..bad451475
--- /dev/null
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Wiki_pages {
+
+	function widget($arr) {
+
+		$channelname = ((array_key_exists('channel',$arr)) ? $arr['channel'] : '');
+		$c = channelx_by_nick($channelname);
+
+		$wikiname = '';
+		if(array_key_exists('refresh', $arr)) {
+			$not_refresh = (($arr['refresh']=== true) ? false : true);
+		}
+		else {
+			$not_refresh = true;
+		}
+
+		$pages = array();
+		if(! array_key_exists('resource_id', $arr)) {
+			$hide = true;
+		}
+		else {
+			$p = \Zotlabs\Lib\NativeWikiPage::page_list($c['channel_id'],get_observer_hash(),$arr['resource_id']);
+
+			if($p['pages']) {
+				$pages = $p['pages'];
+				$w = $p['wiki'];
+				// Wiki item record is $w['wiki']
+				$wikiname = $w['urlName'];
+				if (!$wikiname) {
+					$wikiname = '';
+				}
+			}
+		}
+
+		$can_create = perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'write_wiki');
+
+		$can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false);
+
+		return replace_macros(get_markup_template('wiki_page_list.tpl'), array(
+				'$hide' => $hide,
+				'$resource_id' => $arr['resource_id'],
+				'$not_refresh' => $not_refresh,
+				'$header' => t('Wiki Pages'),
+				'$channel' => $channelname,
+				'$wikiname' => $wikiname,
+				'$pages' => $pages,
+				'$canadd' => $can_create,
+				'$candel' => $can_delete,
+				'$addnew' => t('Add new page'),
+				'$pageName' => array('pageName', t('Page name')),
+		));
+	}
+}
+
+
diff --git a/include/widgets.php b/include/widgets.php
index 6241f3a6b..b669b73fa 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -12,22 +12,6 @@ require_once('include/attach.php');
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 function widget_website_portation_tools($arr) {
 
@@ -50,10 +34,6 @@ function widget_findpeople($arr) {
 
 
 
-function widget_vcard($arr) {
-	return vcard_from_xchan('', App::get_observer());
-}
-
 
 /*
  * The following directory widgets are only useful on the directory page
@@ -68,114 +48,10 @@ function widget_dirtags($arr) {
 	return dir_tagblock(z_root() . '/directory', null);
 }
 
-function widget_menu_preview($arr) {
-	if(! App::$data['menu_item'])
-		return;
-	require_once('include/menu.php');
-
-	return menu_render(App::$data['menu_item']);
-}
-
-function widget_chatroom_list($arr) {
 
 
-	$r = Zotlabs\Lib\Chatroom::roomlist(App::$profile['profile_uid']);
 
-	if($r) {
-		return replace_macros(get_markup_template('chatroomlist.tpl'), array(
-			'$header' => t('Chatrooms'),
-			'$baseurl' => z_root(),
-			'$nickname' => App::$profile['channel_address'],
-			'$items' => $r,
-			'$overview' => t('Overview')
-		));
-	}
-}
 
-function widget_chatroom_members() {
-	$o = replace_macros(get_markup_template('chatroom_members.tpl'), array(
-		'$header' => t('Chat Members')
-	));
-
-	return $o;
-}
-
-function widget_wiki_list($arr) {
-
-	$channel = channelx_by_n(App::$profile_uid);
-
-	$wikis = Zotlabs\Lib\NativeWiki::listwikis($channel,get_observer_hash());
-
-	if($wikis) {
-		return replace_macros(get_markup_template('wikilist_widget.tpl'), array(
-			'$header' => t('Wiki List'),
-			'$channel' => $channel['channel_address'],
-			'$wikis' => $wikis['wikis']
-		));
-	}
-	return '';
-}
-
-function widget_wiki_pages($arr) {
-
-	$channelname = ((array_key_exists('channel',$arr)) ? $arr['channel'] : '');
-	$c = channelx_by_nick($channelname);
-
-	$wikiname = '';
-	if (array_key_exists('refresh', $arr)) {
-		$not_refresh = (($arr['refresh']=== true) ? false : true);
-	} else {
-		$not_refresh = true;
-	}
-	$pages = array();
-	if (! array_key_exists('resource_id', $arr)) {
-		$hide = true;
-	} else {
-		$p = Zotlabs\Lib\NativeWikiPage::page_list($c['channel_id'],get_observer_hash(),$arr['resource_id']);
-
-		if($p['pages']) {
-			$pages = $p['pages'];
-			$w = $p['wiki'];
-			// Wiki item record is $w['wiki']
-			$wikiname = $w['urlName'];
-			if (!$wikiname) {
-				$wikiname = '';
-			}
-		}
-	}
-	$can_create = perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'write_wiki');
-
-	$can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false);
-
-	return replace_macros(get_markup_template('wiki_page_list.tpl'), array(
-			'$hide' => $hide,
-			'$resource_id' => $arr['resource_id'],
-			'$not_refresh' => $not_refresh,
-			'$header' => t('Wiki Pages'),
-			'$channel' => $channelname,
-			'$wikiname' => $wikiname,
-			'$pages' => $pages,
-			'$canadd' => $can_create,
-			'$candel' => $can_delete,
-			'$addnew' => t('Add new page'),
-			'$pageName' => array('pageName', t('Page name')),
-	));
-}
-
-function widget_wiki_page_history($arr) {
-
-	$pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
-	$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-
-	$pageHistory = Zotlabs\Lib\NativeWikiPage::page_history(array('channel_id' => App::$profile_uid, 'observer_hash' => get_observer_hash(), 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
-	return replace_macros(get_markup_template('nwiki_page_history.tpl'), array(
-		'$pageHistory' => $pageHistory['history'],
-		'$permsWrite' => $arr['permsWrite'],
-		'$name_lbl' => t('Name'),
-		'$msg_label' => t('Message','wiki_history')
-	));
-
-}
 
 function widget_bookmarkedchats($arr) {
 
@@ -749,28 +625,6 @@ function widget_activity($arr) {
 
 
 
-function widget_tasklist($arr) {
-
-	if (! local_channel())
-		return;
-
-	require_once('include/event.php');
-	$o .= '<script>var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});</script>';
-	$o .= '<script>function taskComplete(id) { $.post("tasks/complete/"+id, function(data) { tasksFetch();}); }
-		function tasksFetch() {
-			$.get("tasks/fetch" + ((tasksShowAll) ? "/all" : ""), function(data) {
-				$(".tasklist-tasks").html(data.html);
-			});
-		}
-		</script>';
-
-	$o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks">';
-	$o .= '</div><form id="tasklist-new-form" action="" ><input id="tasklist-new-summary" type="text" name="summary" value="" /></form>';
-	$o .= '</div>';
-	return $o;
-
-}
-
 
 function widget_helpindex($arr) {
 
@@ -814,68 +668,6 @@ function widget_helpindex($arr) {
 
 
 
-function widget_admin($arr) {
-
-	/*
-	 * Side bar links
-	 */
-
-	if(! is_site_admin()) {
-		return '';
-	}
-
-	$o = '';
-
-	// array( url, name, extra css classes )
-
-	$aside = array(
-		'site'      => array(z_root() . '/admin/site/',     t('Site'),           'site'),
-		'accounts'  => array(z_root() . '/admin/accounts/', t('Accounts'),       'accounts', 'pending-update', t('Member registrations waiting for confirmation')),
-		'channels'  => array(z_root() . '/admin/channels/', t('Channels'),       'channels'),
-		'security'  => array(z_root() . '/admin/security/', t('Security'),       'security'),
-		'features'  => array(z_root() . '/admin/features/', t('Features'),       'features'),
-		'plugins'   => array(z_root() . '/admin/plugins/',  t('Plugins'),        'plugins'),
-		'themes'    => array(z_root() . '/admin/themes/',   t('Themes'),         'themes'),
-		'queue'     => array(z_root() . '/admin/queue',     t('Inspect queue'),  'queue'),
-		'profs'     => array(z_root() . '/admin/profs',     t('Profile Fields'), 'profs'),
-		'dbsync'    => array(z_root() . '/admin/dbsync/',   t('DB updates'),     'dbsync')
-
-	);
-
-	/* get plugins admin page */
-
-	$r = q("SELECT * FROM addon WHERE plugin_admin = 1");
-
-	$plugins = array();
-	if($r) {
-		foreach ($r as $h){
-			$plugin = $h['aname'];
-			$plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin');
-			// temp plugins with admin
-			App::$plugins_admin[] = $plugin;
-		}
-	}
-
-	$logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs');
-
-	$arr = array('links' => $aside,'plugins' => $plugins,'logs' => $logs);
-	call_hooks('admin_aside',$arr);
-
-	$o .= replace_macros(get_markup_template('admin_aside.tpl'), array(
-			'$admin' => $aside,
-			'$admtxt' => t('Admin'),
-			'$plugadmtxt' => t('Plugin Features'),
-			'$plugins' => $plugins,
-			'$logtxt' => t('Logs'),
-			'$logs' => $logs,
-			'$h_pending' => t('Member registrations waiting for confirmation'),
-			'$admurl'=> z_root() . '/admin/'
-	));
-
-	return $o;
-
-}
-
 
 
 function widget_album($args) {

From fb3f63bf596e77fe25c8b60c74651e39b62b1436 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 21:49:27 -0700
Subject: [PATCH 040/299] input filter issue

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

diff --git a/include/items.php b/include/items.php
index ace8b2fb2..c929bb378 100755
--- a/include/items.php
+++ b/include/items.php
@@ -532,6 +532,8 @@ function get_item_elements($x,$allow_code = false) {
 
 	$maxlen = get_max_import_size();
 
+	$arr['body'] = $x['body'];
+
 	if($maxlen && mb_strlen($arr['body']) > $maxlen) {
 		$arr['body'] = mb_substr($arr['body'],0,$maxlen,'UTF-8');
 		logger('get_item_elements: message length exceeds max_import_size: truncated');

From 051759580dc7aff7d5b349b3b5271f054c7d3423 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 16 Mar 2017 01:16:29 -0700
Subject: [PATCH 041/299] namespace error

---
 Zotlabs/Widget/Conversations.php | 2 +-
 include/items.php                | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php
index fa59ce20c..c1f1eff16 100644
--- a/Zotlabs/Widget/Conversations.php
+++ b/Zotlabs/Widget/Conversations.php
@@ -33,7 +33,7 @@ class Conversations {
 			require_once('include/message.php');
 
 			// private_messages_list() can do other more complicated stuff, for now keep it simple
-			$r = private_messages_list(local_channel(), $mailbox, App::$pager['start'], App::$pager['itemspage']);
+			$r = private_messages_list(local_channel(), $mailbox, \App::$pager['start'], \App::$pager['itemspage']);
 
 			if(! $r) {
 				info( t('No messages.') . EOL);
diff --git a/include/items.php b/include/items.php
index c929bb378..c6aedc2e4 100755
--- a/include/items.php
+++ b/include/items.php
@@ -528,12 +528,10 @@ function get_item_elements($x,$allow_code = false) {
 
 	$arr = array();
 
-	$key = get_config('system','pubkey');
+	$arr['body'] = $x['body'];
 
 	$maxlen = get_max_import_size();
 
-	$arr['body'] = $x['body'];
-
 	if($maxlen && mb_strlen($arr['body']) > $maxlen) {
 		$arr['body'] = mb_substr($arr['body'],0,$maxlen,'UTF-8');
 		logger('get_item_elements: message length exceeds max_import_size: truncated');

From 446b5550a2c2b52bb31db5b99602c42b9dfdade6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 16 Mar 2017 17:11:48 -0700
Subject: [PATCH 042/299] the rest of the standard widgets converted

---
 Zotlabs/Widget/Activity.php                |  61 ++
 Zotlabs/Widget/Album.php                   | 106 +++
 Zotlabs/Widget/Bookmarkedchats.php         |  28 +
 Zotlabs/Widget/Categories.php              |   1 +
 Zotlabs/Widget/Clock.php                   |  63 ++
 Zotlabs/Widget/Cover_photo.php             |  59 ++
 Zotlabs/Widget/Dirsort.php                 |  11 +
 Zotlabs/Widget/Dirtags.php                 |  13 +
 Zotlabs/Widget/Filer.php                   |   1 +
 Zotlabs/Widget/Findpeople.php              |  12 +
 Zotlabs/Widget/Forums.php                  |  97 +++
 Zotlabs/Widget/Helpindex.php               |  45 ++
 Zotlabs/Widget/Item.php                    |  54 ++
 Zotlabs/Widget/Photo.php                   |  55 ++
 Zotlabs/Widget/Photo_rand.php              |  66 ++
 Zotlabs/Widget/Pubsites.php                |  16 +
 Zotlabs/Widget/Random_block.php            |  46 ++
 Zotlabs/Widget/Rating.php                  |  67 ++
 Zotlabs/Widget/Suggestedchats.php          |  37 +
 Zotlabs/Widget/Website_portation_tools.php |  22 +
 include/widgets.php                        | 763 +--------------------
 21 files changed, 861 insertions(+), 762 deletions(-)
 create mode 100644 Zotlabs/Widget/Activity.php
 create mode 100644 Zotlabs/Widget/Album.php
 create mode 100644 Zotlabs/Widget/Bookmarkedchats.php
 create mode 100644 Zotlabs/Widget/Clock.php
 create mode 100644 Zotlabs/Widget/Cover_photo.php
 create mode 100644 Zotlabs/Widget/Dirsort.php
 create mode 100644 Zotlabs/Widget/Dirtags.php
 create mode 100644 Zotlabs/Widget/Findpeople.php
 create mode 100644 Zotlabs/Widget/Forums.php
 create mode 100644 Zotlabs/Widget/Helpindex.php
 create mode 100644 Zotlabs/Widget/Item.php
 create mode 100644 Zotlabs/Widget/Photo.php
 create mode 100644 Zotlabs/Widget/Photo_rand.php
 create mode 100644 Zotlabs/Widget/Pubsites.php
 create mode 100644 Zotlabs/Widget/Random_block.php
 create mode 100644 Zotlabs/Widget/Rating.php
 create mode 100644 Zotlabs/Widget/Suggestedchats.php
 create mode 100644 Zotlabs/Widget/Website_portation_tools.php

diff --git a/Zotlabs/Widget/Activity.php b/Zotlabs/Widget/Activity.php
new file mode 100644
index 000000000..72a27bdf1
--- /dev/null
+++ b/Zotlabs/Widget/Activity.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Activity {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return '';
+
+		$o = '';
+
+		if(is_array($arr) && array_key_exists('limit',$arr))
+			$limit = " limit " . intval($limit) . " ";
+		else
+			$limit = '';
+
+		$perms_sql = item_permissions_sql(local_channel()) . item_normal();
+
+		$r = q("select author_xchan from item where item_unseen = 1 and uid = %d $perms_sql",
+			intval(local_channel())
+		);
+
+		$contributors = [];
+		$arr = [];
+
+		if($r) {
+			foreach($r as $rv) {
+				if(array_key_exists($rv['author_xchan'],$contributors)) {
+					$contributors[$rv['author_xchan']] ++;
+				}
+				else {
+					$contributors[$rv['author_xchan']] = 1;
+				}
+			}
+			foreach($contributors as $k => $v) {
+				$arr[] = [ 'author_xchan' => $k, 'total' => $v	];	
+			}
+			usort($arr,'total_sort');
+			xchan_query($arr);
+		}
+
+		$x = [ 'entries' => $arr ];
+		call_hooks('activity_widget',$x);
+		$arr = $x['entries']; 
+
+		if($arr) {
+			$o .= '<div class="widget">';
+			$o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav nav-pills nav-stacked">';
+
+			foreach($arr as $rv) {
+				$o .= '<li><a href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge pull-right">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rv['author']['xchan_name'] . '</a></li>';
+			}
+			$o .= '</ul></div>';
+		}
+		return $o;
+	}
+
+}	
+
diff --git a/Zotlabs/Widget/Album.php b/Zotlabs/Widget/Album.php
new file mode 100644
index 000000000..f359e6d0f
--- /dev/null
+++ b/Zotlabs/Widget/Album.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/attach.php');
+
+class Album {
+
+	function widget($args) {
+
+
+		$owner_uid = \App::$profile_uid;
+		$sql_extra = permissions_sql($owner_uid);
+
+
+		if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage'))
+			return '';
+
+		if($args['album'])
+			$album = $args['album'];
+		if($args['title'])
+			$title = $args['title'];
+
+		/**
+		 * This may return incorrect permissions if you have multiple directories of the same name.
+		 * It is a limitation of the photo table using a name for a photo album instead of a folder hash
+		 */
+
+		if($album) {
+			$x = q("select hash from attach where filename = '%s' and uid = %d limit 1",
+				dbesc($album),
+				intval($owner_uid)
+			);
+			if($x) {
+				$y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']);
+				if(! $y)
+					return '';
+			}
+		}
+
+		$order = 'DESC';
+
+		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+			(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph
+			ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
+			ORDER BY created $order ",
+			intval($owner_uid),
+			dbesc($album),
+			intval(PHOTO_NORMAL),
+			intval(PHOTO_PROFILE)
+		);
+
+		//edit album name
+		$album_edit = null;
+
+		$photos = array();
+		if($r) {
+			$twist = 'rotright';
+			foreach($r as $rr) {
+
+				if($twist == 'rotright')
+					$twist = 'rotleft';
+				else
+					$twist = 'rotright';
+
+				$ext = $phototypes[$rr['mimetype']];
+
+				$imgalt_e = $rr['filename'];
+				$desc_e = $rr['description'];
+
+				$imagelink = (z_root() . '/photos/' . \App::$profile['channel_address'] . '/image/' . $rr['resource_id']);
+
+
+				$photos[] = array(
+					'id' => $rr['id'],
+					'twist' => ' ' . $twist . rand(2,4),
+					'link' => $imagelink,
+					'title' => t('View Photo'),
+					'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
+					'alt' => $imgalt_e,
+					'desc'=> $desc_e,
+					'ext' => $ext,
+					'hash'=> $rr['resource_id'],
+					'unknown' => t('Unknown')
+				);
+			}
+		}
+
+
+		$tpl = get_markup_template('photo_album.tpl');
+		$o .= replace_macros($tpl, array(
+			'$photos' => $photos,
+			'$album' => (($title) ? $title : $album),
+			'$album_id' => rand(),
+			'$album_edit' => array(t('Edit Album'), $album_edit),
+			'$can_post' => false,
+			'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
+			'$order' => false,
+			'$upload_form' => $upload_form,
+			'$usage' => $usage_message
+		));
+	
+		return $o;
+	}
+}
+
diff --git a/Zotlabs/Widget/Bookmarkedchats.php b/Zotlabs/Widget/Bookmarkedchats.php
new file mode 100644
index 000000000..d64bbdb4b
--- /dev/null
+++ b/Zotlabs/Widget/Bookmarkedchats.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Bookmarkedchats {
+
+	function widget($arr) {
+
+		if(! feature_enabled(\App::$profile['profile_uid'],'ajaxchat'))
+			return '';
+
+		$h = get_observer_hash();
+		if(! $h)
+			return;
+		$r = q("select xchat_url, xchat_desc from xchat where xchat_xchan = '%s' order by xchat_desc",
+			dbesc($h)
+		);
+		if($r) {
+			for($x = 0; $x < count($r); $x ++) {
+				$r[$x]['xchat_url'] = zid($r[$x]['xchat_url']);
+			}
+		}
+		return replace_macros(get_markup_template('bookmarkedchats.tpl'),array(
+			'$header' => t('Bookmarked Chatrooms'),
+			'$rooms' => $r
+		));
+	}
+}
diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php
index 82fffccc8..d1dcfda93 100644
--- a/Zotlabs/Widget/Categories.php
+++ b/Zotlabs/Widget/Categories.php
@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Widget;
 
+require_once('include/contact_widgets.php');
 
 class Categories {
 
diff --git a/Zotlabs/Widget/Clock.php b/Zotlabs/Widget/Clock.php
new file mode 100644
index 000000000..b63b5f748
--- /dev/null
+++ b/Zotlabs/Widget/Clock.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Clock {
+
+	function widget($arr) {
+
+		$miltime = 0;
+		if(isset($arr['military']) && $arr['military'])
+			$miltime = 1;
+
+		$o = <<< EOT
+<div class="widget">
+<h3 class="clockface"></h3>
+<script>
+
+var timerID = null
+var timerRunning = false
+
+function stopclock(){
+    if(timerRunning)
+        clearTimeout(timerID)
+    timerRunning = false
+}
+
+function startclock(){
+    stopclock()
+    showtime()
+}
+
+function showtime(){
+    var now = new Date()
+    var hours = now.getHours()
+    var minutes = now.getMinutes()
+    var seconds = now.getSeconds()
+	var military = $miltime
+    var timeValue = ""
+	if(military)
+		timeValue = hours
+	else
+		timeValue = ((hours > 12) ? hours - 12 : hours)
+    timeValue  += ((minutes < 10) ? ":0" : ":") + minutes
+//    timeValue  += ((seconds < 10) ? ":0" : ":") + seconds
+	if(! military)
+	    timeValue  += (hours >= 12) ? " P.M." : " A.M."
+    $('.clockface').html(timeValue)
+    timerID = setTimeout("showtime()",1000)
+    timerRunning = true
+}
+
+$(document).ready(function() {
+	startclock();
+});
+
+</script>
+</div>
+EOT;
+
+	return $o;
+	}
+}
+
diff --git a/Zotlabs/Widget/Cover_photo.php b/Zotlabs/Widget/Cover_photo.php
new file mode 100644
index 000000000..d2eb1be92
--- /dev/null
+++ b/Zotlabs/Widget/Cover_photo.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Cover_photo {
+
+	function widget($arr) {
+
+		require_once('include/channel.php');
+		$o = '';
+
+		if(\App::$module == 'channel' && $_REQUEST['mid'])
+			return '';
+
+		$channel_id = 0;
+		if(array_key_exists('channel_id', $arr) && intval($arr['channel_id']))
+			$channel_id = intval($arr['channel_id']);
+		if(! $channel_id)
+			$channel_id = \App::$profile_uid;
+		if(! $channel_id)
+			return '';
+
+		$channel = channelx_by_n($channel_id);
+
+		if(array_key_exists('style', $arr) && isset($arr['style']))
+			$style = $arr['style'];
+		else
+			$style = 'width:100%; height: auto;';
+
+		// ensure they can't sneak in an eval(js) function
+
+		if(strpbrk($style,'(\'"<>') !== false)
+			$style = '';
+
+		if(array_key_exists('title', $arr) && isset($arr['title']))
+			$title = $arr['title'];
+		else
+			$title = $channel['channel_name'];
+
+		if(array_key_exists('subtitle', $arr) && isset($arr['subtitle']))
+			$subtitle = $arr['subtitle'];
+		else
+			$subtitle = str_replace('@','&#x40;',$channel['xchan_addr']);
+
+		$c = get_cover_photo($channel_id,'html');
+
+		if($c) {
+			$photo_html = (($style) ? str_replace('alt=',' style="' . $style . '" alt=',$c) : $c);
+
+			$o = replace_macros(get_markup_template('cover_photo_widget.tpl'),array(
+				'$photo_html'	=> $photo_html,
+				'$title'	=> $title,
+				'$subtitle'	=> $subtitle,
+				'$hovertitle' => t('Click to show more'),
+			));
+		}
+		return $o;
+	}
+}
diff --git a/Zotlabs/Widget/Dirsort.php b/Zotlabs/Widget/Dirsort.php
new file mode 100644
index 000000000..e75a00e50
--- /dev/null
+++ b/Zotlabs/Widget/Dirsort.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/dir_fns.php');
+
+class Dirsort {
+	function widget($arr) {
+		return dir_sort_links();
+	}
+}
diff --git a/Zotlabs/Widget/Dirtags.php b/Zotlabs/Widget/Dirtags.php
new file mode 100644
index 000000000..f211d5942
--- /dev/null
+++ b/Zotlabs/Widget/Dirtags.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/dir_fns.php');
+
+class Dirtags {
+
+	function widget($arr) {
+		return dir_tagblock(z_root() . '/directory', null);
+	}
+
+}
diff --git a/Zotlabs/Widget/Filer.php b/Zotlabs/Widget/Filer.php
index cb9a0becf..5d6f96a87 100644
--- a/Zotlabs/Widget/Filer.php
+++ b/Zotlabs/Widget/Filer.php
@@ -2,6 +2,7 @@
 
 namespace Zotlabs\Widget;
 
+require_once('include/contact_widgets.php');
 
 class Filer {
 
diff --git a/Zotlabs/Widget/Findpeople.php b/Zotlabs/Widget/Findpeople.php
new file mode 100644
index 000000000..f450b96ae
--- /dev/null
+++ b/Zotlabs/Widget/Findpeople.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/contact_widgets.php');
+
+class Findpeople {
+	function widget($arr) {
+		return findpeople_widget();
+	}
+}
+
diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php
new file mode 100644
index 000000000..5f04a9fcc
--- /dev/null
+++ b/Zotlabs/Widget/Forums.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Forums {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return '';
+
+		$o = '';
+
+		if(is_array($arr) && array_key_exists('limit',$arr))
+			$limit = " limit " . intval($limit) . " ";
+		else
+			$limit = '';
+
+		$unseen = 0;
+		if(is_array($arr) && array_key_exists('unseen',$arr) && intval($arr['unseen']))
+			$unseen = 1;
+
+		$perms_sql = item_permissions_sql(local_channel()) . item_normal();
+
+		$xf = false;
+
+		$x1 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'send_stream' and v = '0'",
+			intval(local_channel())
+		);
+		if($x1) {
+			$xc = ids_to_querystr($x1,'xchan',true);
+			$x2 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'tag_deliver' and v = '1' and xchan in (" . $xc . ") ",
+				intval(local_channel())
+			);
+			if($x2)
+				$xf = ids_to_querystr($x2,'xchan',true);
+		}
+
+		$sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); 
+
+		$r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d $sql_extra order by xchan_name $limit ",
+			intval(local_channel())
+		);
+		if(! $r1)
+			return $o;
+
+		$str = '';
+
+		// Trying to cram all this into a single query with joins and the proper group by's is tough.
+		// There also should be a way to update this via ajax.
+
+		for($x = 0; $x < count($r1); $x ++) {
+			$r = q("select sum(item_unseen) as unseen from item where owner_xchan = '%s' and uid = %d and item_unseen = 1 $perms_sql ",
+				dbesc($r1[$x]['xchan_hash']),
+				intval(local_channel())
+			);
+			if($r)
+				$r1[$x]['unseen'] = $r[0]['unseen'];
+
+		/**
+		 * @FIXME
+		 * This SQL makes the counts correct when you get forum posts arriving from different routes/sources
+		 * (like personal channels). However the network query for these posts doesn't yet include this
+		 * correction and it makes the SQL for that query pretty hairy so this is left as a future exercise.
+		 * It may make more sense in that query to look for the mention in the body rather than another join,
+		 * but that makes it very inefficient.
+		 *
+		$r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
+			intval(TERM_OBJ_POST),
+			dbesc($r1[$x]['xchan_hash']),
+			intval(local_channel()),
+			dbesc($r1[$x]['xchan_url']),
+			intval(TERM_MENTION)
+		);
+		if($r)
+			$r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
+		 *
+		 * end @FIXME
+		 */
+
+		}
+
+		if($r1) {
+			$o .= '<div class="widget">';
+			$o .= '<h3>' . t('Forums') . '</h3><ul class="nav nav-pills nav-stacked">';
+
+			foreach($r1 as $rr) {
+				if($unseen && (! intval($rr['unseen'])))
+					continue;
+				$o .= '<li><a href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge pull-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img src="' . $rr['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rr['xchan_name'] . '</a></li>';
+			}
+			$o .= '</ul></div>';
+		}
+		return $o;
+
+	}
+}
diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php
new file mode 100644
index 000000000..62cecce1f
--- /dev/null
+++ b/Zotlabs/Widget/Helpindex.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Helpindex {
+
+	function widget($arr) {
+
+		$o .= '<div class="widget">';
+
+		$level_0 = get_help_content('sitetoc');
+		if(! $level_0)
+			$level_0 = get_help_content('toc');
+
+		$level_0 = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills nav-stacked">',$level_0);
+
+		$levels = array();
+
+
+		if(argc() > 2) {
+			$path = '';
+			for($x = 1; $x < argc(); $x ++) {
+				$path .= argv($x) . '/';
+				$y = get_help_content($path . 'sitetoc');
+				if(! $y)
+					$y = get_help_content($path . 'toc');
+				if($y)
+					$levels[] = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills nav-stacked">',$y);
+			}
+		}
+
+		if($level_0)
+			$o .= $level_0;
+		if($levels) {
+			foreach($levels as $l) {
+				$o .= '<br /><br />';
+				$o .= $l;
+			}
+		}
+
+		$o .= '</div>';
+
+		return $o;
+	}
+}
diff --git a/Zotlabs/Widget/Item.php b/Zotlabs/Widget/Item.php
new file mode 100644
index 000000000..273d5649c
--- /dev/null
+++ b/Zotlabs/Widget/Item.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/security.php');
+
+class Item {
+
+	function widget($arr) {
+
+		$channel_id = 0;
+		if(array_key_exists('channel_id',$arr) && intval($arr['channel_id']))
+			$channel_id = intval($arr['channel_id']);
+		if(! $channel_id)
+			$channel_id = \App::$profile_uid;
+		if(! $channel_id)
+			return '';
+
+
+		if((! $arr['mid']) && (! $arr['title']))
+			return '';
+
+		if(! perm_is_allowed($channel_id, get_observer_hash(), 'view_pages'))
+			return '';
+
+		$sql_extra = item_permissions_sql($channel_id);
+
+		if($arr['title']) {
+			$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s'
+				and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1",
+				intval($channel_id),
+				dbesc($arr['title']),
+				intval(ITEM_TYPE_WEBPAGE)
+			);
+		}
+		else {
+			$r = q("select * from item where mid = '%s' and uid = %d and item_type = " 
+				. intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1",
+				dbesc($arr['mid']),
+				intval($channel_id)
+			);
+		}
+
+		if(! $r)
+			return '';
+
+		xchan_query($r);
+		$r = fetch_post_tags($r, true);
+
+		$o = prepare_page($r[0]);
+		return $o;
+	}
+}
diff --git a/Zotlabs/Widget/Photo.php b/Zotlabs/Widget/Photo.php
new file mode 100644
index 000000000..10031f028
--- /dev/null
+++ b/Zotlabs/Widget/Photo.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Photo {
+
+
+	/**
+	 * @brief Widget to display a single photo.
+	 *
+	 * @param array $arr associative array with
+	 *    * \e string \b src URL of photo; URL must be an http or https URL
+	 *    * \e boolean \b zrl use zid in URL
+	 *    * \e string \b style CSS string
+	 *
+	 * @return string with parsed HTML
+	 */
+
+	function widget($arr) {
+
+		$style = $zrl = false;
+
+		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(strpbrk($style, '(\'"<>' ) !== false)
+			$style = '';
+
+		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 . '" alt="' . t('photo/image') . '">';
+
+		$o .= '</div>';
+
+		return $o;
+	}
+}
+
diff --git a/Zotlabs/Widget/Photo_rand.php b/Zotlabs/Widget/Photo_rand.php
new file mode 100644
index 000000000..af80a3b9f
--- /dev/null
+++ b/Zotlabs/Widget/Photo_rand.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/photos.php');
+
+class Photo_rand {
+
+	function widget($arr) {
+
+		$style = false;
+
+		if(array_key_exists('album', $arr) && isset($arr['album']))
+			$album = $arr['album'];
+		else
+			$album = '';
+
+		$channel_id = 0;
+		if(array_key_exists('channel_id', $arr) && intval($arr['channel_id']))
+			$channel_id = intval($arr['channel_id']);
+		if(! $channel_id)
+			$channel_id = \App::$profile_uid;
+		if(! $channel_id)
+			return '';
+
+		$scale = ((array_key_exists('scale',$arr)) ? intval($arr['scale']) : 0);
+
+		$ret = photos_list_photos(array('channel_id' => $channel_id),\App::get_observer(),$album);
+
+		$filtered = array();
+		if($ret['success'] && $ret['photos'])
+		foreach($ret['photos'] as $p)
+			if($p['imgscale'] == $scale)
+				$filtered[] = $p['src'];
+
+		if($filtered) {
+			$e = mt_rand(0, count($filtered) - 1);
+			$url = $filtered[$e];
+		}
+
+		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 '';
+	
+		$url = zid($url);
+
+		$o = '<div class="widget">';
+
+		$o .= '<img class="zrl" '
+			. (($style) ? ' style="' . $style . '"' : '')
+			. ' src="' . $url . '" alt="' . t('photo/image') . '">';
+
+		$o .= '</div>';
+
+		return $o;
+	}
+}
+
+
diff --git a/Zotlabs/Widget/Pubsites.php b/Zotlabs/Widget/Pubsites.php
new file mode 100644
index 000000000..958ba68c2
--- /dev/null
+++ b/Zotlabs/Widget/Pubsites.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Pubsites {
+
+	// used by site ratings pages to provide a return link
+
+	function widget($arr) {
+		if(\App::$poi)
+			return;
+		return '<div class="widget"><ul class="nav nav-pills"><li><a href="pubsites">' . t('Public Hubs') . '</a></li></ul></div>';
+	}
+}
+
+
diff --git a/Zotlabs/Widget/Random_block.php b/Zotlabs/Widget/Random_block.php
new file mode 100644
index 000000000..465a51f97
--- /dev/null
+++ b/Zotlabs/Widget/Random_block.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Random_block {
+
+	function widget($arr) {
+
+		$channel_id = 0;
+		if(array_key_exists('channel_id',$arr) && intval($arr['channel_id']))
+			$channel_id = intval($arr['channel_id']);
+		if(! $channel_id)
+			$channel_id = \App::$profile_uid;
+		if(! $channel_id)
+			return '';
+
+		if(array_key_exists('contains',$arr))
+			$contains = $arr['contains'];
+
+		$o = '';
+
+		require_once('include/security.php');
+		$sql_options = item_permissions_sql($channel_id);
+
+		$randfunc = db_getfunc('RAND');
+
+		$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.v like '%s' and iconfig.k = 'BUILDBLOCK' and
+			item_type = %d $sql_options order by $randfunc limit 1",
+			intval($channel_id),
+			dbesc('%' . $contains . '%'),
+			intval(ITEM_TYPE_BLOCK)
+		);
+
+		if($r) {
+			$o = '<div class="widget bblock">';
+			if($r[0]['title'])
+				$o .= '<h3>' . $r[0]['title'] . '</h3>';
+
+			$o .= prepare_text($r[0]['body'],$r[0]['mimetype']);
+			$o .= '</div>';
+		}
+
+		return $o;
+	}
+}
diff --git a/Zotlabs/Widget/Rating.php b/Zotlabs/Widget/Rating.php
new file mode 100644
index 000000000..5e09f457b
--- /dev/null
+++ b/Zotlabs/Widget/Rating.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Rating {
+
+	function widget($arr) {
+
+
+		$rating_enabled = get_config('system','rating_enabled');
+		if(! $rating_enabled) {
+			return;
+		}
+
+		if($arr['target'])
+			$hash = $arr['target'];
+		else
+			$hash = \App::$poi['xchan_hash'];
+
+		if(! $hash)
+			return;
+
+		$url = '';
+		$remote = false;
+
+		if(remote_channel() && ! local_channel()) {
+			$ob = \App::get_observer();
+			if($ob && $ob['xchan_url']) {
+				$p = parse_url($ob['xchan_url']);
+				if($p) {
+					$url = $p['scheme'] . '://' . $p['host'] . (($p['port']) ? ':' . $p['port'] : '');
+					$url .= '/rate?f=&target=' . urlencode($hash);
+				}
+				$remote = true;
+			}
+		}
+
+		$self = false;
+
+		if(local_channel()) {
+			$channel = \App::get_channel();
+
+			if($hash == $channel['channel_hash'])
+				$self = true;
+
+			head_add_js('ratings.js');
+		}
+
+
+		$o = '<div class="widget">';
+		$o .= '<h3>' . t('Rating Tools') . '</h3>';
+
+		if((($remote) || (local_channel())) && (! $self)) {
+			if($remote)
+				$o .= '<a class="btn btn-block btn-primary btn-sm" href="' . $url . '"><i class="fa fa-pencil"></i> ' . t('Rate Me') . '</a>';
+			else
+				$o .= '<div class="btn btn-block btn-primary btn-sm" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="fa fa-pencil"></i> ' . t('Rate Me') . '</div>';
+		}
+
+		$o .= '<a class="btn btn-block btn-default btn-sm" href="ratings/' . $hash . '"><i class="fa fa-eye"></i> ' . t('View Ratings') . '</a>';
+		$o .= '</div>';
+
+		return $o;
+
+	}
+}
+
diff --git a/Zotlabs/Widget/Suggestedchats.php b/Zotlabs/Widget/Suggestedchats.php
new file mode 100644
index 000000000..7df42944d
--- /dev/null
+++ b/Zotlabs/Widget/Suggestedchats.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Suggestedchats {
+
+	function widget($arr) {
+
+		if(! feature_enabled(\App::$profile['profile_uid'],'ajaxchat'))
+			return '';
+
+		// There are reports that this tool does not ever remove chatrooms on dead sites,
+		// and also will happily link to private chats which you cannot enter.
+		// For those reasons, it will be disabled until somebody decides it's worth
+		// fixing and comes up with a plan for doing so.
+
+		return '';
+
+		// probably should restrict this to your friends, but then the widget will only work
+		// if you are logged in locally.
+
+		$h = get_observer_hash();
+		if(! $h)
+			return;
+		$r = q("select xchat_url, xchat_desc, count(xchat_xchan) as total from xchat group by xchat_url, xchat_desc order by total desc, xchat_desc limit 24");
+		if($r) {
+			for($x = 0; $x < count($r); $x ++) {
+				$r[$x]['xchat_url'] = zid($r[$x]['xchat_url']);
+			}
+		}
+		return replace_macros(get_markup_template('bookmarkedchats.tpl'),array(
+			'$header' => t('Suggested Chatrooms'),
+			'$rooms' => $r
+		));
+	}
+}
+
diff --git a/Zotlabs/Widget/Website_portation_tools.php b/Zotlabs/Widget/Website_portation_tools.php
new file mode 100644
index 000000000..1cf3bb78a
--- /dev/null
+++ b/Zotlabs/Widget/Website_portation_tools.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+class Website_portation_tools {
+
+	function widget($arr) {
+
+		// mod menu doesn't load a profile. For any modules which load a profile, check it.
+		// otherwise local_channel() is sufficient for permissions.
+
+		if(\App::$profile['profile_uid'])
+			if((\App::$profile['profile_uid'] != local_channel()) && (! \App::$is_sys))
+				return '';
+
+		if(! local_channel())
+			return '';
+
+		return website_portation_tools();
+	}
+}
diff --git a/include/widgets.php b/include/widgets.php
index b669b73fa..f35915d72 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -2,767 +2,6 @@
 /**
  * @file include/widgets.php
  *
- * @brief This file contains some widgets.
+ * @brief This file may contain some widgets.
  */
 
-require_once('include/dir_fns.php');
-require_once('include/contact_widgets.php');
-require_once('include/attach.php');
-
-
-
-
-
-function widget_website_portation_tools($arr) {
-
-	// mod menu doesn't load a profile. For any modules which load a profile, check it.
-	// otherwise local_channel() is sufficient for permissions.
-
-	if(App::$profile['profile_uid'])
-		if((App::$profile['profile_uid'] != local_channel()) && (! App::$is_sys))
-			return '';
-
-	if(! local_channel())
-		return '';
-
-	return website_portation_tools();
-}
-
-function widget_findpeople($arr) {
-	return findpeople_widget();
-}
-
-
-
-
-/*
- * The following directory widgets are only useful on the directory page
- */
-
-
-function widget_dirsort($arr) {
-	return dir_sort_links();
-}
-
-function widget_dirtags($arr) {
-	return dir_tagblock(z_root() . '/directory', null);
-}
-
-
-
-
-
-
-function widget_bookmarkedchats($arr) {
-
-	if(! feature_enabled(App::$profile['profile_uid'],'ajaxchat'))
-		return '';
-
-	$h = get_observer_hash();
-	if(! $h)
-		return;
-	$r = q("select xchat_url, xchat_desc from xchat where xchat_xchan = '%s' order by xchat_desc",
-		dbesc($h)
-	);
-	if($r) {
-		for($x = 0; $x < count($r); $x ++) {
-			$r[$x]['xchat_url'] = zid($r[$x]['xchat_url']);
-		}
-	}
-	return replace_macros(get_markup_template('bookmarkedchats.tpl'),array(
-		'$header' => t('Bookmarked Chatrooms'),
-		'$rooms' => $r
-	));
-}
-
-function widget_suggestedchats($arr) {
-
-	if(! feature_enabled(App::$profile['profile_uid'],'ajaxchat'))
-		return '';
-
-	// There are reports that this tool does not ever remove chatrooms on dead sites,
-	// and also will happily link to private chats which you cannot enter.
-	// For those reasons, it will be disabled until somebody decides it's worth
-	// fixing and comes up with a plan for doing so.
-
-	return '';
-
-
-	// probably should restrict this to your friends, but then the widget will only work
-	// if you are logged in locally.
-
-	$h = get_observer_hash();
-	if(! $h)
-		return;
-	$r = q("select xchat_url, xchat_desc, count(xchat_xchan) as total from xchat group by xchat_url, xchat_desc order by total desc, xchat_desc limit 24");
-	if($r) {
-		for($x = 0; $x < count($r); $x ++) {
-			$r[$x]['xchat_url'] = zid($r[$x]['xchat_url']);
-		}
-	}
-	return replace_macros(get_markup_template('bookmarkedchats.tpl'),array(
-		'$header' => t('Suggested Chatrooms'),
-		'$rooms' => $r
-	));
-}
-
-function widget_item($arr) {
-
-	$channel_id = 0;
-	if(array_key_exists('channel_id',$arr) && intval($arr['channel_id']))
-		$channel_id = intval($arr['channel_id']);
-	if(! $channel_id)
-		$channel_id = App::$profile_uid;
-	if(! $channel_id)
-		return '';
-
-
-	if((! $arr['mid']) && (! $arr['title']))
-		return '';
-
-	if(! perm_is_allowed($channel_id, get_observer_hash(), 'view_pages'))
-		return '';
-
-	require_once('include/security.php');
-	$sql_extra = item_permissions_sql($channel_id);
-
-	if($arr['title']) {
-		$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
-			where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s'
-			and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1",
-			intval($channel_id),
-			dbesc($arr['title']),
-			intval(ITEM_TYPE_WEBPAGE)
-		);
-	}
-	else {
-		$r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1",
-			dbesc($arr['mid']),
-			intval($channel_id)
-		);
-	}
-
-	if(! $r)
-		return '';
-
-	xchan_query($r);
-	$r = fetch_post_tags($r, true);
-
-	$o = prepare_page($r[0]);
-	return $o;
-}
-
-function widget_clock($arr) {
-
-	$miltime = 0;
-	if(isset($arr['military']) && $arr['military'])
-		$miltime = 1;
-
-$o = <<< EOT
-<div class="widget">
-<h3 class="clockface"></h3>
-<script>
-
-var timerID = null
-var timerRunning = false
-
-function stopclock(){
-    if(timerRunning)
-        clearTimeout(timerID)
-    timerRunning = false
-}
-
-function startclock(){
-    stopclock()
-    showtime()
-}
-
-function showtime(){
-    var now = new Date()
-    var hours = now.getHours()
-    var minutes = now.getMinutes()
-    var seconds = now.getSeconds()
-	var military = $miltime
-    var timeValue = ""
-	if(military)
-		timeValue = hours
-	else
-		timeValue = ((hours > 12) ? hours - 12 : hours)
-    timeValue  += ((minutes < 10) ? ":0" : ":") + minutes
-//    timeValue  += ((seconds < 10) ? ":0" : ":") + seconds
-	if(! military)
-	    timeValue  += (hours >= 12) ? " P.M." : " A.M."
-    $('.clockface').html(timeValue)
-    timerID = setTimeout("showtime()",1000)
-    timerRunning = true
-}
-
-$(document).ready(function() {
-	startclock();
-});
-
-</script>
-</div>
-EOT;
-return $o;
-
-}
-
-/**
- * @brief Widget to display a single photo.
- *
- * @param array $arr associative array with
- *    * \e string \b src URL of photo; URL must be an http or https URL
- *    * \e boolean \b zrl use zid in URL
- *    * \e string \b style CSS string
- *
- * @return string with parsed HTML
- */
-function widget_photo($arr) {
-
-	$style = $zrl = false;
-
-	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(strpbrk($style, '(\'"<>') !== false)
-		$style = '';
-
-	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 . '" alt="' . t('photo/image') . '">';
-
-	$o .= '</div>';
-
-	return $o;
-}
-
-
-function widget_cover_photo($arr) {
-
-	require_once('include/channel.php');
-	$o = '';
-
-	if(App::$module == 'channel' && $_REQUEST['mid'])
-		return '';
-
-	$channel_id = 0;
-	if(array_key_exists('channel_id', $arr) && intval($arr['channel_id']))
-		$channel_id = intval($arr['channel_id']);
-	if(! $channel_id)
-		$channel_id = App::$profile_uid;
-	if(! $channel_id)
-		return '';
-
-	$channel = channelx_by_n($channel_id);
-
-	if(array_key_exists('style', $arr) && isset($arr['style']))
-		$style = $arr['style'];
-	else
-		$style = 'width:100%; height: auto;';
-
-	// ensure they can't sneak in an eval(js) function
-
-	if(strpbrk($style,'(\'"<>') !== false)
-		$style = '';
-
-	if(array_key_exists('title', $arr) && isset($arr['title']))
-		$title = $arr['title'];
-	else
-		$title = $channel['channel_name'];
-
-	if(array_key_exists('subtitle', $arr) && isset($arr['subtitle']))
-		$subtitle = $arr['subtitle'];
-	else
-		$subtitle = str_replace('@','&#x40;',$channel['xchan_addr']);
-
-	$c = get_cover_photo($channel_id,'html');
-
-	if($c) {
-		$photo_html = (($style) ? str_replace('alt=',' style="' . $style . '" alt=',$c) : $c);
-
-		$o = replace_macros(get_markup_template('cover_photo_widget.tpl'),array(
-			'$photo_html'	=> $photo_html,
-			'$title'	=> $title,
-			'$subtitle'	=> $subtitle,
-			'$hovertitle' => t('Click to show more'),
-		));
-	}
-	return $o;
-}
-
-
-function widget_photo_rand($arr) {
-
-	require_once('include/photos.php');
-	$style = false;
-
-	if(array_key_exists('album', $arr) && isset($arr['album']))
-		$album = $arr['album'];
-	else
-		$album = '';
-
-	$channel_id = 0;
-	if(array_key_exists('channel_id', $arr) && intval($arr['channel_id']))
-		$channel_id = intval($arr['channel_id']);
-	if(! $channel_id)
-		$channel_id = App::$profile_uid;
-	if(! $channel_id)
-		return '';
-
-	$scale = ((array_key_exists('scale',$arr)) ? intval($arr['scale']) : 0);
-
-	$ret = photos_list_photos(array('channel_id' => $channel_id),App::get_observer(),$album);
-
-	$filtered = array();
-	if($ret['success'] && $ret['photos'])
-	foreach($ret['photos'] as $p)
-		if($p['imgscale'] == $scale)
-			$filtered[] = $p['src'];
-
-	if($filtered) {
-		$e = mt_rand(0, count($filtered) - 1);
-		$url = $filtered[$e];
-	}
-
-	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 '';
-
-	$url = zid($url);
-
-	$o = '<div class="widget">';
-
-	$o .= '<img class="zrl" '
-		. (($style) ? ' style="' . $style . '"' : '')
-		. ' src="' . $url . '" alt="' . t('photo/image') . '">';
-
-	$o .= '</div>';
-
-	return $o;
-}
-
-
-function widget_random_block($arr) {
-
-	$channel_id = 0;
-	if(array_key_exists('channel_id',$arr) && intval($arr['channel_id']))
-		$channel_id = intval($arr['channel_id']);
-	if(! $channel_id)
-		$channel_id = App::$profile_uid;
-	if(! $channel_id)
-		return '';
-
-	if(array_key_exists('contains',$arr))
-		$contains = $arr['contains'];
-
-	$o = '';
-
-	require_once('include/security.php');
-	$sql_options = item_permissions_sql($channel_id);
-
-	$randfunc = db_getfunc('RAND');
-
-	$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
-		where item.uid = %d and iconfig.cat = 'system' and iconfig.v like '%s' and iconfig.k = 'BUILDBLOCK' and
-		item_type = %d $sql_options order by $randfunc limit 1",
-		intval($channel_id),
-		dbesc('%' . $contains . '%'),
-		intval(ITEM_TYPE_BLOCK)
-	);
-
-	if($r) {
-		$o = '<div class="widget bblock">';
-		if($r[0]['title'])
-			$o .= '<h3>' . $r[0]['title'] . '</h3>';
-
-		$o .= prepare_text($r[0]['body'],$r[0]['mimetype']);
-		$o .= '</div>';
-	}
-
-	return $o;
-}
-
-
-function widget_rating($arr) {
-
-
-	$rating_enabled = get_config('system','rating_enabled');
-	if(! $rating_enabled) {
-		return;
-	}
-
-	if($arr['target'])
-		$hash = $arr['target'];
-	else
-		$hash = App::$poi['xchan_hash'];
-
-	if(! $hash)
-		return;
-
-	$url = '';
-	$remote = false;
-
-	if(remote_channel() && ! local_channel()) {
-		$ob = App::get_observer();
-		if($ob && $ob['xchan_url']) {
-			$p = parse_url($ob['xchan_url']);
-			if($p) {
-				$url = $p['scheme'] . '://' . $p['host'] . (($p['port']) ? ':' . $p['port'] : '');
-				$url .= '/rate?f=&target=' . urlencode($hash);
-			}
-			$remote = true;
-		}
-	}
-
-	$self = false;
-
-	if(local_channel()) {
-		$channel = App::get_channel();
-
-		if($hash == $channel['channel_hash'])
-			$self = true;
-
-		head_add_js('ratings.js');
-
-	}
-
-
-	$o = '<div class="widget">';
-	$o .= '<h3>' . t('Rating Tools') . '</h3>';
-
-	if((($remote) || (local_channel())) && (! $self)) {
-		if($remote)
-			$o .= '<a class="btn btn-block btn-primary btn-sm" href="' . $url . '"><i class="fa fa-pencil"></i> ' . t('Rate Me') . '</a>';
-		else
-			$o .= '<div class="btn btn-block btn-primary btn-sm" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="fa fa-pencil"></i> ' . t('Rate Me') . '</div>';
-	}
-
-	$o .= '<a class="btn btn-block btn-default btn-sm" href="ratings/' . $hash . '"><i class="fa fa-eye"></i> ' . t('View Ratings') . '</a>';
-	$o .= '</div>';
-
-	return $o;
-
-}
-
-// used by site ratings pages to provide a return link
-function widget_pubsites($arr) {
-	if(App::$poi)
-		return;
-	return '<div class="widget"><ul class="nav nav-pills"><li><a href="pubsites">' . t('Public Hubs') . '</a></li></ul></div>';
-}
-
-
-function widget_forums($arr) {
-
-	if(! local_channel())
-		return '';
-
-	$o = '';
-
-	if(is_array($arr) && array_key_exists('limit',$arr))
-		$limit = " limit " . intval($limit) . " ";
-	else
-		$limit = '';
-
-	$unseen = 0;
-	if(is_array($arr) && array_key_exists('unseen',$arr) && intval($arr['unseen']))
-		$unseen = 1;
-
-	$perms_sql = item_permissions_sql(local_channel()) . item_normal();
-
-	$xf = false;
-
-	$x1 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'send_stream' and v = '0'",
-		intval(local_channel())
-	);
-	if($x1) {
-		$xc = ids_to_querystr($x1,'xchan',true);
-		$x2 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'tag_deliver' and v = '1' and xchan in (" . $xc . ") ",
-			intval(local_channel())
-		);
-		if($x2)
-			$xf = ids_to_querystr($x2,'xchan',true);
-	}
-
-	$sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); 
-
-	$r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d $sql_extra order by xchan_name $limit ",
-		intval(local_channel())
-	);
-	if(! $r1)
-		return $o;
-
-	$str = '';
-
-	// Trying to cram all this into a single query with joins and the proper group by's is tough.
-	// There also should be a way to update this via ajax.
-
-	for($x = 0; $x < count($r1); $x ++) {
-		$r = q("select sum(item_unseen) as unseen from item where owner_xchan = '%s' and uid = %d and item_unseen = 1 $perms_sql ",
-			dbesc($r1[$x]['xchan_hash']),
-			intval(local_channel())
-		);
-		if($r)
-			$r1[$x]['unseen'] = $r[0]['unseen'];
-
-/**
- * @FIXME
- * This SQL makes the counts correct when you get forum posts arriving from different routes/sources
- * (like personal channels). However the network query for these posts doesn't yet include this
- * correction and it makes the SQL for that query pretty hairy so this is left as a future exercise.
- * It may make more sense in that query to look for the mention in the body rather than another join,
- * but that makes it very inefficient.
- *
-		$r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
-			intval(TERM_OBJ_POST),
-			dbesc($r1[$x]['xchan_hash']),
-			intval(local_channel()),
-			dbesc($r1[$x]['xchan_url']),
-			intval(TERM_MENTION)
-		);
-		if($r)
-			$r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
- *
- * end @FIXME
- */
-
-	}
-
-	if($r1) {
-		$o .= '<div class="widget">';
-		$o .= '<h3>' . t('Forums') . '</h3><ul class="nav nav-pills nav-stacked">';
-
-		foreach($r1 as $rr) {
-			if($unseen && (! intval($rr['unseen'])))
-				continue;
-			$o .= '<li><a href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge pull-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img src="' . $rr['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rr['xchan_name'] . '</a></li>';
-		}
-		$o .= '</ul></div>';
-	}
-	return $o;
-
-}
-
-
-function widget_activity($arr) {
-
-	if(! local_channel())
-		return '';
-
-	$o = '';
-
-	if(is_array($arr) && array_key_exists('limit',$arr))
-		$limit = " limit " . intval($limit) . " ";
-	else
-		$limit = '';
-
-	$perms_sql = item_permissions_sql(local_channel()) . item_normal();
-
-	$r = q("select author_xchan from item where item_unseen = 1 and uid = %d $perms_sql",
-		intval(local_channel())
-	);
-
-	$contributors = [];
-	$arr = [];
-
-	if($r) {
-		foreach($r as $rv) {
-			if(array_key_exists($rv['author_xchan'],$contributors)) {
-				$contributors[$rv['author_xchan']] ++;
-			}
-			else {
-				$contributors[$rv['author_xchan']] = 1;
-			}
-		}
-		foreach($contributors as $k => $v) {
-			$arr[] = [ 'author_xchan' => $k, 'total' => $v	];	
-		}
-		usort($arr,'total_sort');
-		xchan_query($arr);
-	}
-
-	$x = [ 'entries' => $arr ];
-	call_hooks('activity_widget',$x);
-	$arr = $x['entries']; 
-
-	if($arr) {
-		$o .= '<div class="widget">';
-		$o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav nav-pills nav-stacked">';
-
-		foreach($arr as $rv) {
-			$o .= '<li><a href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge pull-right">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rv['author']['xchan_name'] . '</a></li>';
-		}
-		$o .= '</ul></div>';
-	}
-	return $o;
-
-}
-
-
-
-
-
-function widget_helpindex($arr) {
-
-	$o .= '<div class="widget">';
-
-	$level_0 = get_help_content('sitetoc');
-	if(! $level_0)
-		$level_0 = get_help_content('toc');
-
-	$level_0 = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills nav-stacked">',$level_0);
-
-	$levels = array();
-
-
-	if(argc() > 2) {
-		$path = '';
-		for($x = 1; $x < argc(); $x ++) {
-			$path .= argv($x) . '/';
-			$y = get_help_content($path . 'sitetoc');
-			if(! $y)
-				$y = get_help_content($path . 'toc');
-			if($y)
-				$levels[] = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills nav-stacked">',$y);
-		}
-	}
-
-	if($level_0)
-		$o .= $level_0;
-	if($levels) {
-		foreach($levels as $l) {
-			$o .= '<br /><br />';
-			$o .= $l;
-		}
-	}
-
-	$o .= '</div>';
-
-	return $o;
-
-}
-
-
-
-
-
-function widget_album($args) {
-
-	$owner_uid = App::$profile_uid;
-	$sql_extra = permissions_sql($owner_uid);
-
-
-	if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage'))
-		return '';
-
-	if($args['album'])
-		$album = $args['album'];
-	if($args['title'])
-		$title = $args['title'];
-
-	/**
-	 * This may return incorrect permissions if you have multiple directories of the same name.
-	 * It is a limitation of the photo table using a name for a photo album instead of a folder hash
-	 */
-
-	if($album) {
-		$x = q("select hash from attach where filename = '%s' and uid = %d limit 1",
-			dbesc($album),
-			intval($owner_uid)
-		);
-		if($x) {
-			$y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']);
-			if(! $y)
-				return '';
-		}
-	}
-
-	$order = 'DESC';
-
-	$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
-		(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph
-		ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
-		ORDER BY created $order ",
-		intval($owner_uid),
-		dbesc($album),
-		intval(PHOTO_NORMAL),
-		intval(PHOTO_PROFILE)
-	);
-
-	//edit album name
-	$album_edit = null;
-
-	$photos = array();
-	if($r) {
-		$twist = 'rotright';
-		foreach($r as $rr) {
-
-			if($twist == 'rotright')
-				$twist = 'rotleft';
-			else
-				$twist = 'rotright';
-
-			$ext = $phototypes[$rr['mimetype']];
-
-			$imgalt_e = $rr['filename'];
-			$desc_e = $rr['description'];
-
-			$imagelink = (z_root() . '/photos/' . App::$profile['channel_address'] . '/image/' . $rr['resource_id']);
-
-
-			$photos[] = array(
-				'id' => $rr['id'],
-				'twist' => ' ' . $twist . rand(2,4),
-				'link' => $imagelink,
-				'title' => t('View Photo'),
-				'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
-				'alt' => $imgalt_e,
-				'desc'=> $desc_e,
-				'ext' => $ext,
-				'hash'=> $rr['resource_id'],
-				'unknown' => t('Unknown')
-			);
-		}
-	}
-
-
-	$tpl = get_markup_template('photo_album.tpl');
-	$o .= replace_macros($tpl, array(
-		'$photos' => $photos,
-		'$album' => (($title) ? $title : $album),
-		'$album_id' => rand(),
-		'$album_edit' => array(t('Edit Album'), $album_edit),
-		'$can_post' => false,
-		'$upload' => array(t('Upload'), z_root() . '/photos/' . App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
-		'$order' => false,
-		'$upload_form' => $upload_form,
-		'$usage' => $usage_message
-	));
-
-	return $o;
-}
-

From cf11ba1147355f0583016db2cec4f7793e656dfc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 16 Mar 2017 18:19:03 -0700
Subject: [PATCH 043/299] simplify the message signing spaghetti

---
 include/items.php  | 57 ++++++++++++++++++++++------------------------
 include/photos.php | 15 ------------
 2 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/include/items.php b/include/items.php
index c6aedc2e4..3d0f380b4 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1408,6 +1408,26 @@ function get_profile_elements($x) {
 }
 
 
+
+
+function item_sign(&$item) {
+
+	if(array_key_exists('sig',$item) && $item['sig'])
+		return;
+
+	$r = q("select channel_prvkey from channel where channel_id = %d and channel_hash = '%s' ",
+			intval($item['uid']),
+			dbesc($item['author_xchan'])
+	);
+	if(! $r)
+		return;
+
+	$item['sig'] = base64url_encode(rsa_sign($item['body'],$r[0]['channel_prvkey']));
+	$item['item_verified'] = 1;
+
+}
+
+
 /**
  * @brief
  *
@@ -1487,24 +1507,12 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 
 
 	$arr['lang'] = detect_language($arr['body']);
+
 	// apply the input filter here
 
-	if(array_key_exists('input_filtered_signed',$arr)) {
-		unset($arr['input_filtered_signed']);
-	}
-	else {
-		$arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec));
+	$arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec));
 
-		if(local_channel() && (local_channel() == $arr['uid'])) {
-			if(! $arr['sig']) {
-				$channel = App::get_channel();
-				if($channel['channel_hash'] === $arr['author_xchan']) {
-					$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
-					$arr['item_verified'] = 1;
-				}
-			}
-		}
-	}
+	item_sign($arr);
 
 	if(! array_key_exists('sig',$arr))
 		$arr['sig'] = '';
@@ -1917,22 +1925,11 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) {
 
 	$arr['lang'] = detect_language($arr['body']);
 
-	if(array_key_exists('input_filtered_signed',$arr)) {
-		unset($arr['input_filtered_signed']);
-	}
-	else {
-		$arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec));
+	// apply the input filter here
 
-		if(local_channel() && (local_channel() == $arr['uid'])) {
-			if(! $arr['sig']) {
-				$channel = App::get_channel();
-				if($channel['channel_hash'] === $arr['author_xchan']) {
-					$arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey']));
-					$arr['item_verified'] = 1;
-				}
-			}
-		}
-	}
+	$arr['body'] = trim(z_input_filter($arr['body'],$arr['mimetype'],$allow_exec));
+
+	item_sign($arr);
 
 	$allowed_languages = get_pconfig($arr['uid'],'system','allowed_languages');
 
diff --git a/include/photos.php b/include/photos.php
index c0f0ec8a9..b4d297bfd 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -340,21 +340,6 @@ function photo_upload($channel, $observer, $args) {
 				$item['tgt_type'] = ACTIVITY_OBJ_ALBUM;
 				$item['target']	= json_encode($target);
 
-				$item['body'] = trim(z_input_filter($item['body'],$item['mimetype'],false));
-
-				if($item['author_xchan'] === $channel['channel_hash']) {
-					$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
-					$item['item_verified']  = 1;
-				}
-				else {
-					$item['sig'] = '';
-				}
-
-				// notify item_store or item_store_update that the input has been filtered and signed already.
-				// The signing procedure in those functions uses local_channel() which may not apply here.
-
-				$item['input_filtered_signed'] = true;
-
 				$force = true;
 
 			}

From d9037589407162f51578856b084baaa5353a8a04 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 16 Mar 2017 18:36:58 -0700
Subject: [PATCH 044/299] remove include/widgets.php

---
 Zotlabs/Module/Connections.php | 4 ----
 Zotlabs/Module/Connedit.php    | 3 ---
 Zotlabs/Module/Directory.php   | 1 -
 Zotlabs/Module/Suggest.php     | 4 +---
 Zotlabs/Render/Comanche.php    | 2 --
 include/channel.php            | 7 +------
 include/widgets.php            | 7 -------
 7 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 include/widgets.php

diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index e8a92e8b7..b079ae860 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -5,10 +5,6 @@ namespace Zotlabs\Module;
 require_once('include/socgraph.php');
 require_once('include/selectors.php');
 require_once('include/group.php');
-require_once('include/contact_widgets.php');
-require_once('include/zot.php');
-require_once('include/widgets.php');
-
 
 class Connections extends \Zotlabs\Web\Controller {
 
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 5b7c23028..72bd3e86e 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -11,9 +11,6 @@ namespace Zotlabs\Module;
 require_once('include/socgraph.php');
 require_once('include/selectors.php');
 require_once('include/group.php');
-require_once('include/contact_widgets.php');
-require_once('include/zot.php');
-require_once('include/widgets.php');
 require_once('include/photos.php');
 
 
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 59ae88857..edcf43cd6 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -4,7 +4,6 @@ namespace Zotlabs\Module;
 
 require_once('include/socgraph.php');
 require_once('include/dir_fns.php');
-require_once('include/widgets.php');
 require_once('include/bbcode.php');
 
 
diff --git a/Zotlabs/Module/Suggest.php b/Zotlabs/Module/Suggest.php
index 367308d90..2a69145ed 100644
--- a/Zotlabs/Module/Suggest.php
+++ b/Zotlabs/Module/Suggest.php
@@ -3,8 +3,6 @@ namespace Zotlabs\Module;
 
 require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
-require_once('include/widgets.php');
-
 
 
 class Suggest extends \Zotlabs\Web\Controller {
@@ -23,7 +21,7 @@ class Suggest extends \Zotlabs\Web\Controller {
 	}
 			
 	
-		function get() {
+	function get() {
 	
 		$o = '';
 		if(! local_channel()) {
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php
index 60a7b232c..5c1ca7d10 100644
--- a/Zotlabs/Render/Comanche.php
+++ b/Zotlabs/Render/Comanche.php
@@ -4,8 +4,6 @@ namespace Zotlabs\Render;
 
 require_once('include/security.php');
 require_once('include/menu.php');
-require_once('include/widgets.php');
-
 
 
 class Comanche {
diff --git a/include/channel.php b/include/channel.php
index ceb5eeb7a..f88a2f8aa 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1193,11 +1193,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 	else
 		$tpl = get_markup_template('profile_vcard.tpl');
 
-	require_once('include/widgets.php');
-
-//	if(! feature_enabled($profile['uid'],'hide_rating'))
-	$z = widget_rating(array('target' => $profile['channel_hash']));
-
 	$o .= replace_macros($tpl, array(
 		'$zcard'         => $zcard,
 		'$profile'       => $profile,
@@ -1211,7 +1206,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 		'$chanmenu'      => $channel_menu,
 		'$diaspora'      => $diaspora,
 		'$reddress'      => $reddress,
-		'$rating'        => $z,
+		'$rating'        => '',
 		'$contact_block' => $contact_block,
 		'$editmenu'	 => profile_edit_menu($profile['uid'])
 	));
diff --git a/include/widgets.php b/include/widgets.php
deleted file mode 100644
index f35915d72..000000000
--- a/include/widgets.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/**
- * @file include/widgets.php
- *
- * @brief This file may contain some widgets.
- */
-

From 4afeefb5ce2119541a6d2a0a0b332c7a9a59a2b4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 18 Mar 2017 16:41:43 -0700
Subject: [PATCH 045/299] various input filter fixes

---
 Zotlabs/Lib/MarkdownSoap.php         |   14 +-
 Zotlabs/Lib/NativeWikiPage.php       |   31 +-
 Zotlabs/Module/Editblock.php         |    7 +-
 Zotlabs/Module/Editlayout.php        |    1 +
 Zotlabs/Module/Editwebpage.php       |    6 +-
 Zotlabs/Module/Hcard.php             |   10 +-
 Zotlabs/Module/Layouts.php           |    1 +
 Zotlabs/Module/Settings/Permcats.php |    4 +-
 Zotlabs/Module/Wiki.php              |   23 +-
 Zotlabs/Widget/Wiki_pages.php        |    7 +
 include/event.php                    |    6 +-
 util/hmessages.po                    | 8059 ++++++++++++--------------
 view/tpl/wiki.tpl                    |    3 +-
 13 files changed, 3925 insertions(+), 4247 deletions(-)

diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index 2dcaaec9a..8cc18d513 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -34,9 +34,13 @@ class MarkdownSoap {
 
 
 	function clean() {
+
 		$x = $this->extract_code($this->str);
+
 		$x = $this->purify($x);
+
 		$x = $this->putback_code($x);		
+
 		$x = $this->escape($x);
 		
 		return $x;
@@ -60,7 +64,7 @@ class MarkdownSoap {
 	}
 	
 	function encode_code($matches) {
-		return $this->token . ';' . base64_encode($matches[1]) . ';' ;
+		return $this->token . ';' . base64_encode($matches[0]) . ';' ;
 	}
 
 	function decode_code($matches) {
@@ -73,7 +77,13 @@ class MarkdownSoap {
 	}
 
 	function purify($s) {
-		return purify_html($s);
+		$s = str_replace("\n",'<br>',$s);
+		$s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
+		$s = str_replace(' ','&nbsp;',$s);
+		$s = purify_html($s);
+		$s = str_replace('&nbsp;'," ",$s);
+		$s = str_replace(['<br>','<br />'],["\n","\n"],$s);
+		return $s;
 	}
 
 	function escape($s) {
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index 9f54081a1..3d6da7779 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -323,13 +323,6 @@ class NativeWikiPage {
 		}
 
 		$mimetype = $w['mimeType'];
-		if($mimetype === 'text/markdown') {
-			$x = new Zlib\MarkdownSoap($content);
-			$content = $x->clean();
-		}
-		else {
-			$content = escape_tags($content);
-		}
 	
 		// fetch the most recently saved revision. 
 
@@ -348,6 +341,7 @@ class NativeWikiPage {
 		$item['author_xchan'] = $observer_hash;
 		$item['revision']     = (($arr['revision']) ? intval($arr['revision']) + 1 : intval($item['revision']) + 1);
 		$item['edited']       = datetime_convert();
+		$item['mimetype']     = $mimetype;
 
 		if($item['iconfig'] && is_array($item['iconfig']) && count($item['iconfig'])) {
 			for($x = 0; $x < count($item['iconfig']); $x ++) {
@@ -515,6 +509,29 @@ class NativeWikiPage {
 		}
 		return $s;
 	}
+
+	static public function render_page_history($arr) {
+
+		$pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
+		$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
+
+		$pageHistory = self::page_history([
+			'channel_id'    => \App::$profile_uid, 
+			'observer_hash' => get_observer_hash(),
+			'resource_id'   => $resource_id,
+			'pageUrlName'   => $pageUrlName
+		]);
+
+		return replace_macros(get_markup_template('nwiki_page_history.tpl'), array(
+			'$pageHistory' => $pageHistory['history'],
+			'$permsWrite'  => $arr['permsWrite'],
+			'$name_lbl'    => t('Name'),
+			'$msg_label'   => t('Message','wiki_history')
+		));
+
+	}
+
+
 	
 	/**
 	 * Replace the instances of the string [toc] with a list element that will be populated by
diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php
index 654e2251d..8a7e87a09 100644
--- a/Zotlabs/Module/Editblock.php
+++ b/Zotlabs/Module/Editblock.php
@@ -98,6 +98,11 @@ class Editblock extends \Zotlabs\Web\Controller {
 
 		$mimetype = $itm[0]['mimetype'];
 
+		$content = $itm[0]['body'];
+		if($itm[0]['mimetype'] === 'text/markdown')
+			$content = \Zotlabs\Lib\MarkdownSoap::unescape($itm[0]['body']);
+
+
 		$rp = 'blocks/' . $channel['channel_address'];
 
 		$x = array(
@@ -117,7 +122,7 @@ class Editblock extends \Zotlabs\Web\Controller {
 			'ptyp' => $itm[0]['type'],
 			'mimeselect' => true,
 			'mimetype' => $itm[0]['mimetype'],
-			'body' => undo_post_tagging($itm[0]['body']),
+			'body' => undo_post_tagging($content),
 			'post_id' => $post_id,
 			'visitor' => true,
 			'title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php
index ea637fcba..3d6a79507 100644
--- a/Zotlabs/Module/Editlayout.php
+++ b/Zotlabs/Module/Editlayout.php
@@ -119,6 +119,7 @@ class Editlayout extends \Zotlabs\Web\Controller {
 			'hide_weblink' => true,
 			'hide_attach' => true,
 			'hide_preview' => true,
+			'disable_comments' => true,
 			'ptyp' => $itm[0]['obj_type'],
 			'body' => undo_post_tagging($itm[0]['body']),
 			'post_id' => $post_id,
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
index 97f4a32ff..03b2aeab9 100644
--- a/Zotlabs/Module/Editwebpage.php
+++ b/Zotlabs/Module/Editwebpage.php
@@ -129,6 +129,10 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 		}
 	
 		$layout = $itm[0]['layout_mid'];
+
+		$content = $itm[0]['body'];
+		if($itm[0]['mimetype'] === 'text/markdown')
+			$content = \Zotlabs\Lib\MarkdownSoap::unescape($itm[0]['body']);
 	
 		$rp = 'webpages/' . $which;
 
@@ -145,7 +149,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 			'hide_location' => true,
 			'hide_voting' => true,
 			'ptyp' => $itm[0]['type'],
-			'body' => undo_post_tagging($itm[0]['body']),
+			'body' => undo_post_tagging($content),
 			'post_id' => $post_id,
 			'visitor' => ($is_owner) ? true : false,
 			'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')),
diff --git a/Zotlabs/Module/Hcard.php b/Zotlabs/Module/Hcard.php
index ec9181f6a..13097939e 100644
--- a/Zotlabs/Module/Hcard.php
+++ b/Zotlabs/Module/Hcard.php
@@ -59,12 +59,10 @@ class Hcard extends \Zotlabs\Web\Controller {
 	}
 	
 	
-		function get() {
-	
-		require_once('include/widgets.php');
-		return widget_profile(array());
-	
-	
+	function get() {
+
+		$x = new \Zotlabs\Widget\Profile();	
+		return $x->widget(array());
 	
 	}
 	
diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php
index c07f65ce1..34d754029 100644
--- a/Zotlabs/Module/Layouts.php
+++ b/Zotlabs/Module/Layouts.php
@@ -125,6 +125,7 @@ class Layouts extends \Zotlabs\Web\Controller {
 			'hide_weblink' => true,
 			'hide_attach' => true,
 			'hide_preview' => true,
+			'disable_comments' => true,
 			'ptlabel'     => t('Layout Name'),
 			'profile_uid' => intval($owner),
 			'expanded'    => true,
diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Settings/Permcats.php
index 35d533196..771e76cbd 100644
--- a/Zotlabs/Module/Settings/Permcats.php
+++ b/Zotlabs/Module/Settings/Permcats.php
@@ -42,8 +42,6 @@ class Permcats {
 
 	function get() {
 
-logger('cmd: ' . \App::$cmd);
-
 		if(! local_channel())
 			return;
 
@@ -85,7 +83,7 @@ logger('cmd: ' . \App::$cmd);
 			if($existing[$k])
 				$thisperm = "1";
 
-			$perms[] = array('perms_' . $k, $v, ((array_key_exists($k,$their_perms)) ? intval($their_perms[$k]) : ''),$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
+			$perms[] = array('perms_' . $k, $v, '',$thisperm, 1, (($checkinherited & PERMS_SPECIFIC) ? '' : '1'), '', $checkinherited);
 		}
 
 
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 79ec5ba25..d24d3f6c3 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -237,6 +237,8 @@ class Wiki extends \Zotlabs\Web\Controller {
 
 				$rawContent = htmlspecialchars_decode(json_decode($p['content']),ENT_COMPAT);
 
+				$rawContent = $p['content'];
+
 				$content = ($p['content'] !== '' ? $rawContent : '"# New page\n"');
 				// Render the Markdown-formatted page content in HTML
 				if($mimeType == 'text/bbcode') {
@@ -244,7 +246,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 				}
 				else {
 					$content = Zlib\MarkdownSoap::unescape($content);
-					$html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(MarkdownExtra::defaultTransform(Zlib\NativeWikiPage::bbcode($content)))));
+					$html = Zlib\NativeWikiPage::generate_toc(zidify_text(MarkdownExtra::defaultTransform(Zlib\NativeWikiPage::bbcode($content))));
 					$renderedContent = Zlib\NativeWikiPage::convert_links($html, argv(0) . '/' . argv(1) . '/' . $wikiUrlName);
 				}
 				$showPageControls = $wiki_editor;
@@ -328,9 +330,12 @@ class Wiki extends \Zotlabs\Web\Controller {
 				$html = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))),$wikiURL);
 			}
 			else {
-				require_once('library/markdown.php');
-				$content = Zlib\NativeWikiPage::bbcode($content);
-				$html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(Markdown($content))));
+				$bb = Zlib\NativeWikiPage::bbcode($content);
+				$x = new ZLib\MarkdownSoap($bb);
+				$md = $x->clean();
+				$md = ZLib\MarkdownSoap::unescape($md);
+				$html = MarkdownExtra::defaultTransform($md);
+				$html = Zlib\NativeWikiPage::generate_toc(zidify_text($html));
 				$html = Zlib\NativeWikiPage::convert_links($html,$wikiURL);
 			}
 			json_return_and_die(array('html' => $html, 'success' => true));
@@ -455,7 +460,11 @@ class Wiki extends \Zotlabs\Web\Controller {
 				json_return_and_die(array('pages' => null, 'message' => 'Permission denied.', 'success' => false));					
 			}
 
-			$page_list_html = widget_wiki_pages(array(
+			// @FIXME - we shouldn't invoke this if it isn't in the PDL or has been over-ridden
+
+			$x = new \Zotlabs\Widget\Wiki_pages();
+
+			$page_list_html = $x->widget(array(
 					'resource_id' => $resource_id, 
 					'refresh' => true, 
 					'channel' => argv(1)));
@@ -513,7 +522,6 @@ class Wiki extends \Zotlabs\Web\Controller {
 			$resource_id = $_POST['resource_id'];
 			$pageUrlName = $_POST['name'];
 			
-
 			// Determine if observer has permission to read content
 
 			$perms = Zlib\NativeWiki::get_permissions($resource_id, intval($owner['channel_id']), $observer_hash);
@@ -522,11 +530,12 @@ class Wiki extends \Zotlabs\Web\Controller {
 				json_return_and_die(array('historyHTML' => '', 'message' => 'Permission denied.', 'success' => false));
 			}
 
-			$historyHTML = widget_wiki_page_history(array(
+			$historyHTML = \Zotlabs\Lib\NativeWikiPage::render_page_history(array(
 				'resource_id' => $resource_id,
 				'pageUrlName' => $pageUrlName,
 				'permsWrite'  => $perms['write']
 			));
+
 			json_return_and_die(array('historyHTML' => $historyHTML, 'message' => '', 'success' => true));
 		}
 
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index bad451475..f992b3f93 100644
--- a/Zotlabs/Widget/Wiki_pages.php
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -10,6 +10,12 @@ class Wiki_pages {
 		$channelname = ((array_key_exists('channel',$arr)) ? $arr['channel'] : '');
 		$c = channelx_by_nick($channelname);
 
+		if(! $c)
+			$c = \App::get_channel();
+
+		if(! $c)
+			return '';
+
 		$wikiname = '';
 		if(array_key_exists('refresh', $arr)) {
 			$not_refresh = (($arr['refresh']=== true) ? false : true);
@@ -36,6 +42,7 @@ class Wiki_pages {
 			}
 		}
 
+
 		$can_create = perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'write_wiki');
 
 		$can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false);
diff --git a/include/event.php b/include/event.php
index 726eb667c..001bd7dd3 100644
--- a/include/event.php
+++ b/include/event.php
@@ -614,7 +614,7 @@ function parse_vobject($ical, $type) {
 	$ev['etype'] = $type;
 
 	$dtstart = $ical->DTSTART->getDateTime();
-	$ev['adjust'] = (($ical->DTSTART->isFloating()) ? 1 : 0);
+	$ev['adjust'] = (($ical->DTSTART->isFloating()) ? 0 : 1);
 
 	$ev['dtstart'] = datetime_convert((($ev['adjust']) ? 'UTC' : date_default_timezone_get()),'UTC',
 		$dtstart->format(\DateTime::W3C));
@@ -755,7 +755,7 @@ function event_import_ical($ical, $uid) {
 	}
 
 	$dtstart = $ical->DTSTART->getDateTime();
-	$ev['adjust'] = (($ical->DTSTART->isFloating()) ? 1 : 0);
+	$ev['adjust'] = (($ical->DTSTART->isFloating()) ? 0 : 1);
 
 //	logger('dtstart: ' . var_export($dtstart,true));
 
@@ -858,7 +858,7 @@ function event_import_ical_task($ical, $uid) {
 
 	$dtstart = $ical->DTSTART->getDateTime();
 
-	$ev['adjust'] = (($ical->DTSTART->isFloating()) ? 1 : 0);
+	$ev['adjust'] = (($ical->DTSTART->isFloating()) ? 0 : 1);
 
 //	logger('dtstart: ' . var_export($dtstart,true));
 
diff --git a/util/hmessages.po b/util/hmessages.po
index 796a53de2..b2f18043c 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3\n"
+"Project-Id-Version: 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-10 00:05-0800\n"
+"POT-Creation-Date: 2017-03-17 00:04-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,7 +89,7 @@ msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:270
 #: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Connedit.php:922
 #: ../../Zotlabs/Module/New_channel.php:132
 #: ../../Zotlabs/Module/Settings/Channel.php:463
 #: ../../extend/addon/addon/cdav/cdav.php:277
@@ -183,7 +183,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2684
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2670
 msgid "Collection"
 msgstr ""
 
@@ -210,11 +210,11 @@ msgstr ""
 #: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:784
 #: ../../Zotlabs/Module/Photos.php:1244
 #: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:561
-#: ../../Zotlabs/Lib/Apps.php:639
+#: ../../Zotlabs/Lib/Apps.php:639 ../../Zotlabs/Widget/Album.php:84
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
-#: ../../include/conversation.php:1177 ../../include/widgets.php:1757
+#: ../../include/conversation.php:1177
 msgid "Unknown"
 msgstr ""
 
@@ -233,9 +233,9 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:330
 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Webpages.php:243
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:925
 #: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:185
 #: ../../extend/addon/addon/cdav/include/widgets.php:127
 #: ../../extend/addon/addon/cdav/include/widgets.php:164
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
@@ -243,26 +243,25 @@ msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:332
-#: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Profile_photo.php:421
+#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Zotlabs/Module/Profile_photo.php:423
 #: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368
-#: ../../Zotlabs/Module/Embedphotos.php:157
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../Zotlabs/Widget/Album.php:97
 #: ../../extend/addon/addon/cdav/include/widgets.php:132
 #: ../../extend/addon/addon/cdav/include/widgets.php:168
-#: ../../include/widgets.php:1770
 msgid "Upload"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:233 ../../Zotlabs/Module/Chat.php:248
 #: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Wiki.php:171
+#: ../../Zotlabs/Module/Wiki.php:171 ../../Zotlabs/Module/Connedit.php:910
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 #: ../../Zotlabs/Module/Settings/Oauth.php:89
 #: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Widget/Wiki_page_history.php:22
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136
 #: ../../extend/addon/addon/rendezvous/rendezvous.php:172
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
-#: ../../include/widgets.php:976
 msgid "Name"
 msgstr ""
 
@@ -272,7 +271,7 @@ msgid "Type"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:235
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1398
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1397
 msgid "Size"
 msgstr ""
 
@@ -282,16 +281,16 @@ msgid "Last Modified"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:238
-#: ../../Zotlabs/Module/Editblock.php:109
-#: ../../Zotlabs/Module/Connections.php:300
-#: ../../Zotlabs/Module/Connections.php:320
+#: ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Connections.php:296
+#: ../../Zotlabs/Module/Connections.php:316
 #: ../../Zotlabs/Module/Admin/Profs.php:154
 #: ../../Zotlabs/Module/Webpages.php:244
 #: ../../Zotlabs/Module/Editlayout.php:114
-#: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Menu.php:112
 #: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Wiki.php:164
-#: ../../Zotlabs/Module/Wiki.php:271 ../../Zotlabs/Module/Blocks.php:160
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Wiki.php:280 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Layouts.php:193
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
 #: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106
 #: ../../Zotlabs/Lib/Apps.php:357
@@ -300,21 +299,21 @@ msgstr ""
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:149
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
-#: ../../include/channel.php:1044 ../../include/channel.php:1048
-#: ../../include/menu.php:113
+#: ../../include/menu.php:113 ../../include/channel.php:1044
+#: ../../include/channel.php:1048
 msgid "Edit"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Profiles.php:803
-#: ../../Zotlabs/Module/Editblock.php:134
-#: ../../Zotlabs/Module/Connections.php:271
+#: ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Connections.php:267
 #: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
 #: ../../Zotlabs/Module/Admin/Channels.php:149
 #: ../../Zotlabs/Module/Webpages.php:246
-#: ../../Zotlabs/Module/Editlayout.php:137
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Connedit.php:661 ../../Zotlabs/Module/Connedit.php:930
+#: ../../Zotlabs/Module/Editlayout.php:138
+#: ../../Zotlabs/Module/Editwebpage.php:172 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Connedit.php:658 ../../Zotlabs/Module/Connedit.php:927
 #: ../../Zotlabs/Module/Blocks.php:162
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1174
@@ -372,13 +371,14 @@ msgstr ""
 #: ../../Zotlabs/Web/WebServer.php:128
 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Chat.php:98
 #: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
+#: ../../Zotlabs/Module/Item.php:1037 ../../Zotlabs/Module/Message.php:18
 #: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61
 #: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:33
-#: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
+#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:29
+#: ../../Zotlabs/Module/Cover_photo.php:281
+#: ../../Zotlabs/Module/Cover_photo.php:294
 #: ../../Zotlabs/Module/Webpages.php:116
 #: ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
@@ -388,27 +388,26 @@ msgstr ""
 #: ../../Zotlabs/Module/Editwebpage.php:126
 #: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78
 #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Filestorage.php:23
 #: ../../Zotlabs/Module/Filestorage.php:78
 #: ../../Zotlabs/Module/Filestorage.php:93
 #: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Connedit.php:388
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Item.php:220
-#: ../../Zotlabs/Module/Item.php:230 ../../Zotlabs/Module/Item.php:1067
+#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:215
+#: ../../Zotlabs/Module/Wiki.php:320 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Mitem.php:115
 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17
 #: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
-#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:215
-#: ../../Zotlabs/Module/Wiki.php:311 ../../Zotlabs/Module/Like.php:181
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Mail.php:164
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113
-#: ../../Zotlabs/Module/Profile_photo.php:278
-#: ../../Zotlabs/Module/Profile_photo.php:291
+#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Rate.php:113
+#: ../../Zotlabs/Module/Profile_photo.php:280
+#: ../../Zotlabs/Module/Profile_photo.php:293
 #: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Common.php:39
 #: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29
 #: ../../Zotlabs/Module/Events.php:271
@@ -416,33 +415,31 @@ msgstr ""
 #: ../../Zotlabs/Module/Sharedwithme.php:11
 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Sources.php:74
 #: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245
-#: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Suggest.php:30
+#: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Suggest.php:28
 #: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
 #: ../../Zotlabs/Module/Thing.php:335
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
 #: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Profile.php:83
 #: ../../Zotlabs/Module/Profile.php:100 ../../Zotlabs/Lib/Chatroom.php:137
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:55
 #: ../../extend/addon/addon/keepout/keepout.php:36
 #: ../../extend/addon/addon/pumpio/pumpio.php:40
 #: ../../extend/addon/addon/openid/Mod_Id.php:53
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:58
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:194
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:291
-#: ../../include/items.php:3350 ../../include/attach.php:144
-#: ../../include/attach.php:191 ../../include/attach.php:255
-#: ../../include/attach.php:269 ../../include/attach.php:276
-#: ../../include/attach.php:343 ../../include/attach.php:357
-#: ../../include/attach.php:364 ../../include/attach.php:441
-#: ../../include/attach.php:908 ../../include/attach.php:979
-#: ../../include/attach.php:1137 ../../include/photos.php:27
+#: ../../include/photos.php:28 ../../include/items.php:3360
+#: ../../include/attach.php:144 ../../include/attach.php:191
+#: ../../include/attach.php:255 ../../include/attach.php:269
+#: ../../include/attach.php:276 ../../include/attach.php:343
+#: ../../include/attach.php:357 ../../include/attach.php:364
+#: ../../include/attach.php:441 ../../include/attach.php:908
+#: ../../include/attach.php:979 ../../include/attach.php:1137
 msgid "Permission denied."
 msgstr ""
 
 #: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Page.php:94
 #: ../../Zotlabs/Module/Block.php:79 ../../Zotlabs/Module/Display.php:122
-#: ../../Zotlabs/Lib/NativeWikiPage.php:522 ../../include/help.php:68
+#: ../../Zotlabs/Lib/NativeWikiPage.php:489 ../../include/help.php:68
 msgid "Page not found."
 msgstr ""
 
@@ -484,7 +481,6 @@ msgid "Room not found"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:239
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 #: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Logs.php:84
@@ -496,15 +492,17 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Site.php:268
 #: ../../Zotlabs/Module/Admin/Plugins.php:438
 #: ../../Zotlabs/Module/Admin/Themes.php:158 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 #: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Import_items.php:122
-#: ../../Zotlabs/Module/Connedit.php:893 ../../Zotlabs/Module/Mitem.php:243
+#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Wiki.php:168
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Mitem.php:243
 #: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Mail.php:413
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134
-#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
+#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mail.php:413 ../../Zotlabs/Module/Rate.php:166
+#: ../../Zotlabs/Module/Appman.php:134 ../../Zotlabs/Module/Pdledit.php:74
+#: ../../Zotlabs/Module/Events.php:493 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149
 #: ../../Zotlabs/Module/Settings/Features.php:47
 #: ../../Zotlabs/Module/Settings/Oauth.php:87
 #: ../../Zotlabs/Module/Settings/Account.php:118
@@ -518,11 +516,10 @@ msgstr ""
 #: ../../Zotlabs/Module/Photos.php:1053 ../../Zotlabs/Module/Photos.php:1093
 #: ../../Zotlabs/Module/Photos.php:1211 ../../Zotlabs/Module/Xchan.php:15
 #: ../../Zotlabs/Lib/ThreadItem.php:731
+#: ../../Zotlabs/Widget/Eventstools.php:16
 #: ../../extend/addon/addon/chords/Mod_Chords.php:60
-#: ../../extend/addon/addon/diaspora/diaspora.php:714
 #: ../../extend/addon/addon/dwpost/dwpost.php:89
 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
-#: ../../extend/addon/addon/friendica/friendica.php:128
 #: ../../extend/addon/addon/frphotos/frphotos.php:96
 #: ../../extend/addon/addon/hubwall/hubwall.php:95
 #: ../../extend/addon/addon/ijpost/ijpost.php:89
@@ -563,8 +560,7 @@ msgstr ""
 #: ../../extend/addon/addon/likebanner/likebanner.php:57
 #: ../../extend/addon/addon/mailtest/mailtest.php:100
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:133
-#: ../../include/widgets.php:801 ../../include/js_strings.php:22
+#: ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:106
 msgid "Submit"
 msgstr ""
@@ -600,8 +596,8 @@ msgstr ""
 msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:287
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:116
+#: ../../Zotlabs/Module/Editwebpage.php:148 ../../Zotlabs/Module/Mail.php:287
 #: ../../Zotlabs/Module/Mail.php:412 ../../include/conversation.php:1295
 msgid "Insert web link"
 msgstr ""
@@ -623,7 +619,7 @@ msgid "Expiration of chats (minutes)"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:232 ../../Zotlabs/Module/Filestorage.php:152
-#: ../../Zotlabs/Module/Connedit.php:683 ../../Zotlabs/Module/Thing.php:313
+#: ../../Zotlabs/Module/Connedit.php:680 ../../Zotlabs/Module/Thing.php:313
 #: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:657
 #: ../../Zotlabs/Module/Photos.php:1042 ../../include/acl_selectors.php:218
 msgid "Permissions"
@@ -639,7 +635,7 @@ msgid "No chatrooms available"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:253 ../../Zotlabs/Module/Profiles.php:834
-#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Wiki.php:167
+#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Manage.php:143
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
 msgid "Create New"
 msgstr ""
@@ -784,7 +780,7 @@ msgid "Membership on this site is by invitation only."
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:162
-#: ../../boot.php:1687
+#: ../../boot.php:1671
 msgid "Register"
 msgstr ""
 
@@ -799,6 +795,2492 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
+#: ../../Zotlabs/Module/Item.php:184
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:450
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:824
+msgid "Duplicate post suppressed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:954
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1084
+msgid "Unable to obtain post information from database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1091
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1098
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
+#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
+msgid "Profile not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+msgid "Profile-"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+msgid "New profile created."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:111
+msgid "Profile unavailable to clone."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:146
+msgid "Profile unavailable to export."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:252
+msgid "Profile Name is required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:459
+msgid "Marital Status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:463
+msgid "Romantic Partner"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
+msgid "Work/Employment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:478
+msgid "Religion"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:482
+msgid "Political Views"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../extend/addon/addon/openid/MysqlProvider.php:74
+msgid "Gender"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:490
+msgid "Sexual Preference"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:494
+msgid "Homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:498
+msgid "Interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793
+#: ../../Zotlabs/Module/Admin/Channels.php:160
+#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:917
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
+msgid "Address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
+#: ../../Zotlabs/Module/Events.php:475
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
+#: ../../include/js_strings.php:25
+msgid "Location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:594
+msgid "Profile updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:678
+msgid "Hide your connections list from viewers of this profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Admin/Site.php:226 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Wiki.php:179
+#: ../../Zotlabs/Module/Connedit.php:399 ../../Zotlabs/Module/Connedit.php:783
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
+#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings/Display.php:103
+#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Photos.php:652
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+#: ../../extend/addon/addon/libertree/libertree.php:69
+#: ../../extend/addon/addon/libertree/libertree.php:81
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+#: ../../extend/addon/addon/nofed/nofed.php:72
+#: ../../extend/addon/addon/nofed/nofed.php:76
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+#: ../../extend/addon/addon/planets/planets.php:153
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+#: ../../extend/addon/addon/redred/redred.php:95
+#: ../../extend/addon/addon/redred/redred.php:99
+#: ../../extend/addon/addon/rtof/rtof.php:81
+#: ../../extend/addon/addon/rtof/rtof.php:85
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:242
+#: ../../extend/addon/addon/twitter/twitter.php:246
+#: ../../extend/addon/addon/twitter/twitter.php:255
+#: ../../extend/addon/addon/visage/visage.php:166
+#: ../../extend/addon/addon/wppost/wppost.php:82
+#: ../../extend/addon/addon/wppost/wppost.php:105
+#: ../../extend/addon/addon/wppost/wppost.php:109
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+#: ../../extend/addon/addon/cdav/cdav.php:234
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1694
+msgid "No"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:681
+#: ../../Zotlabs/Module/Admin/Site.php:228 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Wiki.php:179
+#: ../../Zotlabs/Module/Connedit.php:399 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96
+#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
+#: ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings/Display.php:103
+#: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Photos.php:652
+#: ../../extend/addon/addon/dwpost/dwpost.php:73
+#: ../../extend/addon/addon/dwpost/dwpost.php:85
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+#: ../../extend/addon/addon/ijpost/ijpost.php:73
+#: ../../extend/addon/addon/ijpost/ijpost.php:85
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
+#: ../../extend/addon/addon/libertree/libertree.php:69
+#: ../../extend/addon/addon/libertree/libertree.php:81
+#: ../../extend/addon/addon/ljpost/ljpost.php:70
+#: ../../extend/addon/addon/ljpost/ljpost.php:82
+#: ../../extend/addon/addon/nofed/nofed.php:72
+#: ../../extend/addon/addon/nofed/nofed.php:76
+#: ../../extend/addon/addon/nsabait/nsabait.php:157
+#: ../../extend/addon/addon/nsfw/nsfw.php:84
+#: ../../extend/addon/addon/planets/planets.php:153
+#: ../../extend/addon/addon/pumpio/pumpio.php:219
+#: ../../extend/addon/addon/pumpio/pumpio.php:223
+#: ../../extend/addon/addon/pumpio/pumpio.php:227
+#: ../../extend/addon/addon/pumpio/pumpio.php:231
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
+#: ../../extend/addon/addon/redred/redred.php:95
+#: ../../extend/addon/addon/redred/redred.php:99
+#: ../../extend/addon/addon/rtof/rtof.php:81
+#: ../../extend/addon/addon/rtof/rtof.php:85
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
+#: ../../extend/addon/addon/statusnet/statusnet.php:389
+#: ../../extend/addon/addon/statusnet/statusnet.php:411
+#: ../../extend/addon/addon/statusnet/statusnet.php:415
+#: ../../extend/addon/addon/statusnet/statusnet.php:424
+#: ../../extend/addon/addon/twitter/twitter.php:242
+#: ../../extend/addon/addon/twitter/twitter.php:246
+#: ../../extend/addon/addon/twitter/twitter.php:255
+#: ../../extend/addon/addon/visage/visage.php:166
+#: ../../extend/addon/addon/wppost/wppost.php:82
+#: ../../extend/addon/addon/wppost/wppost.php:105
+#: ../../extend/addon/addon/wppost/wppost.php:109
+#: ../../extend/addon/addon/xmpp/xmpp.php:53
+#: ../../extend/addon/addon/cdav/cdav.php:234
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1694
+msgid "Yes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "Edit Profile Details"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "View this profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
+#: ../../include/channel.php:1066
+msgid "Edit visibility"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Profile Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Change cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
+msgid "Change profile photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Create a new profile using these settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Clone this profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Delete this profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Add profile things"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1715
+msgid "Personal"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Relation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Import profile from file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Export profile to file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Your gender"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Marital status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "Sexual preference"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Profile name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
+#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
+#: ../../include/datetime.php:259
+msgid "Required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "This is your default profile."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:752
+msgid "Your full name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:753
+msgid "Title/Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:756
+msgid "Street address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:757
+msgid "Locality/City"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:758
+msgid "Region/State"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:759
+msgid "Postal/Zip code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:935
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
+msgid "Country"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Who (if applicable)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:766
+msgid "Since (date)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:769
+msgid "Tell us about yourself"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../extend/addon/addon/openid/MysqlProvider.php:68
+msgid "Homepage URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:771
+msgid "Hometown"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Political views"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:773
+msgid "Religious views"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Keywords used in directory listings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Example: fishing photography software"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:777
+msgid "Musical interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Books, literature"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:779
+msgid "Television"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "Film/Dance/Culture/Entertainment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:781
+msgid "Hobbies/Interests"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:782
+msgid "Love/Romance"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:784
+msgid "School/Education"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:785
+msgid "Contact information and social networks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:786
+msgid "My other channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:788
+msgid "Communications"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:913
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
+msgid "Phone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:790
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+#: ../../Zotlabs/Module/Admin/Accounts.php:181
+#: ../../Zotlabs/Module/Connedit.php:914
+#: ../../extend/addon/addon/redred/redred.php:107
+#: ../../extend/addon/addon/rtof/rtof.php:93
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
+#: ../../extend/addon/addon/openid/MysqlProvider.php:56
+#: ../../extend/addon/addon/openid/MysqlProvider.php:57
+#: ../../include/network.php:1749
+msgid "Email"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:915
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
+msgid "Instant messenger"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:916
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
+msgid "Website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:918
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
+msgid "Note"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:919
+#: ../../extend/addon/addon/cdav/cdav.php:270
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
+#: ../../include/connections.php:668
+msgid "Mobile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:920
+#: ../../extend/addon/addon/cdav/cdav.php:271
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
+#: ../../include/connections.php:669
+msgid "Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:921
+#: ../../extend/addon/addon/cdav/cdav.php:274
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
+#: ../../include/connections.php:672
+msgid "Work"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:923
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
+msgid "Add Contact"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:924
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
+msgid "Add Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:802
+#: ../../Zotlabs/Module/Admin/Plugins.php:453
+#: ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Settings/Oauth.php:42
+#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
+msgid "Update"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:804
+#: ../../Zotlabs/Module/Admin/Plugins.php:423
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Wiki.php:270 ../../Zotlabs/Module/Wiki.php:295
+#: ../../Zotlabs/Module/Connedit.php:928
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../extend/addon/addon/js_upload/js_upload.php:46
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
+msgid "Cancel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
+msgid "Profile Image"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105
+#: ../../include/channel.php:1044
+msgid "Edit Profiles"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827
+msgid "About"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
+msgid "Members"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:82
+msgid "Administrators"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:83
+msgid "Developers"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Tutorials"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:93
+msgid "$Projectname Documentation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:94
+msgid "Contents"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:60
+#: ../../Zotlabs/Module/Admin/Plugins.php:259
+#: ../../Zotlabs/Module/Admin/Themes.php:72
+#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89
+#: ../../include/items.php:3281
+msgid "Item not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:94
+msgid "# Accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "# blocked accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "# expired accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "# expiring accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:108
+msgid "# Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:109
+msgid "# primary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:110
+msgid "# clones"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Message queues"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:133
+msgid "Your software should be updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82
+#: ../../Zotlabs/Module/Admin/Security.php:86
+#: ../../Zotlabs/Module/Admin/Accounts.php:164
+#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Zotlabs/Module/Admin/Site.php:266
+#: ../../Zotlabs/Module/Admin/Plugins.php:341
+#: ../../Zotlabs/Module/Admin/Plugins.php:436
+#: ../../Zotlabs/Module/Admin/Themes.php:122
+#: ../../Zotlabs/Module/Admin/Themes.php:156
+msgid "Administration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:138
+msgid "Summary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Registered accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:142
+msgid "Pending registrations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:143
+msgid "Registered channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Active plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Version"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Repository version (master)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Repository version (dev)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editpost.php:24
+msgid "Item not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1406
+msgid "Title (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr ""
+
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Chanview.php:96
+#: ../../Zotlabs/Module/Wall_upload.php:31
+msgid "Channel not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr ""
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin/Profs.php:74
+#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Widget/Notes.php:18
+#: ../../include/text.php:1010 ../../include/text.php:1022
+msgid "Save"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:254
+msgid "sent you a private message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:302
+msgid "added your channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:312
+msgid "g A l F d"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:330
+msgid "[today]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:339
+msgid "posted an event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:52
+#: ../../Zotlabs/Module/Connections.php:157
+#: ../../Zotlabs/Module/Connections.php:246
+msgid "Blocked"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:57
+#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Zotlabs/Module/Connections.php:245
+msgid "Ignored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:62
+#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Zotlabs/Module/Connections.php:244
+msgid "Hidden"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:67
+#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Zotlabs/Module/Connections.php:243
+msgid "Archived"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:72
+#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
+#: ../../include/conversation.php:1724
+msgid "New"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:88
+#: ../../Zotlabs/Module/Connections.php:103
+#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Widget/Affinity.php:30
+msgid "All"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:134
+msgid "New Connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:137
+msgid "Show pending (new) connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:141
+#: ../../Zotlabs/Module/Profperm.php:140
+msgid "All Connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:144
+msgid "Show all connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:160
+msgid "Only show blocked connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:167
+msgid "Only show ignored connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:174
+msgid "Only show archived connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:181
+msgid "Only show hidden connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:242
+msgid "Pending approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:258
+#, php-format
+msgid "%1$s [%2$s]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:259
+msgid "Edit connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:260
+msgid "Delete connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:269
+msgid "Channel address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:271
+msgid "Network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:274
+msgid "Call"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:276
+msgid "Status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:278
+msgid "Connected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:280
+msgid "Approve connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:281
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
+msgid "Approve"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:282
+msgid "Ignore connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connedit.php:634
+msgid "Ignore"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:284
+msgid "Recent activity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
+#: ../../include/nav.php:203 ../../include/text.php:939
+msgid "Connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
+#: ../../include/nav.php:180 ../../include/text.php:1009
+#: ../../include/text.php:1021 ../../include/acl_selectors.php:213
+msgid "Search"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:313
+msgid "Search your connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:314
+msgid "Connections search"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connections.php:315
+#: ../../Zotlabs/Module/Directory.php:391
+#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
+msgid "Find"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:56
+#: ../../Zotlabs/Module/Profile_photo.php:61
+msgid "Image uploaded but image cropping failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:136
+#: ../../Zotlabs/Module/Cover_photo.php:186
+msgid "Cover Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:159
+#: ../../Zotlabs/Module/Profile_photo.php:137
+msgid "Image resize failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:173
+#: ../../Zotlabs/Module/Profile_photo.php:203 ../../include/photos.php:145
+msgid "Unable to process image"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:197
+#: ../../Zotlabs/Module/Profile_photo.php:238
+msgid "Image upload failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:214
+#: ../../Zotlabs/Module/Profile_photo.php:257
+msgid "Unable to process image."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4189
+msgid "female"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4190
+#, php-format
+msgid "%1$s updated her %2$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4191
+msgid "male"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4192
+#, php-format
+msgid "%1$s updated his %2$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4194
+#, php-format
+msgid "%1$s updated their %2$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
+msgid "cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:307
+#: ../../Zotlabs/Module/Cover_photo.php:322
+#: ../../Zotlabs/Module/Profile_photo.php:318
+#: ../../Zotlabs/Module/Profile_photo.php:365
+msgid "Photo not available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:358
+#: ../../Zotlabs/Module/Profile_photo.php:420
+msgid "Upload File:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:359
+#: ../../Zotlabs/Module/Profile_photo.php:421
+msgid "Select a profile:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:360
+msgid "Upload Cover Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+#: ../../Zotlabs/Module/Settings/Channel.php:404
+msgid "or"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+msgid "skip this step"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+msgid "select a photo from your photo albums"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:381
+#: ../../Zotlabs/Module/Profile_photo.php:448
+msgid "Crop Image"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:382
+#: ../../Zotlabs/Module/Profile_photo.php:449
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cover_photo.php:384
+#: ../../Zotlabs/Module/Profile_photo.php:451
+msgid "Done Editing"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "Off"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "On"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#, php-format
+msgid "Lock feature %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Features.php:64
+msgid "Manage Additional Features"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:28
+msgid "Log settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
+#: ../../Zotlabs/Widget/Admin.php:58
+msgid "Logs"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:85
+msgid "Clear"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:91
+msgid "Debugging"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid "Log file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid ""
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Logs.php:93
+msgid "Log level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:69
+msgid "New Profile Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:70
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+msgid "Field nickname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:70
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+msgid "System name of field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:71
+#: ../../Zotlabs/Module/Admin/Profs.php:91
+msgid "Input type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:72
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+msgid "Field Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:72
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+msgid "Label on profile pages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+msgid "Help text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+msgid "Additional info (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:83
+msgid "Field definition not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:89
+msgid "Edit Profile Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30
+msgid "Profile Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:148
+msgid "Basic Profile Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:149
+msgid "Advanced Profile Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:149
+msgid "(In addition to basic fields)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:151
+msgid "All available fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:152
+msgid "Custom Fields"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Profs.php:156
+msgid "Create Custom Field"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:77
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:80
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:81
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:82
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:87
+#: ../../Zotlabs/Widget/Admin.php:25
+msgid "Security"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid "Block public"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently authenticated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:90
+msgid "Set \"Transport Security\" HTTP header"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:91
+msgid "Set \"Content Security Policy\" HTTP header"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:92
+msgid "Allowed email domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:92
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid "Not allowed email domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid ""
+"Comma separated list of domains which are not allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains, unless allowed domains have been defined."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid "Allow communications only from these sites"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:95
+msgid "Block communications from these sites"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:96
+msgid "Allow communications only from these channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:96
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:97
+msgid "Block communications from these channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:98
+msgid "Only allow embeds from secure (SSL) websites and links."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:99
+msgid "Allow unfiltered embedded HTML content only from these domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:99
+msgid "One site per line. By default embedded content is filtered."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Security.php:100
+msgid "Block embedded HTML from these domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#, php-format
+msgid "Password changed for account %d."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+msgid "Account settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+msgid "Account not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+msgid "Account Edit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+msgid "New Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+msgid "New Password again"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+msgid "Technical skill level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+msgid "Account language (for emails)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+msgid "Service class"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:36
+#, php-format
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:43
+#, php-format
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:79
+msgid "Account not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:90
+#, php-format
+msgid "Account '%s' deleted"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:98
+#, php-format
+msgid "Account '%s' blocked"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:106
+#, php-format
+msgid "Account '%s' unblocked"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:165
+#: ../../Zotlabs/Module/Admin/Accounts.php:178
+#: ../../Zotlabs/Widget/Admin.php:23
+msgid "Accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:167
+#: ../../Zotlabs/Module/Admin/Channels.php:148
+msgid "select all"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:168
+msgid "Registrations waiting for confirm"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+msgid "Request date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:170
+msgid "No registrations."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:172
+msgid "Deny"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:175
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Unblock"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:180
+msgid "ID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
+msgid "All Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:183
+msgid "Register date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:184
+msgid "Last login"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:185
+msgid "Expires"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:186
+msgid "Service Class"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:188
+msgid ""
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
+"on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Accounts.php:189
+msgid ""
+"The account {0} will be deleted!\\n\\nEverything this account has posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:31
+#, php-format
+msgid "%s channel censored/uncensored"
+msgid_plural "%s channels censored/uncensored"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:40
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:46
+#, php-format
+msgid "%s channel deleted"
+msgid_plural "%s channels deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:65
+msgid "Channel not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:75
+#, php-format
+msgid "Channel '%s' deleted"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:87
+#, php-format
+msgid "Channel '%s' censored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:87
+#, php-format
+msgid "Channel '%s' uncensored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code allowed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code disallowed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Zotlabs/Widget/Admin.php:24
+msgid "Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:150
+msgid "Censor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:151
+msgid "Uncensor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:152
+msgid "Allow Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:153
+msgid "Disallow Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../include/conversation.php:1815
+msgid "Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:158
+msgid "UID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:162
+msgid ""
+"Selected channels will be deleted!\\n\\nEverything that was posted in these "
+"channels on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Channels.php:163
+msgid ""
+"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
+"channel on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:29
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:36
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#, php-format
+msgid "Update function %s could not be found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:55
+msgid "No failed updates."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+msgid "Failed Updates"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:35
+msgid "Queue Statistics"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:36
+msgid "Total Entries"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:37
+msgid "Priority"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:38
+msgid "Destination URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:39
+msgid "Mark hub permanently offline"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:40
+msgid "Empty queue for this hub"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Queue.php:41
+msgid "Last known contact"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:133
+msgid "Site settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2906
+msgid "Default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:170
+#: ../../Zotlabs/Module/Settings/Display.php:137
+#, php-format
+msgid "%s - (Incompatible)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:177
+#: ../../Zotlabs/Module/Settings/Display.php:151
+msgid "mobile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:179
+msgid "experimental"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:181
+msgid "unsupported"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:227
+msgid "Yes - with approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:233
+msgid "My site is not a public server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:234
+msgid "My site has paid access only"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:235
+msgid "My site has free access only"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:236
+msgid "My site offers free accounts with optional paid upgrades"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:247
+msgid "Basic/Minimal Social Networking"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:248
+msgid "Standard Configuration (default)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:249
+msgid "Professional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Lib/Techlevels.php:10
+msgid "Beginner/Basic"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:254 ../../Zotlabs/Lib/Techlevels.php:11
+msgid "Novice - not skilled but willing to learn"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Lib/Techlevels.php:12
+msgid "Intermediate - somewhat comfortable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:256 ../../Zotlabs/Lib/Techlevels.php:13
+msgid "Advanced - very comfortable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:257 ../../Zotlabs/Lib/Techlevels.php:14
+msgid "Expert - I can write computer code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Lib/Techlevels.php:15
+msgid "Wizard - I probably know more than you do"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Widget/Admin.php:22
+msgid "Site"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:270
+msgid "File upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:271
+msgid "Policies"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:272
+#: ../../include/contact_widgets.php:16
+msgid "Advanced"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../extend/addon/addon/statusnet/statusnet.php:890
+msgid "Site name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:278
+msgid "Server Configuration/Role"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:280
+msgid "Site default technical skill level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:280
+msgid "Used to provide a member experience matched to technical comfort level"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:282
+msgid "Lock the technical skill level setting"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:282
+msgid "Members can set their own technical comfort level by default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:284
+msgid "Banner/Logo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:285
+msgid "Administrator Information"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:285
+msgid ""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Zotlabs/Module/Siteinfo.php:23
+msgid "Site Information"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:286
+msgid ""
+"Publicly visible description of this site.  Displayed on siteinfo page.  "
+"BBCode can be used here"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:287
+msgid "System language"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:288
+msgid "System theme"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:288
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:289
+msgid "Mobile system theme"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:289
+msgid "Theme for mobile devices"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:291
+msgid "Allow Feeds as Connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:291
+msgid "(Heavy system resource usage)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:292
+msgid "Maximum image size"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:292
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:293
+msgid "Does this site allow new member registration?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:294
+msgid "Invitation only"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:294
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:295
+msgid "Which best describes the types of account offered by this hub?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:296
+msgid "Register text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:296
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:297
+msgid "Site homepage to show visitors (default: login box)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:297
+msgid ""
+"example: 'public' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:298
+msgid "Preserve site homepage URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:298
+msgid ""
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:299
+msgid "Accounts abandoned after x days"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:299
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:300
+msgid "Allowed friend domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:300
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:301
+msgid "Verify Email Addresses"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:301
+msgid ""
+"Check to verify email addresses used in account registration (recommended)."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:302
+msgid "Force publish"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:302
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:303
+msgid "Import Public Streams"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:303
+msgid ""
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:304
+msgid "Login on Homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:304
+msgid ""
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:305
+msgid "Enable context help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:305
+msgid ""
+"Display contextual help for the current page when the help button is pressed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:307
+msgid "Directory Server URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:307
+msgid "Default directory server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:309
+msgid "Proxy user"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:310
+msgid "Proxy URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:311
+msgid "Network timeout"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:311
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:312
+msgid "Delivery interval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:312
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:313
+msgid "Deliveries per process"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:313
+msgid ""
+"Number of deliveries to attempt in a single operating system process. Adjust "
+"if necessary to tune system performance. Recommend: 1-5."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:314
+msgid "Poll interval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:314
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:315
+msgid "Maximum Load Average"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:315
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:316
+msgid "Expiration period in days for imported (grid/network) content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:316
+msgid "0 for no expiration of imported content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:294
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:310
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+msgid "Disable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:313
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+msgid "Enable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:342
+#: ../../Zotlabs/Module/Admin/Plugins.php:437
+#: ../../Zotlabs/Widget/Admin.php:27
+msgid "Plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:343
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+msgid "Toggle"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:344
+#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
+#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:225
+msgid "Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:351
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+msgid "Author: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:352
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:353
+msgid "Minimum project version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:354
+msgid "Maximum project version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:355
+msgid "Minimum PHP version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:356
+msgid "Compatible Server Roles: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:357
+msgid "Requires: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:358
+#: ../../Zotlabs/Module/Admin/Plugins.php:442
+msgid "Disabled - version incompatibility"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:411
+msgid "Enter the public git repository URL of the plugin repo."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:412
+msgid "Plugin repo git URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
+msgid "Custom repo name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
+msgid "(optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:414
+msgid "Download Plugin Repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:421
+msgid "Install new repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348
+msgid "Install"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:445
+msgid "Manage Repos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:446
+msgid "Installed Plugin Repositories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:447
+msgid "Install a New Plugin Repository"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:454
+msgid "Switch branch"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:455
+#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Photos.php:984
+#: ../../extend/addon/addon/superblock/superblock.php:116
+msgid "Remove"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:26
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:61
+msgid "No themes found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:116
+msgid "Screenshot"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+msgid "Themes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:162
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:163
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:52
+msgid "Import Webpage Elements"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:53
+msgid "Import selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:76
+msgid "Export Webpage Elements"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:77
+msgid "Export selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/conversation.php:1889
+msgid "Webpages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Blocks.php:161
+#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Photos.php:1073
+#: ../../extend/addon/addon/cdav/include/widgets.php:123
+#: ../../include/conversation.php:1378
+msgid "Share"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Pubsites.php:59
+#: ../../Zotlabs/Module/Wiki.php:166 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Events.php:694
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../include/page_widgets.php:42
+msgid "View"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Events.php:478
+#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../include/conversation.php:1347 ../../include/page_widgets.php:43
+msgid "Preview"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:254
+msgid "Page Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:191
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:192
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:284
+msgid "Invalid file type."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:296
+msgid "Error opening zip file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:307
+msgid "Invalid folder path."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:334
+msgid "No webpage elements detected."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:409
+msgid "Import complete."
+msgstr ""
+
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+msgid "Layout Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editlayout.php:129
+#: ../../Zotlabs/Module/Layouts.php:132
+msgid "Layout Description (Optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editlayout.php:137
+msgid "Edit Layout"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editwebpage.php:144
+msgid "Page link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editwebpage.php:171
+msgid "Edit Webpage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+msgid "This site is not a directory server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:96
+msgid "No such group"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:136
+msgid "No such channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:141
+msgid "forum"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:153
+msgid "Search Results For:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:221
+msgid "Privacy group is empty"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:230
+msgid "Privacy group: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:256
+msgid "Invalid connection."
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:275
+#: ../../extend/addon/addon/redred/redred.php:65
+msgid "Invalid channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2259
+msgid "Menus"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
+msgid "Drop"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
+msgid "Edit post"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary "
+"location."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+msgid "Public Hubs"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:27
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
+#: ../../include/conversation.php:941 ../../include/conversation.php:1099
+msgid "Ratings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:48
+msgid "Rate"
+msgstr ""
+
 #: ../../Zotlabs/Module/Setup.php:176
 msgid "$Projectname Server - Setup"
 msgstr ""
@@ -1239,2463 +3721,6 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
-#: ../../Zotlabs/Module/Profiles.php:241 ../../Zotlabs/Module/Profiles.php:659
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
-msgid "Profile not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
-msgid "Profile-"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
-msgid "New profile created."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:111
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:146
-msgid "Profile unavailable to export."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:252
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:459
-msgid "Marital Status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:463
-msgid "Romantic Partner"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
-msgid "Work/Employment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:478
-msgid "Religion"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:482
-msgid "Political Views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:486
-#: ../../extend/addon/addon/openid/MysqlProvider.php:74
-msgid "Gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:490
-msgid "Sexual Preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:494
-msgid "Homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:498
-msgid "Interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793
-#: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:920
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
-msgid "Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
-#: ../../Zotlabs/Module/Events.php:475
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
-#: ../../include/js_strings.php:25
-msgid "Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:594
-msgid "Profile updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:678
-msgid "Hide your connections list from viewers of this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Admin/Site.php:226 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Connedit.php:402 ../../Zotlabs/Module/Connedit.php:786
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Wiki.php:179
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Settings/Channel.php:294
-#: ../../Zotlabs/Module/Photos.php:652
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-#: ../../extend/addon/addon/libertree/libertree.php:69
-#: ../../extend/addon/addon/libertree/libertree.php:81
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-#: ../../extend/addon/addon/nofed/nofed.php:72
-#: ../../extend/addon/addon/nofed/nofed.php:76
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-#: ../../extend/addon/addon/planets/planets.php:153
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-#: ../../extend/addon/addon/redred/redred.php:95
-#: ../../extend/addon/addon/redred/redred.php:99
-#: ../../extend/addon/addon/rtof/rtof.php:81
-#: ../../extend/addon/addon/rtof/rtof.php:85
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:242
-#: ../../extend/addon/addon/twitter/twitter.php:246
-#: ../../extend/addon/addon/twitter/twitter.php:255
-#: ../../extend/addon/addon/visage/visage.php:166
-#: ../../extend/addon/addon/wppost/wppost.php:82
-#: ../../extend/addon/addon/wppost/wppost.php:105
-#: ../../extend/addon/addon/wppost/wppost.php:109
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:234
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1710
-msgid "No"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Admin/Site.php:228 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Connedit.php:402 ../../Zotlabs/Module/Mitem.php:162
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96
-#: ../../Zotlabs/Module/Wiki.php:179 ../../Zotlabs/Module/Events.php:470
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Settings/Display.php:103
-#: ../../Zotlabs/Module/Settings/Channel.php:294
-#: ../../Zotlabs/Module/Photos.php:652
-#: ../../extend/addon/addon/dwpost/dwpost.php:73
-#: ../../extend/addon/addon/dwpost/dwpost.php:85
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#: ../../extend/addon/addon/ijpost/ijpost.php:73
-#: ../../extend/addon/addon/ijpost/ijpost.php:85
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:309
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:313
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:343
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:351
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:355
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:359
-#: ../../extend/addon/addon/libertree/libertree.php:69
-#: ../../extend/addon/addon/libertree/libertree.php:81
-#: ../../extend/addon/addon/ljpost/ljpost.php:70
-#: ../../extend/addon/addon/ljpost/ljpost.php:82
-#: ../../extend/addon/addon/nofed/nofed.php:72
-#: ../../extend/addon/addon/nofed/nofed.php:76
-#: ../../extend/addon/addon/nsabait/nsabait.php:157
-#: ../../extend/addon/addon/nsfw/nsfw.php:84
-#: ../../extend/addon/addon/planets/planets.php:153
-#: ../../extend/addon/addon/pumpio/pumpio.php:219
-#: ../../extend/addon/addon/pumpio/pumpio.php:223
-#: ../../extend/addon/addon/pumpio/pumpio.php:227
-#: ../../extend/addon/addon/pumpio/pumpio.php:231
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:81
-#: ../../extend/addon/addon/redred/redred.php:95
-#: ../../extend/addon/addon/redred/redred.php:99
-#: ../../extend/addon/addon/rtof/rtof.php:81
-#: ../../extend/addon/addon/rtof/rtof.php:85
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:273
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:277
-#: ../../extend/addon/addon/statusnet/statusnet.php:389
-#: ../../extend/addon/addon/statusnet/statusnet.php:411
-#: ../../extend/addon/addon/statusnet/statusnet.php:415
-#: ../../extend/addon/addon/statusnet/statusnet.php:424
-#: ../../extend/addon/addon/twitter/twitter.php:242
-#: ../../extend/addon/addon/twitter/twitter.php:246
-#: ../../extend/addon/addon/twitter/twitter.php:255
-#: ../../extend/addon/addon/visage/visage.php:166
-#: ../../extend/addon/addon/wppost/wppost.php:82
-#: ../../extend/addon/addon/wppost/wppost.php:105
-#: ../../extend/addon/addon/wppost/wppost.php:109
-#: ../../extend/addon/addon/xmpp/xmpp.php:53
-#: ../../extend/addon/addon/cdav/cdav.php:234
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1710
-msgid "Yes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:725
-msgid "Edit Profile Details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "View this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1066
-msgid "Edit visibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Profile Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:730
-msgid "Change cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
-msgid "Change profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Create a new profile using these settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Clone this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Delete this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Add profile things"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1715
-msgid "Personal"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Relation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Import profile from file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Export profile to file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Your gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:744
-msgid "Marital status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:745
-msgid "Sexual preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:748
-msgid "Profile name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752
-#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
-#: ../../include/datetime.php:259
-msgid "Required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:750
-msgid "This is your default profile."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Your full name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:753
-msgid "Title/Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:756
-msgid "Street address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:757
-msgid "Locality/City"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:758
-msgid "Region/State"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:759
-msgid "Postal/Zip code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:938
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
-msgid "Country"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Who (if applicable)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:766
-msgid "Since (date)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:769
-msgid "Tell us about yourself"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:770
-#: ../../extend/addon/addon/openid/MysqlProvider.php:68
-msgid "Homepage URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:771
-msgid "Hometown"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:772
-msgid "Political views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Religious views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Keywords used in directory listings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Example: fishing photography software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:777
-msgid "Musical interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Books, literature"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:779
-msgid "Television"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:780
-msgid "Film/Dance/Culture/Entertainment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:781
-msgid "Hobbies/Interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:782
-msgid "Love/Romance"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:784
-msgid "School/Education"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:785
-msgid "Contact information and social networks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:786
-msgid "My other channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:788
-msgid "Communications"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:916
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
-msgid "Phone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:790
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-#: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:917
-#: ../../extend/addon/addon/redred/redred.php:107
-#: ../../extend/addon/addon/rtof/rtof.php:93
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
-#: ../../extend/addon/addon/openid/MysqlProvider.php:56
-#: ../../extend/addon/addon/openid/MysqlProvider.php:57
-#: ../../include/network.php:1749
-msgid "Email"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:918
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
-msgid "Instant messenger"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:919
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
-msgid "Website"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:921
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
-msgid "Note"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:922
-#: ../../extend/addon/addon/cdav/cdav.php:270
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
-#: ../../include/connections.php:668
-msgid "Mobile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:923
-#: ../../extend/addon/addon/cdav/cdav.php:271
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
-#: ../../include/connections.php:669
-msgid "Home"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:924
-#: ../../extend/addon/addon/cdav/cdav.php:274
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
-#: ../../include/connections.php:672
-msgid "Work"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:926
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:368
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
-msgid "Add Contact"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:927
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
-msgid "Add Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:802
-#: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Connedit.php:929
-#: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
-msgid "Update"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:804
-#: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Connedit.php:931 ../../Zotlabs/Module/Wiki.php:261
-#: ../../Zotlabs/Module/Wiki.php:286
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../extend/addon/addon/friendica/dfrn_request.php:879
-#: ../../extend/addon/addon/js_upload/js_upload.php:46
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
-msgid "Cancel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
-msgid "Profile Image"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
-#: ../../include/nav.php:105
-msgid "Edit Profiles"
-msgstr ""
-
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
-msgstr ""
-
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827
-msgid "About"
-msgstr ""
-
-#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
-msgid "Members"
-msgstr ""
-
-#: ../../Zotlabs/Module/Help.php:82
-msgid "Administrators"
-msgstr ""
-
-#: ../../Zotlabs/Module/Help.php:83
-msgid "Developers"
-msgstr ""
-
-#: ../../Zotlabs/Module/Help.php:84
-msgid "Tutorials"
-msgstr ""
-
-#: ../../Zotlabs/Module/Help.php:93
-msgid "$Projectname Documentation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Help.php:94
-msgid "Contents"
-msgstr ""
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr ""
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:60
-#: ../../Zotlabs/Module/Admin/Plugins.php:259
-#: ../../Zotlabs/Module/Admin/Themes.php:72
-#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89
-#: ../../include/items.php:3271
-msgid "Item not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:116
-msgid "Message queues"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:133
-msgid "Your software should be updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin/Accounts.php:164
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:266
-#: ../../Zotlabs/Module/Admin/Plugins.php:341
-#: ../../Zotlabs/Module/Admin/Plugins.php:436
-#: ../../Zotlabs/Module/Admin/Themes.php:122
-#: ../../Zotlabs/Module/Admin/Themes.php:156
-msgid "Administration"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:138
-msgid "Summary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:141
-msgid "Registered accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Pending registrations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:143
-msgid "Registered channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Active plugins"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Version"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Repository version (master)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Repository version (dev)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editpost.php:24
-msgid "Item not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406
-msgid "Title (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
-msgid "Invalid item."
-msgstr ""
-
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Chanview.php:96
-#: ../../Zotlabs/Module/Wall_upload.php:31
-msgid "Channel not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Page.php:131
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
-"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr ""
-
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin/Profs.php:74
-#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:188
-#: ../../include/text.php:1011 ../../include/text.php:1023
-msgid "Save"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:254
-msgid "sent you a private message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:302
-msgid "added your channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:312
-msgid "g A l F d"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:330
-msgid "[today]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:339
-msgid "posted an event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:56
-#: ../../Zotlabs/Module/Connections.php:161
-#: ../../Zotlabs/Module/Connections.php:250
-msgid "Blocked"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:61
-#: ../../Zotlabs/Module/Connections.php:168
-#: ../../Zotlabs/Module/Connections.php:249
-msgid "Ignored"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:66
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:248
-msgid "Hidden"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:71
-#: ../../Zotlabs/Module/Connections.php:175
-#: ../../Zotlabs/Module/Connections.php:247
-msgid "Archived"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:76
-#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1724
-msgid "New"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:720 ../../include/widgets.php:530
-msgid "All"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:138
-msgid "New Connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:141
-msgid "Show pending (new) connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:145
-#: ../../Zotlabs/Module/Profperm.php:140
-msgid "All Connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:148
-msgid "Show all connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:164
-msgid "Only show blocked connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:171
-msgid "Only show ignored connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:178
-msgid "Only show archived connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:185
-msgid "Only show hidden connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:246
-msgid "Pending approval"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:262
-#, php-format
-msgid "%1$s [%2$s]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:263
-msgid "Edit connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:264
-msgid "Delete connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:273
-msgid "Channel address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:275
-msgid "Network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:278
-msgid "Call"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:280
-msgid "Status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:282
-msgid "Connected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:284
-msgid "Approve connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:285
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-msgid "Approve"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:286
-msgid "Ignore connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:287
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Ignore"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:288
-msgid "Recent activity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/text.php:940 ../../include/nav.php:203
-msgid "Connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:237 ../../include/widgets.php:302
-#: ../../include/text.php:1010 ../../include/text.php:1022
-#: ../../include/nav.php:180 ../../include/acl_selectors.php:213
-msgid "Search"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:317
-msgid "Search your connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:318
-msgid "Connections search"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Directory.php:392
-#: ../../Zotlabs/Module/Directory.php:397 ../../include/contact_widgets.php:23
-msgid "Find"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:61
-msgid "Image uploaded but image cropping failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:134
-#: ../../Zotlabs/Module/Cover_photo.php:181
-msgid "Cover Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:135
-msgid "Image resize failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:201 ../../include/photos.php:149
-msgid "Unable to process image"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:236
-msgid "Image upload failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:255
-msgid "Unable to process image."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4181
-msgid "female"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4182
-#, php-format
-msgid "%1$s updated her %2$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4183
-msgid "male"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4184
-#, php-format
-msgid "%1$s updated his %2$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4186
-#, php-format
-msgid "%1$s updated their %2$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1764
-msgid "cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:303
-#: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:316
-#: ../../Zotlabs/Module/Profile_photo.php:363
-msgid "Photo not available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:418
-msgid "Upload File:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:419
-msgid "Select a profile:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:356
-msgid "Upload Cover Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:427
-#: ../../Zotlabs/Module/Settings/Channel.php:404
-msgid "or"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:427
-msgid "skip this step"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:427
-msgid "select a photo from your photo albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:446
-msgid "Crop Image"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:447
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:449
-msgid "Done Editing"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "Off"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "On"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#, php-format
-msgid "Lock feature %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Features.php:64
-msgid "Manage Additional Features"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:28
-msgid "Log settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1661
-#: ../../include/widgets.php:1671
-msgid "Logs"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:85
-msgid "Clear"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:91
-msgid "Debugging"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid "Log file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid ""
-"Must be writable by web server. Relative to your top-level webserver "
-"directory."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Logs.php:93
-msgid "Log level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:69
-msgid "New Profile Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:70
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-msgid "Field nickname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:70
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-msgid "System name of field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:71
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-msgid "Input type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:72
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-msgid "Field Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:72
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-msgid "Label on profile pages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-msgid "Help text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-msgid "Additional info (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:83
-msgid "Field definition not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:89
-msgid "Edit Profile Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1642
-msgid "Profile Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:148
-msgid "Basic Profile Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:149
-msgid "Advanced Profile Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:149
-msgid "(In addition to basic fields)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:151
-msgid "All available fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:152
-msgid "Custom Fields"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Profs.php:156
-msgid "Create Custom Field"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:77
-msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently "
-"insecure."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:80
-msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:81
-msgid ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
-"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:82
-msgid ""
-"All other embedded content will be filtered, <strong>unless</strong> "
-"embedded content from that site is explicitly blocked."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1637
-msgid "Security"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid "Block public"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently authenticated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:90
-msgid "Set \"Transport Security\" HTTP header"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:91
-msgid "Set \"Content Security Policy\" HTTP header"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:92
-msgid "Allowed email domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:92
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:93
-msgid "Not allowed email domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:93
-msgid ""
-"Comma separated list of domains which are not allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains, unless allowed domains have been defined."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid "Allow communications only from these sites"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:95
-msgid "Block communications from these sites"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:96
-msgid "Allow communications only from these channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:96
-msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:97
-msgid "Block communications from these channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:98
-msgid "Only allow embeds from secure (SSL) websites and links."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:99
-msgid "Allow unfiltered embedded HTML content only from these domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:99
-msgid "One site per line. By default embedded content is filtered."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Security.php:100
-msgid "Block embedded HTML from these domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
-#, php-format
-msgid "Password changed for account %d."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
-msgid "Account settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
-msgid "Account not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
-msgid "Account Edit"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
-msgid "New Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
-msgid "New Password again"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:71
-msgid "Technical skill level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
-msgid "Account language (for emails)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Account_edit.php:73
-msgid "Service class"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:36
-#, php-format
-msgid "%s account blocked/unblocked"
-msgid_plural "%s account blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:43
-#, php-format
-msgid "%s account deleted"
-msgid_plural "%s accounts deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:79
-msgid "Account not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:90
-#, php-format
-msgid "Account '%s' deleted"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:98
-#, php-format
-msgid "Account '%s' blocked"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:106
-#, php-format
-msgid "Account '%s' unblocked"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:165
-#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1635
-msgid "Accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
-#: ../../Zotlabs/Module/Admin/Channels.php:148
-msgid "select all"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
-msgid "Registrations waiting for confirm"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-msgid "Request date"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:170
-msgid "No registrations."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
-msgid "Deny"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Unblock"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
-msgid "ID"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
-msgid "All Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-msgid "Register date"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:184
-msgid "Last login"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:185
-msgid "Expires"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
-msgid "Service Class"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:188
-msgid ""
-"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
-"on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Accounts.php:189
-msgid ""
-"The account {0} will be deleted!\\n\\nEverything this account has posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:31
-#, php-format
-msgid "%s channel censored/uncensored"
-msgid_plural "%s channels censored/uncensored"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:40
-#, php-format
-msgid "%s channel code allowed/disallowed"
-msgid_plural "%s channels code allowed/disallowed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:46
-#, php-format
-msgid "%s channel deleted"
-msgid_plural "%s channels deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:65
-msgid "Channel not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:75
-#, php-format
-msgid "Channel '%s' deleted"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' censored"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' uncensored"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:98
-#, php-format
-msgid "Channel '%s' code allowed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:98
-#, php-format
-msgid "Channel '%s' code disallowed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1636
-msgid "Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:150
-msgid "Censor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:151
-msgid "Uncensor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:152
-msgid "Allow Code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:153
-msgid "Disallow Code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1815
-msgid "Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:158
-msgid "UID"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:162
-msgid ""
-"Selected channels will be deleted!\\n\\nEverything that was posted in these "
-"channels on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Channels.php:163
-msgid ""
-"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
-"channel on this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
-msgid "Update has been marked successful"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:29
-#, php-format
-msgid "Executing %s failed. Check system logs."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:36
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
-#, php-format
-msgid "Update function %s could not be found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:55
-msgid "No failed updates."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
-msgid "Failed Updates"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:61
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:35
-msgid "Queue Statistics"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:36
-msgid "Total Entries"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:37
-msgid "Priority"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:38
-msgid "Destination URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:39
-msgid "Mark hub permanently offline"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:40
-msgid "Empty queue for this hub"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Queue.php:41
-msgid "Last known contact"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:133
-msgid "Site settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2920
-msgid "Default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:170
-#: ../../Zotlabs/Module/Settings/Display.php:137
-#, php-format
-msgid "%s - (Incompatible)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:177
-#: ../../Zotlabs/Module/Settings/Display.php:151
-msgid "mobile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:179
-msgid "experimental"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:181
-msgid "unsupported"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:227
-msgid "Yes - with approval"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:233
-msgid "My site is not a public server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:234
-msgid "My site has paid access only"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:235
-msgid "My site has free access only"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:236
-msgid "My site offers free accounts with optional paid upgrades"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:247
-msgid "Basic/Minimal Social Networking"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:248
-msgid "Standard Configuration (default)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:249
-msgid "Professional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Lib/Techlevels.php:10
-msgid "Beginner/Basic"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:254 ../../Zotlabs/Lib/Techlevels.php:11
-msgid "Novice - not skilled but willing to learn"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Lib/Techlevels.php:12
-msgid "Intermediate - somewhat comfortable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:256 ../../Zotlabs/Lib/Techlevels.php:13
-msgid "Advanced - very comfortable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:257 ../../Zotlabs/Lib/Techlevels.php:14
-msgid "Expert - I can write computer code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Lib/Techlevels.php:15
-msgid "Wizard - I probably know more than you do"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:267 ../../include/widgets.php:1634
-msgid "Site"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:270
-msgid "File upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:271
-msgid "Policies"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:272
-#: ../../include/contact_widgets.php:16
-msgid "Advanced"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:276
-#: ../../extend/addon/addon/statusnet/statusnet.php:890
-msgid "Site name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:278
-msgid "Server Configuration/Role"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:280
-msgid "Site default technical skill level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:280
-msgid "Used to provide a member experience matched to technical comfort level"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:282
-msgid "Lock the technical skill level setting"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:282
-msgid "Members can set their own technical comfort level by default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:284
-msgid "Banner/Logo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:285
-msgid "Administrator Information"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:285
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:286
-#: ../../Zotlabs/Module/Siteinfo.php:23
-msgid "Site Information"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:286
-msgid ""
-"Publicly visible description of this site.  Displayed on siteinfo page.  "
-"BBCode can be used here"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:287
-msgid "System language"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:288
-msgid "System theme"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:288
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Mobile system theme"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Theme for mobile devices"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:291
-msgid "Allow Feeds as Connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:291
-msgid "(Heavy system resource usage)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:292
-msgid "Maximum image size"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:292
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:293
-msgid "Does this site allow new member registration?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:294
-msgid "Invitation only"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:294
-msgid ""
-"Only allow new member registrations with an invitation code. Above register "
-"policy must be set to Yes."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:295
-msgid "Which best describes the types of account offered by this hub?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:296
-msgid "Register text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:296
-msgid "Will be displayed prominently on the registration page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:297
-msgid "Site homepage to show visitors (default: login box)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:297
-msgid ""
-"example: 'public' to show public stream, 'page/sys/home' to show a system "
-"webpage called 'home' or 'include:home.html' to include a file."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:298
-msgid "Preserve site homepage URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:298
-msgid ""
-"Present the site homepage in a frame at the original location instead of "
-"redirecting"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:299
-msgid "Accounts abandoned after x days"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:299
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:300
-msgid "Allowed friend domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:300
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:301
-msgid "Verify Email Addresses"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:301
-msgid ""
-"Check to verify email addresses used in account registration (recommended)."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:302
-msgid "Force publish"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:302
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:303
-msgid "Import Public Streams"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:303
-msgid ""
-"Import and allow access to public content pulled from other sites. Warning: "
-"this content is unmoderated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:304
-msgid "Login on Homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:304
-msgid ""
-"Present a login box to visitors on the home page if no other content has "
-"been configured."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:305
-msgid "Enable context help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:305
-msgid ""
-"Display contextual help for the current page when the help button is pressed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:307
-msgid "Directory Server URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:307
-msgid "Default directory server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:309
-msgid "Proxy user"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:310
-msgid "Proxy URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:311
-msgid "Network timeout"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:311
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:312
-msgid "Delivery interval"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:312
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:313
-msgid "Deliveries per process"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:313
-msgid ""
-"Number of deliveries to attempt in a single operating system process. Adjust "
-"if necessary to tune system performance. Recommend: 1-5."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:314
-msgid "Poll interval"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:314
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:315
-msgid "Maximum Load Average"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:315
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:316
-msgid "Expiration period in days for imported (grid/network) content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Site.php:316
-msgid "0 for no expiration of imported content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:294
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:310
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-msgid "Disable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:313
-#: ../../Zotlabs/Module/Admin/Themes.php:97
-msgid "Enable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:342
-#: ../../Zotlabs/Module/Admin/Plugins.php:437 ../../include/widgets.php:1639
-msgid "Plugins"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:343
-#: ../../Zotlabs/Module/Admin/Themes.php:124
-msgid "Toggle"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/widgets.php:685 ../../include/nav.php:225
-msgid "Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
-#: ../../Zotlabs/Module/Admin/Themes.php:134
-msgid "Author: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
-#: ../../Zotlabs/Module/Admin/Themes.php:135
-msgid "Maintainer: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
-msgid "Minimum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:354
-msgid "Maximum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:355
-msgid "Minimum PHP version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:356
-msgid "Compatible Server Roles: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:357
-msgid "Requires: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:358
-#: ../../Zotlabs/Module/Admin/Plugins.php:442
-msgid "Disabled - version incompatibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:411
-msgid "Enter the public git repository URL of the plugin repo."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:412
-msgid "Plugin repo git URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
-msgid "Custom repo name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
-msgid "(optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
-msgid "Download Plugin Repo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:421
-msgid "Install new repo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348
-msgid "Install"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:445
-msgid "Manage Repos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:446
-msgid "Installed Plugin Repositories"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:447
-msgid "Install a New Plugin Repository"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:454
-msgid "Switch branch"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Photos.php:984
-#: ../../extend/addon/addon/superblock/superblock.php:116
-msgid "Remove"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:26
-msgid "Theme settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:61
-msgid "No themes found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:116
-msgid "Screenshot"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../include/widgets.php:1640
-msgid "Themes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:162
-msgid "[Experimental]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:163
-msgid "[Unsupported]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:52
-msgid "Import Webpage Elements"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:53
-msgid "Import selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:76
-msgid "Export Webpage Elements"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:77
-msgid "Export selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1889
-msgid "Webpages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1073
-#: ../../extend/addon/addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1378
-msgid "Share"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../Zotlabs/Module/Wiki.php:166 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Events.php:694
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
-#: ../../include/page_widgets.php:42
-msgid "View"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Lib/ThreadItem.php:740
-#: ../../include/conversation.php:1347 ../../include/page_widgets.php:43
-msgid "Preview"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
-msgid "Actions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
-msgid "Page Link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:254
-msgid "Page Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190
-#: ../../include/page_widgets.php:47
-msgid "Created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../include/page_widgets.php:48
-msgid "Edited"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:284
-msgid "Invalid file type."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:296
-msgid "Error opening zip file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:307
-msgid "Invalid folder path."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:334
-msgid "No webpage elements detected."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:409
-msgid "Import complete."
-msgstr ""
-
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
-msgid "Layout Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:131
-msgid "Layout Description (Optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editlayout.php:136
-msgid "Edit Layout"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editwebpage.php:142
-msgid "Page link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editwebpage.php:169
-msgid "Edit Webpage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
-msgid "This site is not a directory server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:221
-msgid "Privacy group is empty"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:230
-msgid "Privacy group: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:256
-msgid "Invalid connection."
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:275
-#: ../../extend/addon/addon/redred/redred.php:65
-msgid "Invalid channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2273
-msgid "Menus"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
-msgid "Drop"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
-msgid "Edit post"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1401
-msgid "Public Hubs"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:27
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Hub URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Access Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Registration Policy"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Stats"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:941 ../../include/conversation.php:1099
-msgid "Ratings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:48
-msgid "Rate"
-msgstr ""
-
 #: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178
 msgid "Apps"
 msgstr ""
@@ -3790,7 +3815,7 @@ msgid "Could not create privacy group."
 msgstr ""
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3804
+#: ../../include/items.php:3812
 msgid "Privacy group not found."
 msgstr ""
 
@@ -3924,11 +3949,11 @@ msgid "Previous"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691
-#: ../../include/channel.php:1370
+#: ../../include/channel.php:1365
 msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2296
+#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2282
 msgid "Import"
 msgstr ""
 
@@ -3937,30 +3962,180 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
-msgid "webpage"
+#: ../../Zotlabs/Module/Wiki.php:30
+msgid "Profile Unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
-msgid "block"
+#: ../../Zotlabs/Module/Wiki.php:44
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
-msgid "layout"
+#: ../../Zotlabs/Module/Wiki.php:68
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60
+msgid "Invalid channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
+#: ../../Zotlabs/Module/Wiki.php:159
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144
+#: ../../include/conversation.php:1900
+msgid "Wikis"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:191
-#, php-format
-msgid "%s element installed"
+#: ../../Zotlabs/Module/Wiki.php:165
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150
+msgid "Download"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:194
-#, php-format
-msgid "%s element installation failed"
+#: ../../Zotlabs/Module/Wiki.php:169
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
+msgid "Wiki name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:170
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
+msgid "Content type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:179
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+msgid "Create a status post for this wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:204
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183
+msgid "Wiki not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:228
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208
+msgid "Rename page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:232
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212
+msgid "Error retrieving page content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:268
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241
+msgid "Revision Comparison"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:269
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
+msgid "Revert"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:273
+msgid "Short description of your changes (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:280
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
+msgid "Source"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:288
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259
+msgid "New page name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:293
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264
+#: ../../include/conversation.php:1299
+msgid "Embed image from photo albums"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:294
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1393
+msgid "Embed an image from your albums"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:296
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
+#: ../../include/conversation.php:1395 ../../include/conversation.php:1442
+msgid "OK"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:297
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1335
+msgid "Choose images to embed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:298
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1336
+msgid "Choose an album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:299
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
+msgid "Choose a different album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:300
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
+#: ../../include/conversation.php:1338
+msgid "Error getting album list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:301
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1339
+msgid "Error getting photo link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:302
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1340
+msgid "Error getting album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:369
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
+msgid "Error creating wiki. Invalid name."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:381
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
+msgid "Wiki created, but error creating Home page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:388
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
+msgid "Error creating wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:400
+msgid "Wiki delete permission denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:410
+msgid "Error deleting wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:436
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
+msgid "New page created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:555
+msgid "Cannot delete Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:619
+msgid "Current Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:619
+msgid "Selected Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:669
+msgid "You must be authenticated."
 msgstr ""
 
 #: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:57
@@ -4052,330 +4227,331 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:82
+#: ../../Zotlabs/Module/Connedit.php:79
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:112
+#: ../../Zotlabs/Module/Connedit.php:109
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:249
+#: ../../Zotlabs/Module/Connedit.php:246
 msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:251
+#: ../../Zotlabs/Module/Connedit.php:248
 msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:301
+#: ../../Zotlabs/Module/Connedit.php:298
 msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:434
+#: ../../Zotlabs/Module/Connedit.php:431
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:482
+#: ../../Zotlabs/Module/Connedit.php:479
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:497 ../../Zotlabs/Module/Connedit.php:506
-#: ../../Zotlabs/Module/Connedit.php:515 ../../Zotlabs/Module/Connedit.php:524
-#: ../../Zotlabs/Module/Connedit.php:537
+#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
+#: ../../Zotlabs/Module/Connedit.php:534
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:561
+#: ../../Zotlabs/Module/Connedit.php:558
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:601 ../../Zotlabs/Lib/Apps.php:228
+#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Lib/Apps.php:228
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:57
 #: ../../include/conversation.php:936 ../../include/conversation.php:1049
 #: ../../include/nav.php:103
 msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:604
+#: ../../Zotlabs/Module/Connedit.php:601
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:608
+#: ../../Zotlabs/Module/Connedit.php:605
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:611
+#: ../../Zotlabs/Module/Connedit.php:608
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:615
+#: ../../Zotlabs/Module/Connedit.php:612
 msgid "Refresh Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:618
+#: ../../Zotlabs/Module/Connedit.php:615
 msgid "Fetch updated photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:622
+#: ../../Zotlabs/Module/Connedit.php:619
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:625
+#: ../../Zotlabs/Module/Connedit.php:622
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:632
+#: ../../Zotlabs/Module/Connedit.php:629
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:633
+#: ../../Zotlabs/Module/Connedit.php:630
 msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:637
+#: ../../Zotlabs/Module/Connedit.php:634
 msgid "Unignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:640
+#: ../../Zotlabs/Module/Connedit.php:637
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:641
+#: ../../Zotlabs/Module/Connedit.php:638
 msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:645
+#: ../../Zotlabs/Module/Connedit.php:642
 msgid "Unarchive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:645
+#: ../../Zotlabs/Module/Connedit.php:642
 msgid "Archive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:648
+#: ../../Zotlabs/Module/Connedit.php:645
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:649
+#: ../../Zotlabs/Module/Connedit.php:646
 msgid "This connection is archived!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:650
 msgid "Unhide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:653
+#: ../../Zotlabs/Module/Connedit.php:650
 msgid "Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:656
+#: ../../Zotlabs/Module/Connedit.php:653
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:657
+#: ../../Zotlabs/Module/Connedit.php:654
 msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:664
+#: ../../Zotlabs/Module/Connedit.php:661
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:672
+#: ../../Zotlabs/Module/Connedit.php:669
 msgid "Fetch Vcard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:675
+#: ../../Zotlabs/Module/Connedit.php:672
 msgid "Fetch electronic calling card for this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:686
+#: ../../Zotlabs/Module/Connedit.php:683
 msgid "Open Individual Permissions section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:709
+#: ../../Zotlabs/Module/Connedit.php:706
 msgid "Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:712
+#: ../../Zotlabs/Module/Connedit.php:709
 msgid "Open Set Affinity section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../include/widgets.php:526
+#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
 msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:717 ../../include/widgets.php:527
+#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Widget/Affinity.php:27
 msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:715
 #: ../../Zotlabs/Module/Settings/Channel.php:62
 #: ../../Zotlabs/Module/Settings/Channel.php:66
 #: ../../Zotlabs/Module/Settings/Channel.php:67
 #: ../../Zotlabs/Module/Settings/Channel.php:70
 #: ../../Zotlabs/Module/Settings/Channel.php:81
-#: ../../include/selectors.php:123 ../../include/widgets.php:528
+#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123
 #: ../../include/channel.php:408 ../../include/channel.php:409
 #: ../../include/channel.php:416
 msgid "Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../include/widgets.php:529
+#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:29
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:746
+#: ../../Zotlabs/Module/Connedit.php:743
 msgid "Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:749
+#: ../../Zotlabs/Module/Connedit.php:746
 msgid "Open Custom Filter section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:786
+#: ../../Zotlabs/Module/Connedit.php:783
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:786
+#: ../../Zotlabs/Module/Connedit.php:783
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:791
+#: ../../Zotlabs/Module/Connedit.php:788
 msgid "Set Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:794
+#: ../../Zotlabs/Module/Connedit.php:791
 msgid "Set Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:797
+#: ../../Zotlabs/Module/Connedit.php:794
 msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:855
+#: ../../Zotlabs/Module/Connedit.php:852
 msgid "none"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:858 ../../include/widgets.php:661
+#: ../../Zotlabs/Module/Connedit.php:855
+#: ../../Zotlabs/Widget/Settings_menu.php:107
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:858 ../../include/items.php:3837
+#: ../../Zotlabs/Module/Connedit.php:855 ../../include/items.php:3845
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:859
+#: ../../Zotlabs/Module/Connedit.php:856
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:859
+#: ../../Zotlabs/Module/Connedit.php:856
 msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:860
+#: ../../Zotlabs/Module/Connedit.php:857
 msgid "Permission role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:861
+#: ../../Zotlabs/Module/Connedit.php:858
 msgid "Add permission role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:867
+#: ../../Zotlabs/Module/Connedit.php:864
 msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:868
+#: ../../Zotlabs/Module/Connedit.php:865
 msgid "Available locations:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:872
+#: ../../Zotlabs/Module/Connedit.php:869
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:873
+#: ../../Zotlabs/Module/Connedit.php:870
 msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:875
+#: ../../Zotlabs/Module/Connedit.php:872
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:876 ../../Zotlabs/Module/Rate.php:155
+#: ../../Zotlabs/Module/Connedit.php:873 ../../Zotlabs/Module/Rate.php:155
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:877
+#: ../../Zotlabs/Module/Connedit.php:874
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:883
+#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:880
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:880
+#: ../../Zotlabs/Module/Connedit.php:877
 msgid "Custom Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Connedit.php:878
 msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:881 ../../Zotlabs/Module/Connedit.php:882
+#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:879
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:882
+#: ../../Zotlabs/Module/Connedit.php:879
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:884
+#: ../../Zotlabs/Module/Connedit.php:881
 msgid "This information is public!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Connedit.php:886
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:892
+#: ../../Zotlabs/Module/Connedit.php:889
 #: ../../Zotlabs/Module/Settings/Permcats.php:107
 #: ../../Zotlabs/Module/Settings/Tokens.php:163
 msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:894
+#: ../../Zotlabs/Module/Connedit.php:891
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Zotlabs/Module/Connedit.php:893
 #: ../../Zotlabs/Module/Settings/Tokens.php:160
 msgid "Their Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:897
+#: ../../Zotlabs/Module/Connedit.php:894
 #: ../../Zotlabs/Module/Settings/Permcats.php:105
 #: ../../Zotlabs/Module/Settings/Tokens.php:161
 msgid "My Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:899
+#: ../../Zotlabs/Module/Connedit.php:896
 #: ../../Zotlabs/Module/Settings/Permcats.php:110
 #: ../../Zotlabs/Module/Settings/Tokens.php:166
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:900
+#: ../../Zotlabs/Module/Connedit.php:897
 #: ../../Zotlabs/Module/Settings/Permcats.php:111
 #: ../../Zotlabs/Module/Settings/Tokens.php:167
 msgid ""
@@ -4384,7 +4560,7 @@ msgid ""
 "individual settings. You can <strong>not</strong> change those settings here."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:901
+#: ../../Zotlabs/Module/Connedit.php:898
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -4392,51 +4568,51 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:902
+#: ../../Zotlabs/Module/Connedit.php:899
 msgid "Last update:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:911
+#: ../../Zotlabs/Module/Connedit.php:908
 msgid "Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:914
+#: ../../Zotlabs/Module/Connedit.php:911
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
 msgid "Organisation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:915
+#: ../../Zotlabs/Module/Connedit.php:912
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
 #: ../../include/page_widgets.php:46
 msgid "Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:932
+#: ../../Zotlabs/Module/Connedit.php:929
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
 msgid "P.O. Box"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:933
+#: ../../Zotlabs/Module/Connedit.php:930
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
 msgid "Additional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:934
+#: ../../Zotlabs/Module/Connedit.php:931
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
 msgid "Street"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:935
+#: ../../Zotlabs/Module/Connedit.php:932
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
 msgid "Locality"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:936
+#: ../../Zotlabs/Module/Connedit.php:933
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
 msgid "Region"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:937
+#: ../../Zotlabs/Module/Connedit.php:934
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
 msgid "ZIP Code"
 msgstr ""
@@ -4567,10 +4743,9 @@ msgid "No ratings"
 msgstr ""
 
 #: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Display.php:22
+#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:22
 #: ../../Zotlabs/Module/Viewconnections.php:23
 #: ../../Zotlabs/Module/Photos.php:508
-#: ../../extend/addon/addon/friendica/dfrn_request.php:794
 msgid "Public access denied."
 msgstr ""
 
@@ -4600,38 +4775,30 @@ msgstr ""
 msgid "System Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:184
-msgid "Unable to locate original post."
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:450
-msgid "Empty post discarded."
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:492
-msgid "Executable content type not permitted to this channel."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:842
-msgid "Duplicate post suppressed."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:984
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1114
-msgid "Unable to obtain post information from database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1121
+#: ../../Zotlabs/Module/Impel.php:181
 #, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1128
+#: ../../Zotlabs/Module/Impel.php:184
 #, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+msgid "%s element installation failed"
 msgstr ""
 
 #: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
@@ -4818,182 +4985,6 @@ msgstr ""
 msgid "Search results for: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:30
-msgid "Profile Unavailable."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:44
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40
-msgid "Not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:68
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60
-msgid "Invalid channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:159
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144
-#: ../../include/conversation.php:1900
-msgid "Wikis"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:165
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150
-msgid "Download"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:169
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
-msgid "Wiki name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:170
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
-msgid "Content type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:179
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-msgid "Create a status post for this wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:204
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183
-msgid "Wiki not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:228
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208
-msgid "Rename page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:232
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212
-msgid "Error retrieving page content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:259
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241
-msgid "Revision Comparison"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:260
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
-msgid "Revert"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:264
-msgid "Short description of your changes (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:271
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
-msgid "Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:279
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259
-msgid "New page name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:284
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264
-#: ../../include/conversation.php:1299
-msgid "Embed image from photo albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:285
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1393
-msgid "Embed an image from your albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:287
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
-#: ../../include/conversation.php:1395 ../../include/conversation.php:1442
-msgid "OK"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:288
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1335
-msgid "Choose images to embed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:289
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1336
-msgid "Choose an album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:290
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
-msgid "Choose a different album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:291
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
-#: ../../include/conversation.php:1338
-msgid "Error getting album list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:292
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1339
-msgid "Error getting photo link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:293
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1340
-msgid "Error getting album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:357
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
-msgid "Error creating wiki. Invalid name."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:369
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
-msgid "Wiki created, but error creating Home page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:376
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
-msgid "Error creating wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:388
-msgid "Wiki delete permission denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:398
-msgid "Error deleting wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:424
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
-msgid "New page created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:539
-msgid "Cannot delete Home"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:603
-msgid "Current Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:603
-msgid "Selected Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:653
-msgid "You must be authenticated."
-msgstr ""
-
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr ""
@@ -5031,27 +5022,23 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
 #: ../../Zotlabs/Module/Tagger.php:47
-#: ../../extend/addon/addon/diaspora/inbound.php:1794
 #: ../../extend/addon/addon/redphotos/redphotohelper.php:74
-#: ../../include/conversation.php:120 ../../include/text.php:1942
+#: ../../include/conversation.php:120 ../../include/text.php:1928
 msgid "photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../extend/addon/addon/diaspora/inbound.php:1794
-#: ../../include/conversation.php:148 ../../include/text.php:1948
+#: ../../include/conversation.php:148 ../../include/text.php:1934
 msgid "status"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
 #: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1145
-#: ../../include/conversation.php:123 ../../include/text.php:1945
+#: ../../include/conversation.php:123 ../../include/text.php:1931
 msgid "event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:419
-#: ../../extend/addon/addon/diaspora/inbound.php:1823
-#: ../../include/conversation.php:164
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -5243,7 +5230,7 @@ msgstr ""
 msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2272
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2258
 msgid "Blocks"
 msgstr ""
 
@@ -5251,25 +5238,25 @@ msgstr ""
 msgid "Block Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2274
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2260
 msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:232
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
 #: ../../include/help.php:55 ../../include/help.php:61
 #: ../../include/nav.php:174 ../../include/nav.php:288
 msgid "Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/Layouts.php:186
 msgid "Comanche page description language help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Layouts.php:190
 msgid "Layout Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Layouts.php:195
 msgid "Download PDL file"
 msgstr ""
 
@@ -5291,28 +5278,28 @@ msgid "Optionally explain your rating (this information is public)"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profile_photo.php:115
-#: ../../Zotlabs/Module/Profile_photo.php:224
+#: ../../Zotlabs/Module/Profile_photo.php:226
 #: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729
-#: ../../include/photo/photo_driver.php:730
+#: ../../include/photo/photo_driver.php:646
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:194
+#: ../../Zotlabs/Module/Profile_photo.php:196
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:298
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:420
+#: ../../Zotlabs/Module/Profile_photo.php:422
 msgid "Use Photo for Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:420
+#: ../../Zotlabs/Module/Profile_photo.php:422
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:421
+#: ../../Zotlabs/Module/Profile_photo.php:423
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:182
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:194
 msgid "Use"
@@ -5451,115 +5438,115 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:246
+#: ../../Zotlabs/Module/Directory.php:245
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Directory.php:257
+#: ../../Zotlabs/Module/Directory.php:256
 msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:259
+#: ../../Zotlabs/Module/Directory.php:258
 msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:261
+#: ../../Zotlabs/Module/Directory.php:260
 msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:310 ../../include/channel.php:1298
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293
 msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:315 ../../include/event.php:52
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/event.php:52
 #: ../../include/event.php:84 ../../include/channel.php:1134
 msgid "Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:321
+#: ../../Zotlabs/Module/Directory.php:320
 msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:326 ../../include/channel.php:1314
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309
 msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1322
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317
 msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:329 ../../Zotlabs/Module/Suggest.php:56
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Widget/Suggestions.php:44 ../../Zotlabs/Widget/Follow.php:32
 #: ../../include/connections.php:110 ../../include/conversation.php:938
-#: ../../include/conversation.php:1069 ../../include/widgets.php:134
-#: ../../include/widgets.php:171 ../../include/channel.php:1119
+#: ../../include/conversation.php:1069 ../../include/channel.php:1119
 msgid "Connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:330
+#: ../../Zotlabs/Module/Directory.php:329
 msgid "Public Forum:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:333
+#: ../../Zotlabs/Module/Directory.php:332
 msgid "Keywords: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:336
+#: ../../Zotlabs/Module/Directory.php:335
 msgid "Don't suggest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:338
+#: ../../Zotlabs/Module/Directory.php:337
 msgid "Common connections:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:387
+#: ../../Zotlabs/Module/Directory.php:386
 msgid "Global Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:387
+#: ../../Zotlabs/Module/Directory.php:386
 msgid "Local Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:393
+#: ../../Zotlabs/Module/Directory.php:392
 msgid "Finding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:396 ../../Zotlabs/Module/Suggest.php:64
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
 #: ../../include/contact_widgets.php:24
 msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:398
+#: ../../Zotlabs/Module/Directory.php:397
 msgid "next page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:398
+#: ../../Zotlabs/Module/Directory.php:397
 msgid "previous page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:399
+#: ../../Zotlabs/Module/Directory.php:398
 msgid "Sort options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:400
+#: ../../Zotlabs/Module/Directory.php:399
 msgid "Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:401
+#: ../../Zotlabs/Module/Directory.php:400
 msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:402
+#: ../../Zotlabs/Module/Directory.php:401
 msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:403
+#: ../../Zotlabs/Module/Directory.php:402
 msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:420
+#: ../../Zotlabs/Module/Directory.php:419
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -5587,7 +5574,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1714
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1698
 msgid "Password Reset"
 msgstr ""
 
@@ -5736,7 +5723,7 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1367
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362
 msgid "Profile"
 msgstr ""
 
@@ -5959,8 +5946,8 @@ msgstr ""
 msgid "*"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:677
-#: ../../include/features.php:213
+#: ../../Zotlabs/Module/Sources.php:96
+#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213
 msgid "Channel Sources"
 msgstr ""
 
@@ -6025,13 +6012,13 @@ msgstr ""
 msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:39
+#: ../../Zotlabs/Module/Suggest.php:37
 msgid ""
 "No suggestions available. If this is a new site, please try again in 24 "
 "hours."
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:136
+#: ../../Zotlabs/Module/Suggest.php:56 ../../Zotlabs/Widget/Suggestions.php:46
 msgid "Ignore/Hide"
 msgstr ""
 
@@ -6039,15 +6026,15 @@ msgstr ""
 msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1989
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984
 msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1990
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1991
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986
 msgid "Authenticate"
 msgstr ""
 
@@ -6382,7 +6369,8 @@ msgid ""
 "Examples:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Tokens.php:150 ../../include/widgets.php:644
+#: ../../Zotlabs/Module/Settings/Tokens.php:150
+#: ../../Zotlabs/Widget/Settings_menu.php:90
 msgid "Guest Access Tokens"
 msgstr ""
 
@@ -6466,7 +6454,7 @@ msgid "Basic Settings"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Channel.php:482
-#: ../../include/channel.php:1255
+#: ../../include/channel.php:1250
 msgid "Full Name:"
 msgstr ""
 
@@ -6772,7 +6760,7 @@ msgid "Firefox Share $Projectname provider"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Channel.php:578
-msgid "Start calendar week on monday"
+msgid "Start calendar week on Monday"
 msgstr ""
 
 #: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
@@ -6849,7 +6837,7 @@ msgid "post"
 msgstr ""
 
 #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1950
+#: ../../include/text.php:1936
 msgid "comment"
 msgstr ""
 
@@ -6881,7 +6869,6 @@ msgid "No channel. Import failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Import.php:467
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:142
 msgid "Import completed."
 msgstr ""
 
@@ -7024,12 +7011,12 @@ msgid "Show Oldest First"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335
-#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1751
+#: ../../Zotlabs/Module/Embedphotos.php:139 ../../Zotlabs/Widget/Album.php:78
 msgid "View Photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:809
-#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1768
+#: ../../Zotlabs/Module/Embedphotos.php:155 ../../Zotlabs/Widget/Album.php:95
 msgid "Edit Album"
 msgstr ""
 
@@ -7168,7 +7155,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190
 #: ../../include/taxonomy.php:403 ../../include/conversation.php:1952
-#: ../../include/channel.php:1273
+#: ../../include/channel.php:1268
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -7255,10 +7242,7 @@ msgstr ""
 msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:61
-#: ../../extend/addon/addon/diaspora/util.php:218
-#: ../../extend/addon/addon/diaspora/util.php:231
-#: ../../extend/addon/addon/diaspora/p.php:46 ../../include/network.php:1427
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1427
 msgid "$projectname"
 msgstr ""
 
@@ -7729,69 +7713,6 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:31
-#: ../../Zotlabs/Lib/NativeWikiPage.php:72
-msgid "(No Title)"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:86
-msgid "Wiki page create failed."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:99
-msgid "Wiki not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:110
-msgid "Destination name already exists"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:136
-#: ../../Zotlabs/Lib/NativeWikiPage.php:365
-msgid "Page not found"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:166
-msgid "Error reading page content"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:350
-#: ../../Zotlabs/Lib/NativeWikiPage.php:403
-#: ../../Zotlabs/Lib/NativeWikiPage.php:470
-#: ../../Zotlabs/Lib/NativeWikiPage.php:511
-msgid "Error reading wiki"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:391
-msgid "Page update failed."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:425
-msgid "Nothing deleted"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:491
-msgid "Compare: object not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:497
-msgid "Page updated"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:500
-msgid "Untitled"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:506
-msgid "Wiki resource_id required for git commit"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:577
-#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
-#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
-msgid "Different viewers will see this text differently"
-msgstr ""
-
 #: ../../Zotlabs/Lib/Permcat.php:58
 msgctxt "permcat"
 msgid "default"
@@ -7842,7 +7763,7 @@ msgid "Suggest Channels"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130
-#: ../../boot.php:1706
+#: ../../boot.php:1690
 msgid "Login"
 msgstr ""
 
@@ -7892,7 +7813,7 @@ msgstr ""
 msgid "Invite"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:242 ../../include/widgets.php:1638
+#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
 msgid "Features"
 msgstr ""
 
@@ -7928,10 +7849,330 @@ msgstr ""
 msgid "Remove from app-tray"
 msgstr ""
 
+#: ../../Zotlabs/Lib/NativeWikiPage.php:31
+#: ../../Zotlabs/Lib/NativeWikiPage.php:72
+msgid "(No Title)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:86
+msgid "Wiki page create failed."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:99
+msgid "Wiki not found."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:110
+msgid "Destination name already exists"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:136
+#: ../../Zotlabs/Lib/NativeWikiPage.php:331
+msgid "Page not found"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:166
+msgid "Error reading page content"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:322
+#: ../../Zotlabs/Lib/NativeWikiPage.php:370
+#: ../../Zotlabs/Lib/NativeWikiPage.php:437
+#: ../../Zotlabs/Lib/NativeWikiPage.php:478
+msgid "Error reading wiki"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:358
+msgid "Page update failed."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:392
+msgid "Nothing deleted"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:458
+msgid "Compare: object not found."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:464
+msgid "Page updated"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:467
+msgid "Untitled"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:473
+msgid "Wiki resource_id required for git commit"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:544
+#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
+#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
+msgid "Different viewers will see this text differently"
+msgstr ""
+
 #: ../../Zotlabs/Lib/NativeWiki.php:128
 msgid "Wiki files deleted successfully"
 msgstr ""
 
+#: ../../Zotlabs/Widget/Notes.php:16
+msgid "Notes"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Cover_photo.php:54
+msgid "Click to show more"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Tagcloud.php:25
+#: ../../Zotlabs/Widget/Appcategories.php:39 ../../include/taxonomy.php:188
+#: ../../include/taxonomy.php:270 ../../include/contact_widgets.php:91
+msgid "Categories"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Photo_rand.php:58 ../../Zotlabs/Widget/Photo.php:48
+msgid "photo/image"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Suggestions.php:51
+msgid "Suggestions"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Suggestions.php:52
+msgid "See more..."
+msgstr ""
+
+#: ../../Zotlabs/Widget/Follow.php:22
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr ""
+
+#: ../../Zotlabs/Widget/Follow.php:29
+msgid "Add New Connection"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Follow.php:30
+msgid "Enter channel address"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Follow.php:31
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Savedsearch.php:75
+msgid "Remove term"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
+msgid "Saved Searches"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
+msgid "add"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../include/features.php:390
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Filer.php:31 ../../Zotlabs/Widget/Appcategories.php:42
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Archive.php:43
+msgid "Archives"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Rating.php:51
+msgid "Rating Tools"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+msgid "Rate Me"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Rating.php:60
+msgid "View Ratings"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+msgid "Bookmarked Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Suggestedchats.php:32
+msgid "Suggested Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Affinity.php:49
+msgid "Refresh"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:35
+msgid "Account settings"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:41
+msgid "Channel settings"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:50
+msgid "Additional features"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:57
+msgid "Feature/Addon settings"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:63
+msgid "Display settings"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:70
+msgid "Manage locations"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:77
+msgid "Export channel"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:83
+msgid "Connected apps"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153
+msgid "Permission Groups"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Settings_menu.php:115
+msgid "Premium Channel Settings"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Mailmenu.php:13
+msgid "Private Mail Menu"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Mailmenu.php:15
+msgid "Combined View"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:213
+msgid "Inbox"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:214
+msgid "Outbox"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:215
+msgid "New Message"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Zotlabs/Widget/Conversations.php:29
+msgid "Conversations"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:21
+msgid "Received Messages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:25
+msgid "Sent Messages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:39
+msgid "No messages."
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:57
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Eventstools.php:13
+msgid "Events Tools"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Eventstools.php:14
+msgid "Export Calendar"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Eventstools.php:15
+msgid "Import Calendar"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../include/conversation.php:1866 ../../include/conversation.php:1869
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Chatroom_list.php:20
+msgid "Overview"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Chatroom_members.php:11
+msgid "Chat Members"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:95
+msgid "Wiki List"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:55
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:76
+msgid "Wiki Pages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:61
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:81
+msgid "Add new page"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_pages.php:62
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:82
+msgid "Page name"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Activity.php:50
+msgctxt "widget"
+msgid "Activity"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+msgctxt "wiki_history"
+msgid "Message"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Tasklist.php:23
+msgid "Tasks"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+msgid "Member registrations waiting for confirmation"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:29
+msgid "Inspect queue"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:31
+msgid "DB updates"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:233
+msgid "Admin"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:56
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Forums.php:85
+msgid "Forums"
+msgstr ""
+
 #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
 msgid "Flag Adult Photos"
 msgstr ""
@@ -7988,39 +8229,6 @@ msgstr ""
 msgid "Quick Reference"
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora/diaspora.php:677
-msgid "Diaspora Protocol Settings updated."
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora/diaspora.php:696
-msgid "Enable the Diaspora protocol for this channel"
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora/diaspora.php:700
-msgid "Allow any Diaspora member to comment on your public posts"
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora/diaspora.php:704
-msgid "Prevent your hashtags from being redirected to other sites"
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora/diaspora.php:709
-msgid "Followed hashtags (comma separated, do not include the #)"
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora/diaspora.php:714
-msgid "Diaspora Protocol Settings"
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:16
-msgid "No username found in import file."
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora/import_diaspora.php:41
-#: ../../include/import.php:51
-msgid "Unable to create a unique channel address. Import failed."
-msgstr ""
-
 #: ../../extend/addon/addon/dirstats/dirstats.php:94
 msgid "Hubzilla Directory Stats"
 msgstr ""
@@ -8241,316 +8449,6 @@ msgstr ""
 msgid "Flattr Widget Settings"
 msgstr ""
 
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:118
-msgid "Contact not found."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:119
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it "
-"has already been approved."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:238
-msgid "Response from remote site was not understood."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:247
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:252
-msgid "Unexpected response from remote site: "
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:261
-msgid "Confirmation completed successfully."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:263
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:277
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:284
-msgid "Remote site reported: "
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:275
-msgid "Temporary failure. Please wait and try again."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:282
-msgid "Introduction failed or was revoked."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:428
-msgid "Unable to set contact photo."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:485
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:570
-#, php-format
-msgid "No user record found for '%s' "
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:580
-msgid "Our site encryption key is apparently messed up."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:591
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:612
-msgid "Contact record was not found for you on our site."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:626
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:646
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:657
-msgid "Unable to set your contact credentials on our system."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:724
-msgid "Unable to update your contact profile details on our system"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:751
-#: ../../extend/addon/addon/friendica/dfrn_request.php:749
-msgid "[Name Withheld]"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:796
-#, php-format
-msgid "%1$s has joined %2$s"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_poll.php:103
-#: ../../extend/addon/addon/friendica/dfrn_poll.php:536
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:102
-msgid "This introduction has already been accepted."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:123
-#: ../../extend/addon/addon/friendica/dfrn_request.php:528
-msgid "Profile location is not valid or does not contain profile information."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:128
-#: ../../extend/addon/addon/friendica/dfrn_request.php:533
-msgid "Warning: profile location has no identifiable owner name."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:130
-#: ../../extend/addon/addon/friendica/dfrn_request.php:535
-msgid "Warning: profile location has no profile photo."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:133
-#: ../../extend/addon/addon/friendica/dfrn_request.php:538
-#, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:180
-msgid "Introduction complete."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:224
-msgid "Unrecoverable protocol error."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:252
-msgid "Profile unavailable."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:277
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:278
-msgid "Spam protection measures have been invoked."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:279
-msgid "Friends are advised to please try again in 24 hours."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:341
-msgid "Invalid locator"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:350
-msgid "Invalid email address."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:377
-msgid "This account has not been configured for email. Request failed."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:473
-msgid "Unable to resolve your name at the provided location."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:486
-msgid "You have already introduced yourself here."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:490
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:511
-msgid "Invalid profile URL."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:517
-msgid "Disallowed profile URL."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:587
-msgid "Failed to update contact record."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:608
-msgid "Your introduction has been sent."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:662
-msgid "Please login to confirm introduction."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:676
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:690
-#: ../../extend/addon/addon/friendica/dfrn_request.php:707
-msgid "Confirm"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:702
-msgid "Hide this contact"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:705
-#, php-format
-msgid "Welcome home %s."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:706
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:836
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:857
-#, php-format
-msgid ""
-"If you are not yet a member of the free social web, <a href=\"%s/siteinfo"
-"\">follow this link to find a public Friendica site and join us today</a>."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:862
-msgid "Friend/Connection Request"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:863
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:864
-msgid "Please answer the following:"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:865
-#, php-format
-msgid "Does %s know you?"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:869
-msgid "Add a personal note:"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:871
-#: ../../include/network.php:1744 ../../include/network.php:1745
-msgid "Friendica"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:872
-msgid "StatusNet/Federated Social Web"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:873
-#: ../../include/network.php:1750
-msgid "Diaspora"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:874
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search "
-"bar."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:875
-msgid "Your Identity Address:"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/dfrn_request.php:878
-msgid "Submit Request"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/friendica.php:113
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:118
-msgid "GNU-Social Protocol Settings updated."
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/friendica.php:124
-msgid "Enable the (experimental) GNU-Social protocol for this channel"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/friendica.php:128
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:133
-msgid "GNU-Social Protocol Settings"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/friendica.php:185
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:323
-msgid "Follow"
-msgstr ""
-
-#: ../../extend/addon/addon/friendica/friendica.php:188
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:326
-#, php-format
-msgid "%1$s is now following %2$s"
-msgstr ""
-
 #: ../../extend/addon/addon/frphotos/frphotos.php:91
 msgid "Friendica Photo Album Import"
 msgstr ""
@@ -8662,7 +8560,7 @@ msgid "IRC Chatroom"
 msgstr ""
 
 #: ../../extend/addon/addon/jappixmini/jappixmini.php:305
-#: ../../include/channel.php:1139 ../../include/channel.php:1301
+#: ../../include/channel.php:1139 ../../include/channel.php:1296
 msgid "Status:"
 msgstr ""
 
@@ -9198,7 +9096,7 @@ msgid "Page to load after image selection."
 msgstr ""
 
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:58
-#: ../../include/channel.php:1048 ../../include/nav.php:107
+#: ../../include/nav.php:107 ../../include/channel.php:1048
 msgid "Edit Profile"
 msgstr ""
 
@@ -10593,25 +10491,6 @@ msgstr ""
 msgid "Login failed."
 msgstr ""
 
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:44
-#, php-format
-msgid "Reconnecting %d connections"
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:63
-msgid "Diaspora Reconnect"
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:65
-msgid ""
-"Use this form to re-establish Diaspora connections which were initially made "
-"from a different hub."
-msgstr ""
-
-#: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:70
-msgid "Reconnect"
-msgstr ""
-
 #: ../../extend/addon/addon/mailtest/mailtest.php:19
 msgid "Send test email"
 msgstr ""
@@ -10773,37 +10652,13 @@ msgstr ""
 msgid "Error downloading wiki: "
 msgstr ""
 
-#: ../../extend/addon/addon/gitwiki/gitwiki.php:76
-#: ../../include/widgets.php:956
-msgid "Wiki Pages"
-msgstr ""
-
-#: ../../extend/addon/addon/gitwiki/gitwiki.php:81
-#: ../../include/widgets.php:962
-msgid "Add new page"
-msgstr ""
-
-#: ../../extend/addon/addon/gitwiki/gitwiki.php:82
-#: ../../include/widgets.php:963
-msgid "Page name"
-msgstr ""
-
-#: ../../extend/addon/addon/gitwiki/gitwiki.php:95
-#: ../../include/widgets.php:913
-msgid "Wiki List"
-msgstr ""
-
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:129
-msgid "Enable the GNU-Social protocol for this channel"
-msgstr ""
-
-#: ../../extend/addon/addon/opensearch/opensearch.php:26 ../../boot.php:1143
+#: ../../extend/addon/addon/opensearch/opensearch.php:26
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr ""
 
-#: ../../extend/addon/addon/opensearch/opensearch.php:28 ../../boot.php:1143
+#: ../../extend/addon/addon/opensearch/opensearch.php:28
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr ""
@@ -10893,14 +10748,6 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/help.php:33
-msgid "Help:"
-msgstr ""
-
-#: ../../include/help.php:65
-msgid "Not Found"
-msgstr ""
-
 #: ../../include/zot.php:649
 msgid "Invalid data packet"
 msgstr ""
@@ -10918,12 +10765,6 @@ msgstr ""
 msgid "invalid target signature"
 msgstr ""
 
-#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
-#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46
-#: ../../include/widgets.php:455
-msgid "Categories"
-msgstr ""
-
 #: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
 msgid "Tags"
 msgstr ""
@@ -11012,7 +10853,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:286 ../../boot.php:2555
+#: ../../include/datetime.php:286 ../../boot.php:2515
 msgid "never"
 msgstr ""
 
@@ -11338,73 +11179,29 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/items.php:807 ../../include/items.php:854
-msgid "(Unknown)"
+#: ../../include/help.php:33
+msgid "Help:"
 msgstr ""
 
-#: ../../include/items.php:1045
-msgid "Visible to anybody on the internet."
+#: ../../include/help.php:65
+msgid "Not Found"
 msgstr ""
 
-#: ../../include/items.php:1047
-msgid "Visible to you only."
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/items.php:1049
-msgid "Visible to anybody in this network."
+#: ../../include/import.php:51
+msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/items.php:1051
-msgid "Visible to anybody authenticated."
+#: ../../include/import.php:90
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/items.php:1053
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: ../../include/items.php:1055
-msgid "Visible to all connections."
-msgstr ""
-
-#: ../../include/items.php:1057
-msgid "Visible to approved connections."
-msgstr ""
-
-#: ../../include/items.php:1059
-msgid "Visible to specific connections."
-msgstr ""
-
-#: ../../include/items.php:3820
-msgid "Privacy group is empty."
-msgstr ""
-
-#: ../../include/items.php:3827
-#, php-format
-msgid "Privacy group: %s"
-msgstr ""
-
-#: ../../include/items.php:3839
-msgid "Connection not found."
-msgstr ""
-
-#: ../../include/items.php:4188
-msgid "profile photo"
-msgstr ""
-
-#: ../../include/items.php:4384
-#, php-format
-msgid "[Edited %s]"
-msgstr ""
-
-#: ../../include/items.php:4384
-msgctxt "edit_activity"
-msgid "Post"
-msgstr ""
-
-#: ../../include/items.php:4384
-msgctxt "edit_activity"
-msgid "Comment"
+#: ../../include/import.php:100
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
 #: ../../include/conversation.php:204
@@ -11417,8 +11214,8 @@ msgstr ""
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:1098
-#: ../../include/text.php:1103
+#: ../../include/conversation.php:243 ../../include/text.php:1097
+#: ../../include/text.php:1102
 msgid "poked"
 msgstr ""
 
@@ -11636,7 +11433,7 @@ msgstr ""
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/conversation.php:1839 ../../include/photos.php:515
+#: ../../include/conversation.php:1839 ../../include/photos.php:507
 msgid "Photo Albums"
 msgstr ""
 
@@ -11644,11 +11441,6 @@ msgstr ""
 msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/conversation.php:1866 ../../include/conversation.php:1869
-#: ../../include/widgets.php:888
-msgid "Chatrooms"
-msgstr ""
-
 #: ../../include/conversation.php:1879
 msgid "Bookmarks"
 msgstr ""
@@ -11742,16 +11534,6 @@ msgstr ""
 msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/contact_widgets.php:53 ../../include/widgets.php:333
-#: ../../include/features.php:390
-msgid "Saved Folders"
-msgstr ""
-
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-#: ../../include/widgets.php:336 ../../include/widgets.php:458
-msgid "Everything"
-msgstr ""
-
 #: ../../include/contact_widgets.php:122
 #, php-format
 msgid "%d connection in common"
@@ -11763,219 +11545,148 @@ msgstr[1] ""
 msgid "show more"
 msgstr ""
 
-#: ../../include/widgets.php:141
-msgid "Suggestions"
+#: ../../include/nav.php:88
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/widgets.php:142
-msgid "See more..."
+#: ../../include/nav.php:88
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/widgets.php:162
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1689
+msgid "Logout"
 msgstr ""
 
-#: ../../include/widgets.php:168
-msgid "Add New Connection"
+#: ../../include/nav.php:99 ../../include/nav.php:140
+msgid "End this session"
 msgstr ""
 
-#: ../../include/widgets.php:169
-msgid "Enter channel address"
+#: ../../include/nav.php:103
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/widgets.php:170
-msgid "Examples: bob@example.com, https://example.com/barbara"
+#: ../../include/nav.php:105
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/widgets.php:186
-msgid "Notes"
+#: ../../include/nav.php:107
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/widgets.php:262
-msgid "Remove term"
+#: ../../include/nav.php:130
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/widgets.php:270 ../../include/features.php:301
-msgid "Saved Searches"
+#: ../../include/nav.php:155
+msgid "Take me home"
 msgstr ""
 
-#: ../../include/widgets.php:271 ../../include/group.php:336
-msgid "add"
+#: ../../include/nav.php:157
+msgid "Log me out of this site"
 msgstr ""
 
-#: ../../include/widgets.php:377
-msgid "Archives"
+#: ../../include/nav.php:162
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/widgets.php:549
-msgid "Refresh"
+#: ../../include/nav.php:174
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/widgets.php:589
-msgid "Account settings"
+#: ../../include/nav.php:178
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/widgets.php:595
-msgid "Channel settings"
+#: ../../include/nav.php:180
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/widgets.php:604
-msgid "Additional features"
+#: ../../include/nav.php:182
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/widgets.php:611
-msgid "Feature/Addon settings"
+#: ../../include/nav.php:194
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/widgets.php:617
-msgid "Display settings"
+#: ../../include/nav.php:195
+msgid "View your network/grid"
 msgstr ""
 
-#: ../../include/widgets.php:624
-msgid "Manage locations"
+#: ../../include/nav.php:196
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/widgets.php:631
-msgid "Export channel"
+#: ../../include/nav.php:198
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/widgets.php:637
-msgid "Connected apps"
+#: ../../include/nav.php:199
+msgid "View your channel home"
 msgstr ""
 
-#: ../../include/widgets.php:652 ../../include/features.php:153
-msgid "Permission Groups"
+#: ../../include/nav.php:200
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/widgets.php:669
-msgid "Premium Channel Settings"
+#: ../../include/nav.php:206
+msgid "Notices"
 msgstr ""
 
-#: ../../include/widgets.php:698
-msgid "Private Mail Menu"
+#: ../../include/nav.php:206
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/widgets.php:700
-msgid "Combined View"
+#: ../../include/nav.php:207
+msgid "View all notifications"
 msgstr ""
 
-#: ../../include/widgets.php:705 ../../include/nav.php:213
-msgid "Inbox"
+#: ../../include/nav.php:210
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/widgets.php:710 ../../include/nav.php:214
-msgid "Outbox"
+#: ../../include/nav.php:211
+msgid "View your private messages"
 msgstr ""
 
-#: ../../include/widgets.php:715 ../../include/nav.php:215
-msgid "New Message"
+#: ../../include/nav.php:212
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/widgets.php:732 ../../include/widgets.php:744
-msgid "Conversations"
+#: ../../include/nav.php:218
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:736
-msgid "Received Messages"
+#: ../../include/nav.php:219
+msgid "View events"
 msgstr ""
 
-#: ../../include/widgets.php:740
-msgid "Sent Messages"
+#: ../../include/nav.php:220
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/widgets.php:754
-msgid "No messages."
+#: ../../include/nav.php:223
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/widgets.php:772
-msgid "Delete conversation"
+#: ../../include/nav.php:225
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/widgets.php:798
-msgid "Events Tools"
+#: ../../include/nav.php:233
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/widgets.php:799
-msgid "Export Calendar"
+#: ../../include/nav.php:297
+msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/widgets.php:800
-msgid "Import Calendar"
+#: ../../include/nav.php:298
+msgid "Please wait..."
 msgstr ""
 
-#: ../../include/widgets.php:892
-msgid "Overview"
-msgstr ""
-
-#: ../../include/widgets.php:899
-msgid "Chat Members"
-msgstr ""
-
-#: ../../include/widgets.php:977
-msgctxt "wiki_history"
-msgid "Message"
-msgstr ""
-
-#: ../../include/widgets.php:999
-msgid "Bookmarked Chatrooms"
-msgstr ""
-
-#: ../../include/widgets.php:1030
-msgid "Suggested Chatrooms"
-msgstr ""
-
-#: ../../include/widgets.php:1175 ../../include/widgets.php:1287
-msgid "photo/image"
-msgstr ""
-
-#: ../../include/widgets.php:1230
-msgid "Click to show more"
-msgstr ""
-
-#: ../../include/widgets.php:1381
-msgid "Rating Tools"
-msgstr ""
-
-#: ../../include/widgets.php:1385 ../../include/widgets.php:1387
-msgid "Rate Me"
-msgstr ""
-
-#: ../../include/widgets.php:1390
-msgid "View Ratings"
-msgstr ""
-
-#: ../../include/widgets.php:1483
-msgid "Forums"
-msgstr ""
-
-#: ../../include/widgets.php:1540
-msgctxt "widget"
-msgid "Activity"
-msgstr ""
-
-#: ../../include/widgets.php:1569
-msgid "Tasks"
-msgstr ""
-
-#: ../../include/widgets.php:1635 ../../include/widgets.php:1673
-msgid "Member registrations waiting for confirmation"
-msgstr ""
-
-#: ../../include/widgets.php:1641
-msgid "Inspect queue"
-msgstr ""
-
-#: ../../include/widgets.php:1643
-msgid "DB updates"
-msgstr ""
-
-#: ../../include/widgets.php:1668 ../../include/nav.php:233
-msgid "Admin"
-msgstr ""
-
-#: ../../include/widgets.php:1669
-msgid "Plugin Features"
+#: ../../include/nav.php:300
+msgid "Add Apps"
 msgstr ""
 
 #: ../../include/js_strings.php:5
@@ -12118,19 +11829,19 @@ msgstr ""
 msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1315
+#: ../../include/js_strings.php:45 ../../include/text.php:1314
 msgid "January"
 msgstr ""
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1315
+#: ../../include/js_strings.php:46 ../../include/text.php:1314
 msgid "February"
 msgstr ""
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1315
+#: ../../include/js_strings.php:47 ../../include/text.php:1314
 msgid "March"
 msgstr ""
 
-#: ../../include/js_strings.php:48 ../../include/text.php:1315
+#: ../../include/js_strings.php:48 ../../include/text.php:1314
 msgid "April"
 msgstr ""
 
@@ -12139,31 +11850,31 @@ msgctxt "long"
 msgid "May"
 msgstr ""
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1315
+#: ../../include/js_strings.php:50 ../../include/text.php:1314
 msgid "June"
 msgstr ""
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1315
+#: ../../include/js_strings.php:51 ../../include/text.php:1314
 msgid "July"
 msgstr ""
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1315
+#: ../../include/js_strings.php:52 ../../include/text.php:1314
 msgid "August"
 msgstr ""
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1315
+#: ../../include/js_strings.php:53 ../../include/text.php:1314
 msgid "September"
 msgstr ""
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1315
+#: ../../include/js_strings.php:54 ../../include/text.php:1314
 msgid "October"
 msgstr ""
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1315
+#: ../../include/js_strings.php:55 ../../include/text.php:1314
 msgid "November"
 msgstr ""
 
-#: ../../include/js_strings.php:56 ../../include/text.php:1315
+#: ../../include/js_strings.php:56 ../../include/text.php:1314
 msgid "December"
 msgstr ""
 
@@ -12216,31 +11927,31 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1311
+#: ../../include/js_strings.php:69 ../../include/text.php:1310
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1311
+#: ../../include/js_strings.php:70 ../../include/text.php:1310
 msgid "Monday"
 msgstr ""
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1311
+#: ../../include/js_strings.php:71 ../../include/text.php:1310
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1311
+#: ../../include/js_strings.php:72 ../../include/text.php:1310
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1311
+#: ../../include/js_strings.php:73 ../../include/text.php:1310
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1311
+#: ../../include/js_strings.php:74 ../../include/text.php:1310
 msgid "Friday"
 msgstr ""
 
-#: ../../include/js_strings.php:75 ../../include/text.php:1311
+#: ../../include/js_strings.php:75 ../../include/text.php:1310
 msgid "Saturday"
 msgstr ""
 
@@ -12313,269 +12024,52 @@ msgstr ""
 msgid "This Website Only"
 msgstr ""
 
-#: ../../include/text.php:461
-msgid "prev"
+#: ../../include/network.php:756
+msgid "view full size"
 msgstr ""
 
-#: ../../include/text.php:463
-msgid "first"
+#: ../../include/network.php:1490
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/text.php:492
-msgid "last"
+#: ../../include/network.php:1744 ../../include/network.php:1745
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/text.php:495
-msgid "next"
+#: ../../include/network.php:1746
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/text.php:506
-msgid "older"
+#: ../../include/network.php:1747
+msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/text.php:508
-msgid "newer"
+#: ../../include/network.php:1748
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/text.php:928
-msgid "No connections"
+#: ../../include/network.php:1750
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/text.php:953
-#, php-format
-msgid "View all %s connections"
+#: ../../include/network.php:1751
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/text.php:1098 ../../include/text.php:1103
-msgid "poke"
+#: ../../include/network.php:1752
+msgid "Zot"
 msgstr ""
 
-#: ../../include/text.php:1104
-msgid "ping"
+#: ../../include/network.php:1753
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/text.php:1104
-msgid "pinged"
+#: ../../include/network.php:1754
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/text.php:1105
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:1105
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:1106
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:1106
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:1107
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:1107
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:1108
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:1108
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:1120
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:1121
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:1122
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:1123
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:1124
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:1125
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:1126
-msgid "stupefied"
-msgstr ""
-
-#: ../../include/text.php:1127
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:1128
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:1129
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:1130
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:1131
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:1132
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:1133
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:1134
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:1135
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:1136
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:1137
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:1138
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:1139
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:1140
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1315
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1392 ../../include/text.php:1396
-msgid "Unknown Attachment"
-msgstr ""
-
-#: ../../include/text.php:1398
-msgid "unknown"
-msgstr ""
-
-#: ../../include/text.php:1434
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1511
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1780
-msgid "Page layout"
-msgstr ""
-
-#: ../../include/text.php:1780
-msgid "You can create your own with the layouts tool"
-msgstr ""
-
-#: ../../include/text.php:1822
-msgid "Page content type"
-msgstr ""
-
-#: ../../include/text.php:1955
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:2269
-msgid "Design Tools"
-msgstr ""
-
-#: ../../include/text.php:2275
-msgid "Pages"
-msgstr ""
-
-#: ../../include/text.php:2297
-msgid "Import website..."
-msgstr ""
-
-#: ../../include/text.php:2298
-msgid "Select folder to import"
-msgstr ""
-
-#: ../../include/text.php:2299
-msgid "Import from a zipped folder:"
-msgstr ""
-
-#: ../../include/text.php:2300
-msgid "Import from cloud files:"
-msgstr ""
-
-#: ../../include/text.php:2301
-msgid "/cloud/channel/path/to/folder"
-msgstr ""
-
-#: ../../include/text.php:2302
-msgid "Enter path to website files"
-msgstr ""
-
-#: ../../include/text.php:2303
-msgid "Select folder"
-msgstr ""
-
-#: ../../include/text.php:2304
-msgid "Export website..."
-msgstr ""
-
-#: ../../include/text.php:2305
-msgid "Export to a zip file"
-msgstr ""
-
-#: ../../include/text.php:2306
-msgid "website.zip"
-msgstr ""
-
-#: ../../include/text.php:2307
-msgid "Enter a name for the zip file."
-msgstr ""
-
-#: ../../include/text.php:2308
-msgid "Export to cloud files"
-msgstr ""
-
-#: ../../include/text.php:2309
-msgid "/path/to/export/folder"
-msgstr ""
-
-#: ../../include/text.php:2310
-msgid "Enter a path to a cloud files destination."
-msgstr ""
-
-#: ../../include/text.php:2311
-msgid "Specify folder"
+#: ../../include/network.php:1755
+msgid "MySpace"
 msgstr ""
 
 #: ../../include/group.php:26
@@ -12609,6 +12103,341 @@ msgstr ""
 msgid "Channels not in any privacy group"
 msgstr ""
 
+#: ../../include/text.php:460
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:462
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:491
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:494
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:505
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:507
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:927
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:952
+#, php-format
+msgid "View all %s connections"
+msgstr ""
+
+#: ../../include/text.php:1097 ../../include/text.php:1102
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:1104
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:1104
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:1105
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:1105
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:1106
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:1106
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:1119
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:1120
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:1121
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:1122
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:1123
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:1124
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:1125
+msgid "stupefied"
+msgstr ""
+
+#: ../../include/text.php:1126
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:1127
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:1128
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:1129
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:1130
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:1131
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1132
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1133
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1134
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1135
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1136
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:1137
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1138
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1139
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1314
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1391 ../../include/text.php:1395
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1397
+msgid "unknown"
+msgstr ""
+
+#: ../../include/text.php:1433
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1510
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1780
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1780
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1808
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1941
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2255
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2261
+msgid "Pages"
+msgstr ""
+
+#: ../../include/text.php:2283
+msgid "Import website..."
+msgstr ""
+
+#: ../../include/text.php:2284
+msgid "Select folder to import"
+msgstr ""
+
+#: ../../include/text.php:2285
+msgid "Import from a zipped folder:"
+msgstr ""
+
+#: ../../include/text.php:2286
+msgid "Import from cloud files:"
+msgstr ""
+
+#: ../../include/text.php:2287
+msgid "/cloud/channel/path/to/folder"
+msgstr ""
+
+#: ../../include/text.php:2288
+msgid "Enter path to website files"
+msgstr ""
+
+#: ../../include/text.php:2289
+msgid "Select folder"
+msgstr ""
+
+#: ../../include/text.php:2290
+msgid "Export website..."
+msgstr ""
+
+#: ../../include/text.php:2291
+msgid "Export to a zip file"
+msgstr ""
+
+#: ../../include/text.php:2292
+msgid "website.zip"
+msgstr ""
+
+#: ../../include/text.php:2293
+msgid "Enter a name for the zip file."
+msgstr ""
+
+#: ../../include/text.php:2294
+msgid "Export to cloud files"
+msgstr ""
+
+#: ../../include/text.php:2295
+msgid "/path/to/export/folder"
+msgstr ""
+
+#: ../../include/text.php:2296
+msgid "Enter a path to a cloud files destination."
+msgstr ""
+
+#: ../../include/text.php:2297
+msgid "Specify folder"
+msgstr ""
+
+#: ../../include/photos.php:111
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr ""
+
+#: ../../include/photos.php:118
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr ""
+
+#: ../../include/photos.php:511
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
+#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
+#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
+#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
+#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
+#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
+#: ../../include/bbcode.php:1079
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:189
+#, php-format
+msgid "Install %s element: "
+msgstr ""
+
+#: ../../include/bbcode.php:193
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr ""
+
+#: ../../include/bbcode.php:272
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr ""
+
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/bbcode.php:357
+msgid "spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:1028
+msgid "$1 wrote:"
+msgstr ""
+
 #: ../../include/channel.php:33
 msgid "Unable to obtain identity information from database"
 msgstr ""
@@ -12654,11 +12483,11 @@ msgstr ""
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/channel.php:1138 ../../include/channel.php:1257
+#: ../../include/channel.php:1138 ../../include/channel.php:1252
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/channel.php:1140 ../../include/channel.php:1312
+#: ../../include/channel.php:1140 ../../include/channel.php:1307
 msgid "Homepage:"
 msgstr ""
 
@@ -12666,138 +12495,245 @@ msgstr ""
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/channel.php:1262
+#: ../../include/channel.php:1257
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/channel.php:1286
+#: ../../include/channel.php:1281
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/channel.php:1287
+#: ../../include/channel.php:1282
 msgid "j F"
 msgstr ""
 
-#: ../../include/channel.php:1294
+#: ../../include/channel.php:1289
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/channel.php:1307
+#: ../../include/channel.php:1302
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/channel.php:1310
+#: ../../include/channel.php:1305
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/channel.php:1316
+#: ../../include/channel.php:1311
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/channel.php:1318
+#: ../../include/channel.php:1313
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/channel.php:1320
+#: ../../include/channel.php:1315
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/channel.php:1324
+#: ../../include/channel.php:1319
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/channel.php:1326
+#: ../../include/channel.php:1321
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/channel.php:1328
+#: ../../include/channel.php:1323
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/channel.php:1330
+#: ../../include/channel.php:1325
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/channel.php:1332
+#: ../../include/channel.php:1327
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/channel.php:1334
+#: ../../include/channel.php:1329
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/channel.php:1336
+#: ../../include/channel.php:1331
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/channel.php:1338
+#: ../../include/channel.php:1333
 msgid "Television:"
 msgstr ""
 
-#: ../../include/channel.php:1340
+#: ../../include/channel.php:1335
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/channel.php:1342
+#: ../../include/channel.php:1337
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/channel.php:1344
+#: ../../include/channel.php:1339
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/channel.php:1346
+#: ../../include/channel.php:1341
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/channel.php:1369
+#: ../../include/channel.php:1364
 msgid "Like this thing"
 msgstr ""
 
-#: ../../include/channel.php:2103
+#: ../../include/channel.php:2098
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../include/network.php:756
-msgid "view full size"
+#: ../../include/message.php:32
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/network.php:1490
-msgid "No Subject"
+#: ../../include/message.php:69
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/network.php:1746
-msgid "OStatus"
+#: ../../include/message.php:74
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/network.php:1747
-msgid "GNU-Social"
+#: ../../include/message.php:225
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/network.php:1748
-msgid "RSS/Atom"
+#: ../../include/security.php:117
+msgid "guest:"
 msgstr ""
 
-#: ../../include/network.php:1751
-msgid "Facebook"
+#: ../../include/security.php:532
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/network.php:1752
-msgid "Zot"
+#: ../../include/items.php:808 ../../include/items.php:855
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/network.php:1753
-msgid "LinkedIn"
+#: ../../include/items.php:1046
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/network.php:1754
-msgid "XMPP/IM"
+#: ../../include/items.php:1048
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/network.php:1755
-msgid "MySpace"
+#: ../../include/items.php:1050
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1052
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1054
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1056
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1058
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1060
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:3828
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:3835
+#, php-format
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:3847
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:4196
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/items.php:4392
+#, php-format
+msgid "[Edited %s]"
+msgstr ""
+
+#: ../../include/items.php:4392
+msgctxt "edit_activity"
+msgid "Post"
+msgstr ""
+
+#: ../../include/items.php:4392
+msgctxt "edit_activity"
+msgid "Comment"
+msgstr ""
+
+#: ../../include/acl_selectors.php:208
+msgid "Who can see this?"
+msgstr ""
+
+#: ../../include/acl_selectors.php:209
+msgid "Custom selection"
+msgstr ""
+
+#: ../../include/acl_selectors.php:210
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
+msgstr ""
+
+#: ../../include/acl_selectors.php:211
+msgid "Show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:212
+msgid "Don't show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:245
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These "
+"permissions set who is allowed to view the post."
+msgstr ""
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr ""
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr ""
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr ""
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
 #: ../../include/attach.php:250 ../../include/attach.php:338
@@ -12862,272 +12798,6 @@ msgstr ""
 msgid "Empty path"
 msgstr ""
 
-#: ../../include/message.php:32
-msgid "Unable to determine sender."
-msgstr ""
-
-#: ../../include/message.php:69
-msgid "No recipient provided."
-msgstr ""
-
-#: ../../include/message.php:74
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/message.php:225
-msgid "Stored post could not be verified."
-msgstr ""
-
-#: ../../include/nav.php:88
-msgid "Remote authentication"
-msgstr ""
-
-#: ../../include/nav.php:88
-msgid "Click to authenticate to your home hub"
-msgstr ""
-
-#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1705
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:99 ../../include/nav.php:140
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:103
-msgid "Your profile page"
-msgstr ""
-
-#: ../../include/nav.php:105
-msgid "Manage/Edit profiles"
-msgstr ""
-
-#: ../../include/nav.php:107
-msgid "Edit your profile"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Sign in"
-msgstr ""
-
-#: ../../include/nav.php:155
-msgid "Get me home"
-msgstr ""
-
-#: ../../include/nav.php:157
-msgid "Log me out of this site"
-msgstr ""
-
-#: ../../include/nav.php:162
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:174
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:178
-msgid "Applications, utilities, links, games"
-msgstr ""
-
-#: ../../include/nav.php:180
-msgid "Search site @name, #tag, ?docs, content"
-msgstr ""
-
-#: ../../include/nav.php:182
-msgid "Channel Directory"
-msgstr ""
-
-#: ../../include/nav.php:194
-msgid "Your grid"
-msgstr ""
-
-#: ../../include/nav.php:195
-msgid "View your network/grid"
-msgstr ""
-
-#: ../../include/nav.php:196
-msgid "Mark all grid notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:198
-msgid "Channel home"
-msgstr ""
-
-#: ../../include/nav.php:199
-msgid "View your channel home"
-msgstr ""
-
-#: ../../include/nav.php:200
-msgid "Mark all channel notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:206
-msgid "Notices"
-msgstr ""
-
-#: ../../include/nav.php:206
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:207
-msgid "View all notifications"
-msgstr ""
-
-#: ../../include/nav.php:210
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:211
-msgid "View your private messages"
-msgstr ""
-
-#: ../../include/nav.php:212
-msgid "Mark all private messages seen"
-msgstr ""
-
-#: ../../include/nav.php:218
-msgid "Event Calendar"
-msgstr ""
-
-#: ../../include/nav.php:219
-msgid "View events"
-msgstr ""
-
-#: ../../include/nav.php:220
-msgid "Mark all events seen"
-msgstr ""
-
-#: ../../include/nav.php:223
-msgid "Manage Your Channels"
-msgstr ""
-
-#: ../../include/nav.php:225
-msgid "Account/Channel Settings"
-msgstr ""
-
-#: ../../include/nav.php:233
-msgid "Site Setup and Configuration"
-msgstr ""
-
-#: ../../include/nav.php:297
-msgid "@name, #tag, ?doc, content"
-msgstr ""
-
-#: ../../include/nav.php:298
-msgid "Please wait..."
-msgstr ""
-
-#: ../../include/nav.php:300
-msgid "Add Apps"
-msgstr ""
-
-#: ../../include/photos.php:115
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr ""
-
-#: ../../include/photos.php:122
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../include/photos.php:260
-msgid "Photo storage failed."
-msgstr ""
-
-#: ../../include/photos.php:300
-msgid "a new photo"
-msgstr ""
-
-#: ../../include/photos.php:304
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr ""
-
-#: ../../include/photos.php:519
-msgid "Upload New Photos"
-msgstr ""
-
-#: ../../include/security.php:117
-msgid "guest:"
-msgstr ""
-
-#: ../../include/security.php:532
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
-
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../include/import.php:90
-msgid "Channel clone failed. Import failed."
-msgstr ""
-
-#: ../../include/import.php:100
-msgid "Cloned channel not found. Import failed."
-msgstr ""
-
-#: ../../include/import.php:1373
-msgid "Unable to import element \""
-msgstr ""
-
-#: ../../include/acl_selectors.php:208
-msgid "Who can see this?"
-msgstr ""
-
-#: ../../include/acl_selectors.php:209
-msgid "Custom selection"
-msgstr ""
-
-#: ../../include/acl_selectors.php:210
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
-"the scope of \"Show\"."
-msgstr ""
-
-#: ../../include/acl_selectors.php:211
-msgid "Show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:212
-msgid "Don't show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:245
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These "
-"permissions set who is allowed to view the post."
-msgstr ""
-
-#: ../../include/activities.php:41
-msgid " and "
-msgstr ""
-
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr ""
-
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr ""
-
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr ""
-
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr ""
-
 #: ../../include/permissions.php:35
 msgid "Can view my normal stream and posts"
 msgstr ""
@@ -13525,49 +13195,6 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
-#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
-#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
-#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
-#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
-#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
-#: ../../include/bbcode.php:1079
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:189
-#, php-format
-msgid "Install %s element: "
-msgstr ""
-
-#: ../../include/bbcode.php:193
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr ""
-
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/bbcode.php:357
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:1028
-msgid "$1 wrote:"
-msgstr ""
-
 #: ../../util/nconfig.php:34
 msgid "Source channel not found."
 msgstr ""
@@ -13704,54 +13331,54 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1479
+#: ../../boot.php:1463
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1482
+#: ../../boot.php:1466
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1686
+#: ../../boot.php:1670
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1708
+#: ../../boot.php:1692
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1709
+#: ../../boot.php:1693
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1710
+#: ../../boot.php:1694
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1713
+#: ../../boot.php:1697
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2277
+#: ../../boot.php:2237
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2432
+#: ../../boot.php:2392
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2435
+#: ../../boot.php:2395
 #, php-format
-msgid "[hubzilla] Website SSL error for %s"
+msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2554
+#: ../../boot.php:2514
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2558
+#: ../../boot.php:2518
 #, php-format
-msgid "[hubzilla] Cron tasks not running on %s"
+msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index ea31c23a3..dbf8b9285 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -107,7 +107,8 @@
 <script>
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
-	window.wiki_page_content = `{{$content}}`;
+//	window.wiki_page_content = "{{$content|escape:'javascript'}}";
+	window.wiki_page_content = {{$content}};
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');

From 320c32fd0f40f3e050ddbec3dc72561f59d7fe35 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 18 Mar 2017 16:55:10 -0700
Subject: [PATCH 046/299] issue #699

---
 library/simplepie/demo/cli_test.php           |  23 -
 .../demo/for_the_demo/alternate_favicon.png   | Bin 28621 -> 0 bytes
 .../for_the_demo/background_blockquote.png    | Bin 27353 -> 0 bytes
 .../demo/for_the_demo/background_menuitem.gif | Bin 533 -> 0 bytes
 .../for_the_demo/background_menuitem_off.gif  | Bin 533 -> 0 bytes
 .../background_menuitem_shadow.gif            | Bin 250 -> 0 bytes
 .../demo/for_the_demo/favicons/alternate.png  | Bin 28621 -> 0 bytes
 .../demo/for_the_demo/favicons/blinklist.png  | Bin 4377 -> 0 bytes
 .../demo/for_the_demo/favicons/blogmarks.png  | Bin 3823 -> 0 bytes
 .../demo/for_the_demo/favicons/delicious.png  | Bin 3739 -> 0 bytes
 .../demo/for_the_demo/favicons/digg.png       | Bin 4004 -> 0 bytes
 .../demo/for_the_demo/favicons/magnolia.png   | Bin 4574 -> 0 bytes
 .../demo/for_the_demo/favicons/myweb2.png     | Bin 4010 -> 0 bytes
 .../demo/for_the_demo/favicons/newsvine.png   | Bin 3804 -> 0 bytes
 .../demo/for_the_demo/favicons/reddit.png     | Bin 4239 -> 0 bytes
 .../demo/for_the_demo/favicons/segnalo.png    | Bin 4116 -> 0 bytes
 .../demo/for_the_demo/favicons/simpy.png      | Bin 4256 -> 0 bytes
 .../demo/for_the_demo/favicons/spurl.png      | Bin 3970 -> 0 bytes
 .../demo/for_the_demo/favicons/technorati.png | Bin 4087 -> 0 bytes
 .../demo/for_the_demo/favicons/wists.png      | Bin 3974 -> 0 bytes
 library/simplepie/demo/for_the_demo/feed.png  | Bin 715 -> 0 bytes
 .../demo/for_the_demo/logo_simplepie_demo.png | Bin 3047 -> 0 bytes
 .../demo/for_the_demo/lucida-grande-bold.swf  | Bin 21159 -> 0 bytes
 .../demo/for_the_demo/mediaplayer.swf         | Bin 32008 -> 0 bytes
 .../demo/for_the_demo/mediaplayer_readme.htm  |   5 -
 .../demo/for_the_demo/mini_podcast.png        | Bin 1202 -> 0 bytes
 .../demo/for_the_demo/place_audio.png         | Bin 851 -> 0 bytes
 .../demo/for_the_demo/place_video.png         | Bin 36713 -> 0 bytes
 .../demo/for_the_demo/sIFR-print.css          |  35 --
 .../demo/for_the_demo/sIFR-screen.css         |  39 --
 .../demo/for_the_demo/sifr-config.js          |  40 --
 library/simplepie/demo/for_the_demo/sifr.js   |  19 -
 .../simplepie/demo/for_the_demo/simplepie.css | 397 ------------------
 .../simplepie/demo/for_the_demo/sleight.js    |  31 --
 .../place_audio_fireworksfile.png             | Bin 39177 -> 0 bytes
 .../place_video_fireworksfile.png             | Bin 115826 -> 0 bytes
 .../source_files/sIFR-r245/SifrStyleSheet.as  |  71 ----
 .../source_files/sIFR-r245/_README_.txt       |  12 -
 .../source_files/sIFR-r245/options.as         |  12 -
 .../source_files/sIFR-r245/sIFR.as            | 359 ----------------
 .../source_files/sIFR-r245/sifr.fla           | Bin 47104 -> 0 bytes
 .../demo/for_the_demo/top_gradient.gif        | Bin 1378 -> 0 bytes
 .../simplepie/demo/for_the_demo/verdana.swf   | Bin 28575 -> 0 bytes
 .../for_the_demo/yanone-kaffeesatz-bold.swf   | Bin 76780 -> 0 bytes
 library/simplepie/demo/handler_image.php      |   6 -
 library/simplepie/demo/index.php              | 295 -------------
 library/simplepie/demo/minimalistic.php       | 137 ------
 library/simplepie/demo/multifeeds.php         | 108 -----
 library/simplepie/demo/test.php               |  62 ---
 49 files changed, 1651 deletions(-)
 delete mode 100644 library/simplepie/demo/cli_test.php
 delete mode 100644 library/simplepie/demo/for_the_demo/alternate_favicon.png
 delete mode 100644 library/simplepie/demo/for_the_demo/background_blockquote.png
 delete mode 100644 library/simplepie/demo/for_the_demo/background_menuitem.gif
 delete mode 100644 library/simplepie/demo/for_the_demo/background_menuitem_off.gif
 delete mode 100644 library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/alternate.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/blinklist.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/blogmarks.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/delicious.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/digg.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/magnolia.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/myweb2.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/newsvine.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/reddit.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/segnalo.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/simpy.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/spurl.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/technorati.png
 delete mode 100644 library/simplepie/demo/for_the_demo/favicons/wists.png
 delete mode 100644 library/simplepie/demo/for_the_demo/feed.png
 delete mode 100644 library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
 delete mode 100644 library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
 delete mode 100644 library/simplepie/demo/for_the_demo/mediaplayer.swf
 delete mode 100644 library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
 delete mode 100644 library/simplepie/demo/for_the_demo/mini_podcast.png
 delete mode 100644 library/simplepie/demo/for_the_demo/place_audio.png
 delete mode 100644 library/simplepie/demo/for_the_demo/place_video.png
 delete mode 100644 library/simplepie/demo/for_the_demo/sIFR-print.css
 delete mode 100644 library/simplepie/demo/for_the_demo/sIFR-screen.css
 delete mode 100644 library/simplepie/demo/for_the_demo/sifr-config.js
 delete mode 100644 library/simplepie/demo/for_the_demo/sifr.js
 delete mode 100644 library/simplepie/demo/for_the_demo/simplepie.css
 delete mode 100644 library/simplepie/demo/for_the_demo/sleight.js
 delete mode 100644 library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
 delete mode 100644 library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
 delete mode 100644 library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
 delete mode 100644 library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
 delete mode 100644 library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
 delete mode 100644 library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
 delete mode 100644 library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
 delete mode 100644 library/simplepie/demo/for_the_demo/top_gradient.gif
 delete mode 100644 library/simplepie/demo/for_the_demo/verdana.swf
 delete mode 100644 library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
 delete mode 100644 library/simplepie/demo/handler_image.php
 delete mode 100644 library/simplepie/demo/index.php
 delete mode 100644 library/simplepie/demo/minimalistic.php
 delete mode 100644 library/simplepie/demo/multifeeds.php
 delete mode 100644 library/simplepie/demo/test.php

diff --git a/library/simplepie/demo/cli_test.php b/library/simplepie/demo/cli_test.php
deleted file mode 100644
index ec933c5ad..000000000
--- a/library/simplepie/demo/cli_test.php
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/php
-<?php
-include_once('../simplepie.inc');
-
-// Parse it
-$feed = new SimplePie();
-if (isset($argv[1]) && $argv[1] !== '')
-{
-	$feed->set_feed_url($argv[1]);
-	$feed->enable_cache(false);
-	$feed->init();
-}
-
-$items = $feed->get_items();
-
-foreach ($items as $item)
-{
-	echo $item->get_title() . "\n";
-}
-
-var_dump($feed->get_item_quantity());
-
-?>
\ No newline at end of file
diff --git a/library/simplepie/demo/for_the_demo/alternate_favicon.png b/library/simplepie/demo/for_the_demo/alternate_favicon.png
deleted file mode 100644
index 063fb280549db7a68a47cce157d680ed7af1a8a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28621
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

diff --git a/library/simplepie/demo/for_the_demo/background_blockquote.png b/library/simplepie/demo/for_the_demo/background_blockquote.png
deleted file mode 100644
index 8267e23a23575eb148f8b8e3305732e6f09870de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27353
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

diff --git a/library/simplepie/demo/for_the_demo/background_menuitem.gif b/library/simplepie/demo/for_the_demo/background_menuitem.gif
deleted file mode 100644
index fa765d670e739793c2ec69e16e6be33618f5425f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmV+w0_y!oNk%w1VJrb00K@<Q|NsB~{{H>_{rvp=`}_O)`uh3#`S|$w_xJbq_V)Gl
z_4M@g^Yioa^78TV@$m5Q@9*#K?(XgF?d<IA>+9?4>gws~>FDU_=jZ3<=H}()<>ch#
z<KyGv;^F|AGXMYpA^8LV2LS&7EC2ui04xC<000I5ARvxpX`X1Ru59bRa4gSsZQppV
z?|kq7z@TtQEE<o<q;kn@I-k&}bV{vSuh^`1%k6r<;IMd1E}PHjw0g}J2j1{^drn`*
z?{I;B&llAHfHQb_eS8Clh=>G>j0Ay?kSK!zdx?sTj0KvTng*Vqk)eT;0hWlIou8@)
ztgQ&Iun3~Fb9sG@sI9EAunE4u2@1l)!nDR{c$S-=vA@K^3(?XG4As^R*bT?qV|S(l
zss_Hq*4NqC4(aL-?ClTS@Lq$Mx(CGB>+b9j{QVLC03`^FN03V&RI#S1O9wEZz=skh
zNSsKaV#R_OwIuoktem@u6DL?4S)ruK3Kmk5s?5l;%0^GX&h?vkQl-iZICJ8}z_TZY
zmO!Dr6z9uYyN4!o`t+Hhsnez!qDl=)l?ft_MXRxcX!EJmuTeLM9XpnT*{W!fT=g^z
z+f0cno02VSwys^X9rEf;%Qr^>Egk|39!$8f;lqd%D_+dFvE#>(BTJr4xw7TUm@{kM
X%(=7Y&!9t#9!<Km>C>o9hX4ROX5}q3

diff --git a/library/simplepie/demo/for_the_demo/background_menuitem_off.gif b/library/simplepie/demo/for_the_demo/background_menuitem_off.gif
deleted file mode 100644
index 236cf406dc2528b538ed078628f9f95e3240f9fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 533
zcmV+w0_y!oNk%w1VJrb00K@<Q|NsB~{{H>_{rvp=`}_O)`uh3#`S|$w_xJbq_V)Gl
z_4M@g^Yioa^78TV@$m5Q@9*#K?(XgF?d<IA>+9?4>gws~>FDU_=jZ3<=H}()<>ch#
z<KyGv;^H$iGXMYpA^8LV2LS&7EC2ui04xC<000I5ARvxpX`X1Ru59bRa4gSsZQppV
z?|kq7z@TtQEE<o<q;kn@I-k&}bV{vSuh^`1%k6r<;IMd1E}PHjw0g}J2j1{^drn`*
z?{I;B&llAHfHQb_eS8Clh=>G>j0Ay?kSK!zdx?sTj0KvTng*Vqk)eT;0hWlIou8@)
ztgQ&Iun3~Fb9sG@sI9EAunE4u2@1l)!nDR{c$S-=vA@K^3(?XG4As^R*bT?qV|S(l
zss_Hq*4NqC4(aL-?ClTS@Lq$Mx(CGB>+b9j{QVLC03`^FN03V&RI#S1O9wEZz=skh
zNSsKaV#R_OwIuoktem@u6DL?4S)ruK3Kmk5s?5l;%0^GX&h?vkQl-iZICJ8}z_TZY
zmO!Dr6z9uYyN4!o`t+Hhsnez!qDl=)l?ft_MXRxcX!EJmuTeLM9XpnT*{W!fT=g^z
z+f0cno02VSwys^X9rEf;%Qr^>Egk|39!$8f;lqd%D_+dFvE#>(BTJr4xw7TUm@{kM
X%(=7Y&!9t#9!<Km>C>o9hX4RO5uq&s

diff --git a/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif b/library/simplepie/demo/for_the_demo/background_menuitem_shadow.gif
deleted file mode 100644
index 95cfb820d47f717cc9ddd31d626d497e23f1a38a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmV<W00sX?Nk%w1VG00v0J8u9_4W1c?(XgF?d<IA>+9?4>gws~>FDU_=jZ3<=H}()
z<>ch#;^N}q;Naii-`(BaA^8LV2LS&7EC2ui015zj000E1@U2H>RW3WMn{UYnG9*Hl
z=drAdx*AEGz;S`xh>aV3?-RhFFgPe02Y`SwkX$;ON+^`MoJyZntTW4{cCB5nc&v?v
zuir9wYfih{V>Eobj-T)IX<1zFtM_|ye1C6bcy@V*b##Pqeua99jf0SEiI<3(i-D4r
zn2es9laZK@j-!^Mp{9nVsIFn0u&1G*w6~PFq^i1|bF#d-!n>@3#)r1UzG4voJBQbb
A?f?J)

diff --git a/library/simplepie/demo/for_the_demo/favicons/alternate.png b/library/simplepie/demo/for_the_demo/favicons/alternate.png
deleted file mode 100644
index 063fb280549db7a68a47cce157d680ed7af1a8a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28621
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

diff --git a/library/simplepie/demo/for_the_demo/favicons/blinklist.png b/library/simplepie/demo/for_the_demo/favicons/blinklist.png
deleted file mode 100644
index 53200b3c62c7a00e21fe30af69961eed389ff41f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4377
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
Tm7TM^00000NkvXXu0mjfB^P<7

diff --git a/library/simplepie/demo/for_the_demo/favicons/blogmarks.png b/library/simplepie/demo/for_the_demo/favicons/blogmarks.png
deleted file mode 100644
index c5372614a4a623d418be15ececf2768a87f70f29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3823
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

diff --git a/library/simplepie/demo/for_the_demo/favicons/delicious.png b/library/simplepie/demo/for_the_demo/favicons/delicious.png
deleted file mode 100644
index 2e6021d26e2d699ace681e80b4dff96eee0a5830..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3739
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
FV1i(EKivQT

diff --git a/library/simplepie/demo/for_the_demo/favicons/digg.png b/library/simplepie/demo/for_the_demo/favicons/digg.png
deleted file mode 100644
index 3aa96770e80ac18446c0254f37af3d75740cc415..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4004
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
KMNUMnLSTY_%g(I;

diff --git a/library/simplepie/demo/for_the_demo/favicons/magnolia.png b/library/simplepie/demo/for_the_demo/favicons/magnolia.png
deleted file mode 100644
index da519f5ab92d84c56d4e55f0c74f17d828391960..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4574
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
IM6N<$f?ZhTO8@`>

diff --git a/library/simplepie/demo/for_the_demo/favicons/myweb2.png b/library/simplepie/demo/for_the_demo/favicons/myweb2.png
deleted file mode 100644
index 2a12968d5ea10ae7b39e47855deb2040e35a5881..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4010
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
QS^xk507*qoM6N<$g7XK!pa1{>

diff --git a/library/simplepie/demo/for_the_demo/favicons/newsvine.png b/library/simplepie/demo/for_the_demo/favicons/newsvine.png
deleted file mode 100644
index 5cdbb31c69adf4c0a52bcb93193c7a1f9566c76c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3804
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
S>-qWs0000<MNUMnLSTYECtpnf

diff --git a/library/simplepie/demo/for_the_demo/favicons/reddit.png b/library/simplepie/demo/for_the_demo/favicons/reddit.png
deleted file mode 100644
index 65c38867cd74b61c1720017d13c95264b75d3500..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4239
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

diff --git a/library/simplepie/demo/for_the_demo/favicons/segnalo.png b/library/simplepie/demo/for_the_demo/favicons/segnalo.png
deleted file mode 100644
index 748149b3713b90ee4c3e8e8e85f73d743d0eec38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4116
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
Skr1f>0000<MNUMnLSTX@jQ1u0

diff --git a/library/simplepie/demo/for_the_demo/favicons/simpy.png b/library/simplepie/demo/for_the_demo/favicons/simpy.png
deleted file mode 100644
index 30b23c1a558369dd1feeaad81c2dca58b2af6bcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4256
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
CDMdU0

diff --git a/library/simplepie/demo/for_the_demo/favicons/spurl.png b/library/simplepie/demo/for_the_demo/favicons/spurl.png
deleted file mode 100644
index f5be3963dc0f2ca78e875cfccc5d021af76ba8d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3970
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

diff --git a/library/simplepie/demo/for_the_demo/favicons/technorati.png b/library/simplepie/demo/for_the_demo/favicons/technorati.png
deleted file mode 100644
index 0f19e824e614e7d56638174c33690d77606df22c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4087
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

diff --git a/library/simplepie/demo/for_the_demo/favicons/wists.png b/library/simplepie/demo/for_the_demo/favicons/wists.png
deleted file mode 100644
index 2e2d294d1ec6198f50c3a37253cc7252a2d4b3a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3974
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

diff --git a/library/simplepie/demo/for_the_demo/feed.png b/library/simplepie/demo/for_the_demo/feed.png
deleted file mode 100644
index e23c50c85b2fc311da507ea1a36b05c859477153..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt007q5
z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!T}ebiRCwBq
zlg(=rK^VrL*-cstQMY1@M6@fdv=u*E$e|!;3tqfvi+B(b+rOaZFQ_7(wKs1q^dN}P
z6a;V0NrX~tkXQ>+60z1wux?1B>3(E=W@nR>oP6QkosV~Z^E|V&0*rblG7hKyj7<|R
zpB~c<)A3vFRu=s_()x^_5#I9fB+Bb^NQ^=o902q=7S!4nA9z>D|LDWt0tlH9&YLs8
z#jznnPdxz&cY(cirJ#}Zwze*Sn1Hh);QbKANWE4yq65Rg<~`uZQ=r>ml?9ZRfL|HF
zw%TA+@fV0t?EaQ!YM$2tffqnI4@9{*KFS;i&eO_B0Z2Y11S<E#-18x#bm(aa0KqN}
zCyHs{^AxZ>&%ULAgFM@jEGG>GaYC5e0Jxn25xX4php5d2R%e0NXMy~41aX|Iu4V)2
zsD%J7aa;m+-|uio;=Xh6!~@{m3~+M|xV8x72wI*}kZ!^+K2jEJHDtRwG@BGuLumyb
zTq&n!lic+VK|k4Fd921#gm;;$HUMZ6paXxx3$jMZ3;ZIl#<&yDpp(9@^Dy6W=Soqn
zx-_k78w#Y4CV-a-x3lW-UXH1%IHmVb0v~2ozjwR|2+qKltp?x<CH4?9LI2y7{%KxS
z_T2)$WK{d8*#yY7S|Fv&moJoG89O;uw6Uc6(n>kBAmhRf%I^u9V)cH!U>vs1-eg7H
z^~7Zbka36$PtrooQe!67#W>#Iht0QNVdZm037{z~8ZjHE6IFC{@xDgT%IJZVch1r9
xZQ~TIqV&z5Nj^h}`kntTq@Q$Zp_KV2zyNZ!0q^m>#MuA<002ovPDHLkV1i)rMIQhF

diff --git a/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png b/library/simplepie/demo/for_the_demo/logo_simplepie_demo.png
deleted file mode 100644
index eda2d868b54949e2f4f7c12d21f0ae1f9052f0c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3047
zcmV<D3mEi?P)<h;3K|Lk000e1NJLTq008#@001or1^@s6aw+{900004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|A9O`nbW?9;ba!ELWdKcKV{&h8Wn^h#
zAVz6&Wp{6KYjYqtwP@0K0000MbVXQnLvm$dbZKvHAXI5>WdJZTFEBGNFg9|O{E`3w
z3p`0gK~#90?Ojic<H!~Ny(M@18??Vcdsyu;wB{NJ<2mNknoACWFrLH09ume43lruN
z4}s*^?o&=-JOl!Pz^GXmXjaSEpJ3%ru=ai2l|wzXOVTU-vuw+5{Xp2Re|j#}t9t*c
zL`o^NXwl;I@T)@;&~y+{4}b??31F&}3J*xmQGtkD04{(Ky6={Ur021L9_z|YL|p)V
z{<&02&4e<206u^YCoPmxy}b}v0Yo$aFa~gDBtKP3`3IoI18{95-6*BJebe!n@u*gA
zX4WBq0X7U9<pIC~nwdwuLJt$=&WNZlO#}_W5OK!d3OoT0E!j%|GXOKoiabjE9@Isb
z4LrH^E!j%|euJM~?T9fq{p5TE@IieYjO)A!{p9oj^q@twK7cNObN-Al1F+&xAAqmE
z4r&wQgq1|X8GuUwmqhf0X-=Xmq@5}}0I%~35z!4c6JmtqB-6p}@jkBr5iOu;o$Q{R
z!y>+N-@^sq(vQx$`X+c$wNd)f=|VHI3*Z@KCP^ZiaW4S8<aT@jHvp#Uo9c|tGkP9l
zC-In=*oLBga0y^QMD7u+jAsC@nO5)6#OxAZ#eUsCTpryypXtu&m1&Ib9FOjtDemzL
z?(rV?c!_)TjCRXjF79!Sd;Cmy&WP@usti|F5{V>;)P!;f{q;!D0Wf7z9?*Sg;&#vU
z<l&Mh{gXwUx!19)k2QX#PtJrs*_oU^Ieq%%jOml}3)Z;C8qX5#)NysO#%rd>rUT0K
zX^X9-hpqs;1Mrlu=lpvCV8VLjG*RbWnR}lw=9cs`Xi*+W_g$^3UQK8sO|>CrEvFxx
zEYo?2jln6hG$-}ueZdFtLj5`j^9mBt2(sSz#3n)#Q8zLYv93OVHpVo1Fc6Ust=5>R
zY%RC+-IY>m#4B`&v@ShYO7%J4gI3KZN~t8X*A5~|jbEh{u{(1LJzkTrj)P-IT<2bA
zmhJJC96X1B3*a;P&I{!RRR+y%)&n)IzifD!RJg}ULn*Z+q6yeOV&FW=hh7;EJ|QZl
zLLwRh_$Xu#pjEJwLtHHXa#U9rU+|v(=Xe$Vx6NJBq8vggkzJ0B0!uGRI{=^;ijzcA
z=br6AU*7d~P5;egaLLNvVO_jd5K)ha+^oUP`L1DjD$;JhO1*+@XVRMk+lp6-#w}?n
z0*T(t`x(!))PKr*UPZ=A7EMLUCB^b%4G+Ag|2U!gP2dZ8QW~IxEZn??g}{hO<j-Y&
z+~w;mQ4i2=yb-kM=OLl<5zz`-7aW?Z06)9|Unw<+h~@ysReZHZV2WqbY|>jth%Mh|
z0K*Nclo}m^76T#D{h9K=^Ta=dcH^4qqL17NQFev)qk2Q=g~mf7h>HL3oZC*RncPof
zvz`%jHGv)rDc+46)c);!#PNzLO8`&QZ_`FLA_^f}%wJ_0$%tr-v`+a{DdiK<67>aU
z+$yD9zUK%90!J9Jkj^}V8V?d5vSBI03P7LrREd_Wh)J0VBt7;i^k9tLM=3=Ht)*zm
zDDwcDLCwe?A;-8{FxcsxQfkQMhXDRsgua4^89;>)XbE!wZj!-IK`b}jWwwVhvZd#U
zI9Vc7oe@_ThIr<dsCUT&wkRgZW+p)YuSvo7vic|QK6TTw4Z6SsBNYjDdTFS2b$g2*
zT)oBwm^aqWAs8-`%)M*?lWudl^e-nBn80F`6hzTM+8=u;R1K&Y7SRWJFh0vG$G9k{
z*V*oyX?@-iEp?!bW#8Ko4Q9WLQG5}(O!iZfx%~z(=(bl<jE>+zww9i=_+1BHL5rj}
zLf*>Amx4gD81#ngT?u&|6q^{N;Gd{niJl^Dx<cBbz}C)P(6SYH)lRB3E9l^+S0!nh
zV-px9jk#OSm)Zppb$P<R6tZ7sv>T%-$=qQBm~;Ep`=3rqTr_rhNifB%%1}y;Sznq6
z*)t<wnoP1p+=)`kPa32O){T%{DOb>jJRh>!k|_;Xm;taGFn2~vO^}#%tdyFvT_!o{
zWUZ)EeqK|^Qp||+$IwQxB>EP57CeTgkR?vn{1Ibr^}Aq!;}^|=wJh?nc>Y1kLp&~e
z*9f<$E2$TG?i^Q0Hn(a@E3H%q&}x7W;Ik!vvPW9#gme$z_@1^#*W*qNE$LF*=0qXY
zi;aV?QrTbNHy}V|+e_-02p;6wvPt@P-H@2SYE)JS_9(^M0->&T(o!dyMpsWrn_0d`
zh<Sw4%zYYqw=4W{01si2o+bN&T^q-SypUi?BB?v3VUA+D@jhs&f|Qtj;A5fko@p*^
z5_3-*z?|D(8Q|4LGEM>c?y+M;m8h>W1N#F6KkI>Lse)d`dQF&=VlX4#QpYT*-v<l&
zhcm;8$6xc#rUBBv)(*7c?HE^Z8>H2;&pz@#%88^4Z1g=J+IUn(e65p~x)2I!E2gOn
zO;c(mRZ7kFyeB*?Q0Ae3<ulaQ7~{BiLKPhh9%RFihvQ=IDhDAvLvdfTiAjdlzACEH
zQWj+vtPYAt3hoPGnZjwY9Ee2oW44+XVs2h>B%gHW1V!_*Xo8U|LS3{-QiEh%Edtwt
z6^((&-0Eep!W!cSFlp7RjMdv#wpXH!Q^NwyVeVbi5>~8t2+xXJpiCHju^(-$Me`w!
z@1Vd?eH++(*%F#Eh_^vlq0TL|&OF1$Fcg}bG<fIHK9EaGO(+|5bA`<j&H$Q!hMw7H
zR_0dU1}plDGeQGS(kO{h$?}b}c;-MFpkak}vLfF0jh)kyp=O1)It}U{3Ay$IS?6Y`
z?}B%@$83w!OZR>G>bpSFp|jwYEPpU$M9_sfRsDJ?*$V!F?(168{f4f_c{;r`7GiZW
znHvDGhIb^!wI$Ya5Csv9d7o}Fy$kzF-$ZfUwWR0KDoH0+7tStDsWGs3S~8yV+z?|^
z8!>EdF5cL&Yge(<Pd&@`2(fXH`#K@@=U`5+9S_Y8&0GR-)m0$vlmVib9B99#553ZL
zp$C<8h{J*p0IZ$Riil=u+h&41=9co$js5`iV2L&?obel1c7aN?R6U`T<KTOcpR=iQ
z&X87lMmz>0Msu02XV8H=yYzAU0zIzfyIJP}h29mWu7VHrC&xoGeczg~zYjz)CNc9z
zuM5h<WP7q|#e`3jkq$TT^D6VnF)O4)EMLR!%iW0~^#HWk!Z;U+<C3OA*>l)mQM7AA
zvlu(hC(Z)$WEES0^Tl$8`aZaUeo;Y_MD!`v=-C*X;THXmj1`(^MC`zRYDrOAC-sn0
z3nqsq0O|b&Q^<Ry4+7rSDf!?pAumwxvX5EHyWyK)jx~BX{N|D+*6`Gu;JJEZ6~!Zz
zv4*bz436kM(l;f<)e*`K-d*aHBOH#F6@ceSBO2@8WhV7~gl89xl3YNrDU@Pv08np(
zm3kXIWkXwd0Hz*cjh=d2%qq?s;)}cn=oWhOgP&1m1^Z-?XWb09%$M$$_wXO$z<I)Q
zQ7j_s7WUOOEJB=x7Sv2j8O))_LC^N~6Lx(S87nJf_kGrcn>B`F`AlaXJ#$zVq}b`F
zRX{`M5_;C?ZPidVX3(?hRE=|2Y7y+`bg?nkbfE`oi1M2sb_UA{rY{iRR58WoeP&he
zF)-RQ`(Xxsa6(w6-D9W4ps9z=vCL7Q`{00<eY?)sGVdWSEi9qO?ZjGdTjqXf=#S0?
zHfJ~YYG~4j9>i1ix1ehL@6jRec;Xf<ilR2=jy3uR=Ny~aIGSx-p=gNs_CY-}{yk{g
z>t6SUmbqKhg`F^Wi|S~ZyG30nZBT2`qQ!BbW$qR&P82P3w`g&qXqmf3ixWl5+|5HW
pz~UC$y~Lo!BSmX1Z_(mJ@qc@qaLI98VlDsx002ovPDHLkV1fZ`uyFtY

diff --git a/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf b/library/simplepie/demo/for_the_demo/lucida-grande-bold.swf
deleted file mode 100644
index 0a41e15eb87253083c1233fbd9e4aff27d438082..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21159
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
K$o~KoWRaGA5MBiU

diff --git a/library/simplepie/demo/for_the_demo/mediaplayer.swf b/library/simplepie/demo/for_the_demo/mediaplayer.swf
deleted file mode 100644
index bf78fd919a3587c75fd5b2df7ef463a22636aa62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32008
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

diff --git a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm b/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
deleted file mode 100644
index 56e12c309..000000000
--- a/library/simplepie/demo/for_the_demo/mediaplayer_readme.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="0;url=http://www.jeroenwijering.com/extras/readme.html">
-</head>
-</html>
\ No newline at end of file
diff --git a/library/simplepie/demo/for_the_demo/mini_podcast.png b/library/simplepie/demo/for_the_demo/mini_podcast.png
deleted file mode 100644
index fd6faf2a318701ec923687afd472e5db89ffd651..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1202
zcmV;j1Wo&iP)<h;3K|Lk000e1NJLTq002Y)000vR1^@s6DVVGM00004b3#c}2nYxW
zd<bNS00009a7bBm000XT000XT0n*)m`~Uy|A9O`nbW?9;ba!ELWdKcKV{&h8Wn^h#
zAVz6&Wp{6KYjYqtwP@0K0000MbVXQnLvm$dbZKvHAXI5>WdJZSFEBGNFg8Pc<_`b>
z1P4h(K~z|U<(5%s8+9DVKbKs3UDGUUdPA;ewlJ|+hry<kiq0)#!o+Pl&66)HB1E6;
zgY>}%3F6bRK24+ral#N8EuCdZMQ9>}wTxzKK)a>7uEi{AZ5mtCw9DG&d`NQ1<ucjR
zY~vq}knivN`~H8w@BQxXFQ}@jUSGY%$I&mjem_EdBSGm>EOJ$1N6qbgWIx06^0Qd2
zR!k-n0758rQ$2d~J?g~TZBgi>#Fp1rIG6o^*PnichK2@ACKKk^+oC^_T_&DMfQoi0
z7P;!NO(9EU@is4{Tajg%nwlEK(Aq8H_siU?k%_PWKd^|rKzK4tb8|EG_4SDVmT+W`
zn<IPN)SK(Lu<!%%t;7R`cQO`@MoFbo0GQZ<!ljt=30rXfDL<E<=_R|R^6AW1oNx6L
zboCo}m2!6)mdRw;+}s2}WGnBKRCKSa=_F^A6TI{5Cwv_n2H=g!54rQwFp5~gWvMza
z$Qz<aGV!&NU^e$NG#{W~SWAt<#rdD`HNA=d_kNA49-q(&dan71r00mQC3G?GjUEOU
zMl13QdzZ#M*L(z%p$FoMBoljiM5pDw(Zj%VXAMo3?xC5nW;6ppR77L&fOS9LL@yIO
z*oXhOekNC@`M&*gc8gZRe^29&^lQQZo^c<+rF`+PP2d^#5%Y{_xFX5Kj^+Lr_>t8)
z;+cfT4|Mk74fQZMKdRFSboLqay`dfk+-G&TBIUjuLaal_E9gCp831B=P^pzUH*=B6
z!{1`J)HCG%jNaQ9*ezNCm|ctKp1<0naG<lVcsH*42qtnxlFfhO3VY-yuTivDoXDlj
ziZ+qLa0g1QY|t<8gy9a<Qzesg)n{n5RIkumrG9mW7!uOCgvpg@4$JKTJXyC-<6OEM
z%r%)V3VW{P@Ay6aW{qaMj#t=gX<c7vquE}J=W+G)1fDBCO+T0jq14L6ULDbR!cfk%
z_`QV2FYwCsN_(r+ufdS=;A}dk84~<6L`$6lz>o1UW8<RTAl!8MII$DOXWa9%k4S0`
zfWV>R9rup)FnD(q;g1ef?}UyYTr8WkbaB$u(`E0XJYUyGmf|!&gc$$=-?>#~m+_6;
zy1Rw<_rC>z|CfH2H&RsMRRh*Neu%EFE?h1bqSxVJU@>4wi2OB6_e8H=WVM3u4#)P+
zS&$?NQ4|3%z3V*5t_@4^uu_vxC_TVbDJHIidq%<ObYipFa)!LPubnR*@1}L-v29c6
zqrmpwv2bkc2@Wa;aJgJK91Z}4Y&NSVlS!tgrU-|_M59qMnGDswBuT>QbmDTkXlrZ3
z;cy@b0)m=bq|<4V$t0;%N;}tA^Abf7o6Uy9;lOIOA_xLN&XE7Owr#ck0iew8UF$dq
Q>i_@%07*qoM6N<$f^gwQSO5S3

diff --git a/library/simplepie/demo/for_the_demo/place_audio.png b/library/simplepie/demo/for_the_demo/place_audio.png
deleted file mode 100644
index 560ea0039310545ed1c4dcf7a1004abcd2b780af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 851
zcmV-Z1FZasP)<h;3K|Lk000e1NJLTq004pj000mO0ssI2RnIWu00003b3#c}2nYz<
z;ZNWI000SaNLh0L02}=P02}=Qm(d3{0000KbVXQnLvm$dbZKvHAXI5>WdJlUH7_tW
zlXA8~0000VbVXQnQ*UN;cVTj608L?Ia&K*AWNBd_Mrm?ocW-iQb09diXwrB900OH?
zL_t(oh3%KWPZMDn$3J(}f=ErHU?>n%8C+ZlR0kcn$-zjh0|O3XOe`yde?b2L`wuXX
zhJ_d%8euf16FM9Ts~z;>k5g1Ea?lD?UWfMDYwzt3VrUcF@AT&TJkR%i-uL_T?y4|9
z%G1wi{dCZL<OCbP2oEaUILF;VE}m|6N9~ID8J>Sp@v0pUT8T@&^mcg|>5)dYfeG!x
z#P-2%!b}=_W|MnsFAVpneERL?<5#2cYtiJl^|-N;xc(%1CDQ!f+6W#+<*b)9?0^Ls
z$ns!hDm<)dujZ29*S8O?@Y-W-Ak^wk{|g*J4h|p-8L(gn(vZbd$oK<54uE}(9n&yP
z0EJ**An`64?$;6@lc>-IAZGM@o${>UkeJqsYd0gNYvsFZoh21j)fgvPSLaw#?##L*
zpe%(Dh}jYYC=2p|_PD8_FAz_yCT_;&U&nyx*xcCp%kyh7?5CHA=tVgZ(UnD8I%`WR
zWrDSDT<U@Qgf(<(+bK<GT&fh!A!c-CIfOvm)0HKge5fmnA#!EcQrdbU1oDs*5*y;F
z)wmX&42%Qu)Cyo&roY=KtuIq|zh%;ng$JPEnNm0^`Kdu-UMZo9Nfl`|GD``|j)WWt
z`vH)($z2fk+OnheDV&ED_Z?%ND?~*^cV{*Ni4BHT_%8By`+~k9VEbS<VI-yXb$zbr
z)tO&+QY3s@vM&2+%B1A_mSbHUpu@_Bop3jwC*2zz<5~cz4S->plYw!+w=Zex;h?s$
z^|t5@)orgf3$@22A8n-Re;Kz1rQBrWn@as?v>$E<m>Q~J{a#-*6xsNZ%0HAkI9a^h
zRJb$5tw5_AX>YtRRW|oq-9_8uLq^5e<E!M4bO%jB%Hou&@MskMCxbnlk-x4xI6>?m
d@n(zJ;9uZFSmaT$)Vu%y002ovPDHLkV1g28gKhu-

diff --git a/library/simplepie/demo/for_the_demo/place_video.png b/library/simplepie/demo/for_the_demo/place_video.png
deleted file mode 100644
index be5ec8219eb952d55d581e40b104d8a74a58af2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36713
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
ATmS$7

diff --git a/library/simplepie/demo/for_the_demo/sIFR-print.css b/library/simplepie/demo/for_the_demo/sIFR-print.css
deleted file mode 100644
index ec89b1961..000000000
--- a/library/simplepie/demo/for_the_demo/sIFR-print.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*=:project
-    scalable Inman Flash Replacement (sIFR) version 3.
-
-  =:file
-    Copyright: 2006 Mark Wubben.
-    Author: Mark Wubben, <http://novemberborn.net/>
-
-  =:history
-    * IFR: Shaun Inman
-    * sIFR 1: Mike Davidson, Shaun Inman and Tomas Jogin
-    * sIFR 2: Mike Davidson, Shaun Inman, Tomas Jogin and Mark Wubben
-
-  =:license
-    This software is licensed and provided under the CC-GNU LGPL.
-    See <http://creativecommons.org/licenses/LGPL/2.1/>    
-*/
-
-
-/* This is the print stylesheet to hide the Flash headlines from the browser... regular browser text headlines will now print as normal */
-
-.sIFR-flash {
-	display: none !important;
-	height: 0;
-	width: 0;
-	position: absolute;
-	overflow: hidden;
-}
-
-.sIFR-alternate {
-	visibility: visible !important;
-	display: block !important;
-	position: static !important;
-	left: auto !important;
-	top: auto !important;
-}
\ No newline at end of file
diff --git a/library/simplepie/demo/for_the_demo/sIFR-screen.css b/library/simplepie/demo/for_the_demo/sIFR-screen.css
deleted file mode 100644
index 778e09d2b..000000000
--- a/library/simplepie/demo/for_the_demo/sIFR-screen.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*=:project
-    scalable Inman Flash Replacement (sIFR) version 3.
-
-  =:file
-    Copyright: 2006 Mark Wubben.
-    Author: Mark Wubben, <http://novemberborn.net/>
-
-  =:history
-    * IFR: Shaun Inman
-    * sIFR 1: Mike Davidson, Shaun Inman and Tomas Jogin
-    * sIFR 2: Mike Davidson, Shaun Inman, Tomas Jogin and Mark Wubben
-
-  =:license
-    This software is licensed and provided under the CC-GNU LGPL.
-    See <http://creativecommons.org/licenses/LGPL/2.1/>    
-*/
-
-/*---- sIFR ---*/
-.sIFR-flash {
-	visibility: visible !important;
-	margin: 0;
-	padding: 0;
-}
-
-.sIFR-replaced {
-	visibility: visible !important;
-}
-
-.sIFR-alternate {
-	position: absolute;
-	left: 0;
-	top: 0;
-	width: 0;
-	height: 0;
-	display: block;
-	overflow: hidden;
-}
-
-/*---- Header styling ---*/
diff --git a/library/simplepie/demo/for_the_demo/sifr-config.js b/library/simplepie/demo/for_the_demo/sifr-config.js
deleted file mode 100644
index e7066b361..000000000
--- a/library/simplepie/demo/for_the_demo/sifr-config.js
+++ /dev/null
@@ -1,40 +0,0 @@
-var yanone_kaffeesatz = {
-	src: './for_the_demo/yanone-kaffeesatz-bold.swf'
-};
-
-var lucida_grande = {
-	src: './for_the_demo/lucida-grande-bold.swf'
-};
-
-sIFR.activate(yanone_kaffeesatz);
-//sIFR.activate(lucida_grande);
-
-sIFR.replace(yanone_kaffeesatz, {
-//sIFR.replace(lucida_grande, {
-
-	selector: 'h3.header',
-	wmode: 'transparent',
-	css: {
-		'.sIFR-root': {
-			'text-align': 'center',
-			'color': '#000000',
-			'font-weight': 'bold',
-			'background-color': '#EEFFEE',
-
-			'font-size': '50px', // For Yanone Kaffeesatz
-			//'font-size': '40px', // For Lucida Grande
-
-			'letter-spacing': '0' // For Yanone Kaffeesatz
-			//'letter-spacing': '-4' // For Lucida Grande
-
-		},
-		'a': {
-			'text-decoration': 'none',
-			'color': '#000000'
-		},
-		'a:hover': {
-			'text-decoration': 'none',
-			'color': '#666666'
-		}
-	}
-});
diff --git a/library/simplepie/demo/for_the_demo/sifr.js b/library/simplepie/demo/for_the_demo/sifr.js
deleted file mode 100644
index 0a8b1b6dc..000000000
--- a/library/simplepie/demo/for_the_demo/sifr.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*=:project
-    scalable Inman Flash Replacement (sIFR) version 3, revision 245
-
-  =:file
-    Copyright: 2006 Mark Wubben.
-    Author: Mark Wubben, <http://novemberborn.net/>
-
-  =:history
-    * IFR: Shaun Inman
-    * sIFR 1: Mike Davidson, Shaun Inman and Tomas Jogin
-    * sIFR 2: Mike Davidson, Shaun Inman, Tomas Jogin and Mark Wubben
-
-  =:license
-    This software is licensed and provided under the CC-GNU LGPL.
-    See <http://creativecommons.org/licenses/LGPL/2.1/>    
-*/
-
-var parseSelector=(function(){var _1=/\s*,\s*/;var _2=/\s*([\s>+~(),]|^|$)\s*/g;var _3=/([\s>+~,]|[^(]\+|^)([#.:@])/g;var _4=/^[^\s>+~]/;var _5=/[\s#.:>+~()@]|[^\s#.:>+~()@]+/g;function parseSelector(_6,_7){_7=_7||document.documentElement;var _8=_6.split(_1),_9=[];for(var i=0;i<_8.length;i++){var _b=[_7],_c=toStream(_8[i]);for(var j=0;j<_c.length;){var _e=_c[j++],_f=_c[j++],_10="";if(_c[j]=="("){while(_c[j++]!=")"&&j<_c.length){_10+=_c[j]}_10=_10.slice(0,-1)}_b=select(_b,_e,_f,_10)}_9=_9.concat(_b)}return _9}function toStream(_11){var _12=_11.replace(_2,"$1").replace(_3,"$1*$2");if(_4.test(_12)){_12=" "+_12}return _12.match(_5)||[]}function select(_13,_14,_15,_16){return (_17[_14])?_17[_14](_13,_15,_16):[]}var _18={toArray:function(_19){var a=[];for(var i=0;i<_19.length;i++){a.push(_19[i])}return a}};var dom={isTag:function(_1d,tag){return (tag=="*")||(tag.toLowerCase()==_1d.nodeName.toLowerCase())},previousSiblingElement:function(_1f){do{_1f=_1f.previousSibling}while(_1f&&_1f.nodeType!=1);return _1f},nextSiblingElement:function(_20){do{_20=_20.nextSibling}while(_20&&_20.nodeType!=1);return _20},hasClass:function(_21,_22){return (_22.className||"").match("(^|\\s)"+_21+"(\\s|$)")},getByTag:function(tag,_24){return _24.getElementsByTagName(tag)}};var _17={"#":function(_25,_26){for(var i=0;i<_25.length;i++){if(_25[i].getAttribute("id")==_26){return [_25[i]]}}return []}," ":function(_28,_29){var _2a=[];for(var i=0;i<_28.length;i++){_2a=_2a.concat(_18.toArray(dom.getByTag(_29,_28[i])))}return _2a},">":function(_2c,_2d){var _2e=[];for(var i=0,_30;i<_2c.length;i++){_30=_2c[i];for(var j=0,_32;j<_30.childNodes.length;j++){_32=_30.childNodes[j];if(_32.nodeType==1&&dom.isTag(_32,_2d)){_2e.push(_32)}}}return _2e},".":function(_33,_34){var _35=[];for(var i=0,_37;i<_33.length;i++){_37=_33[i];if(dom.hasClass([_34],_37)){_35.push(_37)}}return _35},":":function(_38,_39,_3a){return (pseudoClasses[_39])?pseudoClasses[_39](_38,_3a):[]}};parseSelector.selectors=_17;parseSelector.pseudoClasses={};parseSelector.util=_18;parseSelector.dom=dom;return parseSelector})();
-var sIFR=new function(){var _3b=this;var _3c="sIFR-active";var _3d="sIFR-replaced";var _3e="sIFR-replacing";var _3f="sIFR-flash";var _40="sIFR-ignore";var _41="sIFR-alternate";var _42="sIFR-class";var _43="sIFR-layout";var _44=6;var _45=126;var _46=8;var _47="SIFR-PREFETCHED";var _48=[10,1.55,19,1.45,32,1.35,71,1.3,1.25];var _49=5;this.isActive=false;this.isEnabled=true;this.hideElements=true;this.preserveSingleWhitespace=false;this.fixWrap=true;this.fixHover=true;this.registerEvents=true;this.setPrefetchCookie=true;this.cookiePath="/";this.domains=[];this.fromLocal=true;this.forceClear=false;this.forceWidth=false;this.fitExactly=false;this.forceTextTransform=true;this.useDomContentLoaded=true;this.debugMode=false;this.hasFlashClassSet=false;this.delayCss=false;this.callbacks=[];var _4a=0;var _4b=false,_4c=false;var dom=new function(){var _4e="http://www.w3.org/1999/xhtml";this.getBody=function(){var _4f=document.getElementsByTagName("body");if(_4f.length==1){return _4f[0]}return null};this.addClass=function(_50,_51){if(_51){_51.className=((_51.className||"")==""?"":_51.className+" ")+_50}};this.removeClass=function(_52,_53){if(_53){_53.className=_53.className.replace(new RegExp("(^|\\s)"+_52+"(\\s|$)"),"").replace(/^\s+|(\s)\s+/g,"$1")}};this.hasClass=function(_54,_55){return new RegExp("(^|\\s)"+_54+"(\\s|$)").test(_55.className)};this.hasOneOfClassses=function(_56,_57){for(var i=0;i<_56.length;i++){if(this.hasClass(_56[i],_57)){return true}}return false};this.create=function(_59){if(document.createElementNS){return document.createElementNS(_4e,_59)}return document.createElement(_59)};this.setInnerHtml=function(_5a,_5b){if(ua.innerHtmlSupport){_5a.innerHTML=_5b}else{if(ua.xhtmlSupport){_5b=["<root xmlns=\"",_4e,"\">",_5b,"</root>"].join("");var xml=(new DOMParser()).parseFromString(_5b,"text/xml");xml=document.importNode(xml.documentElement,true);while(_5a.firstChild){_5a.removeChild(_5a.firstChild)}while(xml.firstChild){_5a.appendChild(xml.firstChild)}}}};this.nodeFromHtml=function(_5d){var _5e=this.create("div");_5e.innerHTML=_5d;return _5e.firstChild};this.getComputedStyle=function(_5f,_60){var _61;if(document.defaultView&&document.defaultView.getComputedStyle){_61=document.defaultView.getComputedStyle(_5f,null)[_60]}else{if(_5f.currentStyle){_61=_5f.currentStyle[_60]}}return _61||""};this.getStyleAsInt=function(_62,_63,_64){var _65=this.getComputedStyle(_62,_63);if(_64&&!/px$/.test(_65)){return 0}_65=parseInt(_65);return isNaN(_65)?0:_65};this.getZoom=function(){return _66.zoom.getLatest()}};this.dom=dom;var ua=new function(){var ua=navigator.userAgent.toLowerCase();var _69=(navigator.product||"").toLowerCase();this.macintosh=ua.indexOf("mac")>-1;this.windows=ua.indexOf("windows")>-1;this.quicktime=false;this.opera=ua.indexOf("opera")>-1;this.konqueror=_69.indexOf("konqueror")>-1;this.ie=false/*@cc_on || true @*/;this.ieSupported=this.ie&&!/ppc|smartphone|iemobile|msie\s5\.5/.test(ua)/*@cc_on && @_jscript_version >= 5.5 @*/;this.ieWin=this.ie&&this.windows/*@cc_on && @_jscript_version >= 5.1 @*/;this.windows=this.windows&&(!this.ie||this.ieWin);this.ieMac=this.ie&&this.macintosh/*@cc_on && @_jscript_version < 5.1 @*/;this.macintosh=this.macintosh&&(!this.ie||this.ieMac);this.safari=ua.indexOf("safari")>-1;this.webkit=ua.indexOf("applewebkit")>-1&&!this.konqueror;this.khtml=this.webkit||this.konqueror;this.gecko=!this.webkit&&_69=="gecko";this.operaVersion=this.opera&&/.*opera(\s|\/)(\d+\.\d+)/.exec(ua)?parseInt(RegExp.$2):0;this.webkitVersion=this.webkit&&/.*applewebkit\/(\d+).*/.exec(ua)?parseInt(RegExp.$1):0;this.geckoBuildDate=this.gecko&&/.*gecko\/(\d{8}).*/.exec(ua)?parseInt(RegExp.$1):0;this.konquerorVersion=this.konqueror&&/.*konqueror\/(\d\.\d).*/.exec(ua)?parseInt(RegExp.$1):0;this.flashVersion=0;if(this.ieWin){var axo;var _6b=false;try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7")}catch(e){try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");this.flashVersion=6;axo.AllowScriptAccess="always"}catch(e){_6b=this.flashVersion==6}if(!_6b){try{axo=new ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch(e){}}}if(!_6b&&axo){this.flashVersion=parseFloat(/([\d,?]+)/.exec(axo.GetVariable("$version"))[1].replace(/,/g,"."))}}else{if(navigator.plugins&&navigator.plugins["Shockwave Flash"]){var _6c=navigator.plugins["Shockwave Flash"];this.flashVersion=parseFloat(/(\d+\.?\d*)/.exec(_6c.description)[1]);var i=0;while(this.flashVersion>=_46&&i<navigator.mimeTypes.length){var _6e=navigator.mimeTypes[i];if(_6e.type=="application/x-shockwave-flash"&&_6e.enabledPlugin.description.toLowerCase().indexOf("quicktime")>-1){this.flashVersion=0;this.quicktime=true}i++}}}this.flash=this.flashVersion>=_46;this.transparencySupport=this.macintosh||this.windows;this.computedStyleSupport=this.ie||document.defaultView&&document.defaultView.getComputedStyle&&(!this.gecko||this.geckoBuildDate>=20030624);this.css=true;if(this.computedStyleSupport){try{var _6f=document.getElementsByTagName("head")[0];_6f.style.backgroundColor="#FF0000";var _70=dom.getComputedStyle(_6f,"backgroundColor");this.css=!_70||/\#F{2}0{4}|rgb\(255,\s?0,\s?0\)/i.test(_70);_6f.style.backgroundColor="";_6f=null}catch(e){}}this.xhtmlSupport=!!window.DOMParser&&!!document.importNode;try{var n=dom.create("span");if(!this.ieMac){n.innerHTML="x"}this.innerHtmlSupport=n.innerHTML=="x"}catch(e){this.innerHtmlSupport=false}this.zoomSupport=!!(this.opera&&document.documentElement);this.geckoXml=this.gecko&&(document.contentType||"").indexOf("xml")>-1;this.requiresPrefetch=this.ieWin||this.khtml;this.verifiedKonqueror=false;this.supported=this.flash&&this.css&&(!this.ie||this.ieSupported)&&(!this.opera||this.operaVersion>=8)&&(!this.webkit||this.webkitVersion>=412)&&(!this.konqueror||this.konquerorVersion>3.5)&&this.computedStyleSupport&&(this.innerHtmlSupport||!this.khtml&&this.xhtmlSupport)};this.ua=ua;var _72=new function(){var _73={leading:true,"margin-left":true,"margin-right":true,"text-indent":true};var _74=" ";function capitalize($){return $.toUpperCase()}this.normalize=function(str){if(_3b.preserveSingleWhitespace){return str.replace(/\s/g,_74)}return str.replace(/(\s)\s+/g,"$1").replace(/\xA0/,_74)};this.textTransform=function(_77,str){switch(_77){case "uppercase":str=str.toUpperCase();break;case "lowercase":str=str.toLowerCase();break;case "capitalize":var _79=str;str=str.replace(/^\w|\s\w/g,capitalize);if(str.indexOf("function capitalize")!=-1){var _7a=_79.replace(/(^|\s)(\w)/g,"$1$1$2$2").split(/^\w|\s\w/g);str="";for(var i=0;i<_7a.length;i++){str+=_7a[i].charAt(0).toUpperCase()+_7a[i].substring(1)}}break}return str};this.toHexString=function(str){if(typeof (str)!="string"||!str.charAt(0)=="#"||str.length!=4&&str.length!=7){return str}str=str.replace(/#/,"");if(str.length==3){str=str.replace(/(.)(.)(.)/,"$1$1$2$2$3$3")}return "0x"+str};this.toJson=function(obj){var _7e="";switch(typeof (obj)){case "string":_7e="\""+obj+"\"";break;case "number":case "boolean":_7e=obj.toString();break;case "object":_7e=[];for(var _7f in obj){if(obj[_7f]==Object.prototype[_7f]){continue}_7e.push("\""+_7f+"\":"+_72.toJson(obj[_7f]))}_7e="{"+_7e.join(",")+"}";break}return _7e};this.convertCssArg=function(arg){if(!arg){return {}}if(typeof (arg)=="object"){if(arg.constructor==Array){arg=arg.join("")}else{return arg}}var obj={};var _82=arg.split("}");for(var i=0;i<_82.length;i++){var $=_82[i].match(/([^\s{]+)\s*\{(.+)\s*;?\s*/);if(!$||$.length!=3){continue}if(!obj[$[1]]){obj[$[1]]={}}var _85=$[2].split(";");for(var j=0;j<_85.length;j++){var $2=_85[j].match(/\s*([^:\s]+)\s*\:\s*([^\s;]+)/);if(!$2||$2.length!=3){continue}obj[$[1]][$2[1]]=$2[2]}}return obj};this.extractFromCss=function(css,_89,_8a,_8b){var _8c=null;if(css&&css[_89]&&css[_89][_8a]){_8c=css[_89][_8a];if(_8b){delete css[_89][_8a]}}return _8c};this.cssToString=function(arg){var css=[];for(var _8f in arg){var _90=arg[_8f];if(_90==Object.prototype[_8f]){continue}css.push(_8f,"{");for(var _91 in _90){if(_90[_91]==Object.prototype[_91]){continue}var _92=_90[_91];if(_73[_91]){_92=parseInt(_92,10)}css.push(_91,":",_92,";")}css.push("}")}return escape(css.join(""))};this.bind=function(_93,_94){return function(){_93[_94].apply(_93,arguments)}}};this.util=_72;var _66={};_66.fragmentIdentifier=new function(){this.fix=true;var _95;this.cache=function(){_95=document.title};function doFix(){document.title=_95}this.restore=function(){if(this.fix){setTimeout(doFix,0)}}};_66.synchronizer=new function(){this.isBlocked=false;this.block=function(){this.isBlocked=true};this.unblock=function(){this.isBlocked=false;_96.replaceAll()}};_66.zoom=new function(){var _97=100;this.getLatest=function(){return _97};if(ua.zoomSupport&&ua.opera){var _98=document.createElement("div");_98.style.position="fixed";_98.style.left="-65536px";_98.style.top="0";_98.style.height="100%";_98.style.width="1px";_98.style.zIndex="-32";document.documentElement.appendChild(_98);function updateZoom(){if(!_98){return}var _99=window.innerHeight/_98.offsetHeight;var _9a=Math.round(_99*100)%10;if(_9a>5){_99=Math.round(_99*100)+10-_9a}else{_99=Math.round(_99*100)-_9a}_97=isNaN(_99)?100:_99;_66.synchronizer.unblock();document.documentElement.removeChild(_98);_98=null}_66.synchronizer.block();setTimeout(updateZoom,54)}};this.hacks=_66;var _9b={kwargs:[],replaceAll:function(){for(var i=0;i<this.kwargs.length;i++){_3b.replace(this.kwargs[i])}this.kwargs=[]}};var _96={kwargs:[],replaceAll:_9b.replaceAll};function isValidDomain(){if(_3b.domains.length==0){return true}var _9d="";try{_9d=document.domain}catch(e){}if(_3b.fromLocal&&sIFR.domains[0]!="localhost"){sIFR.domains.unshift("localhost")}for(var i=0;i<_3b.domains.length;i++){var _9f=_3b.domains[i];if(_9f=="*"||_9f==_9d){return true}var _a0=_9f.lastIndexOf("*");if(_a0>-1){_9f=_9f.substr(_a0+1);var _a1=_9d.lastIndexOf(_9f);if(_a1>-1&&(_a1+_9f.length)==_9d.length){return true}}}return false}this.activate=function(){if(!ua.supported||!this.isEnabled||this.isActive||!isValidDomain()){return}if(arguments.length>0){this.prefetch.apply(this,arguments)}this.isActive=true;if(this.hideElements){this.setFlashClass()}if(ua.ieWin&&_66.fragmentIdentifier.fix&&window.location.hash!=""){_66.fragmentIdentifier.cache()}else{_66.fragmentIdentifier.fix=false}if(!this.registerEvents){return}function handler(evt){_3b.initialize();if(evt&&evt.type=="load"){if(document.removeEventListener){document.removeEventListener("DOMContentLoaded",handler,false)}if(window.removeEventListener){window.removeEventListener("load",handler,false)}}}if(window.addEventListener){if(_3b.useDomContentLoaded&&ua.gecko){document.addEventListener("DOMContentLoaded",handler,false)}window.addEventListener("load",handler,false)}else{if(ua.ieWin){if(_3b.useDomContentLoaded){document.write("<scr"+"ipt id=__sifr_ie_onload defer src=//:></script>");document.getElementById("__sifr_ie_onload").onreadystatechange=function(){if(this.readyState=="complete"){handler();this.removeNode()}}}window.attachEvent("onload",handler)}}};this.setFlashClass=function(){if(this.hasFlashClassSet){return}dom.addClass(_3c,dom.getBody()||document.documentElement);this.hasFlashClassSet=true};this.removeFlashClass=function(){if(!this.hasFlashClassSet){return}dom.removeClass(_3c,dom.getBody());dom.removeClass(_3c,document.documentElement);this.hasFlashClassSet=false};this.initialize=function(){if(_4c||!this.isActive||!this.isEnabled){return}_4c=true;_9b.replaceAll();clearPrefetch()};function getSource(src){if(typeof (src)!="string"){if(src.src){src=src.src}if(typeof (src)!="string"){var _a4=[];for(var _a5 in src){if(src[_a5]!=Object.prototype[_a5]){_a4.push(_a5)}}_a4.sort().reverse();var _a6="";var i=-1;while(!_a6&&++i<_a4.length){if(parseFloat(_a4[i])<=ua.flashVersion){_a6=src[_a4[i]]}}src=_a6}}if(!src&&_3b.debugMode){throw new Error("sIFR: Could not determine appropriate source")}if(ua.ie&&src.charAt(0)=="/"){src=window.location.toString().replace(/([^:]+)(:\/?\/?)([^\/]+).*/,"$1$2$3")+src}return src}this.prefetch=function(){if(!ua.requiresPrefetch||!ua.supported||!this.isEnabled||!isValidDomain()){return}if(this.setPrefetchCookie&&new RegExp(";?"+_47+"=true;?").test(document.cookie)){return}try{_4b=true;if(ua.ieWin){prefetchIexplore(arguments)}else{prefetchLight(arguments)}if(this.setPrefetchCookie){document.cookie=_47+"=true;path="+this.cookiePath}}catch(e){if(_3b.debugMode){throw e}}};function prefetchIexplore(_a8){for(var i=0;i<_a8.length;i++){document.write("<script defer type=\"sifr/prefetch\" src=\""+getSource(_a8[i])+"\"></script>")}}function prefetchLight(_aa){for(var i=0;i<_aa.length;i++){new Image().src=getSource(_aa[i])}}function clearPrefetch(){if(!ua.ieWin||!_4b){return}try{var _ac=document.getElementsByTagName("script");for(var i=_ac.length-1;i>=0;i--){var _ae=_ac[i];if(_ae.type=="sifr/prefetch"){_ae.parentNode.removeChild(_ae)}}}catch(e){}}function getRatio(_af,_b0){for(var i=0;i<_b0.length;i+=2){if(_af<=_b0[i]){return _b0[i+1]}}return _b0[_b0.length-1]}function getFilters(obj){var _b3=[];for(var _b4 in obj){if(obj[_b4]==Object.prototype[_b4]){continue}var _b5=obj[_b4];_b4=[_b4.replace(/filter/i,"")+"Filter"];for(var _b6 in _b5){if(_b5[_b6]==Object.prototype[_b6]){continue}_b4.push(_b6+":"+escape(_72.toJson(_72.toHexString(_b5[_b6]))))}_b3.push(_b4.join(","))}return _b3.join(";")}function calculate(_b7){var _b8,_b9;if(!ua.ie){_b8=dom.getStyleAsInt(_b7,"lineHeight");_b9=Math.floor(dom.getStyleAsInt(_b7,"height")/_b8)}else{if(ua.ie){var _ba=_b7.innerHTML;_b7.style.visibility="visible";_b7.style.overflow="visible";_b7.style.position="static";_b7.style.zoom="normal";_b7.style.writingMode="lr-tb";_b7.style.width=_b7.style.height="auto";_b7.style.maxWidth=_b7.style.maxHeight=_b7.style.styleFloat="none";var _bb=_b7;var _bc=_b7.currentStyle.hasLayout;if(_bc){dom.setInnerHtml(_b7,"<div class=\""+_43+"\">X<br />X<br />X</div>");_bb=_b7.firstChild}else{dom.setInnerHtml(_b7,"X<br />X<br />X")}var _bd=_bb.getClientRects();_b8=_bd[1].bottom-_bd[1].top;_b8=Math.ceil(_b8*0.8);if(_bc){dom.setInnerHtml(_b7,"<div class=\""+_43+"\">"+_ba+"</div>");_bb=_b7.firstChild}else{dom.setInnerHtml(_b7,_ba)}_bd=_bb.getClientRects();_b9=_bd.length;if(_bc){dom.setInnerHtml(_b7,_ba)}_b7.style.visibility=_b7.style.width=_b7.style.height=_b7.style.maxWidth=_b7.style.maxHeight=_b7.style.overflow=_b7.style.styleFloat=_b7.style.position=_b7.style.zoom=_b7.style.writingMode=""}}return {lineHeight:_b8,lines:_b9}}this.replace=function(_be,_bf){if(!ua.supported){return}if(_bf){for(var _c0 in _be){if(typeof (_bf[_c0])=="undefined"){_bf[_c0]=_be[_c0]}}_be=_bf}if(!_4c){return _9b.kwargs.push(_be)}if(_66.synchronizer.isBlocked){return _96.kwargs.push(_be)}var _c1=_be.elements;if(!_c1&&parseSelector){_c1=parseSelector(_be.selector)}if(_c1.length==0){return}this.setFlashClass();var src=getSource(_be.src);var css=_72.convertCssArg(_be.css);var _c4=getFilters(_be.filters);var _c5=(_be.forceClear==null)?_3b.forceClear:_be.forceClear;var _c6=(_be.fitExactly==null)?_3b.fitExactly:_be.fitExactly;var _c7=_c6||(_be.forceWidth==null?_3b.forceWidth:_be.forceWidth);var _c8=parseInt(_72.extractFromCss(css,".sIFR-root","leading"))||0;var _c9=_72.extractFromCss(css,".sIFR-root","font-size",true)||0;var _ca=_72.extractFromCss(css,".sIFR-root","background-color",true)||"#FFFFFF";var _cb=_72.extractFromCss(css,".sIFR-root","kerning",true)||"";var _cc=_be.gridFitType||_72.extractFromCss(css,".sIFR-root","text-align")=="right"?"subpixel":"pixel";var _cd=_3b.forceTextTransform?_72.extractFromCss(css,".sIFR-root","text-transform",true)||"none":"none";var _ce=_72.extractFromCss(css,".sIFR-root","opacity",true)||"100";var _cf=_be.pixelFont||false;var _d0=_be.ratios||_48;if(parseInt(_c9).toString()!=_c9&&_c9.indexOf("px")==-1){_c9=0}else{_c9=parseInt(_c9)}if(parseFloat(_ce)<1){_ce=100*parseFloat(_ce)}var _d1=null;var _d2="";if(_c6){_72.extractFromCss(css,".sIFR-root","text-align",true)}if(!_be.modifyCss){_d2=_72.cssToString(css);_d1=_3b.fixHover&&_d2.indexOf("%3Ahover")>-1}var _d3=!ua.opera&&_3b.delayCss;var _d4=_be.wmode||"";if(!_d4){if(_be.transparent){_d4="transparent"}else{if(_be.opaque){_d4="opaque"}}}if(_d4=="transparent"){if(!ua.transparencySupport){_d4="opaque"}else{_ca="transparent"}}for(var i=0;i<_c1.length;i++){var _d6=_c1[i];if(!ua.verifiedKonqueror){if(dom.getComputedStyle(_d6,"lineHeight").match(/e\+08px/)){ua.supported=_3b.isEnabled=false;this.removeFlashClass();return}ua.verifiedKonqueror=true}if(dom.hasOneOfClassses([_3d,_3e,_40,_41],_d6)){continue}var _d7=_d6.offsetHeight;var _d8=_d6.offsetWidth;var _d9=dom.getComputedStyle(_d6,"display");if(!_d7||!_d8||_d9==null||_d9=="none"){continue}if(_c5&&ua.gecko){_d6.style.clear="both"}var _da=null;if(_3b.fixWrap&&ua.ie&&_d9=="block"){_da=_d6.innerHTML;dom.setInnerHtml(_d6,"X")}_d8=dom.getStyleAsInt(_d6,"width",ua.ie);if(_d8==0){var _db=dom.getStyleAsInt(_d6,"paddingRight",true);var _dc=dom.getStyleAsInt(_d6,"paddingLeft",true);var _dd=dom.getStyleAsInt(_d6,"borderRightWidth",true);var _de=dom.getStyleAsInt(_d6,"borderLeftWidth",true);_d8=_d6.offsetWidth-_dc-_db-_de-_dd}if(_da&&_3b.fixWrap&&ua.ie){dom.setInnerHtml(_d6,_da)}var _df,_e0;if(!_c9){var _e1=calculate(_d6);_df=Math.min(_45,Math.max(_44,_e1.lineHeight));if(_cf){_df=Math.max(8,8*Math.round(_df/8))}_e0=_e1.lines;if(isNaN(_e0)||!isFinite(_e0)||_e0==0){_e0=1}if(_e0>1&&_c8){_d7+=Math.round((_e0-1)*_c8)}}else{_df=_c9;_e0=1}_d7=Math.round(_e0*_df);if(_c5&&ua.gecko){_d6.style.clear=""}var _e2=dom.create("span");_e2.className=_41;var _e3=_d6.cloneNode(true);for(var j=0,l=_e3.childNodes.length;j<l;j++){_e2.appendChild(_e3.childNodes[j].cloneNode(true))}if(_be.modifyContent){_be.modifyContent(_e3,_be.selector)}if(_be.modifyCss){_d2=_be.modifyCss(css,_e3,_be.selector)}if(_d1==null){_d1=_3b.fixHover&&_d2.indexOf("%3Ahover")>-1}var _e6=handleContent(_e3,_cd);if(_be.modifyContentString){_e6=_be.modifyContentString(_e6,_be.selector)}if(_e6==""){continue}var _e7=["content="+_e6,"width="+_d8,"height="+_d7,"fitexactly="+(_c6?"true":""),"tunewidth="+(_be.tuneWidth||""),"tuneheight="+(_be.tuneHeight||""),"offsetleft="+(_be.offsetLeft||""),"offsettop="+(_be.offsetTop||""),"thickness="+(_be.thickness||""),"sharpness="+(_be.sharpness||""),"kerning="+_cb,"gridfittype="+_cc,"zoomsupport="+ua.zoomSupport,"flashfilters="+_c4,"opacity="+_ce,"blendmode="+(_be.blendMode||""),"size="+_df,"zoom="+dom.getZoom(),"css="+_d2,"selectable="+(_be.selectable==null?"true":_be.selectable),"lines="+_e0];var _e8=encodeURI(_e7.join("&amp;"));var _e9="sIFR_callback_"+_4a++;var _ea=new CallbackInfo(_e9,_e7,_be.onReplacement,_d1);window[_e9+"_DoFSCommand"]=(function(_eb){return function(_ec,arg){_eb.handle(_ec,arg)}})(_ea);_d7=Math.round(_e0*getRatio(_df,_d0)*_df)+_49;var _ee=_c7?_d8:"100%";var _ef;if(ua.ie){_ef=["<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" id=\"",_e9,"\" sifr=\"true\" width=\"",_ee,"\" height=\"",_d7,"\" class=\"",_3f,"\">","<param name=\"movie\" value=\"",src,"\"></param>","<param name=\"flashvars\" value=\"",_e8,"\"></param>","<param name=\"allowScriptAccess\" value=\"always\"></param>","<param name=\"quality\" value=\"best\"></param>","<param name=\"wmode\" value=\"",_d4,"\"></param>","<param name=\"bgcolor\" value=\"",_ca,"\"></param>","<param name=\"name\" value=\"",_e9,"\"></param>","</object>","<scr","ipt event=FSCommand(info,args) for=",_e9,">",_e9,"_DoFSCommand(info, args);","</","script>"].join("")}else{_ef=["<embed type=\"application/x-shockwave-flash\"",(_d3?" class=\""+_3f+"\"":"")," src=\"",src,"\" quality=\"best\" flashvars=\"",_e8,"\" width=\"",_ee,"\" height=\"",_d7,"\" wmode=\"",_d4,"\" bgcolor=\"",_ca,"\" name=\"",_e9,"\" id=\"",_e9,"\" allowScriptAccess=\"always\" sifr=\"true\"></embed>"].join("")}dom.setInnerHtml(_d6,_ef);_ea.flashNode=_d6.firstChild;_ea.html=_ef;_3b.callbacks.push(_ea);if(_be.selector){if(!_3b.callbacks[_be.selector]){_3b.callbacks[_be.selector]=[_ea]}else{_3b.callbacks[_be.selector].push(_ea)}}_d6.appendChild(_e2);dom.addClass(_d3?_3e:_3d,_d6);_ea.setupFixHover()}_66.fragmentIdentifier.restore()};this.getCallbackByFlashElement=function(_f0){for(var i=0;i<_3b.callbacks.length;i++){if(_3b.callbacks[i].id==_f0.getAttribute("id")){return _3b.callbacks[i]}}};function handleContent(_f2,_f3){var _f4=[],_f5=[];var _f6=_f2.childNodes;var i=0;while(i<_f6.length){var _f8=_f6[i];if(_f8.nodeType==3){var _f9=_72.normalize(_f8.nodeValue);_f9=_72.textTransform(_f3,_f9);_f5.push(_f9.replace(/\%/g,"%25").replace(/\&/g,"%26").replace(/\,/g,"%2C").replace(/\+/g,"%2B"))}if(_f8.nodeType==1){var _fa=[];var _fb=_f8.nodeName.toLowerCase();var _fc=_f8.className||"";if(/\s+/.test(_fc)){if(_fc.indexOf(_42)>-1){_fc=_fc.match("(\\s|^)"+_42+"-([^\\s$]*)(\\s|$)")[2]}else{_fc=_fc.match(/^([^\s]+)/)[1]}}if(_fc!=""){_fa.push("class=\""+_fc+"\"")}if(_fb=="a"){var _fd=_f8.getAttribute("href")||"";var _fe=_f8.getAttribute("target")||"";_fa.push("href=\""+_fd+"\"","target=\""+_fe+"\"")}_f5.push("<"+_fb+(_fa.length>0?" ":"")+escape(_fa.join(" "))+">");if(_f8.hasChildNodes()){_f4.push(i);i=0;_f6=_f8.childNodes;continue}else{if(!/^(br|img)$/i.test(_f8.nodeName)){_f5.push("</",_f8.nodeName.toLowerCase(),">")}}}if(_f4.length>0&&!_f8.nextSibling){do{i=_f4.pop();_f6=_f8.parentNode.parentNode.childNodes;_f8=_f6[i];if(_f8){_f5.push("</",_f8.nodeName.toLowerCase(),">")}}while(i==_f6.length-1&&_f4.length>0)}i++}return _f5.join("").replace(/\n|\r/g,"")}function CallbackInfo(id,vars,_101,_102){this.id=id;this.vars=vars;this._replacementHandler=_101;this._firedReplacementEvent=!(this._replacementHandler!=null);this._fixHover=_102;this._setClasses=!_3b.delayCss;this.html="";this._pings=0}CallbackInfo.prototype.getFlashElement=function(){return document.getElementById(this.id)};CallbackInfo.prototype.handle=function(info,arg){if(/(FSCommand\:)?resize/.test(info)){var _105=this.getFlashElement();var $=arg.split(/\:|,/);_105.setAttribute($[0],$[1]);if($.length>2){_105.setAttribute($[2],$[3])}if(!this._setClasses){if(!ua.ie&&!ua.opera){dom.addClass(_3f,_105)}dom.removeClass(_3e,_105.parentNode);dom.addClass(_3d,_105.parentNode);this._setClasses=true}if(ua.khtml){var _107=_105.offsetHeight}if(!this._firedReplacementEvent){this._replacementHandler(this);this._firedReplacementEvent=true}}else{if(/(FSCommand\:)?resetmovie/.test(info)){this.resetMovie()}else{if(/(FSCommand\:)?ping/.test(info)){if(this._pings>0){this.setupFixHover()}this._pings++}else{if(this.debugHandler&&/(FSCommand\:)?debug/.test(info)){this.debugHandler(info,arg)}}}}};CallbackInfo.prototype.call=function(type,_109){var _10a=this.getFlashElement();if(!_10a){return}_10a.SetVariable("callbackType",type);_10a.SetVariable("callbackValue",_109);_10a.SetVariable("callbackTrigger",true)};CallbackInfo.prototype.replaceText=function(_10b){_10b=escape(_10b);this.call("replacetext",_10b);this.vars[0]="content="+_10b;this.html=this.html.replace(/(flashvars(=|\"\svalue=)\")[^\"]+/,"$1"+encodeURI(this.vars.join("&amp;")))};CallbackInfo.prototype.resetMovie=function(){var _10c=this.getFlashElement();var node=_10c.parentNode;node.replaceChild(dom.nodeFromHtml(this.html),_10c);this.setupFixHover()};CallbackInfo.prototype.setupFixHover=function(){var _10e=this.getFlashElement();if(!this._fixHover||!_10e){return}var node=_10e.parentNode;if(node.addEventListener){node.addEventListener("mouseout",_72.bind(this,"fixHover"),false)}else{if(node.attachEvent){node.attachEvent("onmouseout",_72.bind(this,"fixHover"))}}};CallbackInfo.prototype.fixHover=function(){this.call("resettext")}};
\ No newline at end of file
diff --git a/library/simplepie/demo/for_the_demo/simplepie.css b/library/simplepie/demo/for_the_demo/simplepie.css
deleted file mode 100644
index 3753cb96d..000000000
--- a/library/simplepie/demo/for_the_demo/simplepie.css
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
-Theme Name: SimplePie
-Theme URI: http://simplepie.org
-Description: A simple, yet beautiful theme inspired by several cleanly designed websites.
-Version: 1.4
-Author: Ryan Parman
-Author URI: http://skyzyx.com
-Updated: 21 June 2007
-*/
-
-
-/*********************************************
-HYPERLINK STYLES
-*********************************************/
-a {
-	color:#369;
-	text-decoration:underline;
-	padding:0 1px;
-}
-
-a:hover {
-	color:#fff !important;
-	background-color:#333;
-	text-decoration:none;
-	padding:0 1px;
-}
-
-a.nohover {
-	text-decoration:none;
-	border:none;
-}
-
-a.nohover:hover {
-	background-color:transparent;
-	border:none;
-}
-
-a.namelink {
-	padding:0;
-	margin:0;
-	overflow:hidden;
-	height:1px;
-}
-
-h4 a,
-.sample_feeds a {
-	color:#000;
-}
-
-
-/*********************************************
-GENERAL STYLES
-*********************************************/
-body {
-	/*font:12px/18px Verdana, sans-serif;*/
-	font:14px/1.5em "Lucida Grande", Tahoma, sans-serif;
-	letter-spacing:0px;
-	color:#333;
-	background-color:#fff;
-	margin:0;
-	padding:0;
-}
-
-div#site {
-	width:600px;
-	margin:50px auto 0 auto;
-}
-
-h1#logo {
-	margin:0;
-	padding:0;
-	text-align:center;
-}
-
-h1#logo a, 
-h1#logo a:hover {
-	background-color:transparent;
-	text-decoration:none;
-	padding:0;
-}
-
-h2.image {
-	margin:0;
-	padding:0;
-	text-align:center;
-}
-
-h3 {
-	margin:20px 0 0 0;
-	padding:0;
-	font-size:1.5em;
-}
-
-h4 {
-	margin:20px 0 0 0;
-	padding:0;
-	font-size:1.2em;
-	letter-spacing:-1px;
-}
-
-h5 {
-	margin:10px 0 0 0;
-	padding:0;
-	font-size:1em;
-	font-weight:bold;
-}
-
-em {
-	font-style:normal;
-	background-color:#ffc;
-}
-
-p {
-	margin:0;
-	padding:5px 0;
-}
-
-ul, ol {
-	margin:10px 0 10px 20px;
-	padding:0 0 0 15px;
-}
-
-ul li, ol li {
-	margin:0 0 7px 0;
-	padding:0 0 0 3px;
-}
-
-form {
-	margin:0;
-	padding:0;
-}
-
-code {
-	font-size:1em;
-	background-color:#f3f3ff;
-	color:#000;
-}
-
-div#site pre {
-	background-color:#f3f3ff;
-	color:#000080;
-	border:1px dotted #000080;
-	overflow:auto;
-	padding:3px 5px;
-}
-
-blockquote {
-	font-size:1em;
-	color:#666;
-	border-left:4px solid #666;
-	margin:10px 0 10px 30px;
-	padding:0 5px 0 10px;
-	background:#f3f3f3 url(background_blockquote.png) repeat top left;
-}
-
-input, select, textarea {
-	font-size:12px;
-	line-height:1.2em;
-	padding:2px;
-}
-
-input[type=text], select, textarea {
-	background-color:#e9f5ff;
-	border:1px solid #333;
-}
-
-input[type=text]:focus, select:focus, textarea:focus {
-	background-color:#ffe;
-}
-
-.clearLeft {clear:left;}
-.clearRight {clear:right;}
-.clearBoth {clear:both;}
-.hide {display:none;}
-
-
-/*********************************************
-NAVIGATION STYLES
-*********************************************/
-div#header {
-	background:#fff url(top_gradient.gif) repeat-x top left;
-	margin:0;
-	padding:0;
-}
-
-div#header form {
-	margin:0;
-	padding:0;
-}
-
-div#header div#headerInner {
-	margin:0;
-	padding:0;
-}
-
-div#header div#headerInner div#logoContainer {}
-
-div#header div#headerInner div#logoContainerInner {
-	width:550px;
-	margin:0 auto;
-	padding:20px;
-}
-
-div#header div#headerInner div#logoContainer div#logo {
-	float:left;
-	width:200px;
-}
-
-div#header div#headerInner div#logoContainer div#logo a,
-div#header div#headerInner div#logoContainer div#logo a:hover {
-	border:none;
-	background:none;
-}
-
-div#header div#headerInner div#logoContainer div#feed {
-	float:right;
-	width:300px;
-	text-align:right;
-	padding:10px 0 0 0;
-}
-
-div#header div#headerInner div#logoContainer div#feed input.text {
-	width:60%;
-}
-
-div#header div#headerInner div#menu {
-	background:#eee url(background_menuitem_shadow.gif) repeat-x top left;
-	border-top:2px solid #ccc;
-	border-bottom:1px solid #ddd;
-	text-align:center;
-}
-
-div#header div#headerInner div#menu table {
-	width:auto;
-	margin:0 auto;
-}
-
-div#header div#headerInner div#menu ul {
-	display:block;
-	width:100%;
-	margin:0 auto;
-	padding:0;
-	font-size:12px;
-}
-
-div#header div#headerInner div#menu ul li {
-	display:block;
-	float:left;
-}
-
-div#header div#headerInner div#menu ul li a {
-	display:block;
-	margin:-2px 0 0 0;
-	padding:5px 7px 8px 7px;
-	text-decoration:none;
-	color:#666 !important;
-	background-color:transparent;
-}
-
-div#header div#headerInner div#menu ul li a:hover {
-	display:block;
-	margin:-2px 0 0 0;
-	padding:5px 7px 8px 7px;
-	text-decoration:none;
-	color:#666;
-	background:#fff url(background_menuitem_off.gif) no-repeat bottom right;
-}
-
-body#bodydemo div#header div#headerInner div#menu ul li#demo a {
-	display:block;
-	margin:-2px 0 0 0;
-	padding:5px 7px 8px 7px;
-	text-decoration:none;
-	color:#333;
-	font-weight:bold;
-	background:#fff url(background_menuitem.gif) no-repeat bottom right;
-}
-
-
-/*********************************************
-CONTENT STYLES
-*********************************************/
-div.chunk {
-	margin:20px 0 0 0;
-	padding:0 0 10px 0;
-	border-bottom:1px solid #ccc;
-}
-
-div.topchunk {
-	margin:0 !important;
-}
-
-.footnote,
-.footnote a {
-	font-size:12px;
-	line-height:1.3em;
-	color:#aaa;
-}
-
-.footnote em {
-	background-color:transparent;
-	font-style:italic;
-}
-
-.footnote code {
-	background-color:transparent;
-	font:11px/14px monospace;
-	color:#aaa;
-}
-
-p.subscribe {
-	background-color:#f3f3f3;
-	font-size:12px;
-	text-align:center;
-}
-
-p.highlight {
-	background-color:#ffc;
-	font-size:12px;
-	text-align:center;
-}
-
-p.sample_feeds {
-	font-size:12px;
-	line-height:1.2em;
-}
-
-div.sp_errors {
-	background-color:#eee;
-	padding:5px;
-	text-align:center;
-	font-size:12px;
-}
-
-.noborder {
-	border:none !important;
-}
-
-img.favicon {
-	margin:0 4px -2px 0;
-	width:16px;
-	height:16px;
-}
-
-p.favicons a,
-p.favicons a:hover {
-	border:none;
-	background-color:transparent;
-}
-
-p.favicons img {
-	border:none;
-}
-
-
-/*********************************************
-DEMO STYLES
-*********************************************/
-div#sp_input {
-	background-color:#ffc;
-	border:2px solid #f90;
-	padding:5px;
-	text-align:center;
-}
-
-div#sp_input input.text {
-	border:1px solid #999;
-	background:#e9f5ff url(feed.png) no-repeat 4px 50%;
-	width:75%;
-	padding:2px 2px 2px 28px;
-	font:18px/22px "Lucida Grande", Verdana, sans-serif;
-	font-weight:bold;
-	letter-spacing:-1px;
-}
-
-form#sp_form {
-	margin:15px 0;
-}
-
-div.focus {
-	margin:0;
-	padding:10px 20px;
-	background-color:#efe;
-}
-
-p.sample_feeds {
-	text-align:justify;
-}
-
-
-/*********************************************
-SIFR STYLES
-*********************************************/
-.sIFR-active h3.header {
-	visibility:hidden;
-	line-height:1em;
-}
diff --git a/library/simplepie/demo/for_the_demo/sleight.js b/library/simplepie/demo/for_the_demo/sleight.js
deleted file mode 100644
index 4b5058e9a..000000000
--- a/library/simplepie/demo/for_the_demo/sleight.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**********************************************************
-Sleight
-(c) 2001, Aaron Boodman
-http://www.youngpup.net
-**********************************************************/
-
-if (navigator.platform == "Win32" && navigator.appName == "Microsoft Internet Explorer" && window.attachEvent)
-{
-	document.writeln('<style type="text/css">img { visibility:hidden; } </style>');
-	window.attachEvent("onload", fnLoadPngs);
-}
-
-function fnLoadPngs()
-{
-	var rslt = navigator.appVersion.match(/MSIE (\d+\.\d+)/, '');
-	var itsAllGood = (rslt != null && Number(rslt[1]) >= 5.5);
-
-	for (var i = document.images.length - 1, img = null; (img = document.images[i]); i--)
-	{
-		if (itsAllGood && img.src.match(/\.png$/i) != null)
-		{
-			var src = img.src;
-			var div = document.createElement("DIV");
-			div.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + src + "', sizing='scale')"
-			div.style.width = img.width + "px";
-			div.style.height = img.height + "px";
-			img.replaceNode(div);
-		}
-		img.style.visibility = "visible";
-	}
-}
diff --git a/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_audio_fireworksfile.png
deleted file mode 100644
index 2bfd87d0ce14c424fd3b72377b085bb0b1510bd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 39177
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

diff --git a/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png b/library/simplepie/demo/for_the_demo/source_files/place_video_fireworksfile.png
deleted file mode 100644
index d0629769cfec742664ec0b739d93ebf4418d15e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 115826
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
Y{xKQOm;9p6g#iC3$f!!!Nt%cL4}oKrIsgCw

diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
deleted file mode 100644
index 6a98ca552..000000000
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/SifrStyleSheet.as
+++ /dev/null
@@ -1,71 +0,0 @@
-/*=:project
-    scalable Inman Flash Replacement (sIFR) version 3.
-
-  =:file
-    Copyright: 2006 Mark Wubben.
-    Author: Mark Wubben, <http://novemberborn.net/>
-
-  =:history
-    * IFR: Shaun Inman
-    * sIFR 1: Mike Davidson, Shaun Inman and Tomas Jogin
-    * sIFR 2: Mike Davidson, Shaun Inman, Tomas Jogin and Mark Wubben
-
-  =:license
-    This software is licensed and provided under the CC-GNU LGPL.
-    See <http://creativecommons.org/licenses/LGPL/2.1/>    
-*/
-
-import TextField.StyleSheet;
-
-class SifrStyleSheet extends TextField.StyleSheet {
-  public var fontSize;
-  public var latestLeading = 0;
-  
-  public function parseCSS(cssText:String) {
-    var native = new TextField.StyleSheet();
-    var parsed = native.parseCSS(cssText);
-    
-    if(!parsed) return false;
-    
-    var selectors = native.getStyleNames();
-    for(var i = selectors.length - 1; i >= 0; i--) {
-      var selector = selectors[i];
-      var nativeStyle = native.getStyle(selector);
-      var style = this.getStyle(selector) || nativeStyle;
-      if(style != nativeStyle) {
-        for(var property in nativeStyle) style[property] = nativeStyle[property];
-      }
-      this.setStyle(selector, style);
-    }
-    
-    return true;
-  }
-  
-  // Apply leading to the textFormat. Much thanks to <http://www.blog.lessrain.com/?p=98>.
-  private function applyLeading(format, leading) {
-    this.latestLeading = leading;
-    
-    if(leading >= 0) {
-        format.leading = leading;
-        return format;
-    }
-
-    // Workaround for negative leading, which is ignored otherwise.
-    var newFormat = new TextFormat(null, null, null, null, null, null, null, null, null, null, null, null, leading);
-    for(var property in format) if(property != 'leading') newFormat[property] = format[property];
-
-    return newFormat;
-  }
-  
-  public function transform(style) {
-    var format = super.transform(style);
-    if(style.leading) format = applyLeading(format, style.leading);
-    if(style.letterSpacing) format.letterSpacing = style.letterSpacing;
-    // Support font sizes relative to the size of .sIFR-root.
-    if(this.fontSize && style.fontSize && style.fontSize.indexOf('%')) {
-      format.size = this.fontSize * parseInt(style.fontSize) / 100;
-    }
-    format.kerning = _root.kerning == 'true' || !(_root.kerning == 'false') || sIFR.defaultKerning;
-    return format;
-  }
-}
\ No newline at end of file
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
deleted file mode 100644
index 2b9d32d20..000000000
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/_README_.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a pre-release nightly of sIFR 3 (r245 to be exact).  We (the SimplePie team) will be updating the 
-sIFR code and font files from time to time as new releases of sIFR 3 are made available.
-
-In this folder you'll find a few Flash 8 files.  The only one of you might want to mess with is sifr.fla.
-  * Open it up
-  * Double-click the rectangle in the middle
-  * Select all
-  * Change the font
-
-More information about sIFR 3 can be found here:
-  * http://dev.novemberborn.net/sifr3/
-  * http://wiki.novemberborn.net/sifr3/
\ No newline at end of file
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
deleted file mode 100644
index 4d371954b..000000000
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/options.as
+++ /dev/null
@@ -1,12 +0,0 @@
-// MTASC only parses as-files with class definitions, so here goes...
-class Options {
-	public static function apply() {
-		sIFR.fromLocal = true;
-		sIFR.domains   = ['*'];
-		
-		// Parsing `p.foo` might not work, see: <http://livedocs.macromedia.com/flash/mx2004/main_7_2/wwhelp/wwhimpl/common/html/wwhelp.htm?context=Flash_MX_2004&file=00001766.html>
-		// Appearantly you have to use hex color codes as well, names are not supported!
-
-		sIFR.styles.parseCSS('.foo { text-decoration: underline; }'); 
-	}
-}
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
deleted file mode 100644
index 4902e003f..000000000
--- a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sIFR.as
+++ /dev/null
@@ -1,359 +0,0 @@
-/*=:project
-    scalable Inman Flash Replacement (sIFR) version 3.
-
-  =:file
-    Copyright: 2006 Mark Wubben.
-    Author: Mark Wubben, <http://novemberborn.net/>
-
-  =:history
-    * IFR: Shaun Inman
-    * sIFR 1: Mike Davidson, Shaun Inman and Tomas Jogin
-    * sIFR 2: Mike Davidson, Shaun Inman, Tomas Jogin and Mark Wubben
-
-  =:license
-    This software is licensed and provided under the CC-GNU LGPL.
-    See <http://creativecommons.org/licenses/LGPL/2.1/>    
-*/
-
-import SifrStyleSheet;
-
-class sIFR {
-  public static var DEFAULT_TEXT                 = 'Rendered with sIFR 3, revision 245';
-  public static var CSS_ROOT_CLASS               = 'sIFR-root';
-  public static var DEFAULT_WIDTH                = 300;
-  public static var DEFAULT_HEIGHT               = 100;
-  public static var DEFAULT_ANTI_ALIAS_TYPE      = 'advanced';
-  public static var MARGIN_LEFT                  = -3;
-  public static var PADDING_BOTTOM               = 5; // Extra padding to make sure the movie is high enough in most cases.
-  public static var LEADING_REMAINDER            = 2; // Flash uses the specified leading minus 2 as the applied leading.
-
-  public static var MAX_FONT_SIZE                = 126;
-  public static var ALIASING_MAX_FONT_SIZE       = 48;
-  
-  //= Holds CSS properties and other rendering properties for the Flash movie.
-  //  *Don't overwrite!*
-  public static var styles:SifrStyleSheet        = new SifrStyleSheet();
-  //= Allow sIFR to be run from localhost
-  public static var fromLocal:Boolean            = true;
-  //= Array containing domains for which sIFR may render text. Used to prevent
-  //  hotlinking. Use `*` to allow all domains.
-  public static var domains:Array                = [];
-  //= Whether kerning is enabled by default. This can be overriden from the client side.
-  //  See also <http://livedocs.macromedia.com/flash/8/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00002811.html>.
-  public static var defaultKerning:Boolean       = true;
-  //= Default value which can be overriden from the client side.
-  //  See also <http://livedocs.macromedia.com/flash/8/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00002788.html>.
-  public static var defaultSharpness:Number      = 0;
-  //= Default value which can be overriden from the client side.
-  //  See also <http://livedocs.macromedia.com/flash/8/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00002787.html>.
-  public static var defaultThickness:Number      = 0;
-  //= Default value which can be overriden from the client side.
-  //  See also <http://livedocs.macromedia.com/flash/8/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00002732.html>.
-  public static var defaultOpacity:Number        = -1; // Use client settings
-  //= Default value which can be overriden from the client side.
-  //  See also <http://livedocs.macromedia.com/flash/8/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00002788.html>.
-  public static var defaultBlendMode:Number      = -1; // Use cliest settings
-  //= Overrides the grid fit type as defined on the client side.
-  //  See also <http://livedocs.macromedia.com/flash/8/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00002444.html>.
-  public static var enforcedGridFitType:String   = null;
-  //= If `true` sIFR won't override the anti aliasing set in the Flash IDE when exporting.
-  //  Thickness and sharpness won't be affected either.
-  public static var preserveAntiAlias:Boolean    = false;
-  //= If `true` sIFR will disable anti-aliasing if the font size is larger than `ALIASING_MAX_FONT_SIZE`.
-  //  This setting is *independent* from `preserveAntiAlias`.
-  public static var conditionalAntiAlias:Boolean = true;
-  //= Sets the anti alias type. By default it's `DEFAULT_ANTI_ALIAS_TYPE`.
-  //  See also <http://livedocs.macromedia.com/flash/8/main/wwhelp/wwhimpl/common/html/wwhelp.htm?context=LiveDocs_Parts&file=00002733.html>.
-  public static var antiAliasType:String         = null;
-  //= Flash filters can be added to this array and will be applied to the text field.
-  public static var filters:Array                = [];
-  //= A mapping from the names of the filters to their actual objecs, used when transforming
-  //  filters defined on the client. You can add additional filters here so they'll be supported
-  //  when defined on the client.
-  public static var filterMap:Object             = {
-    DisplacementMapFilter : flash.filters.DisplacementMapFilter,
-    ColorMatrixFilter     : flash.filters.ColorMatrixFilter,
-    ConvolutionFilter     : flash.filters.ConvolutionFilter,
-    GradientBevelFilter   : flash.filters.GradientBevelFilter,
-    GradientGlowFilter    : flash.filters.GradientGlowFilter,
-    BevelFilter           : flash.filters.BevelFilter,
-    GlowFilter            : flash.filters.GlowFilter,
-    BlurFilter            : flash.filters.BlurFilter,
-    DropShadowFilter      : flash.filters.DropShadowFilter
-  };
-
-  private static var instance;
-  
-  private var textField;
-  private var content;
-  private var realHeight;
-  private var originalHeight;
-  private var currentHeight;
-  private var fontSize;
-  private var tuneWidth;
-  private var tuneHeight;
-  
-
-  
-  //= Sets the default styles for `sIFR.styles`. This method is called
-  //  directly in `sifr.fla`, before options are applied.
-  public static function setDefaultStyles() {
-    sIFR.styles.parseCSS([
-      '.', CSS_ROOT_CLASS, ' { color: #000000; }',
-      'strong { display: inline; font-weight: bold; } ',
-      'em { display: inline; font-style: italic; }',
-      'a { color: #0000FF; text-decoration: underline; }',
-      'a:hover { color: #0000FF; text-decoration: none; }'
-    ].join(''));
-  }
-  
-  //= Validates the domain sIFR is being used on.
-  //  Returns `true` if the domain is valid, `false` otherwise.  
-  public static function checkDomain():Boolean {
-    if(sIFR.domains.length == 0) return true;
-
-    var domain = (new LocalConnection()).domain();
-    if(sIFR.fromLocal) sIFR.domains.push('localhost');
-    
-    for(var i = 0; i < sIFR.domains.length; i++) {
-      var match = sIFR.domains[i];
-      if(match == '*' || match == domain) return true;
-
-      var wildcard = match.lastIndexOf('*');
-      if(wildcard > -1) {
-        match = match.substr(wildcard + 1);
-        var matchPosition = domain.lastIndexOf(match);
-        if(matchPosition > -1 && (matchPosition + match.length) == domain.length) return true;
-      }
-    }
-    
-    return false;
-  }
-  
-  //= Runs sIFR. Called automatically.
-  public static function run() {
-    var holder  = _root.holder;
-    var content = checkDomain() ? unescape(_root.content) : DEFAULT_TEXT
-    if(content == 'undefined' || content == '') {
-      content = DEFAULT_TEXT;
-      fscommand('resetmovie', '');
-    } else fscommand('ping', '');
-
-    // Sets stage parameters
-    Stage.scaleMode = 'noscale';
-    Stage.align = 'TL';
-    Stage.showMenu = false;
-    
-    // Other parameters
-    var opacity = parseInt(_root.opacity);
-    if(!isNaN(opacity)) holder._alpha = sIFR.defaultOpacity == -1 ? opacity : sIFR.defaultOpacity;
-    else holder._alpha = 100;
-    _root.blendMode = sIFR.defaultBlendMode == -1 ? _root.blendmode : sIFR.defaultBlendMode;
-
-    sIFR.instance = new sIFR(holder.txtF, content);
-    // This should ignore resizes from the callback. Disabled for now.
-/*    if(_root.zoomsupport == 'true') Stage.addListener({onResize: function() { sIFR.instance.scale() }});*/
-
-    // Setup callbacks
-    _root.watch('callbackTrigger', function() { 
-      sIFR.callback();
-      return false;
-    });
-  }
-  
-  private static function eval(str) {
-    var as;
-    
-    if(str.charAt(0) == '{') { // Ah, we need to create an object
-      as = {};
-      str = str.substring(1, str.length - 1);
-      var $ = str.split(',');
-      for(var i = 0; i < $.length; i++) {
-        var $1 = $[i].split(':');
-        as[$1[0]] = sIFR.eval($1[1]);
-      }
-    } else if(str.charAt(0) == '"') { // String
-      as = str.substring(1, str.length - 1);
-    } else if(str == 'true' || str == 'false') { // Boolean
-      as = str == 'true';
-    } else { // Float
-      as = parseFloat(str);
-    }
-    
-    return as;
-  }
-  
-  private function applyFilters() {
-    var $filters = this.textField.filters;
-    $filters = $filters.concat(sIFR.filters);
-    
-    var $ = _root.flashfilters.split(';'); // name,prop:value,...;
-    for(var i = 0; i < $.length; i++) {
-      var $1 = $[i].split(',');
-      
-      var newFilter = new sIFR.filterMap[$1[0]]();
-      for(var j = 1; j < $1.length; j++) {
-        var $2 = $1[j].split(':');
-        newFilter[$2[0]] = sIFR.eval(unescape($2[1]));
-      }
-      
-      $filters.push(newFilter);
-    }
-
-    this.textField.filters = $filters;
-  }
-  
-  private function sIFR(textField, content) {
-    this.textField = textField;
-    this.content   = content;
-
-    var offsetLeft = parseInt(_root.offsetleft);
-    textField._x = MARGIN_LEFT + (isNaN(offsetLeft) ? 0 : offsetLeft);
-    var offsetTop = parseInt(_root.offsettop);
-    if(!isNaN(offsetTop)) textField._y += offsetTop;
-    
-    tuneWidth = parseInt(_root.tunewidth);
-    if(isNaN(tuneWidth)) tuneWidth = 0;
-    tuneHeight = parseInt(_root.tuneheight);
-    if(isNaN(tuneHeight)) tuneHeight = 0;
-
-    textField._width = tuneWidth + (isNaN(parseInt(_root.width)) ? DEFAULT_WIDTH : parseInt(_root.width));
-    textField._height = tuneHeight + (isNaN(parseInt(_root.height)) ? DEFAULT_HEIGHT : parseInt(_root.height));
-    textField.wordWrap = true;
-    textField.selectable = _root.selectable == 'true';
-    textField.gridFitType = sIFR.enforcedGridFitType || _root.gridfittype;
-    this.applyFilters();
-
-    // Determine font-size and the number of lines
-    this.fontSize = parseInt(_root.size);
-    if(isNaN(this.fontSize)) this.fontSize = 26;
-    styles.fontSize = this.fontSize;
-    
-    if(!sIFR.preserveAntiAlias && (sIFR.conditionalAntiAlias && this.fontSize < ALIASING_MAX_FONT_SIZE
-    || !sIFR.conditionalAntiAlias)) {
-      textField.antiAliasType = sIFR.antiAliasType || DEFAULT_ANTI_ALIAS_TYPE;      
-    }
-
-    if(!sIFR.preserveAntiAlias || !isNaN(parseInt(_root.sharpness))) {
-      textField.sharpness = parseInt(_root.sharpness);
-    }
-    if(isNaN(textField.sharpness)) textField.sharpness = sIFR.defaultSharpness;
-
-    if(!sIFR.preserveAntiAlias || !isNaN(parseInt(_root.thickness))) {
-      textField.thickness = parseInt(_root.thickness);
-    }
-    if(isNaN(textField.thickness)) textField.thickness = sIFR.defaultThickness;
-    
-    // Set font-size and other styles
-    sIFR.styles.parseCSS(unescape(_root.css));
-    
-    var rootStyle = styles.getStyle('.sIFR-root') || {};
-    rootStyle.fontSize = this.fontSize; // won't go higher than 126!
-    styles.setStyle('.sIFR-root', rootStyle);
-    textField.styleSheet = styles;
-    
-    this.write(content);
-    this.repaint();
-  }
-  
-  private function repaint() {
-    var leadingFix = this.isSingleLine() ? sIFR.styles.latestLeading : 0;
-    if(leadingFix > 0) leadingFix -= LEADING_REMAINDER;
-
-    // Flash wants to scroll the movie by one line, by adding the fontSize to the
-    // textField height this is no longer happens. We also add the absolute tuneHeight,
-    // to prevent a negative value from triggering the bug. We won't send the fake
-    // value to the JavaScript side, though.
-    textField._height = textField.textHeight + PADDING_BOTTOM + this.fontSize + Math.abs(tuneHeight) + tuneHeight - leadingFix;
-    this.realHeight = textField._height - this.fontSize - Math.abs(tuneHeight);
-    var arg = 'height:' + this.realHeight;
-    if(_root.fitexactly == 'true') arg += ',width:' + (textField.textWidth + tuneWidth);
-    fscommand('resize', arg);
-        
-    this.originalHeight = textField._height;
-    this.currentHeight = Stage.height;
-
-    textField._xscale = textField._yscale = parseInt(_root.zoom);
-  }
-  
-  private function write(content) {
-    this.textField.htmlText = ['<p class="', CSS_ROOT_CLASS, '">', 
-                                content, '</p>'
-                              ].join('');
-  }
-  
-  private function isSingleLine() {
-    return Math.round((this.textField.textHeight - sIFR.styles.latestLeading) / this.fontSize) == 1;
-  }
-
-  //= Scales the text field to the new scale of the Flash movie itself.
-  public function scale() {
-    this.currentHeight = Stage.height;
-    var scale = 100 * Math.round(this.currentHeight / this.originalHeight);
-    textField._xscale = textField._yscale = scale;
-  }
-  
-  private function calculateRatios() {
-    var strings = ['X', 'X<br>X', 'X<br>X<br>X', 'X<br>X<br>X<br>X'];
-    var results = {};
-
-    for(var i = 1; i <= strings.length; i++) {
-      var size = 6;
-    
-      this.write(strings[i - 1]);
-      while(size < MAX_FONT_SIZE) {
-        var rootStyle = sIFR.styles.getStyle('.sIFR-root') || {};
-        rootStyle.fontSize = size;
-        sIFR.styles.setStyle('.sIFR-root', rootStyle);
-        this.textField.styleSheet = sIFR.styles;
-        this.repaint();
-        var ratio = (this.realHeight - PADDING_BOTTOM) / i / size;
-        if(!results[size]) results[size] = ratio;
-        else results[size] = ((i - 1) * results[size] + ratio) / i;
-        size++;
-      }
-    }
-
-    var sizes = [], ratios = [];
-    var ratiosToSizes = {}, sizesToRatios = {};
-
-    for(var size in results) {
-      if(results[size] == Object.prototype[size]) continue;
-      var ratio = results[size];
-      ratiosToSizes[ratio] = Math.max(ratio, parseInt(size));
-    }
-
-    for(var ratio in ratiosToSizes) {
-      if(ratiosToSizes[ratio] == Object.prototype[ratio]) continue;
-      sizesToRatios[ratiosToSizes[ratio]] = roundDecimals(ratio, 2);
-      sizes.push(ratiosToSizes[ratio]);
-    }
-
-    sizes.sort(function(a, b) { return a - b; });
-    for(var j = 0; j < sizes.length - 1; j++) ratios.push(sizes[j], sizesToRatios[sizes[j]]);
-    ratios.push(sizesToRatios[sizes[sizes.length - 1]]);
-
-    fscommand('debug:ratios', '[' + ratios.join(',') + ']');
-  }
-  
-  private function roundDecimals(value, decimals) {
-    return Math.round(value * Math.pow(10, decimals)) / Math.pow(10, decimals);
-  }
-  
-  public static function callback() {
-    switch(_root.callbackType) {
-      case 'replacetext':
-        sIFR.instance.content = _root.callbackValue;
-        sIFR.instance.write(_root.callbackValue);
-        sIFR.instance.repaint();
-        break;
-      case 'resettext':
-        sIFR.instance.write('');
-        sIFR.instance.write(sIFR.instance.content);
-        break;
-      case 'ratios':
-        sIFR.instance.calculateRatios();
-        break;
-    }
-  }
-}
diff --git a/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla b/library/simplepie/demo/for_the_demo/source_files/sIFR-r245/sifr.fla
deleted file mode 100644
index 2aa3f647f4902e189eba92767e211ed0ee15d8b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 47104
zcmeHQ378#4wXT}(Y(O9@fdrbKfrPMSn*>4#gpgrKAdn#w_ANtZZW72W&P;$H>O7VA
ze15(suFw0{ASf6>Kv7T>f(ry31Q!$)6-9B^abFO||3B5;x4Z7W-FId%kmv15-Fr`0
z)v2mer%s)7YRQvNOnmmnyQhCoS<gwzQ7;XSQ=?<=HGbEG@C2n?{N}rt1_uZE+Cjk2
z>azz?K&@rZ4gaZ8qoO`1FLdp=?t&fNPfUE1w|05+$|T;tXBrp1`<;*Iv3Py*R1>#C
zb*c{4tJ>tVCz+uFXp*YY<jIitD#)UaWuiutvPre5jVRq$^DD_(lxAOyh<JAwB`EQt
z9`9C?2zZ*+Hr1{!2Nkvqs}5-YkjrPe_wU0`Gj?B$Hvqpmp7|Vw_;Cn_BbYb4_j5MN
zJp$oKgfR%mAg~4tgYQzcS%f&&|2TXvMmQc}3Bm~oOA$^)I0<1H!pR8B5l%r^fzW_(
zDgs&KGz7BmDumM!&Olg=a3;c82x}0U5Y9&65Nbxa2%%J+!gm)V{t|@sv2-o?9nw2Y
zw>!Ug=lEBLP3?OR#{XVu^UjI*!1GFs|4A(P6&(LFQT!`C{^xOE;|Y0<JV-eZ^5VX+
zIHuVfFh$0A1nLC)AwUIC>_+C9jPEH36zlsVOhY&T;Xs7x2s024LO2+~LpTJ%N2o=p
zLpT)SFa*+O7Q)d8EZ2VK1n=kKdmaL%_5uXT)O84U`rQqmgF2jxa2~?>2p1q+h!E0s
zch@JYJdL`A^C$JWQ3&i`%3DrRWD}0pc>j|(;{DI@^m6q->BRo$oD-M-oQud4oCC-M
zrTU-q0_8vF_mRr~S8IP|_2*FIUv2##j{l+dKl|(D?Em4+|CB#_8sDJG9A@#ShCE>&
z{X)$Pkf|>Xy1nWeXz7h%1m7`?nXj&c{JjqH_c}%To2L(72vEukxZ=MlWeU#$NJN=~
zCrFOYT!w%$D3kc|1x_q@_^#B$_od51>OK?pW`$Qn;ok;@zgtn|M;4SbxCVd38eq`o
zJIFSsCVY<+P1d6a2Q>ucil)sQnp!rtxj?5OGzqV6+1Az_f6>_8(jKJPOHwp<b#Lx%
zb18qL2ZA)Hg}jRY4(q{pK_GeX2&uxP_#PXQ?Tl?f0@GciH;JLqD(yGL?%`dr$J5{R
zkLgeLAb9l6OVtMSQ@iRC<Jg$SKHxSC!4{Y)E%Mzc@CLOB->oog4#(SWwH46e%2z$W
z!I*ZWJ_ql&ND4b<%`oX_IDTE*HN64%_Mz$sP!B^k#0&hUa0vyBPo)sg=(plSPkxZU
zIc^cg9^@bFAK)M8&+;!r<!2%1KIhkrS%J!LQJY~OcjL3Yy&a=eO9>%P;@}e#TBoFB
zRx-3xGOtq0bh(mE+fp*uLX|xfYV1rj;BYki2$-%%L2Wq(D$87`tMef$>meo=K}9(Z
z=IQY;O;3PXdLm5HW$I)Yqo=?iYJd^i2m^E_jL*|yc&>)gc@_-LCK#J*VQ8*Hf1V2k
z^L!|m7sBYg7)Ir#>N1#>Eg;ke@Isr)!KtwcB)dXg2?DmmxzY)4dJV|f11{OBu2NS+
zpl?&xs@FnrzfQegZC5v{_p6)K&FTZ{gX$J_tNM`Ip>9*Rt2@+()t%}tb+`J6`lz}`
zeN25^-K*|XpHQDv_p48-Ppb#igKDRGNPR|qR((!=UOlWHQM=Tm>M`{N)vq2`UsO-1
zC)JnKm(^F)SJhMMYwGLjY4r{DP4zAHjQY0vj{2^8R((%>Up=ROpnj;HS3goeRzFcc
zRX<ZdSHDodRKHRK>euQw>bL55>i6mo>W}JA>d)#g>IL;z^`d%7kuS8a(T;ZYC_P$_
z(PQ;Ey_eow@1w`-ef55Nf}W@+>B)MEo~rlP)ARxQKs{a0&<E**wWkl!zOL1E`cQqC
zo~dW)!}V-^gg#OqrH|If=s9|>o~P&Q1-f1@)Qj}7`Z&E<AFr3_6ZBGjqCQD4(<kfY
z`V_rFH|SG!qdrZq)T{LA`V75VpQ+E%Yjl%7Td&p4dYwK;pR3Q)=j#jfh590WvA#rK
zsxQ;)b&I}SZ_ur}P3QDRy-9D@SLiGC7TvBpbf@mpuhHGQNB8Qj`YL_3zD94;*Xq~m
z>-6jN>-8J-JGEPO$fPjtt9ty8Ukz5>05)y~Yx@`y-T3Yh1|OO%$V60uTu?QT3)zUW
zq*GN!RAs~~CnL7&8}*&~F8vq%g8r+1QNN@I^}{uf)I3`Abj>$vzFG6FnrCXhU85ZB
zIL<idQ0Mi|o1N>Oe|G-Gd5iO}&Rd<gIsfjw-MPVehx1P7UCz6m_c-r${=<2nlXw2p
z`7h_co&RzE*ZDtZyK|#+lXJ840q29xEzYgZhnyYGZO-k^9nOcHJDt0nyPc0XA9e0=
zKIVMfx!1YR`GoUH=YHo?&ZnIRoClqq&O^>;oX<L+b3X4p>^$P^avpUabH3p8JC8eG
zgn+Mc9oKb7xue}N?pSx6yO+DSyN|oCyPrG3o#;+-C%aSJsqX&nH1`1aKzF)3!#&77
z*!A2)T;HvA>)b=#!`zwfEcbACwtIwoq<fTmw0n#@$DQlWbLYDY+<JGRyU0D(J<eV1
z9`7!3PjHvIC%PxO%iNRQ<?bo&3b(;M)opZ7b62{n+|%7N+|}-x?pf{{_iT5q+w87$
z&vDOn&vVarFK{n(FLEz-FLf_-Z*bq?_Idy0T}LTBaxwBo?@ivDz3aX0-i_Y-y_>w7
zy$^UF^ltHP^*-e7@NV;N_wMjM?A__z<=yRl#QUgskM}X}<KDgAecmU$PkQ%zpYlHK
zJ>Wg)?ere<KI47X`<(ZA?_uu|Z<qI|_n7wuuityz`=a-R_oVkF@5|m-ysvssd0+Fs
z?mg{&!~3T9E$<oc+unD)?|RRA-}AojJ?H(v`=R%|_apDe-cP)rdO!1i?)}31rS~gu
z!27lL8}GN?@4Vl8fAIe3{mJ{YH`$-!PxYsXzBk>U;ZyhXeBZD2>!AP5^B4H_{_*}2
zf2n_x-{8N&zsbMZzs0}Jzug~ID|+F`$v3(7pqHl~_OGq0omD%h_M+O0YcHw2w6>;h
zblrY+6YD0`O|3hyZhD<pcU0ZVy7hIfb!~Mw&fGEcwwaI3d}8MFGxvFUiq``*1Ma}6
zfzbnF2F4DI8`x`L?}2>=#t+mC0lnzY)Y?Ti-p%$0v{KsQv}iVqwL?25v{GpKv_a?X
z#9uG;VCuJRfhE%n#lXbVj%N-op|#3_LKkq+CgS2k(u(48UoSLcmcm>o!MV8<x_Pm^
z#Ta?|@QLs;`ZBI;5X2+)Ww<%CkBg`1yi#5a<@C8~6oNcx!^_-`@6)-B2P`w#S~C~M
z&WSK+y3n1SFg)5o)Ls~be(*<wl-3+OaSLL7m^U3_o_64Oqr~)}YkYKg8?Z1XyO?G#
z8|lNK>Or1H#2*3ZD!ivTW7x)rVKoP(neteV9Aa2bp$24!E*L$uC21b@B9#x5Y##oO
z#ji6_VmAyXAI8;I)RN5BAy~sUEXRAYPbbnbZ|NLIBW9`K??rh_z+Q8Kr&DUowO-bn
zE56-=oh;sq6elHWPvecI8dGhHwc$wMHZ)-Q%_yY>bs_}|)GV}^sY9A^n3y_mMjJ_g
zIufozIju-TMq<57WAu@ddbbbblS8TnIeZwWouK1p#FQ&>!LUnYT}qc#s7q<;$9aIh
z10yDS(BeWZ*MV-NFR9ZBPU(d?%)Td8%==_cwmhVO;cr7X3K?JMZ(M4=a0juhz~3>j
zSk8j6?n88)2J?M&f|r_68dKVwvO(%$1R{Cdh^BVwp&no$M{ESYBx~4%H(@Dr!P9fl
z+vKT`bH`(J&J_-W9|c@VEF4oIcZ^57<L}oXO(>FkkS|O(2fxU#4fxD~CR<UDUT{q>
zxRj%<N8BDKAcq<4TfpfY$5)~^w*e<xd?Esce5q9DBJ~zv%}Tcp_2($&-VM5PiIer&
zBK0HYWDDjXt_y!#PzyR{n4-`oy3IO*_eQ2AKk22?u~+fm6sipLF1ze3vH~VkO5}Wf
zKRgr0{4RX;;U~hF(J`EsTY0yE%TSjR553sq)ryAB4O`pWI(q5ao;EtZR|bt8lbnJD
zOGqfX^W#L~?_b~BuzYQUDQpbCm^ciw2pIt;QG|h{G_&Q!Pn^;irV{@(5i<-Ep)5NP
zA)m0qgq`puBgz9z71bl2h1m!*5N|B54`3|NtB=q(ZLGZ)2ze3?d*Z1H5tgFxP4_h{
zf2k4*7ZnA}@<b%qvnkHDq*0uG9V~ow1y1QFg@ZO}=z0GJ=bKXTAewQ&A7sXzJ9mO*
zxR1fP2Or~D*tByo?y2%nv@XHlsj_57@zf!L$;T8xrN*p2v3dwo?OYsW6qn()v`}O1
zkp>~hes+#V2trO>jVSpVrqc8HIl)f14rwUjSqE;oi&7qBr?l(9mK3IpMwHe9Oa{Yz
z;+bq?;Pk*Ll9O*U>P7L|S}1WMr;3fz(ruWws6sGZm%Jggv5<C#jeEIJ*{FRKL7WIU
zSutHfA!O^MZd01@mWm%$8&0`Y`<B4h&c50#O4&M;dpS#VkAot(5K|||!Tb28wh48o
z!b-JZ6Q=Ram}WwZERQ%i?GY#G#+LQsuMJawL?vSKlbF^b{ycd1%i-!ljal1POy*oK
zIHN$3x+JERD6Jjkmczu!naWMC)NiXykg>j)nZ!me>IOdYNI8sDomnC|kL``MbQ~4(
z95BoQwM;6s{lMZrY=*+l5s|^|ezJCFLyag`tJT0|##VglN9iS~pN3~S+SG;Gw<J`E
z0FOocG(1#Kd%<O!U?x!cC!aLnvt4>pc(aJNIc_co$5F8{<A5|GpS1%vd==|EFG(Fk
znb7blM<+_7VDwIin_Y|1A5=<NiYZ%U&WvOkS=_c7ZRKbKz0CMKIGMi^{<=bVKPCev
z+5B^kaPe7E+pC3RuPls@>B$n)`sh5gv=!~$#N1B3n1c9qSQ0}MIGhT+kt6n~54nv!
zbS-K`Gjog7N$6*&Fe{0%^3mTM^aaP+D)dhS>O$Izj2|*q)33y}R=Beba&RjsKxrCb
zwIo7Tk5evo!hoU_-3XaRS<?ZY?+K*1aQZ>X_GjTd2N=ljhJw=8g+s+aNyM2XX{vB^
zQ#zYjnZH6Q78@6)&xSXnTP;nWF`6+Fjdx2p(3ES@KZ{p5mf3?X!g)yt2l{mEY{(!w
zOpK#LXnAOomRTj_Kr@>Bo3K93UI}>z*j=t^(}9BD``e?GBY_$RwUZwF(P0uwLUNmM
zhQ-5`$cI9G!oG{mKw}FtP!G5=$C@3UY;PrHQ2ypD-ieh`vZpG+OKKF{W1MR_Pi!cR
zzM*M^+GkE{R!ZkN&OwxT90Q^3qWcGU7;2NW%HoZ-m~PmNwyc6a2P}p@*6f{ytDy7L
zV|T>D6rCpvQ@mD52`4;f&6`=$=xoSHYIdaCHfh~Le$Gx(DhrFzPdT?5*9avMT^MwN
z8W(3oH*5Z>jISu`(#J!W$U~Gej5&D|+D@G>s$->gh{c=fbE&Dnk<TS~(;CNFTu_jV
zoCD~94s8WvJ)kXYPm!EoBUVATq;5q{>P4Xq6PuB&k&@N_tV3uMu}A6DCN)KN9+Tvy
zN_w2GFWOCJ^@NfnInxzMt07o~$=al8P)36^nyJVTGxDtwmfq`TR$=XF$H`1MaRJ8v
zG0=rM=6uL;BeQ(yE1`A{+F5gLdMPF6T8ld?mz?AXj$b;@qh35DNw;)ttAqpCf1F)u
zDMxrL4fb@<h4yke4YUC<tC)MtLhLJ>581g0d&?H^P0=VVl4Z{PaQ-ezYs%wjq^-=_
ziS)E+md*FHosHjN8)gV{?bZUeBa<}C!nP80=P1557(tZFDUx)-(6AdBO$~zMlN=eg
z-n>}_onSdeaSKwg*UVB@)NfW>hBu1SWjJ*j=?iQ2siZ9GyjR1wlp!aEfjP9;GB8`?
zwURm;JuITIH8RpiSdlGi*|O=mE3*wNpM%Z-H*Ev`$-jZr;3%+Wk;?I{0}u9s3q@`a
zlO=t!Fcq||1&|oVza-<^vJNWgrPrV)>3mB&=PK6Hk{;<YJ408sYMS1kN$*?<?P5sS
zD)8=DT3qG*(GcjHMfUy>G1Bg$d^{JN(u&`mam#JAk^8jWL<6yA?5sJbXdbCqToO+u
z+*7dUIL=G)U^<r!wP(|@4ZUZxXjK75OA45oHz%`9TiJR4D)eaykGCadvu4!7>`Cem
zR~s$1YbifFGNc0SG?8DHW?u={7;7eD#+jF#|0}~=+CtALY2>RYmi$T6y2F*EQv*w7
z8|WNgm62W?wxlho+gjMNc;0aEM%2pqe#}Zs#9`BIUlFNW?D?kGi5icYGm)D!NKxK3
zuuP4ez-<9Wm!_p)R(Pn%#XPZ=?VB|^R-#_vb|I8q(3Xcd%F1XHmanf8{tR`k^!b*l
z#Djjs&__T)9%t~prE#Ro)f9WjqGkF#UbaUp?JkQ$=~<`0KH|wD`-dBlx}Yu7yKQV+
z8CRC9%Hp7PC?me^TB6@NsmpN_7iWqNtR$NC4a)W<$jjpo^c;j6wU)@5DGx=_*S-yD
zmZP4uu#9hsJ|=QK{T5p#hU16pp2SZt2>r65*LVqJN9f;W4bDeC<I`P;9JJP!h-bM2
zwhu?bRw*|uV+qbF8PCuX%dSYQ0M;hCFwA451g+cTN~)PVT7~lT8Mh)u)K5dS=}1db
z*Io&rce-%(OxP<$s{q6B%oNXshVEe*G0)7tp|_greD=J977xP~+Z6Oi#@MywU?q|#
zv>&6Mu*PjAI3gdU(KLp-bHEzoX>(**Ibq4%bg8u#oM&v8Hmm`1#Br^~_-lvj`5`x4
zW3LlBT<2dzF1O@Mx->L19%r~Nkp`w_C9E4uR;ObPEoY7q?%fcN1M6mCsobV1>|qf7
zeqVe3C!NDRCJ}!fH8iQQM&va0S>r+GSmv*A+{MN=+hUEaESXdh-pS#3z6@pC^+-rW
zYuziW^h{|ru~71cgk(#UYH4wmjM!p7bJRbUJ(|u_Ay1~RlUw!6;xBGM<#_BwA9Idt
zmmZJmS2Uw1{d-Ken4B=h=0>Aen{DSMF&C{FaF>m-x7#s)vbW+ZpDgJ(mSoAVIPP+D
zA$=>%FS<w3j*+;Qo4y-L{K1yQ<`q_W!ee0%@z_YoQ`cs9WXjp+>WQ*f>O@(16m0GA
zJ8w@oMJ7j@hR2&cfHr#g)QO*6bB2$`9D6H&u|eh#o92(8bY8A7-5){eGyJi`Z@YcO
zZv>sm(}5$%&Vz*`$j&o~BgoF<jKeyoZ{&1%5^}=udxD23C)bugwm1R~nOZjj4zUkQ
zj)2w8Im;0=<guCi4xhk0-I;nUb9gfB?{yWEvAwA$8=pb-{3VsGV6VR!b=rKH&pv!1
z$Z4Nkpl2fiPX*YwNbL#dFH?86mbIWQEjHbPuFUh9ZaY+Hh5Jc+G0S==tbi`Uu89Tl
z{brVTB+HjrmQqD~BIA}tSu4TP(z9$s>ix7fV?MG<*F9)3RnOo4<DS12UzRz&QtY)f
zUf3)@qHR0JEn(xwUW`2_&0sX+1uyJ9kF46FwX?z~sT4zU<fr)sL*JJ12}gCX_U@!%
zFm+;z!oEOzESuRh!fyG$(<NqdJv-(t=F~JKOr^bpQLQW=RJsf<jf-9}b6N&iu{y@R
zB=}|RCP>G;93qJ4VvM&gcD`kZ-k`#o2KW4OCn0@8s11YV?W=rlV9$03zDZNV)mU#C
z$tetTUc&5pq(_-P$_CJp$LUeilDq7(>KotjTv*SEuvs%o)_hiG&Mw-U9v|zx#G!-_
z&g#Rgxh(0S<C-D0EVN_sak!vhUKCEinYbjp$buJIaJ>aDu;BR?j500%X1smnymcGF
z$+^hm92>i_a|tF5@LS`r68!WAW=Ld<;%SnMl4dK`4!9P$9GDAd1<5($akN%T(y(!)
z&}YhZtSzFC6rC_IIIUHLbZMBeT5@z!@@MfEWw(+1S*r!*C{Rf+g)3#@%0r9~Vkabf
zAoIA76eU?yuB41|^YuvT&2`qowGLseqump<a*Q+$45Yup@ZtIA6)QTobapqi<y@FY
z<}^KixP4h*Jrg(KddCAKF%Ih(aGrqq5L_u>e+aG@5K`SFzJ?$!fR}OuRP};+c8IxN
zFfRotnCk`e3V?#SUNAQT6wLL4c_l!>oQp6^-ke~b5~9ipW)@^(1@j_+f;lIcS*~Et
z3Feal3TBn0Ree25md7+d8H+pa5xX6E4Xq^cH4&I&Y%4&MH&5^qfC1?UUI;KC9l`Sf
z2Bagn3!q@Os!=bPo6t*!R)V<+ISsA)nYT&Z5TF_~;IHt)?ZX8{1fKzBL!6+20jiu}
zo*iP&3Ff6C=A2+&5n|2>X7-U_wn&%Dfwc0N2HK=!EJ<gGQ%~@15h!^{NfVoA?3Dlm
z(h($K1JV&(4=^Ad!F$5I^@4eO*rNIXb3{6WDk2@hOTq@$4-#Y_Ndt3=AUj2Bl@rXn
zLd;fsb5iFfB$Zm_`k9w~WKaoaj<Q?XDGAb*yYZ)b{|+5uS3w+Zz+~2rKeLUjdjAeL
z5b-vj>is*r?UJ6qV?oP|)U-cet@r=D|MBYmKgKz|yYBzlBPmXHrlJ}=efW+AUf5K<
z|3^FxV&N5e-)I%a?;tuAnnbuai&j2;7WB2y(vaO;L*2z!z5fR%ajN(K_|Q?4oJN>_
zJFz&)Uw+cMPxC&kM&9cEKfKP;+{#qWL)B3jz191FK&$HgKV}CdrFkijUzSI$djC)2
zMnB8bp1$%?@=gNF7nn6u6jnXxf34pC6YhiNRkhXoe~Qo6WSpt4P0qMk+!tSWs^0&T
zb`PUj*`iyidjC&3-NdYynA02Kc>y}!Xv`s4Cu6dBvmhC{VphHX$KI*24pfPsOpG)D
zYYt1(y3Ja1_5L5xoUC=t^tqpF+lJGt_x}`b*v-;5tM~s@@Bb-qOZo^4cY0B-iJ!{a
zx0;^2%pMqPPe|o+Q1$+w>is{J-S}O-|7Y;fq!p6BLx^5O?tV5}NC~}hNZ7dFDC6F4
zO9o`^rmFy>Wpx?-ILnjA<>~7EKc#joMH0W#eekf#Xd&<x|KfdB?7t0JyY5E5iehnT
zn$}&t|0n)GZB+0730C7`drYqYA6M`HNxL<*8DqYB|4$1fUSYp@_5PpO>X@+^s`vjy
zGh?``xtyP<vR%uG|J`S(I|nQaE^Ur1dnV6XUrE<3D?E8PB+pOAj&{q-nQo<)K9y5K
z2Od%lL(7>fO4a*+j9$o-PR3tH8NpxS?*5p}sNVmBJsmv%QM~RH@?`b?pMw9Y5{dcu
zz5gfee>N&BK`kkqE<wxq(JU#PF6Ane!q#q~EZ<!9{5Mx4%iF!x^S`AfS@ry{`OlKM
zepNmHYoFrGmO9n*zvch8O0!FXdw96+Up@b8-;7&5|0{cg3%8|K&;P<VZT{C`Ghav6
zxus!MqH9*q|Kflo&aC3-NcH?Lj+2ra)$_mqkI(=1x%qrPI4C8Dg>g12IyWVUg&E7E
z)8;gEJ;8THV2<GR5h$p5k~%m#&Dair>&ZxJkl-eO!O>}gcZ7-S1@m^qN#c6J{I&=T
zFo&`I%zI_w=rlo|(KhFu6~X&M%sIh)Plzffn74zu%~|OHa|jCNR>TEIr-_Q^=!=g|
z_qqN3{fOnWQ?Y?I=@?7WNsClH!S_aBjvx=Ao7g<TH%6dfCM8YmAY;1#2BagnBaE#V
z%-bVs2<CT1pkTf}0t3u91gHcv`zRnCG4njTl$#UGcZ7L!f|-3}5({SbkpTnDAt;!6
zj=mJ>c#{MPr__LQOOTGSB%QPuw+H}yUj*g|-VlL#f^Uhyeu8}wC<T#{0qGcfYXk~r
z79>r;A$!EKj|?c7*+&Kx%<LlrMwkV}JrKxy7h(-x31;?@i51K&NT>lGL}HF30}5u2
zBLha5OOh^NvyeDRuFFTUD@oYA+*UCjm<=emRm_OMe0BU+$G?%$0TWlp|3B3D=VU)S
z5(jcy%>sZT{W0|+b}>MaX#J67k=TBbEPI8C`$e+wS{xHA_uzODD41E0i51NA019T5
zf`2Lk1@qVl6wDJMP%s}5fr8nOK*7v{1T&BdW@2}#f)H#f6PuUYYMw)EAUb(@jRGR6
zb6)h|DG?~Q)y$4SxvgdqguRrTm)mN1?~e?te!=`aK-2u-9-JU?zhE98=Is~EGa^th
z&yGOB%svv#gM#_T01YJr%weoxW*?cvf|-3}K*7vDGN524=>$Z}6Qq;rjT2ZY!sg|+
znx_yOkd7D7JQEQoxSc1^vGQ_T&FoME%gb#wy!S`S&C6{yyqoD(c3Hn*<`qH#>4^C`
zB$aCP2bhDr{eqc&B&hlYGyBMZf|++S3Fbk;{4BtLbi~X)lEi}n<}k5f<~(Zh3TDou
z1{BOBoq!hUFx3NdIiAdmwz>;>SF*i%(N=e%PSW1IXsf#-TFGn${HBt5(N=jkla!km
z4V&z}lc@Ry^Ope%s(!)z6mkZnqiV}OGQ<fm2dMf5Gw)^+%>9Cy{4AIU1@qGY1JW5(
z5$OnW97*260CSjEFp~)lD#1+R2#A&;uX$V!Sn5fU_GZQA6=$mlkaxX8;=E|9_lFJ4
zi?&L=UmBPfZIyR38CnI}Y6yz9N)tk=(Jz?UDT29QFz*U6_X}qBQ9wFYgLg9-S_x)0
z!Jrb%?3AZj$w9&VB*1`l%*#FsxQ-ylQ9wF^WPU+47+?-j31*T`Frz>uHjflU(y<9r
zkQECdirD+YSO^Ay)cXysL|dh8W@shaD#yN51B66ks>KG3`ba>?W5n)6tdt8G1CV`W
zXeF3wn;BXOW|nL63T750EdqqR?0o?-i~vS0g18F6fOH`kkS+uTGe{LAHmC$MX*HnS
zr1_!7gl{GwI)3+e;Wuv(F%R$%aY*?9*Cf0tq>lf7S#qMd;gyMM4mT$<7MEF`LZbuv
z;4Amy;CfQ&T7LB9F`MrgB$MzlsRF8%$2KOyh8%-OBH!R8Y|9&nW(UdfRkn=y0+h-@
z7Iwi42oH|JAi|5cqgJK5rSMMkl;IHW&*c82X1F+7@oDy-o4Y09qaM_1f?9F*y5(D2
zH+MF-_4aP=*x18%pfprg7ixkc@s^b^71^ZuM&2^L^%N?rl;N}R4ZleQ=9J&W8$32f
INr#WW0e?>J6951J

diff --git a/library/simplepie/demo/for_the_demo/top_gradient.gif b/library/simplepie/demo/for_the_demo/top_gradient.gif
deleted file mode 100644
index f77bd38f97bb39339a19d79a31dbdb97c279b5b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1378
zcmd6lc~6rE0Eep}#c47U9WWK`hEW7OG8bTRe`s)sfNseg;G)pYMapGdJW#VuCek9{
zqE-vxtPb1Kavv>F4iP9vfudE~(w4rx-lOf?`!2N8Z?PxO2Y8a-@6_p(q;G!t3iA^N
z#9;jXz`EbRw(j?>`#o#x-nDhNZ_VXhb9#LakI(M$+1y^M+iP)o%r1|~<uN+lCa1^X
zaH9^l&hFCNU5L#ITb+>A0a_edi$iU;Ys_|)$)+^f0FzB&v;s!kDr%LZR;j@vGgwyi
zW{J)$)|o_zX&EuShmG$(2%$m<eFLIzA#@2e2(*Sptzki<pV#R5YTcYlH>*NsmB@?|
znFe4U08c5PNd+{afL^ac<E!8+IXLz~nRZmB9g%9dE9&7D&5%SrC{c67ssXWzEmHQ2
zl$ie?UwDEsSWEyD|1s_3CKzm>^z6N|`{hJZ#e>SK>W2@`JbL_u{PY>6hMZnk-_Y39
zOnu&%(ejc;XS6a|^t6u7uI`@RzW(mh1A{}{;gQiX?y1)klT*Cunc1n-`GrNn(wnzJ
zLCUg7ELoAt<f{rmDgRER1tA#G>7kQGli6am*&UW-x5w-I@PvTxe(0{$F6ww$=(g~!
zue+X4kiw$V8r)$OQ&o{i3uH6hmw0<{$(6fK_q5ECqyJ=FnC*GVuQ_swZ8*_OTc}UE
zrjy+!lLXDj%RY%p>mw{hrIKSW&h@nl>FGC88`Juk?^)TsnG56nEKw(ZqB6?&8A;Mh
z5Hc_F*~Ke6uLjg}jp>{YIrmyIEa!7N6=S7ATXts*Tm^PiY>Ug8ALv$3SLLTRWeoOc
z`L##0n#KovApteHYWMniA|hn`$jVt5x}l5gy2Nif!)2q=-duQffy*%|UX{6sCx!<s
z>KSre?q9NU8?^Lqdh^+lJN9sKZ=qswgzGX%&sXgEestJlgM~G@<D(-!ms!nk4&;=t
z``k9YLNIpMza0}21C$1b6M(;iUQmI1TN7ZQEG$I~Y~G$pP?kqtW+;gfb%2tDBgUvI
z_EHF{2QjqlFE_`tVO7-;UW~f>Fa@uEm;^G^|9tDLRfirAIiPuTGCW`NIJuIl2|US2
zKs4kZQY3pr&t>LopJiWe)l#yEfVKutJOI}IM)@4X5@@YpT@f1r>kIGTpoZ(q`B396
z@O&Qj4<`aOmxjc`)Vo*k@bij&O!!50LR}2@QA#Y*@-(vmc}XsyBD98^I)qLouH=Wb
zPzrRd3>s6%r2h)&SY5nWeOur14*jM9kg4w&cIxz<+@EoVuF3F1L-))+mZ4`pp+0`o
zQc4`!_b#&#?H6WJQMT-+9_0W;X?w7SQfM56X)NOqbQUmj&Ad3%uzh*w;b1q&GL5b|
z^`<dj3eNm0IHJfr9=iX6IcRI5!8{RmD&8{r=`p-zY$`IZ&BEJN((ro_juda5*;`X&
zosB+9wa&$J3|9V;X_<B7*P<fZLK4(wTTF}tY=Yz1gZ8D95mDDSrtWXIzs*QQ?ZWhE
zoa5cOtYXLe?7WMP4HrsKhX_wP=oIJf#5*Mfdb@L_h=V$%SEuC(8?K9rUGiH{yKA*1
z0&poxv4`Bi{fOOeOvU~Vx2ihP=vG&4!Fe=Kv#xlwwRt(WF%2a~4@4y$^1{tQcrU`B
PcX)MeoTfWC%(4FfURf4^

diff --git a/library/simplepie/demo/for_the_demo/verdana.swf b/library/simplepie/demo/for_the_demo/verdana.swf
deleted file mode 100644
index baf03504737f3ff25b9a7279ef11b9a5ab06bb90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28575
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

diff --git a/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf b/library/simplepie/demo/for_the_demo/yanone-kaffeesatz-bold.swf
deleted file mode 100644
index c812a79dcf951f14f4332e8b98ad9dd2b903a179..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 76780
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
KVan(Gss9a8mXT%v

diff --git a/library/simplepie/demo/handler_image.php b/library/simplepie/demo/handler_image.php
deleted file mode 100644
index 49c3ec89b..000000000
--- a/library/simplepie/demo/handler_image.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-// This should be modifed as your own use warrants.
-
-require_once('../simplepie.inc');
-SimplePie_Misc::display_cached_file($_GET['i'], './cache', 'spi');
-?>
diff --git a/library/simplepie/demo/index.php b/library/simplepie/demo/index.php
deleted file mode 100644
index 1481ba917..000000000
--- a/library/simplepie/demo/index.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-// Start counting time for the page load
-$starttime = explode(' ', microtime());
-$starttime = $starttime[1] + $starttime[0];
-
-// Include SimplePie
-// Located in the parent directory
-include_once('../simplepie.inc');
-include_once('../idn/idna_convert.class.php');
-
-// Create a new instance of the SimplePie object
-$feed = new SimplePie();
-
-//$feed->force_fsockopen(true);
-
-// Make sure that page is getting passed a URL
-if (isset($_GET['feed']) && $_GET['feed'] !== '')
-{
-	// Strip slashes if magic quotes is enabled (which automatically escapes certain characters)
-	if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
-	{
-		$_GET['feed'] = stripslashes($_GET['feed']);
-	}
-	
-	// Use the URL that was passed to the page in SimplePie
-	$feed->set_feed_url($_GET['feed']);
-	
-	// XML dump
-	$feed->enable_xml_dump(isset($_GET['xmldump']) ? true : false);
-}
-
-// Allow us to change the input encoding from the URL string if we want to. (optional)
-if (!empty($_GET['input']))
-{
-	$feed->set_input_encoding($_GET['input']);
-}
-
-// Allow us to choose to not re-order the items by date. (optional)
-if (!empty($_GET['orderbydate']) && $_GET['orderbydate'] == 'false')
-{
-	$feed->enable_order_by_date(false);
-}
-
-// Allow us to cache images in feeds.  This will also bypass any hotlink blocking put in place by the website.
-if (!empty($_GET['image']) && $_GET['image'] == 'true')
-{
-	$feed->set_image_handler('./handler_image.php');
-}
-
-// We'll enable the discovering and caching of favicons.
-$feed->set_favicon_handler('./handler_image.php');
-
-// Initialize the whole SimplePie object.  Read the feed, process it, parse it, cache it, and 
-// all that other good stuff.  The feed's information will not be available to SimplePie before 
-// this is called.
-$success = $feed->init();
-
-// We'll make sure that the right content type and character encoding gets set automatically.
-// This function will grab the proper character encoding, as well as set the content type to text/html.
-$feed->handle_content_type();
-
-// When we end our PHP block, we want to make sure our DOCTYPE is on the top line to make 
-// sure that the browser snaps into Standards Mode.
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<head>
-<title>SimplePie: Demo</title>
-
-<link rel="stylesheet" href="./for_the_demo/sIFR-screen.css" type="text/css" media="screen">
-<link rel="stylesheet" href="./for_the_demo/sIFR-print.css" type="text/css" media="print">
-<link rel="stylesheet" href="./for_the_demo/simplepie.css" type="text/css" media="screen, projector" />
-
-<script type="text/javascript" src="./for_the_demo/sifr.js"></script>
-<script type="text/javascript" src="./for_the_demo/sifr-config.js"></script>
-<script type="text/javascript" src="./for_the_demo/sleight.js"></script>
-
-</head>
-
-<body id="bodydemo">
-
-<div id="header">
-	<div id="headerInner">
-		<div id="logoContainer">
-			<div id="logoContainerInner">
-				<div align="center"><a href="http://simplepie.org"><img src="./for_the_demo/logo_simplepie_demo.png" alt="SimplePie Demo: PHP-based RSS and Atom feed handling" title="SimplePie Demo: PHP-based RSS and Atom feed handling" border="0" /></a></div>
-				<div class="clearLeft"></div>
-			</div>
-
-		</div>
-		<div id="menu">
-		<!-- I know, I know, I know... tables for layout, I know.  If a web standards evangelist (like me) has to resort 
-		to using tables for something, it's because no other possible solution could be found.  This issue?  No way to 
-		do centered floats purely with CSS. The table box model allows for a dynamic width while centered, while the 
-		CSS box model for DIVs doesn't allow for it. :( -->
-		<table cellpadding="0" cellspacing="0" border="0"><tbody><tr><td>
-<ul><li id="demo"><a href="./">SimplePie Demo</a></li><li><a href="http://simplepie.org/wiki/faq/start">FAQ/Troubleshooting</a></li><li><a href="http://simplepie.org/support/">Support Forums</a></li><li><a href="http://simplepie.org/wiki/reference/start">API Reference</a></li><li><a href="http://simplepie.org/blog/">Weblog</a></li><li><a href="../test/test.php">Unit Tests</a></li></ul>
-
-			<div class="clearLeft"></div>
-		</td></tr></tbody></table>
-		</div>
-	</div>
-</div>
-
-<div id="site">
-
-	<div id="content">
-
-		<div class="chunk">
-			<form action="" method="get" name="sp_form" id="sp_form">
-				<div id="sp_input">
-
-
-					<!-- If a feed has already been passed through the form, then make sure that the URL remains in the form field. -->
-					<p><input type="text" name="feed" value="<?php if ($feed->subscribe_url()) echo $feed->subscribe_url(); ?>" class="text" id="feed_input" />&nbsp;<input type="submit" value="Read" class="button" /></p>
-
-
-				</div>
-			</form>
-
-
-			<?php
-			// Check to see if there are more than zero errors (i.e. if there are any errors at all)
-			if ($feed->error())
-			{
-				// If so, start a <div> element with a classname so we can style it.
-				echo '<div class="sp_errors">' . "\r\n";
-
-					// ... and display it.
-					echo '<p>' . htmlspecialchars($feed->error()) . "</p>\r\n";
-
-				// Close the <div> element we opened.
-				echo '</div>' . "\r\n";
-			}
-			?>
-
-			<!-- Here are some sample feeds. -->
-			<p class="sample_feeds"><strong>Or try one of the following:</strong> 
-			<a href="?feed=http://www.詹姆斯.com/atomtests/iri/everything.atom" title="Test: International Domain Name support">詹姆斯.com</a>, 
-			<a href="?feed=http://www.adultswim.com/williams/podcast/tools/xml/video_rss.xml" title="Humor from the people who make [adult swim] cartoons.">adult swim</a>, 
-			<a href="?feed=http://afterdawn.com/news/afterdawn_rss.xml" title="Ripping, Burning, DRM, and the Dark Side of Consumer Electronics Media">Afterdawn</a>, 
-			<a href="?feed=http://feeds.feedburner.com/ajaxian" title="AJAX and Scripting News">Ajaxian</a>, 
-			<a href="?feed=http://www.andybudd.com/index.rdf&amp;image=true" title="Test: Bypass Image Hotlink Blocking">Andy Budd</a>, 
-			<a href="?feed=http://feeds.feedburner.com/AskANinja" title="Test: Embedded Enclosures">Ask a Ninja</a>, 
-			<a href="?feed=http://www.atomenabled.org/atom.xml" title="Test: Atom 1.0 Support">AtomEnabled.org</a>, 
-			<a href="?feed=http://newsrss.bbc.co.uk/rss/newsonline_world_edition/front_page/rss.xml" title="World News">BBC News</a>, 
-			<a href="?feed=http://newsrss.bbc.co.uk/rss/arabic/news/rss.xml" title="Test: Windows-1256 Encoding">BBC Arabic</a>, 
-			<a href="?feed=http://newsrss.bbc.co.uk/rss/chinese/simp/news/rss.xml" title="Test: GB2312 Encoding">BBC China</a>, 
-			<a href="?feed=http://newsrss.bbc.co.uk/rss/russian/news/rss.xml" title="Test: Windows-1251 Encoding">BBC Russia</a>, 
-			<a href="?feed=http://inessential.com/xml/rss.xml" title="Developer of NetNewsWire">Brent Simmons</a>, 
-			<a href="?feed=http://www.channelfrederator.com/rss" title="Test: Embedded Enclosures">Channel Frederator</a>, 
-			<a href="?feed=http://rss.cnn.com/rss/cnn_topstories.rss" title="World News">CNN</a>, 
-			<a href="?feed=http://digg.com/rss/index.xml" title="Tech news. Better than Slashdot.">Digg</a>, 
-			<a href="?feed=http://revision3.com/diggnation/feed/quicktime-large" title="Tech and industry videocast.">Diggnation</a>, 
-			<a href="?feed=http://www.flickr.com/services/feeds/photos_public.gne?format=rss2" title="Flickr Photos">Flickr</a>, 
-			<a href="?feed=http://news.google.com/?output=rss" title="World News">Google News</a>, 
-			<a href="?feed=http://video.google.com/videofeed?type=top100new&num=20&output=rss" title="Test: Media RSS Support">Google Video</a>, 
-			<a href="?feed=http://blogs.law.harvard.edu/home/feed/rdf/" title="Test: Tag Stripping">Harvard Law</a>, 
-			<a href="?feed=http://hagada.org.il/hagada/html/backend.php" title="Test: Window-1255 Encoding">Hebrew Language</a>, 
-			<a href="?feed=http://www.infoworld.com/rss/news.xml" title="Test: Ad Stripping">InfoWorld</a>, 
-			<a href="?feed=http://phobos.apple.com/WebObjects/MZStore.woa/wpa/MRSS/topsongs/limit=10/rss.xml&orderbydate=false" title="Test: Tag Stripping">iTunes</a>, 
-			<a href="?feed=http://blog.japan.cnet.com/lessig/index.rdf" title="Test: EUC-JP Encoding">Japanese Language</a>, 
-			<a href="?feed=http://nurapt.kaist.ac.kr/~jamaica/htmls/blog/rss.php&amp;input=EUC-KR" title="Test: EUC-KR Encoding">Korean Language</a>, 
-			<a href="?feed=http://mir.aculo.us/xml/rss/feed.xml" title="Weblog for the developer of Scriptaculous">mir.aculo.us</a>, 
-			<a href="?feed=http://images.apple.com/trailers/rss/newtrailers.rss" title="Apple's QuickTime movie trailer site">Movie Trailers</a>, 
-			<a href="?feed=http://www.newspond.com/rss/main.xml" title="Tech and Science News">Newspond</a>, 
-			<a href="?feed=http://nick.typepad.com/blog/index.rss" title="Developer of TopStyle and FeedDemon">Nick Bradbury</a>, 
-			<a href="?feed=http://feeds.feedburner.com/ok-cancel" title="Usability comics and commentary">OK/Cancel</a>, 
-			<a href="?feed=http://osnews.com/files/recent.rdf" title="News about every OS ever">OS News</a>, 
-			<a href="?feed=http://weblog.philringnalda.com/feed/" title="Test: Atom 1.0 Support">Phil Ringnalda</a>, 
-			<a href="?feed=http://kabili.libsyn.com/rss" title="Test: Improved enclosure type sniffing">Photoshop Videocast</a>, 
-			<a href="?feed=http://www.pariurisportive.com/blog/xmlsrv/rss2.php?blog=2" title="Test: ISO-8859-1 Encoding">Romanian Language</a>, 
-			<a href="?feed=http://www.erased.info/rss2.php" title="Test: KOI8-R Encoding">Russian Language</a>, 
-			<a href="?feed=http://www.upsaid.com/isis/index.rdf" title="Test: BIG5 Encoding">Traditional Chinese Language</a>, 
-			<a href="?feed=http://technorati.com/watchlists/rss.html?wid=29290" title="Technorati watch for SimplePie">Technorati</a>, 
-			<a href="?feed=http://www.tbray.org/ongoing/ongoing.atom" title="Test: Atom 1.0 Support">Tim Bray</a>, 
-			<a href="?feed=http://tuaw.com/rss.xml" title="Apple News">TUAW</a>, 
-			<a href="?feed=http://www.tvgasm.com/atom.xml&amp;image=true" title="Test: Bypass Image Hotlink Blocking">TVgasm</a>, 
-			<a href="?feed=http://uneasysilence.com/feed/" title="Interesting tech randomness">UNEASYsilence</a>, 
-			<a href="?feed=http://feeds.feedburner.com/web20Show" title="Test: Embedded Enclosures">Web 2.0 Show</a>, 
-			<a href="?feed=http://windowsvistablog.com/blogs/MainFeed.aspx" title="Test: Tag Stripping">Windows Vista Blog</a>, 
-			<a href="?feed=http://xkcd.com/rss.xml" title="Test: LightHTTPd and GZipping">XKCD</a>, 
-			<a href="?feed=http://rss.news.yahoo.com/rss/topstories" title="World News">Yahoo! News</a>, 
-			<a href="?feed=http://youtube.com/rss/global/top_favorites.rss" title="Funny user-submitted videos">You Tube</a>, 
-			<a href="?feed=http://zeldman.com/rss/" title="The father of the web standards movement">Zeldman</a></p>
-
-		</div>
-
-		<div id="sp_results">
-
-			<!-- As long as the feed has data to work with... -->
-			<?php if ($success): ?>
-				<div class="chunk focus" align="center">
-
-					<!-- If the feed has a link back to the site that publishes it (which 99% of them do), link the feed's title to it. -->
-					<h3 class="header"><?php if ($feed->get_link()) echo '<a href="' . $feed->get_link() . '">'; echo $feed->get_title(); if ($feed->get_link()) echo '</a>'; ?></h3>
-
-					<!-- If the feed has a description, display it. -->
-					<?php echo $feed->get_description(); ?>
-
-				</div>
-
-				<!-- Add subscribe links for several different aggregation services -->
-				<p class="subscribe"><strong>Subscribe:</strong> <a href="<?php echo $feed->subscribe_bloglines(); ?>">Bloglines</a>, <a href="<?php echo $feed->subscribe_google(); ?>">Google Reader</a>, <a href="<?php echo $feed->subscribe_msn(); ?>">My MSN</a>, <a href="<?php echo $feed->subscribe_netvibes(); ?>">Netvibes</a>, <a href="<?php echo $feed->subscribe_newsburst(); ?>">Newsburst</a><br /><a href="<?php echo $feed->subscribe_newsgator(); ?>">Newsgator</a>, <a href="<?php echo $feed->subscribe_odeo(); ?>">Odeo</a>, <a href="<?php echo $feed->subscribe_podnova(); ?>">Podnova</a>, <a href="<?php echo $feed->subscribe_rojo(); ?>">Rojo</a>, <a href="<?php echo $feed->subscribe_yahoo(); ?>">My Yahoo!</a>, <a href="<?php echo $feed->subscribe_feed(); ?>">Desktop Reader</a></p>
-
-
-				<!-- Let's begin looping through each individual news item in the feed. -->
-				<?php foreach($feed->get_items() as $item): ?>
-					<div class="chunk">
-
-						<?php
-						// Let's add a favicon for each item. If one doesn't exist, we'll use an alternate one.
-						if (!$favicon = $feed->get_favicon())
-						{
-							$favicon = './for_the_demo/favicons/alternate.png';
-						}
-						?>
-
-						<!-- If the item has a permalink back to the original post (which 99% of them do), link the item's title to it. -->
-						<h4><img src="<?php echo $favicon; ?>" alt="Favicon" class="favicon" /><?php if ($item->get_permalink()) echo '<a href="' . $item->get_permalink() . '">'; echo $item->get_title(); if ($item->get_permalink()) echo '</a>'; ?>&nbsp;<span class="footnote"><?php echo $item->get_date('j M Y, g:i a'); ?></span></h4>
-
-						<!-- Display the item's primary content. -->
-						<?php echo $item->get_content(); ?>
-
-						<?php
-						// Check for enclosures.  If an item has any, set the first one to the $enclosure variable.
-						if ($enclosure = $item->get_enclosure(0))
-						{
-							// Use the embed() method to embed the enclosure into the page inline.
-							echo '<div align="center">';
-							echo '<p>' . $enclosure->embed(array(
-								'audio' => './for_the_demo/place_audio.png',
-								'video' => './for_the_demo/place_video.png',
-								'mediaplayer' => './for_the_demo/mediaplayer.swf',
-								'altclass' => 'download'
-							)) . '</p>';
-
-							if ($enclosure->get_link() && $enclosure->get_type())
-							{
-								echo '<p class="footnote" align="center">(' . $enclosure->get_type();
-								if ($enclosure->get_size())
-								{
-									echo '; ' . $enclosure->get_size() . ' MB';								
-								}
-								echo ')</p>';
-							}
-							if ($enclosure->get_thumbnail())
-							{
-								echo '<div><img src="' . $enclosure->get_thumbnail() . '" alt="" /></div>';
-							}
-							echo '</div>';
-						}
-						?>
-
-						<!-- Add links to add this post to one of a handful of services. -->
-						<p class="footnote favicons" align="center">
-							<a href="<?php echo $item->add_to_blinklist(); ?>" title="Add post to Blinklist"><img src="./for_the_demo/favicons/blinklist.png" alt="Blinklist" /></a>
-							<a href="<?php echo $item->add_to_blogmarks(); ?>" title="Add post to Blogmarks"><img src="./for_the_demo/favicons/blogmarks.png" alt="Blogmarks" /></a>
-							<a href="<?php echo $item->add_to_delicious(); ?>" title="Add post to del.icio.us"><img src="./for_the_demo/favicons/delicious.png" alt="del.icio.us" /></a>
-							<a href="<?php echo $item->add_to_digg(); ?>" title="Digg this!"><img src="./for_the_demo/favicons/digg.png" alt="Digg" /></a>
-							<a href="<?php echo $item->add_to_magnolia(); ?>" title="Add post to Ma.gnolia"><img src="./for_the_demo/favicons/magnolia.png" alt="Ma.gnolia" /></a>
-							<a href="<?php echo $item->add_to_myweb20(); ?>" title="Add post to My Web 2.0"><img src="./for_the_demo/favicons/myweb2.png" alt="My Web 2.0" /></a>
-							<a href="<?php echo $item->add_to_newsvine(); ?>" title="Add post to Newsvine"><img src="./for_the_demo/favicons/newsvine.png" alt="Newsvine" /></a>
-							<a href="<?php echo $item->add_to_reddit(); ?>" title="Add post to Reddit"><img src="./for_the_demo/favicons/reddit.png" alt="Reddit" /></a>
-							<a href="<?php echo $item->add_to_segnalo(); ?>" title="Add post to Segnalo"><img src="./for_the_demo/favicons/segnalo.png" alt="Segnalo" /></a>
-							<a href="<?php echo $item->add_to_simpy(); ?>" title="Add post to Simpy"><img src="./for_the_demo/favicons/simpy.png" alt="Simpy" /></a>
-							<a href="<?php echo $item->add_to_spurl(); ?>" title="Add post to Spurl"><img src="./for_the_demo/favicons/spurl.png" alt="Spurl" /></a>
-							<a href="<?php echo $item->add_to_wists(); ?>" title="Add post to Wists"><img src="./for_the_demo/favicons/wists.png" alt="Wists" /></a>
-							<a href="<?php echo $item->search_technorati(); ?>" title="Who's linking to this post?"><img src="./for_the_demo/favicons/technorati.png" alt="Technorati" /></a>
-						</p>
-
-					</div>
-
-				<!-- Stop looping through each item once we've gone through all of them. -->
-				<?php endforeach; ?>
-
-			<!-- From here on, we're no longer using data from the feed. -->
-			<?php endif; ?>
-
-		</div>
-
-		<div>
-			<!-- Display how fast the page was rendered. -->
-			<p class="footnote">Page processed in <?php $mtime = explode(' ', microtime()); echo round($mtime[0] + $mtime[1] - $starttime, 3); ?> seconds.</p>
-
-			<!-- Display the version of SimplePie being loaded. -->
-			<p class="footnote">Powered by <a href="<?php echo SIMPLEPIE_URL; ?>"><?php echo SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . ', Build ' . SIMPLEPIE_BUILD; ?></a>.  Run the <a href="../compatibility_test/sp_compatibility_test.php">SimplePie Compatibility Test</a>.  SimplePie is &copy; 2004&ndash;<?php echo date('Y'); ?>, Ryan Parman and Geoffrey Sneddon, and licensed under the <a href="http://www.opensource.org/licenses/bsd-license.php">BSD License</a>.</p>
-		</div>
-
-	</div>
-
-</div>
-
-</body>
-</html>
diff --git a/library/simplepie/demo/minimalistic.php b/library/simplepie/demo/minimalistic.php
deleted file mode 100644
index 56509c00c..000000000
--- a/library/simplepie/demo/minimalistic.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-function microtime_float()
-{
-	if (version_compare(phpversion(), '5.0.0', '>='))
-	{
-		return microtime(true);
-	}
-	else
-	{
-		list($usec, $sec) = explode(' ', microtime());
-		return ((float) $usec + (float) $sec);
-	}
-}
-
-$start = microtime_float();
-
-include('../simplepie.inc');
-
-// Parse it
-$feed = new SimplePie();
-if (!empty($_GET['feed']))
-{
-	if (get_magic_quotes_gpc())
-	{
-		$_GET['feed'] = stripslashes($_GET['feed']);
-	}
-	$feed->set_feed_url($_GET['feed']);
-	$feed->init();
-}
-$feed->handle_content_type();
-
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><?php echo (empty($_GET['feed'])) ? 'SimplePie' : 'SimplePie: ' . $feed->get_title(); ?></title>
-
-<!-- META HTTP-EQUIV -->
-<meta http-equiv="content-type" content="text/html; charset=<?php echo ($feed->get_encoding()) ? $feed->get_encoding() : 'UTF-8'; ?>" />
-<meta http-equiv="imagetoolbar" content="false" />
-
-<style type="text/css">
-html, body {
-	height:100%;
-	margin:0;
-	padding:0;
-}
-
-h1 {
-	background-color:#333;
-	color:#fff;
-	font-size:3em;
-	margin:0;
-	padding:5px 15px;
-	text-align:center;
-}
-
-div#footer {
-	padding:5px 0;
-}
-
-div#footer,
-div#footer a {
-	text-align:center;
-	font-size:0.7em;
-}
-
-div#footer a {
-	text-decoration:underline;
-}
-
-code {
-	background-color:#f3f3ff;
-	color:#000;
-}
-
-pre {
-	background-color:#f3f3ff;
-	color:#000080;
-	border:1px dotted #000080;
-	padding:3px 5px;
-}
-
-form {
-	margin:0;
-	padding:0;
-}
-
-div.chunk {
-	border-bottom:1px solid #ccc;
-}
-
-form#sp_form {
-	text-align:center;
-	margin:0;
-	padding:0;
-}
-
-form#sp_form input.text {
-	width:85%;
-}
-</style>
-
-</head>
-
-<body>
-	<h1><?php echo (empty($_GET['feed'])) ? 'SimplePie' : 'SimplePie: ' . $feed->get_title(); ?></h1>
-
-	<form action="" method="get" name="sp_form" id="sp_form">
-		<p><input type="text" name="feed" value="<?php echo ($feed->subscribe_url()) ? htmlspecialchars($feed->subscribe_url()) : 'http://'; ?>" class="text" id="feed_input" />&nbsp;<input type="submit" value="Read" class="button" /></p>
-	</form>
-
-	<div id="sp_results">
-		<?php if ($feed->data): ?>
-			<?php $items = $feed->get_items(); ?>
-			<p align="center"><span style="background-color:#ffc;">Displaying <?php echo $feed->get_item_quantity(); ?> most recent entries.</span></p>
-			<?php foreach($items as $item): ?>
-				<div class="chunk" style="padding:0 5px;">
-					<h4><a href="<?php echo $item->get_permalink(); ?>"><?php echo $item->get_title(); ?></a> <?php echo $item->get_date('j M Y'); ?></h4>
-					<?php echo $item->get_content(); ?>
-					<?php
-					if ($enclosure = $item->get_enclosure(0))
-						echo '<p><a href="' . $enclosure->get_link() . '" class="download"><img src="./for_the_demo/mini_podcast.png" alt="Podcast" title="Download the Podcast" border="0" /></a></p>';
-					?>
-				</div>
-			<?php endforeach; ?>
-			</div>
-		<?php endif; ?>
-	</div>
-
-	<div id="footer">
-		Powered by <?php echo SIMPLEPIE_LINKBACK; ?>, a product of <a href="http://www.skyzyx.com">Skyzyx Technologies</a>.<br />
-		Page created in <?php echo round(microtime_float()-$start, 3); ?> seconds.
-	</div>
-</body>
-</html>
diff --git a/library/simplepie/demo/multifeeds.php b/library/simplepie/demo/multifeeds.php
deleted file mode 100644
index b23d792a2..000000000
--- a/library/simplepie/demo/multifeeds.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/********************************************************************
-MULTIFEEDS TEST PAGE
-
-Nothing too exciting here.  Just a sample page that demos integrated 
-Multifeeds support as well as cached favicons and perhaps a few other 
-things.
-
-Lots of this code is commented to help explain some of the new stuff.  
-Code was tested in PHP 5.2.2, but *should* also work with earlier 
-versions of PHP, as supported by SimplePie (PHP 4.1).
-
-********************************************************************/
-
-// Include the SimplePie library, and the one that handles internationalized domain names.
-require_once('../simplepie.inc');
-require_once('../idn/idna_convert.class.php');
-
-// Initialize some feeds for use.
-$feed = new SimplePie();
-$feed->set_feed_url(array(
-	'http://rss.news.yahoo.com/rss/topstories',
-	'http://news.google.com/?output=atom',
-	'http://rss.cnn.com/rss/cnn_topstories.rss'
-));
-
-// When we set these, we need to make sure that the handler_image.php file is also trying to read from the same cache directory that we are.
-$feed->set_favicon_handler('./handler_image.php');
-$feed->set_image_handler('./handler_image.php');
-
-// Initialize the feed.
-$feed->init();
-
-// Make sure the page is being served with the UTF-8 headers.
-$feed->handle_content_type();
-
-// Begin the (X)HTML page.
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">	
-<head>
-	<title>Multifeeds Test page</title>
-	<link rel="stylesheet" href="../demo/for_the_demo/simplepie.css" type="text/css" media="screen" title="SimplePie Styles" charset="utf-8" />
-	<style type="text/css">
-	div#site {
-		width:600px;
-	}
-	span.footnote {
-		white-space:nowrap;
-	}
-	h1 {
-		line-height:1.4em;
-	}
-	h4 {
-		padding-left:20px;
-		background-color:transparent;
-		background-repeat:no-repeat;
-		background-position:0 1px;
-	}
-	.clearBoth {
-		clear:both;
-	}
-	</style>
-</head>
-<body>
-<div id="site">
-
-	<?php if ($feed->error): ?>
-		<p><?=$feed->error()?></p>
-	<?php endif ?>
-
-	<div class="chunk">
-		<h1>Quick-n-Dirty Multifeeds Demo</a></h1>
-	</div>
-
-	<?php
-	// Let's loop through each item in the feed.
-	foreach($feed->get_items() as $item):
-
-	// Let's give ourselves a reference to the parent $feed object for this particular item.
-	$feed = $item->get_feed();
-	?>
-
-		<div class="chunk">
-			<h4 style="background-image:url(<?php echo $feed->get_favicon(); ?>);"><a href="<?php echo $item->get_permalink(); ?>"><?php echo html_entity_decode($item->get_title(), ENT_QUOTES, 'UTF-8'); ?></a></h4>
-
-			<!-- get_content() prefers full content over summaries -->
-			<?php echo $item->get_content(); ?>
-
-			<?php if ($enclosure = $item->get_enclosure()): ?>
-				<div>
-				<?php echo $enclosure->native_embed(array(
-					// New 'mediaplayer' attribute shows off Flash-based MP3 and FLV playback.
-					'mediaplayer' => '../demo/for_the_demo/mediaplayer.swf'
-				)); ?>
-				</div>
-			<?php endif; ?>
-
-			<p class="footnote">Source: <a href="<?php echo $feed->get_permalink(); ?>"><?php echo $feed->get_title(); ?></a> | <?php echo $item->get_date('j M Y | g:i a'); ?></p>
-		</div>
-
-	<?php endforeach ?>
-
-	<p class="footnote">This is a test of the emergency broadcast system.  This is only a test&hellip; beeeeeeeeeeeeeeeeeeeeeeeeeep!</p>
-
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/library/simplepie/demo/test.php b/library/simplepie/demo/test.php
deleted file mode 100644
index 5b9943abb..000000000
--- a/library/simplepie/demo/test.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-include_once('../simplepie.inc');
-include_once('../idn/idna_convert.class.php');
-
-// Parse it
-$feed = new SimplePie();
-if (isset($_GET['feed']) && $_GET['feed'] !== '')
-{
-	if (get_magic_quotes_gpc())
-	{
-		$_GET['feed'] = stripslashes($_GET['feed']);
-	}
-	$feed->set_feed_url($_GET['feed']);
-	$feed->enable_cache(false);
-	$starttime = explode(' ', microtime());
-	$starttime = $starttime[1] + $starttime[0];
-	$feed->init();
-	$endtime = explode(' ', microtime());
-	$endtime = $endtime[1] + $endtime[0];
-	$time = $endtime - $starttime;
-}
-else
-{
-	$time = 'null';
-}
-
-$feed->handle_content_type();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<title>SimplePie Test</title>
-<pre>
-<?php
-
-// memory_get_peak_usage() only exists on PHP 5.2 and higher if PHP is compiled with the --enable-memory-limit configuration option or on PHP 5.2.1 and higher (which runs as if --enable-memory-limit was on, with no option)
-if (function_exists('memory_get_peak_usage'))
-{
-	var_dump($time, memory_get_usage(), memory_get_peak_usage());
-}
-// memory_get_usage() only exists if PHP is compiled with the --enable-memory-limit configuration option or on PHP 5.2.1 and higher (which runs as if --enable-memory-limit was on, with no option)
-else if (function_exists('memory_get_usage'))
-{
-	var_dump($time, memory_get_usage());
-}
-else
-{
-	var_dump($time);
-}
-
-// Output buffer
-function callable_htmlspecialchars($string)
-{
-	return htmlspecialchars($string);
-}
-ob_start('callable_htmlspecialchars');
-
-// Output
-print_r($feed);
-ob_end_flush();
-
-?>
-</pre>
\ No newline at end of file

From a12a614e7e6c7d7b5e789d9c69396be55925c951 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 19 Mar 2017 19:43:00 -0700
Subject: [PATCH 047/299] attach_folder_rpaths() providing incorrect results

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

diff --git a/include/attach.php b/include/attach.php
index cbcdbc399..d7c1b9da4 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -2243,11 +2243,12 @@ function attach_folder_select_list($channel_id) {
 	if($r) {
 		foreach($r as $rv) {
 			$x = attach_folder_rpaths($r,$rv);
-			if($x)
+			if($x) {
 				$out[$x[0]] = $x[1];
+			}
 		}
 	}
-
+logger('results: ' . print_r($out,true));
 	return $out;
 }
 
@@ -2266,7 +2267,6 @@ function attach_folder_rpaths($all_folders,$that_folder) {
 					continue;
 				if($selected['hash'] == $parent_hash) {
 					$path         = '/' . $selected['filename'] . $path;
-					$current_hash = $selected['hash'];
 					$parent_hash  = $selected['folder'];
 					$found = true;
 					break;

From 78aeb50ce59b9d83d88b5e1bc9f82195635b0996 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 19 Mar 2017 21:39:28 -0700
Subject: [PATCH 048/299] add function attach_syspaths to calculate the
 contents of os_path and display_path; add this to the rename function. We
 will also need it to populate existing file/photo structures as an upgrade
 task.

---
 include/attach.php | 44 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/include/attach.php b/include/attach.php
index d7c1b9da4..93401226d 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -2212,10 +2212,23 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) {
 		intval($r[0]['id'])
 	);
 
+
+	$x = attach_syspaths($channel_id,$resource_id);
+
+	$t1 = q("update attach set os_path = '%s', display_path = '%s' where id = %d",
+		dbesc($x['os_path']),
+		dbesc($x['path']),
+		intval($r[0]['id'])
+	);
+
+
 	if($r[0]['is_photo']) {
-		$t = q("update photo set album = '%s', filename = '%s' where resource_id = '%s' and uid = %d",
+		$t = q("update photo set album = '%s', filename = '%s', os_path = '%s', display_path = '%s' 
+			where resource_id = '%s' and uid = %d",
 			dbesc($newdirname),
 			dbesc($filename),
+			dbesc($x['os_path']),
+			dbesc($x['path']),
 			dbesc($resource_id),
 			intval($channel_id)
 		);
@@ -2248,7 +2261,7 @@ function attach_folder_select_list($channel_id) {
 			}
 		}
 	}
-logger('results: ' . print_r($out,true));
+
 	return $out;
 }
 
@@ -2280,3 +2293,30 @@ function attach_folder_rpaths($all_folders,$that_folder) {
 
 	return (($error) ? false : [ $current_hash , $path ]);
 }
+
+
+function attach_syspaths($channel_id,$attach_hash) {
+
+	$os_path = '';
+	$path = '';
+	do {
+
+		$r = q("select folder, filename, hash from attach where hash = '%s' and uid = %d",
+			dbesc($attach_hash),
+			intval($channel_id)
+		);
+		if(! $r)
+			break;
+
+		$os_path = $r[0]['hash'] . (($os_path) ? '/' . $os_path : '');
+		$path = $r[0]['filename'] . (($path) ? '/' . $path : '');
+		$attach_hash = $r[0]['folder'];
+	}
+	while($attach_hash);
+
+	return [ 'os_path' => $os_path, 'path' => $path ];
+
+
+}
+
+

From da823125b92a4cb2a128e5b3e7c7298c4ee74be8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 15:24:47 -0700
Subject: [PATCH 049/299] remove redundant and non-functional/broken check for
 successfully cloned channel record which was left over from an earlier method
 of creating the table; which was deprecated a few months back.

---
 include/import.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/import.php b/include/import.php
index bbe930864..d0e15c89d 100644
--- a/include/import.php
+++ b/include/import.php
@@ -85,12 +85,6 @@ function import_channel($channel, $account_id, $seize) {
 		create_table_from_array('channel',$clean);
 	}
 
-	if(! $r) {
-		logger('mod_import: channel clone failed. ' . print_r($channel,true));
-		notice( t('Channel clone failed. Import failed.') . EOL);
-		return false;
-	}
-
 	$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
 		intval($account_id),
 		$channel['channel_guid']   // Already dbesc'd

From 7a611c6d47020d227630a96de8026da4dae5f862 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 18:14:50 -0700
Subject: [PATCH 050/299] create channel_store_lowlevel() and remove more
 diaspora stuff from core.

---
 include/channel.php              | 93 +++++++++++++++++++-------------
 view/tpl/profile_vcard.tpl       |  3 --
 view/tpl/profile_vcard_short.tpl |  4 --
 3 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/include/channel.php b/include/channel.php
index f88a2f8aa..465a1524a 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -242,24 +242,22 @@ function create_identity($arr) {
 
 	$expire = 0;
 
-	$r = q("insert into channel ( channel_account_id, channel_primary,
-		channel_name, channel_address, channel_guid, channel_guid_sig,
-		channel_hash, channel_prvkey, channel_pubkey, channel_pageflags, channel_system, channel_expire_days, channel_timezone )
-		values ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s' ) ",
-
-		intval($arr['account_id']),
-		intval($primary),
-		dbesc($name),
-		dbesc($nick),
-		dbesc($guid),
-		dbesc($sig),
-		dbesc($hash),
-		dbesc($key['prvkey']),
-		dbesc($key['pubkey']),
-		intval($pageflags),
-		intval($system),
-		intval($expire),
-		dbesc(App::$timezone)
+	$r = channel_store_lowlevel(
+		[ 
+			channel_account_id  => intval($arr['account_id']), 
+			channel_primary     => intval($primary),
+			channel_name        => $name, 
+			channel_address     => $nick, 
+			channel_guid        => $guid, 
+			channel_guid_sig    => $sig,
+			channel_hash        => $hash, 
+			channel_prvkey      => $key['prvkey'], 
+			channel_pubkey      => $key['pubkey'], 
+			channel_pageflags   => intval($pageflags), 
+			channel_system      => intval($system), 
+			channel_expire_days => intval($expire), 
+			channel_timezone    => App::$timezone
+		]
 	);
 
 	$r = q("select * from channel where channel_account_id = %d
@@ -1153,25 +1151,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 
 	// @fixme move this to the diaspora plugin itself
 
-	if(plugin_is_installed('diaspora')) {
-		$diaspora = array(
-			'podloc'     => z_root(),
-			'guid'       => $profile['channel_guid'] . str_replace('.','',App::get_hostname()),
-			'pubkey'     => pemtorsa($profile['channel_pubkey']),
-			'searchable' => (($block) ? 'false' : 'true'),
-			'nickname'   => $profile['channel_address'],
-			'fullname'   => $profile['channel_name'],
-			'firstname'  => $firstname,
-			'lastname'   => $lastname,
-			'photo300'   => z_root() . '/photo/profile/300/' . $profile['uid'] . '.jpg',
-			'photo100'   => z_root() . '/photo/profile/100/' . $profile['uid'] . '.jpg',
-			'photo50'    => z_root() . '/photo/profile/50/'  . $profile['uid'] . '.jpg',
-		);
-	}
-	else
-		$diaspora = '';
-
-
 	$contact_block = contact_block();
 
 	$channel_menu = false;
@@ -1204,7 +1183,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 		'$marital'       => $marital,
 		'$homepage'      => $homepage,
 		'$chanmenu'      => $channel_menu,
-		'$diaspora'      => $diaspora,
 		'$reddress'      => $reddress,
 		'$rating'        => '',
 		'$contact_block' => $contact_block,
@@ -1989,6 +1967,45 @@ function remote_login() {
 
 }
 
+function channel_store_lowlevel($arr) {
+    $store = [
+        'channel_account_id'      => ((array_key_exists('channel_account_id',$arr))      ? $arr['channel_account_id']      : '0'),
+        'channel_primary'         => ((array_key_exists('channel_primary',$arr))         ? $arr['channel_primary']         : '0'),
+        'channel_name'            => ((array_key_exists('channel_name',$arr))            ? $arr['channel_name']            : ''),
+        'channel_address'         => ((array_key_exists('channel_address',$arr))         ? $arr['channel_address']         : ''),
+        'channel_guid'            => ((array_key_exists('channel_guid',$arr))            ? $arr['channel_guid']            : ''),
+        'channel_guid_sig'        => ((array_key_exists('channel_guid_sig',$arr))        ? $arr['channel_guid_sig']        : ''),
+        'channel_hash'            => ((array_key_exists('channel_hash',$arr))            ? $arr['channel_hash']            : ''),
+        'channel_timezone'        => ((array_key_exists('channel_timezone',$arr))        ? $arr['channel_timezone']        : 'UTC'),
+        'channel_location'        => ((array_key_exists('channel_location',$arr))        ? $arr['channel_location']        : ''),
+        'channel_theme'           => ((array_key_exists('channel_theme',$arr))           ? $arr['channel_theme']           : ''),
+        'channel_startpage'       => ((array_key_exists('channel_startpage',$arr))       ? $arr['channel_startpage']       : ''),
+        'channel_pubkey'          => ((array_key_exists('channel_pubkey',$arr))          ? $arr['channel_pubkey']          : ''),
+        'channel_prvkey'          => ((array_key_exists('channel_prvkey',$arr))          ? $arr['channel_prvkey']          : ''),
+        'channel_notifyflags'     => ((array_key_exists('channel_notifyflags',$arr))     ? $arr['channel_notifyflags']     : '65535'),
+        'channel_pageflags'       => ((array_key_exists('channel_pageflags',$arr))       ? $arr['channel_pageflags']       : '0'),
+        'channel_dirdate'         => ((array_key_exists('channel_dirdate',$arr))         ? $arr['channel_dirdate']         : NULL_DATE),
+        'channel_lastpost'        => ((array_key_exists('channel_lastpost',$arr))        ? $arr['channel_lastpost']        : NULL_DATE),
+        'channel_deleted'         => ((array_key_exists('channel_deleted',$arr))         ? $arr['channel_deleted']         : NULL_DATE),
+        'channel_max_anon_mail'   => ((array_key_exists('channel_max_anon_mail',$arr))   ? $arr['channel_max_anon_mail']   : '10'),
+        'channel_max_friend_req'  => ((array_key_exists('channel_max_friend_req',$arr))  ? $arr['channel_max_friend_req']  : '10'),
+        'channel_expire_days'     => ((array_key_exists('channel_expire_days',$arr))     ? $arr['channel_expire_days']     : '0'),
+        'channel_passwd_reset'    => ((array_key_exists('channel_passwd_reset',$arr))    ? $arr['channel_passwd_reset']    : ''),
+        'channel_default_group'   => ((array_key_exists('channel_default_group',$arr))   ? $arr['channel_default_group']   : ''),
+        'channel_allow_cid'       => ((array_key_exists('channel_allow_cid',$arr))       ? $arr['channel_allow_cid']       : ''),
+        'channel_allow_gid'       => ((array_key_exists('channel_allow_gid',$arr))       ? $arr['channel_allow_gid']       : ''),
+        'channel_deny_cid'        => ((array_key_exists('channel_deny_cid',$arr))        ? $arr['channel_deny_cid']        : ''),
+        'channel_deny_gid'        => ((array_key_exists('channel_deny_gid',$arr))        ? $arr['channel_deny_gid']        : ''),
+        'channel_removed'         => ((array_key_exists('channel_removed',$arr))         ? $arr['channel_removed']         : '0'),
+        'channel_system'          => ((array_key_exists('channel_system',$arr))          ? $arr['channel_system']          : '0'),
+        'channel_moved'           => ((array_key_exists('channel_moved',$arr))           ? $arr['channel_moved']           : '')
+
+	];
+
+	return create_table_from_array('channel',$store);
+
+}
+
 
 
 function profile_store_lowlevel($arr) {
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 9bd534fd8..c17a7878c 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -49,9 +49,6 @@
 
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
 
-	{{if $diaspora}}
-	{{include file="diaspora_vcard.tpl"}}
-	{{/if}}
 
 </div>
 <div id="clear"></div>
diff --git a/view/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
index 0984a4e5f..5d87d52c6 100755
--- a/view/tpl/profile_vcard_short.tpl
+++ b/view/tpl/profile_vcard_short.tpl
@@ -30,10 +30,6 @@
 
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
 
-	{{if $diaspora}}
-	{{include file="diaspora_vcard.tpl"}}
-	{{/if}}
-
 <div id="clear"></div>
 
 {{$chanmenu}}

From 35fc7328de3237ef9727e6f729ffe4df4697a421 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 19:41:03 -0700
Subject: [PATCH 051/299] even more fine tuning of the markdown purifier -
 especially when used with the wiki

---
 Zotlabs/Lib/MarkdownSoap.php   | 2 +-
 Zotlabs/Lib/NativeWikiPage.php | 2 +-
 Zotlabs/Module/Wiki.php        | 1 +
 view/tpl/wiki.tpl              | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index 8cc18d513..cf1446f45 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -81,7 +81,7 @@ class MarkdownSoap {
 		$s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
 		$s = str_replace(' ','&nbsp;',$s);
 		$s = purify_html($s);
-		$s = str_replace('&nbsp;'," ",$s);
+		$s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
 		$s = str_replace(['<br>','<br />'],["\n","\n"],$s);
 		return $s;
 	}
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index 3d6da7779..960fe014e 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -156,7 +156,7 @@ class NativeWikiPage {
 			$content = $item['body'];
 
 			return [ 
-				'content' => json_encode($content), 
+				'content' => $content,
 				'mimeType' => $w['mimeType'], 
 				'message' => '', 
 				'success' => true
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 28e8fe328..b5801c3d7 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -255,6 +255,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 				goaway('/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName);
 		}
 		
+
 		$wikiModalID = random_string(3);
 
 		$wikiModal = replace_macros(get_markup_template('generic_modal.tpl'), array(
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index dbf8b9285..2865adec2 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -108,7 +108,7 @@
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
 //	window.wiki_page_content = "{{$content|escape:'javascript'}}";
-	window.wiki_page_content = {{$content}};
+	window.wiki_page_content = '{{$content|escape:'quotes'}}';
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');

From 8821986d87b36b8b5ea311bcb73d348dc0bed262 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 19:50:09 -0700
Subject: [PATCH 052/299] after all of this, I would be very hesitant to use
 any multi-user system which uses markdown and which doesn't have a large
 security budget.

---
 Zotlabs/Lib/MarkdownSoap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index cf1446f45..e5f3c81dd 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -82,7 +82,7 @@ class MarkdownSoap {
 		$s = str_replace(' ','&nbsp;',$s);
 		$s = purify_html($s);
 		$s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
-		$s = str_replace(['<br>','<br />'],["\n","\n"],$s);
+		$s = str_replace(['<br>','<br />', '&lt;', '&gt;' ],["\n","\n", '<', '>'],$s);
 		return $s;
 	}
 

From b153c651b45842b0062c0b32a1a3816a1f06856c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 21:53:39 -0700
Subject: [PATCH 053/299] perform attach_upgrade()

---
 Zotlabs/Daemon/Cron.php |  3 +++
 include/attach.php      | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index 350dda7a0..c84708ba4 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -121,6 +121,9 @@ class Cron {
 			}
 		}
 
+		require_once('include/attach.php');
+		attach_upgrade();
+
 		$abandon_days = intval(get_config('system','account_abandon_days'));
 		if($abandon_days < 1)
 			$abandon_days = 0;
diff --git a/include/attach.php b/include/attach.php
index 93401226d..c8582f8d3 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -2320,3 +2320,26 @@ function attach_syspaths($channel_id,$attach_hash) {
 }
 
 
+
+function attach_upgrade() {
+
+	$r = q("select id, uid, hash from attach where os_path = '' and display_path = '' limit 100");
+	if($r) {
+		foreach($r as $rv) {
+			$x = attach_syspaths($rv['uid'],$rv['hash']);
+			if($x) {
+				$w = q("update attach set os_path = '%s', display_path = '%s' where id = %d",
+					dbesc($x['os_path']),
+					dbesc($x['path']),
+					intval($rv['id'])
+				);
+				$y = q("update photo set os_path = '%s', display_path = '%s' where uid = %d and resource_id = '%s'",
+					dbesc($x['os_path']),
+					dbesc($x['path']),
+					intval($rv['uid']),
+					dbesc($rv['hash'])
+				);
+			}
+		}
+	}
+}
\ No newline at end of file

From 82631c3413b7fc7025f46cd23c17d3ea292cf16c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 00:40:19 -0700
Subject: [PATCH 054/299] more markdown purification

---
 Zotlabs/Lib/MarkdownSoap.php | 10 +++++-----
 view/tpl/wiki.tpl            |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index e5f3c81dd..a0214bbe4 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -77,12 +77,12 @@ class MarkdownSoap {
 	}
 
 	function purify($s) {
-		$s = str_replace("\n",'<br>',$s);
-		$s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
-		$s = str_replace(' ','&nbsp;',$s);
+//		$s = str_replace("\n",'<br>',$s);
+//		$s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
+//		$s = str_replace(' ','&nbsp;',$s);
 		$s = purify_html($s);
-		$s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
-		$s = str_replace(['<br>','<br />', '&lt;', '&gt;' ],["\n","\n", '<', '>'],$s);
+//		$s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
+//		$s = str_replace(['<br>','<br />', '&lt;', '&gt;' ],["\n","\n", '<', '>'],$s);
 		return $s;
 	}
 
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 2865adec2..c831ab33d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -107,8 +107,7 @@
 <script>
 	window.wiki_resource_id = '{{$resource_id}}';
 	window.wiki_page_name = '{{$page}}';
-//	window.wiki_page_content = "{{$content|escape:'javascript'}}";
-	window.wiki_page_content = '{{$content|escape:'quotes'}}';
+	window.wiki_page_content = '{{$content|escape:'javascript'}}';
 	window.wiki_page_commit = '{{$commit}}';
 
 	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');

From c1cc7bfc945e4da4150c9ed99dc11981767b4ccb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 17:14:58 -0700
Subject: [PATCH 055/299] update license

---
 LICENSE | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/LICENSE b/LICENSE
index bb0e40327..580742e56 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,20 +1,5 @@
 Copyright (c) 2010-2017 Mike Macgirvin
 All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Portions of this work created prior to March 2017 MAY be 
+available under the terms of the Hubzilla project license.

From bedc39342514a37d311274210f30a4abd14284fa Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 20:11:48 -0700
Subject: [PATCH 056/299] begin the process of using the relevant attach
 directory/path for photo albums instead of an album basename which may not be
 unique. Created an 'ellipsify()' function to shorten long names and keep the
 beginning and end intact

---
 Zotlabs/Module/Photos.php | 45 ++++++++++++------------------------
 include/photos.php        | 48 +++++++++++++++++++++++++++------------
 include/text.php          | 11 +++++++++
 view/tpl/photo_albums.tpl |  6 ++---
 4 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 582174d0e..598f1782d 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -92,13 +92,9 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 		if((argc() > 3) && (argv(2) === 'album')) {
 	
-			$album = hex2bin(argv(3));
-	
-			if($album === t('Profile Photos')) {
-				// not allowed
-				goaway(z_root() . '/' . $_SESSION['photo_return']);
-			}
-	
+			$album = argv(3);
+
+
 			if(! photos_album_exists($page_owner_uid,$album)) {
 				notice( t('Album not found.') . EOL);
 				goaway(z_root() . '/' . $_SESSION['photo_return']);
@@ -680,29 +676,16 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 		if($datatype === 'album') {
 	
-			if(strlen($datum)) {
-				if((strlen($datum) & 1) || (! ctype_xdigit($datum))) {
-					notice( t('Album name could not be decoded') . EOL);
-					logger('mod_photos: illegal album encoding: ' . $datum);
-					$datum = '';
-					goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
-				}
-			}
 	
-			$album = (($datum) ? hex2bin($datum) : '');
+			$album = $datum;
 
 			\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 
-			//check if the album exists and if we have perms
-			$r = q("SELECT album FROM photo WHERE uid = %d AND album = '%s' and is_nsfw = %d $sql_extra LIMIT 1",
-				intval($owner_uid),
-				dbesc($album),
-				intval($unsafe)
-			);
-
-			if($r) {
+			if($x = photos_album_exists($owner_uid,$datum)) {
 				\App::set_pager_itemspage(60);
-			} else {
+				$album = $x['display_path'];
+			} 
+			else {
 				goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
 			}
 
@@ -712,19 +695,19 @@ class Photos extends \Zotlabs\Web\Controller {
 				$order = 'DESC';
 
 			$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
-					(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph 
+					(SELECT resource_id, max(imgscale) imgscale FROM photo left join attach on folder = '%s' and photo.resource_id = attach.hash WHERE attach.uid = %d AND imgscale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph 
 					ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
 				ORDER BY created $order LIMIT %d OFFSET %d",
+				dbesc($datum),
 				intval($owner_uid),
-				dbesc($album),
 				intval(PHOTO_NORMAL),
 				intval(PHOTO_PROFILE),
 				intval($unsafe),
 				intval(\App::$pager['itemspage']),
 				intval(\App::$pager['start'])
 			);
-			
-			//edit album name
+
+			// edit album name
 			$album_edit = null;
 			if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
@@ -749,9 +732,9 @@ class Photos extends \Zotlabs\Web\Controller {
 			}
 	
 			if($_GET['order'] === 'posted')
-				$order =  array(t('Show Newest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($album));
+				$order =  array(t('Show Newest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $datum);
 			else
-				$order = array(t('Show Oldest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($album) . '?f=&order=posted');
+				$order = array(t('Show Oldest First'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $datum . '?f=&order=posted');
 	
 			$photos = array();
 			if(count($r)) {
diff --git a/include/photos.php b/include/photos.php
index b4d297bfd..e68290c9d 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -443,7 +443,7 @@ function photo_upload($channel, $observer, $args) {
  *   * \e array \b albums
  */
 
-function photos_albums_list($channel, $observer, $sort_key = 'album', $direction = 'asc') {
+function photos_albums_list($channel, $observer, $sort_key = 'display_path', $direction = 'asc') {
 
 	$channel_id     = $channel['channel_id'];
 	$observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
@@ -456,16 +456,31 @@ function photos_albums_list($channel, $observer, $sort_key = 'album', $direction
 	$sort_key = dbesc($sort_key);
 	$direction = dbesc($direction);
 
-	//$albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and photo_usage IN ( %d, %d ) $sql_extra group by album order by $sort_key $direction",
-	//	intval($channel_id),
-	//	intval(PHOTO_NORMAL),
-	//	intval(PHOTO_PROFILE)
-	//);
-
-	// this query provides the same results but might perform better
-	$albums = q("SELECT count( distinct resource_id ) as total, album from photo where uid = %d and os_storage = 1 $sql_extra group by album order by $sort_key $direction",
+	$r = q("select display_path, hash from attach where is_dir = 1 and uid = %d order by $sort_key $direction",
 		intval($channel_id)
 	);
+	array_unshift($r,[ 'display_path' => '/', 'hash' => '' ]);
+	$str = ids_to_querystr($r,'hash',true);
+
+	$albums = [];
+
+	if($str) {
+		$x = q("select count( distinct hash ) as total, folder from attach where is_photo = 1 and uid = %d and folder in ( $str ) group by folder ",
+			intval($channel_id)
+		);
+		if($x) {
+			foreach($r as $rv) {
+				foreach($x as $xv) {
+					if($xv['folder'] === $rv['hash']) {
+						if($xv['total'] != 0) {
+							$albums[] = [ 'album' => $rv['display_path'], 'folder' => $xv['folder'], 'total' => $xv['total'] ];
+						}
+						continue;
+					}
+				}
+			}
+		}
+	}
 
 	// add various encodings to the array so we can just loop through and pick them out in a template
 
@@ -477,11 +492,12 @@ function photos_albums_list($channel, $observer, $sort_key = 'album', $direction
 		foreach($albums as $k => $album) {
 			$entry = array(
 				'text' => (($album['album']) ? $album['album'] : '/'),
+				'shorttext' => (($album['album']) ? ellipsify($album['album'],28) : '/'),
 				'jstext' => (($album['album']) ? addslashes($album['album']) : '/'),
 				'total' => $album['total'],
-				'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album['album']),
+				'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'],
 				'urlencode' => urlencode($album['album']),
-				'bin2hex' => bin2hex($album['album'])
+				'bin2hex' => $album['folder']
 			);
 			$ret['albums'][] = $entry;
 		}
@@ -492,7 +508,7 @@ function photos_albums_list($channel, $observer, $sort_key = 'album', $direction
 	return $ret;
 }
 
-function photos_album_widget($channelx,$observer,$sortkey = 'album',$direction = 'asc') {
+function photos_album_widget($channelx,$observer,$sortkey = 'display_path',$direction = 'asc') {
 
 	$o = '';
 
@@ -505,6 +521,7 @@ function photos_album_widget($channelx,$observer,$sortkey = 'album',$direction =
 		$o = replace_macros(get_markup_template('photo_albums.tpl'),array(
 			'$nick'    => $channelx['channel_address'],
 			'$title'   => t('Photo Albums'),
+			'$recent'  => t('Recent Photos'),
 			'$albums'  => $albums['albums'],
 			'$baseurl' => z_root(),
 			'$upload'  => ((perm_is_allowed($channelx['channel_id'],(($observer) ? $observer['xchan_hash'] : ''),'write_storage'))
@@ -565,12 +582,15 @@ function photos_list_photos($channel, $observer, $album = '') {
  */
 
 function photos_album_exists($channel_id, $album) {
-	$r = q("SELECT id FROM photo WHERE album = '%s' AND uid = %d limit 1",
+
+	$sql_extra = permissions_sql($channel_id);
+
+	$r = q("SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE hash = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1",
 		dbesc($album),
 		intval($channel_id)
 	);
 
-	return (($r) ? true : false);
+	return (($r) ? $r[0] : false);
 }
 
 /**
diff --git a/include/text.php b/include/text.php
index 500c87ad5..49b588f13 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3113,3 +3113,14 @@ function array_escape_tags(&$v,$k) {
 	$v = escape_tags($v);
 }
 
+function ellipsify($s,$maxlen) {
+	if($maxlen & 1)
+		$maxlen --;
+	if($maxlen < 4)
+		$maxlen = 4;
+
+	if(mb_strlen($s) < $maxlen)
+		return $s;
+
+	return mb_substr($s,0,$maxlen / 2) . '...' . mb_substr($s,mb_strlen($s) - ($maxlen / 2));
+} 
\ No newline at end of file
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index de1105bbc..177fecad5 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,11 +1,11 @@
 <div id="side-bar-photos-albums" class="widget">
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills nav-stacked">
-		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
+		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li>
 		{{if $albums}}
 		{{foreach $albums as $al}}
-		{{if $al.text}}
-		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li>
+		{{if $al.shorttext}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
 		{{/if}}
 		{{/foreach}}
 		{{/if}}

From a7bf4366cee5dcdabe3eb6dbcb144727d2158775 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 21:00:48 -0700
Subject: [PATCH 057/299] use the same host macro for sender address as for
 reply_to address

---
 Zotlabs/Lib/Enotify.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 257687567..5db5fb42d 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -67,7 +67,7 @@ class Enotify {
 		$sender_name = $product;
 		$hostname = \App::get_hostname();
 		if(strpos($hostname,':'))
-		$hostname = substr($hostname,0,strpos($hostname,':'));
+			$hostname = substr($hostname,0,strpos($hostname,':'));
 
 		// Do not translate 'noreply' as it must be a legal 7-bit email address
 
@@ -77,7 +77,7 @@ class Enotify {
 
 		$sender_email = get_config('system','from_email');
 		if(! $sender_email)
-			$sender_email = 'Administrator' . '@' . \App::get_hostname();
+			$sender_email = 'Administrator' . '@' . $hostname;
 	
 		$sender_name = get_config('system','from_email_name');
 		if(! $sender_name)

From 83a78a949d67dbbe3294f7f02ffeb45b6f96423d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 21:13:14 -0700
Subject: [PATCH 058/299] photos_album_exists() requires an observer to work
 correctly; provide it.

---
 Zotlabs/Module/Photos.php | 4 ++--
 include/photos.php        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 598f1782d..cf622d657 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -95,7 +95,7 @@ class Photos extends \Zotlabs\Web\Controller {
 			$album = argv(3);
 
 
-			if(! photos_album_exists($page_owner_uid,$album)) {
+			if(! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
 				notice( t('Album not found.') . EOL);
 				goaway(z_root() . '/' . $_SESSION['photo_return']);
 			}
@@ -681,7 +681,7 @@ class Photos extends \Zotlabs\Web\Controller {
 
 			\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 
-			if($x = photos_album_exists($owner_uid,$datum)) {
+			if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
 				\App::set_pager_itemspage(60);
 				$album = $x['display_path'];
 			} 
diff --git a/include/photos.php b/include/photos.php
index e68290c9d..69b31de9f 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -581,9 +581,9 @@ function photos_list_photos($channel, $observer, $album = '') {
  * @return boolean
  */
 
-function photos_album_exists($channel_id, $album) {
+function photos_album_exists($channel_id, $observer_hash, $album) {
 
-	$sql_extra = permissions_sql($channel_id);
+	$sql_extra = permissions_sql($channel_id,$observer_hash);
 
 	$r = q("SELECT folder, hash, is_dir, filename, os_path, display_path FROM attach WHERE hash = '%s' AND is_dir = 1 AND uid = %d $sql_extra limit 1",
 		dbesc($album),

From 65ecc5ae15757b41bda8e0aed23a17d5e258cdc7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 22:05:36 -0700
Subject: [PATCH 059/299] more work on the photo album mess

---
 Zotlabs/Module/Photos.php | 157 ++++++++++++++++----------------------
 include/photos.php        |  11 +--
 2 files changed, 71 insertions(+), 97 deletions(-)

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index cf622d657..a0e230ac8 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -15,13 +15,10 @@ class Photos extends \Zotlabs\Web\Controller {
 
 	function init() {
 	
-	
 		if(observer_prohibited()) {
 			return;
 		}
 	
-		$o = '';
-	
 		if(argc() > 1) {
 			$nick = argv(1);
 	
@@ -54,7 +51,6 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 		logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
 	
-	
 		logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA);
 		logger('mod_photos: FILES '   . print_r($_FILES,true), LOGGER_DATA);
 	
@@ -94,7 +90,6 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 			$album = argv(3);
 
-
 			if(! photos_album_exists($page_owner_uid, get_observer_hash(), $album)) {
 				notice( t('Album not found.') . EOL);
 				goaway(z_root() . '/' . $_SESSION['photo_return']);
@@ -117,7 +112,7 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 				$folder_hash = '';
 	 
-				$r = q("select * from attach where is_dir = 1 and uid = %d and filename = '%s'",
+				$r = q("select * from attach where is_dir = 1 and uid = %d and hash = '%s'",
 					intval($page_owner_uid),
 					dbesc($album)
 				);
@@ -125,14 +120,7 @@ class Photos extends \Zotlabs\Web\Controller {
 					notice( t('Album not found.') . EOL);
 					return;
 				}
-				if(count($r) > 1) {
-					notice( t('Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager') . EOL);
-					return;
-				}
-				else {
-					$folder_hash = $r[0]['hash'];
-				}
-	
+				$folder_hash = $r[0]['hash'];
 	
 	
 				$res = array();
@@ -464,7 +452,7 @@ class Photos extends \Zotlabs\Web\Controller {
 		 * default post action - upload a photo
 		 */
 	
-		$channel = \App::$data['channel'];
+		$channel  = \App::$data['channel'];
 		$observer = \App::$data['observer'];
 	
 		$_REQUEST['source'] = 'photos';
@@ -481,12 +469,10 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 		if(! $r['success']) {
 			notice($r['message'] . EOL);
+			goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
 		}		
-		
-		if($_REQUEST['newalbum'])
-			goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($_REQUEST['newalbum']));
-		else
-			goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex(datetime_convert('UTC',date_default_timezone_get(),'now', 'Y')));		
+
+		goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']);
 	
 	}
 	
@@ -565,7 +551,9 @@ class Photos extends \Zotlabs\Web\Controller {
 			return;
 		}
 	
-		$sql_extra = permissions_sql($owner_uid);
+		$sql_item = item_permissions_sql($owner_uid,get_observer_hash());
+		$sql_extra = permissions_sql($owner_uid,get_observer_hash(),'photo');
+		$sql_attach = permissions_sql($owner_uid,get_observer_hash(),'attach');
 	
 		$o = "";
 	
@@ -676,9 +664,6 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 		if($datatype === 'album') {
 	
-	
-			$album = $datum;
-
 			\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 
 			if($x = photos_album_exists($owner_uid, get_observer_hash(), $datum)) {
@@ -788,10 +773,10 @@ class Photos extends \Zotlabs\Web\Controller {
 				$o .= replace_macros($tpl, array(
 					'$photos' => $photos,
 					'$album' => $album,
-					'$album_id' => bin2hex($album),
+					'$album_id' => $datum),
 					'$album_edit' => array(t('Edit Album'), $album_edit),
 					'$can_post' => $can_post,
-					'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/upload/' . bin2hex($album)),
+					'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/upload/' . $datum),
 					'$order' => $order,
 					'$upload_form' => $upload_form,
 					'$usage' => $usage_message
@@ -805,8 +790,6 @@ class Photos extends \Zotlabs\Web\Controller {
 				killme();
 			}
 	
-	//		$o .= paginate($a);
-	
 			return $o;
 	
 		}	
@@ -819,6 +802,11 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 			\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 	
+			$x = q("select folder from attach where hash = '%s' and uid = %d $sql_attach limit 1",
+				dbesc($datum),
+				intval($owner_uid)
+			);
+
 			// fetch image, item containing image, then comments
 	
 			$ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,description,album,filename,mimetype,height,width,filesize,imgscale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM photo WHERE uid = %d AND resource_id = '%s' 
@@ -827,7 +815,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				dbesc($datum)
 			);
 	
-			if(! $ph) {
+			if(! ($ph && $x)) {
 	
 				/* Check again - this time without specifying permissions */
 	
@@ -852,16 +840,17 @@ class Photos extends \Zotlabs\Web\Controller {
 			else
 				$order = 'DESC';
 	
-	
-			$prvnxt = q("SELECT resource_id FROM photo WHERE album = '%s' AND uid = %d AND imgscale = 0 
-				$sql_extra ORDER BY created $order ",
-				dbesc($ph[0]['album']),
+				
+
+			$prvnxt = q("SELECT hash FROM attach WHERE folder = '%s' AND uid = %d AND is_photo = 1
+				$sql_attach ORDER BY created $order ",
+				dbesc($x[0]['folder']),
 				intval($owner_uid)
 			); 
 	
 			if(count($prvnxt)) {
 				for($z = 0; $z < count($prvnxt); $z++) {
-					if($prvnxt[$z]['resource_id'] == $ph[0]['resource_id']) {
+					if($prvnxt[$z]['hash'] == $ph[0]['hash']) {
 						$prv = $z - 1;
 						$nxt = $z + 1;
 						if($prv < 0)
@@ -890,7 +879,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				}
 			}
 	
-			$album_link = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($ph[0]['album']);
+			$album_link = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $x[0]['folder'];
 	 		$tools = Null;
 	 		$lock = Null;
 	 
@@ -930,7 +919,7 @@ class Photos extends \Zotlabs\Web\Controller {
 			// Do we have an item for this photo?
 	
 			$linked_items = q("SELECT * FROM item WHERE resource_id = '%s' and resource_type = 'photo' 
-				$sql_extra LIMIT 1",
+				$sql_item LIMIT 1",
 				dbesc($datum)
 			);
 	
@@ -945,7 +934,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				$item_normal = item_normal();
 	
 				$r = q("select * from item where parent_mid = '%s' 
-					$item_normal and uid = %d $sql_extra ",
+					$item_normal and uid = %d $sql_item ",
 					dbesc($link_item['mid']),
 					intval($link_item['uid'])
 	
@@ -991,13 +980,6 @@ class Photos extends \Zotlabs\Web\Controller {
 			$edit = null;
 			if($can_post) {
 
-				$m = q("select folder from attach where hash = '%s' and uid = %d limit 1",
-					dbesc($ph[0]['resource_id']),
-					intval($ph[0]['uid'])
-				);
-				if($m)
-					$album_hash = $m[0]['folder'];
-					
 				$album_e = $ph[0]['album'];
 				$caption_e = $ph[0]['description'];
 				$aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
@@ -1007,35 +989,35 @@ class Photos extends \Zotlabs\Web\Controller {
 
 				$folder_list = attach_folder_select_list($ph[0]['uid']);
 	
-				$edit = array(
+				$edit = [
 					'edit' => t('Edit photo'),
 					'id' => $link_item['id'],
-					'rotatecw' => t('Rotate CW (right)'),
-					'rotateccw' => t('Rotate CCW (left)'),
-					'albums' => $albums['albums'],
-					'album' => $album_e,
-					'album_select' => [ 'move_to_album', t('Move photo to album'), $album_hash, '', $folder_list ],
-					'newalbum_label' => t('Enter a new album name'),
+					'rotatecw'             => t('Rotate CW (right)'),
+					'rotateccw'            => t('Rotate CCW (left)'),
+					'albums'               => $albums['albums'],
+					'album'                => $album_e,
+					'album_select'         => [ 'move_to_album', t('Move photo to album'), $x[0]['folder'], '', $folder_list ],
+					'newalbum_label'       => t('Enter a new album name'),
 					'newalbum_placeholder' => t('or select an existing one (doubleclick)'),
-					'nickname' => \App::$data['channel']['channel_address'],
-					'resource_id' => $ph[0]['resource_id'],
-					'capt_label' => t('Caption'),
-					'caption' => $caption_e,
-					'tag_label' => t('Add a Tag'),
-					'permissions' => t('Permissions'),
-					'aclselect' => $aclselect_e,
-					'allow_cid' => acl2json($ph[0]['allow_cid']),
-					'allow_gid' => acl2json($ph[0]['allow_gid']),
-					'deny_cid' => acl2json($ph[0]['deny_cid']),
-					'deny_gid' => acl2json($ph[0]['deny_gid']),
-					'lockstate' => $lockstate[0],
-					'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
-					'item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
-					'adult_enabled' => feature_enabled($owner_uid,'adult_photo_flagging'),
-					'adult' => array('adult',t('Flag as adult in album view'), intval($ph[0]['is_nsfw']),''),
-					'submit' => t('Submit'),
-					'delete' => t('Delete Photo')
-				);
+					'nickname'             => \App::$data['channel']['channel_address'],
+					'resource_id'          => $ph[0]['resource_id'],
+					'capt_label'           => t('Caption'),
+					'caption'              => $caption_e,
+					'tag_label'            => t('Add a Tag'),
+					'permissions'          => t('Permissions'),
+					'aclselect'            => $aclselect_e,
+					'allow_cid'            => acl2json($ph[0]['allow_cid']),
+					'allow_gid'            => acl2json($ph[0]['allow_gid']),
+					'deny_cid'             => acl2json($ph[0]['deny_cid']),
+					'deny_gid'             => acl2json($ph[0]['deny_gid']),
+					'lockstate'            => $lockstate[0],
+					'help_tags'            => t('Example: @bob, @Barbara_Jensen, @jim@example.com'),
+					'item_id'              => ((count($linked_items)) ? $link_item['id'] : 0),
+					'adult_enabled'        => feature_enabled($owner_uid,'adult_photo_flagging'),
+					'adult'                => array('adult',t('Flag as adult in album view'), intval($ph[0]['is_nsfw']),''),
+					'submit'               => t('Submit'),
+					'delete'               => t('Delete Photo')
+				];
 			}
 	
 			if(count($linked_items)) {
@@ -1049,13 +1031,13 @@ class Photos extends \Zotlabs\Web\Controller {
 				$likebuttons = '';
 	
 				if($can_post || $can_comment) {
-					$likebuttons = array(
-						'id' => $link_item['id'],
+					$likebuttons = [
+						'id'       => $link_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')
-					);
+						'nolike'   => t("I don't like this \x28toggle\x29"),
+						'share'    => t('Share'),
+						'wait'     => t('Please wait')
+					];
 				}
 	
 				$comments = '';
@@ -1260,25 +1242,13 @@ class Photos extends \Zotlabs\Web\Controller {
 	
 		\App::$page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$cmd) . '" title="oembed" />' . "\r\n";
 	
-		/*
-		$r = q("SELECT resource_id, max(imgscale) AS imgscale FROM photo WHERE uid = %d 
-			and photo_usage in ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id",
-			intval(\App::$data['channel']['channel_id']),
-			intval(PHOTO_NORMAL),
-			intval(PHOTO_PROFILE),
-			intval($unsafe)
-		);
-		if($r) {
-			\App::set_pager_total(count($r));
-			\App::set_pager_itemspage(60);
-		}
-		*/
 
 		\App::set_pager_itemspage(60);
 		
 		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created FROM photo p 
-			INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo 
-				WHERE uid = %d AND photo_usage IN ( %d, %d ) 
+			INNER JOIN ( SELECT resource_id, attach.folder as folder, max(imgscale) imgscale FROM photo left join attach on
+				photo.resource_id = attach.hash 
+				WHERE photo.uid = %d AND photo_usage IN ( %d, %d ) 
 				AND is_nsfw = %d $sql_extra group by resource_id ) ph 
 			ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) 
 			ORDER by p.created DESC LIMIT %d OFFSET %d",
@@ -1310,7 +1280,10 @@ class Photos extends \Zotlabs\Web\Controller {
 					$alt_e = $rr['filename'];
 					$name_e = $rr['album'];
 				}
-	
+
+					
+
+
 				$photos[] = array(
 					'id'       => $rr['id'],
 					'twist'    => ' ' . $twist . rand(2,4),
diff --git a/include/photos.php b/include/photos.php
index 69b31de9f..3ce307067 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -625,14 +625,15 @@ function photos_album_rename($channel_id, $oldname, $newname) {
 
 function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') {
 
-	if ($remote_xchan) {
-		$r = q("SELECT distinct resource_id from photo where xchan = '%s' and uid = %d and album = '%s' ",
+	if($remote_xchan) {
+		$r = q("SELECT hash from attach where creator = '%s' and uid = %d and folder = '%s' ",
 			dbesc($remote_xchan),
 			intval($channel_id),
 			dbesc($album)
 		);
-	} else {
-		$r = q("SELECT distinct resource_id from photo where uid = %d and album = '%s' ",
+	}
+	else {
+		$r = q("SELECT hash from attach where uid = %d and folder = '%s' ",
 			intval($channel_id),
 			dbesc($album)
 		);
@@ -640,7 +641,7 @@ function photos_album_get_db_idstr($channel_id, $album, $remote_xchan = '') {
 	if ($r) {
 		$arr = array();
 		foreach ($r as $rr) {
-			$arr[] = "'" . dbesc($rr['resource_id']) . "'" ;
+			$arr[] = "'" . dbesc($rr['hash']) . "'" ;
 		}
 		$str = implode(',',$arr);
 		return $str;

From 24b55bbc9ba157f5f3b22c49b36ee9cced10b0e2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 12:41:16 -0700
Subject: [PATCH 060/299] fix photo prvnxt after all the changes yesterday

---
 Zotlabs/Module/Photos.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index a0e230ac8..f423440ed 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -773,7 +773,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				$o .= replace_macros($tpl, array(
 					'$photos' => $photos,
 					'$album' => $album,
-					'$album_id' => $datum),
+					'$album_id' => $datum,
 					'$album_edit' => array(t('Edit Album'), $album_edit),
 					'$can_post' => $can_post,
 					'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/upload/' . $datum),
@@ -840,17 +840,16 @@ class Photos extends \Zotlabs\Web\Controller {
 			else
 				$order = 'DESC';
 	
-				
 
 			$prvnxt = q("SELECT hash FROM attach WHERE folder = '%s' AND uid = %d AND is_photo = 1
 				$sql_attach ORDER BY created $order ",
 				dbesc($x[0]['folder']),
 				intval($owner_uid)
 			); 
-	
+
 			if(count($prvnxt)) {
 				for($z = 0; $z < count($prvnxt); $z++) {
-					if($prvnxt[$z]['hash'] == $ph[0]['hash']) {
+					if($prvnxt[$z]['hash'] == $ph[0]['resource_id']) {
 						$prv = $z - 1;
 						$nxt = $z + 1;
 						if($prv < 0)
@@ -861,8 +860,8 @@ class Photos extends \Zotlabs\Web\Controller {
 					}
 				}
 	
-				$prevlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['resource_id'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
-				$nextlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['resource_id'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+				$prevlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+				$nextlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
 	 		}
 	
 	

From 0fb024190192c92e542bceb486e8875ddabfdeb6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 16:11:38 -0700
Subject: [PATCH 061/299] some more photo issues

---
 Zotlabs/Module/Photos.php | 46 +++++++++++++++++++--------------------
 include/attach.php        | 12 +++++-----
 include/photos.php        |  7 +++---
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index f423440ed..975c527ef 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -612,8 +612,14 @@ class Photos extends \Zotlabs\Web\Controller {
 			if(! $aclselect) {
 				$aclselect = '<input id="group_allow" type="hidden" name="allow_gid[]" value="" /><input id="contact_allow" type="hidden" name="allow_cid[]" value="" /><input id="group_deny" type="hidden" name="deny_gid[]" value="" /><input id="contact_deny" type="hidden" name="deny_cid[]" value="" />';
 			}
-	
-			$selname = (($datum) ? hex2bin($datum) : '');
+
+			$selname = '';
+
+			if($datum) {
+				$h = attach_by_hash_nodata($datum,get_observer_hash());
+				$selname = $h['data']['display_path'];
+			}	
+
 	
 			$albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
 	
@@ -694,12 +700,12 @@ class Photos extends \Zotlabs\Web\Controller {
 
 			// edit album name
 			$album_edit = null;
-			if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
-				if($can_post) {
-					$album_e = $album;
-					$albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
+
+			if($can_post) {
+				$album_e = $album;
+				$albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
 	
-					// @fixme - syncronise actions with DAV
+				// @fixme - syncronise actions with DAV
 		
 	//				$edit_tpl = get_markup_template('album_edit.tpl');
 	//				$album_edit = replace_macros($edit_tpl,array(
@@ -713,7 +719,6 @@ class Photos extends \Zotlabs\Web\Controller {
 	//					'$dropsubmit' => t('Delete Album')
 	//				));
 	
-				}
 			}
 	
 			if($_GET['order'] === 'posted')
@@ -1244,9 +1249,9 @@ class Photos extends \Zotlabs\Web\Controller {
 
 		\App::set_pager_itemspage(60);
 		
-		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created FROM photo p 
-			INNER JOIN ( SELECT resource_id, attach.folder as folder, max(imgscale) imgscale FROM photo left join attach on
-				photo.resource_id = attach.hash 
+		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.album, p.imgscale, p.created, p.display_path 
+			FROM photo p 
+			INNER JOIN ( SELECT resource_id, max(imgscale) imgscale FROM photo 
 				WHERE photo.uid = %d AND photo_usage IN ( %d, %d ) 
 				AND is_nsfw = %d $sql_extra group by resource_id ) ph 
 			ON (p.resource_id = ph.resource_id and p.imgscale = ph.imgscale) 
@@ -1265,23 +1270,18 @@ class Photos extends \Zotlabs\Web\Controller {
 		if($r) {
 			$twist = 'rotright';
 			foreach($r as $rr) {
+
+				if(! attach_can_view_folder(\App::$data['channel']['channel_id'],get_observer_hash(),$rr['resource_id']))
+					continue;
+
 				if($twist == 'rotright')
 					$twist = 'rotleft';
 				else
 					$twist = 'rotright';
 				$ext = $phototypes[$rr['mimetype']];
 				
-				if(\App::get_template_engine() === 'internal') {
-					$alt_e = template_escape($rr['filename']);
-					$name_e = template_escape($rr['album']);
-				}
-				else {
-					$alt_e = $rr['filename'];
-					$name_e = $rr['album'];
-				}
-
-					
-
+				$alt_e = $rr['filename'];
+				$name_e = dirname($rr['display_path']);
 
 				$photos[] = array(
 					'id'       => $rr['id'],
@@ -1291,9 +1291,7 @@ class Photos extends \Zotlabs\Web\Controller {
 					'src'     	=> z_root() . '/photo/' . $rr['resource_id'] . '-' . ((($rr['imgscale']) == 6) ? 4 : $rr['imgscale']) . '.' . $ext,
 					'alt'     	=> $alt_e,
 					'album'	=> array(
-						'link'  => z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . bin2hex($rr['album']),
 						'name'  => $name_e,
-						'alt'   => t('View Album'),
 					),
 					
 				);
diff --git a/include/attach.php b/include/attach.php
index c8582f8d3..675dd0da2 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -209,7 +209,7 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $
 
 	// Retrieve all columns except 'data'
 
-	$r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, os_storage, is_dir, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra ORDER BY $orderby $limit",
+	$r = q("select id, aid, uid, hash, filename, filetype, filesize, revision, folder, os_path, display_path, os_storage, is_dir, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d $sql_extra ORDER BY $orderby $limit",
 		intval($channel_id)
 	);
 
@@ -284,6 +284,7 @@ function attach_by_hash($hash, $observer_hash, $rev = 0) {
 	return $ret;
 }
 
+
 function attach_can_view_folder($uid,$ob_hash,$folder_hash) {
 
 	$sql_extra = permissions_sql($uid,$ob_hash);
@@ -348,7 +349,7 @@ function attach_by_hash_nodata($hash, $observer_hash, $rev = 0) {
 
 	// Now we'll see if we can access the attachment
 
-	$r = q("select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_photo, is_dir, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d and hash = '%s' $sql_extra limit 1",
+	$r = q("select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_photo, os_path, display_path, is_dir, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where uid = %d and hash = '%s' $sql_extra limit 1",
 		intval($r[0]['uid']),
 		dbesc($hash)
 	);
@@ -531,7 +532,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		if($options === 'update' &&  $arr && array_key_exists('revision',$arr))
 			$sql_options = " and revision = " . intval($arr['revision']) . " ";
 
-		$x = q("select id, aid, uid, filename, filetype, filesize, hash, revision, folder, os_storage, is_photo, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where hash = '%s' and uid = %d $sql_options limit 1",
+		$x = q("select id, aid, uid, filename, filetype, filesize, hash, revision, folder, os_storage, is_photo, os_path, display_path, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where hash = '%s' and uid = %d $sql_options limit 1",
 			dbesc($arr['hash']),
 			intval($channel_id)
 		);
@@ -929,7 +930,7 @@ function z_readdir($channel_id, $observer_hash, $pathname, $parent_hash = '') {
 	else
 		$paths = array($pathname);
 
-	$r = q("select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, is_photo, is_dir, os_storage, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and folder = '%s' and filename = '%s' and is_dir != 0 " . permissions_sql($channel_id),
+	$r = q("select id, aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_path, display_path, is_photo, is_dir, os_storage, flags, created, edited, allow_cid, allow_gid, deny_cid, deny_gid from attach where id = %d and folder = '%s' and filename = '%s' and is_dir != 0 " . permissions_sql($channel_id),
 		intval($channel_id),
 		dbesc($parent_hash),
 		dbesc($paths[0])
@@ -2342,4 +2343,5 @@ function attach_upgrade() {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+
diff --git a/include/photos.php b/include/photos.php
index 3ce307067..eae9689a9 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -456,23 +456,24 @@ function photos_albums_list($channel, $observer, $sort_key = 'display_path', $di
 	$sort_key = dbesc($sort_key);
 	$direction = dbesc($direction);
 
-	$r = q("select display_path, hash from attach where is_dir = 1 and uid = %d order by $sort_key $direction",
+	$r = q("select display_path, hash from attach where is_dir = 1 and uid = %d $sql_extra order by $sort_key $direction",
 		intval($channel_id)
 	);
+
 	array_unshift($r,[ 'display_path' => '/', 'hash' => '' ]);
 	$str = ids_to_querystr($r,'hash',true);
 
 	$albums = [];
 
 	if($str) {
-		$x = q("select count( distinct hash ) as total, folder from attach where is_photo = 1 and uid = %d and folder in ( $str ) group by folder ",
+		$x = q("select count( distinct hash ) as total, folder from attach where is_photo = 1 and uid = %d and folder in ( $str ) $sql_extra group by folder ",
 			intval($channel_id)
 		);
 		if($x) {
 			foreach($r as $rv) {
 				foreach($x as $xv) {
 					if($xv['folder'] === $rv['hash']) {
-						if($xv['total'] != 0) {
+						if($xv['total'] != 0 && attach_can_view_folder($channel_id,$observer_xchan,$xv['folder'])) {
 							$albums[] = [ 'album' => $rv['display_path'], 'folder' => $xv['folder'], 'total' => $xv['total'] ];
 						}
 						continue;

From 0499deea6969129bd3b642f2d4edd676e1e5d4c9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 19:31:43 -0700
Subject: [PATCH 062/299] more cloud updates - upgrade the DAV structures as
 well.

---
 Zotlabs/Storage/Directory.php | 62 ++++++++++++++++++++++-------------
 Zotlabs/Storage/File.php      | 12 ++++++-
 include/attach.php            | 46 ++++++++++++++++----------
 3 files changed, 79 insertions(+), 41 deletions(-)

diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 51540735c..0ed7a3c68 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -49,7 +49,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 	 * @param BasicAuth &$auth_plugin
 	 */
 	public function __construct($ext_path, &$auth_plugin) {
-//		$ext_path = urldecode($ext_path);
+		//		$ext_path = urldecode($ext_path);
 		logger('directory ' . $ext_path, LOGGER_DATA);
 		$this->ext_path = $ext_path;
 		// remove "/cloud" from the beginning of the path
@@ -167,6 +167,14 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			intval($this->auth->owner_id)
 		);
 
+		$x = attach_syspaths($this->auth->owner_id,$this->folder_hash);
+
+		$y = q("update attach set display_path = '%s where hash = '%s' and uid = %d",
+			dbesc($x['path']),
+			dbesc($this->folder_hash),
+			intval($this->auth->owner_id)
+		);
+
 		$ch = channelx_by_n($this->auth->owner_id);
 		if ($ch) {
 			$sync = attach_export_data($ch, $this->folder_hash);
@@ -260,14 +268,18 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			dbesc($f),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
-			'', //TODO: use os_path
-			'', //TODO: use display_path
+			'', 
+			'', 
 			dbesc($allow_cid),
 			dbesc($allow_gid),
 			dbesc($deny_cid),
 			dbesc($deny_gid)
 		);
 
+		// fetch the actual storage paths
+
+		$xpath = attach_syspaths($this->auth->owner_id, $hash);
+
 		// returns the number of bytes that were written to the file, or FALSE on failure
 		$size = file_put_contents($f, $data);
 		// delete attach entry if file_put_contents() failed
@@ -281,15 +293,17 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 		$edited = datetime_convert();
 
 		$is_photo = 0;
-		$x = @getimagesize($f);
-		logger('getimagesize: ' . print_r($x,true), LOGGER_DATA);
-		if (($x) && ($x[2] === IMAGETYPE_GIF || $x[2] === IMAGETYPE_JPEG || $x[2] === IMAGETYPE_PNG)) {
+		$gis = @getimagesize($f);
+		logger('getimagesize: ' . print_r($gis,true), LOGGER_DATA);
+		if (($gis) && ($gis[2] === IMAGETYPE_GIF || $gis[2] === IMAGETYPE_JPEG || $gis[2] === IMAGETYPE_PNG)) {
 			$is_photo = 1;
 		}
 
 		// updates entry with filesize and timestamp
-		$d = q("UPDATE attach SET filesize = '%s', is_photo = %d, edited = '%s' WHERE hash = '%s' AND uid = %d",
+		$d = q("UPDATE attach SET filesize = '%s', os_path = '%s', display_path = '%s', is_photo = %d, edited = '%s' WHERE hash = '%s' AND uid = %d",
 			dbesc($size),
+			dbesc($xpath['os_path']),
+			dbesc($xpath['display_path']),
 			intval($is_photo),
 			dbesc($edited),
 			dbesc($hash),
@@ -312,29 +326,29 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 		// check against service class quota
 		$limit = engr_units_to_bytes(service_class_fetch($c[0]['channel_id'], 'attach_upload_limit'));
 		if ($limit !== false) {
-			$x = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d ",
+			$z = q("SELECT SUM(filesize) AS total FROM attach WHERE aid = %d ",
 				intval($c[0]['channel_account_id'])
 			);
-			if (($x) && ($x[0]['total'] + $size > $limit)) {
-				logger('service class limit exceeded for ' . $c[0]['channel_name'] . ' total usage is ' . $x[0]['total'] . ' limit is ' . userReadableSize($limit));
+			if (($z) && ($z[0]['total'] + $size > $limit)) {
+				logger('service class limit exceeded for ' . $c[0]['channel_name'] . ' total usage is ' . $z[0]['total'] . ' limit is ' . userReadableSize($limit));
 				attach_delete($c[0]['channel_id'], $hash);
 				return;
 			}
 		}
 
-		if ($is_photo) {
+		if($is_photo) {
 			$album = '';
 			if ($this->folder_hash) {
-				$f1 = q("select filename from attach WHERE hash = '%s' AND uid = %d",
+				$f1 = q("select filename, display_path from attach WHERE hash = '%s' AND uid = %d",
 					dbesc($this->folder_hash),
 					intval($c[0]['channel_id'])
 				);
 				if ($f1)
-					$album = $f1[0]['filename'];
+					$album = (($f1[0]['display_path']) ? $f1[0]['display_path'] : $f1[0]['filename']);
 			}
 
 			require_once('include/photos.php');
-			$args = array( 'resource_id' => $hash, 'album' => $album, 'os_path' => $f, 'filename' => $name, 'getimagesize' => $x, 'directory' => $direct);
+			$args = array( 'resource_id' => $hash, 'album' => $album, 'os_syspath' => $f, 'os_path' => $xpath['os_path'], 'display_path' => $xpath['path'], 'filename' => $name, 'getimagesize' => $gis, 'directory' => $direct);
 			$p = photo_upload($c[0], \App::get_observer(), $args);
 		}
 
@@ -646,20 +660,24 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			logger("Path mismatch: $path !== /$file");
 			return NULL;
 		}
-		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
-			$prefix = 'DISTINCT ON (filename)';
-			$suffix = 'ORDER BY filename';
-		}
-		else {
-			$prefix = '';
-			$suffix = 'GROUP BY filename';
-		}
+
+		$prefix = '';
+		$suffix = '';
+
 		$r = q("select $prefix id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, created, edited from attach where folder = '%s' and uid = %d $perms $suffix",
 			dbesc($folder),
 			intval($channel_id)
 		);
 
 		foreach ($r as $rr) {
+
+			// @FIXME I don't think we use revisions currently in attach structures.
+			// In case we see any in the wild provide a unique filename. This 
+			// name may or may not be accessible
+
+			if($rr['revision'])
+				$rr['filename'] .= '-' . $rr['revision'];
+
 			//logger('filename: ' . $rr['filename'], LOGGER_DEBUG);
 			if (intval($rr['is_dir'])) {
 				$ret[] = new Directory($path . '/' . $rr['filename'], $auth);
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index d2bca3964..1475241ab 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -85,13 +85,23 @@ class File extends DAV\Node implements DAV\IFile {
 			intval($this->data['id'])
 		);
 
+		$x = attach_syspaths($this->auth->owner_id,$this->data['hash']);
+
+		$y = q("update attach set display_path = '%s where hash = '%s' and uid = %d",
+			dbesc($x['path']),
+			dbesc($this->data['hash']),
+			intval($this->auth->owner_id)
+		);
+
 		if($this->data->is_photo) {
-			$r = q("update photo set filename = '%s' where resource_id = '%s' and uid = %d",
+			$r = q("update photo set filename = '%s', display_path = '%s' where resource_id = '%s' and uid = %d",
 				dbesc($newName),
+				dbesc($x['path']),
 				dbesc($this->data['hash']),
 				intval($this->auth->owner_id)
 			);
 		}
+
 		$ch = channelx_by_n($this->auth->owner_id);
 		if($ch) {
 			$sync = attach_export_data($ch,$this->data['hash']);
diff --git a/include/attach.php b/include/attach.php
index 675dd0da2..ac50b05b1 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -811,7 +811,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	if($is_photo) {
 
-		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_syspath' => $os_basepath . $os_relpath, 'os_path' => $os_path, 'display_path' => $display_path, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options );
+		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => $pathname, 'os_syspath' => $os_basepath . $os_relpath, 'os_path' => $os_path, 'display_path' => $display_path, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options );
 		if($arr['contact_allow'])
 			$args['contact_allow'] = $arr['contact_allow'];
 		if($arr['group_allow'])
@@ -915,7 +915,7 @@ function z_readdir($channel_id, $observer_hash, $pathname, $parent_hash = '') {
 		if(count($paths) > 1) {
 			$curpath = array_shift($paths);
 
-			$r = q("select hash, id, is_dir from attach where uid = %d and filename = '%s' and is_dir != 0 " . permissions_sql($channel_id) . " limit 1",
+			$r = q("select hash, id, is_dir from attach where uid = %d and filename = '%s' and is_dir != 0 " . permissions_sql($channel_id,$observer_hash) . " limit 1",
 				intval($channel_id),
 				dbesc($curpath)
 			);
@@ -969,12 +969,15 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
 
 	$sql_options = '';
 
-	$basepath = 'store/' . $channel['channel_address'];
+	$os_basepath = 'store/' . $channel['channel_address'];
 
-	logger('attach_mkdir: basepath: ' . $basepath);
+	logger('attach_mkdir: basepath: ' . $os_basepath);
 
-	if(! is_dir($basepath))
-		os_mkdir($basepath,STORAGE_DEFAULT_PERMISSIONS, true);
+	if(! is_dir($os_basepath))
+		os_mkdir($os_basepath,STORAGE_DEFAULT_PERMISSIONS, true);
+
+
+	$os_basepath .= '/';
 
 	if(! perm_is_allowed($channel_id, $observer_hash, 'write_storage')) {
 		$ret['message'] = t('Permission denied.');
@@ -1020,10 +1023,13 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
 
 		$lpath = '';
 		$lfile = $arr['folder'];
+		$dpath = '';
+
 		$sql_options = permissions_sql($channel['channel_id']);
 
+
 		do {
-			$r = q("select filename, hash, flags, is_dir, folder from attach where uid = %d and hash = '%s' and is_dir != 0
+			$r = q("select filename, hash, flags, is_dir, folder, display_path from attach where uid = %d and hash = '%s' and is_dir = 1
 				$sql_options limit 1",
 				intval($channel['channel_id']),
 				dbesc($lfile)
@@ -1033,22 +1039,26 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
 				$ret['message'] = t('Path not found.');
 				return $ret;
 			}
+
+			$dpath = $r[0]['filename'] . (($dpath) ? '/' . $dpath : ''); 
+
 			if($lfile)
-				$lpath = $r[0]['hash'] . '/' . $lpath;
+				$lpath = $r[0]['hash'] . (($lpath) ? '/' . $lpath : '');
+
 			$lfile = $r[0]['folder'];
+
 		} while ( ($r[0]['folder']) && intval($r[0]['is_dir'])) ;
-		$path = $basepath . '/' . $lpath;
+
+		$path = $lpath;
 	}
 	else
-		$path = $basepath . '/';
-
-	$path .= $arr['hash'];
+		$path = '';
 
 	$created = datetime_convert();
 
-	// not yet used
-	$os_path = '';
-	$display_path = '';
+	$os_path = ltrim($path . '/' . $arr['hash'],'/');
+	$display_path = ltrim($dpath . '/' . $arr['filename'],'/');
+
 
 	$r = q("INSERT INTO attach ( aid, uid, hash, creator, filename, filetype, filesize, revision, folder, os_storage, is_dir, content, created, edited, os_path, display_path, allow_cid, allow_gid, deny_cid, deny_gid )
 		VALUES ( %d, %d, '%s', '%s', '%s', '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
@@ -1063,7 +1073,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
 		dbesc($arr['folder']),
 		intval(1),
 		intval(1),
-		dbescbin($path),
+		dbescbin($os_basepath . $os_path),
 		dbesc($created),
 		dbesc($created),
 		dbesc($os_path),
@@ -1075,7 +1085,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
 	);
 
 	if($r) {
-		if(os_mkdir($path, STORAGE_DEFAULT_PERMISSIONS, true)) {
+		if(os_mkdir($os_basepath . $os_path, STORAGE_DEFAULT_PERMISSIONS, true)) {
 			$ret['success'] = true;
 
 			// update the parent folder's lastmodified timestamp
@@ -1093,7 +1103,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
 				$ret['data'] = $z[0];
 		}
 		else {
-			logger('attach_mkdir: ' . mkdir . ' ' . $path . ' failed.');
+			logger('attach_mkdir: ' . mkdir . ' ' . $os_basepath . $os_path . ' failed.');
 			$ret['message'] = t('mkdir failed.');
 		}
 	}

From 5f1da17406518ad37e323c77f8dd14bc3821c4dc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 20:35:20 -0700
Subject: [PATCH 063/299] red koala

---
 images/red-koala.jpg | Bin 0 -> 15832 bytes
 images/red-koala.png | Bin 0 -> 14669 bytes
 images/red-koala.svg | 151 +++++++++++++++++++++++++++++++++++++++++++
 images/red-koala.xcf | Bin 0 -> 21756 bytes
 4 files changed, 151 insertions(+)
 create mode 100644 images/red-koala.jpg
 create mode 100644 images/red-koala.png
 create mode 100644 images/red-koala.svg
 create mode 100644 images/red-koala.xcf

diff --git a/images/red-koala.jpg b/images/red-koala.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4cbedd264bbf4c69458a0beb635088d5d6716079
GIT binary patch
literal 15832
zcmbulbyVEVvMxLXcP3bH55a@GI|L`l;O;tTa0u=YB)A3$4DJ#j4DN1&JHcJU<=y+N
zbN0R8{pYUlnYCv6CoR*}U0wB5y)3+}18@{%<YfSGaBu***AL)j86XLOfAbIi`G$W5
z0usVMKtV!6L_$SDLqkPDMMcBF#y~^ILPtf#1Y%-g<KO^s&@kTOzQw_PE#v&t2;4t4
z;So??E8?J|qQBn#f5b}{0Ehyo3P%ACM-6xbgo6jdy+8qE05|{~;y=UvZ=fO|A|a!|
zzxn6!XB+?=0^FO|F(bd;MZpHVzW#cJhy+A_OND~VE{=*vt!CnaPs1Uh9+YV6nqNb}
z8JyHjD`^I<ts^9&Gj~fa_|3(mp{W(}^;=<m4|H;R=AT~w=@0ooJN<X7$S82AuaBjH
zfY&||5s(p3-k>7>Gq8X43PePDOT{j(W|D}EOYIVrUxUKYJ&A`;BcYzOamMLNpb?y0
z`+I8ooR-TJT=234z<__P280I!L;)#WQvZJ;9e0>Rb9N~y!1Kq!yTtAOo720Y9m-Ne
z;jMPCr@qxPeB+HGMe=}iS}>6b$Tr^Z(_CR-@Le&o)m*7B{F0~L?zzoM#o|_WI~8ZH
z<@P;^>!9gQNvj@#m3NX&j`GfFBDCd%zKk|Wi`!<^#z%xI1hW~&Jr?L(>3z$x?9z(e
zaO#%nz|dR(g0Hgx>EFgfNwg+QOkBoQ8NO$dvJo_YE~B*<@QiHLV4(Rs%wSorY;b|$
zy<%Y;%!}--iLIzrzc#NOrLt<wSORps$*yKO7>R`m9iOF<St?Zhy^=20+gRh1y-Scg
zp?nCez3;UAzPra@U9&cdIr;)X&nmIN<K3^E&dzhgvJ{%5hz2E7?%FRh?74F8Fn;P1
z-*(d?KT-8q&fw@jUSDtH{3?=!MQ;1Stj{GHn<suSkl1O~JdM4sEpKhXCiRUxy;Z}A
zHJJtDC5@N4RUFO{E9|I+OlYpLLm11jyke~5Ov+2o0IjOT$C_O5ED_2ImA0S$lBxWM
zl+HlDnDZO>T{(oU%H!K{29X#oxpsYm2W7BO1m!i_ZdJ5af_T1^l=LPwTh7JDbD)p+
z0F2ka%{P&7iu&K^<6gt{^69~_bA6JS^NJPKQZ~V@0+}mk1-00JqR)_ZxYa?uV?zaK
zmS)TgcSG>$jYlf737HNl<gu;Vg?sd{Wp!-%0@vnT7E&e2{~lK=!oL8Hj_R;5Zl=~t
zh%aNOnlrtHMYA#kH2bacqEK1w1tN?{lca6~3itLX-x7<_s@M8!(LDT+vhi4#_WOKe
zd8jw#`s0hG0uvR+xd2Iz*s8pB-YJ~ZSE<joT@n8uL}$0zdW1&@3keB$5+aEm`Z>r_
zsbE`{FOygk$n=R!=P0lD*-L?lQR!iDOun{4f0-0)j((JlE#lWSe*tf^ei9dk0YCnd
zwHNZRlYdIX+Y$uEO+4>Wxc{nb`f<^EzsGx}^yO3LjGbarxs(Ol$_WmNVqDJ>>%I^^
z>EjQCw~J!vV<}wladvdA3Cz~1-}st>X}&W~Yn#}Bv+F;aOtmQozTu{F=2DZza0q*k
zR1?UZ=MDJvEv#uWI`8ib0MDJUKeY({KDgcC%f~D5_XaGcJ?en(xfB?MS2k9cpsN)<
zxn0SCkN2!SRw`+9-@@jh0E;I=RcvG%7@jZnk%7hj<fbwse}#3n=hqpG*sS9)*jv@?
zy)!N+8q`}t;lk|}Cj;kO(Al`~`|tA^wkL!%<R?H~%h8m)<8hL{qr}YEmUKmb#(948
zF}WDEjRf99{`gn|u;&-?Hf_lB=M<iK=o1noAVeQd$az!ef||*7BsHLiT=+aZgsW<c
z&#KaXqjY<hz<%}`bYsd1AX#mw>pSaD4J6fT`e^6fv|~e}$Z~*k%=xXiCk~P}&G)^~
zOy_atW81>FpxH6pL1wXB+<IeoK|o6j{uE||C>!?AaJ)c{#WZ(`ZU}iSYYK$Ns)UxR
zm5L5}6GrXMis_6DwaY20xKww!jcaWkX>33ya{o4#Zhu#9v0DsBezI8;$M(ns<Uf`;
z5ZtrXpDsGz^H6X-o#}L!h|0eC3e(W;b@@AaUtSNHXq)=f%|?Y-`1Spl)Z~%!Hty8M
z7&!9QnPbdlV@|EGHMWZViq!I+FC%GAeJqRLVHYZ9f6NnCZ-tjz`ZpD>q*<oHSa@!-
z6vq@9<)NMxURbQ545&pXp%?*)2K6VEbHw~(9&vL5Au4IlRRyk%49LEZX-)3USF(;G
zQ%htOArB7P>NBzJu~ns|JmVj3ZztcCxZM4c4Y;2e_(=(>tL>{UX!e?M<<^SUT3_*T
zD6Xr;$x@!^>i4%aW>n<EJ$SQ`Q{AQ6?~=@-A!l2CD{CsLrE{(&+~g{c*E@w0PEY^w
z`!N+XP@jk1#s#^d3efENBY!5%D>8aG`r62eNCn*_t-_pmo<CP}VGuy{ZWr9%5H#ux
z4rgkNz&{(Hiakx@)0rO-_sN(*kB8n@MB$&uE$Em^A};??HruY>egV|^rICBde9Q9X
zLzt<q=L>3yFFiR97F&`VFSrX?p08JKuCYnCzg8lOt~Oja*kqEqUj(jM{+fY+hr1rn
zQChD7tp0;*1G^W=dz{~yz6)g+w%=Ci_(gO2Kh?gy^|$b%?tg#G-*UPIrFEQeCHevx
z_dF3^ZC&@%{?NyVX7+<V=eD(S+yUJu(RYy4wYr~)_$HSg^Y??a1S(R#1)G^ESIs((
zE9EW<OuSTt%8ddbXyYOn;vMnl5cbOnbU<I-&%?8``gg@KBvoPhlVTHz!wUZ<2ez_0
zoO;TSYa}Ku8<^qGZr$q`N6T+SXkgdW+k{VDcPllAymmngk256V2sah7S`{2hLM5qu
zg*M<-zb>qzr*9cIZu40x>+`5rC*QVS0N9*-M<Sx6B(dY_6_2Zs&y`Dz^MAzV6?Knd
zs=0THvjR~uoL<}022G}aw_ES0>u$w0!ci&M`jt~@5o^+yR&SqLOR||nfmwtJVDT}D
z<q5|DybnwHd8nyV8MRr3$rpF9H37PX&&?<VJ$_W}B%RhqIKrr@zwB>8@DcN3F0;h1
zjLsTXR6;4Bre*{F2M9`!`TBR7Kl22ayQG}hwdaT`ijlRj#m$EC%yqd7HIUd!p2a{)
z5O6*R3(V%5tN!jLb*ahYj)gY{kOL4)>xWOy^<s(0Y<M}{O0X>Jg1b3A;XFBZZ@tmO
zOA#dae{$w8_D!yp!aJABSpKv-oD1{1d<FvX6x3M^mOekRlyx8d)rj^2@qZF#98V&?
z0lXENw6Xsb^a8Nu*WV;2U5S7tPvF;Uf*<7WzI(DknMKiUmc9Dc85*CP#i^>=M4pO!
z{IUm8tQeL{e9w0wjrD)bY1fE;w*gj_C40V%3JABURatDN))}`~YvX2du-FMIQ%0%o
z6MMYH>g{KNaUqk9tte2li2i&KLIVDCNM8TP<N$$$#a}LAHTVkEt-5<YW^p{2u-oP%
zViDQ|!aPD^MEKPOB{uIoK$3DGoVtoL!W~m;%2aEJ-l33x(o}PcE5Ciwag|oRp5tw<
zw;)nIK;DIt>y13%Z4qwJuXtf#$@yEOEnnwD{ocH(q0bH~m<lv73X=2#L*K#0!Y=rm
zxQU~>#Y`1vLb-0oYsQ;~AIeB=EQyr-6PNaWT7-TJ%M))!mc!W(hUQMCYwhh?(A0vN
zC$J(sNV_(aP`8G^Z000A*wnKj^c+1R(c}$rP2<YjZQ}SHNyOP<^#!96HSc{jT_OyH
z32tQ5NQzsJXuaj-O_iOkoE!eI7Etl+<X*(lMOT4(h<Ktqv>?bjy{16cI~u=tj6X@9
zHitGzB@!eUrPG=JDC6v;xqklb&(hH1sEO;mHwkXVtUEj>m2alwEh<yZk(I`gphGx2
zNw2lzlB+f;VO&GSH@=ADLsIF0ACJE-`tZl<$Mj|kvCY=F95E?nPMoJM;1)tUn53Dx
z3&MP`YH024jF^_-i=4^yCB*=_<bjCm0||wZ+LC7Rz=6N@>m6!9siOZfW&ZWUBD&~E
zB^$2m`>y#>78~NO1kV-j*_q5~eJQvp86^6)>CIGj_R@-QIbU~A`CH*z_Ai@bUT>#}
z4_mAkU8$${>Q)4?`#73Fp&1O*_<vB}H{|caNlB?OF#Uc$^cv#f&_&0n(kfEP@h%eN
z;aft_+Vl+sq+q-rj+#$~n~jB=cr~qjwT&-;L2BoPel4DebsLK4HZ%TCJJ+JyMxLr%
z=^N)cZ?ser{LEPzXm2yD8I+PRfZX5e8y>*YbfNaP+HQ+SR-2LQHa_pJvh>EW?F?qc
zvL8~<fSSd~-u?mz^rWU{#&-w(=YM`JGmdcANV3aZ#{KR{FQ#7^S`X+}%ZKZ#zatNo
z#atk#Xbu?&In%sM5J_QqYjoZ)`ZNmmXY@?8Qy$G&qk}pk?jIX{_ey#m@rs%Wd;#b&
zv$?S*Jn5UUioVqv)@vkzY9TjC!0lz+`|vZpm9eC)aPp1=tN6&<Tp|L2GG(cG$1JMb
zZa1<0s;Rd3%fx#~9~(D4R?AEp`FB%#T*fBVQoBv|*H1JiPIw-s9&(tQfR8dZF$BVW
z!ot7z*Gf4#1pW2+1yg=hDb&d-*Ff(}z(JH?D9TOhzG|$zMuB->V;j@RQ{DMLlKAi+
zMqspp-F!gznso;d%1IfITUpjAu@jvmN#s&|Qxm@fU!HZU7oPqC*fArwbFUDLhVd2m
z=8)~Wv9!e()7@p#G1UYcDIBTTH&pPNqOuPStTk>qqX?sFDI>V3uL0e5DnuaV<eY{!
z{C!NHO@kKZ8z+xOy2Msdmk?@%u+-<>=uI`@={3HTI{%?Uj@3&%S@4sktNUj{<{7@o
zU0{}V*;^PolX+@<j!yG0Lc1{xSU}@U3;3c^ixm&o^Q6MRQv;?lZyHEnL>GVh+JCM8
zrXlvopGm3-tar}T;+I?eB|2lFb51(So1keuBBG|aEhWUj)}_d8w7my3uRK9h+3zKw
z?M6|eanEwFkXfS?H~oY$a_(v<VDZ5=e7iz5Ki-T;m@z(rdl?kl171ar4dM4DmJD(c
zD$H!2k81fg`BosyQc|IZMQ#F>E|9+{=xldw8*RpyYm=9to?O8e_I{o?O+|m0OFPTN
zmGiTE*y&`|35-AR{LchSkoyiDwcIaStzdb|xv)Si0S7@ss;g6{RaCu67CI^dS|08g
zH+GDc=A2D&;Usn(Nf5GahKA6COlD<zHkLwjl}APGOcRb^#E~>jVM^YKC)|-UGOX;<
zd&DxkU-8>8$R0;}*H_;+V{%ueMPvO#(<hs#1`dLtYsQ@$OP?mv6$6?`5gOO6);)i!
zKbc?VISxW{M*LiLwch%Y+(kUej$e=~Qq<W8*^UWG4B^U;hbjR!WvMcjZ>Njo(%u{o
zOXa}beARJ)3;$#i+jpyR($N1=c+W#-ii1qPUrFA7_<Knvxj?x*Caalw%GT=Uy4XG3
z^y=qR>GR2{VRAtoXkWMw^^wxD*`qzhXlKDRN?mE1|9B*F8BW(G_i5!CX&R&aRfjJf
zi)h6P-(C{ftS(G;qdUPGrYDQJ=VUI;4DK7uPpp-tkxakI?g=`hjK`^Ht<%}yvLG-R
z`SiTw$*kJPUz89}7T)YMlapHtnhsjp)Zo41rDFh-lF<?JUE7cuPz*Z^+*5qXJ4VLO
zFJ(_|sk-*mU^aPd-#B4i-l}mr)A@vsj`@?;65EPXtzNw#`_WUiGPj{si`@~o${?nD
zZnlEO!<1z3_mL!H*x}LyAAiFV!R$0~IeppHY_^k;xUE-x0~1S$oruf0KTrJ$3uc@i
z=1O9cVfW1Q#(FLO&f?`1Mbi4I<%-H;ord#RWjWNMY^^M&?$58Ehr!!U_OU4iyq+W2
z0elM$U1?YjE#5ZHnDrwB+)XVV=9*uXMz_WX_?zxdTQj|mynQ&!eLKY5rBN$0KO;-5
z(C87aj}C)2D%~jOksF#_T`21V<tjfTs7^Hy;~Pdq6X<Oy@D@(1DP<n*=@ET!Tnb?K
zAtNHEs|4F$KOH4rz`6b2a*|ON8|)!7ieh~MbYH{U2c0F=E4={rQx=(=7tS%{QCLO4
zdRv?s@d?PJ*r%M-=W(f`jEkm+2Yd$-{5nQ1y?9Uz7FbhV_n9+iG+|DskI(&52}bub
zzcm@(iQpUZ7WbIU4r1I?LewJe+j6#Es`-VwYxJ|ZxQ|RDDxkuq1?<NDjU~{V8B`{p
zsL!6;-ZwZ*@exMIzK&a?mtvarVS33^!FgQKW`&*^Z2Do7v0vRoa^(xuZ(7Ay=S#Sp
zyie1i{-%n-oK`Fz+J{PPZ%S3)+PhaHPP6_$*&9$#B#fiON>yVE84EPDbc(1ud(Z#X
zd9T!I<jB2nqed{jNZ2$X+}#FjP&er%t*PW<QmVy*4sp8$UU|?M*y!cdMUKu`wAPY^
zwCD>obm0!&WH0UB^A~wD9Zu_W*2Qg{5^+}{6X`ZD5jmdf9JD@-u@4PC$HX|F9@TS9
zWBj1>bb^2}GsGNs#BA}@h=LZa!DK@pJE(kRTFUu0kMSPjs#K(AEp(!DJN;PF3v%Q=
zmKPBO-aE`cblm=_-r1S?o9IUhLndQ7^fKI&{mK4OH{j!026m}4`T4+r%4q+3i;1mX
zK*hrln=Zt+lwteV*DJ*<m3@O8^Inn=(LLyqRqyP@54nh_u|^KBE5^7~5@1})rP;aW
z;UK;2uXn`#g1cge<v=OY-C($ZGL;}Snq}Y-;^;&IDj76bHV9qUWm&D0q$IC<K7jc<
zZ_ZiB1}+b+zj@OYlQ>I!e{`6i6}}VWOrh1T{$4-?Xv0CTjd{^WfQ;MI`tENaEBrym
zQndXVL-pliu+;n5?m+F#=twCk?cVawT1-?T^z_>FpJBDL-;+N+fjkXlv!@qWyo19?
zzdHJPXDs6=^bFmAF?%xnWxKBQi&~q+NB$7Ap)$4m$q@XFg?}O-@d?R`;8YzYMa3tZ
zHDEeAxzmb<2x7Sh)1t(fMe8$STUYNuf&G-WA8HJQyN>z82I^=$j$<N2H_oMLBy~{E
zcHxh`eZt#W;v%XeTNWetkVk}?LuUvO7iv!Gkrj0=j=#<mXJ{3j(<a&EmE{p5NJ%SH
z4T<@^lU|z~^~GMiJ|yvdZ1H>nATF1uJ(E3fKY#;`rqFS?lWk)fGLJl0Kgtdp1U`my
zaq#(4bY>hPHZ$uuhFW!-HT)Jj^k>>*lTS`4ISnl&$8I%k_Sa_-arjW*Np>V^aOg+T
zMQU$f4SQawTl!vQ?dxL9@M)0NJn&v8OHv<hlZ-xrNqCbG-^=rNh1B;-O4}z(0wk$>
zGmA`2`#E@DJv^Vwp_4rO3FU2Ol|TU>VIEGFUWj{4Qryo?#ISApGC_|tqF7^=e6e6S
zB))jTZa`#7rn}4g60{zZ`W`2ctY^T%AL)k4|HFFxw^haB(l>^uyJ<)eCi}@!FKBMb
zaB$EjYr=~6=i<(euX=2}uy^LQYn>^|!jU4Vz1ggf!JV$zjTd<Jlpz@Lah_x0_oA1Z
z_Pf!RBenFm!ym6<7fE-wi|fFa#c143UJSQfJQtkJ24OqQjF{t=*nz3+*(x&!-lK7l
zhmTsjuK=)3pL9z6Ym-1Ie+`^**fS4V;nl|G2lt&*`LGBNMR6NLN-@870vUbZQOxtG
zY50)HTjY7`<!AaoWJ8~?UjUYdAM92bz+&b;N|u!eZHcw~OcqyjBC}~oLc*bQH1@2l
zSavErT_-}C_U9p?i(}~L^qf5g;vOA;-j(#-RnD83d;A&dx+}(@O?`_sW<sAb>Wt;Q
z*bnGP^%W;PfRH5tgdh1s=MBf_e<|H~w*d?M>hy1`RVS(^nl+E@e%dt8*hq&{Q}<}g
z7f@5PAos(-e-1Og<Mexa93owM6V^b14+MY9bt-c=WuhJHr%%eTnVhuV+g1tsL0YSG
zDL0<PZdt85WOjLA^-gn1s2iS4TRt8vOx6b9Z<OSDFnvA^#F3zFux7Cq&4zmyf^@Le
zI9wWLhJo-T@(belfJ01aYn%0m93~o&1@Y7#QoW=60^&Te<=6BM!I=I}tGY~@QT)g)
z-G!NVC-vi~d^Vmm2_YI*jIG4@1F7w<m@%j4Hp^#m;Q^vp9Ug1whO5gGq)-_}3GQxn
zpE1p|r8eBflf5zBx5)(Cm*^PIbJaizohf|-$#g7QlT}1F>LMu}*ZnIawSML)o_91H
zau>vX@q~PLh!;(~=6|vFyxRImN!{6h=)Zq+ZU4g-8ggh>MH;k8Pr<98qcay*L`Z?u
z9QB>wN~zx*2`x#Mr9Jd>()qF~>vb}_%?KZN^};4o!wjG7+dUJ2!_O2}qWwEQzn)Rv
z0!n)^<8${i;mO#Hd!l#P0i$EPE+XbhRV~apyqFTcm1b0+SjGwt70VGw)Q5B-{k`VE
z$#XhA?q9XPogWp<8{!I*EGPP;SLGI{Ifj{{Lv-=%$&6@LcWWSIido1RGY_6}hswfM
zJ9AmKldfi59>O~rR?<7^gBasy9<p>;CuYUVMXG`xQ1mQuZ@bKvUSfFAFRSKXg4yH@
zGfB!*^0c=}^7Nys)@1CwWX**oKB^Y%SLZrHB0M`}bh<T{tAm=^TXr7XBE!_4^xhaO
z2yq@A<H!pJNbP^-gNuN(<rvOA=m;+TB$A-MplWOQJb)X3O&SMJeN&1Z8!qAG`R^?d
z_@(%D#r<C}19Ld)|LreedV;A~!l*HWD>JF5HdQ%r!M!>m<uinI(Z{<0z0i?OpaeE*
z(|J@LcZ6<a`}m4(kW1tkfrJFmwYOL@eqclSI(usuk^OaA!xBg7#b}Z;T)9wiNbi$A
zI#d<&+%m1e>L7aR(;+OT+<nFgdS4U7DSU8#;Bd3j0{GuOZH8lmVbq)CdSRg2FX|TO
zh;iV<Au`f4A!KPzna6tmB64jXr8To{WsdgCkDY3Ix%8P$wkI+prw!b%{t!f7aO^Z?
z>U2bZYg7Ku-gH4zB<H*7K`y5u@mup4_T;A93`Nk!xnuv0O4JPJ8wBf0w<e2*0kV|`
zFLDb%f?5h&-3uHOJt?UuV))IE#Dp3Gjp^Z+TsZE(mnIB=dj45v$lNiOucr=;PUjux
ztIvd}t$r<d?l}XI7KB?!hhg=@{QB2F3+4+K6j?l;YI|``O|Ar!yfUL917XSQ*ul42
zzJC*@zhpy*+CT9aPS%+pE)olOk1ia~_jDTqsd{}0k$YSa9FU?H7m4%~P*bzQ781rF
zV99?>-_>%xw!l_~aaMv_2*PusAP+@3uXZ~jI+s>%V%;1x8n^mn(Lu0-^6^GwK$I*M
z6xGNA5hZG-AcA^6mDWVE#yb{glYSanoB*BYcVP<F5W)=t2}hE8(J_+c=D56C`i&tE
z6<rCF8VN>na%A%GgL>xUYTy{YJwGaAvbI*J5ZB-3U&EsHvR$~78Y}%fburhZS<V_o
zr?!$>!?~OTl=W|PR>hlP3G(|q%e~6>xN38xG;zP+HMSv%$2_Tg^1KlLt~HM~_#DQ$
z*xkw>hucm4mj0vOW7FS{Vlh1YNkwvcc-V?B9IP|6zDve9ca3(r#bLVa(x-%2;cSBD
z<({5Xn=K>>@$^OFZn5h=YFW5sOsQCMc(-`_mE%As4aeCX_c|h1>C?Vt&$HeL9Ya#`
zofOa5BKZz)K6K8U>5%sNpR`oW^_fMHD1k$aI+;J&E!IVP^j6a1t~>;29>nUZD?Vte
zZC-Mlrc8+V`VAb(ERx)$>;D#Wz9grze?&5r!K-ADjA~7Wc*TB$HR}~;T3#tH_mOQ{
zY3c~#EZKHVH&i}uKsB3p<%$tMGzfZOLiK+s$_+!YM0dEg*i?23M-BTHy3|XD=j@UW
zE#fQR-DQ$yCGl5rf?Iix2bxT&e*uu9wM1wNh}$Nx1OZY~hNb@-+x9;fE}cd2^{I*y
zrt9mCp#!azPO6$bVBUOh`+Ao#y4W~g>^j=sS}bEvvv->SHnUKnnHhdQ)_A<h!rR>{
z0>p5BZ-);&pL1Ypro@;%Hnc~W__QY^13Jj|tBZ5s)LK%q^%Fxm_LS9!7TB>ax{<^B
z(L+OyKtwl8p7L-L9po*}wrRZ?_ih=Fy&=YW5n{ancZPl)V{UKnQqK(maOc?r$i@93
zDz>0Rh}??#r?Bp7?3~LpBXLLW-a1E?EZXh94`E@n5`rq8rPhxS2w-Fu`b|pOUbmJ}
z(JRJc(dUt?&~4eC4n9>(xO>YAd-iidWF;6AWL+#1gl5uA!^P)FNnvE*Rqiywy*Sq>
zNeBOw#X9(YZ84#xv)iAP>mn9n#laCMoTFXKs<C}qZs#cq-{z0D8)apL8&EQ+?)RBK
z&jM*(ADQxj$q8IqNE+KIp(=npsC(?W3x7kuQ+<bU?I2BG_a5}kLF7H7@*V~C0m|C$
z^o2I9a`Opku%G@YhTON6Il;faPoJCi(Z+8o3<rm)9#yXI3t@kc9PMPc-#o;_MVl?t
zCJdX59<G6M6iG`~SI@^5o+O&7FRLQ&;!l&VbX~>ff7%F1`^i^D2+eQ3o8w}S#kAfB
zkN`T>@EY_1Z-V~e>}w_!`a0rB_$x_*MW~FfkXmP-m}VNTJ+V3KHaJpR^v2;H%C;zW
zt)h=cflpXx=cJW@=(h~jX1!_7zVtXUo24vF?`0MO?``f_BKo6nc0<(G6rxCbQ7Csm
zfYsX;LmGBdj!`i(zTAlJV_Ha5=ge_Wh4<Km7~lWw>^(w=vusA@Om`aLaoNX5YSq&`
z#KbJC0Zq%Van<Q4Dzzy1x1o|Wvv?tZWp2{gj~_>TGJG{hoC6~7L^zz+kf9DD815I>
z_dAt)jt`B*itmH^P1?TG7_Qtb95?SvEY2a;To=8iwg9%ClVFcWZTP3Q@)2T9n9DP^
zs&hNzezyy6|LrkhIbG)15~4o{#DBK^Pp9s`%hHfX@$(YwF2i@`4L1q|dW};{=|7Q_
zB|WYJZ`GW(C+l)9c&YhT*Rhu0`OZ9Ks@fUIC(jAg(Z84F{$BgX(?RrfzyrYLH^-e{
zVTLSI1F_zJv-;fPwJb`&*KhS{%fflO^{wtXH%X@=VMvI>n9Qn*ap*5$YH-k!1fc-L
z;R}l-H^qMSxJkyj=Rt{|ww)WU^P-8a#A=q+vs72PT{#sQLv!b<pz{XtXCTnD-2eZ6
z03XJ6>HCoKY~tSOl|n9TMx88z3s?Ozy!}FGM3KfO2IAuz2Y40;@rVALKc6{qd#@pk
z-V~&STgjZyRv{0B)KK7566jwZ9sKBb%pj-yb9su6)2Xe6cu`%r=n`%n^GP&}Mx0sb
zk^Tihh%dO`FmAQ_abl|k%^4<9uG_!@GAlPPYk;kmd(aGW8K0=IecUw>RwVx|MsHD*
zx?#2q%s=Kv=DrLwHDoTb8t%8TTT+x02u4L9rwsllUZL=RSQN}`F%N%52%K}ZTu@gA
z(-5O-Y|GyZa_EVF6$d`wf3p8OHA=|xAPd$o6BKA7!jC&{8I_DHrs4V9P{CF=e6}!$
z^>-+dn`Hltg77TZ`%Psde)e@o8H?3iw!IAJC4b)i+d?e%55}jvzEe513YTp~-iLd*
zyYjH)Q>Fu;jW%C<nxOixZ1LbhFNY8mH3$H%8SomA0YpUPYrJYve0)U>-9ZCu(e2r`
zX1xjbG}FD@)G_1xaK>53uIm!c@#xBB*yBz1dH?{wS1AVIZM~S5ps593d8=DvXltMi
z2A2v30s@ApslS!0y|$;W<fv1dQg*a@=w<05=p%m2ynL}Z_WY(?>yNNICeq_iP{1x3
z$_t?VhXf$mpnp<rT*{5-WA#K@wHKjkJWl0@h~l5ne=TQes?``4No9XByI5LsKTnF%
z!Xdfo9mI@8X`-h!Wv5Ax;HbE6;$f=dHih-G>*A%HiV`rc2glZsH>F>CZc~u6pTDX~
zV9MW%VgrZFPLB8X`&M=`<hozfeD4l|d)*^_OWrBz;YAd-QueAKBV)Z10#^+g|A*{Y
z@vrg^(b*?9`V!1TW{*LG7C)?Vy%C&yfX^(W53Gl3Z3mnKBK{mUpVVBoi+?Bu3N>ZS
z#EPE0sar(}Bg@2#Eyx-`H+Pf%u(*6|Rr5Q)iuEbRr^9B@m6)1E?pNr)S3i>@{h@=o
zbx!t5&V9)0Ai(1Vuy%^PU8%76O;mO<nrH2B%L(lCEH4=T0x&-D#{~aH+uJOWK33au
zDxKfkgj^v1>}NdIQQ~WWrsi_2BEHf+>Yuy+k!`b|W1;9JNb&^`P4xn}DvxU1h_4v*
z{O~23GgbQUPf=svZfBqH?n5`Bj6LTP(FuH~tmEDg1P2cqSeHtfZ3{JZQYFg2`15FE
z58s)&dQY;ufKr>Sl`lFCh@jv)efVO6?873ioUAToIplmw%)ZCS9Mz3QA0&4|>l2dA
z8yLnDZ^R3rpysAC3s4rX_kJJQ4{>%HSVDEKuX2pH|Ni<n23bC0dMD?>U};1&Bj|P1
z{~PeEzbIsE^dB*eJqpTB!|$@Ltlfvw9SZr;FG%VcT4T!bE>lGesEIxbO|%DG(qAzS
zdMz1QN|(S7gw_kZi(4Svl<Ktc@io9)XJwO;E}NhDuT&;VK7!^q*b>+o_0!%xI+pKU
z{nRyv6(sz}b6ro<3^jI<R%w>n*qA=styDfV7QB_FTpSf0p}-M8L^(uD?+;q^2){L2
zZDr&y^OU0I!j+4iYQ=H4S@*7=?2*9!$>hNZJs;$GfAm8U--9`El~clh_`y34B1&*t
zjldLje#FehXkOoAX%Z2rVS=nGBSlX6gfj3|%Fx4JQoX&gLXHTJnaw9YSqzqff{=m8
ze_}^$xFyC(?@auYxgj#g3_6uiJ6i3T`0FE-XD@kg-tzAxx!AD*0?zDf<aG<!iwpm5
za(ynSnxdcps-2svpRzE_Vn8)!avsHgL-Q0w`*%9KN!nS%6lblDL}>gV@A)%EvH{-r
z=HSpJ_*>mlQuK~J7fQbwDQP<We+z@);fN_NjcO@ZRteYh-GZy9xybI9n28ragP>;Z
zhms@o#DU3U@u1)^uH|T|m_g0fGwgd7|GkdWxSqUIlQ5As>`F4v1tJ|iiNiqVxoMvc
zZB)0r+t!C(tO?1l$R4<rTk5VSs}T{k+&|R*NBrQ|&@R?INTY6tDyaXnWq_VRczaot
zeOArq*ySM8<$f*MiHm9<CmNILT^|dXSS*7uW(}EG`Ol5+nY?zR910Rdk@&l@cGB{q
z?SotZOF4Ac!)J#gE+hgaS;#dHCt^%wcU(h4?EuZ52nHh5ajQutcJKnx6|40s^T6Ix
zVpTNUm!qSUy2?_HX26_-CEpP0K#N*vXO=24@6aZh(K942NFE*0oD6;T>3vo>)`dFA
ziWuJQ;xC+<HoO;f*s4OgF?ABdTAgkY_sRNFVPJd{dgASY`hLQRf4;{m&h95`cwK!t
z6>9W2Udwg>7Ezv)&;Dz+&{w1rIuEG-Hx_+S$odbewYE|Visu@TQC!E*1`2Byd{%mW
z6KAhK%?@H<ukg?IT}@<%wa^Ep0H(IZ=$!tfzXw$(UDm8D#*_OH*7mxZ43qxC3~>bY
zlq%qM-JLM%O0)<QJ#*e2`$kKZ*?HPT{rrkM9I`ChK|YB?kLpGcX2yQS);bIO1n$LK
zxYp)iQux=}jwqKB@IiKglvkAZ<z{Ct+Af*sY?Bvv7kw-1-p{4&0{5vGZJQPKUym7u
z`p0MOFAnyJ5*9*2L8kzDo0D>%*-?CQfk((~weD9*$GQ;92*GrBl5no8l_D>)_6T8d
zv>HXQA|_gS5K%G?RL+WKqbryjfjAf|6bO{~@v0>mNg)jOGQ*nDdLCtLfyvdLo3Z_8
z&2Azm;ZQ_11(^0hj|a~B-~u^(7}QY+<$|WG%2ZO^MG$T##c?_>i`xdq!y^fC{fl+o
zr))Hw=`^T(n{QRUv!(xwaZUN>mzc+6x}Io7F;8!V`cnXIL36pq`Ja1%yUuqeZ*~$-
z7nh}`&secM|5iD1gSB8rbE`ujVb9tHozn$#hl6{e!G|K&QKM$>tY0=F0@GOf`?pq4
zkarR1RC#BmOO<jFMdiWNuVA!mA@<tkp8K)GK~`uc4&D~ot#^01N5lo`TTf=B5is*%
zuv0f9#g<S#K1XGxC@>lOgQ;d?EIHl?86u=&@7%oe_k96ScKQdF(Ca0`>bGuU8jXem
zs;AzGz7ORrxAVJo9lyF{j8T?}&1$EXxg~|~!qE?4(hPiH=fZ$EHg0Ca?4-aM3m66^
zvDx(&Q!tF%>XunJni4KrulmYURg*$@g3^t7NPw8TN8WVUnRV@vGN_l6&+#dLm%b@8
z4cz#6+;W?JBa?7!up}s@i@V9!k=;h*?3PmJ8dIbmbSqy=K_h;7vf6X5+nec4OS{ei
zii0ai$=gd@(q>*$4rO!LYWM-Ed5fNnzYxOSjKcw!*YfSC9u5?!WF!4?zt9TzfPKqA
zt<g!sx*|<Etj=LtG?%OP1rR>yAWVNCIHASvDr)H5qrT;;)@CUkp3!kfXW3Jlq}{dK
z=J%Ym61Z$dHbA(~bDd2(StE8@dX28WB#gTz$lkoAd+H1kd}r#-4!xU-uAkK5B5#=%
zQkcAhxEEe9cSMZLJ48)2LE$GyydJB}Leh70AYlFJ8T<fkV{v?R!<OPW7Uz7Fi0IkP
zS21?+UG~a(G5uDOg??v1Pd2ryX<*_zT7)Rkm;}Yql$xZ<fPpi->G6nIpfq)>>zu;D
z!)NVpX>{L57Tw$Cw)f2wjs&og8X%Z<AOUWOovavM=z|hBI)ih-C!6$R0;Tks$)UUO
z`=RSUug+FN%Ix^K1*xLZ8fsJeND6W-qTHsPvgEA$UR}y+YPjWy-XxJurFYmoS&X%f
zyXbeQX8doYh=^zm1J-{X+YzO%nwBX?o#LYw3vd{$f;?K}KX{+8R<NU03_HZH``5y0
zko|D=`?-6Qpnu~dw|Xnd&mVBaNrKVJv??-{dAi2BrUxd7+yniZ!`GJ2Ir}$PO=gZt
z>W*c#+!rtI9fi;uKfzO9@{Bt_Zar;9kl$`vSG6x?{-n{L2ka)iwj=bL0d42!YY^%)
zfvcGwdP4QuyPren_a9R<KtRL#&&wOQ#NGFpDNR&tQ+1@=T4^%<)hlTyHF@ElMudF!
zC>M5-f{qi8L*OtJlM;2iouno)=XjpGkx>X-%7QYrfzs6gSxRZ8OsHeGTa``8F?yqS
zC%?Yz8I}I$#>i{?K8ehBW>@|AO>`+o_-!53=d*T8d*>6O_``yXqfcECZsnPqyF0r}
zOi9!X3LQXvB$=z@lxCQ-U8TaRqZQ^NypUl33n0W-Up4_DV&V6tSkb3X9J<+NkAXz5
zi9DD^N4wT=G=Hd)9b|cmt)ESg3cd2MmP<BW9xKQlpTf2Sb)KAl^50YpF&m`&+3&Qu
zU6{$P7++9)hb5`3ijwG&0L>{|<*~V@MJtjzN5@30?y%vi0gS~YIm90&r)}0QNcqox
zgs{A2f<kB6vE2(lu5v$)Ek=DK3JXMK{SVvB^G5GjF#G6F*&1e}?x1x=`>2Nz5z($M
z+XC<0pOB3Y)^MZyw02@5(>hXBHY<`}XPX&`bCtH&2R3U{7HzXj$wmeXyjCiaw|%kI
z)-{P(pRdg9o<d;+bsK(vEESq{|5%(Sc5J6FS`RG)tG&2`<uc#*oGM@L)|HprL4AIO
zyqi&n2rrB1r!idJPHq=f;C?x}S$A=^*NR2;kf4Owes~VcUz+Rq9TCm1U;Vl+3j?Oi
z%IOBrofP&P!)}QK0FO^S&`}T9d9J5S1rAZ)N^t}1<r{hPW63Q0kRq=vGn(hsgZ}3d
ze(>*^+bF6?o8HPHEHSpcY)l2o<d(NoxxV~+9pmnPfHNs6E$O<+f140OU+|=)?fL@-
zJ>r0Shl-!RMP9`Cm3G!NFW<;fxTUyh>e{;MmvxxVEd~Alav}^!`~}E$A*p{N)sA*Y
z6cKx0<-yQShFZpygPnc@5~skCyZaf=)%R|R(c|gK&#nVxA`@=eJS^iufU%(b?TI^o
zw1krTx1Pd=Hn-EzQr5egdWvDk)kjf>$Minf6z~iN5Q533KB{fk>h?|KJmJ$6BVeAA
zTHWk`k(a0-LXZVVne97!5dQBt?)sfnXzGs!Q{%Z--4^c_y<ekn5CA}4gq$`nj0(ev
z@@!s2knitM=%r(>OG+A+H5Xlf-6Cz=fN+5lx_Dl({5;xCi8>nhcda@_o$g&v+T<46
zoTArEtZUk&jzqj*#aM;bp0I^a7{+--03HNQT}BQNaG{LGv_&UP;uhQd^d|k(M_+&<
zfu<C#fe_+i0>uNabC?o^<4Uf}Oo%Ut=Odet?w{ZDRi@1+@oG1rkX?J`+WguS#Z^fT
zS4l)b>ospsU|zM^9%eQpBBTXNoM>}+^MG3)m*(p7VK^5kjQNdVcUgBcV%EgTI_<=Y
z-Mf}5nzRenr*^#C-!?zsC7X{<=#A8R_2^1AtNA{0wd5s`PwHz9*Utrm?9^1z4J2g9
z@Rb$L3-v|#pmjs%c)-&pq3|xJZ2&BJ8%{(%F8@%CZ;;;4)CxS#PD0q}<e31UM=s`X
z*H=uUuJ@q$VSnV<#++S7J`O3DEE3T2%EUC12>=9=omGXxc;Qt7hMT=})_)pH`a+G0
z`VchU!<Uli%k&Fof*8tN|7YL*qhVW{CLt~p=Pv+m+4da^2$jQ5XXGTTWcUG<;z^r<
zHRy;i#h<f*Jfm_R2i8EEBiyqptULVz5IB6Dvf$~jo=N<{4JDsA`fRsBm=x|1&mAAM
zlo=^K3*XyUA6Tv9fOXQb=iKhopXLxL;xv>84gl6>FM}s5{Y_!RJNRedU8RKj_vOcM
zta*c+3;rQhflpyk4di(dA2CNTu;M0YpXcUNby3LQzb~x=ja?6=<E~gwZvLX7IWy=!
zdI2~#PPeXUH{a~!=sl--EFW(ClQk6D{$Km&U%LojMB%+kTmwRzt33R|@pEqx{(Vf!
z<(91y>(hleNp@#@{oAr@+^mnDI=>~0LnrFv=|vYQpyeT;xq9wA08$q=<&Ug<tQSCV
z9?^Jf<~yd%3)uvr`NMyyTOd%+?F<>8^aXGaO<H&XR3whS@&c6#D?d8V!T2u#iIC?7
zZG0ZlbAwesn=?%U?dPxX9kD`7*yU0Gunqq?OrTqQ;g%w&nn!B>w^Z4hRwML;;kvZ$
zi)M~=vtOiXw4S3uVAlj}nNuWg*4*OEEt$fi2X1b<4<FX^zYz=zt6tKkD#{&@jJvPo
zwiE9;4DI437<{*qt$%mMNTlv%ZnN8ftV{qSVcZ*0Y^Ai9yVIF$=)qOo=S7Mc8;UJr
zU6qoqpGPcswefte7%Z$8`^<m#S{4r&Ax2nOgXv<AS-|?(5tIqCy%O)6re?X6tA-Bj
z9St!Wd1BL=h?0UWhsh3wpyGmtD@*d$J6;r)GIBk2>0(*jy~6cvBsLXsxx+4LAxq*7
z+?ras$uoGRV2AXeo<GI*Bo_}oD5t!}c11`AJ*&G+m>YFUg$y^QRgPwH=bJ*mm&vf!
z<U9q=u#4L;+MVBB*0jvV3x*h!J<*=1okX9<n^)K;w)4lsjXDbkW2YOHe@^@qb^4>3
z51DJ`Rd@b(f-5S(QMrqyqf2DCUHKT%gXtZb6?Sn?V@(<BZzYGIg~mEwq>;>!$)b-q
zk~!1W-0Decdj;;QBpTa-W4)&Bys1O2Q<h)mVyLQZjJ*57dgbu|!2u$OkTY?JmM)~k
ztulAW@&ddNW;xZTp1Kk)O<Lg_2b7xUtB0F8u7>%{|1xao5OiNykyaR^-ohG#BnDku
zI*leFHTy?d+_7}|lR1+plOlbEUW^)l+~)A`NIH>_iHpk+Lt1zAFcUNLj%SkDvGT0B
z;z%))rB~=^or=xHIB%5U^98Mo>(;UQaw0+^@iy@%(5%)nc2RS!7n?n@bS_+3K9YR}
z?D2`jR+=|L5N0w|gHo-y5i!B~@EPmkXOwqUvz&8+!p>;0%8WJmy8y0u!Ile~3}qLQ
zi%)g~9!^JRWFvg&J&^v~D^T1E;N)BUzV6?)7eMZ;foy#bLw35|3!pxrF+WT(g<7a~
zDKs3m7g%21JW}~1>+>{UOqeZrgMg<fb?tc}WAjHpa*rYDK`>Uv1hLaw*`UIxV9d_u
ziCSp^vXQT%k?(TWk;@oYxQ|&x4kPu1WB*#md)|R2@`5tJ>NY6G)1W4$ooZcyj~x6A
z79WPyox6`}l~1%9V3n9KvPPzBCI6cB7Xa#AxV^di8pc&)Uh{&q$I_rFWsM*;LPFob
zO<Mh%O)&&}d8Ti7E&B^o$tJb@{%D6n#iRo%H%ulMjYK@c=h@@svh<W0Y?SjI7Y>bM
zWZs#IqHcwzZt~jUT0g>R#wE9_niQ9a$3EuE>m{9h1rfvSk9nDYf~<D~0TA>tSvrb{
za<JE@x$mQ^)1Wk5JN&f1PsVLB)BJS7Dr8wg-3U1AiuzNpi4F*p%sjNb5-w)FC^Ps|
zuF1~y>l~J!H_le!>|PyJG8CFym@OO-4=w-SRsaxxT*<~y1;XimH5WJCg0Tx)e8|u=
z=8)THM(lTtF@}MKq3mrZo5-I@`J7_T226|g-xOzMr`8p(ar5GEkRa;s;Q&YmMLU9v
z0z0|>rp{*kzK2?OFr|)f^VnS5yYn;ixA$A7rE*0qsVH07Pu9>Lp=Br&954yMhk;}z
z3|h$Ah{1@GxGWJ%put?jHfrz^wkoO#CB>IH;iNWh&7;$T3O_pMmD$$Bl-+UVLDVXe
z0&I4zpblhOzoU?>IIEU1mj&0F%-4V>+Q364Dw}YVdRr(DmR*Q|_5t47uzW?}1YI5>
zise`S?wRsz1Ez3FF1$+fiHN9&hW}!s*T?4l!Z~owIY_nEJ=l}K4Cgv=me7D{g!Y#F
zqOzd8;Mwu7i7l|YvTY$6gtNuSx^7Aza$W?64bZrehxIxeE<`C|E{mlb)@ky*J-_~S
zx`nB6*>fSVR@>i^>0LwR2*d65gfcRj>%dd|&(#i!s|{-del^P_=MgB<_SgirF$@)f
zzb)toS=e_J2Wf`+XY%K?<Jg}E%)M|g0Nxqi?7uhK<z%@s^Hv9u*S?kY<$tS~a9?wx
zD?*2U|H<YPp0B^8Ky0LZlrxx*Z%Bz*J6YLZFXYBcegX96cC9^g&c6U2uPI&tiGH&C
zlk19P?X7i&BWu5pLU}^&8%srd#h-C<o|Ja|74jZs3_uo0qT5!FQQT?S8g^{17(AI}
ztVS%}yJ(s=GFCZISaEkuY-UTpWlo@DaiP==>Ct3?RoovhA9DX0;~>_&y7%JY0V10c
z#xQR_+2&iwjtYe&nL4Sz$Txi3d29QRk|esM4&-nUcw-TT4JL3P)igU(7k1=5v&iaA
zqMM8eW;9(`Uf^Ba$Xf>0IW&vX@`fKr_sJoCfqYE)h2`0E&WrQj{xSndwr!?`=n<lp
z5p=&0+`dmG$gBsq27f3BelLz-AIG=!uJ0pYt{yWG;05?KX{k!Lp~zVtJTcjfIO<Uh
z5q0=P)F#7O02TFyCa>g#1Ol9;q%=}m{%b=3fwq5nZk#rZDA<oe^i6WfmFomsb$?>x
zto`JrPpP$+Tx_9lORTco^EbGm7HwWz(2It>2VX3K_}zDr>=Nf7S4!w_cWAI8$JjC|
z)Y_4_M_AbG#+OZY9JhHi)%2{6zAH-k)qz(zg#NngLZ%Op&h!TY7Zb;|LFtail7f%)
z3a2(U=c-C+<zVIQ-QS0dJT*j&+o)yc#(sK0+>KGZpem<b!UU=wXK~~ahRLA~=f$Pf
zl1%8-fVSu^WZrz_@1G!a^qR%3K!Vi+7H8h@Y2kiP0VPg(Xl^8Xg)QBPiKx}PAgK04
zXdCTw@h%Al>M(z$$Bh&VY1X{PcU5SVIo(nB;xD6yE@g_Q%D;VCrQ<hdXi0{H+23~r
z+k#rT9PV7yc<%wlB<atI;X9(-&QA5v&eb}D4gAi1)vG9@?W54eICb<ps$$`skkkmL
z3quYMzN2oMmT|=TKg!EKK;gnGEHqp&^-&BzMMl<|jW<PymFQz%K(TZHrk7b|bLY>3
z$t>Y+QTikwpT$T|PeeJ-g;AlBBKwO=R$*e&FARuBE(?#EXM`G-?k@lwuveyTX7ekH
zZaoVfXRhwny^v)dOT3UJ0>kc107yp@{XWWjiyfFfCj`!?p*qX&;>fI@9N$1%d>%1M
z2pKYz8nJxhPF&#gVA<ipLn#kKZBsWkK!c?So}+Q+``reXzXxFpzhWb4Fi<!gOBT2F
foil>>rb>kNmw2gOUH1Wkg8vRL{=XKCUKals0#OA5

literal 0
HcmV?d00001

diff --git a/images/red-koala.png b/images/red-koala.png
new file mode 100644
index 0000000000000000000000000000000000000000..005a37fe270bcec23b1ae5d19289fdc653171155
GIT binary patch
literal 14669
zcmb_j1ydYN6Tai%aCf)h?tZvyf&>o)3+{fnJHcH;&;*yDhlK<^f(Ccj;QsOchp%>~
zwx+jct7mGr`{}29Vze|AG117-0001{vXb08002n++O<%?uaZauzsuJf_@k<#9N^`@
ztEj6y^;LrEqGaF>0HEXl*MWeXJd#%-vWK#|Jn}k-7(`3y6;OxwDx$R2(f5#bc679I
z@^~Er0J3gY<{nm-G~TuzpJ)`7)wL`+t&jl#8i2B#w2sfhalUs}+RW9EWMfxD$I-hC
zEAlQOX}PzhAC+~E=0DPYI*R$JA1bL@5`)<hjfq4+9$ge2OF)=L$NDF;9i4sAe>Fe*
z;b9XC^<Ar)@5r6_M1apn>s4Rphw&db1^!qlp)~)$_Q6#NpFh{@vx^sR9sxpFPLT<H
zI8xXYaJyFvD-Aekm23iD3|=mH$2G=;LI>fXLyKhW=lcymv{Rx$#qA3IH1SdkuhPbx
z_In;fZjnB=t{6vnkHkMK(?vc^S=UG<cpTy>l~|sps)|kr=?mQG=p`TOwN0hr8AHde
z0W`eWU<n)t4<Ezph?h8B_(K~}^-hERC8!Azd!1%AoagH?jM360M?|%VrKB~pkiRH9
zqlBvO0X8*4JMkpr#(S+m74Eb>Oru~wr3sYKh<ya_JZyPPAW;Emq_${0^ik~=ZI7Yr
zjS=}DZX$XlCs9nQTr6d2FtkS<Cda&lXy4kq8gli={wGgXznKTCF$uy`DXl13Nm%b&
zWNA;W_aG$svv&;8Xh=B@qEe(PXE0r62zvp2x?|Dzus)|c9zrTmq$)NzT)Og1O>^FZ
zbE_N8Ggs<I65Lt7=ozG&eMX<mI>v;9DXSnAn2#F13wsAT5YrNpF=vGW<;XfK!-5fu
zByg<$tm9=O1|5Qpe#)+U7v*srwSFrC_n%;KYh;)R&J~=T9b&_~N@Lj03Hg@+lE)E~
z!6WEN7#EMC<wMdpDA8C^ZOI_He#|RRtsSs8?iS^`h(JAD1XUv@eCl4BTZ*GX#YI3y
zmY#oBwv-(0aBWE9Orj3y_{9=s5+j7i)<qL}&tJ@=ji8Ti;S6TDR;VS2?sXETNM;t|
z^bVJLF&WEQBjhj;o7TE^1f!x5rEsTDmxG{)WUWnun~_2TJ8a7fX9X1MFYBQh9RvIr
zBAj%G07seju~r)dVzWgWUP)>XO(M~C06~f8cx5mJGs@}jk+I+4TBtJ#b)^7EWvIN=
zck0|GO|m6YWSjV~FXuRg8{1sWz=EjQzgn|^YVY1u*aRJ9wtV@#&Xv%kStVj6@*qg|
zd#E}s95uQo0{iAb8WRWmQav0O)kQ<t(kmou62~2HfO_{X`13pn3R1r)@}bn3?SGWu
zrq++?Zoxa4gtZt#CGgiq<%A^=!G$P1-ZHx(fmOQ-Yk|y$$nIYK9P?({3*#Gndm8$W
z6mJYF-)SWICdUizQia8G74xGgh1YG;90)6sB<eBots`WF-6N`GN?G8f&C1G1K(jzW
z_Qy$DjGbbL8f`==k)iYw!JbfrD$~%R>t1b?41y&-vEB#mB9&~1QiEY<Rl*94`R&QY
zj6byaf&s(;&1-r>p^8S@9`sJc%glW{+COVCJyP3f*=-pt<h>FEZlZmXMs;p#s!=tC
zy^c-yZ4yk`{Z|Ts&e_dG#ncX&sP<hO;42pXJU~ZBf5Y{e4Gn%*d25hAEgcD`N|cah
z@Y3;5V%_x0+PPl^Nk}MUs3L3}O~2VGR7mTjoZn?mhgnE$S@z2>ua%0K4V=<AMEeG^
zw>q^{T;YF=>Yc|LKLKzF%4`$fPwUrlqrzrz`~*C}^C<a@u!8~|zw&EyUd((NzsBp@
zD#CLfT6K6Jouw&i@n>EkN5vpBhA&y?%bFos+b$*A4<a$QSqUhgs4=CZ@C(SA`j@0X
z%3qm7$T2(yZf{5s4_)X7#)5;ajI^Lfb-Vb>9Kt@EtKZvMyDZ+}$tlRVaLdU_xp2Qd
zKMz-=^q66OBNuc+lQyMntAUlkz!3ia{pR>c|L5E|iwP>;iwn{tkDQUO#A>~A%!T08
ze`~9B5JozD>s6PH7~&_3yMHuM{X#RI9m_{c?di?#yMO9z@e>^vfBhQX7--<l7Lm!V
zL_Ud*tG;V5`Dle@92HcXjq>fwjjz`2?>H{jpwwpDRKEwVptn;|Si0L-Q4~?Cwz`$b
z0{fR!GuWyb6^aw0BN8;?;#^qcX_byHyk-YqR=RX$Wy8=2)YaAPcC<AscOR~_(|NPM
zG!-48W9p`Ib?eVePcxULxpgetJ&T=I<c>?Uc7KrROQbqecw-#1qMgLO_}FyWP%Y%p
z^|D~^Zz>t!2U{&G>CD4E?J2}^-*q#W4hc^tz#55MGi&)$_IB<Y`SG|!Ci+SHVO`;3
zn->Qg<TkkTL*QF-A;+rUi><YOwTmXEnE2@H__n`cDNt)It=<h0_q5ORT>%|_=12O?
zyrPDI%VnR?nV6Nj7HbQ0?#m@B3o|*iUzfl^rcFplXgAsEd+-CDOQ)1FQARDr1vV@R
z+g)1ddMKZ8S|TB%qH=1>G=ex&J)HcAa$RisJrSPpD>il`b6O{-q{M}Z0e7hkopM4n
zZq>w(#oXLcjLp%`ZsYT2()-l8?_EC-OojZ6^k*l^+2U0Wr-qXIK-~AC=<``Q!wplK
zyIZkn+3A92uDj#>>Nx|1?>`);?nXsMrttXG(YqcmT#V5`r1g&XP)KIXVF1}4i}Gom
zDp?szJwpm4XikpG*~Nr=Vp6z`<YyKZkMQC>SSlSPghrURVJ>=vlkZZD({B?~gM;Ps
zUt4p%!Jq#Q7&5s(-nj*O-)(nO-_+OV0ViQJxP>ryv3DUv8I&Y8UdN@ctu1@?aGEQa
z5a!}R7A&Ng#JH8J*=BX^kTUg{de>h6HPV}gI=^HHuK#BzDXf0z=G1wQO`jTaiIeF(
zPt!PEq9$=?`7`K>@bl+q%1BI3V$OV(N>e{tfCoCJ$<0iS!Egn8wutt(#DsJU>$nV|
zhs(De4GjpJ!}advqQ$D2?}|E@LtgfMe<#z<a9pLI5nC}Z9E1fvS*94)>4f?1PiyOr
zCsG0_EvBe_q^!V5j<QjLc#rb$^&fYhZpdd3e2<6OjPkbM#h$C0Dn<M4=h*95SXjV@
zvKEi^UP$?V<^!t}I&1AKF?UIXp9WUC6ixkB10tb4T_Pf1I8AG&ywEa=(X!mP)0YGT
zM2m}yfkD(!{n8tC=85)2L2rziCAR$g_{@h!qo@UIW-ji(wX$aFqh_ERzx=B#XQk)3
z2)esA^7Jj&NYB0>U^DpAdo%Kln3_yrnDiI<(a^>+F1=-+VGR`CSk5}%F{ib8^w-GA
zRk2sDbi$yTy+hP1A)yO88gPTudKDO7`^&I35kf9BTpJ$o3l+U|dD(l4XHb8=I5j1O
zB7e>A%|`91a)|N^nb_<%jL}z(G8i&v5~qg}1-A67zkSoi#vt2L5xRZiWYdTA#>B+T
znLeKek>5vli%G7wdmA_?aloIC8Zqyj&>1zY55JqF(=JRd)am#3`zpQE)m5a8s#)|{
znHP`hqvIk?lkzLv+_>)u@9OA2jUhS5ZEr40bGK<)Sm?-xxyr8`du^_C8d%qCk5XIg
zoRf3ASt^k&VTY6dxKrbT6ys2>Om9`x3Z3X?P!qAQg`0F(HW*^)YFqre5#2rM_#w=~
z!bgTdIoo@=p$%l470%yQXo0q9WXse>g0sJUyt|FyH0i)A$RVQu^Uy)Mt&X`85@r+#
z3$NJT^Sa!*Wmo8ZX<taLP0!372|YS$;LT#$*t8(a8~-O7mIGre^o_(#Pv?F6P09BM
z?FakGCR?41^nj@DJKBxSO%=pB0%CIKAI;_<iA>IPWjkFJRm?lX!Nr!hSgSc^D>;Sw
z(KS3~!hfjCHFv%77-t%UG3@TrP8Z8n%xj~QsDDafgzFI!lAa8vQPdjcWHs=zVzzwo
z63r*r+2RMtD>zHCMJL&Xe*GDWAlsETvW*~O+R9HK8>@dcNF3=`-YoejH8`FxKnDpd
zL90sdWiMoCw01Sr%NW%{Ppu*Fw;tu57W<Yfk^4=<Mxai2U<kX-+<(T@g2VNKnDfox
zb_%JTs{)7NK$UzP#yRKJ)m0josT!#R0*2%*J1yjn+x~F&+xX9)3jLj_vNcpj@Yedz
zj_AZ>8zvCnXJ5$Q&L5wcmMkJ$8pCg=VSR;eZo`56zv^2?w&~t*X<C0(cOhAmYyAE_
zk%7-<*7^N`EsP+fv<7dxSa@}tb?kl%U$#^2`n!qc&hAJ}Q`{{HY}IDH<MiLv&jh1?
z>$Z(exmGfx{IJlz4?zM09S$G5a;Q8#dD)Ibfim`%wML4c-)WCdJ7nM%Qe?IJEw}$0
zv!4S$ny7dm(M*~hYbW#u9FN5Vp#cX~RmRPAiUUmC4og}_Moq&2#lm4J>92wS`rvLU
z$%&p9U|x3t#$Mx!VNFs$U<3cpJP85#SRRVddTH3{eCL+-u0^OHn1Nseu!nbF`-hYa
z$eAiB(SUsL&a71l0WX&*#+qxEX2NH9;H2HZ3h&U-fBzoG+7k;G%};!jTBg*Jc6$_A
zo>}|hL%ZMk$Hh2J5f{ojNgsPCRGiq@1^6N8NdP^QbNe=qb0gx*8>g$3ba!fQj9cP5
zq+eIi8|$@GDe5&{n4|PLsh;lO1UeDoC1qc3PIRQxtGTwY(F+JTY0m~?S$qthO3IZ$
zs4J8X1M_&F7)N4J4zKlwW%Jo!wXS*+7Y+@*?6`ASk;18caOb@dU2PE?Li{BPO?Jyf
zPe9hdLWDT@TpI}2oC&SMq?NPiX<6r8=we4?O|)iQ0#;V1?MxL+lmdL);x2O550qJR
z5hjrge55VR6?UaNo|^KlOkcgw^vD}Gk#Y~6*Ym9@aStY5U=}S$pbwGsTUkdiV~3*)
zQ=fH|%4%r9?mK9>l0qF9^R`80E2A|5gS*RR1_ttRE51xLtEV2KsHk<foriye{wBSP
zZB`UUq7ZVT;P4#NfnieFmkZ4KUIa&luo=~37-3UjL!(yu?Jm;{X{y|9WTyV;FW1vE
z-5UiXv`rU?xzf2`TwJJ_MMi6yRaUxmym!nN<e(v+xVyW1gX}Z0i$4)Ao@~%)U2ip#
zAq!b7mPIC`9MkmOK^O-?5EmNSY5+U_>=`=+odN)2%BH*}&6|^DgLV%V5fKsS&9Zkz
zJjVEqMJ_UH%S1zxq;>BQb>?n=KG4t;4VmY*Avt+t@U(09#^EztCa3NqC{MYuRZs(q
z#iZTiZ7P$dUP3~G3QL*S>B=`S7DdIl^N#y+5ho&HK=^L!SGmyk&g|6}f{L?#ae7Wp
z4Gz=JTcM}q^z^cJuag?R+sZLX4Gld{PtQO~d)@T(gO(5wdCIy-_CGKkNUu}eI(~I<
zH}$>g+h!n9;b^JabygNhdPc@qUS3`u6_r>wVT!SW$M>PJ|4Pn|xay0joPXY63-_%K
z4GvZ^sAf?7Aui8zi_KXp7yOWwT!e;>{v<lP@;oG|^S*1sVwf=AitqL$!aw7i{@a$N
ziJLCFi+|A=F3U+RN$*Td#!i+yevgkc3JDRXl?3q>+`Tzt=yoNmk$Lf;X4^aaY<$Pc
z%9<tYx<NZ~G+C<nz>(~#79cSbIBxy6-j2}x{tTW*g^@u>&BXq}K>On223tZdL6Xmi
zWG$<UVPlT8ZHJ`rj=~3gwymK@%UwYK0qE*_2@uE?bllj8<9c@1pZfZhakj=_v$aT&
z=jux5VRGt6NlEC@ST1?>I+MXJN$Tk5y3=pDPXBUQ#4ir2LG4@bipK4FQ*5?)3Uo18
z$B<RO^`~oT%~5Te{7E{$p{1o|6%f$HB;}Q}vb3!D^-F1HPSdd)G#%T|{sbM|ohq;P
z_=ONUCMpuf&I#$b?%PtQ4l?d}emH%)NC2NXbtmnZ{M!$QWJr>|-|XQ>QHRMS9)**5
zv)j+@TTT>6)R=T+9343v92_Lx37IxR0YTPU20b4m?774vQR#>lbfLc@h9p@zO<%Ud
zQLA9s#d_&L1l4>jONvcC<${0=D#g1|f0&A-GxJtIZY?z4aebl_)CN!5&^{hw@SZqX
z4jYn_?@BJF9Fm7(#QF<8u3y#ENI1Wu&F1d$TE}G7GIw~USQysSx=F~~q(-1(3D&J-
zlVoDgUvLd%G^ht($*I>pC8YYXZ9?yGs9W+TQEcyX0oC?&tC$=VL(P>cKEKOO_c`r+
zGhhd*Z(yKYBaQdF48#`927jN=7aRhU^YA#2OFX~9#%o*Sj`)PV7p9DO0$32(BrT>w
z=bq6#Jp!argMM|r?3F^>eJ{BDuQ-T%_XhfYm&(YXeO1rfOI3&Iu0l&2LPHU{*OzAB
zA+io?=8h_|nn<Tp^iI06S7enwI&xRg79Bh-Iq{wLta9a!ab~J6i#zDcqQvuDKrtFp
zZ*_Vb5;S(3oi(!G-H%04`vv`|^Wj-u-oYk27ruYirTLA#A{-jQL)?b6w{f?M{2Y`Y
z5;xg;-2e3S2lF|`u<2+@^Ul0K@?AOVzxudaiZ=ex+S$zX1b?56fngK!F5<18mX?gj
z2=p=kll@|<EcLan*}Od$QbofJaiqskufWa$ZAOGu5OuLo@YBm5jUMROed|ie*ZOnf
zOJK2?;6nf3_xXW-U5m%pu`G{EBD=TCqc`%tBkrqcptSEeXVt76hF;5o9TS<x2KIAR
z<aqeivTN*(6TLJYv6?K<=B-8N4?&0LLyMgc#yUE3J-XG8&N~mmzxPr(>9xS@JldOg
zw6T4EhNx{^m46GCd&S_L^RV4<&OPy&26fT3CY*bla1zt1WOqvpqe$U=FV)&KK*&+>
zr=x>*EE)bt;p)Dxf^sccM%>xhp9AeK+}zwG^M&ixv6a=-zA!WXyiDN1X6Bt2`zE9f
zQn;Jl-Z@lGou1g<UKOBR!BiO-a?t4u3e<0_vtGQP#lC>UwaCOgc>|0nI8h9WScH@p
z(*dXwez!+=tK&I?O-Sgm*LyT68L;aOZNMo98;gPPX=V9Bi<62nPk@mF&zjhbf5ry|
z8zaj%T?z^Rem5>V2^DrfHZ<0KKXC<-mD52SX_3F*uSHR-EZ`*#<`*~}2v!L0y>UkL
z$|-vC@;ue>rZ#}M7X;>LW^zriz|9*u!lILQkp-Q1$89fG13PB0NxY7mA4w=37r^t0
zJopa+8;im+D}6JKOo>DTeNNX6jWzMkD}f!wqsM_5ab*(t=jS-6l<3`eUuS|OU2a_j
zF-Xkp&MUds`~|Yj{+0n0SGys;*ELa88y7V-T?}W5Gdp?FNm1fijpswuhbpm#Jzub>
zAWKbGs}VfQR^&W^Dv=-P=}0`z2Tg;VW@~#IoK`w>=zLJ{hmLX2MZnG6LHh*~4?9ik
z^AhYFV@>p5`if4s`9p3U_GaRM{gJ*`+10Oj;^KUBrc=VdWg7ONm*-APC-!30lG*oU
z4|(=kSc~I~g*;;ieL4q;UhT^Q@B2zo2j}WQP5G1L&M-jj(an~_;?Gd!ROW>yWh>_;
z{pN}qheN7c2}ad0_NEl7y4!uzt|f+VN?|FlE-4TLoo_q;dl1<cgg8pMx^W(MtcPxQ
z-8kX5y)rw6&)60QBL!ju=x>k90(!x3FoV0e;wh_*Ip2?@wCU<rYKnRbmffoHRNTG^
zHMCgsGMex18lD)rh`n_%=+NtecXzSLGKDvbH|)AI5B_kucwZQx_qcF1*Sd#o@$qBD
z!Q4bzx(0|2<JPoTDl}yATaohzQO}d3{HJe`U^^Mv^iTv`>fCqWi#gV-;S6lan!M+v
zpr$=%%KpggKcuCSIL@#ew9Wb6Gf>y+CT4e`SmthRTgk~xXsENh8U=yr8Q%WcPl>m0
z1*T3rYX5$9e~lmQ-acG^HS+o)RYvCWcV-pln1OvTa<gK8;dWSBUZ_`^lA?m|8Eq#G
zk5pq7ch~UonVj1E`J<YZEmt6GMdZ#>`{aSbS?c`92<%v(RhvoI)O3Y${m$(`#}jI7
z?23Vryw6DCrTPX5a=!^L_GFWMd7R(4*p<wE2c<$Lw4_;AMz~51S+rmH&D8q$z;`Q6
zdx_GcKv7zlxALsKaj})F@M-{GQPWDyalxFAi==BSSVb`T_ENydzl+aYrdob?w@h^g
zeK)^c109`heeVZ3lJpcVCxnN!YA>PZSyw<nfYQrMS5L1h>7BN^?Nhv9a?nIB*old$
z;)dG4Mz`-`HVnI}7Zo)^!b~~k<sTWE9u1zt4HnkQ6MS#-1iR2*<9Ma(AsKjm{o%Q!
zN}U;^D#bt|1@-e~Y<s(CtL;*EZ#x)Egg$Z6y1X-vg1#6$uJ3q?srxxaZwdk`NDOHN
zGco?Oe#11x`12>YG8rc{o$gC<$W-8Swkc=k{z+XP8k87zdK!P-AT|hd<QEf2zi4%&
z7w^2Y1(|jnax!+^A0!@MU4`)|#`71_d3P9U+6t-xLWR=OFp`*A_UDiyqhLW{_nj!N
zoWf45Zwl>7S_*)9Qf8sQ6-%^53O}9+R-MdL%lBRU%=hL!Zk~&6nVTzQ>!ZJo+w;(W
zrW77)di2B8@t5RkmXXRoITzt|TeOUdth%f1UZ}Cs)7DPSaU0<{7_O^p;3SIeVb6+c
zgCuYA|9zfNFIu=$_Mwx`2Um@+IljZT8)nGlSM^y5x;4K#Qf8{GmzI_{S;Nf+%Si2^
zO$0gfp1X#%&tMa2;Z>Z2SIt&Vk)B_9f~x!bdkeG)A@`k%kjY7;WivbBJQhAF6q5Y4
zXD;;|8DG|laR^R6iPo|d2cNQ7C&VF(m4($VW5#{Lwp?JaUx4>tQoJ$y75@5KH>p=1
zz(0`RfaXlHxN$lk&Eu@^q9j;t4V4C+#1Zay3h;z%VTUeh(|RW?F1K0EvghO^Qn`4I
z39X)OAI!*apM}IjdzIeU!1|bqmg4o`hFZkI!)F5vw!f|2h_#r4{pK3IKVG&!BgKYH
zUE5ou<fY=`HT>&)ezG_1*de?6dstgt(yuSWW$YSp@ZFsoO;P$0iXeyf_@LJ2%i1JV
zdbbY_MEDAn1n5dpiVpkY-2W0Mp+xYcaS;`zsxS~gR0$sH6(Ky~h}y+^eCacj673Ac
zyA&zaE)UPg#kDil((+V*c5cS^hFP>g&*hiXLPO*7&&uLGdb1dDmONPqI@H>UEoc5g
zrmbNa!pB2|{%M>Pe<{CuhqVR^7ukRv4$#OY7T8cCTY^uz!759<`<QP}B2xH|ZCJ3{
zLa+7_Zk7RqymufY)9^o*KE?`Pf^eqb0G-~OGMsEo*>N6gW-C=~)GeS;e@@q#qAl(V
zjp8wQADQ@aBr1BhjN`G7aiV8e`k7nbi)?FVU&2GWF6k;8T-c2;gErk?^!<7OIioE3
zbXbZx7j34?ybD9RH!<8A*5_S(4U4HKn-(d0#@6|P5}`S~twoNQKzjBKL-y}QJ^6a}
z+0_O2eM8u_?>jg-HX$q@reTJ%;H~h9+-Xg^h)RYlB1abo554Q47>@byB?7S;e-We?
zh^apIV@U*inzYC|dhpMVTNIP=uaMU1Ah_!ChMJE`<kuG*Y@3&<W@6|Q@RDpH6f=m}
z&)NaZ2&62dO#01k#&iFsdiG+qFL)y9>~1nS6VrM3pltr5X5(ujY=;Rg(z<WyE;(az
z*ro<pa6TFvh|Do46QUvY;W9l^E4SrBZ|xKo18bJbw0<_BuS4)5KY)aydY*O18{$$=
zy&5RxsLY=5@#C(uPB$}TEiZUbEnwDHjun?O<x)HsWwI8=CRI74GU~AHZW?mm)9>kd
z_Bq}dmzpm%16-R2WKxTi3vwbml|}woSe{8>jC|Q76-ES7#l~5r4t7`*_Q?CQ;s_07
z;YMii?%ShsX$@WXtn;AmJTMqU4Xsy>6w?fTEX2V1?7~t(E}f5hP*}7RW{CY&#YzA0
zuZJXP+ER;8;%a^~>~sOa4spvAE8?mMg0ve`$An}G!n5><+qRhZQjhrkzPD|Nc2X(f
z2r&>GD2@DYAprJ=W4=-H5Ahy${6F^P>(bzDm<P>V<Ch0_^3`%O%G(|7A|PePrVF!&
zaH4kb;Uw@kLN9{LGv+_lwb_riYLV^HNt59=3jr?cj-q)9wk|;bNhZ5P@sVus<xel>
zx?y^yAcS^clHb6_OK=uZ;M@&N$HT8cHCT0$hh<cX@=TH005j<%g4pucD+OZ_hWvFE
zM7-j}yDpMb)`WSC4^Nd10CfXQZ=$tVLF{<tLnW+=AC{Ih6NX|*G2)T^vYSkn?w?dM
zVI%(Q=A?IY5Fi8S>kB4l`{o|7f?ZkQKDy&Fn87%-oT8%dtyG)*K~1n&@e!YX3;M}b
zjU`fV4_yK3)Q51^bGnufcgoIN#Fln9bkb+k`)B{&;8Gb8x9-L&*mUI(Ag-n&crSy?
zc!6cY()pNouA-*hG`ER~E?2_LDYql<t~1HB0-7c)N=9*dnFe5$<uZY#YQij0C%_+n
z%wk4UO6kv`hCjxpK#&Krb~#le6y(nsiQ>@{p#h!?Rw}|vED8M5aj2(2$pFkJzAqf%
z^l(Is&?AlogHAm|Irc)qRN!eRVyU9iBI;0<zAa8O#)59|`#*G1bbr|lr3f%2sK)QZ
z5|tTH6s_39t@?y%bPZ((%D>s)%@w9=V-zE)g>3O>(Q(jjOxbOijh+_U#PUbL5x~I~
z1QgV0{bd4yaSp;l+WvmM6Kut~h;F!sDx5BOk9nn=`KVNuQ%$6fY2elI$#NsQS(!Ln
z<Spqf@Gqy}gg<l*M|MP&XSGJfr)IcR#hBuNbJR2HtvVU@LhI*``C?>L0jL{g0^uz<
zSe7!=H_1Ac{WO26?gS)xP5k?@?P&xQ7G%!wc4d0$NTyK8E&no5Wbpeu$SUEk<97Zg
zhqEAk{f*tj-hrix@EAz31cA7?4kN|kp$pS`QR?XQCp8@5VZCWWc8L4y<^=$dl>Ju=
z@QCCWJ41hqK+H|xRU0L}H*N9p4h4=x<wr11YQE~wADV=U@Q%ihMQ3i$LGJa@0CuRS
zJ*_U8!Wlz?l%#$mNMYU}90{BBZ0n5@(K;?vodoCG1x;l1Ey}XC`BAnY6-H<fDYkO{
znx28z-#mW(W|YKJ7IoTNRAO$5>u)ovwE-XR=9A^x&d~NaUVV0|nHl(vO`m_mQ3DI=
z*&1j^nUGUII%G{)*(T?NZNozH53+2g*B>mI;5H;tYuFeaM3A14aS0{g5)CEfBO(q$
zsXWv{fxy_W-Jug5_=X^QR)|XudSrQf8HHHg#w&?_)Z`OoAb_l%mDo<ZVL{y9hpA`i
z#sU1pzVrbJrcU(DC?4_{i*sI&itF-OH^X>)uTX={U&#wW1yGK3m{HlmIi_(jF}{Ic
zh^4F-V|xd<c1a&Y{Ku|et4+g0mPmYF5B%&hJ7^YTNw6)2>k^51{|!IcS^XS!A0;#9
zc0QQkc9WXD;pa0diEV12JHRQ<(BmyP4taj(f*!QbTq;ujpn-_QE;Z18pnXW@y;Rh-
zOMP@w^S;264DCB_poGI8S4<+JLNOXfY3J3LTmAG;!mjZVZr@KqDe_P?O$u(bcfrqe
z5F!Rt@O2Zs(gXiG=FSk@)avr&6q#7bEj=()(pKC;)f=y4c6<h+4?*##FkaAx$`prv
zp%Gw0v!_Om_~e?<4=y)tA)rRS)M(TTaA1JwG3nNph{fLOC%Y&qCo8j%q+Q<^WNyo<
z{e2595!GkMx23rLB|aBCesAX4*TiFg$A>5uI|2KQV_SxH1!(zOv>AI;M|4+6Xzyz=
z>$Q=JLa*8MEC2h`B|^(W(J5NJ;;-Kt3ov`<E58K|DBfC{G|^%yCE)QR{`tOHm>(6g
ztFmC*cN?*D)KF7WqUtGtSs3QM6Wev0f}5!D#(J&Z2dme4A8BUo6sNFExL7$>yvZeG
z>^)0Df}}FFgpCG<WEN6CO@dM{Lhgu8I|KIOG`-A_()fGHaH$XB&AIaQ38nyOq#0pg
zq#upyz>w${OT(kA0Lk+`^sj?N$8F1k4SsOdJ=Pjhp|OGud>{*{pZ`G05@M(IWP1Q+
zo>Qu;A&~ia*3$NMtIm`2%+{;5YyhhOPokPdx;6gX_$gx!NQWGhT~62|zSYNO1^IC?
zG((Ex`t1BK7et^=_Eo=dnJD47IaiGPs)%&)0?B@bkc5yfxQ;^@IbRDNHF8r@qqIaJ
zn5s!DV5eB~;z&kNr=!UxBsxjgMfMBjzsaw_fRG6etxPhHpJ-x8K_ipIw-+_0njMtQ
zQHu<-=MpgYy$eG=K2X~)>o5<l*T~*U?jbfQ6waMHEkNdj5b)@vXAFyir3>O0qM2O1
zI`Fs{&FF*!F$xl(n&AFJ4`3<UQ+t~tMxpDdLA<3y|Detw;1n?fD4BcI<sRZ3Qe97t
zNe9Uwpt5S!AHrH=xTH$XmiY!jc^oO|3&XFHht@=mSoH&!fdP+!4EHT1lXrNO5&?CX
z4^>((W?PHJ-@O{44lEErf3O(5k~;xvR1c$1(_CmOL<0~X;hxu1X)s-H-|RiS#m9V1
z^aiBXtukJOY-n4B`I~q(L5HjBgoKK?3N!@PI>zLqlqu~tpZ_8!48Cggr4w)6*Q~4;
zv4YHp)aTbuKx+Auf9$c=d!v{nd=*w43RpGlomqzTiY=ZCF^>5~H_Hsqy2ClSE!%lz
z*dy;GmDKKL0Qs@>qkQmc8O|-P@cZ@%63QK+VJy$)^jm`dmgW0`lHl<nF;GCe4j$~L
z?R|#P%eHW|>a^>+9JD4J-K{0(<$Kxt7zC;_c7KFksK@>M=Rbsi_=qAb7q*n@Ww)d8
zhL}S?Rbf#6`SdCeg&q7^{3V6+cFau}FYmtf-N29v!3n{+2>S%6_2Eve5aAhNK;_~k
z(?sfrM)qclpNXS)eG}F7udf%ym(mY&Y8O*C$Fd*1y3}%>h15b*B+lw65A4LwS)zWZ
zI+*=wiA09qR6V+ao?q%riym6up+k|7H1uB$p>*tesrTjncNZKiGc-|9B-c}M;6IE`
z=|5XN>y#DMa5l4EnK!`9wevy}jKwspTH0;yZ85FQfZIoR>1`D;>UZPQ=J5{r-xo$h
zp74S>_b!JHXb!Jn>f7`Dx3?Hd`IxP`z0-c=4m-^esS+c#B0iE<V{S#Q<(uKF4evj6
zuo0j05KY2RrPORl2oZ?OrF5uK62iCv#QZ;cb&*c)K?BUFGER|Lhp;;q50zlWep=tM
z-H^U@UzA(WJrOjNxbQ*ztc3rRHVu>@sFZ0T%DXmaQ{=}x%?|dKWm8*V)Y_GHr4vWX
zn@8H|Mj`xoLj41Zc@W42aVD;?FEhb5GJP$OaUXhco}nsz8xtGup0f5>y|%>EnauGX
zSSvG=n!E_04u?_7((s_}VR+oIqbh9hlp~IVA-!Um2~@zqU6#I=Pl#Y?jSQ;5mUCIY
zlG|`A*z)mO25PbonjGf&KVlsO`(QO1%7BJcYzG8Egr1UGq8nsRIh$aVhW!Db*Bti{
zc_w5CfbO`Ip}1jC;fuydH18m9$9x_Wp4twJM=m}Tz#;l2T?JR{a}PNU(GHdbu?Xgp
z7zNM4QBfBAG$ele{N0h6TC<%RE1>T6GsAPR4`1VEUIlFiQ+j<uFLe-BEbn9MU&nTq
zdRHQ?<J(rwY=-MXo*caruipCGavy8UXI&&tJR@nj0+9%?3hbC<V#+S?ay)&TjaJc#
z@#i$mskOgVtQZbd@5P};uc9J5ENY|5IG%}0?uqT%L!vWNV?4UWARDdYX?y2vT>T(D
z^Vf`i8r80bxWHYa0-EbUB_<t!a6qR;9Oj2VT|f_Q!JQT=0DUf%XhfK%)0&fZ1s@$_
z6^8dBNhun5HRr8aW_eH;OW=z(@fq|7gqjxhAY#;=CH13u)YZ4Fh)ZHqLi&fdiX;Z+
zism%l7ik0TLdX1GYIanaSJ4tUD^Mbio#qWdzDNt^lc)|?X^gnk>O<eTUrymSwKx{D
zy?Wsq^6r!i0SmE9n8w%`4x8@dNRZY~<j3IW7_3ex{etB1>O=Y!%<Hl@Mg}>G4PlOv
z`2p1~&isi}LPs_Jk5l04MNE`-%39Y=@rX;R4cAGqY4GaC+w(XM;d()TX`gFz_1A2|
zr<)MQ%d(~CkmYVOSh1cD_q`pir1ae3dM0>&177|>8Aek~M74-H#nIC<Mfx)#B=lX}
zw{vo-CoG*1q{Homr-E8337cZCO2Ac7xnoA|(K5Q!G1B%Q^1oGFmY{ruV&uR^ti}Ga
z{`GAnI8X1#5;E}PP@`Nuo>)kMsgH)>y~ofI^F+aT*`7As7pBZuEvwknp@bvKv#FRo
ztLuDtC-JGPXQ132O<agvR9}GmnEBGAeu!PCT%3y|^I!9fz1{HSj}vJzmBeNxYHYv|
z#@?##D#P{R<z>_@VtH>KY4XP_g0|L@Btl4|Qb6q4xQG+3X&X7dl#0ac_y>sxf4xn9
z6o1sn@=q4y&egPqL2uF20#Lx%Ja;>8?k+{{=3Q}KReWMdrg(+m(OiEC;((O9lA-oy
zR$`g0QWrPkteC=`D$PMAq-QUdJjq^0Ww;bImzwMc27R^+>>|yuQ4(QR>^3q=@Rvf&
zpC>-icVc-{x~mmD&9`5^_I6F!ak&}c?$-xDgO3PDqFkC<bF=3|u$*4N-17<+H=NNu
zlt0V*EvI5N!Q%IM*9>(G`Qo4(!%^~_?{L)({3vG&8UI|zPrH-ZKD$j54ok?cL7|e?
zpFk_n4Se)c#Rap%-A^9KREmWu)469)UCqX^LsCx7Lu-m2m!XyOyZ_GCeNYxm5QQxJ
z<Qii%=T-z4c16hOC(GZw&vMvb|LNaDvH!{0j9xoTWBUSe!M>{l!=xZ&e%-|;w43K6
z)_=c#P;IFu3QVNnUvkWAx>fWtOlWV%x8SY8+I}Gf=FmyrxG*XlybmvqyZ(0B-Wsks
zP);9DM)O%IsDG@$YIKOvclB-$r)tHFrf#L^>XD*LsFft(%Sm#vUmb0)T7VD#7{LZU
zf~>!44`pA^q)pZjMxXc2;Fnl%6^8zh^Q5BaDQ!=hq6N1w7{=Y%`EtT`zK_Ec;Duri
zd$Xny*0cK>6_l)aU>rqa-I)>07F!T>?cRA3Cyq-NxmS5@2sPaz4h~yi;F2O<{yX9z
z`HXP+wYoJ)m{Shfj1M6<*dI<la?blEcaZtX!XsmHuzZ)M{$tW`*q+pZ!o|xSX&V}4
z{^TO=iUv|Qj}+w%ptUq#YEaY}(kn&0Y-!3z(8USC<$fd(*%#F#KSy!t30c_}b2Q{b
zUo~bxK~9;(f`*h(kYIO4e6e@J?DrJ97O1&>(_a}jmJeFtdc<-8j$oW|R>Q}W8_$nT
zvdBZ;gLD*`7VPf~Xk;TlRFi;FaZND{PCU<1BR9cHk^*r|5~_7lUn@qzRM-0A^^oW9
zpZAih$U#~Y9h1O#<llAn0{b{ilW~#tt%F0jNHHI;`ID~q5+;yAmrwEqR=@Zki3fvT
zamKTH*%_;-->N>Tn_~$+4!H8QxCKbR{iRwy@30>HNEz6VxwKZ_{YYxXJxC7`y4!!)
z0g(s$TU9h?TS}4YLQ~cs>kB^J$z1qib=@6JbbOd7a<`?V4!(b;I{tR;OdT{KxaO&8
z648PWLi9gRhF5RkW9}BRQyp-81^Mw^vPcH3ie55aBmiqJB;o!hNw<4<RxnCfZkAAN
z2`=i*M|VG6XbFu0l*w?&Y7cR#8xrdzg)HL#7vTAvxjW~9u(ImWgB}n%_ck))J*q&(
z?U!r3-9Eu{0zc3~rg-S}XCW2Am>v*u@lCf|=jAA7L5PG-WZGQJ3@K+Pozx0J;rD>1
zmpr)2pAhY{-YawL9v{ZGN#5#$sOze3qI^g(N84oX2=<7}KU5Y&zRna&c<#oO$nt>i
zTtXiu48x<H$hic5(_Fy)sq3KxUojwFLvw0=c(*e&5t_~^`<uyQrkcFA#=46UQVi#u
zolqWPZ~wX@?E%(t=EW4IRN`}4rl0)kUS&g?vE0}5f}0ON)gx7a(Cc>m@frMgo+D|-
z--M4$ed<DXe=C7~Y&1z0E3P*nw6}Kb3KIj@db4Q7L#TQvj?q2H$K0`&P?mNp-IFnB
z3qNCgew%D;|7L^<Z{rPT?9DCmebd)6)#}<{boc{P{hrj`2LQDhw9$j=ej3{YV|xNl
zZ0ameolhMz0e=vurlHjeP*<dxRK@k``f(IXI5OlPFXImpVmkAqJPWlkXdbj!kC#hI
z{)9hshu#F*2)suA&_PDIamnK$Jj?4L7#~4}ZYv_HmrPOpP=M9`p`Fa`Zy9Vqt^1r6
zyQo%5ZTn29{$jE+o47Qox@RqDD1lzWpN1*t%Xi<sES@Oz6VH_L#F5F*$lktz0*WP?
zzvVn0?eEsgqTiU}7b;YI&wPE4>?BpYcPS;Cf^UY#-%lSh5@BVZ%6r4q=htBmj8%si
z9)892>i~^w0$LZJjAqlA&JBTcTb%QA)a*U=X}pP){+RBhD`v&j{{3KIysKj==lE6n
zWk(+hzrWjrL6F)QO$nV>QdRTE;x-6x68OtdrtO5d-#>6A4zix2&FYS`Q<jTidU)#h
zYsGpLgQca6>-Brv<6j>X#tfZs^;Z_^yt8QZOY~yF#gK6}tL|N`$3We3VnhpG$ao04
zH-_4=(U$An4{^U)f3hcAVI)5-vm$~{P*iZil}#}jAUeHE&R5HjUceg{k6m&4I_%$X
z%o%rN4FuQ)@@@(Gmi{g@e&7Zib3Zd0Lw=&3((;eI`*u~+9nS!PB^DMdwErTR{`jZ^
zbNtc6cuPzSUmFZCsV#I8?5$laE5zWd7bAV7L{~dY?0d=h<-@g;doyT5J(^crOO6V(
z2EkVmH|R$=-L=5X%=|UC)4iE|W1GhIwt<7U%Kr|M&oZrx@m&1Q0W-uJWddb&j)j-H
zu*$w010|#fEkG5*HHiWAS6Jq1l->S!SkABGGEzjYe~4SUu-!<aLeX33*Yl@E_AyQm
zDNgA#@Ts&(ed3>nMfe7YUkCPc`Hu}yHtz<}xt^+xde)L!;vmL+AZq#Sk)Jv9J35B%
zD{5jevHGMJd?-HOg#5EO><!5WXkOi(tbrd=JaiyP;gcA)^s`g`6wT`5#I+R)p*JD)
zyz8+IDO~1FX9e5~?J^-k=7acR`FZX&tZ~A3pDG&u&nlCYo%+s-SFpR2;pA}5RV*k3
z8pFL4bin=G#R<oX#0#8j8#qK{Ht+UnnV^54(Z7}Lw%m6*8*cFN?^gu>vJnjBQd4Jv
zqA>LwO{mIxerB=OsQt^^cq|%c@O|lN5$exP-HPwQHqd6#YsJx%NY>j=iAmGi!f7TH
zkcmuO5mJ3d6Kmlm7y&bD_#E_#^0{tY6A*ZeM6M?*6f<{dWDHY>U$W^8NCkky^H5Ox
zX`lenQu(3^keA<pE4q$j_yHxn35XYn?8#ST5$|CR`vial|12zeeD7k@f6=k7{E8<K
zM&m*T5Pa5oeeO&|fY+pp!PRD~5Fe+)#6}~aCAfc$Uzmd+Qc-3I3r7OsBUr}4`%)l&
zKrhe+^B%#TP&C|%wvOEHTISgF(=gI|5dXB4qePl0O*KwnB|JvJtGE@q^p<<w*JoRS
z+R+JZXh&1)kyP9O<3s7@_3gCsJavZVgWNm;X8n7q<<xJ~yM1r7&;*it+a2-;F7>66
zHiBtU;X=4z(IQ3eChV{}EfmZM_*y^v??c)zZ*#X2G(Opd{xqw=2;~(b5P}up&FhvT
zmBC8o<;Rxz_ENAKQ;RGR5f!BdTyb0l2C!33uF%8G9{l!foBbF(!<-*r1rtRYAt@XA
z?~o5vnAM_`_1R8M#a%w4L7!Q5I;3?~gC1%uLx#B(b6WNAGq5C`QpT?rf=LlYj@KQ~
zld_9WxW5tC90RL0!c2NXRqt2*x5Yk<27Au0ak~9v{*|iXY?O_lOInBaF!(`JBZNUy
zIwC%-CG)tb-PReo=iv(&+3YM$jOGVAg%B+6$HuV?iwiEnXsFONOn073-qVwCbRHwW
zRcb;~>dTgoGo>z!w9dJ@Ti7laK2*Hy*-3qOWh;HBMxB2e9X`qHS%kji$4KzYRBJ?)
zrD8I<5T$(4^~e${LZX=$C(+<Klnni$9maoYLcSg}<Yf^l<@7y1)jHi!3tPqjTb~-0
z{#e{)TpaW-*HVk3#WJj&Dt5{o>8GX~uG0P2{tREY6u(h7J_7l^bY9EgS9aV=Ybzt<
ze6@jedhq@hY8B01pQ9?r+UdzbF#C%{^y5DIUtS$78p4xq%HbmjcOcl4ajU%dqgix(
zyq>|7&1J-~vuu~@z)o^Xv8=>zs;7`Iy{SUdmCNi!j9Tt6Uxcl%z2#EQq?nG9aHXgi
zS@Tn<%Wfzu-ul}QVQiG9DeJDcQ*r)W5g$8_fXkpk2^uz1szLF$+-g=RW&H#Ew|*E$
zjg4n%A!J4P&kUqx?ij@GRrrsUT;e>hvBMLd{)hSQ!BB78cqK4Y1P3e^x@i|pjs8~e
zyE73tQmksRtr&lr^o&!MR<*k`sv;ep#&9rYYSC~kghEW}+uYEuZx+*KqI|r4ine)m
z`nNoxB2mnY(td_A<<{1Z%Tx$SY9W5rn2CJFG^9k9dvQ=EmG=+JXgO0Lugj2xA=&FL
zt@i%c+H%YTCua2sp|QG3hdr$xb2u0Njz;kKoRou2D&{}KH8Cys;!l**voh);ZFaO{
zz$D^6Z8{_%6EmVhd2c{Hyp}qg8kvU_XNr^}e=>77zFWZ^I4AwPmD`s~+#xbjNH*_$
zO^IX?={W~wc|3BSj|Kvwgf4yhXNoo&df!^yhUjL$HYJ{g>>$2ofm`stHvNaQ@Vj6t
z+~ir@c6lkGB72-BkW4@AJnCoMB4Zp}j9ywC0)H3?uc=5xobotYVhzg*FC2-I|Flm^
z{t$>u<N*s9YU__b<;FVQc*Y?377=w}9&13hVBQddi$+lh-i_+5V^qS7iY7rhMr0)o
z)us_AEZL+LCx||OoSb}iWZ9Pb3w+TFF$7tu770?jsjfG>Wg+Q|7`F@&^-9a`OD&^F
z{&I<x9PW(UK>6%MPa}T9%%m%DrYZon|El1w|K%bq__`ov?M{dhfo_9_hk&k+rWd&0
z+kVjx@3AyL(c9BZp3So>8b)QXs;kDB^{F9O#((pFI{)W;8$?3(re90?5B7hj8kOZW
K<i5+8h5io=|M>p^

literal 0
HcmV?d00001

diff --git a/images/red-koala.svg b/images/red-koala.svg
new file mode 100644
index 000000000..f303b32dd
--- /dev/null
+++ b/images/red-koala.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="744.09448"
+   height="1052.3622"
+   id="svg2"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="red-koala.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview26"
+     showgrid="false"
+     inkscape:zoom="0.50332378"
+     inkscape:cx="476.12273"
+     inkscape:cy="572.78569"
+     inkscape:window-x="38"
+     inkscape:window-y="616"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(0.17560932,-0.17560932)">
+    <path
+       d=""
+       id="path6167"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.08838835;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 497.9857,1088.5424 c 0,-16.225 0.13752,-22.8625 0.30561,-14.75 0.16808,8.1125 0.16808,21.3875 0,29.5 -0.16809,8.1125 -0.30561,1.475 -0.30561,-14.75 z m 290.93182,18.5 c -0.002,-6.05 0.1606,-8.6539 0.36191,-5.7865 0.2013,2.8674 0.20315,7.8174 0.004,11 -0.19905,3.1826 -0.36376,0.8365 -0.36601,-5.2135 z m 17.08867,-37.5 c 0,-26.675 0.12889,-37.5875 0.28641,-24.25 0.15752,13.3375 0.15752,35.1625 0,48.5 -0.15752,13.3375 -0.28641,2.425 -0.28641,-24.25 z m 27.96202,27 c 0,-11.825 0.14466,-16.6625 0.32145,-10.75 0.1768,5.9125 0.1768,15.5875 0,21.5 -0.17679,5.9125 -0.32145,1.075 -0.32145,-10.75 z m -495.42476,10.5 c 1.29175,-1.375 2.57363,-2.5 2.84863,-2.5 0.275,0 -0.55688,1.125 -1.84863,2.5 -1.29175,1.375 -2.57363,2.5 -2.84863,2.5 -0.275,0 0.55688,-1.125 1.84863,-2.5 z m 68.27083,-7.1042 c 0.33229,-0.3322 1.19479,-0.3678 1.91667,-0.079 0.79773,0.3193 0.56078,0.5562 -0.60417,0.6042 -1.05416,0.043 -1.64479,-0.1929 -1.3125,-0.5252 z m 376.47917,-3.0581 c 0.6875,-0.2774 1.8125,-0.2774 2.5,0 0.6875,0.2774 0.125,0.5044 -1.25,0.5044 -1.375,0 -1.9375,-0.227 -1.25,-0.5044 z m -462.75,-2.8377 c 0.68469,-0.825 1.46989,-1.5 1.74489,-1.5 0.275,0 -0.0602,0.675 -0.74489,1.5 -0.68469,0.825 -1.46989,1.5 -1.74489,1.5 -0.275,0 0.0602,-0.675 0.74489,-1.5 z m 303.07895,-3.9167 c -0.0434,-1.0541 0.19293,-1.6447 0.52522,-1.3125 0.33229,0.3323 0.36781,1.1948 0.0789,1.9167 -0.31922,0.7977 -0.55618,0.5608 -0.60416,-0.6042 z m -281.80812,-4.1875 c 0.33229,-0.3322 1.19479,-0.3678 1.91667,-0.079 0.79773,0.3193 0.56078,0.5562 -0.60417,0.6042 -1.05416,0.043 -1.64479,-0.1929 -1.3125,-0.5252 z m 20.80812,-11.8125 c -0.0434,-1.0541 0.19292,-1.6447 0.52522,-1.3125 0.33229,0.3323 0.36781,1.1948 0.0789,1.9167 -0.31922,0.7977 -0.55618,0.5608 -0.60416,-0.6042 z m 0.0789,-7.5833 c 0,-1.375 0.22698,-1.9375 0.50439,-1.25 0.27741,0.6875 0.27741,1.8125 0,2.5 -0.27741,0.6875 -0.50439,0.125 -0.50439,-1.25 z m 477.84211,-13.5 c 0.68469,-0.825 1.46989,-1.5 1.74489,-1.5 0.275,0 -0.0602,0.675 -0.74489,1.5 -0.68469,0.825 -1.46989,1.5 -1.74489,1.5 -0.275,0 0.0602,-0.675 0.74489,-1.5 z m -588.60544,-20 c 0.002,-7.7 0.15853,-10.7178 0.34883,-6.7062 0.1903,4.0115 0.18902,10.3115 -0.003,14 -0.19189,3.6884 -0.34759,0.4062 -0.34603,-7.2938 z m 606,0 c 0.002,-7.7 0.15853,-10.7178 0.34883,-6.7062 0.1903,4.0115 0.18902,10.3115 -0.003,14 -0.19169,3.6884 -0.34739,0.4062 -0.34583,-7.2938 z m -585.39456,-1 c 1.29175,-1.375 2.57363,-2.5 2.84863,-2.5 0.275,0 -0.55688,1.125 -1.84863,2.5 -1.29175,1.375 -2.57363,2.5 -2.84863,2.5 -0.275,0 0.55688,-1.125 1.84863,-2.5 z m 454.75,-11.2322 c 2.3375,-0.2105 6.1625,-0.2105 8.5,0 2.3375,0.2105 0.425,0.3828 -4.25,0.3828 -4.675,0 -6.5875,-0.1723 -4.25,-0.3828 z m 43.96349,0 c 2.86742,-0.2013 7.81742,-0.2032 11,0 3.18258,0.1991 0.83651,0.3638 -5.21349,0.366 -6.05,0 -8.65393,-0.1606 -5.78651,-0.3619 z m 106.03651,-9.0063 c 3.9875,-0.1898 10.5125,-0.1898 14.5,0 3.9875,0.1898 0.725,0.3451 -7.25,0.3451 -7.975,0 -11.2375,-0.1553 -7.25,-0.3451 z M 454.81581,605.54241 c 0,-2.475 0.19502,-3.4875 0.43337,-2.25 0.23836,1.2375 0.23836,3.2625 0,4.5 -0.23835,1.2375 -0.43337,0.225 -0.43337,-2.25 z m -16.34805,-45.75 -2.42431,-2.75 2.75,2.42431 c 1.5125,1.33338 2.75,2.57088 2.75,2.75 0,0.78428 -0.8098,0.14598 -3.07569,-2.42431 z m 130.82569,-1.99507 c 5.0875,-0.18149 13.4125,-0.18149 18.5,0 5.0875,0.18149 0.925,0.32999 -9.25,0.32999 -10.175,0 -14.3375,-0.1485 -9.25,-0.32999 z m 159.5,-0.004 c 14.1625,-0.15649 37.3375,-0.15649 51.5,0 14.1625,0.15649 2.575,0.28452 -25.75,0.28452 -28.325,0 -39.9125,-0.12803 -25.75,-0.28452 z m 208.5,3e-5 c 13.8875,-0.15682 36.6125,-0.15682 50.5,0 13.88755,0.15682 2.525,0.28513 -25.25,0.28513 -27.775,0 -39.1375,-0.12831 -25.25,-0.28513 z M 388.81428,541.93824 c 0.33229,-0.33229 1.19479,-0.36781 1.91667,-0.0789 0.79773,0.31922 0.56078,0.55618 -0.60417,0.60416 -1.05416,0.0434 -1.64479,-0.19293 -1.3125,-0.52522 z"
+       id="path6242"
+       style="fill:#5f5b5b"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 552.98651,1088.0424 c -4.5e-4,-16.5 0.13655,-23.3903 0.30444,-15.3118 0.16789,8.0785 0.16826,21.5785 8.2e-4,30 -0.16745,8.4215 -0.30481,1.8118 -0.30526,-14.6882 z m 54.80912,26 c -0.0111,-2.2 0.18461,-3.2177 0.4349,-2.2617 0.25029,0.9561 0.25937,2.7561 0.0202,4 -0.23919,1.244 -0.44398,0.4617 -0.45508,-1.7383 z m -105.25218,-86 c 0.68469,-0.825 1.46989,-1.5 1.74489,-1.5 0.275,0 -0.0602,0.675 -0.74489,1.5 -0.68469,0.825 -1.46989,1.5 -1.74489,1.5 -0.275,0 0.0602,-0.675 0.74489,-1.5 z m 41.40499,-0.75 -1.90499,-2.25 2.25,1.905 c 2.11444,1.7902 2.70524,2.595 1.90499,2.595 -0.18976,0 -1.20226,-1.0125 -2.25,-2.25 z m 117.86584,-7.3542 c 0.33229,-0.3322 1.19479,-0.3678 1.91667,-0.079 0.79773,0.3193 0.56078,0.5562 -0.60417,0.6042 -1.05416,0.043 -1.64479,-0.1929 -1.3125,-0.5252 z M 545.72943,857.7944 c 9.17729,-0.16487 24.47729,-0.16517 34,-6.6e-4 9.52271,0.16451 2.01402,0.29941 -16.68598,0.29977 -18.7,3.6e-4 -26.49131,-0.13424 -17.31402,-0.29911 z m 183.06402,-10e-4 c 14.1625,-0.15649 37.3375,-0.15649 51.5,0 14.1625,0.15649 2.575,0.28452 -25.75,0.28452 -28.325,0 -39.9125,-0.12803 -25.75,-0.28452 z m 208.5,3e-5 c 13.8875,-0.15682 36.6125,-0.15682 50.5,0 13.88745,0.15682 2.525,0.28513 -25.25,0.28513 -27.775,0 -39.1375,-0.12831 -25.25,-0.28513 z M 382.78179,541.85533 c 0.95609,-0.25029 2.75609,-0.25937 4,-0.0202 1.24391,0.23919 0.46166,0.44398 -1.73834,0.45508 -2.2,0.0111 -3.21775,-0.18461 -2.26166,-0.4349 z m 139.26166,-55.31292 c -1.5808,-1.65 -2.64918,-3 -2.37418,-3 0.275,0 1.79338,1.35 3.37418,3 1.5808,1.65 2.64918,3 2.37418,3 -0.275,0 -1.79338,-1.35 -3.37418,-3 z"
+       id="path6236"
+       style="fill:#292222"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6312">
+      <g
+         id="g6286">
+        <g
+           transform="translate(43.475438,27.243334)"
+           id="g6190">
+          <g
+             id="g6035"
+             style="stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+            <path
+               d="m 230.00007,643.07523 c -3.43799,-0.73575 -5.99718,-1.74825 -5.68708,-2.25 0.3101,-0.50175 0.12499,-0.91227 -0.41135,-0.91227 -1.48706,0 -8.54066,-7.1481 -10.08081,-10.21587 -0.74992,-1.49373 -1.69468,-2.51118 -2.09947,-2.26101 -0.40479,0.25017 -1.34946,-0.32769 -2.09928,-1.28413 -1.2337,-1.57367 -1.19694,-1.60851 0.38669,-0.36655 1.82477,1.43109 2.46942,0.24698 0.78342,-1.43902 -0.99993,-0.99993 -5.85993,-14.40317 -6.50264,-17.93342 -0.20026,-1.1 -0.42292,-2 -0.49479,-2 -0.80622,0 -0.75379,-10.80804 0.0645,-13.29479 0.5963,-1.81214 1.42743,-5.63714 1.84696,-8.5 1.01816,-6.94791 1.28046,-7.7525 3.17755,-9.74688 0.89375,-0.93958 1.79375,-2.12857 2,-2.64219 0.6726,-1.67498 11.51235,-9.31614 13.21587,-9.31614 0.91252,0 1.65913,-0.46973 1.65913,-1.04384 0,-0.57411 0.5625,-0.95313 1.25,-0.84228 0.6875,0.11086 2.03333,-0.14096 2.99074,-0.5596 0.9574,-0.41863 3.9949,-0.56502 6.75,-0.32531 2.75509,0.23972 5.00926,0.0613 5.00926,-0.39656 0,-0.45783 0.47656,-0.83241 1.05902,-0.83241 0.58246,0 0.79485,0.42742 0.47199,0.94983 -0.51182,0.82814 2.33166,3.05017 3.90325,3.05017 1.48687,0 0.34183,-2.0101 -1.18426,-2.07895 -0.9625,-0.0434 -1.2463,-0.28632 -0.63067,-0.53977 0.80908,-0.3331 0.75814,-1.5092 -0.1838,-4.2432 -1.6748,-4.86113 -1.58978,-22.34502 0.14495,-29.80756 0.72638,-3.12478 1.11621,-6.01227 0.86629,-6.41664 -0.45531,-0.73672 3.57389,-13.97353 4.53969,-14.91388 0.28245,-0.275 1.38572,-2.21316 2.45172,-4.30703 1.066,-2.09387 2.94358,-4.89187 4.17239,-6.21777 1.22881,-1.32591 2.51101,-3.28292 2.84934,-4.3489 0.7171,-2.25937 11.83409,-14.1263 13.23359,-14.1263 0.52178,0 3.06923,-2.03183 5.661,-4.51518 l 4.7123,-4.51517 -3.47612,-3.57925 c -1.91186,-1.96858 -3.94674,-3.28838 -4.52194,-2.93288 -0.58125,0.35923 -0.84131,0.068 -0.58544,-0.65558 0.60298,-1.70518 -1.691,-4.6672 -3.5363,-4.56613 -5.13701,0.28137 -7.97051,-0.4819 -10.09204,-2.71853 -1.29523,-1.3655 -2.7246,-2.4905 -3.17639,-2.5 -1.88718,-0.0397 -8.08561,-8.54966 -7.23261,-9.92984 0.31483,-0.50941 -0.10671,-1.60534 -0.93677,-2.43539 -0.83005,-0.83006 -1.50919,-2.11633 -1.50919,-2.85838 0,-0.74205 -0.7875,-2.06805 -1.75,-2.94666 -5.45757,-4.98188 -7.84532,-8.79242 -10.76413,-17.17818 -2.03246,-5.83926 -2.92733,-9.89511 -2.46426,-11.16883 0.39992,-1.1 0.3336,-2.75804 -0.14738,-3.68453 -1.00661,-1.93897 0.14895,-5.54804 3.06731,-9.57991 1.08904,-1.50456 2.22871,-4.91121 2.53261,-7.57033 0.30389,-2.65913 1.24741,-5.52965 2.0967,-6.37894 0.8493,-0.84929 1.31621,-2.13823 1.03759,-2.8643 -0.32214,-0.83947 0.021,-1.11767 0.94249,-0.76407 0.98287,0.37716 1.44907,-0.12181 1.44907,-1.55093 0,-1.2555 0.63987,-2.10699 1.58333,-2.10699 0.87084,0 1.39046,-0.5625 1.15471,-1.25 -0.62048,-1.80954 5.44327,-8.54821 9.59822,-10.66652 3.70647,-1.88967 7.8224,-1.93142 20.16374,-0.20452 3.3,0.46176 6.15761,0.70779 6.35024,0.54673 0.19263,-0.16106 2.79027,1.02727 5.77254,2.64074 2.98226,1.61346 6.06164,2.93357 6.84306,2.93357 0.78141,0 2.09306,0.95986 2.91478,2.13302 0.99008,1.41354 2.17361,1.95531 3.50876,1.60616 1.1081,-0.28978 2.16007,-0.0908 2.33771,0.44209 0.19299,0.57898 3.38657,0.2344 7.93498,-0.85616 5.60405,-1.34367 9.90949,-1.69322 16.32165,-1.32511 4.79031,0.275 8.94555,0.11745 9.23386,-0.35012 0.73918,-1.19874 13.76024,0.44069 18.84022,2.37209 1.43552,0.54579 3.03342,0.73067 3.55089,0.41085 0.51748,-0.31981 0.81721,-0.0717 0.66609,0.55133 -0.15113,0.62304 1.41272,1.72847 3.47522,2.45649 2.0625,0.72803 3.75,1.09661 3.75,0.81908 0,-0.27754 0.675,0.0556 1.5,0.74028 1.03636,0.8601 1.5,0.89795 1.5,0.12244 0,-0.61734 0.6794,-1.12244 1.50979,-1.12244 0.83038,0 2.28039,-0.9 3.22224,-2 0.94185,-1.1 2.43486,-2 3.3178,-2 0.88295,0 4.49544,-1.18497 8.02776,-2.63327 8.46052,-3.46892 14.63942,-3.97669 17.37205,-1.42762 1.1277,1.05195 3.3242,2.22889 4.88112,2.61544 1.55692,0.38654 3.06757,1.3199 3.35699,2.07413 0.28943,0.75422 1.12457,1.37132 1.85588,1.37132 0.75838,0 1.46428,1.353 1.64301,3.14915 0.1875,1.88431 1.11665,3.5913 2.31336,4.25 1.1,0.60547 2.22893,1.40174 2.50874,1.7695 0.2798,0.36775 2.0798,0.81775 4,1 2.27368,0.21579 3.50048,0.85448 3.51769,1.83135 0.0145,0.825 0.35938,2.03141 0.76631,2.6809 0.40694,0.6495 0.2487,1.48447 -0.35163,1.8555 -0.71159,0.43978 -0.31705,1.49898 1.13348,3.043 1.98819,2.11632 2.04669,2.43683 0.54968,3.01128 -1.38588,0.53182 -1.45495,0.90995 -0.39979,2.18872 1.03517,1.25456 1.03212,1.62774 -0.0162,1.98047 -0.99232,0.33388 -1.02188,0.75978 -0.12755,1.83738 0.73955,0.8911 0.82539,1.85868 0.23535,2.65275 -0.51086,0.6875 -0.88128,2.57782 -0.82317,4.20072 0.0581,1.6229 -0.67967,3.73606 -1.63952,4.69591 -1.26468,1.26468 -1.59142,2.69275 -1.1867,5.1867 0.42623,2.6266 0.078,3.92203 -1.47076,5.47076 -1.11608,1.11608 -1.77762,2.28087 -1.47008,2.58841 0.30755,0.30754 0.0263,1.20128 -0.62507,1.98609 -0.91938,1.10779 -0.89534,1.54346 0.1075,1.94803 0.83366,0.33632 0.93712,0.81408 0.29174,1.34725 -0.55,0.45437 -1.13902,1.72613 -1.30894,2.82613 -0.16991,1.1 -1.10266,3.125 -2.07278,4.5 -0.97011,1.375 -2.40344,3.9625 -3.18517,5.75 -1.03908,2.37593 -2.09527,3.27123 -3.92722,3.32895 -1.37824,0.0434 -1.94339,0.30592 -1.25589,0.58333 1.88994,0.76261 1.50594,2.12802 -1,3.55578 -1.2375,0.70507 -2.25,1.95694 -2.25,2.78194 0,0.825 -0.675,1.41017 -1.5,1.30038 -0.825,-0.1098 -2.43628,1.2402 -3.58062,3 -1.14434,1.75979 -2.61936,3.08295 -3.27782,2.94034 -1.08968,-0.23598 -1.45305,0.37488 -2.74933,4.6219 -0.32054,1.05021 -0.73669,1.0964 -1.81504,0.20145 -0.99034,-0.82192 -1.59437,-0.84529 -2.06734,-0.08 -0.44576,0.72125 -1.76948,0.40055 -3.97628,-0.96333 -3.11614,-1.92587 -7.17568,-1.86871 -5.96881,0.084 0.3043,0.49237 0.14557,0.89522 -0.35273,0.89522 -1.51282,0 -5.22477,3.65392 -4.47432,4.40437 0.38573,0.38574 -0.0725,0.40441 -1.01819,0.0415 -1.24342,-0.47714 -1.72376,-0.14568 -1.73483,1.19715 -0.0131,1.58573 -0.17028,1.63788 -1.07613,0.35699 -0.94295,-1.33333 -1.01588,-1.33333 -0.65636,0 0.22245,0.825 1.38171,1.6438 2.57613,1.81955 1.19442,0.17575 2.17167,0.73825 2.17167,1.25 0,0.51175 0.70156,0.93045 1.55902,0.93045 0.85746,0 1.31241,0.39901 1.01101,0.88669 -0.30141,0.48768 0.12204,1.44278 0.94098,2.12245 1.00214,0.8317 1.48899,0.87575 1.48899,0.13474 0,-1.50115 4.95297,0.59164 7.16029,3.02546 0.91316,1.00687 1.92566,1.83066 2.25,1.83066 1.34484,0 4.72208,4.29595 7.25599,9.22983 1.48864,2.89859 3.52272,6.34336 4.52017,7.65503 0.99745,1.31167 1.81355,3.07624 1.81355,3.92126 0,0.84502 0.72,2.33199 1.6,3.30438 0.88,0.97239 1.6,3.43675 1.6,5.47636 0,2.03962 0.76793,5.10446 1.70651,6.81077 0.93858,1.7063 1.61471,4.79182 1.50251,6.85671 -0.1122,2.06489 0.20721,4.00848 0.7098,4.3191 0.50259,0.31061 0.67661,0.94855 0.3867,1.41762 -0.2899,0.46908 -0.76403,3.92549 -1.05361,7.68091 -0.28959,3.75541 -0.71708,8.48392 -0.94998,10.50777 -0.2329,2.02386 0.003,3.82386 0.5249,4 0.52709,0.178 0.28756,1.5926 -0.53924,3.18457 -0.81817,1.57537 -1.48759,3.61274 -1.48759,4.52749 0,0.91475 -0.70052,2.66332 -1.5567,3.88569 -0.87255,1.24574 -1.0923,2.22251 -0.5,2.22251 0.58118,0 1.0567,-0.5051 1.0567,-1.12244 0,-0.792 0.42748,-0.76768 1.45201,0.0826 0.79861,0.66279 2.29858,0.93638 3.33327,0.60798 1.03469,-0.3284 3.81286,0.0844 6.17371,0.91738 2.36086,0.83296 6.23433,1.51447 8.60772,1.51447 2.37339,0 4.61956,0.49238 4.99149,1.09417 0.37193,0.60179 1.76406,0.88622 3.09363,0.63206 1.32956,-0.25417 2.23378,-0.27851 2.00937,-0.0541 -0.2244,0.22441 1.91928,2.75397 4.76374,5.62125 6.91688,6.97236 6.84708,6.79218 7.96086,20.54842 0.37147,4.58799 0.71492,8.63799 0.76322,9 0.0483,0.36201 0.0337,0.79697 -0.10711,1.1582 -0.80187,2.05678 -1.31054,4.99435 -1.34682,7.77778 -0.0235,1.80277 -0.41672,1.48669 -0.74391,2.14323 -0.15813,0.31731 0.25315,0.79264 -0.63886,0.98195 -0.37621,0.60872 -0.45106,0.16598 -0.58513,0.9003 -0.0521,0.28524 -0.25816,0.17907 -0.74263,0.68717 -0.43248,0.45357 -0.35784,-0.0516 -0.66596,0.89743 -0.31216,0.96149 -0.20602,0.77316 -0.22528,1.16979 -0.0334,0.68828 -0.15481,0.85715 0.19242,2.05829 0.143,0.49469 -0.42203,1.27822 -0.89555,2.24755 -0.88043,1.80233 -0.25484,1.80931 -2.10364,2.00505 -0.26599,0.0282 0.44276,-0.20257 -1.17031,0.10247 -0.97461,0.1843 -1.19198,1.67998 -0.96659,2.29972 0.22539,0.61973 -1.01695,0.42266 -2.90511,3.15273 -2.25936,3.26679 -3.52602,1.58301 -4.03544,3.64173 -0.54849,2.21667 0.58003,0.14982 -0.11326,1.62782 -1.05669,2.25269 -0.47931,1.15177 -0.88709,1.80055 0,0 -0.22285,0.54501 -0.88857,0.87087 -0.44625,0.21842 1.17998,-0.12796 -2.60139,0.47671 -0.63646,0.29734 -0.46202,-0.80807 -3.19227,1.72224 l -2.76552,2.563 -22.1305,-0.23761 c -15.88014,-0.1705 -23.06085,-0.62092 -25.42453,-1.59481 -1.81171,-0.74645 -3.73536,-1.08443 -4.27478,-0.75105 -0.53941,0.33338 -0.8571,0.0102 -0.70598,-0.71819 0.16117,-0.77676 -0.44879,-1.20284 -1.47522,-1.03049 -0.9625,0.16161 -1.75,-0.25089 -1.75,-0.91667 0,-0.66578 -0.27444,-0.93607 -0.60986,-0.60064 -0.78027,0.78026 -7.41837,-3.39567 -10.84536,-6.82266 -1.44854,-1.44854 -3.25963,-2.39353 -4.02464,-2.09997 -0.76501,0.29356 -1.5575,0.034 -1.76109,-0.57674 -0.20359,-0.61077 -1.78787,-1.11049 -3.52062,-1.11049 -1.73275,0 -2.90921,-0.39034 -2.61436,-0.86741 0.29485,-0.47708 -0.35864,-1.51606 -1.91518,-1.22854 -1.55654,0.28751 -11.53389,1.69766 -21.70889,2.05337 -14.52324,0.50772 -19.12609,-3.02326 -21.87373,-1.66976 -1.925,0.94825 -7.96545,6.36524 -12.49725,8.6425 -4.53181,2.27733 -8.72086,4.14055 -9.30903,4.14055 -0.58816,0 -0.1631,1.70754 0.17292,2.25124 0.3629,0.58718 -0.0858,0.72119 -1.10503,0.33006 -1.25638,-0.48212 -1.49674,-0.30375 -0.89743,0.66596 0.5495,0.88911 0.43265,1.08594 -0.3555,0.59884 -1.02239,-0.63187 -5.26154,0.26637 -10.13496,2.1475 -3.07686,1.18766 -31.55601,0.75877 -37.7587,-0.56864 z"
+               id="path3028"
+               style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cssssssssssssssscsssssscssscsssssscsssssssssssssssssssscssssssscsscsccsssssssssscssssscscssssssssssccssssscssscscsssscssccssssscsssssssssssccsscssssssssssscsssssscsssasssssssscscscssscsscsscssssscsscssssc" />
+            <path
+               d="m 335.35714,412.00504 c 7.82838,2.22626 13.55258,9.07397 16.11064,16.58597 1.77331,5.10242 2.2904,10.63429 1.66409,15.98751 -0.69791,5.10295 -3.46584,10.04442 -8.00784,12.65844 -7.35888,4.77106 -18.18995,4.75934 -24.65496,-1.57547 -4.82902,-5.00061 -6.04119,-12.54296 -4.81793,-19.19027 1.46182,-8.18673 6.2227,-15.59326 12.57325,-20.87012 2.41956,-1.79458 5.22351,-3.69025 8.38275,-3.41755"
+               id="path3800"
+               style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               inkscape:connector-curvature="0" />
+            <path
+               d="m 310.53571,412.36218 c -1.40641,-1.17116 -3.58861,-1.66135 -5.16196,-0.51893 -2.22395,1.52051 -3.19556,4.27879 -3.55744,6.84075 -0.33384,2.53795 0.27807,5.51425 2.44186,7.10488 1.90236,1.39111 4.56075,0.65579 6.25684,-0.72054 1.97274,-1.54803 3.35558,-4.07045 3.02805,-6.62562 0.37908,-2.01145 -0.015,-4.50186 -1.88689,-5.65872 -0.34622,-0.20237 -0.72717,-0.34426 -1.12046,-0.42182 z"
+               id="path3843"
+               style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               inkscape:connector-curvature="0" />
+            <path
+               d="m 362.32143,415.04075 c 1.82028,-0.2869 3.79491,0.35598 4.9485,1.82847 1.8159,2.28393 2.02126,5.56951 0.97481,8.2301 -0.74786,1.96459 -2.45847,3.56523 -4.53699,3.99866 -2.04621,0.51877 -4.27055,-0.27745 -5.67674,-1.81667 -2.21845,-2.35017 -3.09901,-6.10321 -1.64239,-9.07066 0.7981,-1.56589 2.2933,-2.80679 4.01266,-3.20954 0.63251,-0.12753 1.2939,-0.11857 1.92015,0.0396 z"
+               id="path3860"
+               style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               inkscape:connector-curvature="0" />
+            <path
+               d="m 313.21429,418.25504 c -0.65312,0.86871 -1.78813,1.29333 -2.8566,1.15862 -1.51532,-0.1724 -2.94976,-1.09631 -3.68229,-2.44106 -0.48041,-0.86232 -0.47858,-1.97724 0.0673,-2.80913 0.63734,-1.05476 1.94102,-1.71218 3.16653,-1.43208 1.54168,0.34032 2.74335,1.63795 3.2515,3.09573 0.26622,0.77734 0.31965,1.64275 0.0536,2.42792 z"
+               id="path3876"
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               inkscape:connector-curvature="0" />
+            <path
+               d="m 368.21429,421.46932 c -0.55015,0.72499 -1.45802,1.18031 -2.37461,1.09864 -1.30459,-0.10649 -2.47133,-0.95018 -3.16425,-2.03402 -0.49974,-0.77749 -0.73307,-1.82753 -0.25762,-2.67243 0.38894,-0.68396 1.10834,-1.14173 1.85648,-1.33873 0.96656,-0.2404 1.98591,0.18488 2.64956,0.89186 0.93289,0.98053 1.46507,2.36797 1.3435,3.72376 -0.012,0.11111 -0.0295,0.22166 -0.0531,0.33092 z"
+               id="path3895"
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               inkscape:connector-curvature="0" />
+            <path
+               d="m 303.04576,597.66727 c 0.89898,4.35249 2.17849,8.87576 1.08581,13.31695 -0.98289,3.59314 -0.74817,7.37439 -1.46656,11.01441 -0.0643,0.90932 -0.11707,1.84689 -0.50302,2.68838"
+               id="path6133"
+               style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               inkscape:connector-curvature="0" />
+            <path
+               d="m 349.51278,594.76308 c -1.58181,2.33253 -1.39144,5.56411 -3.53003,7.56876 -0.74878,3.62541 -0.71177,7.35102 -1.21455,11.00843 -0.10351,3.82135 -0.0162,7.71947 1.08376,11.4103"
+               id="path6143"
+               style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               inkscape:connector-curvature="0" />
+          </g>
+          <path
+             d="m 409.49059,562.817 c -6.67512,0.0141 -12.72539,2.68679 -18.37595,5.87319 -5.33515,2.18172 -7.45099,7.69796 -12.7301,9.94852 -4.12835,4.17446 -7.57404,7.9756 -11.12192,12.52392 -2.6138,5.46222 -7.29966,10.95705 -13.63968,6.46078 -4.52118,-3.54734 -10.14186,-6.62102 -12.94899,-11.82544 -2.65925,-5.83356 -3.26085,-12.84467 -1.90417,-19.32125 0.65245,-6.59597 4.3386,-12.21307 7.7841,-17.72679 2.52977,-5.2597 6.29469,-8.24419 7.64728,-13.87964 2.44434,-5.87935 2.40037,-12.09314 2.93216,-18.33486 0.0486,-2.55913 0.45478,-5.2273 -0.67574,-7.63532"
+             id="path6125"
+             style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="m 247.99245,560.54416 c 6.76369,0.22082 13.24135,2.3829 18.17002,6.74782 3.36251,5.76075 8.86908,9.4273 12.13456,15.223 3.40989,5.65472 7.64278,11.01568 10.16352,16.76182 5.33282,4.95503 12.09713,-2.9069 18.35687,-2.90228 3.07966,-5.12791 6.1634,-10.09309 10.89959,-13.65497 3.57662,-4.51201 1.53442,-12.1972 3.96354,-17.84779 0.65412,-6.29983 -5.71452,-10.1283 -7.74494,-15.55479 -5.11189,-5.20658 -9.57769,-10.17315 -13.01542,-16.77188 -3.03275,-6.36273 -3.86358,-13.67482 -2.19127,-20.51204 1.29002,-1.18262 1.10017,-2.57287 1.53892,-3.89055"
+             id="path6127"
+             style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="m 264.49757,451.68163 c -0.83348,-0.36325 -1.85626,-1.07502 -2.27284,-1.58172 -0.41658,-0.5067 -1.7802,-1.5663 -3.03026,-2.35468 -2.64376,-1.66732 -6.90902,-7.0392 -7.34147,-9.24618 -0.59726,-3.04812 -3.54506,-8.15921 -6.60743,-11.45641 -4.03542,-4.34485 -6.20805,-8.31132 -8.70689,-15.89577 -1.7921,-5.43936 -2.03866,-6.78071 -2.18289,-11.87582 l -0.1626,-5.74387 2.14733,-3.61858 c 1.49005,-2.51097 2.45643,-4.98256 3.15715,-8.07469 0.5554,-2.45086 1.46859,-5.37083 2.02932,-6.48881 l 1.01951,-2.0327 6.17741,-0.24014 c 3.39757,-0.13208 8.19146,-0.18277 10.65308,-0.11265 4.44806,0.12672 11.48416,1.5513 13.68386,2.77053 0.63259,0.35063 2.29197,1.25362 3.68752,2.00665 3.98522,2.1504 4.30748,2.61329 3.37531,4.84826 -0.42755,1.0251 -1.42299,2.54567 -2.2121,3.37904 -1.43662,1.51721 -3.05975,6.05037 -3.05975,8.54542 0,0.72538 -0.68185,2.52705 -1.51523,4.00371 -0.83337,1.47666 -1.51523,3.19279 -1.51523,3.81363 0,0.62083 -0.27818,1.62523 -0.61819,2.232 -0.58367,1.04162 -1.16789,5.63751 -2.41505,18.9987 -0.45164,4.83847 -0.70286,5.88848 -1.551,6.48254 -0.89587,0.62749 -0.97423,1.0664 -0.68253,3.8228 0.18125,1.71265 0.64492,3.6173 1.03039,4.23256 0.38547,0.61526 0.70085,2.16071 0.70085,3.43435 0,1.27363 0.31405,2.92943 0.69789,3.67957 0.38384,0.75013 0.85915,2.33434 1.05624,3.52046 0.19709,1.18612 0.69477,2.49301 1.10595,2.90419 0.66009,0.66009 0.40341,0.74529 -2.19266,0.72783 -1.61715,-0.0109 -3.62221,-0.31697 -4.45569,-0.68022 l 0,0 z"
+             id="path6163"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.35355338;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="m 396.41236,460.39021 c -0.50626,-0.28797 -1.47514,-0.38438 -2.15306,-0.21422 -0.97746,0.24532 -5.45503,-1.12035 -6.703,-2.04444 -0.099,-0.0733 0.62934,-0.96678 1.61864,-1.98543 1.35515,-1.39535 1.87342,-2.4304 2.10166,-4.19725 0.16662,-1.28984 0.76652,-4.0498 1.3331,-6.13324 0.56659,-2.08344 1.5235,-5.60635 2.12647,-7.82868 0.85499,-3.15121 1.06501,-5.15235 0.95413,-9.09137 -0.24568,-8.72732 -0.64405,-14.10608 -1.12226,-15.15229 -0.25394,-0.55559 -0.53774,-2.64127 -0.63065,-4.63486 -0.11344,-2.43421 -0.43818,-3.92719 -0.98873,-4.54568 -0.58913,-0.66183 -0.91354,-2.41327 -1.15292,-6.22429 l -0.3331,-5.3033 1.6724,-2.61886 c 0.91982,-1.44037 2.52021,-3.145 3.55641,-3.78807 1.0362,-0.64307 2.0247,-1.58971 2.19666,-2.10365 0.17195,-0.51394 1.30987,-1.37556 2.5287,-1.9147 1.21883,-0.53915 2.45435,-1.42554 2.74561,-1.96975 0.39448,-0.73711 1.07253,-0.99386 2.65836,-1.00663 1.17084,-0.009 3.03794,-0.45628 4.14911,-0.99301 1.11116,-0.53674 2.62785,-0.98359 3.37041,-0.99302 0.79847,-0.0101 1.94627,-0.6133 2.80919,-1.47622 l 1.45909,-1.45909 1.98903,1.20358 c 1.09397,0.66197 3.29507,1.4616 4.89135,1.77697 2.77989,0.5492 2.9243,0.65506 3.42363,2.50943 0.28673,1.06482 0.376,2.51507 0.19837,3.22277 -0.23988,0.95577 0.0373,1.75897 1.07743,3.12273 1.2757,1.67252 1.32566,1.89062 0.56112,2.44967 -0.98074,0.71713 -1.09884,2.31355 -0.23507,3.17733 0.46889,0.46888 0.40779,0.74782 -0.2728,1.24548 -0.81374,0.59502 -0.81889,0.75778 -0.0714,2.25615 0.54968,1.10185 0.65784,1.90156 0.34048,2.51733 -0.25581,0.49636 -0.62128,2.15254 -0.81214,3.6804 -0.20022,1.60272 -0.86987,3.5746 -1.58291,4.66112 -1.00727,1.53485 -1.23588,2.52258 -1.23588,5.3396 0,3.05151 -0.17585,3.68879 -1.50118,5.4404 -0.82565,1.0912 -1.5075,2.3088 -1.51523,2.70576 -0.008,0.39697 -0.29148,1.48898 -0.63057,2.4267 -0.5085,1.40624 -0.49207,1.78186 0.0938,2.14394 0.51371,0.31749 0.56277,0.62439 0.17726,1.10883 -0.29318,0.36842 -0.80141,1.50347 -1.12941,2.52235 -0.54409,1.69015 -3.63547,7.55893 -5.93115,11.25991 -0.6016,0.96988 -1.5138,1.61512 -2.59487,1.83549 -2.15117,0.43849 -2.32413,0.65034 -1.54695,1.89481 0.56684,0.90765 0.47994,1.16021 -0.72534,2.10829 -2.14287,1.68558 -2.87911,2.52914 -2.87911,3.29881 0,0.39155 -0.57263,0.85563 -1.27252,1.03129 -0.69989,0.17566 -2.31849,1.5437 -3.59689,3.04008 -1.32232,1.5478 -2.7445,2.7207 -3.29893,2.7207 -0.65584,0 -1.22039,0.61945 -1.72618,1.89404 -1.49574,3.76925 -1.40087,3.64682 -2.39016,3.08409 l 0,0 z"
+             id="path6165"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.35355338;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+        <path
+           d="m 327.4876,492.39499 c 2.2644,2.66632 6.07748,3.19909 8.63579,5.43274 2.86007,2.28019 6.66345,0.59268 9.87447,1.65009 3.09838,0.67486 5.93629,2.75922 9.39536,2.88839 3.32499,0.37833 6.55094,0.57956 9.53617,1.55177 2.6564,0.95363 5.25607,-2.99638 7.07288,-0.0245 3.26765,2.24544 7.81367,0.6425 11.58781,1.00892 3.32915,0.008 5.80304,-2.7396 9.17467,-2.25665 3.08744,-0.22194 6.69298,0.88515 9.12364,-1.39255 3.30181,0.0682 6.36091,-0.78244 9.0003,-2.76185 1.51143,-1.14436 3.49477,-0.47019 5.25963,-0.64998 0.0806,-1.61182 2.11123,-1.97141 2.85714,-3.21429"
+           id="path6159"
+           style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/images/red-koala.xcf b/images/red-koala.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..a95baf62c3a626ff80b8f6f01047592fb8109288
GIT binary patch
literal 21756
zcmeHv2Xs|M+wPn+Qh*Q=64Fn4C;>w6y;td?B7_!@4oVdxDvC-I>4MTx;G;-UL5hI%
z-b(@@q<2!!IeX9S`@Azjbp8Kb|9{tA>#p^$`<=D+e%_hcXP?<K&&*q9_KBY`d7637
z=yB$86DEyijG2OQya9ne9ym-UoIG(jcRb7(9r$?RaKK@Q!@EMJ>uTWo0ARIv+%{&y
z<hb~;G4V4dj6oJdxrs&3e1GnwvF4dmCrubr%Qbpj{OGBZrp_=&ONf~fKPt}Lpk4#{
z`A>w{ilSQh>Zt$ZtFOw<|9gSHI%npzxX}})#G7MZ{T4Fk{%4sLc`+YMnee`O!j#eD
z$IhhhPaQXI=GgcDsvv#)KW3?%e}0wPq2gouLJ0#~D*UVAsU54%7&|6r;?%fFarI`-
zil+;xrRn2@gIeCe;anlpH(V-Y0HYqDYv|*O<CX08H@WiP<SKuY-67L`UwtY;c=i3i
z_j*OST^A+%ReM}(2ObRsD+Y$*sQ1ruyDU5c%3Q88<`w~>48So8gc6Jewqq=00%LXY
z{kk787E_zCSkSTImy9)Qfujdwtu`{&raEKojxg3Kj<L=w80$WZv0keg>x;5C@Qee_
z<G7C_9Y-1JKyAhnoD-M`W^I^gN~dY8HRC>OSxcq`O}StIMQy`mv|^$epgGg3h6OH{
zlJ2sp%&<ci_xRDUCk$P++kSU5riUyN$Y{oR@BM~@(Uj@tB~~f$s2>bRWbiI06uxHx
zHeozqvEf7*zDZ%!ZHc0<QORh`xcg@cLw{2^Py;r?*ESl?Mnk4o9#SX;9<sx5F=Ck>
z@R3yty!jc!)o8%D|0jkUVZBGd1XnAw*bkpRZ^5F)4ApE&)osqiN>mcbD5`8TCf-$b
zwA-gJjOyByiC(B0V798M%T-m=Sk$Nq6Yr=BI_^=}fGXOUi8-hq>Kj!cQ6!*p4H<7y
zQOPO?P{~+^r<HZ|yz@V$j?V3va3j`iB-T`YLFalo#2r(YUB!fpiww!3L{O$B<906;
ziMl<yQYa-p%%-?AQCF04OIDq*msc<*TeUh71Fim8wYqPX!tOTJ`U_R-A5)O58ox$~
z!qHr!xUD)NqC|DV3DpT5OB7QoCCN_UD|N*f?=00DO9Ze!<M!D`Wh24y3bVL`MuzwY
z1&5kKg$HZEvRuPjuf1Mk7$QIA;nl;-$F*w^86FYHqL>~!__^V3losCndDZkjvGt<E
zSP;`)qs|(BhJL$W1oLNljaGR^prPOG6~SsU-LH?;FdO=<t|3qvy8k=e2s8A1xUxFa
zefx1E($Joa2n}RaneNu4+^A(}rDw(lvdWByWf?IB|22TQF>%zWZ}2VtnBy86*6+hY
zBO?PaPwJlGb&Q5aiI!~T3tP16yYO(Pkzo4R5GDC``64UHK8Yun8L@^qeBAkX*|8tD
z{<Q1IpDtUCR)&>7*|UAepGF%)d-TJWLZh{zX**UF5f-lBCxCj&Hy2UN&;CT`yJwKa
zbB@w^S1E45OTHs{QxVB0FVnf;N6J~Rll($nxq%}`Y^UspSLwV%W^6+fB)FbtV%=7|
ztzzeX`~Bs6mdu?zs6~JStHY|Hau2>3-rNJtUBl4sPl+|LaOPv^+E=w%81pssf_NVm
z!u$<Av9B8oW`PDj5P@z8GWa!j7D$-wDN!s!Hi}E?N)$72bpUEn1?X?^yxPnR6vJ>g
zKZ7TGOBC<1P$WeYfUm)Cxk?lX^0!4i;D2=89WS%Os)JXYyn6fk$$gu?oX|PanZ+<I
z_GD@~22n|AR(kToi#tE;TfZ8fRIj!t*YGsTZMkVLQj>R^(W-iE5;xHHSqFodALBzZ
zj9^30+>0J!d~%Kvio|b`u$p*$juC;&ev5%^#RujX(T0|N@3Y3N3gZnjjk<=O{fi4x
zJJG0T=(Y>?;I_~}bG`g0d+7LvMp5y@eScn`4XxQ?%Fzc#Q^QvH^l56okx<FbNN{#$
zy1P#hMyzi3slgmsag~tTg9i0%-Lye;WFYK<LZ6`UhC>!?-FN)*)vM=^|F+w-+q!1;
z>a_>&V16mjJG1KD=C#ACprTrrg})b|-nNvj12M)uSZ%|ipPm|1KPnib5W}w63~Ycw
z8|#gFiD09FVG}<$53A1XnPwl{Jke-ml;v+9+{es9m)|g2VCXk{2lL8VBcU3UF&&j2
zGtJJUx+{xdR;RFzW2Ys2Y5G!MIBm*chrxwCM{Rzdn))L7(Vc6*e9|o#lSX;vcAx(F
zG%d3j^OjwyC<9nZ)1TcrFv1`9DSuIbmMycTKU~t@nK{~{c6AJ^$W6bSwoKNPKl7!=
ztbxYV#PfyKSS7}T9$_9Rwx*mN7ZPA%&iyy08BGj}EhF=i-#MBPcxslaa-{*R)F~{g
zVVm~N>V;KhvCJA6(QDm((x-aP=ON&V%_}tSjE*T*e_X!?i)J>5&}Q4pjVhSAW`$J3
zSk;1JK20^M8(Qv%(IFUlHjnV=QMZknXqeta8ZD&%{$xy%{0l!kEDt$D6Qt<o2MUSn
z#2|5|F>LKfgWsb`Gs+OP6ttJXKXO2~MPZUL1EUQ-*B7l44dRRm#;h7;SS?G=e_Gd_
zRl_Yx(^r>b{)?|2?gHk88QPsaTMs}FS?+%K$<Vf;)T3s@mcD({bq!CXz5IQ7Yh?Kw
zmWR8xZr=8r)u;+`&U1&Mh#BJdUyK?C-w=uv9!4BIWq2EWTXQ5aJzZRrZul5{=X@k<
z7`o-Vs|Kcz%|SBBSC>IU@b&&kc^Q1;GYlb~Lf@=z=q2Air`FgKf{yYq^o(z9Mi6fQ
zxfv#KHA632EvSLkFK_|P-BGYgqx6lTAt-k@_>Wmeh{2b+;@ed*iycJ^@~w2Qs)pD|
z+NNxNFs`g(@X~#h+&ef7$pp9BOt?e6YaLH^t;CwMa>oH^scpSHSR>Fnq|-9AlI_Oq
zt^szeF0<Ly9(7i=(7`uMps~d@Dz?jr9n?PD)&QN(Yi>v5h!L1Ic;Js{7%>misa|E^
zbF_;10y8ad{X1Gje2B@Hx1r_`b3qOs{fOG)sUOBHZ<j<3G2f2)GTmV~H3Ju&k>JCr
z3B)X-OFMdc{)Z1uI1#CMbTNTMr*(L4v4A+#7f;E{>VZOHHHlwWL1X-X_q>&AGGSs(
zS#gd2TdqDxd6Aa*=bI*0pV{gyy`NT&Nl-7o5(s^(xzBh=h7eB~0*!04>v}xZ3KK`m
zzuMals!xkv_oTq^f?e?Jr-tYwTf}>NpJb4^lfBM_{?MxaoGqxMie&HH=jahV^V>Sq
z`oah|cm~usjp4lt9;q>$>Z-<YVP`pp#d$T93+7`e*TRta-Cxecy2$8)aa<Q;I_bM%
zb)2Cv>SOjT&Unxt!?Y1JeK^JtP>cgMHpC$bJk=dt-WWDX8-)*?C5mOLI6n-@CI)}v
zfsxPzL+Y{}##U2|kO4qs6kYL!fE$3t^2*09@=DG(C@lDv#!#ix|2W`{3@eegrS7^g
zPYLde)0EXY=&8c62MPnOD-1fTu+Favo9$89aEHQ(?Fz%zO4Qw^TcHnP8E<<|VdN%-
z!CwI3gY>_z%;1P0B<ex%-K4M5<D$aQ4H9*aX;x)U*FPdrH!l^+2p@bxp?Q@=-C^ii
zX|wCWi%XO--|Tydy8rvPrM0gIeU%B<u?5q^KQDzJ(1Kar8p6;vSPN#W(qgmp8MLac
zPZ_KgG<Vyl<XBXHi#&~*EWs%ORyX&hwgY-n(*dhiw47^2%Q;ZX!Ku2cfZ7WwY9_!6
z1#=aQQP5oi53Oi1`(I@XiFgIgReQPKKsz;JV!8z0q@uN)kE4~~=#7-XYgM$B-A1$(
z{MyzPP35o?O$0Zlvjpx&t|dIqy3|f^K;tEFuXAXn7H}6|ppoD;HKR6a#k3*RLU5`a
z<^j<#@VlvDLhn+;bflC0zgy?OY#sP=jY=?u0Y?dmVgl?DBpVbU*?@@`3hpSluizN~
z*O*dYCvj=THTz{Ie@g>}z(ucY#i)l0mMLP@DNsy$tYEDoRA`<e)NMtmcufsEw{%6Q
z{fbcab0v|)g$h39D<1u>codSZcr?FUjWfH;Dx$%?o+~ER&rnQilcku{El)A1(@V*q
zZWbcXN;<iMLG9qmh;8J8@hx;d`v_;TiNxENN!&o<qf;bqhr_3?)#W#irBd$J*SWjs
z+Qf@={xz4%c9O|aTttd~2b8nrPUC=p=tUZ|2GYUs54{l&)jYlZ7sHuAR*+Fz5D2@z
z-}RgQeP3nSh9dCS77ryBsjNW5N>`bFAhSyQi7bO}op2*Dl`>wOK?a719piov$PT-h
zNEuNu%58qDZAJ<VP`<y6@<I^S(<%p<{gEYq9l<eYR#6iX{WrPmYnh*@ju~F~(08`u
zAw)wc1n#x-Ra#GuutQ~ZyMTT4OD_-7gXg{#W{&x=2=(WesD=4<=?#}|GHM&phA`Ha
zTS(kUW>fZWMjeB<O$AeV#tD)m){t!b5wh;{&SNCd?2uXT*RNy~s9p?eip?lM!fzK6
z)Q1S^A!M+EuKQjlbl0)Dbm11H&`9AM=)zq(A`A!|R3CQ<4CW`(khI5~{dFFw%O71q
z(t+u9zu}-RFW#?`9zEBf6jiBZI3l1iWiu6S<M8O5m>&GW7Vw!r{~gInObhJ(bukDH
z{zMxt6z{kQKFgFV(*wKh0jv3uJR{0*W14r%?=+B^7wty6GPAivee_cb2*7_RL0F_J
zD>c`Bd;YSeD^}gp;PAkUbPkQQi{xRaVOGEp3_b(n4z^*m4*CHD{#5AmE1@C!!xXIv
z!bdASR7s-fDWeJeLRE=k5R6%{=Z>dD@ji=0QuG4A)Yoe(++{CO#L1Y1XbFH7uZJjn
z;v!M(fHMTjf1+Tzf|2A9d185iNZk(xl~vN-i;``S6t5{C1B01Y&^?ff6wxa~R2&zl
zaI?SIE!LpQfAM+&t3{NasNih{Jry)l5D6fvdMi9_ClNMtZMYr0v>8y6RCI?~h*3x!
z^?=BOpAj!JV23d=j6_=iMDBT;*wzRxA%dik`a<HNlAV)TJqo^paaY`^d;pa<qw+wq
zHBn8Jk0I$xNZjKH*eDLdI^~hsl8H_v_f<5kNwR4;aj+xV2~KlBK=c%BAlKPMzNG4q
z^-4pEh<R<`zwp>2M7wbek>=`)!8x&+H9?$is^VK95}JMM<wQ0y1-_5Pvu=wvt(!pC
zn&N4u{5N$lOeCNFO`ZP}>Lj?dr+FUwvw%)_apG^4KoRH+LDg0O=NtfZ*w+fSNZ|d-
zjFvQi+b04sSq~~f7|EXT6T)at=#>g|!0Jnm(F}7iU-%N?Fek>pD@7E?39<R5IRa5A
z#KeMjmm?zV3PY$60UtNU2jn1LRhj9nQv?ESRhX^%rWb`A%EKK)pjq7N&8E%z{uB*U
zst+R2=XA`em|NYS%efU+HBGTt>_EiUVF*GAk4iBW;}NSF<(VHx`+L_~X+fD7kI6zS
zo8@N*eXKc|*OC{=1Ie(`&xANbk?K{VZ$bZA({>*`e!7?xNd4KQfj;&@sEYfpz?G$G
zZ3CQ~T&w!_&cHb4i<;spU5u`dn3nGTrko0H`;&UF8RQ+3f$_~ZG{ETB^`4a}dS1CV
zt;}#s7%s8G$$DsROxMKpL9Q;aT2_s5m!WjYSCz<Wa6bXVNq-b@fmD)777TMm{D@ci
zg6598xD9tdN$RNWXnDyebi2hKa8$YXX_`}lU{~<w0=MDw!s!y<XLLSX1HLa0DI(RT
z`{No*)i+)mwyq)c9dw_;bAu>i;rK30JD4Jl%<2%>!0ZC;YKSLP-p!5z9W`&^4x%1~
z@|vT0_zri(&O|G^?T7X-RJds|wO|=S;i%Cis%dTj<@=>j{!9mW>!Led{$*A40C#+c
zvUB_q#N`2bxLg-~E2Db4eFF=X%&?;phsF3tsrbOp1k<bL;9@E%4?@gFG(y#^Sziqt
zI6sMW!1pc`$O$MTRojTdJ8p*&;^X=L&|+|!ApYP)Vk3x94NzxbmLVcZoB5ZJ#a8T3
za*f+0-|!;Y{ST7&IFjso6teh=;z<s>Nt_Sm2ipeHbeXxA#DyeQIYHuD5<Ra%<VT$8
z4mFcVPOeFE5GR>SwOWVj(G<CG`B2R-?5Or$*GPWu3t7~n;8bgRyeb<hY<JRw0#%VZ
z0#%|dHB!w#i~xCOw7km%ihiuGE@M_5IoZ4MRnfn?ONVmUgt~aIIzk@0R~!v3zNscH
z{8SD-iyI_3GA62#iC&*hi=f+daGSbtg9&QUCRvR5gNPv|DGAFT)g-f&iWNIiq2?7V
zM69AYvnsNY+bvmz)!+;4|KTrHW0(qHW#d_=+oSHU5}PU_lG{<Dr_FT3Q=n)&MTq86
z6h<cSrSt~sOLQII8v3`yvg)sICq6<e!9F?ok|r8$yh^1XqtumQNV$`DgT$srGQsa(
zM91jmODT3+jSNzB(@qNYBC#DEsF#hYsZ!*g@B_gZb|{jG6|S!nh-6|WA(sbNeeEO*
z_*ogvUg4)wh_b>}SsQ_r2i+Wrm0_<E0SJ!G_k5k=>+0Z!xNZl?rJw2RDO3Dk<rr3a
z@kC!tez47sWh2Rd2tWuMsq;@MwIWoeOt*1i;WTemlyreud?XkXA}-AOol=YKRjTv=
zQu@ETnboCu1SBmJ>88>z!lggZI;2b>pv}iSyiW1c^_cssBK~dItAsbE&@m3LQ+!<r
zCR*t;AqalEpX2KkUrMVhs8;R~c!vCR3`PP{7oNZr*7*z{mE0+i<a@#q2SlrEqq2gD
zo=8<gFm5}QZJ@9}Qa5hH@zNhoa#P7|!a(r+5`Lrxb<j3w8(Z?4g>iwHjp2Be?L~(E
zwH-qDlsuM6$%o&VWfE5-(0=!GT6_U>=)3y4F+mv8;8^CbV6?uwg(s$8Bo7o~_S1iD
zS{c(WNV}QL<d17$u0>)SDZK07bif>e8B*Vc$y58jez=!P-@itt?Fuud7?kd@kQQ7Q
zjyV#xF~#cmhUS=*Fw-X=hMLl}wZr_7#{6qpOX*$9`ubstb46pVvOpJUr(;5Cxdr#!
zkVks$11xx;$HZqCI-&(d!sn4RjijkGoL+cQRCX-JoQNf97-gn<kl2H+{EV(_M$!n9
zqDbljiF>PI7D=+{M;cduIH0LSPl#eN1?ZiQ(}*gsO)BaG62CB!IEsczSzR=hc!NaD
zYY^K(6q86j#ga6Fq%e|(LE=@Ok<&gHZHDkYq&G;4C#eld-D&DguSsGvh+-t>W>ghx
z2z#s0H0?`6hZn`r^zA|82FnbX-(6_Xz<+>fx=F*L(3iB+Nr++#>4H5ZjVEb66@TqY
z#fwR_)FLr~%I8!09Ev~ih9piWalaFZlOc*e=pZqPRLxCK5+_0wLrHPXq@|+^)ks`G
z3nc^LyumleK-leqOz!fSxXs%lo7a_NV6h!t(x0;PqtLVHO*nXyAaUob6mz&4NOC>m
zJwF)>A5^>r;%bk_wf2DTDV8B2M#HJ&)iWUSo7G{`!+yZfx#UA)Jmu~WA-8WQvG{8*
zy4Z*K%{RG|57>t0^0wsmjV5NF>g`1GXJivB@E~u_{sK{Yq7$j3KuPFn&hXYmC!+II
z61n3#a8uVNI6=LMfg~rivLiRH9g&#tb0a^lVGasJ2Ry^S`TKAF{!ivF){L|`7%Es@
zdQ=H^4bb+ELOxz$ZWW1QpS(;=1>jql5hRwkRhU~#VKP}!SlK!X%cT(_GIf9rG1Yzm
zbETmnZorlRj040%<@8V}-d5QkDcG#w2UV!Or!b{5umKjy2FPVKZe0#*qdp8MJBeZw
zEQ5Lmx4x(Fkv%X5zcCzx6#4nHRKDe7g%?b!+}auCxGuv{A}a2V1w3BTRU#@}4f_>%
zK~rFDJoZ7k(8sfC0BfP~roj#XCfWh9xNjLL7x#IhJunKlc?;@35@z*P6NGT=aCmve
z3o0KQID|gGi3!RKN{#;n^#s&c0<oi@>;&n3=&k(8P)k@p&Ly1$H6><4<pA@-f!MW`
zeex}67MNn<t`{^2v`V5IbOxM&>?mjfXqJL8nC+nzaz4fc5A!E$Qy0wNnB2ADn2r-F
z{c}k$p|Zh50GapUbm~N_J1(o~9R7^Xb!4=Dgk1b_+a@9SqJ+TH5<+iE2+JoBwGH-q
zS4rhlOa#(h7t-lA-L6_Xorjdu`Dc0Sr}FEOnG!~75|*l^f=?B!Q*cTGw&O8){92H?
z*=2Yy0gRg$L!D#akN-#x9gN*>zJoaQZZLAND(`PVq56#hB6ew>3U3LE{((c6L)n^{
zHE4~I@OCB?BXqHOI~-;0a`z7lq5hz!Luea@wy)iSe5f_}RN=?TrV$4_ZG~>b??zsS
z4$<__hi5@!`5|~$ht_MfD{l@?SZrFXE!}?22AzS80^UvXNRbs>J#Kg0y7!}=!}r;6
zXKcL-iX-RLmbR?j{Ks&2y;1e%*YFG$acXRrg@^BeKYHM70UJisF0Gpme(}In2t@;f
zzD4{Ru>kW*1icY?4q1sPIsyp6OJwAP`%lCUCIlV4v4B?>Q5C&%I~#WEVQ*9I0)$zx
zdoTPMw%;KBVm^ZS3ql;OLlBPvhNS{s;Ji&joCX+~4}`}TbQ1v_Y}5%{Y#?rd#n1jS
zw8Nu{fe87ayeWl%JSHOq1Pm_*B1GZ0RfULP1~jM8k@*-xM|PyTWkf0HF;Hiovt;xs
z{3U?1fwVLc_$!^GY&au4i)mnK5*l3mLSir4>LIMO>9Ak`UH0DZ^u>a~B>%pI&Pz_v
zdE#?A_m?;6O(Cz>r#=+?>O)&CUu}Z|t!5>raL@|7Bz=z+N?!3rd9eJzhv~WK8t`Oh
z9@qs^&CXS%N+<xS%vfmosT=}mXa92vN<c)%V`aD$)U5P}72gd&km;g^o8j&O56BV6
z{<PTV=w8^T12eEF0H-|Ya4xJ`#Al{uB9H|FnAYTCvB49<mY1sUfwJ$n6rt~{Q9-fl
z{8h!O^QY&_&gXCEs4j1psk%HkMRj?lyJ$mn{Z6au`q*6A_2P=^@y>;+$K8`;kL&hW
z+LK+ss91G<uN>9o0V(Kmbp3Izy1qxg>T<`&s>?qvRb5^!MRqw~uK{TlC`0zWxFq}h
zjY8Sy*Qld{GwA#Y?e7%#sk<`hB#Z?6w&-v@rCkk7*_vwzb{JtJ>dk&;PbeFkgJ1LQ
z7Ch=pe)+uyVSYZop%INnZq30~(>O!iqi&9oD~Us~v~6g7e%vA;pS&KmweF7Z+qrX3
z)L(nl=ZiGdSGze5J0Thy<vF`|e;3!`{fES~JhZr_Y-^|0I}X!IZTY~C9lMNJd?*()
zhE1Fq-F-dmP_20Dpgx@)I%}PVVoR5&QK%>X@@2p7GiJA+`-FcyoA%1t&c*fEScv}B
zwEGV^hJ4x4HwJ&Sc=2a5M-Mg))_V4s^9Vg+DZY06_{kf|`KEkf!EVB3hA5?G$$W<%
zrH4lHdnt5YNK2#q6S>m);SG{MxKHOPNpv1wK<B=)F^TN2xbN{7;S=oIV$e|hmzUY-
zikC)0m3ElsEQ!5i+K$^}qhQ~a7+AdsI8MQ8qSe9t#`;4!s5$>84B3u`o;$M|qLrmi
z5hJ%PY&c-`WCvtB82T==JB$cx7+yRu2f*65H~6d|gn#hOmA(l6XvWKDX4+ZME6nTz
z#KI_agc&E@-_H@MM6;ZKI|K#zLMwlK!OqaEr$@M8^Spz>S1YvUg|hH4KP;#?VnbY$
zp_ZRp`omgxGxQ@-Ua;-q5|j-Hfb9>5n7<nUhX9VUm=Xdf0q*p*F63IkCl_zmlq*fT
z-pw6Vg+Ego4TS4+EeKBo)%k%ZR433D4TSS_&>yZ3+^N<Q_?;kVSg72gj!?P4)L<Y~
z@ho?!V&F^cyd)KUAP_1VD!Zo>R5maz1Q>w1swPx9P$#Dl;h2Lya1?=7+Pw|8vz`RL
z+y|;3PO9Dj2%F$`2y6muJ9|e0{}cBl)4>)Fgx_0VK@$ZX6pWI<H@m^ifVuG$JBwj|
zh&mGZrxYa&h3|>#!#u&A3HZ4{WvytmV;s(TV+H*cj0Rxww80ulms4)&4x2-r;Two1
z;!O(q`2>f=j`U#(?i2p|7dl~NWu#)O7uL_x9ntJyWo`%N+WlfF2rBkVQgUrNk+1Ig
zd_xo!8)e-k`Lwc!qpKirT;6QU_wEt*@7W_4yF>G~I)FXkQ~no{PvQ*mFXK%5a^l||
z;@=;{zob=-!9Nphu&*TlwDd(??G^9JhAAu`0z|a=ng6mg3w>Ebs$5#Op}$y9+w;Lc
z?L{B(4}NOyRL~E;Yu-Yz4^f-^gHdo?;SguN5AwlD&W)1`Sv<3&qFgepNTMD;2?XWx
z$!Y`Tp3&x9AdFz59#0Dd=YZm{;$C)R$vJUNQLkXAqFfTixIsP3w~Bh1brt1col43T
zy{9Pm++9&lqdkwH+!aN+XAX*T#ZwgJ(r6nbnWd){=dx-kT79G7nu5m)o=f1V*qcgR
z%Zya0y`wmHP;u_5NpY@tpyJ$h#ks6Hie1YT+>*ePO$hNIB%4OtD}kA4i~nHLwq|-e
zWi!qKppQKdC=7q9FjDPm5)Cnb!)WcIAYQ>@0Cqq*|ERF$ZwiAiDGYz8Fd{=?SV0Ar
zC=9hJ454)w@G1nO0JjTONgk@HV!YZTe<rNrYvC2Q3xA~Y&6gGWRQ$aCcSxhIA1LUn
zpsoZhJYPMR*IpoYY4uZ3AJB|hg5s*cF)={5vYG+SMogJ9al$);OoPhD-`wiyQSX8Q
zp4rSxSD&CwXjZK^!iXzDG2JC_Hq2I=SQA_`0G!gy^}e}50nL{uo`Oo6OW0-(!<nq<
z{<$z?VfZ+Q98!jlZ||4V@ZkX~l(|za{E9Sp^qQUXVP3%~uHM_G44)Va3?Hl}1>JyN
zMEK5sBf@{MfBdJy{sFe&z#6a{FTxC}fu#l*L4ZL3EOfbSQi$G>>99hHA_@xIi;2bx
zMgd?nJ8xDPas&9v=!2$lO-1W~Ce3Jz5^zcdJ@%?bzOCRH03BI5O<^?cYeKqHk-~Q?
z`g^wQZ?ROtRt1L@oKSF10j-FEAlLr^*Hr4Vf(r`HDmbKIn}QVz=1AZJt*RQ0$tFRy
zys4Vt%Ton^NYJM1>IwbRfuM%hKv(tzVqK<t)M?zv)JW9A8w=(26Rl%RkB}e5irqT(
zTl_dRtDqn|BQ4dGTAs<R^FO0ktfH89tE7~+v)OV#ZF%4&rXkIBzz^B*hP0vw3Avbm
zG^e>KrHC+wGQCxj74b=!$!=S6l$qQaIsRlF+b_>n*0J~HVnvs>sX|%DLul(btm8r1
ziX=5(NRsIG=Y?X+=2FF$8F`8&ftivee6vt&NmR55NLM(_s_3y&@#3t4hl&<<DGH-9
z6~3)W#MZM~<a4|u&8d&2$+c6yGjw|<Sx%xGnPmfClDv5boeSQSIXNUB`wVBDcP^vE
z@%dCRMDDzLK7{0i!&F=X5~29YFv?oCin7E|GKlr;j`Z%6eyvA2!O^!kfPXieuA8!v
zvcwnyuD^{eVKWl!P8rtTBj<c~#tK`ul;_{yyKq3CITtxBUaPn=zx_w4u(oaDSie!p
z_?~vL_Z)fWeeLhi-Lm`aCD6wFi@@4G3&77yyK~j2lqH7$OrQ@rPEgi^j7~kX!wZ7M
z4%9;W#qRQszx0!a>e{(f*Z1XZtzBrR9=|n+vgYlfi_6=|Ry`F@Sz~C++^ca3gjd5Y
z(!F~zp1yc3fzH2B`|xk1cQ{UN{j2clko!EI$~OK)=Qp#-uPE$G^0v)%9#lX%B{FBt
z50G^oF<xXX-A?CJSrB)V<X@&zab`zZJoq|g?Vn3o#hobpDRzUO)OpaX1COHCJgX<j
zte1Ak#l*))T%_~wbCAUkO#`QSw{(0<FKJywi3bCa;2-VAOvpc#y9d*HgXgl(q2c3h
zf$Vxd+%T8{S4V^3{7f9lz0yE(KJQ-?TR%Gk1lKJc^C`GKFb%Zk$LCP!{MoypEALuL
zA%}!hB(FG3awksmgJ~2<Pnt+gYwJ()`u!y9eMugfN%Hvxknzqbf?zXllh_j?7GQ8e
z+8DaPDlh(RImr)ZQvUj%Nj|xhWH=>|f7(X!q-P|r{Eg(X=_D_>LGs9KlE<Zy953_V
z&`6&30QvZ7)c5mqRA1hk<Q>~celnTl3kykJE}yAn5XrqPcy5eBn6am^H-I0TOKmdY
z2{rGnj+h?NkHwVr+gIo{{a#mk4^+R_@gB9Kr6+nsPw7C@rT$0PJZk6BkI{X4K_{B=
zLFXb`8M!!v`d1rp3weL1D6HWL%0d~hAVC=_KYJ+yrG#EQL$7UeMBooQQ^v?7HfvHY
zVs6rkfw?X5UZ}!j71qu7_A-sdWNCJfP|!(1g%Ms)rJ?|^)UmrnVha2bN?!?4c-Tv#
z*r05zg$kxBn6E6ZeV*!CJsK#N;N&gfB1n9XR@C4dl#*`%T<0Yb3vkkdsHKd%f-r?J
zgk>Dl8U-T|9kJ90=x>x;ZthzDO`uO8N_~u+m%AqP8Zvvsp2by1KkgbH5#1yvJOE);
zFT<+u?>}JU3v{P$JFU^ij+eiWFo$6o9yYTrd3LAuFVR!w_g8ce4Gs_Wk&EWG=cD=_
z;uw-;<#&!B+qH6hlMw8Yfn)yk-C=hza;#VDMnpzNBjBUGT+o;3rDdgZS`^a6nl1+s
zo6rk}uE9j9=XE+yklOwpL3+EJ1c|L=sOoXMWJ+CbpNKDLC7%t*Cp^-6ub>+oenY;j
z)`O;d?6FEPwf&1N7{*z(RsX_jmi=AON+DkSlq7lXElEO=S|SV2tfes7PLb!1yiA-_
zut~u@0PbxYtT4ago*5Nf!iy|aE}pASeXQV)f(r`vE1+03uAB}4b*yhFENHDTo0x|D
z{N@Vzd?0=}%~AdEb364z$5e4{3yI>MVoTXrg=y6kYZ5^K4A?V@EtYtN$(4X$OUV?;
z8trk?HDa6DD88Cwq+Y-D=;7^?3+p2gUk64<>i&MTtDv4yQj+@g#-1;y4enpZ5pEw|
z#ME=1ANGW2*aGkBrW`wb`3ZK1C15|xOomNSSj?@36TcIHAJL7I0r*XLd;9(IOYjcA
zr<eZhp@#$TJPz2N5RAr09Au#xQG6^2P7gs`7H=ns!5)anVp+Sa4iH}I%^*-0!J?iL
z_*vRb;DV_&9Eh!<Z57Orz_(+Y$7{!hDn_f!Jeh`xF0Q+xPMTpo<A^$85-K}NJFYO3
z74ISk2(>HNplVmRTGj65GF7{xd8i#KmEBWS>Uj;+29*;>RIM^1R5g|>xTk89ihU-u
zPM_0Iq5duq7IS!o2~-b*#gkU%Yf;eI_mINyLW!atChh8El1und!FK=zrX7D&SdBCU
z(!R$P2K}ip@DGLXb7Xn7g9_n($-8~3AXWko%TvGXy$^^Ay`>;p0uOtl3^$kMz`v}2
z9!lDge1#=IxDK%rc<6IwDmp9#VuwL(2|Vx|rV4B>7$|{<7D4~QEvdd12sfn;8J^^>
z>;=LyjVy%T@nM=rpwrvZM%6uoW<h|96B>O8S{*yEg6~5Wfpsk;(A$T!V8O#upn4Ek
zj-{6X5H5D_q(Se%kMbT|v2GDK2}%bZR#3cv#Q-bXZ;%En8t*;(w9kd}1&iCoyrcyB
z3G3_*Yb9z<QD0>s{1}aY4G3$x;B+#FVy(+^gTjL&8}=BrV8ibH$4_6qm6VcSj9tby
zXP<!3Fzi}SFtt~&0^@aHH0(9i&ZcCAG1&^|35j?oM0QRx0DT%r8XVXnUm?Qnlolgk
zHvlFp_)x)@3Kl7tt3X}CM+$X=_AeE>rU1dLvl94BGGV~KuuLE-nWR8*fe$QGz3=uy
z_5Mi-d_b}4{YuYO?;lmY-?c#XzFm^)_EiG?4R<p%Lv{ZR)%|12RQFd(R^9)VO*tUV
zU6Q1r9XvNUOEI8&W@)Zufadkbi*oe5A9kHwQ4BC=sIFgPLDyrLJKj?i2zj9>&?OTT
zz}f;L_Hu1uW`XQ@{$)PY8FmNGA`ct82S;V2`@_kbDu!DHC*AR5i|lp1_TwTbM0oP{
z{ZFS9z}l(JN*r4)KK9^Q>WlO|3!-QZSfQO)WV0TFhfkaH<%-Qa4<EyB@^*;z=y|Y$
zVICj;06!|SQ8WJb4YE*qU&wlPH{u-sY6IC*yBC3W{MJA`C?E0|KdoCj(aHr+?uP`Q
z^Di_LU-|?1$FC1V6Y91Od8mvoy3=UmCufo!_Wf7r8r~-zuA?=3?a=N+ZInJg8JgHC
ze(l?RdkNMr_`s(Wh%Q^ve#Og#KM~#6uXlU~d!Q`i>+b8z4ddtvENYZK9WZR=+S$G0
zj!-n6XAg&?X3ITw97}JA5%wgfqCa^fd>%O}e2a7pj;tm5{O5GOJD1LvKcVx%^>kiz
zj?UPs4+Y+X#QeAEeC;DTA6iG}4desyPcG3J7B0@<9xm@mBCJ=Ovq#eT(#LQa%JtEW
z+mGCE)q+J6{c&UH8vGMXNM!xab9a(kxzUVua^Zo8(aVPgW1$<uqk6Qd7)#V^%`kZI
zf=wP?K6l4zw0_7;Gd12NPsLuV>a@<BJTh3VGd~y*>>$^f_3K@Npe=&2%CN6Fz0Zy=
z{vg~J>IHGVXvFnk+$P=WtAsATW(eL!dFe0lE$Ro?@J2Y$)3D{OYld$`Ac9_2@bvnL
z10S{w#m}<J;ds9#)C0ts{MT%e;Bv&U*>YZFSm1G%q`mLXLf-i1&nM|cSX9zW&ii2*
zKzDC99!pPp_7Xb;fa}9g>n5L1FTUgp4PF-(IyMtkr3bVmwZ;SD4cl~tsPPvYSYWtN
z4>J;|lzp)^o)5b-Gfy;t@-t)cHSOmpD99kZ$^Yon8ql10z$bVd_*fbAUl0MX@Qyxg
z3CRbGs#(wO-YS@d=kqdb<u5MItAn24&aTM7UwVkV7Z>9yBdAgNyyeJG8^0Xi*ac5H
zk?GI66%*y(yi2~`l!HXG_8AxudTJLNjf=Hkf|OXwLg~>sy7JIO8V{d;MuX#VAKHD+
z7bIXn==t5UXheKH%0h!+#C1$W`k_wA<kZ}W!&Ii<Z+n2Y?(rTpuWDt($6H~mn!b%O
zw6TjiKcfY(%YA5Pyfv@Ck=XShR+sg=9cZnu{QI4TVVyZ4AM48c&pqY;vJ5UjRZGux
z`1E#u?r%e8Suuim`kT1GBF@YiI&4K2EuJnuKt63^cTNuO09sQLeTcaE@6h@B0y-a-
z!)4=sl0TJ8O^Wk_X<)rtQ+mC+^h)Z5!H2Q%>LkbF067+?KA~G}kT-lV1B-BFWp@vK
zJ+h5Q|6*#zOY~OQ%aV-8fA0V0gJEr()eVnuhbhNhH=xuCC!t=W=B?~ol{Sj06BQZ}
z6%phHE?I*cwdyqM7TO$PDgSk%1il^q`5`Payu&Schj<yt|0^_f3|3yp>S*M8(4}3}
zE19}`1A31)7JB+1BB1zhr@(hhF<;_e2Hb1?z%h|PO$NsvPRl_@<FBTIgE~XN`@`lw
zLk=PihInhB0&{pYOR#JAw~_I^VJk|1UX+D_URaWymh$A*sde$~g6!C6D?QBW->%%c
z{{(-7V|rfv<o?Yw2RD5@qElUO6E@UX{mv&o%P5euyjHE{krFw(TkSUAy!4FYiRxg5
z`s7PI5<+*TZ}OnyvBT}XEIb;vv~^BH6JoP=t%v1!BD{L!{Czg)(}?Mv5-p%jW2QOI
zLyV37TuO7FcRXD^(66a!rFatT%=YtrtR87!(mnM^ZtbwbLj9KC8t#u)wjkVvaJ&m%
z9BXO7pf<5q2G;LPtR*55!N3+UQtP7Qni$rHQ-`;Rc7@y+!K)xVo!)d-63uvGW*}z2
zGKbLm!<OtlmskoNq3dr4V6H264uY>1UB6DF2926^Hg(np4;vOY#WY2H@|oRd`d6#h
zt~ae0Kkl~MEe;&FKhC??#H&=o*~igGRK~bn^12V)5)6?^EHAjzjB1=SOw~A9)>zBH
zOPz4sIR92v9a~WGrv!#AC;i#&CbGs_$+<Q`^loKxKDtrQ-)M&iu-LUd@+`fG>=mB7
z5OY|Of4kucTTWcLc_;D7i}XypOf5SnC%3><AWF;Z%1ovB>lkdD&7OcsN;rC$JT!A?
zXe|o3cEXae=!^eZ5${ZMoF>2?)E=hz*&t<#KMq$|90tToXpstH6p+1+%ytUiQZP%w
zw-WeXS2QO!M4ky$_<;6CBb`@)f)Fpd)lyJj0T!$1qRfhm)>M{h_%`zQY6DP5o$3Tk
zslZ#ID*dYNd+9$;;QBPiOb$<IhZzW8<aQub7krfSL73RFt&;v?0T830j)GPIcw5#8
zh2MAs;f3LC$r^BkY?jTF+XhLI$5CtpON}woSK^P%K;1ZlO;L;|hEjvqCZEp}MDF#M
z%Y{Z;jLHFaC^)0wmV$>0o=M=Tl~ik_2Pw>Ltgx&X5KT8m!6F4)6dYG@O~E|{PZT66
zH~~N-m%phn-AAHGR6l-A!9E4+6nqXqizDbHF^yP)rY$?5n)r+}5PCtsNAGc<jZ?i<
z8$VL5s(`0D$y}af0-}|R-&3vp)E;P$mG-QR*|Kr9ocHlZOWxGHPtdG@hXBp6-S(5M
zeAk6q8EcVf<&LU>@wbBs|2K!J5JTYgf&U9!j^jrh^y!9Ukdzn}r5F~q<mazHJ#-&9
zcGB3<?@yRI#oQ-u=0qw)W#otcdywP=9RHpFYphyvy$J}f2(cvjdG*(elwI)|_&eT3
z!rvpxf9pj4z(iE?A&yiWh3cYL<%32dZw!v{I40qkhU0x4b8vi!<6|73;aH4g362#w
zR^eEOV<V2uIJV<JiwxR};{cAsIDW-}dJH;^;~b8QIIiNjiQ_KAha&3#I4Yg~XPV0Y
UZ}S{*kG~(LLIXejU-sbt0_-rS@Bjb+

literal 0
HcmV?d00001


From 708f738952ec9cf9f5d2c43e255582d95c3c82aa Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 20:39:07 -0700
Subject: [PATCH 064/299] add mascot

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 01524f8c8..907406350 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,6 @@
 red
 ===
 
-This is red.
\ No newline at end of file
+This is red.
+
+![red](https://github.com/zotlabs/hubzilla/blob/red/images/red-koala.png?raw=true)

From c3c1572683be325a2cc8a357125cb98ebd68d11e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 21:40:43 -0700
Subject: [PATCH 065/299] allow setting the system email name/address/reply

---
 Zotlabs/Module/Admin/Site.php | 15 +++++++++++++++
 view/tpl/admin_site.tpl       |  5 +++++
 2 files changed, 20 insertions(+)

diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index b71e63030..d05e70aa9 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -48,6 +48,10 @@ class Site {
 		$no_community_page    = !((x($_POST,'no_community_page'))	? True	:	False);
 		$default_expire_days  = ((array_key_exists('default_expire_days',$_POST)) ? intval($_POST['default_expire_days']) : 0);
 
+		$reply_address      = ((array_key_exists('reply_address',$_POST) && trim($_POST['reply_address'])) ? trim($_POST['reply_address']) : 'noreply@' . \App::get_hostname());
+		$from_email         = ((array_key_exists('from_email',$_POST) && trim($_POST['from_email'])) ? trim($_POST['from_email']) : 'Administrator@' . \App::get_hostname());
+		$from_email_name    = ((array_key_exists('from_email_name',$_POST) && trim($_POST['from_email_name'])) ? trim($_POST['from_email_name']) : \Zotlabs\Lib\System::get_site_name());
+
 		$verifyssl         = ((x($_POST,'verifyssl'))        ? True : False);
 		$proxyuser         = ((x($_POST,'proxyuser'))        ? notags(trim($_POST['proxyuser']))  : '');
 		$proxy             = ((x($_POST,'proxy'))            ? notags(trim($_POST['proxy']))      : '');
@@ -77,8 +81,15 @@ class Site {
 		set_config('system', 'enable_context_help', $enable_context_help);
 		set_config('system', 'verify_email', $verify_email);
 		set_config('system', 'default_expire_days', $default_expire_days);
+		set_config('system', 'reply_address', $reply_address);
+		set_config('system', 'from_email', $from_email);
+		set_config('system', 'from_email_name' , $from_email_name);
+
+
 		set_config('system', 'techlevel_lock', $techlevel_lock);
 
+
+
 		if(! is_null($techlevel))
 			set_config('system', 'techlevel', $techlevel);
 
@@ -304,6 +315,10 @@ class Site {
 			'$login_on_homepage'	=> array('login_on_homepage', t("Login on Homepage"),((intval($homelogin) || $homelogin === false) ? 1 : '') , t("Present a login box to visitors on the home page if no other content has been configured.")),
 			'$enable_context_help'	=> array('enable_context_help', t("Enable context help"),((intval($enable_context_help) === 1 || $enable_context_help === false) ? 1 : 0) , t("Display contextual help for the current page when the help button is pressed.")),
 
+			'$reply_address' => [ 'reply_address', t('Reply-to email address for system generated email.'), get_config('system','reply_address','noreply@' . \App::get_hostname()),'' ],
+			'$from_email' => [ 'from_email', t('Sender (From) email address for system generated email.'), get_config('system','from_email','Administrator@' . \App::get_hostname()),'' ],
+			'$from_email_name' => [ 'from_email_name', t('Name of email sender for system generated email.'), get_config('system','from_email_name',\Zotlabs\Lib\System::get_site_name()),'' ],
+
 			'$directory_server' => (($dir_choices) ? array('directory_server', t("Directory Server URL"), get_config('system','directory_server'), t("Default directory server"), $dir_choices) : null),
 
 			'$proxyuser'		=> array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 1cdb4a56b..6fd0fd9ce 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -51,6 +51,11 @@
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_textarea.tpl" field=$siteinfo}}
 	{{include file="field_textarea.tpl" field=$admininfo}}
+
+    {{include file="field_input.tpl" field=$reply_address}}
+    {{include file="field_input.tpl" field=$from_email}}
+    {{include file="field_input.tpl" field=$from_email_name}}
+
 	{{include file="field_select.tpl" field=$language}}
 	{{include file="field_select.tpl" field=$theme}}
     {{include file="field_select.tpl" field=$theme_mobile}}

From e98938d03dbdd94c33419924a50e4b6fbeb6fe1c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 23 Mar 2017 00:20:12 -0700
Subject: [PATCH 066/299] rev update

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 9ebc7e5b6..e0c0bc94e 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ require_once('include/hubloc.php');
 
 
 define ( 'PLATFORM_NAME',           'red' );
-define ( 'STD_VERSION',             '5.2' );
+define ( 'STD_VERSION',             '5.3' );
 define ( 'ZOT_REVISION',            '1.2' );
 
 define ( 'DB_UPDATE_VERSION',       1188  );

From a2e101997836ebd904e94aa896a1bcc2e2c70f01 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 23 Mar 2017 21:49:20 -0700
Subject: [PATCH 067/299] move db_upgrade to zlib

---
 Zotlabs/Lib/DB_Upgrade.php | 105 ++++++++++++++++++++++++++++++++++
 Zotlabs/Lib/ThreadItem.php |   1 -
 Zotlabs/Web/WebServer.php  |  17 +++---
 boot.php                   |  88 +----------------------------
 include/conversation.php   | 112 +++----------------------------------
 util/db_update.php         |   3 +-
 6 files changed, 128 insertions(+), 198 deletions(-)
 create mode 100644 Zotlabs/Lib/DB_Upgrade.php

diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php
new file mode 100644
index 000000000..13adaced5
--- /dev/null
+++ b/Zotlabs/Lib/DB_Upgrade.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+
+class DB_Upgrade {
+
+
+	function __construct($db_revision) {
+
+		$build = get_config('system','db_version',0);
+		if(! intval($build))
+			$build = set_config('system','db_version',$db_revision);
+
+		if($build == $db_revision) {
+			// Nothing to be done.
+			return;
+		}
+		else {
+			$stored = intval($build);
+			if(! $stored) {
+				logger('Critical: check_config unable to determine database schema version');
+				return;
+			}
+		
+			$current = intval($db_revision);
+			if(($stored < $current) && file_exists('install/update.php')) {
+
+				Config::Load('database');
+
+				// We're reporting a different version than what is currently installed.
+				// Run any existing update scripts to bring the database up to current.
+				
+				require_once('install/update.php');
+
+				// make sure that boot.php and update.php are the same release, we might be
+				// updating from git right this very second and the correct version of the update.php
+				// file may not be here yet. This can happen on a very busy site.
+
+				if($db_revision == UPDATE_VERSION) {
+					for($x = $stored; $x < $current; $x ++) {
+						if(function_exists('update_r' . $x)) {
+							// There could be a lot of processes running or about to run.
+							// We want exactly one process to run the update command.
+							// So store the fact that we're taking responsibility
+							// after first checking to see if somebody else already has.
+
+							// If the update fails or times-out completely you may need to
+							// delete the config entry to try again.
+
+							if(get_config('database','update_r' . $x))
+								break;
+							set_config('database','update_r' . $x, '1');
+							// call the specific update
+
+							$func = 'update_r' . $x;
+							$retval = $func();
+							if($retval) {
+
+								// Prevent sending hundreds of thousands of emails by creating
+								// a lockfile.  
+
+								$lockfile = 'store/[data]/mailsent';
+
+								if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 86400)))
+									return;
+								@unlink($lockfile);
+								//send the administrator an e-mail
+								file_put_contents($lockfile, $x);
+							
+								$r = q("select account_language from account where account_email = '%s' limit 1",
+									dbesc(App::$config['system']['admin_email'])
+								);
+								push_lang(($r) ? $r[0]['account_language'] : 'en');
+
+								z_mail(
+									[
+										'toEmail'        => \App::$config['system']['admin_email'],
+										'messageSubject' => sprintf( t('Update Error at %s'), z_root()),
+										'textVersion'    => replace_macros(get_intltext_template('update_fail_eml.tpl'), 
+											[
+												'$sitename' => \App::$config['system']['sitename'],
+												'$siteurl' =>  z_root(),
+												'$update' => $x,
+												'$error' => sprintf( t('Update %s failed. See error logs.'), $x)
+											]
+										)
+									]
+								);
+
+								//try the logger
+								logger('CRITICAL: Update Failed: ' . $x);
+								pop_lang();
+							}
+							else {
+								set_config('database','update_r' . $x, 'success');
+							}
+						}
+					}
+					set_config('system','db_version', $db_revision);
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 799a606d6..b692224b0 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -337,7 +337,6 @@ class ThreadItem {
 			'profile_url' => $profile_link,
 			'thread_action_menu' => thread_action_menu($item,$conv->get_mode()),
 			'thread_author_menu' => thread_author_menu($item,$conv->get_mode()),
-			'item_photo_menu' => item_photo_menu($item),
 			'dreport' => $dreport,
 			'name' => $profile_name,
 			'thumb' => $profile_avatar,
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index 5bb0e08e8..9c9f0483a 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -79,11 +79,6 @@ class WebServer {
 		if(! x($_SESSION, 'sysmsg_info'))
 			$_SESSION['sysmsg_info'] = array();
 
-		/*
-		 * check_config() is responsible for running update scripts. These automatically
-		 * update the DB schema whenever we push a new one out. It also checks to see if
-		 * any plugins have been added or removed and reacts accordingly.
-		 */
 
 
 		if(\App::$install) {
@@ -91,8 +86,16 @@ class WebServer {
 			if(\App::$module != 'view')
 				\App::$module = 'setup';
 		}
-		else
-			check_config($a);
+		else {
+
+			/*
+			 * check_config() is responsible for running update scripts. These automatically
+			 * update the DB schema whenever we push a new one out. It also checks to see if
+			 * any plugins have been added or removed and reacts accordingly.
+			 */
+
+			check_config();
+		}
 
 		nav_set_selected('nothing');
 
diff --git a/boot.php b/boot.php
index e0c0bc94e..63df8b3b0 100755
--- a/boot.php
+++ b/boot.php
@@ -1357,11 +1357,7 @@ function is_ajax() {
 // base url for use in cmdline programs which don't have
 // $_SERVER variables, and synchronising the state of installed plugins.
 
-function check_config(&$a) {
-
-	$build = get_config('system','db_version');
-	if(! intval($build))
-		$build = set_config('system','db_version',DB_UPDATE_VERSION);
+function check_config() {
 
 	$saved = get_config('system','urlverify');
 	if(! $saved)
@@ -1399,88 +1395,8 @@ function check_config(&$a) {
 	if (! $syschan_exists)
 		create_sys_channel();
 
-	if($build != DB_UPDATE_VERSION) {
-		$stored = intval($build);
-		if(! $stored) {
-			logger('Critical: check_config unable to determine database schema version');
-			return;
-		}
-		$current = intval(DB_UPDATE_VERSION);
-		if(($stored < $current) && file_exists('install/update.php')) {
+	$x = new \Zotlabs\Lib\DB_Upgrade(DB_UPDATE_VERSION);
 
-			load_config('database');
-
-			// We're reporting a different version than what is currently installed.
-			// Run any existing update scripts to bring the database up to current.
-			require_once('install/update.php');
-
-			// make sure that boot.php and update.php are the same release, we might be
-			// updating right this very second and the correct version of the update.php
-			// file may not be here yet. This can happen on a very busy site.
-
-			if(DB_UPDATE_VERSION == UPDATE_VERSION) {
-				for($x = $stored; $x < $current; $x ++) {
-					if(function_exists('update_r' . $x)) {
-						// There could be a lot of processes running or about to run.
-						// We want exactly one process to run the update command.
-						// So store the fact that we're taking responsibility
-						// after first checking to see if somebody else already has.
-
-						// If the update fails or times-out completely you may need to
-						// delete the config entry to try again.
-
-						if(get_config('database','update_r' . $x))
-							break;
-						set_config('database','update_r' . $x, '1');
-						// call the specific update
-
-						$func = 'update_r' . $x;
-						$retval = $func();
-						if($retval) {
-
-							// Prevent sending hundreds of thousands of emails by creating
-							// a lockfile.  
-
-							$lockfile = 'store/[data]/mailsent';
-
-							if ((file_exists($lockfile)) && (filemtime($lockfile) > (time() - 86400)))
-									return;
-							@unlink($lockfile);
-							//send the administrator an e-mail
-							file_put_contents($lockfile, $x);
-							
-							$r = q("select account_language from account where account_email = '%s' limit 1",
-								dbesc(App::$config['system']['admin_email'])
-							);
-							push_lang(($r) ? $r[0]['account_language'] : 'en');
-
-
-							$email_tpl = get_intltext_template("update_fail_eml.tpl");
-							$email_msg = replace_macros($email_tpl, array(
-								'$sitename' => App::$config['system']['sitename'],
-								'$siteurl' =>  z_root(),
-								'$update' => $x,
-								'$error' => sprintf( t('Update %s failed. See error logs.'), $x)
-							));
-
-							$subject = email_header_encode(sprintf(t('Update Error at %s'), z_root()));
-
-							mail(App::$config['system']['admin_email'], $subject, $email_msg,
-								'From: Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
-								. 'Content-type: text/plain; charset=UTF-8' . "\n"
-								. 'Content-transfer-encoding: 8bit' );
-							//try the logger
-							logger('CRITICAL: Update Failed: ' . $x);
-							pop_lang();
-						}
-						else
-							set_config('database','update_r' . $x, 'success');
-					}
-				}
-				set_config('system','db_version', DB_UPDATE_VERSION);
-			}
-		}
-	}
 
 	/**
 	 *
diff --git a/include/conversation.php b/include/conversation.php
index a1acc456a..20ed4f216 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -2,10 +2,6 @@
 
 require_once('include/items.php');
 
-// Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
-// is identical to the code in mod/message.php for 'item_extract_images' and
-// 'item_redir_and_replace_images'
-
 
 function item_extract_images($body) {
 
@@ -375,13 +371,14 @@ function localize_item(&$item){
  *  * \e array \b children
  * @return number
  */
+
 function count_descendants($item) {
 
 	$total = count($item['children']);
 
-	if ($total > 0) {
-		foreach ($item['children'] as $child) {
-			if (! visible_activity($child))
+	if($total > 0) {
+		foreach($item['children'] as $child) {
+			if(! visible_activity($child))
 				$total --;
 
 			$total += count_descendants($child);
@@ -408,8 +405,8 @@ function visible_activity($item) {
 	if(intval($item['item_notshown']))
 		return false;
 
-	foreach ($hidden_activities as $act) {
-		if ((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) {
+	foreach($hidden_activities as $act) {
+		if((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) {
 			return false;
 		}
 	}
@@ -870,98 +867,6 @@ function best_link_url($item) {
 
 
 
-function item_photo_menu($item){
-
-	$contact = null;
-
-	$ssl_state = false;
-
-	$sub_link="";
-	$poke_link="";
-	$contact_url="";
-	$pm_url="";
-	$vsrc_link = "";
-	$follow_url = "";
-
-	$local_channel = local_channel();
-
-	if($local_channel) {
-		$ssl_state = true;
-		if(! count(App::$contacts))
-			load_contact_links($local_channel);
-		$channel = App::get_channel();
-		$channel_hash = (($channel) ? $channel['channel_hash'] : '');
-	}
-
-	if(($local_channel) && $local_channel == $item['uid']) {
-		$vsrc_link = 'javascript:viewsrc(' . $item['id'] . '); return false;';
-		if($item['parent'] == $item['id'] && $channel && ($channel_hash != $item['author_xchan'])) {
-			$sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
-		}
-		if($channel) {
-			$unsub_link = 'javascript:dounsubthread(' . $item['id'] . '); return false;';
-		}
-	}
-
-	$profile_link = chanlink_hash($item['author_xchan']);
-	if($item['uid'] > 0)
-		$pm_url = z_root() . '/mail/new/?f=&hash=' . $item['author_xchan'];
-
-	if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts))
-		$contact = App::$contacts[$item['author_xchan']];
-	else
-		if($local_channel && $item['author']['xchan_addr'])
-			$follow_url = z_root() . '/follow/?f=&url=' . $item['author']['xchan_addr'];
-
-	if($contact) {
-		$poke_link = z_root() . '/poke/?f=&c=' . $contact['abook_id'];
-		if (! intval($contact['abook_self']))  
-			$contact_url = z_root() . '/connedit/' . $contact['abook_id'];
-		$posts_link = z_root() . '/network/?cid=' . $contact['abook_id'];
-
-		$clean_url = normalise_link($item['author-link']);
-	}
-
-	$rating_enabled = get_config('system','rating_enabled');
-
-	$ratings_url = (($rating_enabled) ? z_root() . '/ratings/' . urlencode($item['author_xchan']) : '');
-
-	$post_menu = Array(
-		t("View Source") => $vsrc_link,
-		t("Follow Thread") => $sub_link,
-		t("Unfollow Thread") => $unsub_link,
-	);
-
-	$author_menu = array(
-		t("View Profile") => $profile_link,
-		t("Activity/Posts") => $posts_link,
-		t("Connect") => $follow_url,
-		t("Edit Connection") => $contact_url,
-		t("Message") => $pm_url,
-		t('Ratings') => $ratings_url,
-		t("Poke") => $poke_link
-	);
-
-
-	$args = array('item' => $item, 'post_menu' => $post_menu, 'author_menu' => $author_menu);
-
-	call_hooks('item_photo_menu', $args);
-
-	$menu = array_merge($args['post_menu'],$args['author_menu']);
-
-	$o = "";
-	foreach($menu as $k=>$v){
-		if(strpos($v,'javascript:') === 0) {
-			$v = substr($v,11);
-			$o .= "<li><a href=\"#\" onclick=\"$v\">$k</a></li>\n";
-		}
-		elseif ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
-	}
-
-	return $o;
-}
-
-
 function thread_action_menu($item,$mode = '') {
 
 	$menu = [];
@@ -1021,14 +926,15 @@ function thread_author_menu($item, $mode = '') {
 	}
 
 	$profile_link = chanlink_hash($item['author_xchan']);
+
 	if($item['uid'] > 0)
-		$pm_url = z_root() . '/mail/new/?f=&hash=' . $item['author_xchan'];
+		$pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']);
 
 	if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts))
 		$contact = App::$contacts[$item['author_xchan']];
 	else
 		if($local_channel && $item['author']['xchan_addr'])
-			$follow_url = z_root() . '/follow/?f=&url=' . $item['author']['xchan_addr'];
+			$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
 
 	if($contact) {
 		$poke_link = z_root() . '/poke/?f=&c=' . $contact['abook_id'];
diff --git a/util/db_update.php b/util/db_update.php
index ceef061c1..8fc7c7616 100644
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -9,6 +9,7 @@ require_once('boot.php');
 require_once('include/cli_startup.php');
 
 cli_startup();
+$build = get_config('system','db_version');
 
 echo "Old DB VERSION: " . $build . "\n";
 echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
@@ -16,7 +17,7 @@ echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
 
 if($build != DB_UPDATE_VERSION) {
 	echo "Updating database...";
-	check_config($a);
+	check_config();
 	echo "Done\n";
 }
 

From 878614f97a9f8dc5e9f8ad2b5b10a85003084938 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 25 Mar 2017 13:07:46 -0700
Subject: [PATCH 068/299] get rid of 'davguest' and allow for project specific
 DB updates (currently db updates are common between all possible
 projects/subprojects/forks).

---
 Zotlabs/Lib/DB_Upgrade.php     |   24 +-
 Zotlabs/Module/Cloud.php       |    2 -
 Zotlabs/Module/Filestorage.php |    2 +-
 util/hmessages.po              | 6586 ++++++++++++++++----------------
 4 files changed, 3302 insertions(+), 3312 deletions(-)

diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php
index 13adaced5..2ee29c314 100644
--- a/Zotlabs/Lib/DB_Upgrade.php
+++ b/Zotlabs/Lib/DB_Upgrade.php
@@ -8,9 +8,10 @@ class DB_Upgrade {
 
 	function __construct($db_revision) {
 
-		$build = get_config('system','db_version',0);
+
+		$build = get_config('system', PLATFORM_NAME . '_db_version', 0);
 		if(! intval($build))
-			$build = set_config('system','db_version',$db_revision);
+			$build = set_config('system', PLATFORM_NAME . '_db_version', $db_revision);
 
 		if($build == $db_revision) {
 			// Nothing to be done.
@@ -24,14 +25,17 @@ class DB_Upgrade {
 			}
 		
 			$current = intval($db_revision);
-			if(($stored < $current) && file_exists('install/update.php')) {
+
+			$update_file = 'install/' . PLATFORM_NAME . '/update.php';
+
+			if(($stored < $current) && file_exists($update_file)) {
 
 				Config::Load('database');
 
 				// We're reporting a different version than what is currently installed.
 				// Run any existing update scripts to bring the database up to current.
 				
-				require_once('install/update.php');
+				require_once($update_file);
 
 				// make sure that boot.php and update.php are the same release, we might be
 				// updating from git right this very second and the correct version of the update.php
@@ -39,7 +43,8 @@ class DB_Upgrade {
 
 				if($db_revision == UPDATE_VERSION) {
 					for($x = $stored; $x < $current; $x ++) {
-						if(function_exists('update_r' . $x)) {
+						$func = PLATFORM_NAME . '_update_' . $x;
+						if(function_exists($func)) {
 							// There could be a lot of processes running or about to run.
 							// We want exactly one process to run the update command.
 							// So store the fact that we're taking responsibility
@@ -48,12 +53,11 @@ class DB_Upgrade {
 							// If the update fails or times-out completely you may need to
 							// delete the config entry to try again.
 
-							if(get_config('database','update_r' . $x))
+							if(get_config('database', $func))
 								break;
-							set_config('database','update_r' . $x, '1');
+							set_config('database',$func, '1');
 							// call the specific update
 
-							$func = 'update_r' . $x;
 							$retval = $func();
 							if($retval) {
 
@@ -93,11 +97,11 @@ class DB_Upgrade {
 								pop_lang();
 							}
 							else {
-								set_config('database','update_r' . $x, 'success');
+								set_config('database',$func, 'success');
 							}
 						}
 					}
-					set_config('system','db_version', $db_revision);
+					set_config('system', PLATFORM_NAME . '_db_version', $db_revision);
 				}
 			}
 		}
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
index 2b6d7bcbe..7370eeda3 100644
--- a/Zotlabs/Module/Cloud.php
+++ b/Zotlabs/Module/Cloud.php
@@ -60,11 +60,9 @@ class Cloud extends \Zotlabs\Web\Controller {
 
 		$_SERVER['QUERY_STRING'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['QUERY_STRING']);
 		$_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']);
-		$_SERVER['QUERY_STRING'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['QUERY_STRING']);
 
 		$_SERVER['REQUEST_URI'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['REQUEST_URI']);
 		$_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']);
-		$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['REQUEST_URI']);
 
 		$rootDirectory = new \Zotlabs\Storage\Directory('/', $auth);
 
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php
index 874445145..785dff394 100644
--- a/Zotlabs/Module/Filestorage.php
+++ b/Zotlabs/Module/Filestorage.php
@@ -130,7 +130,7 @@ class Filestorage extends \Zotlabs\Web\Controller {
 			$f = $r[0];
 			$channel = \App::get_channel();
 
-			$cloudpath = get_cloudpath($f) . (intval($f['is_dir']) ? '?f=&davguest=1' : '');
+			$cloudpath = get_cloudpath($f);
 			$parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
 
 			$aclselect_e = populate_acl($f, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage'));
diff --git a/util/hmessages.po b/util/hmessages.po
index b2f18043c..e0b54d7c1 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 5.2\n"
+"Project-Id-Version: 5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-17 00:04-0700\n"
+"POT-Creation-Date: 2017-03-24 00:04-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,8 +89,8 @@ msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:270
 #: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:922
 #: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Connedit.php:922
 #: ../../Zotlabs/Module/Settings/Channel.php:463
 #: ../../extend/addon/addon/cdav/cdav.php:277
 #: ../../extend/addon/addon/cdav/cdav.php:284
@@ -207,19 +207,19 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:784
-#: ../../Zotlabs/Module/Photos.php:1244
+#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:757
+#: ../../Zotlabs/Module/Photos.php:1213
 #: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:561
 #: ../../Zotlabs/Lib/Apps.php:639 ../../Zotlabs/Widget/Album.php:84
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1083
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1843
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1749
 msgid "Files"
 msgstr ""
 
@@ -233,9 +233,9 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:330
 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Webpages.php:243
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:925
+#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Layouts.php:185
 #: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Blocks.php:159
 #: ../../extend/addon/addon/cdav/include/widgets.php:127
 #: ../../extend/addon/addon/cdav/include/widgets.php:164
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
@@ -244,8 +244,8 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:332
 #: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321
 #: ../../Zotlabs/Module/Profile_photo.php:423
-#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368
 #: ../../Zotlabs/Module/Embedphotos.php:157 ../../Zotlabs/Widget/Album.php:97
 #: ../../extend/addon/addon/cdav/include/widgets.php:132
 #: ../../extend/addon/addon/cdav/include/widgets.php:168
@@ -258,15 +258,16 @@ msgstr ""
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 #: ../../Zotlabs/Module/Settings/Oauth.php:89
 #: ../../Zotlabs/Module/Settings/Oauth.php:115
+#: ../../Zotlabs/Lib/NativeWikiPage.php:528
 #: ../../Zotlabs/Widget/Wiki_page_history.php:22
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136
 #: ../../extend/addon/addon/rendezvous/rendezvous.php:172
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:158
 msgid "Name"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:172
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:159
 msgid "Type"
 msgstr ""
 
@@ -281,31 +282,29 @@ msgid "Last Modified"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:238
-#: ../../Zotlabs/Module/Editblock.php:114
 #: ../../Zotlabs/Module/Connections.php:296
 #: ../../Zotlabs/Module/Connections.php:316
 #: ../../Zotlabs/Module/Admin/Profs.php:154
 #: ../../Zotlabs/Module/Webpages.php:244
 #: ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Wiki.php:164
-#: ../../Zotlabs/Module/Wiki.php:280 ../../Zotlabs/Module/Blocks.php:160
-#: ../../Zotlabs/Module/Layouts.php:193
+#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Layouts.php:193
+#: ../../Zotlabs/Module/Wiki.php:164 ../../Zotlabs/Module/Wiki.php:275
+#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editblock.php:114
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
 #: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106
 #: ../../Zotlabs/Lib/Apps.php:357
 #: ../../extend/addon/addon/cdav/include/widgets.php:125
 #: ../../extend/addon/addon/cdav/include/widgets.php:161
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:149
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
+#: ../../include/channel.php:1042 ../../include/channel.php:1046
 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
-#: ../../include/menu.php:113 ../../include/channel.php:1044
-#: ../../include/channel.php:1048
+#: ../../include/menu.php:113
 msgid "Edit"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Profiles.php:803
-#: ../../Zotlabs/Module/Editblock.php:139
 #: ../../Zotlabs/Module/Connections.php:267
 #: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
@@ -313,14 +312,15 @@ msgstr ""
 #: ../../Zotlabs/Module/Webpages.php:246
 #: ../../Zotlabs/Module/Editlayout.php:138
 #: ../../Zotlabs/Module/Editwebpage.php:172 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Connedit.php:658 ../../Zotlabs/Module/Connedit.php:927
-#: ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:658
+#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Editblock.php:139
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1174
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../Zotlabs/Lib/Apps.php:358
+#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126
+#: ../../Zotlabs/Lib/Apps.php:358
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:864
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153
-#: ../../include/conversation.php:656
+#: ../../include/conversation.php:653
 msgid "Delete"
 msgstr ""
 
@@ -357,7 +357,7 @@ msgstr ""
 msgid "Drop files here to immediately upload"
 msgstr ""
 
-#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Web/WebServer.php:130 ../../Zotlabs/Module/Group.php:72
 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
 #: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Like.php:283
 #: ../../Zotlabs/Module/Subthread.php:62 ../../Zotlabs/Module/Profperm.php:28
@@ -368,14 +368,12 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../Zotlabs/Web/WebServer.php:128
+#: ../../Zotlabs/Web/WebServer.php:131
 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Chat.php:98
 #: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
-#: ../../Zotlabs/Module/Item.php:1037 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Page.php:35
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Profiles.php:198
+#: ../../Zotlabs/Module/Profiles.php:635 ../../Zotlabs/Module/Authtest.php:16
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Page.php:35
 #: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:29
 #: ../../Zotlabs/Module/Cover_photo.php:281
 #: ../../Zotlabs/Module/Cover_photo.php:294
@@ -388,31 +386,32 @@ msgstr ""
 #: ../../Zotlabs/Module/Editwebpage.php:126
 #: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78
 #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Filestorage.php:23
 #: ../../Zotlabs/Module/Filestorage.php:78
 #: ../../Zotlabs/Module/Filestorage.php:93
 #: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:215
-#: ../../Zotlabs/Module/Wiki.php:320 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:104
+#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Api.php:24
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
+#: ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Wiki.php:50
+#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Wiki.php:315
 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mood.php:116
-#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71
-#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Rate.php:113
+#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Mail.php:164
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
+#: ../../Zotlabs/Module/Item.php:1037 ../../Zotlabs/Module/Rate.php:113
 #: ../../Zotlabs/Module/Profile_photo.php:280
 #: ../../Zotlabs/Module/Profile_photo.php:293
 #: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Common.php:39
-#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29
-#: ../../Zotlabs/Module/Events.php:271
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Events.php:271
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Sharedwithme.php:11
 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Sources.php:74
 #: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245
 #: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Suggest.php:28
@@ -420,20 +419,20 @@ msgstr ""
 #: ../../Zotlabs/Module/Thing.php:335
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Profile.php:83
-#: ../../Zotlabs/Module/Profile.php:100 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
+#: ../../Zotlabs/Lib/Chatroom.php:137
 #: ../../extend/addon/addon/keepout/keepout.php:36
 #: ../../extend/addon/addon/pumpio/pumpio.php:40
 #: ../../extend/addon/addon/openid/Mod_Id.php:53
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:194
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:291
-#: ../../include/photos.php:28 ../../include/items.php:3360
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:196
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:292
+#: ../../include/photos.php:28 ../../include/items.php:3358
 #: ../../include/attach.php:144 ../../include/attach.php:191
 #: ../../include/attach.php:255 ../../include/attach.php:269
-#: ../../include/attach.php:276 ../../include/attach.php:343
-#: ../../include/attach.php:357 ../../include/attach.php:364
-#: ../../include/attach.php:441 ../../include/attach.php:908
-#: ../../include/attach.php:979 ../../include/attach.php:1137
+#: ../../include/attach.php:276 ../../include/attach.php:344
+#: ../../include/attach.php:358 ../../include/attach.php:365
+#: ../../include/attach.php:442 ../../include/attach.php:909
+#: ../../include/attach.php:983 ../../include/attach.php:1148
 msgid "Permission denied."
 msgstr ""
 
@@ -457,12 +456,12 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Profile.php:20 ../../include/channel.php:945
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Webpages.php:33
+#: ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editblock.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../include/channel.php:943
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -472,7 +471,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:32
 #: ../../extend/addon/addon/chess/chess.php:403
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:26
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:28
 msgid "You must be logged in to see this page."
 msgstr ""
 
@@ -489,33 +488,33 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Account_edit.php:74
 #: ../../Zotlabs/Module/Admin/Accounts.php:166
 #: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Site.php:268
+#: ../../Zotlabs/Module/Admin/Site.php:279
 #: ../../Zotlabs/Module/Admin/Plugins.php:438
 #: ../../Zotlabs/Module/Admin/Themes.php:158 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 #: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Wiki.php:168
+#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Photos.php:657
+#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062
+#: ../../Zotlabs/Module/Photos.php:1180
 #: ../../Zotlabs/Module/Import_items.php:122
-#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Mitem.php:243
-#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mail.php:413 ../../Zotlabs/Module/Rate.php:166
-#: ../../Zotlabs/Module/Appman.php:134 ../../Zotlabs/Module/Pdledit.php:74
-#: ../../Zotlabs/Module/Events.php:493 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149
+#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Invite.php:149
+#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Mail.php:413
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
+#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
 #: ../../Zotlabs/Module/Settings/Features.php:47
 #: ../../Zotlabs/Module/Settings/Oauth.php:87
 #: ../../Zotlabs/Module/Settings/Account.php:118
 #: ../../Zotlabs/Module/Settings/Display.php:203
 #: ../../Zotlabs/Module/Settings/Featured.php:50
-#: ../../Zotlabs/Module/Settings/Permcats.php:112
 #: ../../Zotlabs/Module/Settings/Tokens.php:168
 #: ../../Zotlabs/Module/Settings/Channel.php:476
+#: ../../Zotlabs/Module/Settings/Permcats.php:110
 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Import.php:507 ../../Zotlabs/Module/Photos.php:667
-#: ../../Zotlabs/Module/Photos.php:1053 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Photos.php:1211 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:731
+#: ../../Zotlabs/Module/Import.php:507 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:730
 #: ../../Zotlabs/Widget/Eventstools.php:16
 #: ../../extend/addon/addon/chords/Mod_Chords.php:60
 #: ../../extend/addon/addon/dwpost/dwpost.php:89
@@ -559,7 +558,7 @@ msgstr ""
 #: ../../extend/addon/addon/cdav/cdav.php:246
 #: ../../extend/addon/addon/likebanner/likebanner.php:57
 #: ../../extend/addon/addon/mailtest/mailtest.php:100
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
 #: ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:106
 msgid "Submit"
@@ -586,19 +585,19 @@ msgid "Bookmark this room"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:240
-#: ../../Zotlabs/Module/Mail.php:349 ../../include/conversation.php:1330
+#: ../../Zotlabs/Module/Mail.php:349 ../../include/conversation.php:1236
 msgid "Please enter a link URL:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:293
-#: ../../Zotlabs/Module/Mail.php:418 ../../Zotlabs/Lib/ThreadItem.php:743
-#: ../../include/conversation.php:1440
+#: ../../Zotlabs/Module/Mail.php:418 ../../Zotlabs/Lib/ThreadItem.php:742
+#: ../../include/conversation.php:1346
 msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editblock.php:116
-#: ../../Zotlabs/Module/Editwebpage.php:148 ../../Zotlabs/Module/Mail.php:287
-#: ../../Zotlabs/Module/Mail.php:412 ../../include/conversation.php:1295
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editwebpage.php:148
+#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:412
+#: ../../Zotlabs/Module/Editblock.php:116 ../../include/conversation.php:1201
 msgid "Insert web link"
 msgstr ""
 
@@ -619,9 +618,9 @@ msgid "Expiration of chats (minutes)"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:232 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011
 #: ../../Zotlabs/Module/Connedit.php:680 ../../Zotlabs/Module/Thing.php:313
-#: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:657
-#: ../../Zotlabs/Module/Photos.php:1042 ../../include/acl_selectors.php:218
+#: ../../Zotlabs/Module/Thing.php:363 ../../include/acl_selectors.php:218
 msgid "Permissions"
 msgstr ""
 
@@ -635,8 +634,8 @@ msgid "No chatrooms available"
 msgstr ""
 
 #: ../../Zotlabs/Module/Chat.php:253 ../../Zotlabs/Module/Profiles.php:834
-#: ../../Zotlabs/Module/Wiki.php:167 ../../Zotlabs/Module/Manage.php:143
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
+#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Wiki.php:167
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
 msgid "Create New"
 msgstr ""
 
@@ -771,7 +770,7 @@ msgid "yes"
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:253
-#: ../../Zotlabs/Module/Admin/Site.php:269
+#: ../../Zotlabs/Module/Admin/Site.php:280
 msgid "Registration"
 msgstr ""
 
@@ -780,7 +779,7 @@ msgid "Membership on this site is by invitation only."
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:162
-#: ../../boot.php:1671
+#: ../../boot.php:1587
 msgid "Register"
 msgstr ""
 
@@ -795,34 +794,30 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:184
-msgid "Unable to locate original post."
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:450
-msgid "Empty post discarded."
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:824
-msgid "Duplicate post suppressed."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:954
-msgid "System error. Post not saved."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1084
-msgid "Unable to obtain post information from database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1091
+#: ../../Zotlabs/Module/Impel.php:181
 #, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1098
+#: ../../Zotlabs/Module/Impel.php:184
 #, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+msgid "%s element installation failed"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
@@ -923,17 +918,17 @@ msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Admin/Site.php:226 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Admin/Site.php:237 ../../Zotlabs/Module/Menu.php:100
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Wiki.php:179
-#: ../../Zotlabs/Module/Connedit.php:399 ../../Zotlabs/Module/Connedit.php:783
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Photos.php:642 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:97
+#: ../../Zotlabs/Module/Wiki.php:179 ../../Zotlabs/Module/Connedit.php:399
+#: ../../Zotlabs/Module/Connedit.php:783 ../../Zotlabs/Module/Events.php:470
 #: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../Zotlabs/Module/Settings/Channel.php:294
-#: ../../Zotlabs/Module/Photos.php:652
 #: ../../extend/addon/addon/dwpost/dwpost.php:73
 #: ../../extend/addon/addon/dwpost/dwpost.php:85
 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
@@ -978,25 +973,25 @@ msgstr ""
 #: ../../extend/addon/addon/wppost/wppost.php:109
 #: ../../extend/addon/addon/xmpp/xmpp.php:53
 #: ../../extend/addon/addon/cdav/cdav.php:234
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1694
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1610
 msgid "No"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:681
-#: ../../Zotlabs/Module/Admin/Site.php:228 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Admin/Site.php:239 ../../Zotlabs/Module/Menu.php:100
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Wiki.php:179
-#: ../../Zotlabs/Module/Connedit.php:399 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Photos.php:642 ../../Zotlabs/Module/Mitem.php:162
 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
 #: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96
+#: ../../Zotlabs/Module/Wiki.php:179 ../../Zotlabs/Module/Connedit.php:399
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
 #: ../../Zotlabs/Module/Removeme.php:63
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../Zotlabs/Module/Settings/Channel.php:294
-#: ../../Zotlabs/Module/Photos.php:652
 #: ../../extend/addon/addon/dwpost/dwpost.php:73
 #: ../../extend/addon/addon/dwpost/dwpost.php:85
 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
@@ -1041,10 +1036,10 @@ msgstr ""
 #: ../../extend/addon/addon/wppost/wppost.php:109
 #: ../../extend/addon/addon/xmpp/xmpp.php:53
 #: ../../extend/addon/addon/cdav/cdav.php:234
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1694
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1610
 msgid "Yes"
 msgstr ""
 
@@ -1057,7 +1052,7 @@ msgid "View this profile"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1066
+#: ../../include/channel.php:1064
 msgid "Edit visibility"
 msgstr ""
 
@@ -1069,7 +1064,7 @@ msgstr ""
 msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1035
 msgid "Change profile photo"
 msgstr ""
 
@@ -1089,7 +1084,7 @@ msgstr ""
 msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1715
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1621
 msgid "Personal"
 msgstr ""
 
@@ -1323,7 +1318,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Profiles.php:804
 #: ../../Zotlabs/Module/Admin/Plugins.php:423
 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Wiki.php:270 ../../Zotlabs/Module/Wiki.php:295
+#: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290
 #: ../../Zotlabs/Module/Connedit.php:928
 #: ../../Zotlabs/Module/Settings/Oauth.php:88
 #: ../../Zotlabs/Module/Settings/Oauth.php:114
@@ -1331,18 +1326,18 @@ msgstr ""
 #: ../../extend/addon/addon/js_upload/js_upload.php:46
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:244
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
+#: ../../include/conversation.php:1300 ../../include/conversation.php:1349
 msgid "Cancel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1060
 msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105
-#: ../../include/channel.php:1044
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1042
+#: ../../include/nav.php:105
 msgid "Edit Profiles"
 msgstr ""
 
@@ -1350,7 +1345,7 @@ msgstr ""
 msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1733
 msgid "About"
 msgstr ""
 
@@ -1438,7 +1433,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Themes.php:72
 #: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35
 #: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89
-#: ../../include/items.php:3281
+#: ../../include/items.php:3279
 msgid "Item not found."
 msgstr ""
 
@@ -1482,7 +1477,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Security.php:86
 #: ../../Zotlabs/Module/Admin/Accounts.php:164
 #: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:266
+#: ../../Zotlabs/Module/Admin/Site.php:277
 #: ../../Zotlabs/Module/Admin/Plugins.php:341
 #: ../../Zotlabs/Module/Admin/Plugins.php:436
 #: ../../Zotlabs/Module/Admin/Themes.php:122
@@ -1522,24 +1517,130 @@ msgstr ""
 msgid "Repository version (dev)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editpost.php:24
-msgid "Item not found"
+#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Photos.php:490
+#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17
+#: ../../Zotlabs/Module/Display.php:22
+#: ../../Zotlabs/Module/Viewconnections.php:23
+msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Name"
+#: ../../Zotlabs/Module/Directory.php:245
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Directory.php:256
+msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1406
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Directory.php:258
+msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:138
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Directory.php:260
+msgid "Homepage: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1271
+msgid "Age:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1132
+#: ../../include/event.php:52 ../../include/event.php:84
+msgid "Location:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:320
+msgid "Description:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1287
+msgid "Hometown:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1295
+msgid "About:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
+#: ../../include/connections.php:110 ../../include/channel.php:1117
+#: ../../include/conversation.php:975
+msgid "Connect"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:329
+msgid "Public Forum:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:332
+msgid "Keywords: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:335
+msgid "Don't suggest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:337
+msgid "Common connections:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Global Directory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Local Directory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:391
+#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Zotlabs/Module/Connections.php:315
+#: ../../include/contact_widgets.php:23
+msgid "Find"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:392
+msgid "Finding:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "next page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "previous page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "Sort options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:400
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:401
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:402
+msgid "Oldest to Newest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:419
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
 #: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
@@ -1623,7 +1724,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:72
 #: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1724
+#: ../../include/conversation.php:1630
 msgid "New"
 msgstr ""
 
@@ -1745,12 +1846,6 @@ msgstr ""
 msgid "Connections search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:315
-#: ../../Zotlabs/Module/Directory.php:391
-#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
-msgid "Find"
-msgstr ""
-
 #: ../../Zotlabs/Module/Cover_photo.php:56
 #: ../../Zotlabs/Module/Profile_photo.php:61
 msgid "Image uploaded but image cropping failed."
@@ -1781,30 +1876,30 @@ msgstr ""
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4189
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4187
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4190
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4188
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4191
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4189
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4192
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4190
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4194
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4192
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1737
 msgid "cover photo"
 msgstr ""
 
@@ -2314,7 +2409,7 @@ msgid "Disallow Code"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1815
+#: ../../include/conversation.php:1721
 msgid "Channel"
 msgstr ""
 
@@ -2402,379 +2497,391 @@ msgstr ""
 msgid "Last known contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:133
+#: ../../Zotlabs/Module/Admin/Site.php:144
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2906
+#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2906
 msgid "Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:170
+#: ../../Zotlabs/Module/Admin/Site.php:181
 #: ../../Zotlabs/Module/Settings/Display.php:137
 #, php-format
 msgid "%s - (Incompatible)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:177
+#: ../../Zotlabs/Module/Admin/Site.php:188
 #: ../../Zotlabs/Module/Settings/Display.php:151
 msgid "mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:179
+#: ../../Zotlabs/Module/Admin/Site.php:190
 msgid "experimental"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:181
+#: ../../Zotlabs/Module/Admin/Site.php:192
 msgid "unsupported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:227
+#: ../../Zotlabs/Module/Admin/Site.php:238
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:233
+#: ../../Zotlabs/Module/Admin/Site.php:244
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:234
+#: ../../Zotlabs/Module/Admin/Site.php:245
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:235
+#: ../../Zotlabs/Module/Admin/Site.php:246
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:236
+#: ../../Zotlabs/Module/Admin/Site.php:247
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:247
+#: ../../Zotlabs/Module/Admin/Site.php:258
 msgid "Basic/Minimal Social Networking"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:248
+#: ../../Zotlabs/Module/Admin/Site.php:259
 msgid "Standard Configuration (default)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:249
+#: ../../Zotlabs/Module/Admin/Site.php:260
 msgid "Professional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Lib/Techlevels.php:10
+#: ../../Zotlabs/Module/Admin/Site.php:264 ../../Zotlabs/Lib/Techlevels.php:10
 msgid "Beginner/Basic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:254 ../../Zotlabs/Lib/Techlevels.php:11
+#: ../../Zotlabs/Module/Admin/Site.php:265 ../../Zotlabs/Lib/Techlevels.php:11
 msgid "Novice - not skilled but willing to learn"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Lib/Techlevels.php:12
+#: ../../Zotlabs/Module/Admin/Site.php:266 ../../Zotlabs/Lib/Techlevels.php:12
 msgid "Intermediate - somewhat comfortable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:256 ../../Zotlabs/Lib/Techlevels.php:13
+#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Lib/Techlevels.php:13
 msgid "Advanced - very comfortable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:257 ../../Zotlabs/Lib/Techlevels.php:14
+#: ../../Zotlabs/Module/Admin/Site.php:268 ../../Zotlabs/Lib/Techlevels.php:14
 msgid "Expert - I can write computer code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Lib/Techlevels.php:15
+#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Lib/Techlevels.php:15
 msgid "Wizard - I probably know more than you do"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Widget/Admin.php:22
+#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Widget/Admin.php:22
 msgid "Site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:270
+#: ../../Zotlabs/Module/Admin/Site.php:281
 msgid "File upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:271
+#: ../../Zotlabs/Module/Admin/Site.php:282
 msgid "Policies"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:272
+#: ../../Zotlabs/Module/Admin/Site.php:283
 #: ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../Zotlabs/Module/Admin/Site.php:287
 #: ../../extend/addon/addon/statusnet/statusnet.php:890
 msgid "Site name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:278
+#: ../../Zotlabs/Module/Admin/Site.php:289
 msgid "Server Configuration/Role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:280
+#: ../../Zotlabs/Module/Admin/Site.php:291
 msgid "Site default technical skill level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:280
+#: ../../Zotlabs/Module/Admin/Site.php:291
 msgid "Used to provide a member experience matched to technical comfort level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
+#: ../../Zotlabs/Module/Admin/Site.php:293
 msgid "Lock the technical skill level setting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
+#: ../../Zotlabs/Module/Admin/Site.php:293
 msgid "Members can set their own technical comfort level by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:284
+#: ../../Zotlabs/Module/Admin/Site.php:295
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:285
+#: ../../Zotlabs/Module/Admin/Site.php:296
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:285
+#: ../../Zotlabs/Module/Admin/Site.php:296
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Zotlabs/Module/Admin/Site.php:297
 #: ../../Zotlabs/Module/Siteinfo.php:23
 msgid "Site Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Zotlabs/Module/Admin/Site.php:297
 msgid ""
 "Publicly visible description of this site.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:287
+#: ../../Zotlabs/Module/Admin/Site.php:298
 msgid "System language"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:288
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid "System theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:288
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Zotlabs/Module/Admin/Site.php:300
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
+#: ../../Zotlabs/Module/Admin/Site.php:300
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:302
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:291
+#: ../../Zotlabs/Module/Admin/Site.php:302
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
+#: ../../Zotlabs/Module/Admin/Site.php:303
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
+#: ../../Zotlabs/Module/Admin/Site.php:304
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:294
+#: ../../Zotlabs/Module/Admin/Site.php:305
 msgid "Invitation only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:294
+#: ../../Zotlabs/Module/Admin/Site.php:305
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:295
+#: ../../Zotlabs/Module/Admin/Site.php:306
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:307
 msgid "Register text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
+#: ../../Zotlabs/Module/Admin/Site.php:307
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
+#: ../../Zotlabs/Module/Admin/Site.php:308
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
+#: ../../Zotlabs/Module/Admin/Site.php:308
 msgid ""
 "example: 'public' to show public stream, 'page/sys/home' to show a system "
 "webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:309
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
+#: ../../Zotlabs/Module/Admin/Site.php:309
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:310
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
+#: ../../Zotlabs/Module/Admin/Site.php:310
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:311
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
+#: ../../Zotlabs/Module/Admin/Site.php:311
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:301
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:301
+#: ../../Zotlabs/Module/Admin/Site.php:312
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:313
 msgid "Force publish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
+#: ../../Zotlabs/Module/Admin/Site.php:313
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:314
 msgid "Import Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
+#: ../../Zotlabs/Module/Admin/Site.php:314
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:315
 msgid "Login on Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
+#: ../../Zotlabs/Module/Admin/Site.php:315
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
+#: ../../Zotlabs/Module/Admin/Site.php:316
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:318
+msgid "Reply-to email address for system generated email."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:319
+msgid "Sender (From) email address for system generated email."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:320
+msgid "Name of email sender for system generated email."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Site.php:322
 msgid "Directory Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
+#: ../../Zotlabs/Module/Admin/Site.php:322
 msgid "Default directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
+#: ../../Zotlabs/Module/Admin/Site.php:324
 msgid "Proxy user"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
+#: ../../Zotlabs/Module/Admin/Site.php:325
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:326
 msgid "Network timeout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
+#: ../../Zotlabs/Module/Admin/Site.php:326
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:327
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
+#: ../../Zotlabs/Module/Admin/Site.php:327
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:328
 msgid "Deliveries per process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
+#: ../../Zotlabs/Module/Admin/Site.php:328
 msgid ""
 "Number of deliveries to attempt in a single operating system process. Adjust "
 "if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:329
 msgid "Poll interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
+#: ../../Zotlabs/Module/Admin/Site.php:329
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:330
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
+#: ../../Zotlabs/Module/Admin/Site.php:330
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:331
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
+#: ../../Zotlabs/Module/Admin/Site.php:331
 msgid "0 for no expiration of imported content"
 msgstr ""
 
@@ -2895,7 +3002,7 @@ msgid "Switch branch"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Photos.php:984
+#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Tagrm.php:137
 #: ../../extend/addon/addon/superblock/superblock.php:116
 msgid "Remove"
 msgstr ""
@@ -2942,28 +3049,28 @@ msgid "Export selected"
 msgstr ""
 
 #: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1889
+#: ../../include/conversation.php:1795
 msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Photos.php:1073
+#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Layouts.php:194
+#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Module/Blocks.php:161
 #: ../../extend/addon/addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1378
+#: ../../include/conversation.php:1284
 msgid "Share"
 msgstr ""
 
 #: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../Zotlabs/Module/Wiki.php:166 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Events.php:694
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
+#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153
 #: ../../include/page_widgets.php:42
 msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Events.php:478
-#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Lib/ThreadItem.php:740
-#: ../../include/conversation.php:1347 ../../include/page_widgets.php:43
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Photos.php:1063
+#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Lib/ThreadItem.php:739
+#: ../../include/conversation.php:1253 ../../include/page_widgets.php:43
 msgid "Preview"
 msgstr ""
 
@@ -2980,13 +3087,13 @@ msgid "Page Title"
 msgstr ""
 
 #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:191
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Blocks.php:157
 #: ../../include/page_widgets.php:47
 msgid "Created"
 msgstr ""
 
 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Blocks.php:158
 #: ../../include/page_widgets.php:48
 msgid "Edited"
 msgstr ""
@@ -3011,6 +3118,13 @@ msgstr ""
 msgid "Import complete."
 msgstr ""
 
+#: ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editblock.php:79
+#: ../../Zotlabs/Module/Editblock.php:95
+msgid "Item not found"
+msgstr ""
+
 #: ../../Zotlabs/Module/Editlayout.php:128
 #: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
 msgid "Layout Name"
@@ -3273,7 +3387,7 @@ msgid "Software"
 msgstr ""
 
 #: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:941 ../../include/conversation.php:1099
+#: ../../include/conversation.php:1005
 msgid "Ratings"
 msgstr ""
 
@@ -3281,6 +3395,2327 @@ msgstr ""
 msgid "Rate"
 msgstr ""
 
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2260
+msgid "Layouts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
+#: ../../include/help.php:55 ../../include/help.php:61
+#: ../../include/nav.php:174 ../../include/nav.php:288
+msgid "Help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:186
+msgid "Comanche page description language help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:190
+msgid "Layout Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:195
+msgid "Download PDL file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178
+msgid "Apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Apps.php:48
+msgid "Manage apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Apps.php:49
+msgid "Create new app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../extend/addon/addon/opensearch/opensearch.php:42
+msgid "$Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Set/edit permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Include all files and sub folders"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:161
+msgid "Return to file list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Copy/paste this code to attach file to a post"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Copy/paste this URL to link file from a web page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:166
+msgid "Share this file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:167
+msgid "Show URL to this file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filestorage.php:168
+msgid "Notify your contacts about this file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
+#: ../../include/conversation.php:1742
+msgid "Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117
+#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183
+msgctxt "acl"
+msgid "Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:344
+msgid "network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:354
+msgid "RSS"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3810
+msgid "Privacy group not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:45
+msgid "Invalid message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:78
+msgid "no results"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:93
+msgid "channel sync processed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:97
+msgid "queued"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:101
+msgid "posted"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:105
+msgid "accepted for delivery"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:109
+msgid "updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:112
+msgid "update ignored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:115
+msgid "permission denied"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:119
+msgid "recipient not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:122
+msgid "mail recalled"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:125
+msgid "duplicate mail received"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:128
+msgid "mail delivered"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:148
+#, php-format
+msgid "Delivery report for %1$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:151
+msgid "Options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:152
+msgid "Redeliver"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:605
+msgid "l, F j"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:660
+#: ../../include/text.php:1750
+msgid "Link to Source"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
+msgid "Edit Event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
+msgid "Create Event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Photos.php:911 ../../Zotlabs/Module/Events.php:689
+#: ../../Zotlabs/Module/Events.php:698
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
+msgid "Previous"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
+#: ../../Zotlabs/Module/Photos.php:920 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:264
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
+msgid "Next"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691
+#: ../../include/channel.php:1343
+msgid "Export"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2282
+msgid "Import"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:700
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
+msgid "Today"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:78
+msgid "Page owner information could not be retrieved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
+msgid "Album not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:103
+msgid "Delete Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:501
+msgid "No photos selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:550
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:591
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:594
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:636
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:640
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:641
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:642
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:643
+msgid "Caption (optional):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:644
+msgid "Description (optional):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:725
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:727
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290
+#: ../../Zotlabs/Module/Embedphotos.php:139 ../../Zotlabs/Widget/Album.php:78
+msgid "View Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:782
+#: ../../Zotlabs/Module/Embedphotos.php:155 ../../Zotlabs/Widget/Album.php:95
+msgid "Edit Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:832
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:834
+msgid "Photo not available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:892
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:893
+msgid "Use as cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:900
+msgid "Private Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:915
+msgid "View Full Size"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:997
+msgid "Edit photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:999
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1000
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1003
+msgid "Move photo to album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1004
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1005
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1008
+msgid "Caption"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1010
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1018
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1021
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:268
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:269
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:410
+#: ../../include/conversation.php:735
+msgid "Please wait"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
+#: ../../Zotlabs/Lib/ThreadItem.php:727
+msgid "This is you"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+msgctxt "title"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+msgctxt "title"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Agree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Disagree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Abstain"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Not attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Might attend"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
+#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
+#: ../../include/conversation.php:1834
+msgid "View all"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1246
+#: ../../include/conversation.php:1858
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:195
+#: ../../include/conversation.php:1861
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1205
+msgid "Photo Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1214
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1219
+msgid "Map"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:399
+msgctxt "noun"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:400
+msgctxt "noun"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:405
+#: ../../include/acl_selectors.php:220
+msgid "Close"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
+#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:525
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:57
+msgid "Nothing to import."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:69
+#: ../../Zotlabs/Module/Import.php:84
+msgid "Unable to download data from old server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:91
+msgid "Imported file is empty."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Import.php:111
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid "Use this form to import existing posts and content from an export file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:121
+#: ../../Zotlabs/Module/Import.php:495
+msgid "File to Upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:136
+#: ../../Zotlabs/Module/New_channel.php:121
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:223
+msgid "Channel Manager"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr ""
+
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
+msgid "Menu Item Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
+#: ../../Zotlabs/Module/Settings/Channel.php:510
+msgid "(click to open/close)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
+msgid "Link Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
+msgid "Link or Submenu Target"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
+msgid "Use magic-auth if available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
+msgid "Open link in new window"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Order in list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Higher numbers will sink to bottom of listing"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:165
+msgid "Submit and finish"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:166
+msgid "Submit and continue"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:174
+msgid "Menu:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:177
+msgid "Link Target"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Edit menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Edit element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Drop element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "New element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:186
+msgid "Edit this menu container"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:187
+msgid "Add menu element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:188
+msgid "Delete this menu item"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:189
+msgid "Edit this menu item"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:206
+msgid "Menu item not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:219
+msgid "Menu item deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:221
+msgid "Menu item could not be deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:228
+msgid "Edit Menu Element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:238
+msgid "Link text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ratings.php:70
+msgid "No ratings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ratings.php:98
+msgid "Rating: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Ratings.php:99
+msgid "Website: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Ratings.php:101
+msgid "Description: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Attach.php:13
+msgid "Item not available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:38
+msgid "No more system notifications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:42
+msgid "System Notifications"
+msgstr ""
+
+#: ../../Zotlabs/Module/Hcard.php:35 ../../Zotlabs/Module/Channel.php:47
+#: ../../Zotlabs/Module/Profile.php:43
+msgid "Posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Hcard.php:42 ../../Zotlabs/Module/Channel.php:54
+#: ../../Zotlabs/Module/Profile.php:50
+msgid "Only posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
+msgid "Authorize application connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:73
+msgid "Return to your app and insert this Security Code:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:83
+msgid "Please login to continue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:95
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:67
+msgid "Please join us on $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:77
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:82
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:86
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Invite.php:105
+msgid "You have no more invitations available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Send invitations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:137
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
+msgid "Your message:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "Please join my community on $Projectname."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "You will need to supply this invitation code:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:145
+msgid "or visit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:147
+msgid "3. Click [Connect]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:20
+msgid "About this site"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "Site Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1474
+msgid "Administrator"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Software and Project information"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "This site is powered by $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:30
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:32
+#, php-format
+msgid "Version %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:33
+msgid "Project homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Developer homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:140
+msgid "Create Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:141
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:142
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:30
+msgid "Profile Unavailable."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:44
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42
+msgid "Not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:68
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62
+msgid "Invalid channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:159
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146
+#: ../../include/conversation.php:1806
+msgid "Wikis"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:165
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
+msgid "Download"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:169
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
+msgid "Wiki name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:170
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
+msgid "Content type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:179
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
+msgid "Create a status post for this wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:204
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185
+msgid "Wiki not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:228
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210
+msgid "Rename page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:232
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214
+msgid "Error retrieving page content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:263
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
+msgid "Revision Comparison"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:264
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
+msgid "Revert"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:268
+msgid "Short description of your changes (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:275
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
+msgid "Source"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:283
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260
+msgid "New page name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:288
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1205
+msgid "Embed image from photo albums"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:289
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1299
+msgid "Embed an image from your albums"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:291
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1301 ../../include/conversation.php:1348
+msgid "OK"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:292
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1241
+msgid "Choose images to embed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:293
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
+#: ../../include/conversation.php:1242
+msgid "Choose an album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:294
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
+msgid "Choose a different album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:295
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1244
+msgid "Error getting album list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:296
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1245
+msgid "Error getting photo link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:297
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274
+#: ../../include/conversation.php:1246
+msgid "Error getting album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:365
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
+msgid "Error creating wiki. Invalid name."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:377
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
+msgid "Wiki created, but error creating Home page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:384
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
+msgid "Error creating wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:396
+msgid "Wiki delete permission denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:406
+msgid "Error deleting wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:432
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
+msgid "New page created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:551
+msgid "Cannot delete Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:615
+msgid "Current Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:615
+msgid "Selected Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:665
+msgid "You must be authenticated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:208
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
+#: ../../include/conversation.php:1015
+msgid "Poke"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr ""
+
+#: ../../Zotlabs/Module/Search.php:224
+#, php-format
+msgid "Items tagged with: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Search.php:226
+#, php-format
+msgid "Search results for: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:79
+msgid "Could not access contact record."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:109
+msgid "Could not locate selected profile."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:246
+msgid "Connection updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:248
+msgid "Failed to update connection record."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:298
+msgid "is now connected to"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:431
+msgid "Could not access address book record."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:479
+msgid "Refresh failed - channel is currently unavailable."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
+#: ../../Zotlabs/Module/Connedit.php:534
+msgid "Unable to set address book parameters."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:558
+msgid "Connection has been removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Lib/Apps.php:228
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:57
+#: ../../include/conversation.php:955 ../../include/nav.php:103
+msgid "View Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:601
+#, php-format
+msgid "View %s's profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:605
+msgid "Refresh Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:608
+msgid "Fetch updated permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:612
+msgid "Refresh Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:615
+msgid "Fetch updated photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:619
+msgid "Recent Activity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "View recent posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Block (or Unblock) all communications with this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:630
+msgid "This connection is blocked!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:634
+msgid "Unignore"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:637
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:638
+msgid "This connection is ignored!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:642
+msgid "Unarchive"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:642
+msgid "Archive"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:645
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:646
+msgid "This connection is archived!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:650
+msgid "Unhide"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:650
+msgid "Hide"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:653
+msgid "Hide or Unhide this connection from your other connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:654
+msgid "This connection is hidden!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:661
+msgid "Delete this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:669
+msgid "Fetch Vcard"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:672
+msgid "Fetch electronic calling card for this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:683
+msgid "Open Individual Permissions section by default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:706
+msgid "Affinity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:709
+msgid "Open Set Affinity section by default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
+msgid "Me"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Widget/Affinity.php:27
+msgid "Family"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Settings/Channel.php:62
+#: ../../Zotlabs/Module/Settings/Channel.php:66
+#: ../../Zotlabs/Module/Settings/Channel.php:67
+#: ../../Zotlabs/Module/Settings/Channel.php:70
+#: ../../Zotlabs/Module/Settings/Channel.php:81
+#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/channel.php:406
+#: ../../include/channel.php:407 ../../include/channel.php:414
+#: ../../include/selectors.php:123
+msgid "Friends"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:29
+msgid "Acquaintances"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:743
+msgid "Filter"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:746
+msgid "Open Custom Filter section by default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:783
+msgid "Approve this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:783
+msgid "Accept connection to allow communication"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:788
+msgid "Set Affinity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:791
+msgid "Set Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:794
+msgid "Set Affinity & Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:852
+msgid "none"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:855
+#: ../../Zotlabs/Widget/Settings_menu.php:107
+msgid "Connection Default Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:855 ../../include/items.php:3843
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:856
+msgid "Apply these permissions automatically"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:856
+msgid "Connection requests will be approved without your interaction"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:857
+msgid "Permission role"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:858
+msgid "Add permission role"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:864
+msgid "This connection's primary address is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:865
+msgid "Available locations:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:869
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:870
+msgid "Connection Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:872
+msgid "Slide to adjust your degree of friendship"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:873 ../../Zotlabs/Module/Rate.php:155
+#: ../../include/js_strings.php:20
+msgid "Rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:874
+msgid "Slide to adjust your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:880
+msgid "Optionally explain your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:877
+msgid "Custom Filter"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:878
+msgid "Only import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:879
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:879
+msgid "Do not import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:881
+msgid "This information is public!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:886
+msgid "Connection Pending Approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Settings/Tokens.php:163
+#: ../../Zotlabs/Module/Settings/Permcats.php:105
+msgid "inherited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:891
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:893
+#: ../../Zotlabs/Module/Settings/Tokens.php:160
+msgid "Their Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:894
+#: ../../Zotlabs/Module/Settings/Tokens.php:161
+#: ../../Zotlabs/Module/Settings/Permcats.php:103
+msgid "My Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:896
+#: ../../Zotlabs/Module/Settings/Tokens.php:166
+#: ../../Zotlabs/Module/Settings/Permcats.php:108
+msgid "Individual Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:897
+#: ../../Zotlabs/Module/Settings/Tokens.php:167
+#: ../../Zotlabs/Module/Settings/Permcats.php:109
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:898
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can change those settings here but they wont have "
+"any impact unless the inherited setting changes."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:899
+msgid "Last update:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:908
+msgid "Details"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:911
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
+msgid "Organisation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:912
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:929
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
+msgid "P.O. Box"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:930
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
+msgid "Additional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:931
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
+msgid "Street"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:932
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
+msgid "Locality"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:933
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
+msgid "Region"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:934
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
+msgid "ZIP Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:25
+msgid ""
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
+"\"register\">register as a new $Projectname member</a> to continue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:122
+msgid "channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47
+#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
+#: ../../include/conversation.php:116 ../../include/text.php:1928
+msgid "photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/conversation.php:144 ../../include/text.php:1934
+msgid "status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1145
+#: ../../include/conversation.php:119 ../../include/text.php:1931
+msgid "event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:160
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:163
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:423
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:425
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:427
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:429
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:431
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:433
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:538
+msgid "Action completed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:539
+msgid "Thank you."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please "
+"leave this page unless you are comfortable with and knowledgeable about how "
+"to correctly use this feature."
+msgstr ""
+
+#: ../../Zotlabs/Module/Subthread.php:118
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Subthread.php:120
+#, php-format
+msgid "%1$s stopped following %2$s's %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:256
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
+msgid "Mood"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:65
+msgid "Unable to lookup recipient."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:72
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:79
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:97
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:178
+msgid "Messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:213
+msgid "Message recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:269
+msgid "Requested channel is not in this network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:277
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
+msgid "To:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
+msgid "Subject:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
+#: ../../include/conversation.php:1296
+msgid "Attach file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:288
+msgid "Send"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
+#: ../../include/conversation.php:1341
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:375
+msgid "Delete message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:376
+msgid "Delivery report"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:377
+msgid "Recall message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:379
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:396
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:398
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:402
+msgid "Send Reply"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:407
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:113
+msgid "Block Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2258
+msgid "Blocks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:184
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:450
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:824
+msgid "Duplicate post suppressed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:954
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1084
+msgid "Unable to obtain post information from database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1091
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1098
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:156
+msgid "Website:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:159
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Rating (this information is public)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:161
+msgid "Optionally explain your rating (this information is public)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:226
+#: ../../include/photo/photo_driver.php:646
+msgid "Profile Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:196
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:298
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:422
+msgid "Use Photo for Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:422
+msgid "Upload Profile Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:423
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:182
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:194
+msgid "Use"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55
+msgid "App installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:48
+msgid "Malformed app."
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:111
+msgid "Embed code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Edit App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Create App"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Name of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:123
+msgid "Location (URL) of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:124 ../../Zotlabs/Module/Rbmark.php:101
+#: ../../Zotlabs/Module/Events.php:473
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:173
+msgid "Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "Photo icon URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:125
+msgid "80 x 80 pixels - optional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:126
+msgid "Categories (optional, comma separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:127
+msgid "Version ID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:128
+msgid "Price of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:129
+msgid "Location (URL) to purchase app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr ""
+
+#: ../../Zotlabs/Module/Chanview.php:134
+msgid "toggle full screen mode"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export Content"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:61
+msgid ""
+"Export your channel information and recent content to a JSON backup that can "
+"be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for "
+"this download to begin."
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:63
+msgid "Export your posts from a given year."
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:65
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:66
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
+"\">%2$s</a>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:67
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:68
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a href=\"%1$s\">"
+"%2$s</a> on any site containing your channel. For best results please import "
+"or restore these in date order (oldest first)."
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1312
+msgid "Title (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
+#, php-format
+msgid "Site Member (%s)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:68
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1614
+msgid "Password Reset"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Your new password is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid "click here to login"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:96
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:117
+#, php-format
+msgid "Your password has changed at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:131
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:132
+msgid "Email Address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:133
+msgid "Reset"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rbmark.php:94
+msgid "Select a bookmark folder"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rbmark.php:99
+msgid "Save Bookmark"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rbmark.php:100
+msgid "URL of bookmark"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rbmark.php:105
+msgid "Or enter new bookmark folder name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
+msgstr ""
+
+#: ../../Zotlabs/Module/Regmod.php:15
+msgid "Please login."
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:35
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:57
+msgid "Remove This Account"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "WARNING: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This action is permanent and can not be undone!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
+msgid "Please enter your password for verification:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:60
+msgid ""
+"Remove this account, all its channels and all its channel clones from the "
+"network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:60
+msgid ""
+"By default only the instances of the channels located on this hub will be "
+"removed from the network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings/Account.php:120
+msgid "Remove Account"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:21
+msgid "Layout updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
+msgid "Edit System Page Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:64
+msgid "Layout not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:70
+msgid "Module Name:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pdledit.php:71
+msgid "Layout Help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:111
+msgid "Profile Visibility Editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1340
+msgid "Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Click on a contact to add or remove."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:124
+msgid "Visible To"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:110
+msgid "Event can not end before it has started."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
+#: ../../Zotlabs/Module/Events.php:143
+msgid "Unable to generate preview."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:119
+msgid "Event title and start time are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+msgid "Event not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:460
+msgid "Edit event title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:460
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
+msgid "Event title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Category"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Category"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:466
+msgid "Edit start date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:466
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
+msgid "Start date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+msgid "Finish date and time are not known or not relevant"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Edit finish date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Finish date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+msgid "Adjust for viewer timezone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:471
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:473
+msgid "Edit Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Edit Location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1316
+msgid "Permission settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:489
+msgid "Timezone:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:494
+msgid "Advanced Options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:633
+msgid "Edit event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:635
+msgid "Delete event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:669
+msgid "calendar"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:695
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
+msgid "Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:696
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
+msgid "Week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:697
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
+msgid "Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:731
+msgid "Event removed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:734
+msgid "Failed to remove event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Service_limits.php:23
+msgid "No service class restrictions found."
+msgstr ""
+
 #: ../../Zotlabs/Module/Setup.php:176
 msgid "$Projectname Server - Setup"
 msgstr ""
@@ -3318,13 +5753,6 @@ msgstr ""
 msgid "System check"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:337
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:944
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
-msgid "Next"
-msgstr ""
-
 #: ../../Zotlabs/Module/Setup.php:265
 msgid "Check again"
 msgstr ""
@@ -3721,2166 +6149,6 @@ msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178
-msgid "Apps"
-msgstr ""
-
-#: ../../Zotlabs/Module/Apps.php:48
-msgid "Manage apps"
-msgstr ""
-
-#: ../../Zotlabs/Module/Apps.php:49
-msgid "Create new app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-#: ../../extend/addon/addon/opensearch/opensearch.php:42
-msgid "$Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Home.php:92
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:87
-msgid "Permission Denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:103
-msgid "File not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:146
-msgid "Edit file permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:159
-msgid "Set/edit permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Include all files and sub folders"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Return to file list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Copy/paste this code to attach file to a post"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Copy/paste this URL to link file from a web page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:166
-msgid "Share this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:167
-msgid "Show URL to this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:168
-msgid "Notify your contacts about this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1836
-msgid "Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117
-#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183
-msgctxt "acl"
-msgid "Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Acl.php:344
-msgid "network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Acl.php:354
-msgid "RSS"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3812
-msgid "Privacy group not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:45
-msgid "Invalid message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "no results"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "channel sync processed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "queued"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:101
-msgid "posted"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:105
-msgid "accepted for delivery"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:109
-msgid "updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:112
-msgid "update ignored"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:115
-msgid "permission denied"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:119
-msgid "recipient not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:122
-msgid "mail recalled"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:125
-msgid "duplicate mail received"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:128
-msgid "mail delivered"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:148
-#, php-format
-msgid "Delivery report for %1$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:151
-msgid "Options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:152
-msgid "Redeliver"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:605
-msgid "l, F j"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:660
-#: ../../include/text.php:1750
-msgid "Link to Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
-msgid "Edit Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
-msgid "Create Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
-#: ../../Zotlabs/Module/Photos.php:935
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
-msgid "Previous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691
-#: ../../include/channel.php:1365
-msgid "Export"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2282
-msgid "Import"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:700
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
-msgid "Today"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:30
-msgid "Profile Unavailable."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:44
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40
-msgid "Not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:68
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60
-msgid "Invalid channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:159
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144
-#: ../../include/conversation.php:1900
-msgid "Wikis"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:165
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150
-msgid "Download"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:169
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
-msgid "Wiki name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:170
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
-msgid "Content type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:179
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164
-msgid "Create a status post for this wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:204
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183
-msgid "Wiki not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:228
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208
-msgid "Rename page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:232
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212
-msgid "Error retrieving page content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:268
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241
-msgid "Revision Comparison"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:269
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
-msgid "Revert"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:273
-msgid "Short description of your changes (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:280
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251
-msgid "Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:288
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259
-msgid "New page name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:293
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264
-#: ../../include/conversation.php:1299
-msgid "Embed image from photo albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:294
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1393
-msgid "Embed an image from your albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:296
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
-#: ../../include/conversation.php:1395 ../../include/conversation.php:1442
-msgid "OK"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:297
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1335
-msgid "Choose images to embed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:298
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1336
-msgid "Choose an album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:299
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
-msgid "Choose a different album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:300
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
-#: ../../include/conversation.php:1338
-msgid "Error getting album list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:301
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1339
-msgid "Error getting photo link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:302
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1340
-msgid "Error getting album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:369
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
-msgid "Error creating wiki. Invalid name."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:381
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
-msgid "Wiki created, but error creating Home page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:388
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
-msgid "Error creating wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:400
-msgid "Wiki delete permission denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:410
-msgid "Error deleting wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:436
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
-msgid "New page created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:555
-msgid "Cannot delete Home"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:619
-msgid "Current Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:619
-msgid "Selected Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:669
-msgid "You must be authenticated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:57
-msgid "Nothing to import."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:69
-#: ../../Zotlabs/Module/Import.php:84
-msgid "Unable to download data from old server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:91
-msgid "Imported file is empty."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:88
-#: ../../Zotlabs/Module/Import.php:111
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:104
-msgid "Import completed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "Import Items"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:120
-msgid "Use this form to import existing posts and content from an export file."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:121
-#: ../../Zotlabs/Module/Import.php:495
-msgid "File to Upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:136
-#: ../../Zotlabs/Module/New_channel.php:121
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:223
-msgid "Channel Manager"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr ""
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:79
-msgid "Could not access contact record."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:109
-msgid "Could not locate selected profile."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:246
-msgid "Connection updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:248
-msgid "Failed to update connection record."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:298
-msgid "is now connected to"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:431
-msgid "Could not access address book record."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:479
-msgid "Refresh failed - channel is currently unavailable."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
-#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
-#: ../../Zotlabs/Module/Connedit.php:534
-msgid "Unable to set address book parameters."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:558
-msgid "Connection has been removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Lib/Apps.php:228
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:936 ../../include/conversation.php:1049
-#: ../../include/nav.php:103
-msgid "View Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:601
-#, php-format
-msgid "View %s's profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:605
-msgid "Refresh Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:608
-msgid "Fetch updated permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:612
-msgid "Refresh Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:615
-msgid "Fetch updated photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:619
-msgid "Recent Activity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:622
-msgid "View recent posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Block (or Unblock) all communications with this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:630
-msgid "This connection is blocked!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:634
-msgid "Unignore"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Ignore (or Unignore) all inbound communications from this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:638
-msgid "This connection is ignored!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:642
-msgid "Unarchive"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:642
-msgid "Archive"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:646
-msgid "This connection is archived!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:650
-msgid "Unhide"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:650
-msgid "Hide"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:653
-msgid "Hide or Unhide this connection from your other connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:654
-msgid "This connection is hidden!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:661
-msgid "Delete this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:669
-msgid "Fetch Vcard"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:672
-msgid "Fetch electronic calling card for this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:683
-msgid "Open Individual Permissions section by default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:706
-msgid "Affinity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:709
-msgid "Open Set Affinity section by default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
-msgid "Me"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Widget/Affinity.php:27
-msgid "Family"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:715
-#: ../../Zotlabs/Module/Settings/Channel.php:62
-#: ../../Zotlabs/Module/Settings/Channel.php:66
-#: ../../Zotlabs/Module/Settings/Channel.php:67
-#: ../../Zotlabs/Module/Settings/Channel.php:70
-#: ../../Zotlabs/Module/Settings/Channel.php:81
-#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123
-#: ../../include/channel.php:408 ../../include/channel.php:409
-#: ../../include/channel.php:416
-msgid "Friends"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:29
-msgid "Acquaintances"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:743
-msgid "Filter"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:746
-msgid "Open Custom Filter section by default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:783
-msgid "Approve this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:783
-msgid "Accept connection to allow communication"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:788
-msgid "Set Affinity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:791
-msgid "Set Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:794
-msgid "Set Affinity & Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:852
-msgid "none"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:855
-#: ../../Zotlabs/Widget/Settings_menu.php:107
-msgid "Connection Default Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:855 ../../include/items.php:3845
-#, php-format
-msgid "Connection: %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:856
-msgid "Apply these permissions automatically"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:856
-msgid "Connection requests will be approved without your interaction"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:857
-msgid "Permission role"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:858
-msgid "Add permission role"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:864
-msgid "This connection's primary address is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:865
-msgid "Available locations:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:869
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:870
-msgid "Connection Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:872
-msgid "Slide to adjust your degree of friendship"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:873 ../../Zotlabs/Module/Rate.php:155
-#: ../../include/js_strings.php:20
-msgid "Rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:874
-msgid "Slide to adjust your rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:880
-msgid "Optionally explain your rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:877
-msgid "Custom Filter"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:878
-msgid "Only import posts with this text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:879
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:879
-msgid "Do not import posts with this text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:881
-msgid "This information is public!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:886
-msgid "Connection Pending Approval"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:889
-#: ../../Zotlabs/Module/Settings/Permcats.php:107
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-msgid "inherited"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:891
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:893
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-msgid "Their Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:894
-#: ../../Zotlabs/Module/Settings/Permcats.php:105
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-msgid "My Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:896
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-msgid "Individual Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:897
-#: ../../Zotlabs/Module/Settings/Permcats.php:111
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can <strong>not</strong> change those settings here."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:898
-msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can change those settings here but they wont have "
-"any impact unless the inherited setting changes."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:899
-msgid "Last update:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:908
-msgid "Details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:911
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
-msgid "Organisation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:912
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
-#: ../../include/page_widgets.php:46
-msgid "Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:929
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
-msgid "P.O. Box"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:930
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
-msgid "Additional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:931
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
-msgid "Street"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:932
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
-msgid "Locality"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:933
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
-msgid "Region"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:934
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
-msgid "ZIP Code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
-msgid "Menu Item Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:510
-msgid "(click to open/close)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
-msgid "Link Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
-msgid "Link or Submenu Target"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
-msgid "Use magic-auth if available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
-msgid "Open link in new window"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Order in list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Higher numbers will sink to bottom of listing"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:165
-msgid "Submit and finish"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:166
-msgid "Submit and continue"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:174
-msgid "Menu:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:177
-msgid "Link Target"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Edit menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Edit element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Drop element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "New element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:186
-msgid "Edit this menu container"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:187
-msgid "Add menu element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:188
-msgid "Delete this menu item"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:189
-msgid "Edit this menu item"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:206
-msgid "Menu item not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:219
-msgid "Menu item deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:221
-msgid "Menu item could not be deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:228
-msgid "Edit Menu Element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:238
-msgid "Link text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:22
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../Zotlabs/Module/Photos.php:508
-msgid "Public access denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Attach.php:13
-msgid "Item not available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:38
-msgid "No more system notifications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:42
-msgid "System Notifications"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
-msgid "webpage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
-msgid "block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
-msgid "layout"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:181
-#, php-format
-msgid "%s element installed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:184
-#, php-format
-msgid "%s element installation failed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
-msgid "Authorize application connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:73
-msgid "Return to your app and insert this Security Code:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:83
-msgid "Please login to continue."
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:95
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:67
-msgid "Please join us on $Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:77
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:82
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:86
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Invite.php:105
-msgid "You have no more invitations available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Send invitations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:137
-msgid "Enter email addresses, one per line:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
-msgid "Your message:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "Please join my community on $Projectname."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "You will need to supply this invitation code:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:145
-msgid "or visit"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:147
-msgid "3. Click [Connect]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:20
-msgid "About this site"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "Site Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1474
-msgid "Administrator"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Software and Project information"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "This site is powered by $Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:30
-msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:32
-#, php-format
-msgid "Version %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:33
-msgid "Project homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Developer homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:140
-msgid "Create Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:141
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:142
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:208
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
-#: ../../include/conversation.php:942 ../../include/conversation.php:1109
-msgid "Poke"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr ""
-
-#: ../../Zotlabs/Module/Search.php:224
-#, php-format
-msgid "Items tagged with: %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Search.php:226
-#, php-format
-msgid "Search results for: %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:19
-msgid "Like/Dislike"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:24
-msgid "This action is restricted to members."
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:25
-msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
-"\"register\">register as a new $Projectname member</a> to continue."
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
-msgid "Invalid request."
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
-msgid "channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:146
-msgid "thing"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:192
-msgid "Channel unavailable."
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:240
-msgid "Previous action reversed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47
-#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
-#: ../../include/conversation.php:120 ../../include/text.php:1928
-msgid "photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:148 ../../include/text.php:1934
-msgid "status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1145
-#: ../../include/conversation.php:123 ../../include/text.php:1931
-msgid "event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:423
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:425
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:427
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:429
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:431
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:433
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:538
-msgid "Action completed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:539
-msgid "Thank you."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please "
-"leave this page unless you are comfortable with and knowledgeable about how "
-"to correctly use this feature."
-msgstr ""
-
-#: ../../Zotlabs/Module/Subthread.php:118
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Subthread.php:120
-#, php-format
-msgid "%1$s stopped following %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234
-msgid "Mood"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:65
-msgid "Unable to lookup recipient."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:72
-msgid "Unable to communicate with requested channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:79
-msgid "Cannot verify requested channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:97
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Messages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:213
-msgid "Message recalled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:226
-msgid "Conversation removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:269
-msgid "Requested channel is not in this network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:277
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
-msgid "To:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
-msgid "Subject:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
-#: ../../include/conversation.php:1390
-msgid "Attach file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:288
-msgid "Send"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
-#: ../../include/conversation.php:1435
-msgid "Set expiration date"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:375
-msgid "Delete message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:376
-msgid "Delivery report"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:377
-msgid "Recall message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:379
-msgid "Message has been recalled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:396
-msgid "Delete Conversation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:398
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:402
-msgid "Send Reply"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:407
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2258
-msgid "Blocks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2260
-msgid "Layouts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/help.php:55 ../../include/help.php:61
-#: ../../include/nav.php:174 ../../include/nav.php:288
-msgid "Help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:186
-msgid "Comanche page description language help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:190
-msgid "Layout Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:195
-msgid "Download PDL file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:156
-msgid "Website:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:159
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Rating (this information is public)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:161
-msgid "Optionally explain your rating (this information is public)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:115
-#: ../../Zotlabs/Module/Profile_photo.php:226
-#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729
-#: ../../include/photo/photo_driver.php:646
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:196
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:298
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:422
-msgid "Use Photo for Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:422
-msgid "Upload Profile Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:423
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:182
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:194
-msgid "Use"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:55
-msgid "App installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:48
-msgid "Malformed app."
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:111
-msgid "Embed code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:117
-msgid "Edit App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:117
-msgid "Create App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Name of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:123
-msgid "Location (URL) of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:124 ../../Zotlabs/Module/Rbmark.php:101
-#: ../../Zotlabs/Module/Events.php:473
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:173
-msgid "Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:125
-msgid "Photo icon URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:125
-msgid "80 x 80 pixels - optional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:126
-msgid "Categories (optional, comma separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:127
-msgid "Version ID"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:128
-msgid "Price of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:129
-msgid "Location (URL) to purchase app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr ""
-
-#: ../../Zotlabs/Module/Chanview.php:134
-msgid "toggle full screen mode"
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export Content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:61
-msgid ""
-"Export your channel information and recent content to a JSON backup that can "
-"be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for "
-"this download to begin."
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:63
-msgid "Export your posts from a given year."
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:65
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:66
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:67
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:68
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a href=\"%1$s\">"
-"%2$s</a> on any site containing your channel. For best results please import "
-"or restore these in date order (oldest first)."
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:245
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Gender: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Status: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:260
-msgid "Homepage: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293
-msgid "Age:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/channel.php:1134
-msgid "Location:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:320
-msgid "Description:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309
-msgid "Hometown:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317
-msgid "About:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
-#: ../../Zotlabs/Widget/Suggestions.php:44 ../../Zotlabs/Widget/Follow.php:32
-#: ../../include/connections.php:110 ../../include/conversation.php:938
-#: ../../include/conversation.php:1069 ../../include/channel.php:1119
-msgid "Connect"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Public Forum:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Keywords: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:335
-msgid "Don't suggest"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:337
-msgid "Common connections:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Global Directory"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Local Directory"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:392
-msgid "Finding:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "next page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "previous page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Sort options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Alphabetic"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:400
-msgid "Reverse Alphabetic"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:401
-msgid "Newest to Oldest"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:402
-msgid "Oldest to Newest"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:419
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:108
-#, php-format
-msgid "Site Member (%s)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:44 ../../Zotlabs/Module/Lostpass.php:49
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:68
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1698
-msgid "Password Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Your new password is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid "click here to login"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:96
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:117
-#, php-format
-msgid "Your password has changed at %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Forgot your Password?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:131
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:132
-msgid "Email Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:133
-msgid "Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rbmark.php:94
-msgid "Select a bookmark folder"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rbmark.php:99
-msgid "Save Bookmark"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rbmark.php:100
-msgid "URL of bookmark"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rbmark.php:105
-msgid "Or enter new bookmark folder name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
-msgstr ""
-
-#: ../../Zotlabs/Module/Regmod.php:15
-msgid "Please login."
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:35
-msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:57
-msgid "Remove This Account"
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "WARNING: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This action is permanent and can not be undone!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Removeme.php:62
-msgid "Please enter your password for verification:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:60
-msgid ""
-"Remove this account, all its channels and all its channel clones from the "
-"network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:60
-msgid ""
-"By default only the instances of the channels located on this hub will be "
-"removed from the network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Removeaccount.php:61
-#: ../../Zotlabs/Module/Settings/Account.php:120
-msgid "Remove Account"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:21
-msgid "Layout updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
-msgid "Edit System Page Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:64
-msgid "Layout not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:70
-msgid "Module Name:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:71
-msgid "Layout Help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362
-msgid "Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Click on a contact to add or remove."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:124
-msgid "Visible To"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:110
-msgid "Event can not end before it has started."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
-#: ../../Zotlabs/Module/Events.php:143
-msgid "Unable to generate preview."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:119
-msgid "Event title and start time are required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
-msgid "Event not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:460
-msgid "Edit event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:460
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Edit Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:463
-msgid "Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:466
-msgid "Edit start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:466
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
-msgid "Finish date and time are not known or not relevant"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:469
-msgid "Edit finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:469
-msgid "Finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:471
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:473
-msgid "Edit Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:475
-msgid "Edit Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1410
-msgid "Permission settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:489
-msgid "Timezone:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:494
-msgid "Advanced Options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:633
-msgid "Edit event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:635
-msgid "Delete event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:669
-msgid "calendar"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:695
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
-msgid "Month"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:696
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
-msgid "Week"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:697
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
-msgid "Day"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:731
-msgid "Event removed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:734
-msgid "Failed to remove event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Service_limits.php:23
-msgid "No service class restrictions found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Hcard.php:35 ../../Zotlabs/Module/Channel.php:47
-#: ../../Zotlabs/Module/Profile.php:43
-msgid "Posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Hcard.php:42 ../../Zotlabs/Module/Channel.php:54
-#: ../../Zotlabs/Module/Profile.php:50
-msgid "Only posts"
-msgstr ""
-
 #: ../../Zotlabs/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
@@ -6026,15 +6294,15 @@ msgstr ""
 msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1962
 msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1963
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1964
 msgid "Authenticate"
 msgstr ""
 
@@ -6324,24 +6592,6 @@ msgstr ""
 msgid "Feature/Addon Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings/Permcats.php:37
-msgid "Permission category saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:63
-msgid ""
-"Use this form to create permission rules for various classes of people or "
-"connections."
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:96
-msgid "Permission Categories"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings/Permcats.php:104
-msgid "Permission Name"
-msgstr ""
-
 #: ../../Zotlabs/Module/Settings/Tokens.php:31
 #, php-format
 msgid "This channel is limited to %d tokens"
@@ -6454,7 +6704,7 @@ msgid "Basic Settings"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Channel.php:482
-#: ../../include/channel.php:1250
+#: ../../include/channel.php:1228
 msgid "Full Name:"
 msgstr ""
 
@@ -6763,6 +7013,24 @@ msgstr ""
 msgid "Start calendar week on Monday"
 msgstr ""
 
+#: ../../Zotlabs/Module/Settings/Permcats.php:37
+msgid "Permission category saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:61
+msgid ""
+"Use this form to create permission rules for various classes of people or "
+"connections."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:94
+msgid "Permission Categories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Permcats.php:102
+msgid "Permission Name"
+msgstr ""
+
 #: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
 msgid "Tag removed"
 msgstr ""
@@ -6836,7 +7104,7 @@ msgstr ""
 msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
 #: ../../include/text.php:1936
 msgid "comment"
 msgstr ""
@@ -6929,283 +7197,6 @@ msgid ""
 "only once and leave this page open until finished."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:82
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:129
-msgid "Album not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:112
-msgid "Delete Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:133
-msgid ""
-"Multiple storage folders exist with this album name, but within different "
-"directories. Please remove the desired folder or folders using the Files "
-"manager"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1054
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:519
-msgid "No photos selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:568
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:607
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:610
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:646
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:650
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:651
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:652
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:653
-msgid "Caption (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:654
-msgid "Description (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:685
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:729
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:752
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:754
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335
-#: ../../Zotlabs/Module/Embedphotos.php:139 ../../Zotlabs/Widget/Album.php:78
-msgid "View Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:809
-#: ../../Zotlabs/Module/Embedphotos.php:155 ../../Zotlabs/Widget/Album.php:95
-msgid "Edit Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:856
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:858
-msgid "Photo not available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:916
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:917
-msgid "Use as cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:924
-msgid "Private Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:939
-msgid "View Full Size"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1028
-msgid "Edit photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1030
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1031
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Move photo to album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "Caption"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1049
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1052
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:268
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Lib/ThreadItem.php:269
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:411
-#: ../../include/conversation.php:738
-msgid "Please wait"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
-#: ../../Zotlabs/Lib/ThreadItem.php:728
-msgid "This is you"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210
-#: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Agree"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Disagree"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Abstain"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Attending"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Not attending"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Might attend"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1139
-#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
-#: ../../include/conversation.php:1928
-msgid "View all"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1952
-#: ../../include/channel.php:1268
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:195
-#: ../../include/conversation.php:1955
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1236
-msgid "Photo Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1245
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1250
-msgid "Map"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:400
-msgctxt "noun"
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/ThreadItem.php:401
-msgctxt "noun"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:406
-#: ../../include/acl_selectors.php:220
-msgid "Close"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1341
-msgid "View Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365
-#: ../../Zotlabs/Module/Photos.php:1366
-msgid "Recent Photos"
-msgstr ""
-
 #: ../../Zotlabs/Module/Xchan.php:10
 msgid "Xchan Lookup"
 msgstr ""
@@ -7520,11 +7511,11 @@ msgstr ""
 msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:663
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:660
 msgid "Private Message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:655
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:652
 msgid "Select"
 msgstr ""
 
@@ -7572,11 +7563,11 @@ msgstr ""
 msgid "starred"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:670
+#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:667
 msgid "Message signature validated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:671
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
 msgid "Message signature incorrect"
 msgstr ""
 
@@ -7632,87 +7623,166 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:717
+#: ../../Zotlabs/Lib/ThreadItem.php:349 ../../include/conversation.php:714
 #, php-format
 msgid "from %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:720
+#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:717
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:721
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:718
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
+#: ../../Zotlabs/Lib/ThreadItem.php:359
 msgid "Attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:361
+#: ../../Zotlabs/Lib/ThreadItem.php:360
 msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:362
+#: ../../Zotlabs/Lib/ThreadItem.php:361
 msgid "Vote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:363
+#: ../../Zotlabs/Lib/ThreadItem.php:362
 msgid "Voting Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:383
+#: ../../Zotlabs/Lib/ThreadItem.php:382
 #: ../../extend/addon/addon/bookmarker/bookmarker.php:38
 msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:384
+#: ../../Zotlabs/Lib/ThreadItem.php:383
 msgid "Add to Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:393
+#: ../../Zotlabs/Lib/ThreadItem.php:392
 msgid "Mark all seen"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:442 ../../include/js_strings.php:7
+#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7
 #, php-format
 msgid "%s show all"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1385
+#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1291
 msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1386
+#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1292
 msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1387
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1293
 msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1388
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1294
 msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1389
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1295
 msgid "Code"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:737
+#: ../../Zotlabs/Lib/ThreadItem.php:736
 msgid "Image"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:738
+#: ../../Zotlabs/Lib/ThreadItem.php:737
 msgid "Insert Link"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:739
+#: ../../Zotlabs/Lib/ThreadItem.php:738
 msgid "Video"
 msgstr ""
 
+#: ../../Zotlabs/Lib/NativeWikiPage.php:31
+#: ../../Zotlabs/Lib/NativeWikiPage.php:72
+msgid "(No Title)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:86
+msgid "Wiki page create failed."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:99
+msgid "Wiki not found."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:110
+msgid "Destination name already exists"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:136
+#: ../../Zotlabs/Lib/NativeWikiPage.php:331
+msgid "Page not found"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:166
+msgid "Error reading page content"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:322
+#: ../../Zotlabs/Lib/NativeWikiPage.php:370
+#: ../../Zotlabs/Lib/NativeWikiPage.php:437
+#: ../../Zotlabs/Lib/NativeWikiPage.php:478
+msgid "Error reading wiki"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:358
+msgid "Page update failed."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:392
+msgid "Nothing deleted"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:458
+msgid "Compare: object not found."
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:464
+msgid "Page updated"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:467
+msgid "Untitled"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:473
+msgid "Wiki resource_id required for git commit"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:529
+#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+msgctxt "wiki_history"
+msgid "Message"
+msgstr ""
+
+#: ../../Zotlabs/Lib/NativeWikiPage.php:567
+#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
+#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../Zotlabs/Lib/DB_Upgrade.php:79
+#, php-format
+msgid "Update Error at %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/DB_Upgrade.php:85
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr ""
+
 #: ../../Zotlabs/Lib/Permcat.php:58
 msgctxt "permcat"
 msgid "default"
@@ -7763,7 +7833,7 @@ msgid "Suggest Channels"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130
-#: ../../boot.php:1690
+#: ../../boot.php:1606
 msgid "Login"
 msgstr ""
 
@@ -7771,7 +7841,7 @@ msgstr ""
 msgid "Grid"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1903
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1809
 #: ../../include/features.php:99
 msgid "Wiki"
 msgstr ""
@@ -7780,8 +7850,8 @@ msgstr ""
 msgid "Channel Home"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1853
-#: ../../include/conversation.php:1856 ../../include/nav.php:218
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1759
+#: ../../include/conversation.php:1762 ../../include/nav.php:218
 msgid "Events"
 msgstr ""
 
@@ -7849,97 +7919,111 @@ msgstr ""
 msgid "Remove from app-tray"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:31
-#: ../../Zotlabs/Lib/NativeWikiPage.php:72
-msgid "(No Title)"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:86
-msgid "Wiki page create failed."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:99
-msgid "Wiki not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:110
-msgid "Destination name already exists"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:136
-#: ../../Zotlabs/Lib/NativeWikiPage.php:331
-msgid "Page not found"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:166
-msgid "Error reading page content"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:322
-#: ../../Zotlabs/Lib/NativeWikiPage.php:370
-#: ../../Zotlabs/Lib/NativeWikiPage.php:437
-#: ../../Zotlabs/Lib/NativeWikiPage.php:478
-msgid "Error reading wiki"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:358
-msgid "Page update failed."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:392
-msgid "Nothing deleted"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:458
-msgid "Compare: object not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:464
-msgid "Page updated"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:467
-msgid "Untitled"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:473
-msgid "Wiki resource_id required for git commit"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWikiPage.php:544
-#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579
-#: ../../include/bbcode.php:610 ../../include/bbcode.php:756
-msgid "Different viewers will see this text differently"
-msgstr ""
-
 #: ../../Zotlabs/Lib/NativeWiki.php:128
 msgid "Wiki files deleted successfully"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Notes.php:16
-msgid "Notes"
+#: ../../Zotlabs/Widget/Activity.php:50
+msgctxt "widget"
+msgid "Activity"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+msgid "Member registrations waiting for confirmation"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:29
+msgid "Inspect queue"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:31
+msgid "DB updates"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:233
+msgid "Admin"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Admin.php:56
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Affinity.php:49
+msgid "Refresh"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Appcategories.php:39
+#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/taxonomy.php:188
+#: ../../include/taxonomy.php:270 ../../include/contact_widgets.php:91
+msgid "Categories"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Appcategories.php:42 ../../Zotlabs/Widget/Filer.php:31
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Archive.php:43
+msgid "Archives"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+msgid "Bookmarked Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../include/conversation.php:1772 ../../include/conversation.php:1775
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Chatroom_list.php:20
+msgid "Overview"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Chatroom_members.php:11
+msgid "Chat Members"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Zotlabs/Widget/Conversations.php:29
+msgid "Conversations"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:21
+msgid "Received Messages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:25
+msgid "Sent Messages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:39
+msgid "No messages."
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:57
+msgid "Delete conversation"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Cover_photo.php:54
 msgid "Click to show more"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Tagcloud.php:25
-#: ../../Zotlabs/Widget/Appcategories.php:39 ../../include/taxonomy.php:188
-#: ../../include/taxonomy.php:270 ../../include/contact_widgets.php:91
-msgid "Categories"
+#: ../../Zotlabs/Widget/Eventstools.php:13
+msgid "Events Tools"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Photo_rand.php:58 ../../Zotlabs/Widget/Photo.php:48
-msgid "photo/image"
+#: ../../Zotlabs/Widget/Eventstools.php:14
+msgid "Export Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Suggestions.php:51
-msgid "Suggestions"
+#: ../../Zotlabs/Widget/Eventstools.php:15
+msgid "Import Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Suggestions.php:52
-msgid "See more..."
+#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../include/features.php:390
+msgid "Saved Folders"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Follow.php:22
@@ -7959,30 +8043,36 @@ msgstr ""
 msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Savedsearch.php:75
-msgid "Remove term"
+#: ../../Zotlabs/Widget/Forums.php:85
+msgid "Forums"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
-msgid "Saved Searches"
+#: ../../Zotlabs/Widget/Mailmenu.php:13
+msgid "Private Mail Menu"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
-msgid "add"
+#: ../../Zotlabs/Widget/Mailmenu.php:15
+msgid "Combined View"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:390
-msgid "Saved Folders"
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:213
+msgid "Inbox"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Filer.php:31 ../../Zotlabs/Widget/Appcategories.php:42
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:214
+msgid "Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Archive.php:43
-msgid "Archives"
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:215
+msgid "New Message"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Notes.php:16
+msgid "Notes"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Photo.php:48 ../../Zotlabs/Widget/Photo_rand.php:58
+msgid "photo/image"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Rating.php:51
@@ -7997,16 +8087,16 @@ msgstr ""
 msgid "View Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
-msgid "Bookmarked Chatrooms"
+#: ../../Zotlabs/Widget/Savedsearch.php:75
+msgid "Remove term"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Suggestedchats.php:32
-msgid "Suggested Chatrooms"
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Affinity.php:49
-msgid "Refresh"
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
+msgid "add"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Settings_menu.php:35
@@ -8049,70 +8139,20 @@ msgstr ""
 msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:13
-msgid "Private Mail Menu"
+#: ../../Zotlabs/Widget/Suggestedchats.php:32
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:15
-msgid "Combined View"
+#: ../../Zotlabs/Widget/Suggestions.php:51
+msgid "Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:213
-msgid "Inbox"
+#: ../../Zotlabs/Widget/Suggestions.php:52
+msgid "See more..."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:214
-msgid "Outbox"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:215
-msgid "New Message"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:17
-#: ../../Zotlabs/Widget/Conversations.php:29
-msgid "Conversations"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:21
-msgid "Received Messages"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:25
-msgid "Sent Messages"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:39
-msgid "No messages."
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:57
-msgid "Delete conversation"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Eventstools.php:13
-msgid "Events Tools"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Eventstools.php:14
-msgid "Export Calendar"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Eventstools.php:15
-msgid "Import Calendar"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1866 ../../include/conversation.php:1869
-msgid "Chatrooms"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Chatroom_list.php:20
-msgid "Overview"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Chatroom_members.php:11
-msgid "Chat Members"
+#: ../../Zotlabs/Widget/Tasklist.php:23
+msgid "Tasks"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Wiki_list.php:15
@@ -8120,59 +8160,21 @@ msgstr ""
 msgid "Wiki List"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:55
+#: ../../Zotlabs/Widget/Wiki_pages.php:54
 #: ../../extend/addon/addon/gitwiki/gitwiki.php:76
 msgid "Wiki Pages"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:61
+#: ../../Zotlabs/Widget/Wiki_pages.php:60
 #: ../../extend/addon/addon/gitwiki/gitwiki.php:81
 msgid "Add new page"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Wiki_pages.php:62
+#: ../../Zotlabs/Widget/Wiki_pages.php:61
 #: ../../extend/addon/addon/gitwiki/gitwiki.php:82
 msgid "Page name"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Activity.php:50
-msgctxt "widget"
-msgid "Activity"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Wiki_page_history.php:23
-msgctxt "wiki_history"
-msgid "Message"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Tasklist.php:23
-msgid "Tasks"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
-msgid "Member registrations waiting for confirmation"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Admin.php:29
-msgid "Inspect queue"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Admin.php:31
-msgid "DB updates"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:233
-msgid "Admin"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Admin.php:56
-msgid "Plugin Features"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Forums.php:85
-msgid "Forums"
-msgstr ""
-
 #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
 msgid "Flag Adult Photos"
 msgstr ""
@@ -8560,7 +8562,7 @@ msgid "IRC Chatroom"
 msgstr ""
 
 #: ../../extend/addon/addon/jappixmini/jappixmini.php:305
-#: ../../include/channel.php:1139 ../../include/channel.php:1296
+#: ../../include/channel.php:1137 ../../include/channel.php:1274
 msgid "Status:"
 msgstr ""
 
@@ -9096,7 +9098,7 @@ msgid "Page to load after image selection."
 msgstr ""
 
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:58
-#: ../../include/nav.php:107 ../../include/channel.php:1048
+#: ../../include/channel.php:1046 ../../include/nav.php:107
 msgid "Edit Profile"
 msgstr ""
 
@@ -10374,7 +10376,7 @@ msgstr ""
 msgid "Error creating new game."
 msgstr ""
 
-#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:899
+#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:897
 msgid "Requested channel is not available."
 msgstr ""
 
@@ -10640,15 +10642,15 @@ msgstr ""
 msgid "Install Firefox Sharing Tools to this web browser"
 msgstr ""
 
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:105
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:107
 msgid "Error retrieving wiki"
 msgstr ""
 
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:112
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:114
 msgid "Error creating zip file export folder"
 msgstr ""
 
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:130
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:132
 msgid "Error downloading wiki: "
 msgstr ""
 
@@ -10805,40 +10807,155 @@ msgstr ""
 msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/event.php:22 ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/event.php:73
-msgid "Starts:"
+#: ../../include/channel.php:67
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/event.php:77
-msgid "Finishes:"
+#: ../../include/channel.php:70
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/event.php:1008
-msgid "This event has been added to your calendar."
+#: ../../include/channel.php:181
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/event.php:1208
-msgid "Not specified"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/event.php:1209
-msgid "Needs Action"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/event.php:1210
-msgid "Completed"
+#: ../../include/channel.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/event.php:1211
-msgid "In Process"
+#: ../../include/channel.php:270
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/event.php:1212
-msgid "Cancelled"
+#: ../../include/channel.php:342
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/channel.php:1043
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/channel.php:1063
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/channel.php:1136 ../../include/channel.php:1230
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/channel.php:1138 ../../include/channel.php:1285
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/channel.php:1139
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/channel.php:1235
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/channel.php:1259
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/channel.php:1260
+msgid "j F"
+msgstr ""
+
+#: ../../include/channel.php:1267
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/channel.php:1280
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: ../../include/channel.php:1283
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../include/channel.php:1289
+msgid "Tags:"
+msgstr ""
+
+#: ../../include/channel.php:1291
+msgid "Political Views:"
+msgstr ""
+
+#: ../../include/channel.php:1293
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/channel.php:1297
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/channel.php:1299
+msgid "Likes:"
+msgstr ""
+
+#: ../../include/channel.php:1301
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../include/channel.php:1303
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/channel.php:1305
+msgid "My other channels:"
+msgstr ""
+
+#: ../../include/channel.php:1307
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/channel.php:1309
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/channel.php:1311
+msgid "Television:"
+msgstr ""
+
+#: ../../include/channel.php:1313
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/channel.php:1315
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/channel.php:1317
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/channel.php:1319
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/channel.php:1342
+msgid "Like this thing"
+msgstr ""
+
+#: ../../include/channel.php:2115
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
 #: ../../include/datetime.php:147
@@ -10853,7 +10970,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:286 ../../boot.php:2515
+#: ../../include/datetime.php:286 ../../boot.php:2431
 msgid "never"
 msgstr ""
 
@@ -11179,6 +11296,42 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
+#: ../../include/event.php:22 ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/event.php:30 ../../include/event.php:73
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:40 ../../include/event.php:77
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:1008
+msgid "This event has been added to your calendar."
+msgstr ""
+
+#: ../../include/event.php:1208
+msgid "Not specified"
+msgstr ""
+
+#: ../../include/event.php:1209
+msgid "Needs Action"
+msgstr ""
+
+#: ../../include/event.php:1210
+msgid "Completed"
+msgstr ""
+
+#: ../../include/event.php:1211
+msgid "In Process"
+msgstr ""
+
+#: ../../include/event.php:1212
+msgid "Cancelled"
+msgstr ""
+
 #: ../../include/help.php:33
 msgid "Help:"
 msgstr ""
@@ -11187,308 +11340,291 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../include/import.php:51
-msgid "Unable to create a unique channel address. Import failed."
-msgstr ""
-
-#: ../../include/import.php:90
-msgid "Channel clone failed. Import failed."
-msgstr ""
-
-#: ../../include/import.php:100
-msgid "Cloned channel not found. Import failed."
-msgstr ""
-
-#: ../../include/conversation.php:204
+#: ../../include/conversation.php:200
 #, php-format
 msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:239
+#: ../../include/conversation.php:235
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:1097
+#: ../../include/conversation.php:239 ../../include/text.php:1097
 #: ../../include/text.php:1102
 msgid "poked"
 msgstr ""
 
-#: ../../include/conversation.php:690
+#: ../../include/conversation.php:687
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:707
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:708
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:736
+#: ../../include/conversation.php:733
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:832
+#: ../../include/conversation.php:829
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:836 ../../include/nav.php:292
+#: ../../include/conversation.php:833 ../../include/nav.php:292
 msgid "Loading..."
 msgstr ""
 
-#: ../../include/conversation.php:837
+#: ../../include/conversation.php:834
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:930 ../../include/conversation.php:972
+#: ../../include/conversation.php:877
 msgid "View Source"
 msgstr ""
 
-#: ../../include/conversation.php:931 ../../include/conversation.php:982
+#: ../../include/conversation.php:887
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:932 ../../include/conversation.php:991
+#: ../../include/conversation.php:896
 msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:937 ../../include/conversation.php:1059
+#: ../../include/conversation.php:965
 msgid "Activity/Posts"
 msgstr ""
 
-#: ../../include/conversation.php:939 ../../include/conversation.php:1079
+#: ../../include/conversation.php:985
 msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/conversation.php:940 ../../include/conversation.php:1089
+#: ../../include/conversation.php:995
 msgid "Message"
 msgstr ""
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1129
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1129
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1227
+#: ../../include/conversation.php:1133
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1229
+#: ../../include/conversation.php:1135
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1235
+#: ../../include/conversation.php:1141
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1238
+#: ../../include/conversation.php:1144
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1239
+#: ../../include/conversation.php:1145
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1239
+#: ../../include/conversation.php:1145
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1282
+#: ../../include/conversation.php:1188
 msgid "Set your location"
 msgstr ""
 
-#: ../../include/conversation.php:1283
+#: ../../include/conversation.php:1189
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/conversation.php:1331
+#: ../../include/conversation.php:1237
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1332
+#: ../../include/conversation.php:1238
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1337
+#: ../../include/conversation.php:1243
 msgid "Choose a different album..."
 msgstr ""
 
-#: ../../include/conversation.php:1341
+#: ../../include/conversation.php:1247
 msgid "Comments enabled"
 msgstr ""
 
-#: ../../include/conversation.php:1342
+#: ../../include/conversation.php:1248
 msgid "Comments disabled"
 msgstr ""
 
-#: ../../include/conversation.php:1380
+#: ../../include/conversation.php:1286
 msgid "Page link name"
 msgstr ""
 
-#: ../../include/conversation.php:1383
+#: ../../include/conversation.php:1289
 msgid "Post as"
 msgstr ""
 
-#: ../../include/conversation.php:1397
+#: ../../include/conversation.php:1303
 msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/conversation.php:1400
+#: ../../include/conversation.php:1306
 msgid "Disable comments"
 msgstr ""
 
-#: ../../include/conversation.php:1401
+#: ../../include/conversation.php:1307
 msgid "Toggle comments"
 msgstr ""
 
-#: ../../include/conversation.php:1409
+#: ../../include/conversation.php:1315
 msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1432
+#: ../../include/conversation.php:1338
 msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/conversation.php:1438
+#: ../../include/conversation.php:1344
 msgid "Set publish date"
 msgstr ""
 
-#: ../../include/conversation.php:1692
+#: ../../include/conversation.php:1598
 msgid "Discover"
 msgstr ""
 
-#: ../../include/conversation.php:1695
+#: ../../include/conversation.php:1601
 msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/conversation.php:1700
+#: ../../include/conversation.php:1606
 msgid "Commented Order"
 msgstr ""
 
-#: ../../include/conversation.php:1703
+#: ../../include/conversation.php:1609
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/conversation.php:1707
+#: ../../include/conversation.php:1613
 msgid "Posted Order"
 msgstr ""
 
-#: ../../include/conversation.php:1710
+#: ../../include/conversation.php:1616
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/conversation.php:1718
+#: ../../include/conversation.php:1624
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/conversation.php:1727
+#: ../../include/conversation.php:1633
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/conversation.php:1733
+#: ../../include/conversation.php:1639
 msgid "Starred"
 msgstr ""
 
-#: ../../include/conversation.php:1736
+#: ../../include/conversation.php:1642
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1743
+#: ../../include/conversation.php:1649
 msgid "Spam"
 msgstr ""
 
-#: ../../include/conversation.php:1746
+#: ../../include/conversation.php:1652
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1818
+#: ../../include/conversation.php:1724
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1830
+#: ../../include/conversation.php:1736
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/conversation.php:1839 ../../include/photos.php:507
+#: ../../include/conversation.php:1745 ../../include/photos.php:524
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/conversation.php:1846
+#: ../../include/conversation.php:1752
 msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/conversation.php:1879
+#: ../../include/conversation.php:1785
 msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1882
+#: ../../include/conversation.php:1788
 msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1892
+#: ../../include/conversation.php:1798
 msgid "View Webpages"
 msgstr ""
 
-#: ../../include/conversation.php:1958
+#: ../../include/conversation.php:1864
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1961
+#: ../../include/conversation.php:1867
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1964
+#: ../../include/conversation.php:1870
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1967
+#: ../../include/conversation.php:1873
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1970
+#: ../../include/conversation.php:1876
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1973
+#: ../../include/conversation.php:1879
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
@@ -11553,7 +11689,7 @@ msgstr ""
 msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1689
+#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1605
 msgid "Logout"
 msgstr ""
 
@@ -12024,54 +12160,6 @@ msgstr ""
 msgid "This Website Only"
 msgstr ""
 
-#: ../../include/network.php:756
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1490
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:1744 ../../include/network.php:1745
-msgid "Friendica"
-msgstr ""
-
-#: ../../include/network.php:1746
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/network.php:1747
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:1748
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/network.php:1750
-msgid "Diaspora"
-msgstr ""
-
-#: ../../include/network.php:1751
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/network.php:1752
-msgid "Zot"
-msgstr ""
-
-#: ../../include/network.php:1753
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/network.php:1754
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/network.php:1755
-msgid "MySpace"
-msgstr ""
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -12368,31 +12456,52 @@ msgstr ""
 msgid "Specify folder"
 msgstr ""
 
-#: ../../include/photos.php:111
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/network.php:756
+msgid "view full size"
 msgstr ""
 
-#: ../../include/photos.php:118
-msgid "Image file is empty."
+#: ../../include/network.php:1490
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
+#: ../../include/network.php:1744 ../../include/network.php:1745
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/photos.php:297
-msgid "a new photo"
+#: ../../include/network.php:1746
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+#: ../../include/network.php:1747
+msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/photos.php:511
-msgid "Upload New Photos"
+#: ../../include/network.php:1748
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/network.php:1750
+msgid "Diaspora"
+msgstr ""
+
+#: ../../include/network.php:1751
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/network.php:1752
+msgid "Zot"
+msgstr ""
+
+#: ../../include/network.php:1753
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/network.php:1754
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/network.php:1755
+msgid "MySpace"
 msgstr ""
 
 #: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
@@ -12438,155 +12547,31 @@ msgstr ""
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
-msgstr ""
-
-#: ../../include/channel.php:67
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/channel.php:70
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/channel.php:181
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/channel.php:193
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/channel.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/channel.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/channel.php:272
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/channel.php:344
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/channel.php:1045
-msgid "Create New Profile"
-msgstr ""
-
-#: ../../include/channel.php:1065
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/channel.php:1138 ../../include/channel.php:1252
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/channel.php:1140 ../../include/channel.php:1307
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/channel.php:1141
-msgid "Online Now"
-msgstr ""
-
-#: ../../include/channel.php:1257
-msgid "Like this channel"
-msgstr ""
-
-#: ../../include/channel.php:1281
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/channel.php:1282
-msgid "j F"
-msgstr ""
-
-#: ../../include/channel.php:1289
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/channel.php:1302
+#: ../../include/photos.php:111
 #, php-format
-msgid "for %1$d %2$s"
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/channel.php:1305
-msgid "Sexual Preference:"
+#: ../../include/photos.php:118
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/channel.php:1311
-msgid "Tags:"
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/channel.php:1313
-msgid "Political Views:"
+#: ../../include/photos.php:297
+msgid "a new photo"
 msgstr ""
 
-#: ../../include/channel.php:1315
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/channel.php:1319
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/channel.php:1321
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/channel.php:1323
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/channel.php:1325
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/channel.php:1327
-msgid "My other channels:"
-msgstr ""
-
-#: ../../include/channel.php:1329
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/channel.php:1331
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/channel.php:1333
-msgid "Television:"
-msgstr ""
-
-#: ../../include/channel.php:1335
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/channel.php:1337
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/channel.php:1339
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/channel.php:1341
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/channel.php:1364
-msgid "Like this thing"
-msgstr ""
-
-#: ../../include/channel.php:2098
+#: ../../include/photos.php:301
 #, php-format
-msgid "User '%s' deleted"
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr ""
+
+#: ../../include/photos.php:529
+msgid "Upload New Photos"
 msgstr ""
 
 #: ../../include/message.php:32
@@ -12615,6 +12600,19 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr ""
+
+#: ../../include/import.php:51
+msgid "Unable to create a unique channel address. Import failed."
+msgstr ""
+
+#: ../../include/import.php:94
+msgid "Cloned channel not found. Import failed."
+msgstr ""
+
 #: ../../include/items.php:808 ../../include/items.php:855
 msgid "(Unknown)"
 msgstr ""
@@ -12652,34 +12650,34 @@ msgstr ""
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:3828
+#: ../../include/items.php:3826
 msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/items.php:3835
+#: ../../include/items.php:3833
 #, php-format
 msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/items.php:3847
+#: ../../include/items.php:3845
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/items.php:4196
+#: ../../include/items.php:4194
 msgid "profile photo"
 msgstr ""
 
-#: ../../include/items.php:4392
+#: ../../include/items.php:4390
 #, php-format
 msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/items.php:4392
+#: ../../include/items.php:4390
 msgctxt "edit_activity"
 msgid "Post"
 msgstr ""
 
-#: ../../include/items.php:4392
+#: ../../include/items.php:4390
 msgctxt "edit_activity"
 msgid "Comment"
 msgstr ""
@@ -12736,65 +12734,65 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/attach.php:250 ../../include/attach.php:338
+#: ../../include/attach.php:250 ../../include/attach.php:339
 msgid "Item was not found."
 msgstr ""
 
-#: ../../include/attach.php:499
+#: ../../include/attach.php:500
 msgid "No source file."
 msgstr ""
 
-#: ../../include/attach.php:521
+#: ../../include/attach.php:522
 msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/attach.php:539
+#: ../../include/attach.php:540
 msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/attach.php:670
+#: ../../include/attach.php:671
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/attach.php:684
+#: ../../include/attach.php:685
 #, php-format
 msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/attach.php:854
+#: ../../include/attach.php:855
 msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/attach.php:867
+#: ../../include/attach.php:868
 msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/attach.php:922 ../../include/attach.php:938
+#: ../../include/attach.php:923 ../../include/attach.php:939
 msgid "Path not available."
 msgstr ""
 
-#: ../../include/attach.php:984 ../../include/attach.php:1142
+#: ../../include/attach.php:988 ../../include/attach.php:1153
 msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/attach.php:1010
+#: ../../include/attach.php:1014
 msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/attach.php:1032
+#: ../../include/attach.php:1039
 msgid "Path not found."
 msgstr ""
 
-#: ../../include/attach.php:1096
+#: ../../include/attach.php:1107
 msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/attach.php:1100
+#: ../../include/attach.php:1111
 msgid "database storage failed."
 msgstr ""
 
-#: ../../include/attach.php:1148
+#: ../../include/attach.php:1159
 msgid "Empty path"
 msgstr ""
 
@@ -13331,54 +13329,44 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1463
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr ""
-
-#: ../../boot.php:1466
-#, php-format
-msgid "Update Error at %s"
-msgstr ""
-
-#: ../../boot.php:1670
+#: ../../boot.php:1586
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1692
+#: ../../boot.php:1608
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1693
+#: ../../boot.php:1609
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1694
+#: ../../boot.php:1610
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1697
+#: ../../boot.php:1613
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2237
+#: ../../boot.php:2153
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2392
+#: ../../boot.php:2308
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2395
+#: ../../boot.php:2311
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2514
+#: ../../boot.php:2430
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2518
+#: ../../boot.php:2434
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""

From b0b5db770db0bfc7d3e3913bfd77a178d78d75f3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 25 Mar 2017 13:22:14 -0700
Subject: [PATCH 069/299] provide compatibility with old-style update system

---
 Zotlabs/Lib/DB_Upgrade.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php
index 2ee29c314..55c69bcca 100644
--- a/Zotlabs/Lib/DB_Upgrade.php
+++ b/Zotlabs/Lib/DB_Upgrade.php
@@ -5,13 +5,25 @@ namespace Zotlabs\Lib;
 
 class DB_Upgrade {
 
+	public $config_name = '';
+	public $func_prefix = '';
 
 	function __construct($db_revision) {
 
+		$update_file = 'install/' . PLATFORM_NAME . '/update.php';
+		if(! file_exists($update_file)) {
+			$update_file = 'install/update.php';
+			$this->config_name = 'db_version';
+			$this->func_prefix = 'update_r';
+		}
+		else {
+			$this->config_name = PLATFORM_NAME . '_db_version';
+			$this->func_prefix = PLATFORM_NAME . '_update_';
+		}
 
-		$build = get_config('system', PLATFORM_NAME . '_db_version', 0);
+		$build = get_config('system', $this->config_name, 0);
 		if(! intval($build))
-			$build = set_config('system', PLATFORM_NAME . '_db_version', $db_revision);
+			$build = set_config('system', $this->config_name, $db_revision);
 
 		if($build == $db_revision) {
 			// Nothing to be done.
@@ -26,8 +38,6 @@ class DB_Upgrade {
 		
 			$current = intval($db_revision);
 
-			$update_file = 'install/' . PLATFORM_NAME . '/update.php';
-
 			if(($stored < $current) && file_exists($update_file)) {
 
 				Config::Load('database');
@@ -43,7 +53,7 @@ class DB_Upgrade {
 
 				if($db_revision == UPDATE_VERSION) {
 					for($x = $stored; $x < $current; $x ++) {
-						$func = PLATFORM_NAME . '_update_' . $x;
+						$func = $this->func_prefix . $x;
 						if(function_exists($func)) {
 							// There could be a lot of processes running or about to run.
 							// We want exactly one process to run the update command.
@@ -101,7 +111,7 @@ class DB_Upgrade {
 							}
 						}
 					}
-					set_config('system', PLATFORM_NAME . '_db_version', $db_revision);
+					set_config('system', $this->config_name, $db_revision);
 				}
 			}
 		}

From 5c63f7dd58c5b3b88efcc47120c791f92527f720 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 25 Mar 2017 14:19:32 -0700
Subject: [PATCH 070/299] provide platform specific install script

---
 include/dba/dba_driver.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index e47f97387..ad1d9d194 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -15,7 +15,7 @@ class DBA {
 	static public $scheme = 'mysql';
 	static public $logging = false;
 
-	static public $install_script = 'install/schema_mysql.sql';
+	static public $install_script = 'schema_mysql.sql';
 	static public $null_date = '0001-01-01 00:00:00';
 	static public $utc_now = 'UTC_TIMESTAMP()';
 	static public $tquot = "`";
@@ -46,7 +46,7 @@ class DBA {
 			if(!($port))
 				$port = 5432;
 
-			self::$install_script = 'install/schema_postgres.sql';
+			self::$install_script = 'schema_postgres.sql';
 			self::$utc_now = "now() at time zone 'UTC'";
 			self::$tquot = '"';
 			self::$scheme = 'pgsql';
@@ -163,7 +163,9 @@ abstract class dba_driver {
 	}
 
 	function get_install_script() {
-		return \DBA::$install_script;
+		if(file_exists('install/' . PLATFORM_NAME . '/' . \DBA::$install_script))
+			 return 'install/' . PLATFORM_NAME . '/' . \DBA::$install_script;
+		return 'install/' . \DBA::$install_script;
 	}
 
 	function get_table_quote() {

From 94e458018bc9af7cac2221e852c90ba3bb84b45f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 25 Mar 2017 14:41:43 -0700
Subject: [PATCH 071/299] rm widgets again

---
 include/widgets.php | 1778 -------------------------------------------
 1 file changed, 1778 deletions(-)
 delete mode 100644 include/widgets.php

diff --git a/include/widgets.php b/include/widgets.php
deleted file mode 100644
index c88c03f7e..000000000
--- a/include/widgets.php
+++ /dev/null
@@ -1,1778 +0,0 @@
-<?php
-/**
- * @file include/widgets.php
- *
- * @brief This file contains the widgets.
- */
-
-require_once('include/dir_fns.php');
-require_once('include/contact_widgets.php');
-require_once('include/attach.php');
-
-
-function widget_profile($args) {
-
-	$block = observer_prohibited();
-	return profile_sidebar(App::$profile, $block, true);
-}
-
-function widget_zcard($args) {
-
-	$block = observer_prohibited();
-	$channel = channelx_by_n(App::$profile_uid);
-	return get_zcard($channel,get_observer_hash(),array('width' => 875));
-}
-
-
-
-
-// FIXME The problem with the next widget is that we don't have a search function for webpages that we can send the links to.
-// Then we should also provide an option to search webpages and conversations.
-
-function widget_tagcloud($args) {
-
-	$o = '';
-	//$tab = 0;
-
-	$uid = App::$profile_uid;
-	$count = ((x($args,'count')) ? intval($args['count']) : 24);
-	$flags = 0;
-	$type = TERM_CATEGORY;
-
-	// FIXME there exists no $authors variable
-	$r = tagadelic($uid, $count, $authors, $owner, $flags, ITEM_TYPE_WEBPAGE, $type);
-
-	if($r) {
-		$o = '<div class="tagblock widget"><h3>' . t('Categories') . '</h3><div class="tags" align="center">';
-		foreach($r as $rr) {
-			$o .= '<span class="tag'.$rr[2].'">'.$rr[0].'</span> ' . "\r\n";
-		}
-		$o .= '</div></div>';
-	}
-	return $o;
-}
-
-function widget_collections($args) {
-	require_once('include/group.php');
-
-	$mode = ((array_key_exists('mode',$args)) ? $args['mode'] : 'conversation');
-	switch($mode) {
-		case 'conversation':
-				$every = argv(0);
-				$each = argv(0);
-				$edit = true;
-				$current = $_REQUEST['gid'];
-				$abook_id = 0;
-				$wmode = 0;
-				break;
-		case 'connections':
-				$every = 'connections';
-				$each = 'group';
-				$edit = true;
-				$current = $_REQUEST['gid'];
-				$abook_id = 0;
-				$wmode = 0;
-		case 'groups':
-				$every = 'connections';
-				$each = argv(0);
-				$edit = false;
-				$current = intval(argv(1));
-				$abook_id = 0;
-				$wmode = 1;
-				break;
-		case 'abook':
-				$every = 'connections';
-				$each = 'group';
-				$edit = false;
-				$current = 0;
-				$abook_id = App::$poi['abook_xchan'];
-				$wmode = 1;
-				break;
-		default:
-			return '';
-			break;
-	}
-
-	return group_side($every, $each, $edit, $current, $abook_id, $wmode);
-}
-
-function widget_suggestions($arr) {
-
-	if((! local_channel()) || (! feature_enabled(local_channel(),'suggest')))
-		return '';
-
-	require_once('include/socgraph.php');
-
-	$r = suggestion_query(local_channel(),get_observer_hash(),0,20);
-
-	if(! $r) {
-		return;
-	}
-
-	$arr = array();
-
-	// Get two random entries from the top 20 returned.
-	// We'll grab the first one and the one immediately following.
-	// This will throw some entropy intot he situation so you won't
-	// be looking at the same two mug shots every time the widget runs
-
-	$index = ((count($r) > 2) ? mt_rand(0,count($r) - 2) : 0);
-
-	for($x = $index; $x <= ($index+1); $x ++) {
-		$rr = $r[$x];
-		if(! $rr['xchan_url'])
-			break;
-
-		$connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr'];
-
-		$arr[] = array(
-			'url' => chanlink_url($rr['xchan_url']),
-			'profile' => $rr['xchan_url'],
-			'name' => $rr['xchan_name'],
-			'photo' => $rr['xchan_photo_m'],
-			'ignlnk' => z_root() . '/directory?ignore=' . $rr['xchan_hash'],
-			'conntxt' => t('Connect'),
-			'connlnk' => $connlnk,
-			'ignore' => t('Ignore/Hide')
-		);
-	}
-
-	$o = replace_macros(get_markup_template('suggest_widget.tpl'),array(
-		'$title' => t('Suggestions'),
-		'$more' => t('See more...'),
-		'$entries' => $arr
-	));
-
-	return $o;
-}
-
-
-function widget_follow($args) {
-	if(! local_channel())
-		return '';
-
-	$uid = App::$channel['channel_id'];
-	$r = q("select count(*) as total from abook where abook_channel = %d and abook_self = 0 ",
-		intval($uid)
-	);
-	if($r)
-		$total_channels = $r[0]['total'];
-	$limit = service_class_fetch($uid,'total_channels');
-	if($limit !== false) {
-		$abook_usage_message = sprintf( t("You have %1$.0f of %2$.0f allowed connections."), $total_channels, $limit);
-	}
-	else {
-		$abook_usage_message = '';
- 	}
-	return replace_macros(get_markup_template('follow.tpl'),array(
-		'$connect' => t('Add New Connection'),
-		'$desc' => t('Enter channel address'),
-		'$hint' => t('Examples: bob@example.com, https://example.com/barbara'),
-		'$follow' => t('Connect'),
-		'$abook_usage_message' => $abook_usage_message
-	));
-}
-
-
-function widget_notes($arr) {
-	if(! local_channel())
-		return '';
-	if(! feature_enabled(local_channel(),'private_notes'))
-		return '';
-
-	$text = get_pconfig(local_channel(),'notes','text');
-
-	$o = replace_macros(get_markup_template('notes.tpl'), array(
-		'$banner' => t('Notes'),
-		'$text' => $text,
-		'$save' => t('Save'),
-	));
-
-	return $o;
-}
-
-
-function widget_savedsearch($arr) {
-	if((! local_channel()) || (! feature_enabled(local_channel(),'savedsearch')))
-		return '';
-
-	$search = ((x($_GET,'netsearch')) ? $_GET['netsearch'] : '');
-	if(! $search)
-		$search = ((x($_GET,'search')) ? $_GET['search'] : '');
-
-	if(x($_GET,'searchsave') && $search) {
-		$r = q("select * from term where uid = %d and ttype = %d and term = '%s' limit 1",
-			intval(local_channel()),
-			intval(TERM_SAVEDSEARCH),
-			dbesc($search)
-		);
-		if(! $r) {
-			q("insert into term ( uid,ttype,term ) values ( %d, %d, '%s') ",
-				intval(local_channel()),
-				intval(TERM_SAVEDSEARCH),
-				dbesc($search)
-			);
-		}
-	}
-
-	if(x($_GET,'searchremove') && $search) {
-		q("delete from term where uid = %d and ttype = %d and term = '%s'",
-			intval(local_channel()),
-			intval(TERM_SAVEDSEARCH),
-			dbesc($search)
-		);
-		$search = '';
-	}
-
-	$srchurl = App::$query_string;
-
-	$srchurl =  rtrim(preg_replace('/searchsave\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
-	$srchurl =  rtrim(preg_replace('/searchremove\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-
-	$srchurl =  rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl =  rtrim(preg_replace('/submit\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
-
-
-	$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
-	$hasamp = ((strpos($srchurl,'&') !== false) ? true : false);
-
-	if(($hasamp) && (! $hasq))
-		$srchurl = substr($srchurl,0,strpos($srchurl,'&')) . '?f=&' . substr($srchurl,strpos($srchurl,'&')+1);
-
-	$o = '';
-
-	$r = q("select tid,term from term WHERE uid = %d and ttype = %d ",
-		intval(local_channel()),
-		intval(TERM_SAVEDSEARCH)
-	);
-
-	$saved = array();
-
-	if(count($r)) {
-		foreach($r as $rr) {
-			$saved[] = array(
-				'id'            => $rr['tid'],
-				'term'          => $rr['term'],
-				'dellink'       => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&amp;searchremove=1&amp;search=' . urlencode($rr['term']),
-				'srchlink'      => z_root() . '/' . $srchurl . (($hasq || $hasamp) ? '' : '?f=') . '&amp;search=' . urlencode($rr['term']),
-				'displayterm'   => htmlspecialchars($rr['term'], ENT_COMPAT,'UTF-8'),
-				'encodedterm'   => urlencode($rr['term']),
-				'delete'        => t('Remove term'),
-				'selected'      => ($search==$rr['term']),
-			);
-		}
-	}
-
-	$tpl = get_markup_template("saved_searches.tpl");
-	$o = replace_macros($tpl, array(
-		'$title'	 => t('Saved Searches'),
-		'$add'		 => t('add'),
-		'$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), true),
-		'$saved' 	 => $saved,
-	));
-
-	return $o;
-}
-
-function widget_sitesearch($arr) {
-
-	$search = ((x($_GET,'search')) ? $_GET['search'] : '');
-
-	$srchurl = App::$query_string;
-
-	$srchurl =  rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl =  rtrim(preg_replace('/submit\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
-
-
-	$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
-	$hasamp = ((strpos($srchurl,'&') !== false) ? true : false);
-
-	if(($hasamp) && (! $hasq))
-		$srchurl = substr($srchurl,0,strpos($srchurl,'&')) . '?f=&' . substr($srchurl,strpos($srchurl,'&')+1);
-
-	$o = '';
-
-	$saved = array();
-
-	$tpl = get_markup_template("sitesearch.tpl");
-	$o = replace_macros($tpl, array(
-		'$title'	 => t('Search'),
-		'$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), false),
-		'$saved' 	 => $saved,
-	));
-
-	return $o;
-}
-
-
-
-
-
-function widget_filer($arr) {
-	if(! local_channel())
-		return '';
-
-
-	$selected = ((x($_REQUEST,'file')) ? $_REQUEST['file'] : '');
-
-	$terms = array();
-	$r = q("select distinct term from term where uid = %d and ttype = %d order by term asc",
-		intval(local_channel()),
-		intval(TERM_FILE)
-	);
-	if(! $r)
-		return;
-
-	foreach($r as $rr)
-		$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-
-	return replace_macros(get_markup_template('fileas_widget.tpl'),array(
-		'$title' => t('Saved Folders'),
-		'$desc' => '',
-		'$sel_all' => (($selected == '') ? 'selected' : ''),
-		'$all' => t('Everything'),
-		'$terms' => $terms,
-		'$base' => z_root() . '/' . App::$cmd
-	));
-}
-
-function widget_archive($arr) {
-
-	$o = '';
-
-	if(! App::$profile_uid) {
-		return '';
-	}
-
-	$uid = App::$profile_uid;
-
-	if(! feature_enabled($uid,'archives'))
-		return '';
-
-	if(! perm_is_allowed($uid,get_observer_hash(),'view_stream'))
-		return '';
-
-	$wall = ((array_key_exists('wall', $arr)) ? intval($arr['wall']) : 0);
-	$style = ((array_key_exists('style', $arr)) ? $arr['style'] : 'select');
-	$showend = ((get_pconfig($uid,'system','archive_show_end_date')) ? true : false);
-	$mindate = get_pconfig($uid,'system','archive_mindate');
-	$visible_years = get_pconfig($uid,'system','archive_visible_years');
-	if(! $visible_years)
-		$visible_years = 5;
-
-	$url = z_root() . '/' . App::$cmd;
-
-	$ret = list_post_dates($uid,$wall,$mindate);
-
-	if(! count($ret))
-		return '';
-
-	$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
-	$cutoff = ((array_key_exists($cutoff_year,$ret))? true : false);
-
-	$o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
-		'$title' => t('Archives'),
-		'$size' => $visible_years,
-		'$cutoff_year' => $cutoff_year,
-		'$cutoff' => $cutoff,
-		'$url' => $url,
-		'$style' => $style,
-		'$showend' => $showend,
-		'$dates' => $ret
-	));
-	return $o;
-}
-
-
-function widget_fullprofile($arr) {
-
-	if(! App::$profile['profile_uid'])
-		return;
-
-	$block = observer_prohibited();
-
-	return profile_sidebar(App::$profile, $block);
-}
-
-function widget_shortprofile($arr) {
-
-	if(! App::$profile['profile_uid'])
-		return;
-
-	$block = observer_prohibited();
-
-	return profile_sidebar(App::$profile, $block, true, true);
-}
-
-
-function widget_categories($arr) {
-
-
-	if(App::$profile['profile_uid'] && (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),'view_stream')))
-		return '';
-
-	$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
-	$srchurl = App::$query_string;
-	$srchurl =  rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
-
-	return categories_widget($srchurl, $cat);
-
-}
-
-function widget_appcategories($arr) {
-
-	if(! local_channel())
-		return '';
-
-	$selected = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
-
-	$srchurl =  rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
-	$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
-
-	$srchurl = z_root() . '/apps';
-
-	$terms = array();
-
-	$r = q("select distinct(term.term)
-        from term join app on term.oid = app.id
-        where app_channel = %d
-        and term.uid = app_channel
-        and term.otype = %d
-        and term.term != 'nav_featured_app'
-        order by term.term asc",
-		intval(local_channel()),
-	    intval(TERM_OBJ_APP)
-	);
-	if($r) {
-		foreach($r as $rr)
-			$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
-
-		return replace_macros(get_markup_template('categories_widget.tpl'),array(
-			'$title' => t('Categories'),
-			'$desc' => '',
-			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => t('Everything'),
-			'$terms' => $terms,
-			'$base' => $srchurl,
-
-		));
-	}
-
-
-
-}
-
-
-
-function widget_appcloud($arr) {
-	if(! local_channel())
-		return '';
-	return app_tagblock(z_root() . '/apps');
-}
-
-
-function widget_tagcloud_wall($arr) {
-
-
-	if((! App::$profile['profile_uid']) || (! App::$profile['channel_hash']))
-		return '';
-	if(! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream'))
-		return '';
-
-	$limit = ((array_key_exists('limit', $arr)) ? intval($arr['limit']) : 50);
-	if(feature_enabled(App::$profile['profile_uid'], 'tagadelic'))
-		return wtagblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash'], 'wall');
-
-	return '';
-}
-
-function widget_catcloud_wall($arr) {
-
-
-	if((! App::$profile['profile_uid']) || (! App::$profile['channel_hash']))
-		return '';
-	if(! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_stream'))
-		return '';
-
-	$limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50);
-
-	return catblock(App::$profile['profile_uid'], $limit, '', App::$profile['channel_hash'], 'wall');
-}
-
-
-function widget_affinity($arr) {
-
-	if(! local_channel())
-		return '';
-	
-	// Get default cmin value from pconfig, but allow GET parameter to override
-	$cmin = intval(get_pconfig(local_channel(),'affinity','cmin'));
-	$cmin = (($cmin) ? $cmin : 0);
-	$cmin = ((x($_REQUEST,'cmin')) ? intval($_REQUEST['cmin']) : $cmin);
-	
-	// Get default cmax value from pconfig, but allow GET parameter to override
-	$cmax = intval(get_pconfig(local_channel(),'affinity','cmax'));
-	$cmax = (($cmax) ? $cmax : 99);
-	$cmax = ((x($_REQUEST,'cmax')) ? intval($_REQUEST['cmax']) : $cmax);
-
-
-	if(feature_enabled(local_channel(),'affinity')) {
-
-		$labels = array(
-			t('Me'),
-			t('Family'),
-			t('Friends'),
-			t('Acquaintances'),
-			t('All')
-		);
-		call_hooks('affinity_labels',$labels);
-		$label_str = '';
-
-		if($labels) {
-			foreach($labels as $l) {
-				if($label_str) {
-					$label_str .= ", '|'";
-					$label_str .= ", '" . $l . "'";
-				}
-				else
-					$label_str .= "'" . $l . "'";
-			}
-		}
-
-		$tpl = get_markup_template('main_slider.tpl');
-		$x = replace_macros($tpl,array(
-			'$val' => $cmin . ',' . $cmax,
-			'$refresh' => t('Refresh'),
-			'$labels' => $label_str,
-		));
-		$arr = array('html' => $x);
-		call_hooks('main_slider',$arr);
-		return $arr['html'];
-	}
-
- 	return '';
-}
-
-
-function widget_settings_menu($arr) {
-
-	if(! local_channel())
-		return;
-
-
-	$channel = App::get_channel();
-
-	$abook_self_id = 0;
-
-	// Retrieve the 'self' address book entry for use in the auto-permissions link
-
-	$role = get_pconfig(local_channel(),'system','permissions_role');
-
-	$abk = q("select abook_id from abook where abook_channel = %d and abook_self = 1 limit 1",
-		intval(local_channel())
-	);
-	if($abk)
-		$abook_self_id = $abk[0]['abook_id'];
-
-	$x = q("select count(*) as total from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0 ",
-		dbesc($channel['channel_hash'])
-	);
-
-	$hublocs = (($x && $x[0]['total'] > 1) ? true : false);
-
-	$tabs = array(
-		array(
-			'label'	=> t('Account settings'),
-			'url' 	=> z_root().'/settings/account',
-			'selected'	=> ((argv(1) === 'account') ? 'active' : ''),
-		),
-
-		array(
-			'label'	=> t('Channel settings'),
-			'url' 	=> z_root().'/settings/channel',
-			'selected'	=> ((argv(1) === 'channel') ? 'active' : ''),
-		),
-
-	);
-
-	if(get_account_techlevel() > 0 && get_features()) {
-		$tabs[] = 	array(
-				'label'	=> t('Additional features'),
-				'url' 	=> z_root().'/settings/features',
-				'selected'	=> ((argv(1) === 'features') ? 'active' : ''),
-		);
-	}
-
-	$tabs[] =	array(
-		'label'	=> t('Feature/Addon settings'),
-		'url' 	=> z_root().'/settings/featured',
-		'selected'	=> ((argv(1) === 'featured') ? 'active' : ''),
-	);
-
-	$tabs[] =	array(
-		'label'	=> t('Display settings'),
-		'url' 	=> z_root().'/settings/display',
-		'selected'	=> ((argv(1) === 'display') ? 'active' : ''),
-	);
-
-	if($hublocs) {
-		$tabs[] = array(
-			'label' => t('Manage locations'),
-			'url' => z_root() . '/locs',
-			'selected' => ((argv(1) === 'locs') ? 'active' : ''),
-		);
-	}
-
-	$tabs[] =	array(
-		'label' => t('Export channel'),
-		'url' => z_root() . '/uexport',
-		'selected' => ''
-	);
-
-	$tabs[] =	array(
-		'label' => t('Connected apps'),
-		'url' => z_root() . '/settings/oauth',
-		'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
-	);
-
-	if(get_account_techlevel() > 2) {
-		$tabs[] =	array(
-			'label' => t('Guest Access Tokens'),
-			'url' => z_root() . '/settings/tokens',
-			'selected' => ((argv(1) === 'tokens') ? 'active' : ''),
-		);
-	}
-
-	if(feature_enabled(local_channel(),'permcats')) {
-		$tabs[] = array(
-			'label' => t('Permission Groups'),
-			'url' => z_root() . '/settings/permcats',
-			'selected' => ((argv(1) === 'permcats') ? 'active' : ''),
-		);
-	}
-
-
-	if($role === false || $role === 'custom') {
-		$tabs[] = array(
-			'label' => t('Connection Default Permissions'),
-			'url' => z_root() . '/connedit/' . $abook_self_id,
-			'selected' => ''
-		);
-	}
-
-	if(feature_enabled(local_channel(),'premium_channel')) {
-		$tabs[] = array(
-			'label' => t('Premium Channel Settings'),
-			'url' => z_root() . '/connect/' . $channel['channel_address'],
-			'selected' => ''
-		);
-	}
-
-	if(feature_enabled(local_channel(),'channel_sources')) {
-		$tabs[] = array(
-			'label' => t('Channel Sources'),
-			'url' => z_root() . '/sources',
-			'selected' => ''
-		);
-	}
-
-	$tabtpl = get_markup_template("generic_links_widget.tpl");
-	return replace_macros($tabtpl, array(
-		'$title' => t('Settings'),
-		'$class' => 'settings-widget',
-		'$items' => $tabs,
-	));
-}
-
-
-function widget_mailmenu($arr) {
-	if (! local_channel())
-		return;
-
-
-	return replace_macros(get_markup_template('message_side.tpl'), array(
-		'$title' => t('Private Mail Menu'),
-		'$combined'=>array(
-			'label' => t('Combined View'),
-			'url' => z_root() . '/mail/combined',
-			'sel' => (argv(1) == 'combined'),
-		),
-		'$inbox'=>array(
-			'label' => t('Inbox'),
-			'url' => z_root() . '/mail/inbox',
-			'sel' => (argv(1) == 'inbox'),
-		),
-		'$outbox'=>array(
-			'label' => t('Outbox'),
-			'url' => z_root() . '/mail/outbox',
-			'sel' => (argv(1) == 'outbox'),
-		),
-		'$new'=>array(
-			'label' => t('New Message'),
-			'url' => z_root() . '/mail/new',
-			'sel'=> (argv(1) == 'new'),
-		)
-	));
-}
-
-
-function widget_conversations($arr) {
-	if (! local_channel())
-		return;
-
-	if(argc() > 1) {
-
-		switch(argv(1)) {
-			case 'combined':
-				$mailbox = 'combined';
-				$header = t('Conversations');
-				break;
-			case 'inbox':
-				$mailbox = 'inbox';
-				$header = t('Received Messages');
-				break;
-			case 'outbox':
-				$mailbox = 'outbox';
-				$header = t('Sent Messages');
-				break;
-			default:
-				$mailbox = 'combined';
-				$header = t('Conversations');
-				break;
-		}
-
-		require_once('include/message.php');
-
-		// private_messages_list() can do other more complicated stuff, for now keep it simple
-		$r = private_messages_list(local_channel(), $mailbox, App::$pager['start'], App::$pager['itemspage']);
-
-		if(! $r) {
-			info( t('No messages.') . EOL);
-			return $o;
-		}
-
-		$messages = array();
-
-		foreach($r as $rr) {
-
-			$messages[] = array(
-				'mailbox'      => $mailbox,
-				'id'           => $rr['id'],
-				'from_name'    => $rr['from']['xchan_name'],
-				'from_url'     => chanlink_hash($rr['from_xchan']),
-				'from_photo'   => $rr['from']['xchan_photo_s'],
-				'to_name'      => $rr['to']['xchan_name'],
-				'to_url'       => chanlink_hash($rr['to_xchan']),
-				'to_photo'     => $rr['to']['xchan_photo_s'],
-				'subject'      => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
-				'delete'       => t('Delete conversation'),
-				'body'         => $rr['body'],
-				'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
-				'seen'         => $rr['seen'],
-				'selected'     => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
-			);
-		}
-
-		$tpl = get_markup_template('mail_head.tpl');
-		$o .= replace_macros($tpl, array(
-			'$header' => $header,
-			'$messages' => $messages
-		));
-
-		//$o .= alt_pager($a,count($r));
-
-	}
-
-	return $o;
-}
-
-function widget_eventstools($arr) {
-	if (! local_channel())
-		return;
-
-	return replace_macros(get_markup_template('events_tools_side.tpl'), array(
-		'$title' => t('Events Tools'),
-		'$export' => t('Export Calendar'),
-		'$import' => t('Import Calendar'),
-		'$submit' => t('Submit')
-	));
-}
-
-function widget_design_tools($arr) {
-
-	// mod menu doesn't load a profile. For any modules which load a profile, check it.
-	// otherwise local_channel() is sufficient for permissions.
-
-	if(App::$profile['profile_uid'])
-		if((App::$profile['profile_uid'] != local_channel()) && (! App::$is_sys))
-			return '';
-
-	if(! local_channel())
-		return '';
-
-	return design_tools();
-}
-
-function widget_website_portation_tools($arr) {
-
-	// mod menu doesn't load a profile. For any modules which load a profile, check it.
-	// otherwise local_channel() is sufficient for permissions.
-
-	if(App::$profile['profile_uid'])
-		if((App::$profile['profile_uid'] != local_channel()) && (! App::$is_sys))
-			return '';
-
-	if(! local_channel())
-		return '';
-
-	return website_portation_tools();
-}
-
-function widget_findpeople($arr) {
-	return findpeople_widget();
-}
-
-
-function widget_photo_albums($arr) {
-
-	if(! App::$profile['profile_uid'])
-		return '';
-	$channelx = channelx_by_n(App::$profile['profile_uid']);
-	if((! $channelx) || (! perm_is_allowed(App::$profile['profile_uid'], get_observer_hash(), 'view_storage')))
-		return '';
-	require_once('include/photos.php');
-	$sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'album');
-	$direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc');
-
-	return photos_album_widget($channelx, App::get_observer(),$sortkey,$direction);
-}
-
-
-function widget_vcard($arr) {
-	return vcard_from_xchan('', App::get_observer());
-}
-
-
-/*
- * The following directory widgets are only useful on the directory page
- */
-
-
-function widget_dirsort($arr) {
-	return dir_sort_links();
-}
-
-function widget_dirtags($arr) {
-	return dir_tagblock(z_root() . '/directory', null);
-}
-
-function widget_menu_preview($arr) {
-	if(! App::$data['menu_item'])
-		return;
-	require_once('include/menu.php');
-
-	return menu_render(App::$data['menu_item']);
-}
-
-function widget_chatroom_list($arr) {
-
-
-	$r = Zotlabs\Lib\Chatroom::roomlist(App::$profile['profile_uid']);
-
-	if($r) {
-		return replace_macros(get_markup_template('chatroomlist.tpl'), array(
-			'$header' => t('Chatrooms'),
-			'$baseurl' => z_root(),
-			'$nickname' => App::$profile['channel_address'],
-			'$items' => $r,
-			'$overview' => t('Overview')
-		));
-	}
-}
-
-function widget_chatroom_members() {
-	$o = replace_macros(get_markup_template('chatroom_members.tpl'), array(
-		'$header' => t('Chat Members')
-	));
-
-	return $o;
-}
-
-function widget_wiki_list($arr) {
-
-	$channel = channelx_by_n(App::$profile_uid);
-
-	$wikis = Zotlabs\Lib\NativeWiki::listwikis($channel,get_observer_hash());
-
-	if($wikis) {
-		return replace_macros(get_markup_template('wikilist_widget.tpl'), array(
-			'$header' => t('Wiki List'),
-			'$channel' => $channel['channel_address'],
-			'$wikis' => $wikis['wikis']
-		));
-	}
-	return '';
-}
-
-function widget_wiki_pages($arr) {
-
-	$channelname = ((array_key_exists('channel',$arr)) ? $arr['channel'] : '');
-	$c = channelx_by_nick($channelname);
-
-	$wikiname = '';
-	if (array_key_exists('refresh', $arr)) {
-		$not_refresh = (($arr['refresh']=== true) ? false : true);
-	} else {
-		$not_refresh = true;
-	}
-	$pages = array();
-	if (! array_key_exists('resource_id', $arr)) {
-		$hide = true;
-	} else {
-		$p = Zotlabs\Lib\NativeWikiPage::page_list($c['channel_id'],get_observer_hash(),$arr['resource_id']);
-
-		if($p['pages']) {
-			$pages = $p['pages'];
-			$w = $p['wiki'];
-			// Wiki item record is $w['wiki']
-			$wikiname = $w['urlName'];
-			if (!$wikiname) {
-				$wikiname = '';
-			}
-		}
-	}
-	$can_create = perm_is_allowed(\App::$profile['uid'],get_observer_hash(),'write_wiki');
-
-	$can_delete = ((local_channel() && (local_channel() == \App::$profile['uid'])) ? true : false);
-
-	return replace_macros(get_markup_template('wiki_page_list.tpl'), array(
-			'$hide' => $hide,
-			'$resource_id' => $arr['resource_id'],
-			'$not_refresh' => $not_refresh,
-			'$header' => t('Wiki Pages'),
-			'$channel' => $channelname,
-			'$wikiname' => $wikiname,
-			'$pages' => $pages,
-			'$canadd' => $can_create,
-			'$candel' => $can_delete,
-			'$addnew' => t('Add new page'),
-			'$pageName' => array('pageName', t('Page name')),
-	));
-}
-
-function widget_wiki_page_history($arr) {
-
-	$pageUrlName = ((array_key_exists('pageUrlName', $arr)) ? $arr['pageUrlName'] : '');
-	$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : '');
-
-	$pageHistory = Zotlabs\Lib\NativeWikiPage::page_history(array('channel_id' => App::$profile_uid, 'observer_hash' => get_observer_hash(), 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
-	return replace_macros(get_markup_template('nwiki_page_history.tpl'), array(
-		'$pageHistory' => $pageHistory['history'],
-		'$permsWrite' => $arr['permsWrite'],
-		'$name_lbl' => t('Name'),
-		'$msg_label' => t('Message','wiki_history')
-	));
-
-}
-
-function widget_bookmarkedchats($arr) {
-
-	if(! feature_enabled(App::$profile['profile_uid'],'ajaxchat'))
-		return '';
-
-	$h = get_observer_hash();
-	if(! $h)
-		return;
-	$r = q("select xchat_url, xchat_desc from xchat where xchat_xchan = '%s' order by xchat_desc",
-		dbesc($h)
-	);
-	if($r) {
-		for($x = 0; $x < count($r); $x ++) {
-			$r[$x]['xchat_url'] = zid($r[$x]['xchat_url']);
-		}
-	}
-	return replace_macros(get_markup_template('bookmarkedchats.tpl'),array(
-		'$header' => t('Bookmarked Chatrooms'),
-		'$rooms' => $r
-	));
-}
-
-function widget_suggestedchats($arr) {
-
-	if(! feature_enabled(App::$profile['profile_uid'],'ajaxchat'))
-		return '';
-
-	// There are reports that this tool does not ever remove chatrooms on dead sites,
-	// and also will happily link to private chats which you cannot enter.
-	// For those reasons, it will be disabled until somebody decides it's worth
-	// fixing and comes up with a plan for doing so.
-
-	return '';
-
-
-	// probably should restrict this to your friends, but then the widget will only work
-	// if you are logged in locally.
-
-	$h = get_observer_hash();
-	if(! $h)
-		return;
-	$r = q("select xchat_url, xchat_desc, count(xchat_xchan) as total from xchat group by xchat_url, xchat_desc order by total desc, xchat_desc limit 24");
-	if($r) {
-		for($x = 0; $x < count($r); $x ++) {
-			$r[$x]['xchat_url'] = zid($r[$x]['xchat_url']);
-		}
-	}
-	return replace_macros(get_markup_template('bookmarkedchats.tpl'),array(
-		'$header' => t('Suggested Chatrooms'),
-		'$rooms' => $r
-	));
-}
-
-function widget_item($arr) {
-
-	$channel_id = 0;
-	if(array_key_exists('channel_id',$arr) && intval($arr['channel_id']))
-		$channel_id = intval($arr['channel_id']);
-	if(! $channel_id)
-		$channel_id = App::$profile_uid;
-	if(! $channel_id)
-		return '';
-
-
-	if((! $arr['mid']) && (! $arr['title']))
-		return '';
-
-	if(! perm_is_allowed($channel_id, get_observer_hash(), 'view_pages'))
-		return '';
-
-	require_once('include/security.php');
-	$sql_extra = item_permissions_sql($channel_id);
-
-	if($arr['title']) {
-		$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
-			where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s'
-			and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1",
-			intval($channel_id),
-			dbesc($arr['title']),
-			intval(ITEM_TYPE_WEBPAGE)
-		);
-	}
-	else {
-		$r = q("select * from item where mid = '%s' and uid = %d and item_type = " . intval(ITEM_TYPE_WEBPAGE) . " $sql_extra limit 1",
-			dbesc($arr['mid']),
-			intval($channel_id)
-		);
-	}
-
-	if(! $r)
-		return '';
-
-	xchan_query($r);
-	$r = fetch_post_tags($r, true);
-
-	$o = prepare_page($r[0]);
-	return $o;
-}
-
-function widget_clock($arr) {
-
-	$miltime = 0;
-	if(isset($arr['military']) && $arr['military'])
-		$miltime = 1;
-
-$o = <<< EOT
-<div class="widget">
-<h3 class="clockface"></h3>
-<script>
-
-var timerID = null
-var timerRunning = false
-
-function stopclock(){
-    if(timerRunning)
-        clearTimeout(timerID)
-    timerRunning = false
-}
-
-function startclock(){
-    stopclock()
-    showtime()
-}
-
-function showtime(){
-    var now = new Date()
-    var hours = now.getHours()
-    var minutes = now.getMinutes()
-    var seconds = now.getSeconds()
-	var military = $miltime
-    var timeValue = ""
-	if(military)
-		timeValue = hours
-	else
-		timeValue = ((hours > 12) ? hours - 12 : hours)
-    timeValue  += ((minutes < 10) ? ":0" : ":") + minutes
-//    timeValue  += ((seconds < 10) ? ":0" : ":") + seconds
-	if(! military)
-	    timeValue  += (hours >= 12) ? " P.M." : " A.M."
-    $('.clockface').html(timeValue)
-    timerID = setTimeout("showtime()",1000)
-    timerRunning = true
-}
-
-$(document).ready(function() {
-	startclock();
-});
-
-</script>
-</div>
-EOT;
-return $o;
-
-}
-
-/**
- * @brief Widget to display a single photo.
- *
- * @param array $arr associative array with
- *    * \e string \b src URL of photo; URL must be an http or https URL
- *    * \e boolean \b zrl use zid in URL
- *    * \e string \b style CSS string
- *
- * @return string with parsed HTML
- */
-function widget_photo($arr) {
-
-	$style = $zrl = false;
-
-	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(strpbrk($style, '(\'"<>') !== false)
-		$style = '';
-
-	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 . '" alt="' . t('photo/image') . '">';
-
-	$o .= '</div>';
-
-	return $o;
-}
-
-
-function widget_cover_photo($arr) {
-
-	require_once('include/channel.php');
-	$o = '';
-
-	if(App::$module == 'channel' && $_REQUEST['mid'])
-		return '';
-
-	$channel_id = 0;
-	if(array_key_exists('channel_id', $arr) && intval($arr['channel_id']))
-		$channel_id = intval($arr['channel_id']);
-	if(! $channel_id)
-		$channel_id = App::$profile_uid;
-	if(! $channel_id)
-		return '';
-
-	$channel = channelx_by_n($channel_id);
-
-	if(array_key_exists('style', $arr) && isset($arr['style']))
-		$style = $arr['style'];
-	else
-		$style = 'width:100%; height: auto;';
-
-	// ensure they can't sneak in an eval(js) function
-
-	if(strpbrk($style,'(\'"<>') !== false)
-		$style = '';
-
-	if(array_key_exists('title', $arr) && isset($arr['title']))
-		$title = $arr['title'];
-	else
-		$title = $channel['channel_name'];
-
-	if(array_key_exists('subtitle', $arr) && isset($arr['subtitle']))
-		$subtitle = $arr['subtitle'];
-	else
-		$subtitle = str_replace('@','&#x40;',$channel['xchan_addr']);
-
-	$c = get_cover_photo($channel_id,'html');
-
-	if($c) {
-		$photo_html = (($style) ? str_replace('alt=',' style="' . $style . '" alt=',$c) : $c);
-
-		$o = replace_macros(get_markup_template('cover_photo_widget.tpl'),array(
-			'$photo_html'	=> $photo_html,
-			'$title'	=> $title,
-			'$subtitle'	=> $subtitle,
-			'$hovertitle' => t('Click to show more'),
-		));
-	}
-	return $o;
-}
-
-
-function widget_photo_rand($arr) {
-
-	require_once('include/photos.php');
-	$style = false;
-
-	if(array_key_exists('album', $arr) && isset($arr['album']))
-		$album = $arr['album'];
-	else
-		$album = '';
-
-	$channel_id = 0;
-	if(array_key_exists('channel_id', $arr) && intval($arr['channel_id']))
-		$channel_id = intval($arr['channel_id']);
-	if(! $channel_id)
-		$channel_id = App::$profile_uid;
-	if(! $channel_id)
-		return '';
-
-	$scale = ((array_key_exists('scale',$arr)) ? intval($arr['scale']) : 0);
-
-	$ret = photos_list_photos(array('channel_id' => $channel_id),App::get_observer(),$album);
-
-	$filtered = array();
-	if($ret['success'] && $ret['photos'])
-	foreach($ret['photos'] as $p)
-		if($p['imgscale'] == $scale)
-			$filtered[] = $p['src'];
-
-	if($filtered) {
-		$e = mt_rand(0, count($filtered) - 1);
-		$url = $filtered[$e];
-	}
-
-	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 '';
-
-	$url = zid($url);
-
-	$o = '<div class="widget">';
-
-	$o .= '<img class="zrl" '
-		. (($style) ? ' style="' . $style . '"' : '')
-		. ' src="' . $url . '" alt="' . t('photo/image') . '">';
-
-	$o .= '</div>';
-
-	return $o;
-}
-
-
-function widget_random_block($arr) {
-
-	$channel_id = 0;
-	if(array_key_exists('channel_id',$arr) && intval($arr['channel_id']))
-		$channel_id = intval($arr['channel_id']);
-	if(! $channel_id)
-		$channel_id = App::$profile_uid;
-	if(! $channel_id)
-		return '';
-
-	if(array_key_exists('contains',$arr))
-		$contains = $arr['contains'];
-
-	$o = '';
-
-	require_once('include/security.php');
-	$sql_options = item_permissions_sql($channel_id);
-
-	$randfunc = db_getfunc('RAND');
-
-	$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
-		where item.uid = %d and iconfig.cat = 'system' and iconfig.v like '%s' and iconfig.k = 'BUILDBLOCK' and
-		item_type = %d $sql_options order by $randfunc limit 1",
-		intval($channel_id),
-		dbesc('%' . $contains . '%'),
-		intval(ITEM_TYPE_BLOCK)
-	);
-
-	if($r) {
-		$o = '<div class="widget bblock">';
-		if($r[0]['title'])
-			$o .= '<h3>' . $r[0]['title'] . '</h3>';
-
-		$o .= prepare_text($r[0]['body'],$r[0]['mimetype']);
-		$o .= '</div>';
-	}
-
-	return $o;
-}
-
-
-function widget_rating($arr) {
-
-
-	$rating_enabled = get_config('system','rating_enabled');
-	if(! $rating_enabled) {
-		return;
-	}
-
-	if($arr['target'])
-		$hash = $arr['target'];
-	else
-		$hash = App::$poi['xchan_hash'];
-
-	if(! $hash)
-		return;
-
-	$url = '';
-	$remote = false;
-
-	if(remote_channel() && ! local_channel()) {
-		$ob = App::get_observer();
-		if($ob && $ob['xchan_url']) {
-			$p = parse_url($ob['xchan_url']);
-			if($p) {
-				$url = $p['scheme'] . '://' . $p['host'] . (($p['port']) ? ':' . $p['port'] : '');
-				$url .= '/rate?f=&target=' . urlencode($hash);
-			}
-			$remote = true;
-		}
-	}
-
-	$self = false;
-
-	if(local_channel()) {
-		$channel = App::get_channel();
-
-		if($hash == $channel['channel_hash'])
-			$self = true;
-
-		head_add_js('ratings.js');
-
-	}
-
-
-	$o = '<div class="widget">';
-	$o .= '<h3>' . t('Rating Tools') . '</h3>';
-
-	if((($remote) || (local_channel())) && (! $self)) {
-		if($remote)
-			$o .= '<a class="btn btn-block btn-primary btn-sm" href="' . $url . '"><i class="fa fa-pencil"></i> ' . t('Rate Me') . '</a>';
-		else
-			$o .= '<div class="btn btn-block btn-primary btn-sm" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="fa fa-pencil"></i> ' . t('Rate Me') . '</div>';
-	}
-
-	$o .= '<a class="btn btn-block btn-default btn-sm" href="ratings/' . $hash . '"><i class="fa fa-eye"></i> ' . t('View Ratings') . '</a>';
-	$o .= '</div>';
-
-	return $o;
-
-}
-
-// used by site ratings pages to provide a return link
-function widget_pubsites($arr) {
-	if(App::$poi)
-		return;
-	return '<div class="widget"><ul class="nav nav-pills"><li><a href="pubsites">' . t('Public Hubs') . '</a></li></ul></div>';
-}
-
-
-function widget_forums($arr) {
-
-	if(! local_channel())
-		return '';
-
-	$o = '';
-
-	if(is_array($arr) && array_key_exists('limit',$arr))
-		$limit = " limit " . intval($limit) . " ";
-	else
-		$limit = '';
-
-	$unseen = 0;
-	if(is_array($arr) && array_key_exists('unseen',$arr) && intval($arr['unseen']))
-		$unseen = 1;
-
-	$perms_sql = item_permissions_sql(local_channel()) . item_normal();
-
-	$xf = false;
-
-	$x1 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'send_stream' and v = '0'",
-		intval(local_channel())
-	);
-	if($x1) {
-		$xc = ids_to_querystr($x1,'xchan',true);
-		$x2 = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'tag_deliver' and v = '1' and xchan in (" . $xc . ") ",
-			intval(local_channel())
-		);
-		if($x2)
-			$xf = ids_to_querystr($x2,'xchan',true);
-	}
-
-	$sql_extra = (($xf) ? " and ( xchan_hash in (" . $xf . ") or xchan_pubforum = 1 ) " : " and xchan_pubforum = 1 "); 
-
-	$r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_deleted = 0 and abook_channel = %d $sql_extra order by xchan_name $limit ",
-		intval(local_channel())
-	);
-	if(! $r1)
-		return $o;
-
-	$str = '';
-
-	// Trying to cram all this into a single query with joins and the proper group by's is tough.
-	// There also should be a way to update this via ajax.
-
-	for($x = 0; $x < count($r1); $x ++) {
-		$r = q("select sum(item_unseen) as unseen from item where owner_xchan = '%s' and uid = %d and item_unseen = 1 $perms_sql ",
-			dbesc($r1[$x]['xchan_hash']),
-			intval(local_channel())
-		);
-		if($r)
-			$r1[$x]['unseen'] = $r[0]['unseen'];
-
-/**
- * @FIXME
- * This SQL makes the counts correct when you get forum posts arriving from different routes/sources
- * (like personal channels). However the network query for these posts doesn't yet include this
- * correction and it makes the SQL for that query pretty hairy so this is left as a future exercise.
- * It may make more sense in that query to look for the mention in the body rather than another join,
- * but that makes it very inefficient.
- *
-		$r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
-			intval(TERM_OBJ_POST),
-			dbesc($r1[$x]['xchan_hash']),
-			intval(local_channel()),
-			dbesc($r1[$x]['xchan_url']),
-			intval(TERM_MENTION)
-		);
-		if($r)
-			$r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
- *
- * end @FIXME
- */
-
-	}
-
-	if($r1) {
-		$o .= '<div class="widget">';
-		$o .= '<h3>' . t('Forums') . '</h3><ul class="nav nav-pills flex-column">';
-
-		foreach($r1 as $rr) {
-			if($unseen && (! intval($rr['unseen'])))
-				continue;
-			$o .= '<li class="nav-item"><a class="nav-link" href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge badge-default float-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img class ="menu-img-1" src="' . $rr['xchan_photo_s'] . '" /> ' . $rr['xchan_name'] . '</a></li>';
-		}
-		$o .= '</ul></div>';
-	}
-	return $o;
-
-}
-
-
-function widget_activity($arr) {
-
-	if(! local_channel())
-		return '';
-
-	$o = '';
-
-	if(is_array($arr) && array_key_exists('limit',$arr))
-		$limit = " limit " . intval($limit) . " ";
-	else
-		$limit = '';
-
-	$perms_sql = item_permissions_sql(local_channel()) . item_normal();
-
-	$r = q("select author_xchan from item where item_unseen = 1 and uid = %d $perms_sql",
-		intval(local_channel())
-	);
-
-	$contributors = [];
-	$arr = [];
-
-	if($r) {
-		foreach($r as $rv) {
-			if(array_key_exists($rv['author_xchan'],$contributors)) {
-				$contributors[$rv['author_xchan']] ++;
-			}
-			else {
-				$contributors[$rv['author_xchan']] = 1;
-			}
-		}
-		foreach($contributors as $k => $v) {
-			$arr[] = [ 'author_xchan' => $k, 'total' => $v	];	
-		}
-		usort($arr,'total_sort');
-		xchan_query($arr);
-	}
-
-	$x = [ 'entries' => $arr ];
-	call_hooks('activity_widget',$x);
-	$arr = $x['entries']; 
-
-	if($arr) {
-		$o .= '<div class="widget">';
-		$o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav nav-pills flex-column">';
-
-		foreach($arr as $rv) {
-			$o .= '<li class="nav-item"><a class="nav-link" href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge badge-default float-right">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" class="menu-img-1" /> ' . $rv['author']['xchan_name'] . '</a></li>';
-		}
-		$o .= '</ul></div>';
-	}
-	return $o;
-
-}
-
-
-
-
-function widget_tasklist($arr) {
-
-	if (! local_channel())
-		return;
-
-	require_once('include/event.php');
-	$o .= '<script>var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});</script>';
-	$o .= '<script>function taskComplete(id) { $.post("tasks/complete/"+id, function(data) { tasksFetch();}); }
-		function tasksFetch() {
-			$.get("tasks/fetch" + ((tasksShowAll) ? "/all" : ""), function(data) {
-				$(".tasklist-tasks").html(data.html);
-			});
-		}
-		</script>';
-
-	$o .= '<div class="widget">' . '<h3>' . t('Tasks') . '</h3><div class="tasklist-tasks">';
-	$o .= '</div><form id="tasklist-new-form" action="" ><input class="form-control" id="tasklist-new-summary" type="text" name="summary" value="" /></form>';
-	$o .= '</div>';
-	return $o;
-
-}
-
-
-function widget_helpindex($arr) {
-
-	$o .= '<div class="widget">';
-
-	$level_0 = get_help_content('sitetoc');
-	if(! $level_0)
-		$level_0 = get_help_content('toc');
-
-	$level_0 = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills flex-column">',$level_0);
-
-	$levels = array();
-
-
-	if(argc() > 2) {
-		$path = '';
-		for($x = 1; $x < argc(); $x ++) {
-			$path .= argv($x) . '/';
-			$y = get_help_content($path . 'sitetoc');
-			if(! $y)
-				$y = get_help_content($path . 'toc');
-			if($y)
-				$levels[] = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills flex-column">',$y);
-		}
-	}
-
-	if($level_0)
-		$o .= $level_0;
-	if($levels) {
-		foreach($levels as $l) {
-			$o .= '<br /><br />';
-			$o .= $l;
-		}
-	}
-
-	$o .= '</div>';
-
-	return $o;
-
-}
-
-
-
-function widget_admin($arr) {
-
-	/*
-	 * Side bar links
-	 */
-
-	if(! is_site_admin()) {
-		return '';
-	}
-
-	$o = '';
-
-	// array( url, name, extra css classes )
-
-	$aside = array(
-		'site'      => array(z_root() . '/admin/site/',     t('Site'),           'site'),
-		'accounts'  => array(z_root() . '/admin/accounts/', t('Accounts'),       'accounts', 'pending-update', t('Member registrations waiting for confirmation')),
-		'channels'  => array(z_root() . '/admin/channels/', t('Channels'),       'channels'),
-		'security'  => array(z_root() . '/admin/security/', t('Security'),       'security'),
-		'features'  => array(z_root() . '/admin/features/', t('Features'),       'features'),
-		'plugins'   => array(z_root() . '/admin/plugins/',  t('Plugins'),        'plugins'),
-		'themes'    => array(z_root() . '/admin/themes/',   t('Themes'),         'themes'),
-		'queue'     => array(z_root() . '/admin/queue',     t('Inspect queue'),  'queue'),
-		'profs'     => array(z_root() . '/admin/profs',     t('Profile Fields'), 'profs'),
-		'dbsync'    => array(z_root() . '/admin/dbsync/',   t('DB updates'),     'dbsync')
-
-	);
-
-	/* get plugins admin page */
-
-	$r = q("SELECT * FROM addon WHERE plugin_admin = 1");
-
-	$plugins = array();
-	if($r) {
-		foreach ($r as $h){
-			$plugin = $h['aname'];
-			$plugins[] = array(z_root() . '/admin/plugins/' . $plugin, $plugin, 'plugin');
-			// temp plugins with admin
-			App::$plugins_admin[] = $plugin;
-		}
-	}
-
-	$logs = array(z_root() . '/admin/logs/', t('Logs'), 'logs');
-
-	$arr = array('links' => $aside,'plugins' => $plugins,'logs' => $logs);
-	call_hooks('admin_aside',$arr);
-
-	$o .= replace_macros(get_markup_template('admin_aside.tpl'), array(
-			'$admin' => $aside,
-			'$admtxt' => t('Admin'),
-			'$plugadmtxt' => t('Plugin Features'),
-			'$plugins' => $plugins,
-			'$logtxt' => t('Logs'),
-			'$logs' => $logs,
-			'$h_pending' => t('Member registrations waiting for confirmation'),
-			'$admurl'=> z_root() . '/admin/'
-	));
-
-	return $o;
-
-}
-
-
-
-function widget_album($args) {
-
-	$owner_uid = App::$profile_uid;
-	$sql_extra = permissions_sql($owner_uid);
-
-
-	if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage'))
-		return '';
-
-	if($args['album'])
-		$album = $args['album'];
-	if($args['title'])
-		$title = $args['title'];
-
-	/**
-	 * This may return incorrect permissions if you have multiple directories of the same name.
-	 * It is a limitation of the photo table using a name for a photo album instead of a folder hash
-	 */
-
-	if($album) {
-		$x = q("select hash from attach where filename = '%s' and uid = %d limit 1",
-			dbesc($album),
-			intval($owner_uid)
-		);
-		if($x) {
-			$y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']);
-			if(! $y)
-				return '';
-		}
-	}
-
-	$order = 'DESC';
-
-	$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
-		(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph
-		ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
-		ORDER BY created $order ",
-		intval($owner_uid),
-		dbesc($album),
-		intval(PHOTO_NORMAL),
-		intval(PHOTO_PROFILE)
-	);
-
-	//edit album name
-	$album_edit = null;
-
-	$photos = array();
-	if($r) {
-		$twist = 'rotright';
-		foreach($r as $rr) {
-
-			if($twist == 'rotright')
-				$twist = 'rotleft';
-			else
-				$twist = 'rotright';
-
-			$ext = $phototypes[$rr['mimetype']];
-
-			$imgalt_e = $rr['filename'];
-			$desc_e = $rr['description'];
-
-			$imagelink = (z_root() . '/photos/' . App::$profile['channel_address'] . '/image/' . $rr['resource_id']);
-
-
-			$photos[] = array(
-				'id' => $rr['id'],
-				'twist' => ' ' . $twist . rand(2,4),
-				'link' => $imagelink,
-				'title' => t('View Photo'),
-				'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
-				'alt' => $imgalt_e,
-				'desc'=> $desc_e,
-				'ext' => $ext,
-				'hash'=> $rr['resource_id'],
-				'unknown' => t('Unknown')
-			);
-		}
-	}
-
-
-	$tpl = get_markup_template('photo_album.tpl');
-	$o .= replace_macros($tpl, array(
-		'$photos' => $photos,
-		'$album' => (($title) ? $title : $album),
-		'$album_id' => rand(),
-		'$album_edit' => array(t('Edit Album'), $album_edit),
-		'$can_post' => false,
-		'$upload' => array(t('Upload'), z_root() . '/photos/' . App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
-		'$order' => false,
-		'$upload_form' => $upload_form,
-		'$usage' => $usage_message
-	));
-
-	return $o;
-}
-

From a572609dbd106730733e275da421f18fca9b78f4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 25 Mar 2017 14:42:40 -0700
Subject: [PATCH 072/299] widget file update

---
 Zotlabs/Widget/Helpindex.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Widget/Helpindex.php b/Zotlabs/Widget/Helpindex.php
index 62cecce1f..f23e73e75 100644
--- a/Zotlabs/Widget/Helpindex.php
+++ b/Zotlabs/Widget/Helpindex.php
@@ -12,7 +12,7 @@ class Helpindex {
 		if(! $level_0)
 			$level_0 = get_help_content('toc');
 
-		$level_0 = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills nav-stacked">',$level_0);
+		$level_0 = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills flex-column">',$level_0);
 
 		$levels = array();
 
@@ -25,7 +25,7 @@ class Helpindex {
 				if(! $y)
 					$y = get_help_content($path . 'toc');
 				if($y)
-					$levels[] = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills nav-stacked">',$y);
+					$levels[] = preg_replace('/\<ul(.*?)\>/','<ul class="nav nav-pills flex-column">',$y);
 			}
 		}
 

From 66fcea0ad8e5a81e0bc8f2de5fe6bb93bc66e5c2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 25 Mar 2017 14:49:18 -0700
Subject: [PATCH 073/299] update license

---
 LICENSE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 580742e56..0b96001d4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 Copyright (c) 2010-2017 Mike Macgirvin
 All rights reserved.
 
-Portions of this work created prior to March 2017 MAY be 
-available under the terms of the Hubzilla project license.
+No license for use or copy is granted without express written permission.
+

From dc59817a9d683d9a262397f3b4d6909e44779847 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 25 Mar 2017 14:50:47 -0700
Subject: [PATCH 074/299] use the long form legal text.

---
 LICENSE | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 0b96001d4..1a47b09d2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,6 @@
 Copyright (c) 2010-2017 Mike Macgirvin
 All rights reserved.
 
-No license for use or copy is granted without express written permission.
+No license for use, copy, modify, merge, publish, distribute, 
+sublicense, and/or sell is granted without express written permission.
 

From 3e6088c6142d1dabbfdbb8b5df276ae942bd3554 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 27 Mar 2017 15:49:48 -0700
Subject: [PATCH 075/299] add 'author_is_pmable()' function with plugin hooks
 to control whether or not to display a 'send mail' link in the thread author
 menu.

---
 doc/hook/author_is_pmable.bb | 14 ++++++++++++++
 doc/hooklist.bb              |  5 ++++-
 include/conversation.php     | 26 ++++++++++++++++++++++++--
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 doc/hook/author_is_pmable.bb

diff --git a/doc/hook/author_is_pmable.bb b/doc/hook/author_is_pmable.bb
new file mode 100644
index 000000000..708350673
--- /dev/null
+++ b/doc/hook/author_is_pmable.bb
@@ -0,0 +1,14 @@
+[h2]author_is_pmable[/h2]
+
+Called from thread action menu before returning a 'send mail' link for the post author. Not all authors will be able to receive private mail, for instance those on other networks with incompatible mail systems. 
+
+By default author_is_pmable() returns true for 'zot' xchans, and false for all others.
+
+The plugin is passed an array
+
+  [ 'xchan' => $author_xchan, 'result' => 'unset' ]
+
+A plugin which sets the 'result' to something besides 'unset' will over-ride the default behaviour. A value of true will enable the 'send mail' link and the private mail recipient will be set to the author's xchan_hash.  A value of false will disable the 'send mail' link. 
+
+
+
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index 137bc1b38..6933edad2 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -28,7 +28,7 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/account_settings]account_settings[/zrl]
 	Called when generating the account settings form
 
-[zrl=[baseurl]/help/hook/settings_account]account_settings_post[/zrl]
+[zrl=[baseurl]/help/hook/account_settings_post]account_settings_post[/zrl]
 	Called when posting from the account settings form
 
 [zrl=[baseurl]/help/hook/activity_received]activity_received[/zrl]
@@ -64,6 +64,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/authenticate]authenticate[/zrl]
 	Can provide alternate authentication mechanisms
 
+[zrl=[baseurl]/help/hook/author_is_pmable]author_is_pmable[/zrl]
+	Called from the thread action menu to determine if we can send private mail to the post author
+
 [zrl=[baseurl]/help/hook/bb2diaspora]bb2diaspora[/zrl]
 	called when converting bbcode to markdown
 
diff --git a/include/conversation.php b/include/conversation.php
index b4f959afa..5b2d60583 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -917,6 +917,24 @@ function thread_action_menu($item,$mode = '') {
 
 }
 
+function author_is_pmable($xchan) {
+
+	$x = [ 'xchan' => $xchan, 'result' => 'unset' ];
+	call_hooks('author_is_pmable',$x);
+	if($x['result'] !== 'unset')
+		return $x['result'];
+	
+	if($xchan['xchan_network'] === 'zot')
+		return true;
+	return false;
+
+}
+
+
+
+
+
+
 function thread_author_menu($item, $mode = '') {
 
 	$menu = [];
@@ -932,8 +950,6 @@ function thread_author_menu($item, $mode = '') {
 
 	$profile_link = chanlink_hash($item['author_xchan']);
 
-	if($item['uid'] > 0)
-		$pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']);
 
 	if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts))
 		$contact = App::$contacts[$item['author_xchan']];
@@ -941,6 +957,12 @@ function thread_author_menu($item, $mode = '') {
 		if($local_channel && $item['author']['xchan_addr'])
 			$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
 
+	
+	if($item['uid'] > 0 && author_is_pmable($item['author']))
+		$pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']);
+
+
+
 	if($contact) {
 		$poke_link = z_root() . '/poke/?f=&c=' . $contact['abook_id'];
 		if (! intval($contact['abook_self']))  

From c5828fecc1fadb4db705bbf94edfa7ff873b491a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 16:02:47 -0700
Subject: [PATCH 076/299] get rid of get_app()

---
 Zotlabs/Module/Setup.php     |  2 --
 Zotlabs/Storage/Browser.php  |  5 +++--
 boot.php                     | 12 ------------
 doc/dev-function-overview.md |  4 ----
 include/message.php          |  2 --
 tests/unit/template_test.php |  6 ------
 util/fresh                   |  2 --
 7 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index e114dfc0b..d6d7eeb05 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -617,7 +617,6 @@ class Setup extends \Zotlabs\Web\Controller {
 	 * @param[out] array &$checks
 	 */
 	function check_htaccess(&$checks) {
-		$a = get_app();
 		$status = true;
 		$help = '';
 		$ssl_error = false;
@@ -711,7 +710,6 @@ class Setup extends \Zotlabs\Web\Controller {
 	 * @return string with parsed HTML
 	 */
 	function what_next() {
-		$a = get_app();
 		// install the standard theme
 		set_config('system', 'allowed_themes', 'redbasic');
 
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index 3fdc8e9d4..c501379d8 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -84,7 +84,6 @@ class Browser extends DAV\Browser\Plugin {
 		require_once('include/conversation.php');
 		require_once('include/text.php');
 		if ($this->auth->owner_nick) {
-			//$html = profile_tabs(get_app(), (($is_owner) ? true : false), $this->auth->owner_nick);
 			$html = '';
 		}
 
@@ -241,7 +240,9 @@ class Browser extends DAV\Browser\Plugin {
 				'$nick' => $this->auth->getCurrentUser()
 			));
 
-		$a = get_app();
+
+		$a = false;
+
 		\App::$page['content'] = $html;
 		load_pdl($a);
 
diff --git a/boot.php b/boot.php
index f5f25b471..c4f76ddf7 100755
--- a/boot.php
+++ b/boot.php
@@ -1223,18 +1223,6 @@ class App {
 } // End App class
 
 
-/**
- * @brief Retrieve the App structure.
- *
- * Useful in functions which require it but don't get it passed to them
- *
- * @return App
- */
-function get_app() {
-	return $a;
-}
-
-
 /**
  * @brief Multi-purpose function to check variable state.
  *
diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md
index fa8a98ff3..cd2526ead 100644
--- a/doc/dev-function-overview.md
+++ b/doc/dev-function-overview.md
@@ -15,10 +15,6 @@ Returns authenticated numeric channel_id if authenticated and connected to a cha
 
 Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string.
 
-* get_app()
-
-Returns the global app structure ($a). No longer used as App is a static class
-
 * App::get_observer()
 
 returns an xchan structure representing the current viewer if authenticated (locally or remotely).
diff --git a/include/message.php b/include/message.php
index bde07afd8..da3514184 100644
--- a/include/message.php
+++ b/include/message.php
@@ -13,10 +13,8 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 	$ret = array('success' => false);
 	$is_reply = false;
 
-	$a = get_app();
 	$observer_hash = get_observer_hash();
 
-
 	if($uid) {
 		$r = q("select * from channel where channel_id = %d limit 1",
 			intval($uid)
diff --git a/tests/unit/template_test.php b/tests/unit/template_test.php
index 1f9f80531..dfaecb4a1 100644
--- a/tests/unit/template_test.php
+++ b/tests/unit/template_test.php
@@ -25,12 +25,6 @@ function x($s,$k = NULL) {
 }
 }
 
-if(!function_exists('get_app')) {
-function get_app() {
-	return new TemplateMockApp();
-}
-}
-
 /**
  * TestCase for the template engine
  *
diff --git a/util/fresh b/util/fresh
index 7f57931aa..0482d1215 100755
--- a/util/fresh
+++ b/util/fresh
@@ -44,8 +44,6 @@ fresh_main($argc,$argv);
 
 function process_command($line) {
 
-	$a = get_app();
-
 	// split args
 
 	App::$cmd = $line;

From 046e5e239fd28996f8c658900a83c33dbe0011ba Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 16:07:22 -0700
Subject: [PATCH 077/299] remove obsolete app argument from load_pdl

---
 Zotlabs/Storage/Browser.php | 2 +-
 Zotlabs/Web/Router.php      | 2 +-
 boot.php                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index c501379d8..b7d90b237 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -244,7 +244,7 @@ class Browser extends DAV\Browser\Plugin {
 		$a = false;
 
 		\App::$page['content'] = $html;
-		load_pdl($a);
+		load_pdl();
 
 		$current_theme = \Zotlabs\Render\Theme::current();
 
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php
index 948f073d6..3190369c8 100644
--- a/Zotlabs/Web/Router.php
+++ b/Zotlabs/Web/Router.php
@@ -202,7 +202,7 @@ class Router {
 			 * The member may have also created a customised PDL that's stored in the config
 			 */
 
-			load_pdl($a);
+			load_pdl();
 
 			/*
 		 	 * load current theme info
diff --git a/boot.php b/boot.php
index c4f76ddf7..2b3e90167 100755
--- a/boot.php
+++ b/boot.php
@@ -1996,7 +1996,7 @@ function get_custom_nav(&$a, $navname) {
  *
  * @param App &$a global application object
  */
-function load_pdl(&$a) {
+function load_pdl() {
 
 	App::$comanche = new Zotlabs\Render\Comanche();
 

From 879350b658002b38881ba9416fa8faf93d5ae9be Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 16:21:20 -0700
Subject: [PATCH 078/299] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 907406350..95e136b20 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@ red
 
 This is red.
 
-![red](https://github.com/zotlabs/hubzilla/blob/red/images/red-koala.png?raw=true)
+![red](https://gitlab.com/macgirvin/red/raw/046e5e239fd28996f8c658900a83c33dbe0011ba/images/red-koala.png)

From 69471948245057d0782d34b469984f66c949f292 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 16:30:02 -0700
Subject: [PATCH 079/299] license update

---
 LICENSE | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 1a47b09d2..abae6bf44 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,9 @@
 Copyright (c) 2010-2017 Mike Macgirvin
 All rights reserved.
 
-No license for use, copy, modify, merge, publish, distribute, 
-sublicense, and/or sell is granted without express written permission.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

From 323ab3dba4a925cf2519c5c9eee9b82683dc7d5d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 17:00:44 -0700
Subject: [PATCH 080/299] get rid of some more deprecated uses of $a

---
 Zotlabs/Storage/Browser.php |  2 +-
 Zotlabs/Web/WebServer.php   |  2 +-
 boot.php                    | 12 +++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index b7d90b237..7162161ef 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -257,7 +257,7 @@ class Browser extends DAV\Browser\Plugin {
 			}
 		}
 		$this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
-		construct_page($a);
+		construct_page();
 	}
 
 	/**
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index 9c9f0483a..4e8dc6786 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -133,7 +133,7 @@ class WebServer {
 
 		call_hooks('page_end', \App::$page['content']);
 
-		construct_page($a);
+		construct_page();
 
 		killme();
 	}
diff --git a/boot.php b/boot.php
index 2b3e90167..8a269fbca 100755
--- a/boot.php
+++ b/boot.php
@@ -1982,7 +1982,7 @@ function curPageURL() {
  *
  * @return mixed
  */
-function get_custom_nav(&$a, $navname) {
+function get_custom_nav($navname) {
 	if (! $navname)
 		return App::$page['nav'];
 	// load custom nav menu by name here
@@ -1994,7 +1994,6 @@ function get_custom_nav(&$a, $navname) {
  * If there is no parsed Comanche template already load a module's pdl file
  * and parse it with Comanche.
  *
- * @param App &$a global application object
  */
 function load_pdl() {
 
@@ -2023,7 +2022,7 @@ function load_pdl() {
 }
 
 
-function exec_pdl(&$a) {
+function exec_pdl() {
 	if(App::$pdl) {
 		App::$comanche->parse(App::$pdl,1);
 	}
@@ -2035,11 +2034,10 @@ function exec_pdl(&$a) {
  *
  * Build the page - now that we have all the components
  *
- * @param App &$a global application object
  */
-function construct_page(&$a) {
+function construct_page() {
 
-	exec_pdl($a);
+	exec_pdl();
 
 	$comanche = ((count(App::$layout)) ? true : false);
 
@@ -2055,7 +2053,7 @@ function construct_page(&$a) {
 
 	if ($comanche) {
 		if (App::$layout['nav']) {
-			App::$page['nav'] = get_custom_nav($a, App::$layout['nav']);
+			App::$page['nav'] = get_custom_nav(App::$layout['nav']);
 		}
 	}
 

From a54bb07753977c7295929fc207ce80f24cb07baf Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 17:49:48 -0700
Subject: [PATCH 081/299] fix a couple more instances where we were still
 calling mail() directly for site critical messages

---
 boot.php | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/boot.php b/boot.php
index 8a269fbca..e0fa2fe1a 100755
--- a/boot.php
+++ b/boot.php
@@ -2287,19 +2287,19 @@ function z_check_cert() {
  */
 
 function cert_bad_email() {
-
-	$email_tpl = get_intltext_template("cert_bad_eml.tpl");
-	$email_msg = replace_macros($email_tpl, array(
-		'$sitename' => App::$config['system']['sitename'],
-		'$siteurl' =>  z_root(),
-		'$error' => t('Website SSL certificate is not valid. Please correct.')
-	));
-
-	$subject = email_header_encode(sprintf(t('[$Projectname] Website SSL error for %s'), App::get_hostname()));
-	mail(App::$config['system']['admin_email'], $subject, $email_msg,
-		'From: Administrator' . '@' . App::get_hostname() . "\n"
-		. 'Content-type: text/plain; charset=UTF-8' . "\n"
-		. 'Content-transfer-encoding: 8bit' );
+	return z_mail(
+		[
+			'toEmail'        => \App::$config['system']['admin_email'],
+			'messageSubject' => sprintf(t('[$Projectname] Website SSL error for %s'), App::get_hostname()),
+			'textVersion'    => replace_macros(get_intltext_template('cert_bad_eml.tpl'),
+				[
+					'$sitename' => App::$config['system']['sitename'],
+					'$siteurl'  =>  z_root(),
+					'$error'    => t('Website SSL certificate is not valid. Please correct.')
+				]
+			)
+		]
+	);
 }
 
 
@@ -2410,20 +2410,20 @@ function check_cron_broken() {
 		return;
 	}
 
-	$email_tpl = get_intltext_template("cron_bad_eml.tpl");
-	$email_msg = replace_macros($email_tpl, array(
-		'$sitename' => App::$config['system']['sitename'],
-		'$siteurl' =>  z_root(),
-		'$error' => t('Cron/Scheduled tasks not running.'),
-		'$lastdate' => (($d)? $d : t('never'))
-	));
-
-	$subject = email_header_encode(sprintf(t('[$Projectname] Cron tasks not running on %s'), App::get_hostname()));
-	mail(App::$config['system']['admin_email'], $subject, $email_msg,
-		'From: Administrator' . '@' . App::get_hostname() . "\n"
-		. 'Content-type: text/plain; charset=UTF-8' . "\n"
-		. 'Content-transfer-encoding: 8bit' );
-	return;
+	return z_mail(
+		[
+			'toEmail'        => \App::$config['system']['admin_email'],
+			'messageSubject' => sprintf(t('[$Projectname] Cron tasks not running on %s'), App::get_hostname()),
+			'textVersion'    => replace_macros(get_intltext_template('cron_bad_eml.tpl'),
+				[
+					'$sitename' => App::$config['system']['sitename'],
+					'$siteurl'  =>  z_root(),
+					'$error'    => t('Cron/Scheduled tasks not running.'),
+					'$lastdate' => (($d)? $d : t('never'))
+				]
+			)
+		]
+	);
 }
 
 

From ad3a3273660600be7932229a7af0293c1f04e28b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 28 Mar 2017 18:16:40 -0700
Subject: [PATCH 082/299] scaling issue with fa-th and fa-bars icons when using
 boostrap-red.css:37 #navbar-collapse-1 i { font-size 1.0rem; }; FF 52.0.1 on
 Win7; 0.9rem and 1.1rem both render much better. 1.1 is a bit large so going
 with 0.9

---
 view/css/bootstrap-red.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 69886b141..73f71fe7f 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -35,7 +35,7 @@ nav .badge {
 
 
 #navbar-collapse-1 i {
-	font-size: 1rem;
+	font-size: 0.9rem;
 }
 
 nav .dropdown-menu {

From f43428aacf940b84b05e1554cc53e29e60846ae4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 29 Mar 2017 16:16:29 -0700
Subject: [PATCH 083/299] channel_store_lowlevel declared twice

---
 include/channel.php | 41 -----------------------------------------
 util/typo.php       |  1 -
 2 files changed, 42 deletions(-)

diff --git a/include/channel.php b/include/channel.php
index b224e3623..7394b1308 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2007,47 +2007,6 @@ function channel_store_lowlevel($arr) {
 
 }
 
-
-function channel_store_lowlevel($arr) {
-
-	$store = [
-		'channel_account_id'      => ((array_key_exists('channel_account_id',$arr))      ? $arr['channel_account_id']      : '0'),
-		'channel_primary'         => ((array_key_exists('channel_primary',$arr))         ? $arr['channel_primary']         : '0'),
-		'channel_name'            => ((array_key_exists('channel_name',$arr))            ? $arr['channel_name']            : ''),
-		'channel_address'         => ((array_key_exists('channel_address',$arr))         ? $arr['channel_address']         : ''),
-		'channel_guid'            => ((array_key_exists('channel_guid',$arr))            ? $arr['channel_guid']            : ''),
-		'channel_guid_sig'        => ((array_key_exists('channel_guid_sig',$arr))        ? $arr['channel_guid_sig']        : ''),
-		'channel_hash'            => ((array_key_exists('channel_hash',$arr))            ? $arr['channel_hash']            : ''),
-		'channel_timezone'        => ((array_key_exists('channel_timezone',$arr))        ? $arr['channel_timezone']        : 'UTC'),
-		'channel_location'        => ((array_key_exists('channel_location',$arr))        ? $arr['channel_location']        : ''),
-		'channel_theme'           => ((array_key_exists('channel_theme',$arr))           ? $arr['channel_theme']           : ''),
-		'channel_startpage'       => ((array_key_exists('channel_startpage',$arr))       ? $arr['channel_startpage']       : ''),
-		'channel_pubkey'          => ((array_key_exists('channel_pubkey',$arr))          ? $arr['channel_pubkey']          : ''),
-		'channel_prvkey'          => ((array_key_exists('channel_prvkey',$arr))          ? $arr['channel_prvkey']          : ''),
-		'channel_notifyflags'     => ((array_key_exists('channel_notifyflags',$arr))     ? $arr['channel_notifyflags']     : '65535'),
-		'channel_pageflags'       => ((array_key_exists('channel_pageflags',$arr))       ? $arr['channel_pageflags']       : '0'),
-		'channel_dirdate'         => ((array_key_exists('channel_dirdate',$arr))         ? $arr['channel_dirdate']         : NULL_DATE),
-		'channel_lastpost'        => ((array_key_exists('channel_lastpost',$arr))        ? $arr['channel_lastpost']        : NULL_DATE),
-		'channel_deleted'         => ((array_key_exists('channel_deleted',$arr))         ? $arr['channel_deleted']         : NULL_DATE),
-		'channel_max_anon_mail'   => ((array_key_exists('channel_max_anon_mail',$arr))   ? $arr['channel_max_anon_mail']   : '10'),
-		'channel_max_friend_req'  => ((array_key_exists('channel_max_friend_req',$arr))  ? $arr['channel_max_friend_req']  : '10'),
-		'channel_expire_days'     => ((array_key_exists('channel_expire_days',$arr))     ? $arr['channel_expire_days']     : '0'),
-		'channel_passwd_reset'    => ((array_key_exists('channel_passwd_reset',$arr))    ? $arr['channel_passwd_reset']    : ''),
-		'channel_default_group'   => ((array_key_exists('channel_default_group',$arr))   ? $arr['channel_default_group']   : ''),
-		'channel_allow_cid'       => ((array_key_exists('channel_allow_cid',$arr))       ? $arr['channel_allow_cid']       : ''),
-		'channel_allow_gid'       => ((array_key_exists('channel_allow_gid',$arr))       ? $arr['channel_allow_gid']       : ''),
-		'channel_deny_cid'        => ((array_key_exists('channel_deny_cid',$arr))        ? $arr['channel_deny_cid']        : ''),
-		'channel_deny_gid'        => ((array_key_exists('channel_deny_gid',$arr))        ? $arr['channel_deny_gid']        : ''),
-		'channel_removed'         => ((array_key_exists('channel_removed',$arr))         ? $arr['channel_removed']         : '0'),
-		'channel_system'          => ((array_key_exists('channel_system',$arr))          ? $arr['channel_system']          : '0'),
-		'channel_moved'           => ((array_key_exists('channel_moved',$arr))           ? $arr['channel_moved']           : '')
-	];
-
-	return create_table_from_array('channel',$store);
-
-}
-
-
 function profile_store_lowlevel($arr) {
 
     $store = [
diff --git a/util/typo.php b/util/typo.php
index a8d363340..e25e57601 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -12,7 +12,6 @@
 	
 	App::init();
 
-//	$a = new App();
 
 	echo "Directory: include\n";
 	$files = glob('include/*.php');

From 198d2ab607a609b5265dcbed5e41e62d431b19c2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 29 Mar 2017 16:41:27 -0700
Subject: [PATCH 084/299] when clicking a notification to view a private mail
 message, actually view that message instead of the most recent.

---
 Zotlabs/Module/Mail.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php
index 459ce5acf..53303816b 100644
--- a/Zotlabs/Module/Mail.php
+++ b/Zotlabs/Module/Mail.php
@@ -296,6 +296,10 @@ class Mail extends \Zotlabs\Web\Controller {
 	
 			return $o;
 		}
+
+		$last_message = private_messages_list(local_channel(), $mailbox, 0, 1);
+
+		$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
 	
 		switch(argv(1)) {
 			case 'combined':
@@ -309,12 +313,15 @@ class Mail extends \Zotlabs\Web\Controller {
 				break;
 			default:
 				$mailbox = 'combined';
+
+				// notifications direct to mail/nn
+
+				if(intval(argv(1)))
+					$mid = intval(argv(1));
 				break;
 		}
 	
-		$last_message = private_messages_list(local_channel(), $mailbox, 0, 1);
 	
-		$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
 	
 		$plaintext = true;
 	

From b51ca4c8d3a36ed49582c4fe894944869b0d42a2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 29 Mar 2017 17:42:31 -0700
Subject: [PATCH 085/299] circular logic - we need the mailbox to find the last
 message so move the code block back where it was, and only set a direct mid
 if one was specified.

---
 Zotlabs/Module/Mail.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php
index 53303816b..2fb89fed5 100644
--- a/Zotlabs/Module/Mail.php
+++ b/Zotlabs/Module/Mail.php
@@ -297,10 +297,8 @@ class Mail extends \Zotlabs\Web\Controller {
 			return $o;
 		}
 
-		$last_message = private_messages_list(local_channel(), $mailbox, 0, 1);
+		$direct_mid = 0;
 
-		$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
-	
 		switch(argv(1)) {
 			case 'combined':
 				$mailbox = 'combined';
@@ -317,10 +315,17 @@ class Mail extends \Zotlabs\Web\Controller {
 				// notifications direct to mail/nn
 
 				if(intval(argv(1)))
-					$mid = intval(argv(1));
+					$direct_mid = intval(argv(1));
 				break;
 		}
 	
+
+		$last_message = private_messages_list(local_channel(), $mailbox, 0, 1);
+
+		$mid = ((argc() > 2) && (intval(argv(2)))) ? argv(2) : $last_message[0]['id'];
+
+		if($direct_mid)
+			$mid = $direct_mid;
 	
 	
 		$plaintext = true;

From 6118570118eb97ee1daa69e7628aae03c3fe4b77 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 30 Mar 2017 20:43:49 -0700
Subject: [PATCH 086/299] make aes256gcm the primary crypto mode

---
 include/crypto.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/include/crypto.php b/include/crypto.php
index f75390985..758cec24f 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -79,6 +79,19 @@ function STD_decrypt($data,$key,$iv) {
 	return openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
 }
 
+function AES256GCM_encrypt($data,$key,$iv) {
+	$key = substr($key,0,32);
+	$iv = substr($iv,0,16);
+	return openssl_encrypt($data,'aes-256-gcm',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+}
+
+function AES256GCM_decrypt($data,$key,$iv) {
+	$key = substr($key,0,32);
+	$iv = substr($iv,0,16);
+	return openssl_decrypt($data,'aes-256-gcm',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+}
+
+
 function CAST5CBC_encrypt($data,$key,$iv) {
 	$key = substr($key,0,16);
 	$iv = substr($iv,0,8);
@@ -152,7 +165,7 @@ function crypto_methods() {
 	// The actual methods are responsible for deriving the actual key/iv from the provided parameters;
 	// possibly by truncation or segmentation - though many other methods could be used.  
 
-	$r = [ 'std', 'aes256cbc', 'aes128cbc', 'cast5cbc' ];
+	$r = [ 'aes256gcm', 'std', 'aes256cbc', 'aes128cbc', 'cast5cbc' ];
 	call_hooks('crypto_methods',$r);
 	return $r;
 

From d1a018f2e8330fbf49ade51ec94fe5d7eb475d57 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 30 Mar 2017 21:04:55 -0700
Subject: [PATCH 087/299] whitespace

---
 include/import.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/import.php b/include/import.php
index f6ebd4bff..9007dbe74 100644
--- a/include/import.php
+++ b/include/import.php
@@ -98,7 +98,7 @@ function import_channel($channel, $account_id, $seize) {
 
 	$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
 		intval($account_id),
-		$channel['channel_guid']   // Already dbesc'd
+		dbesc($channel['channel_guid'])
 	);
 	if(! $r) {
 		logger('mod_import: channel not found. ' . print_r($channel,true));
@@ -195,23 +195,24 @@ function import_hublocs($channel, $hublocs, $seize, $moving = false) {
 			}
 
 			if(! array_key_exists('hubloc_primary',$hubloc)) {
-				$hubloc['hubloc_primary'] = (($hubloc['hubloc_flags'] & 0x0001) ? 1 : 0);
-				$hubloc['hubloc_orphancheck'] = (($hubloc['hubloc_flags'] & 0x0004) ? 1 : 0);
-				$hubloc['hubloc_error'] = (($hubloc['hubloc_status'] & 0x0003) ? 1 : 0);
-				$hubloc['hubloc_deleted'] = (($hubloc['hubloc_flags'] & 0x1000) ? 1 : 0);
+				$hubloc['hubloc_primary']     = (($hubloc['hubloc_flags']  & 0x0001) ? 1 : 0);
+				$hubloc['hubloc_orphancheck'] = (($hubloc['hubloc_flags']  & 0x0004) ? 1 : 0);
+				$hubloc['hubloc_error']       = (($hubloc['hubloc_status'] & 0x0003) ? 1 : 0);
+				$hubloc['hubloc_deleted']     = (($hubloc['hubloc_flags']  & 0x1000) ? 1 : 0);
 			}
 
 			if($moving && $hubloc['hubloc_hash'] === $channel['channel_hash'] && $hubloc['hubloc_url'] !== z_root()) {
 				$hubloc['hubloc_deleted'] = 1;
 			}
 
-			$arr = array(
-				'guid' => $hubloc['hubloc_guid'],
+			$arr = [
+				'guid'     => $hubloc['hubloc_guid'],
 				'guid_sig' => $hubloc['hubloc_guid_sig'],
-				'url' => $hubloc['hubloc_url'],
-				'url_sig' => $hubloc['hubloc_url_sig'],
-				'sitekey' => ((array_key_exists('hubloc_sitekey',$hubloc)) ? $hubloc['hubloc_sitekey'] : '')
-			);
+				'url'      => $hubloc['hubloc_url'],
+				'url_sig'  => $hubloc['hubloc_url_sig'],
+				'sitekey'  => ((array_key_exists('hubloc_sitekey',$hubloc)) ? $hubloc['hubloc_sitekey'] : '')
+			];
+
 			if(($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize))
 				$hubloc['hubloc_primary'] = 0;
 
@@ -1443,7 +1444,8 @@ function import_webpage_element($element, $channel, $type) {
 	// The author is either the owner or whomever was specified
 	$arr['author_xchan'] = (($element['author_xchan']) ? $element['author_xchan'] : get_observer_hash());
 	// Import mimetype if it is a valid mimetype for the element
-	$mimetypes = [	'text/bbcode',
+	$mimetypes = [	
+		'text/bbcode',
 		'text/html',
 		'text/markdown',
 		'text/plain',

From e79f450af9690433aaa1b81ca94555e7dcf14103 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 30 Mar 2017 21:45:29 -0700
Subject: [PATCH 088/299] aes256gcm is not ready for prime time. Stay tuned.
 Until it is, we're pretty much stuffed unless we go to 3rd party crypto libs.

---
 include/crypto.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/crypto.php b/include/crypto.php
index 758cec24f..bcbb3d388 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -81,14 +81,14 @@ function STD_decrypt($data,$key,$iv) {
 
 function AES256GCM_encrypt($data,$key,$iv) {
 	$key = substr($key,0,32);
-	$iv = substr($iv,0,16);
-	return openssl_encrypt($data,'aes-256-gcm',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+	$iv = substr($iv,0,12);
+	return openssl_encrypt($data,'aes-256-gcm',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,12,"\0"));
 }
 
 function AES256GCM_decrypt($data,$key,$iv) {
 	$key = substr($key,0,32);
-	$iv = substr($iv,0,16);
-	return openssl_decrypt($data,'aes-256-gcm',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+	$iv = substr($iv,0,12);
+	return openssl_decrypt($data,'aes-256-gcm',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,12,"\0"));
 }
 
 
@@ -165,7 +165,7 @@ function crypto_methods() {
 	// The actual methods are responsible for deriving the actual key/iv from the provided parameters;
 	// possibly by truncation or segmentation - though many other methods could be used.  
 
-	$r = [ 'aes256gcm', 'std', 'aes256cbc', 'aes128cbc', 'cast5cbc' ];
+	$r = [ 'std', 'aes256cbc', 'aes128cbc', 'cast5cbc' ];
 	call_hooks('crypto_methods',$r);
 	return $r;
 

From ecf30b2c71eb358e05a9a5b844aee79d45fd710b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 31 Mar 2017 17:25:04 -0700
Subject: [PATCH 089/299] strings

---
 util/hmessages.po | 6494 ++++++++++++++++++++++-----------------------
 1 file changed, 3230 insertions(+), 3264 deletions(-)

diff --git a/util/hmessages.po b/util/hmessages.po
index e0b54d7c1..c9e6ba337 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-24 00:04-0700\n"
+"POT-Creation-Date: 2017-03-31 00:04-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,8 +89,8 @@ msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:270
 #: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/New_channel.php:132
 #: ../../Zotlabs/Module/Connedit.php:922
+#: ../../Zotlabs/Module/New_channel.php:132
 #: ../../Zotlabs/Module/Settings/Channel.php:463
 #: ../../extend/addon/addon/cdav/cdav.php:277
 #: ../../extend/addon/addon/cdav/cdav.php:284
@@ -183,7 +183,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2670
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2685
 msgid "Collection"
 msgstr ""
 
@@ -214,12 +214,12 @@ msgstr ""
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
-#: ../../include/conversation.php:1083
+#: ../../include/conversation.php:1110
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1749
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1782
 msgid "Files"
 msgstr ""
 
@@ -231,34 +231,35 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:330
-#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Webpages.php:243
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:332
+#: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Layouts.php:185
+#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Connedit.php:925
 #: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Module/Blocks.php:159
 #: ../../extend/addon/addon/cdav/include/widgets.php:127
 #: ../../extend/addon/addon/cdav/include/widgets.php:164
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
 msgid "Create"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:332
+#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321
 #: ../../Zotlabs/Module/Profile_photo.php:423
+#: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321
 #: ../../Zotlabs/Module/Embedphotos.php:157 ../../Zotlabs/Widget/Album.php:97
 #: ../../extend/addon/addon/cdav/include/widgets.php:132
 #: ../../extend/addon/addon/cdav/include/widgets.php:168
 msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:233 ../../Zotlabs/Module/Chat.php:248
+#: ../../Zotlabs/Storage/Browser.php:233
 #: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Wiki.php:171 ../../Zotlabs/Module/Connedit.php:910
-#: ../../Zotlabs/Module/Sharedwithme.php:99
+#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Wiki.php:172
+#: ../../Zotlabs/Module/Sharedwithme.php:100
 #: ../../Zotlabs/Module/Settings/Oauth.php:89
 #: ../../Zotlabs/Module/Settings/Oauth.php:115
-#: ../../Zotlabs/Lib/NativeWikiPage.php:528
+#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:528
 #: ../../Zotlabs/Widget/Wiki_page_history.php:22
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136
 #: ../../extend/addon/addon/rendezvous/rendezvous.php:172
@@ -266,100 +267,106 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:172
+#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:173
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:159
 msgid "Type"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:235
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1397
+#: ../../Zotlabs/Module/Sharedwithme.php:102 ../../include/text.php:1415
 msgid "Size"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:236
-#: ../../Zotlabs/Module/Sharedwithme.php:102
+#: ../../Zotlabs/Module/Sharedwithme.php:103
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:238
+#: ../../Zotlabs/Storage/Browser.php:238 ../../Zotlabs/Module/Layouts.php:193
+#: ../../Zotlabs/Module/Webpages.php:245
 #: ../../Zotlabs/Module/Connections.php:296
 #: ../../Zotlabs/Module/Connections.php:316
 #: ../../Zotlabs/Module/Admin/Profs.php:154
-#: ../../Zotlabs/Module/Webpages.php:244
 #: ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Wiki.php:164 ../../Zotlabs/Module/Wiki.php:275
-#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Editblock.php:114
+#: ../../Zotlabs/Module/Wiki.php:165 ../../Zotlabs/Module/Wiki.php:275
+#: ../../Zotlabs/Module/Blocks.php:160
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../Zotlabs/Lib/Apps.php:357
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:357
+#: ../../Zotlabs/Lib/ThreadItem.php:107
 #: ../../extend/addon/addon/cdav/include/widgets.php:125
 #: ../../extend/addon/addon/cdav/include/widgets.php:161
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
-#: ../../include/channel.php:1042 ../../include/channel.php:1046
 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
-#: ../../include/menu.php:113
+#: ../../include/menu.php:113 ../../include/channel.php:1043
+#: ../../include/channel.php:1047
 msgid "Edit"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Profiles.php:803
+#: ../../Zotlabs/Module/Webpages.php:247
 #: ../../Zotlabs/Module/Connections.php:267
 #: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
 #: ../../Zotlabs/Module/Admin/Channels.php:149
-#: ../../Zotlabs/Module/Webpages.php:246
 #: ../../Zotlabs/Module/Editlayout.php:138
 #: ../../Zotlabs/Module/Editwebpage.php:172 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:658
-#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Blocks.php:162
 #: ../../Zotlabs/Module/Editblock.php:139
+#: ../../Zotlabs/Module/Connedit.php:658 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Zotlabs/Module/Blocks.php:162
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126
-#: ../../Zotlabs/Lib/Apps.php:358
+#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1143
+#: ../../Zotlabs/Lib/Apps.php:358 ../../Zotlabs/Lib/ThreadItem.php:127
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:864
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153
-#: ../../include/conversation.php:653
+#: ../../include/conversation.php:654
 msgid "Delete"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:299
+#: ../../Zotlabs/Storage/Browser.php:301
 #, php-format
 msgid "You are using %1$s of your available file storage."
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:304
+#: ../../Zotlabs/Storage/Browser.php:306
 #, php-format
 msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:315
+#: ../../Zotlabs/Storage/Browser.php:317
 msgid "WARNING:"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:325
+#: ../../Zotlabs/Storage/Browser.php:327
 msgid ""
 "Please use DAV to upload large (video, audio) files.<br>See <a class=\"zrl\" "
 "href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop "
 "Clients</a>"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:329
+#: ../../Zotlabs/Storage/Browser.php:331
 msgid "Create new folder"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:331
+#: ../../Zotlabs/Storage/Browser.php:333
 msgid "Upload file"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:345
+#: ../../Zotlabs/Storage/Browser.php:347
 msgid "Drop files here to immediately upload"
 msgstr ""
 
+#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Page.php:94
+#: ../../Zotlabs/Module/Block.php:79 ../../Zotlabs/Module/Display.php:122
+#: ../../Zotlabs/Lib/NativeWikiPage.php:489 ../../include/help.php:68
+msgid "Page not found."
+msgstr ""
+
 #: ../../Zotlabs/Web/WebServer.php:130 ../../Zotlabs/Module/Group.php:72
 #: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Like.php:283
+#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Like.php:283
 #: ../../Zotlabs/Module/Subthread.php:62 ../../Zotlabs/Module/Profperm.php:28
 #: ../../extend/addon/addon/frphotos/frphotos.php:81
 #: ../../extend/addon/addon/redfiles/redfiles.php:109
@@ -369,15 +376,16 @@ msgid "Permission denied"
 msgstr ""
 
 #: ../../Zotlabs/Web/WebServer.php:131
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Chat.php:98
-#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Register.php:77
-#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Profiles.php:198
-#: ../../Zotlabs/Module/Profiles.php:635 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connections.php:29
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Setup.php:212
+#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Layouts.php:71
+#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Webpages.php:116
+#: ../../Zotlabs/Module/Connections.php:29
 #: ../../Zotlabs/Module/Cover_photo.php:281
 #: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Webpages.php:116
 #: ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:68
@@ -386,62 +394,57 @@ msgstr ""
 #: ../../Zotlabs/Module/Editwebpage.php:126
 #: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78
 #: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245
+#: ../../Zotlabs/Module/Channel.php:285
+#: ../../Zotlabs/Module/Filestorage.php:23
 #: ../../Zotlabs/Module/Filestorage.php:78
 #: ../../Zotlabs/Module/Filestorage.php:93
 #: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Api.php:24
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Wiki.php:50
-#: ../../Zotlabs/Module/Wiki.php:215 ../../Zotlabs/Module/Wiki.php:315
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Connedit.php:385
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17
+#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/New_channel.php:104
+#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
-#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Like.php:181
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Mail.php:164
-#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
-#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
-#: ../../Zotlabs/Module/Item.php:1037 ../../Zotlabs/Module/Rate.php:113
+#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:216
+#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Rate.php:113
 #: ../../Zotlabs/Module/Profile_photo.php:280
 #: ../../Zotlabs/Module/Profile_photo.php:293
 #: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Common.php:39
-#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
+#: ../../Zotlabs/Module/Item.php:1037 ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Events.php:271
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Sharedwithme.php:11
 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Sources.php:74
-#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245
-#: ../../Zotlabs/Module/Channel.php:285 ../../Zotlabs/Module/Suggest.php:28
+#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Suggest.php:28
 #: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
 #: ../../Zotlabs/Module/Thing.php:335
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
-#: ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Chat.php:98
+#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Lib/Chatroom.php:137
 #: ../../extend/addon/addon/keepout/keepout.php:36
 #: ../../extend/addon/addon/pumpio/pumpio.php:40
 #: ../../extend/addon/addon/openid/Mod_Id.php:53
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:196
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:292
-#: ../../include/photos.php:28 ../../include/items.php:3358
 #: ../../include/attach.php:144 ../../include/attach.php:191
 #: ../../include/attach.php:255 ../../include/attach.php:269
 #: ../../include/attach.php:276 ../../include/attach.php:344
 #: ../../include/attach.php:358 ../../include/attach.php:365
 #: ../../include/attach.php:442 ../../include/attach.php:909
 #: ../../include/attach.php:983 ../../include/attach.php:1148
+#: ../../include/items.php:3358 ../../include/photos.php:28
 msgid "Permission denied."
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Page.php:94
-#: ../../Zotlabs/Module/Block.php:79 ../../Zotlabs/Module/Display.php:122
-#: ../../Zotlabs/Lib/NativeWikiPage.php:489 ../../include/help.php:68
-msgid "Page not found."
-msgstr ""
-
 #: ../../Zotlabs/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please "
@@ -456,12 +459,13 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Webpages.php:33
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Layouts.php:31
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Profile.php:20 ../../include/channel.php:943
+#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17
+#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32
+#: ../../Zotlabs/Module/Filestorage.php:59
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20
+#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Blocks.php:33
+#: ../../include/channel.php:944
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -469,18 +473,133 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:32
-#: ../../extend/addon/addon/chess/chess.php:403
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:28
-msgid "You must be logged in to see this page."
+#: ../../Zotlabs/Module/Setup.php:176
+msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:179
-msgid "Room not found"
+#: ../../Zotlabs/Module/Setup.php:180
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:239
+#: ../../Zotlabs/Module/Setup.php:184
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:191
+msgid "Could not create table."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:196
+msgid "Your site database has been installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:200
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Setup.php:741
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:260
+msgid "System check"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:920
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
+msgid "Next"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:265
+msgid "Check again"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:287
+msgid "Database connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:288
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:289
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:290
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Database Server Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Default is 127.0.0.1"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Database Port"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Communication port number - use 0 for default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:296
+msgid "Database Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:297
+msgid "Database Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:298
+msgid "Database Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:299
+msgid "Database Type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+msgid "Site administrator email address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Website URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Please use SSL (https) URL if available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 #: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Import.php:514
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Profs.php:157
@@ -488,22 +607,19 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Account_edit.php:74
 #: ../../Zotlabs/Module/Admin/Accounts.php:166
 #: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Site.php:279
 #: ../../Zotlabs/Module/Admin/Plugins.php:438
-#: ../../Zotlabs/Module/Admin/Themes.php:158 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Admin/Themes.php:158
+#: ../../Zotlabs/Module/Admin/Site.php:279 ../../Zotlabs/Module/Locs.php:121
 #: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Cal.php:342 ../../Zotlabs/Module/Photos.php:657
-#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062
-#: ../../Zotlabs/Module/Photos.php:1180
-#: ../../Zotlabs/Module/Import_items.php:122
-#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Invite.php:149
-#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Connedit.php:890 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Mail.php:413
+#: ../../Zotlabs/Module/Import_items.php:129
+#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Connedit.php:890
+#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Wiki.php:169 ../../Zotlabs/Module/Cal.php:343
 #: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134
 #: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
+#: ../../Zotlabs/Module/Mail.php:425
 #: ../../Zotlabs/Module/Settings/Features.php:47
 #: ../../Zotlabs/Module/Settings/Oauth.php:87
 #: ../../Zotlabs/Module/Settings/Account.php:118
@@ -513,8 +629,10 @@ msgstr ""
 #: ../../Zotlabs/Module/Settings/Channel.php:476
 #: ../../Zotlabs/Module/Settings/Permcats.php:110
 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Import.php:507 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:730
+#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1022
+#: ../../Zotlabs/Module/Photos.php:1062 ../../Zotlabs/Module/Photos.php:1180
+#: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:240
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:732
 #: ../../Zotlabs/Widget/Eventstools.php:16
 #: ../../extend/addon/addon/chords/Mod_Chords.php:60
 #: ../../extend/addon/addon/dwpost/dwpost.php:89
@@ -559,92 +677,324 @@ msgstr ""
 #: ../../extend/addon/addon/likebanner/likebanner.php:57
 #: ../../extend/addon/addon/mailtest/mailtest.php:100
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
-#: ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:106
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:84
 msgid "Submit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:195
-msgid "Leave Room"
+#: ../../Zotlabs/Module/Setup.php:331
+msgid "Site settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:196
-msgid "Delete Room"
+#: ../../Zotlabs/Module/Setup.php:385
+msgid "PHP version 5.5 or greater is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "I am away right now"
+#: ../../Zotlabs/Module/Setup.php:386
+msgid "PHP version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "I am online"
+#: ../../Zotlabs/Module/Setup.php:402
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "Bookmark this room"
+#: ../../Zotlabs/Module/Setup.php:403
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:240
-#: ../../Zotlabs/Module/Mail.php:349 ../../include/conversation.php:1236
-msgid "Please enter a link URL:"
+#: ../../Zotlabs/Module/Setup.php:407
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:293
-#: ../../Zotlabs/Module/Mail.php:418 ../../Zotlabs/Lib/ThreadItem.php:742
-#: ../../include/conversation.php:1346
-msgid "Encrypt text"
+#: ../../Zotlabs/Module/Setup.php:407
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Editwebpage.php:148
-#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:412
-#: ../../Zotlabs/Module/Editblock.php:116 ../../include/conversation.php:1201
-msgid "Insert web link"
+#: ../../Zotlabs/Module/Setup.php:412
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:216 ../../Zotlabs/Module/Pdledit.php:34
-msgid "Feature disabled."
+#: ../../Zotlabs/Module/Setup.php:422
+msgid ""
+"Unable to check command line PHP, as shell_exec() is disabled. This is "
+"required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:229
-msgid "New Chatroom"
+#: ../../Zotlabs/Module/Setup.php:425
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:230
-msgid "Chatroom name"
+#: ../../Zotlabs/Module/Setup.php:426
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:231
-msgid "Expiration of chats (minutes)"
+#: ../../Zotlabs/Module/Setup.php:429
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:232 ../../Zotlabs/Module/Filestorage.php:152
-#: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011
-#: ../../Zotlabs/Module/Connedit.php:680 ../../Zotlabs/Module/Thing.php:313
-#: ../../Zotlabs/Module/Thing.php:363 ../../include/acl_selectors.php:218
-msgid "Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:247
+#: ../../Zotlabs/Module/Setup.php:447
 #, php-format
-msgid "%1$s's Chatrooms"
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to "
+"upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:252
-msgid "No chatrooms available"
+#: ../../Zotlabs/Module/Setup.php:452
+msgid "You can adjust these settings in the server php.ini file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:253 ../../Zotlabs/Module/Profiles.php:834
-#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Wiki.php:167
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
-msgid "Create New"
+#: ../../Zotlabs/Module/Setup.php:454
+msgid "PHP upload limits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "Expiration"
+#: ../../Zotlabs/Module/Setup.php:477
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:257
-msgid "min"
+#: ../../Zotlabs/Module/Setup.php:478
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:481
+msgid "Generate encryption keys"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:498
+msgid "libCurl PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:499
+msgid "GD graphics PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:500
+msgid "OpenSSL PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:501
+msgid "PDO database PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:502
+msgid "mb_string PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "xml PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+msgid "Apache mod_rewrite module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:507
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+msgid "exec"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:513
+msgid ""
+"Error: exec is required but is either not installed or has been disabled in "
+"php.ini"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+msgid "shell_exec"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:519
+msgid ""
+"Error: shell_exec is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:527
+msgid "Error: libCURL PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:531
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:535
+msgid "Error: openssl PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:539
+msgid "Error: PDO database PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:543
+msgid "Error: mb_string PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:547
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:565
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:566
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:567
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:568
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:571
+msgid ".htconfig.php is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:585
+msgid ""
+"This software uses the Smarty3 template engine to render its web views. "
+"Smarty3 compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:586
+#, php-format
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the top level web folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:588
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:591
+#, php-format
+msgid "%s is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:607
+msgid ""
+"This software uses the store directory to save uploaded files. The web "
+"server needs to have write access to the store directory under the top level "
+"web folder"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:611
+msgid "store is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:643
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:644
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:645
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:646
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:647
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:648
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:650
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:652
+msgid "SSL certificate validation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:658
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:661
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:675
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:699
+#: ../../extend/addon/addon/cdav/cdav.php:41
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:739
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:740
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:49
@@ -778,8 +1128,8 @@ msgstr ""
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:162
-#: ../../boot.php:1587
+#: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:145
+#: ../../boot.php:1577
 msgid "Register"
 msgstr ""
 
@@ -794,30 +1144,130 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
-msgid "webpage"
+#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Ratings.php:83
+#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Display.php:22
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../Zotlabs/Module/Photos.php:490
+msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
-msgid "block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
-msgid "layout"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:181
+#: ../../Zotlabs/Module/Directory.php:245
 #, php-format
-msgid "%s element installed"
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Directory.php:256
+msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:184
-#, php-format
-msgid "%s element installation failed"
+#: ../../Zotlabs/Module/Directory.php:258
+msgid "Status: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:260
+msgid "Homepage: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1272
+msgid "Age:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1133
+#: ../../include/event.php:52 ../../include/event.php:84
+msgid "Location:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:320
+msgid "Description:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1288
+msgid "Hometown:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1296
+msgid "About:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
+#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
+#: ../../include/connections.php:110 ../../include/channel.php:1118
+#: ../../include/conversation.php:1002
+msgid "Connect"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:329
+msgid "Public Forum:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:332
+msgid "Keywords: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:335
+msgid "Don't suggest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:337
+msgid "Common connections:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Global Directory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:386
+msgid "Local Directory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:391
+#: ../../Zotlabs/Module/Directory.php:396
+#: ../../Zotlabs/Module/Connections.php:315
+#: ../../include/contact_widgets.php:23
+msgid "Find"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:392
+msgid "Finding:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "next page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "previous page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "Sort options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:400
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:401
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:402
+msgid "Oldest to Newest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:419
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:184
@@ -920,15 +1370,15 @@ msgstr ""
 #: ../../Zotlabs/Module/Profiles.php:681
 #: ../../Zotlabs/Module/Admin/Site.php:237 ../../Zotlabs/Module/Menu.php:100
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Photos.php:642 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:97
-#: ../../Zotlabs/Module/Wiki.php:179 ../../Zotlabs/Module/Connedit.php:399
-#: ../../Zotlabs/Module/Connedit.php:783 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Connedit.php:399
+#: ../../Zotlabs/Module/Connedit.php:783 ../../Zotlabs/Module/Api.php:97
+#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Events.php:470
 #: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Photos.php:642
 #: ../../extend/addon/addon/dwpost/dwpost.php:73
 #: ../../extend/addon/addon/dwpost/dwpost.php:85
 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
@@ -975,23 +1425,23 @@ msgstr ""
 #: ../../extend/addon/addon/cdav/cdav.php:234
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1610
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1600
 msgid "No"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:681
 #: ../../Zotlabs/Module/Admin/Site.php:239 ../../Zotlabs/Module/Menu.php:100
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Photos.php:642 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96
-#: ../../Zotlabs/Module/Wiki.php:179 ../../Zotlabs/Module/Connedit.php:399
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Connedit.php:399
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Wiki.php:180
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
 #: ../../Zotlabs/Module/Removeme.php:63
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../Zotlabs/Module/Settings/Channel.php:294
+#: ../../Zotlabs/Module/Photos.php:642
 #: ../../extend/addon/addon/dwpost/dwpost.php:73
 #: ../../extend/addon/addon/dwpost/dwpost.php:85
 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
@@ -1038,8 +1488,8 @@ msgstr ""
 #: ../../extend/addon/addon/cdav/cdav.php:234
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1610
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:89
+#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1600
 msgid "Yes"
 msgstr ""
 
@@ -1052,7 +1502,7 @@ msgid "View this profile"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1064
+#: ../../include/channel.php:1065
 msgid "Edit visibility"
 msgstr ""
 
@@ -1064,7 +1514,7 @@ msgstr ""
 msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1035
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1036
 msgid "Change profile photo"
 msgstr ""
 
@@ -1084,7 +1534,7 @@ msgstr ""
 msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1621
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1648
 msgid "Personal"
 msgstr ""
 
@@ -1317,9 +1767,9 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:804
 #: ../../Zotlabs/Module/Admin/Plugins.php:423
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Connedit.php:928
 #: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290
-#: ../../Zotlabs/Module/Connedit.php:928
 #: ../../Zotlabs/Module/Settings/Oauth.php:88
 #: ../../Zotlabs/Module/Settings/Oauth.php:114
 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
@@ -1328,24 +1778,30 @@ msgstr ""
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:244
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267
-#: ../../include/conversation.php:1300 ../../include/conversation.php:1349
+#: ../../include/conversation.php:1327 ../../include/conversation.php:1376
 msgid "Cancel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1060
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1061
 msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1042
-#: ../../include/nav.php:105
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105
+#: ../../include/channel.php:1043
 msgid "Edit Profiles"
 msgstr ""
 
+#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:143
+#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:254
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154
+msgid "Create New"
+msgstr ""
+
 #: ../../Zotlabs/Module/Help.php:23
 msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1733
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1764
 msgid "About"
 msgstr ""
 
@@ -1373,16 +1829,63 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
+#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+#: ../../Zotlabs/Module/Editlayout.php:128
+msgid "Layout Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
+#: ../../Zotlabs/Module/Layouts.php:132
+#: ../../Zotlabs/Module/Editlayout.php:129
+msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2275
+msgid "Layouts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
+#: ../../include/nav.php:157 ../../include/nav.php:264
+#: ../../include/help.php:55 ../../include/help.php:61
+msgid "Help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:186
+msgid "Comanche page description language help"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:190
+msgid "Layout Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:257
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:246
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042
+#: ../../extend/addon/addon/cdav/include/widgets.php:123
+#: ../../include/conversation.php:1311
+msgid "Share"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:195
+msgid "Download PDL file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:251
+#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Wiki.php:167
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153
+#: ../../include/page_widgets.php:42
+msgid "View"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
@@ -1477,11 +1980,11 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Security.php:86
 #: ../../Zotlabs/Module/Admin/Accounts.php:164
 #: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:277
 #: ../../Zotlabs/Module/Admin/Plugins.php:341
 #: ../../Zotlabs/Module/Admin/Plugins.php:436
 #: ../../Zotlabs/Module/Admin/Themes.php:122
 #: ../../Zotlabs/Module/Admin/Themes.php:156
+#: ../../Zotlabs/Module/Admin/Site.php:277
 msgid "Administration"
 msgstr ""
 
@@ -1517,138 +2020,107 @@ msgstr ""
 msgid "Repository version (dev)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Photos.php:490
-#: ../../Zotlabs/Module/Ratings.php:83 ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Display.php:22
-#: ../../Zotlabs/Module/Viewconnections.php:23
-msgid "Public access denied."
+#: ../../Zotlabs/Module/Import.php:64 ../../Zotlabs/Module/Import_items.php:48
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:245
+#: ../../Zotlabs/Module/Import.php:79 ../../Zotlabs/Module/Import.php:95
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Unable to download data from old server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:102
+#: ../../Zotlabs/Module/Import_items.php:77
+msgid "Imported file is empty."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:121
+#: ../../Zotlabs/Module/Import_items.php:93
 #, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Gender: "
+msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Status: "
+#: ../../Zotlabs/Module/Import.php:144
+#, php-format
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:260
-msgid "Homepage: "
+#: ../../Zotlabs/Module/Import.php:158
+msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1271
-msgid "Age:"
+#: ../../Zotlabs/Module/Import.php:466
+msgid "Import completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1132
-#: ../../include/event.php:52 ../../include/event.php:84
-msgid "Location:"
+#: ../../Zotlabs/Module/Import.php:494
+msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:320
-msgid "Description:"
+#: ../../Zotlabs/Module/Import.php:499
+msgid "Import Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1287
-msgid "Hometown:"
+#: ../../Zotlabs/Module/Import.php:500
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You "
+"may retrieve the channel identity from the old server/hub via the network or "
+"provide an export file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1295
-msgid "About:"
+#: ../../Zotlabs/Module/Import.php:501
+#: ../../Zotlabs/Module/Import_items.php:127
+msgid "File to Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54
-#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44
-#: ../../include/connections.php:110 ../../include/channel.php:1117
-#: ../../include/conversation.php:975
-msgid "Connect"
+#: ../../Zotlabs/Module/Import.php:502
+msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Public Forum:"
+#: ../../Zotlabs/Module/Import.php:503
+msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Keywords: "
+#: ../../Zotlabs/Module/Import.php:504
+msgid "Your old login email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:335
-msgid "Don't suggest"
+#: ../../Zotlabs/Module/Import.php:505
+msgid "Your old login password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:337
-msgid "Common connections:"
+#: ../../Zotlabs/Module/Import.php:506
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be "
+"able to post from either location, but only one can be marked as the primary "
+"location for files, photos, and media."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Global Directory"
+#: ../../Zotlabs/Module/Import.php:507
+msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Local Directory"
+#: ../../Zotlabs/Module/Import.php:508
+msgid "Move this channel (disable all previous locations)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:391
-#: ../../Zotlabs/Module/Directory.php:396
-#: ../../Zotlabs/Module/Connections.php:315
-#: ../../include/contact_widgets.php:23
-msgid "Find"
+#: ../../Zotlabs/Module/Import.php:509
+msgid "Import a few months of posts if possible (limited by available memory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:392
-msgid "Finding:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:62
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "next page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "previous page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Sort options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Alphabetic"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:400
-msgid "Reverse Alphabetic"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:401
-msgid "Newest to Oldest"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:402
-msgid "Oldest to Newest"
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:419
-msgid "No entries (some entries may be hidden)."
+#: ../../Zotlabs/Module/Import.php:510
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
 msgstr ""
 
 #: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
 msgid "Invalid item."
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
-#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Chanview.php:96
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43
+#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96
 #: ../../Zotlabs/Module/Wall_upload.php:31
 msgid "Channel not found."
 msgstr ""
@@ -1663,19 +2135,63 @@ msgid ""
 "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
+#: ../../Zotlabs/Module/Webpages.php:52
+msgid "Import Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
+#: ../../Zotlabs/Module/Webpages.php:53
+msgid "Import selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin/Profs.php:74
-#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../Zotlabs/Widget/Notes.php:18
-#: ../../include/text.php:1010 ../../include/text.php:1022
-msgid "Save"
+#: ../../Zotlabs/Module/Webpages.php:76
+msgid "Export Webpage Elements"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:77
+msgid "Export selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/conversation.php:1832
+msgid "Webpages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Module/Events.php:478
+#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Lib/ThreadItem.php:741
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1280
+msgid "Preview"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:254 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:255
+msgid "Page Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:285
+msgid "Invalid file type."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:297
+msgid "Error opening zip file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:308
+msgid "Invalid folder path."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:335
+msgid "No webpage elements detected."
+msgstr ""
+
+#: ../../Zotlabs/Module/Webpages.php:410
+msgid "Import complete."
 msgstr ""
 
 #: ../../Zotlabs/Module/Ping.php:254
@@ -1724,7 +2240,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:72
 #: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1630
+#: ../../include/conversation.php:1657
 msgid "New"
 msgstr ""
 
@@ -1827,14 +2343,14 @@ msgid "Recent activity"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/nav.php:203 ../../include/text.php:939
+#: ../../include/nav.php:181 ../../include/text.php:957
 msgid "Connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Module/Search.php:44
 #: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../include/nav.php:180 ../../include/text.php:1009
-#: ../../include/text.php:1021 ../../include/acl_selectors.php:213
+#: ../../include/nav.php:160 ../../include/text.php:1027
+#: ../../include/text.php:1039 ../../include/acl_selectors.php:213
 msgid "Search"
 msgstr ""
 
@@ -1899,7 +2415,7 @@ msgstr ""
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1737
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1738
 msgid "cover photo"
 msgstr ""
 
@@ -2046,6 +2562,14 @@ msgstr ""
 msgid "Additional info (optional)"
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Profs.php:74
+#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Filer.php:53
+#: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104
+#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1028
+#: ../../include/text.php:1040
+msgid "Save"
+msgstr ""
+
 #: ../../Zotlabs/Module/Admin/Profs.php:83
 msgid "Field definition not found"
 msgstr ""
@@ -2409,7 +2933,7 @@ msgid "Disallow Code"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1721
+#: ../../include/conversation.php:1751
 msgid "Channel"
 msgstr ""
 
@@ -2497,11 +3021,158 @@ msgstr ""
 msgid "Last known contact"
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#, php-format
+msgid "Plugin %s disabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:294
+#, php-format
+msgid "Plugin %s enabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:310
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+msgid "Disable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:313
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+msgid "Enable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:342
+#: ../../Zotlabs/Module/Admin/Plugins.php:437
+#: ../../Zotlabs/Widget/Admin.php:27
+msgid "Plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:343
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+msgid "Toggle"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:344
+#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
+#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:203
+msgid "Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:351
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+msgid "Author: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:352
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:353
+msgid "Minimum project version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:354
+msgid "Maximum project version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:355
+msgid "Minimum PHP version: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:356
+msgid "Compatible Server Roles: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:357
+msgid "Requires: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:358
+#: ../../Zotlabs/Module/Admin/Plugins.php:442
+msgid "Disabled - version incompatibility"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:411
+msgid "Enter the public git repository URL of the plugin repo."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:412
+msgid "Plugin repo git URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
+msgid "Custom repo name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
+msgid "(optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:414
+msgid "Download Plugin Repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:421
+msgid "Install new repo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348
+msgid "Install"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:445
+msgid "Manage Repos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:446
+msgid "Installed Plugin Repositories"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:447
+msgid "Install a New Plugin Repository"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:454
+msgid "Switch branch"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Plugins.php:455
+#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Photos.php:960
+#: ../../extend/addon/addon/superblock/superblock.php:116
+msgid "Remove"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:26
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:61
+msgid "No themes found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:116
+msgid "Screenshot"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+msgid "Themes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:162
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin/Themes.php:163
+msgid "[Unsupported]"
+msgstr ""
+
 #: ../../Zotlabs/Module/Admin/Site.php:144
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2906
+#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2921
 msgid "Default"
 msgstr ""
 
@@ -2885,237 +3556,16 @@ msgstr ""
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
-#, php-format
-msgid "Plugin %s disabled."
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Enter a folder name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:294
-#, php-format
-msgid "Plugin %s enabled."
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "or select an existing folder (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:310
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-msgid "Disable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:313
-#: ../../Zotlabs/Module/Admin/Themes.php:97
-msgid "Enable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:342
-#: ../../Zotlabs/Module/Admin/Plugins.php:437
-#: ../../Zotlabs/Widget/Admin.php:27
-msgid "Plugins"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:343
-#: ../../Zotlabs/Module/Admin/Themes.php:124
-msgid "Toggle"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:344
-#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223
-#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:225
-msgid "Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
-#: ../../Zotlabs/Module/Admin/Themes.php:134
-msgid "Author: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
-#: ../../Zotlabs/Module/Admin/Themes.php:135
-msgid "Maintainer: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
-msgid "Minimum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:354
-msgid "Maximum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:355
-msgid "Minimum PHP version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:356
-msgid "Compatible Server Roles: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:357
-msgid "Requires: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:358
-#: ../../Zotlabs/Module/Admin/Plugins.php:442
-msgid "Disabled - version incompatibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:411
-msgid "Enter the public git repository URL of the plugin repo."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:412
-msgid "Plugin repo git URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
-msgid "Custom repo name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
-msgid "(optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
-msgid "Download Plugin Repo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:421
-msgid "Install new repo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348
-msgid "Install"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:445
-msgid "Manage Repos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:446
-msgid "Installed Plugin Repositories"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:447
-msgid "Install a New Plugin Repository"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:454
-msgid "Switch branch"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Plugins.php:455
-#: ../../Zotlabs/Module/Photos.php:960 ../../Zotlabs/Module/Tagrm.php:137
-#: ../../extend/addon/addon/superblock/superblock.php:116
-msgid "Remove"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:26
-msgid "Theme settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:61
-msgid "No themes found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:116
-msgid "Screenshot"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
-msgid "Themes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:162
-msgid "[Experimental]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin/Themes.php:163
-msgid "[Unsupported]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:52
-msgid "Import Webpage Elements"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:53
-msgid "Import selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:76
-msgid "Export Webpage Elements"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:77
-msgid "Export selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1795
-msgid "Webpages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Layouts.php:194
-#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Module/Blocks.php:161
-#: ../../extend/addon/addon/cdav/include/widgets.php:123
-#: ../../include/conversation.php:1284
-msgid "Share"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Wiki.php:166
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153
-#: ../../include/page_widgets.php:42
-msgid "View"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Photos.php:1063
-#: ../../Zotlabs/Module/Events.php:478 ../../Zotlabs/Lib/ThreadItem.php:739
-#: ../../include/conversation.php:1253 ../../include/page_widgets.php:43
-msgid "Preview"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
-msgid "Actions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
-msgid "Page Link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:254
-msgid "Page Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Menu.php:114
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Blocks.php:157
-#: ../../include/page_widgets.php:47
-msgid "Created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Module/Menu.php:115
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Blocks.php:158
-#: ../../include/page_widgets.php:48
-msgid "Edited"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:284
-msgid "Invalid file type."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:296
-msgid "Error opening zip file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:307
-msgid "Invalid folder path."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:334
-msgid "No webpage elements detected."
-msgstr ""
-
-#: ../../Zotlabs/Module/Webpages.php:409
-msgid "Import complete."
+#: ../../Zotlabs/Module/Filer.php:54 ../../Zotlabs/Lib/ThreadItem.php:137
+msgid "Save to Folder"
 msgstr ""
 
 #: ../../Zotlabs/Module/Editlayout.php:79
@@ -3125,16 +3575,6 @@ msgstr ""
 msgid "Item not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editlayout.php:129
-#: ../../Zotlabs/Module/Layouts.php:132
-msgid "Layout Description (Optional)"
-msgstr ""
-
 #: ../../Zotlabs/Module/Editlayout.php:137
 msgid "Edit Layout"
 msgstr ""
@@ -3143,6 +3583,13 @@ msgstr ""
 msgid "Page link"
 msgstr ""
 
+#: ../../Zotlabs/Module/Editwebpage.php:148
+#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Mail.php:287
+#: ../../Zotlabs/Module/Mail.php:424 ../../Zotlabs/Module/Chat.php:205
+#: ../../include/conversation.php:1228
+msgid "Insert web link"
+msgstr ""
+
 #: ../../Zotlabs/Module/Editwebpage.php:171
 msgid "Edit Webpage"
 msgstr ""
@@ -3232,7 +3679,7 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2259
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2274
 msgid "Menus"
 msgstr ""
 
@@ -3387,7 +3834,7 @@ msgid "Software"
 msgstr ""
 
 #: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:1005
+#: ../../include/conversation.php:1032
 msgid "Ratings"
 msgstr ""
 
@@ -3395,29 +3842,27 @@ msgstr ""
 msgid "Rate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2260
-msgid "Layouts"
+#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25
+#: ../../extend/addon/addon/chess/chess.php:403
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:28
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232
-#: ../../include/help.php:55 ../../include/help.php:61
-#: ../../include/nav.php:174 ../../include/nav.php:288
-msgid "Help"
+#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Profile.php:43
+#: ../../Zotlabs/Module/Hcard.php:35
+msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:186
-msgid "Comanche page description language help"
+#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Profile.php:50
+#: ../../Zotlabs/Module/Hcard.php:42
+msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:190
-msgid "Layout Description"
+#: ../../Zotlabs/Module/Channel.php:112
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:195
-msgid "Download PDL file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178
+#: ../../Zotlabs/Module/Apps.php:45
 msgid "Apps"
 msgstr ""
 
@@ -3451,6 +3896,14 @@ msgstr ""
 msgid "Edit file permissions"
 msgstr ""
 
+#: ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Connedit.php:680 ../../Zotlabs/Module/Thing.php:313
+#: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:647
+#: ../../Zotlabs/Module/Photos.php:1011 ../../Zotlabs/Module/Chat.php:233
+#: ../../include/acl_selectors.php:218
+msgid "Permissions"
+msgstr ""
+
 #: ../../Zotlabs/Module/Filestorage.php:159
 msgid "Set/edit permissions"
 msgstr ""
@@ -3484,7 +3937,7 @@ msgid "Notify your contacts about this file"
 msgstr ""
 
 #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229
-#: ../../include/conversation.php:1742
+#: ../../include/conversation.php:1774
 msgid "Photos"
 msgstr ""
 
@@ -3616,349 +4069,44 @@ msgstr ""
 msgid "Redeliver"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:605
-msgid "l, F j"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:660
-#: ../../include/text.php:1750
-msgid "Link to Source"
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
-msgid "Edit Event"
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
-msgid "Create Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Photos.php:911 ../../Zotlabs/Module/Events.php:689
-#: ../../Zotlabs/Module/Events.php:698
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
-msgid "Previous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
-#: ../../Zotlabs/Module/Photos.php:920 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Setup.php:264
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
-msgid "Next"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691
-#: ../../include/channel.php:1343
-msgid "Export"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2282
-msgid "Import"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:700
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
-msgid "Today"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:78
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
-msgid "Album not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:103
-msgid "Delete Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:501
-msgid "No photos selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:550
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:591
+#: ../../Zotlabs/Module/Impel.php:181
 #, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:594
+#: ../../Zotlabs/Module/Impel.php:184
 #, php-format
-msgid "%1$.2f MB photo storage used."
+msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:636
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:640
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:641
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:642
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:643
-msgid "Caption (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:644
-msgid "Description (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:725
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:727
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290
-#: ../../Zotlabs/Module/Embedphotos.php:139 ../../Zotlabs/Widget/Album.php:78
-msgid "View Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:782
-#: ../../Zotlabs/Module/Embedphotos.php:155 ../../Zotlabs/Widget/Album.php:95
-msgid "Edit Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:832
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:834
-msgid "Photo not available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:892
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:893
-msgid "Use as cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:900
-msgid "Private Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:915
-msgid "View Full Size"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:997
-msgid "Edit photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:999
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1000
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1003
-msgid "Move photo to album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1004
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1005
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1008
-msgid "Caption"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1010
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1018
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1021
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:268
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:269
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:410
-#: ../../include/conversation.php:735
-msgid "Please wait"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
-#: ../../Zotlabs/Lib/ThreadItem.php:727
-msgid "This is you"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
-#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Agree"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Disagree"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Abstain"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Attending"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Not attending"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Might attend"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
-#: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
-#: ../../include/conversation.php:1834
-msgid "View all"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/taxonomy.php:403 ../../include/channel.php:1246
-#: ../../include/conversation.php:1858
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:195
-#: ../../include/conversation.php:1861
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1205
-msgid "Photo Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1214
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1219
-msgid "Map"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:399
-msgctxt "noun"
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:400
-msgctxt "noun"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:405
-#: ../../include/acl_selectors.php:220
-msgid "Close"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
-#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:525
-msgid "Recent Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:57
-msgid "Nothing to import."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:69
-#: ../../Zotlabs/Module/Import.php:84
-msgid "Unable to download data from old server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:91
-msgid "Imported file is empty."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:88
-#: ../../Zotlabs/Module/Import.php:111
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:104
+#: ../../Zotlabs/Module/Import_items.php:108
 msgid "Import completed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:119
+#: ../../Zotlabs/Module/Import_items.php:125
 msgid "Import Items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:120
+#: ../../Zotlabs/Module/Import_items.php:126
 msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:121
-#: ../../Zotlabs/Module/Import.php:495
-msgid "File to Upload"
-msgstr ""
-
 #: ../../Zotlabs/Module/Manage.php:136
 #: ../../Zotlabs/Module/New_channel.php:121
 #, php-format
@@ -3970,7 +4118,7 @@ msgid "Create a new channel"
 msgstr ""
 
 #: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:223
+#: ../../include/nav.php:201
 msgid "Channel Manager"
 msgstr ""
 
@@ -4012,6 +4160,19 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
+#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1339
+msgid "Title (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
+msgstr ""
+
 #: ../../Zotlabs/Module/Magic.php:71
 msgid "Hub not found."
 msgstr ""
@@ -4153,386 +4314,6 @@ msgstr ""
 msgid "Item not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:38
-msgid "No more system notifications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:42
-msgid "System Notifications"
-msgstr ""
-
-#: ../../Zotlabs/Module/Hcard.php:35 ../../Zotlabs/Module/Channel.php:47
-#: ../../Zotlabs/Module/Profile.php:43
-msgid "Posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Hcard.php:42 ../../Zotlabs/Module/Channel.php:54
-#: ../../Zotlabs/Module/Profile.php:50
-msgid "Only posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
-msgid "Authorize application connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:73
-msgid "Return to your app and insert this Security Code:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:83
-msgid "Please login to continue."
-msgstr ""
-
-#: ../../Zotlabs/Module/Api.php:95
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:67
-msgid "Please join us on $Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:77
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:82
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:86
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Invite.php:105
-msgid "You have no more invitations available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Send invitations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:137
-msgid "Enter email addresses, one per line:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
-msgid "Your message:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "Please join my community on $Projectname."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "You will need to supply this invitation code:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:145
-msgid "or visit"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:147
-msgid "3. Click [Connect]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:20
-msgid "About this site"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "Site Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1474
-msgid "Administrator"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Software and Project information"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "This site is powered by $Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:30
-msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:32
-#, php-format
-msgid "Version %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:33
-msgid "Project homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Developer homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:140
-msgid "Create Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:141
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:142
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:30
-msgid "Profile Unavailable."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:44
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42
-msgid "Not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:68
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62
-msgid "Invalid channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:159
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1806
-msgid "Wikis"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:165
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
-msgid "Download"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:169
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
-msgid "Wiki name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:170
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
-msgid "Content type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:179
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
-msgid "Create a status post for this wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:204
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185
-msgid "Wiki not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:228
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210
-msgid "Rename page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:232
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214
-msgid "Error retrieving page content"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:263
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
-msgid "Revision Comparison"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:264
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
-msgid "Revert"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:268
-msgid "Short description of your changes (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:275
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
-msgid "Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:283
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260
-msgid "New page name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:288
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1205
-msgid "Embed image from photo albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:289
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1299
-msgid "Embed an image from your albums"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:291
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1301 ../../include/conversation.php:1348
-msgid "OK"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:292
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1241
-msgid "Choose images to embed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:293
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
-#: ../../include/conversation.php:1242
-msgid "Choose an album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:294
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
-msgid "Choose a different album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:295
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1244
-msgid "Error getting album list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:296
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1245
-msgid "Error getting photo link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:297
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274
-#: ../../include/conversation.php:1246
-msgid "Error getting album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:365
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
-msgid "Error creating wiki. Invalid name."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:377
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
-msgid "Wiki created, but error creating Home page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:384
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
-msgid "Error creating wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:396
-msgid "Wiki delete permission denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:406
-msgid "Error deleting wiki"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:432
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
-msgid "New page created"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:551
-msgid "Cannot delete Home"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:615
-msgid "Current Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:615
-msgid "Selected Revision"
-msgstr ""
-
-#: ../../Zotlabs/Module/Wiki.php:665
-msgid "You must be authenticated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:208
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
-#: ../../include/conversation.php:1015
-msgid "Poke"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr ""
-
-#: ../../Zotlabs/Module/Search.php:224
-#, php-format
-msgid "Items tagged with: %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Search.php:226
-#, php-format
-msgid "Search results for: %s"
-msgstr ""
-
 #: ../../Zotlabs/Module/Connedit.php:79
 msgid "Could not access contact record."
 msgstr ""
@@ -4573,7 +4354,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Lib/Apps.php:228
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:57
-#: ../../include/conversation.php:955 ../../include/nav.php:103
+#: ../../include/nav.php:102 ../../include/conversation.php:982
 msgid "View Profile"
 msgstr ""
 
@@ -4697,9 +4478,9 @@ msgstr ""
 #: ../../Zotlabs/Module/Settings/Channel.php:67
 #: ../../Zotlabs/Module/Settings/Channel.php:70
 #: ../../Zotlabs/Module/Settings/Channel.php:81
-#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/channel.php:406
-#: ../../include/channel.php:407 ../../include/channel.php:414
-#: ../../include/selectors.php:123
+#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123
+#: ../../include/channel.php:407 ../../include/channel.php:408
+#: ../../include/channel.php:415
 msgid "Friends"
 msgstr ""
 
@@ -4922,6 +4703,204 @@ msgstr ""
 msgid "ZIP Code"
 msgstr ""
 
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:38
+msgid "No more system notifications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:42
+msgid "System Notifications"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
+msgid "Authorize application connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:73
+msgid "Return to your app and insert this Security Code:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:83
+msgid "Please login to continue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Api.php:95
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:67
+msgid "Please join us on $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:77
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:82
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:86
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Invite.php:105
+msgid "You have no more invitations available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Send invitations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:137
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
+msgid "Your message:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "Please join my community on $Projectname."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "You will need to supply this invitation code:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:145
+msgid "or visit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:147
+msgid "3. Click [Connect]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:20
+msgid "About this site"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "Site Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1474
+msgid "Administrator"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Software and Project information"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "This site is powered by $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:30
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:32
+#, php-format
+msgid "Version %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:33
+msgid "Project homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Developer homepage"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:140
+msgid "Create Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:141
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:142
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile.php:91
+msgid "vcard"
+msgstr ""
+
+#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:186
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235
+#: ../../include/conversation.php:1042
+msgid "Poke"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr ""
+
+#: ../../Zotlabs/Module/Search.php:224
+#, php-format
+msgid "Items tagged with: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Search.php:226
+#, php-format
+msgid "Search results for: %s"
+msgstr ""
+
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr ""
@@ -4959,19 +4938,19 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
 #: ../../Zotlabs/Module/Tagger.php:47
-#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
-#: ../../include/conversation.php:116 ../../include/text.php:1928
+#: ../../extend/addon/addon/redphotos/redphotohelper.php:71
+#: ../../include/conversation.php:116 ../../include/text.php:1943
 msgid "photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:144 ../../include/text.php:1934
+#: ../../include/conversation.php:144 ../../include/text.php:1949
 msgid "status"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1145
-#: ../../include/conversation.php:119 ../../include/text.php:1931
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:119
+#: ../../include/event.php:1145 ../../include/text.php:1946
 msgid "event"
 msgstr ""
 
@@ -5070,109 +5049,191 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:65
-msgid "Unable to lookup recipient."
+#: ../../Zotlabs/Module/Wiki.php:30
+msgid "Profile Unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:72
-msgid "Unable to communicate with requested channel."
+#: ../../Zotlabs/Module/Wiki.php:44
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:79
-msgid "Cannot verify requested channel."
+#: ../../Zotlabs/Module/Wiki.php:68
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62
+msgid "Invalid channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:97
-msgid "Selected channel has private message restrictions. Send failed."
+#: ../../Zotlabs/Module/Wiki.php:160
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146
+#: ../../include/conversation.php:1845
+msgid "Wikis"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Messages"
+#: ../../Zotlabs/Module/Wiki.php:166
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
+msgid "Download"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:213
-msgid "Message recalled."
+#: ../../Zotlabs/Module/Wiki.php:170
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
+msgid "Wiki name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:226
-msgid "Conversation removed."
+#: ../../Zotlabs/Module/Wiki.php:171
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
+msgid "Content type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../Zotlabs/Module/Wiki.php:180
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
+msgid "Create a status post for this wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:269
-msgid "Requested channel is not in this network"
+#: ../../Zotlabs/Module/Wiki.php:205
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185
+msgid "Wiki not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:277
-msgid "Send Private Message"
+#: ../../Zotlabs/Module/Wiki.php:229
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210
+msgid "Rename page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
-msgid "To:"
+#: ../../Zotlabs/Module/Wiki.php:233
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214
+msgid "Error retrieving page content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
-msgid "Subject:"
+#: ../../Zotlabs/Module/Wiki.php:239
+msgid "New page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
-#: ../../include/conversation.php:1296
-msgid "Attach file"
+#: ../../Zotlabs/Module/Wiki.php:263
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
+msgid "Revision Comparison"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:288
-msgid "Send"
+#: ../../Zotlabs/Module/Wiki.php:264
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
+msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
-#: ../../include/conversation.php:1341
-msgid "Set expiration date"
+#: ../../Zotlabs/Module/Wiki.php:268
+msgid "Short description of your changes (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:375
-msgid "Delete message"
+#: ../../Zotlabs/Module/Wiki.php:275
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
+msgid "Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:376
-msgid "Delivery report"
+#: ../../Zotlabs/Module/Wiki.php:283
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260
+msgid "New page name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:377
-msgid "Recall message"
+#: ../../Zotlabs/Module/Wiki.php:288
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1232
+msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:379
-msgid "Message has been recalled."
+#: ../../Zotlabs/Module/Wiki.php:289
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1326
+msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:396
-msgid "Delete Conversation"
+#: ../../Zotlabs/Module/Wiki.php:291
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1328 ../../include/conversation.php:1375
+msgid "OK"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:398
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../Zotlabs/Module/Wiki.php:292
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1268
+msgid "Choose images to embed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:402
-msgid "Send Reply"
+#: ../../Zotlabs/Module/Wiki.php:293
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
+#: ../../include/conversation.php:1269
+msgid "Choose an album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:407
-#, php-format
-msgid "Your message for %s (%s):"
+#: ../../Zotlabs/Module/Wiki.php:294
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
+msgid "Choose a different album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
-#: ../../Zotlabs/Module/Editblock.php:113
-msgid "Block Name"
+#: ../../Zotlabs/Module/Wiki.php:295
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1271
+msgid "Error getting album list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2258
+#: ../../Zotlabs/Module/Wiki.php:296
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1272
+msgid "Error getting photo link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:297
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274
+#: ../../include/conversation.php:1273
+msgid "Error getting album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:365
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
+msgid "Error creating wiki. Invalid name."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:372
+msgid "A wiki with this name already exists."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:385
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
+msgid "Wiki created, but error creating Home page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:392
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
+msgid "Error creating wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:404
+msgid "Wiki delete permission denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:414
+msgid "Error deleting wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:440
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
+msgid "New page created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:559
+msgid "Cannot delete Home"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:623
+msgid "Current Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:623
+msgid "Selected Revision"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:673
+msgid "You must be authenticated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2273
 msgid "Blocks"
 msgstr ""
 
@@ -5180,34 +5241,46 @@ msgstr ""
 msgid "Block Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:184
-msgid "Unable to locate original post."
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:450
-msgid "Empty post discarded."
+#: ../../Zotlabs/Module/Cal.php:264 ../../Zotlabs/Module/Events.php:605
+msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:824
-msgid "Duplicate post suppressed."
+#: ../../Zotlabs/Module/Cal.php:313 ../../Zotlabs/Module/Events.php:660
+#: ../../include/text.php:1765
+msgid "Link to Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:954
-msgid "System error. Post not saved."
+#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Events.php:688
+msgid "Edit Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1084
-msgid "Unable to obtain post information from database."
+#: ../../Zotlabs/Module/Cal.php:336 ../../Zotlabs/Module/Events.php:688
+msgid "Create Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1091
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344
+#: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698
+#: ../../Zotlabs/Module/Photos.php:911
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
+msgid "Previous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1098
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Events.php:691
+#: ../../include/channel.php:1344
+msgid "Export"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2297
+msgid "Import"
+msgstr ""
+
+#: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Events.php:700
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
+msgid "Today"
 msgstr ""
 
 #: ../../Zotlabs/Module/Rate.php:156
@@ -5387,12 +5460,34 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1312
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Item.php:184
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:138
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Item.php:450
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:824
+msgid "Duplicate post suppressed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:954
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1084
+msgid "Unable to obtain post information from database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1091
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1098
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
 #: ../../Zotlabs/Module/Lostpass.php:19
@@ -5419,7 +5514,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1614
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1604
 msgid "Password Reset"
 msgstr ""
 
@@ -5544,6 +5639,10 @@ msgstr ""
 msgid "Layout updated."
 msgstr ""
 
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Chat.php:217
+msgid "Feature disabled."
+msgstr ""
+
 #: ../../Zotlabs/Module/Pdledit.php:42 ../../Zotlabs/Module/Pdledit.php:69
 msgid "Edit System Page Description"
 msgstr ""
@@ -5568,7 +5667,7 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1340
+#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1341
 msgid "Profile"
 msgstr ""
 
@@ -5665,7 +5764,7 @@ msgstr ""
 msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1316
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1343
 msgid "Permission settings"
 msgstr ""
 
@@ -5716,437 +5815,16 @@ msgstr ""
 msgid "No service class restrictions found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:176
-msgid "$Projectname Server - Setup"
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:180
-msgid "Could not connect to database."
+#: ../../Zotlabs/Module/Bookmarks.php:76
+msgid "My Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:184
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:191
-msgid "Could not create table."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:196
-msgid "Your site database has been installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:200
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:743
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:260
-msgid "System check"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:265
-msgid "Check again"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:287
-msgid "Database connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:288
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:289
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:290
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Database Server Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Default is 127.0.0.1"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Database Port"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Communication port number - use 0 for default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:296
-msgid "Database Login Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:297
-msgid "Database Login Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:298
-msgid "Database Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:299
-msgid "Database Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
-msgid "Site administrator email address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
-msgid "Website URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
-msgid "Please use SSL (https) URL if available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346
-msgid "Please select a default timezone for your website"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:331
-msgid "Site settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:385
-msgid "PHP version 5.5 or greater is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:386
-msgid "PHP version"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:402
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:403
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:407
-msgid "PHP executable path"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:407
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:412
-msgid "Command line PHP"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:422
-msgid ""
-"Unable to check command line PHP, as shell_exec() is disabled. This is "
-"required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:425
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:426
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:429
-msgid "PHP register_argc_argv"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:447
-#, php-format
-msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to "
-"upload is set to %s. You are allowed to upload up to %d files at once."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:452
-msgid "You can adjust these settings in the server php.ini file."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:454
-msgid "PHP upload limits"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:477
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:478
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:481
-msgid "Generate encryption keys"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:498
-msgid "libCurl PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:499
-msgid "GD graphics PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:500
-msgid "OpenSSL PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:501
-msgid "PDO database PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:502
-msgid "mb_string PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:503
-msgid "xml PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
-msgid "Apache mod_rewrite module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:507
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
-msgid "exec"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:513
-msgid ""
-"Error: exec is required but is either not installed or has been disabled in "
-"php.ini"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
-msgid "shell_exec"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:519
-msgid ""
-"Error: shell_exec is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:527
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:531
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:539
-msgid "Error: PDO database PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:543
-msgid "Error: mb_string PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:547
-msgid "Error: xml PHP module required for DAV but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:565
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:566
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:567
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:568
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:571
-msgid ".htconfig.php is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:585
-msgid ""
-"This software uses the Smarty3 template engine to render its web views. "
-"Smarty3 compiles templates to PHP to speed up rendering."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:586
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the top level web folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:588
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:591
-#, php-format
-msgid "%s is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:607
-msgid ""
-"This software uses the store directory to save uploaded files. The web "
-"server needs to have write access to the store directory under the top level "
-"web folder"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:611
-msgid "store is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:644
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:645
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:646
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:647
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:648
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:649
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:651
-msgid ""
-"If you are confident that the certificate is valid and signed by a trusted "
-"authority, check to see if you have failed to install an intermediate cert. "
-"These are not normally required by browsers, but are required for server-to-"
-"server communications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:653
-msgid "SSL certificate validation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:659
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:662
-msgid "Url rewrite is working"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:676
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:700
-#: ../../extend/addon/addon/cdav/cdav.php:41
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:741
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:742
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../Zotlabs/Module/Bookmarks.php:87
+msgid "My Connections Bookmarks"
 msgstr ""
 
 #: ../../Zotlabs/Module/Removeme.php:35
@@ -6178,19 +5856,19 @@ msgstr ""
 msgid "Remove Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:98
+#: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Files: shared with me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:100
+#: ../../Zotlabs/Module/Sharedwithme.php:101
 msgid "NEW"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:103
+#: ../../Zotlabs/Module/Sharedwithme.php:104
 msgid "Remove all files"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
+#: ../../Zotlabs/Module/Sharedwithme.php:105
 msgid "Remove this file"
 msgstr ""
 
@@ -6276,8 +5954,112 @@ msgstr ""
 msgid "Unable to remove source."
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:112
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../Zotlabs/Module/Mail.php:65
+msgid "Unable to lookup recipient."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:72
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:79
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:97
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:178
+msgid "Messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:213
+msgid "Message recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:361
+#: ../../Zotlabs/Module/Chat.php:203 ../../include/conversation.php:1263
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:362
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:269
+msgid "Requested channel is not in this network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:277
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:415
+msgid "To:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:417
+msgid "Subject:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:423
+#: ../../include/conversation.php:1323
+msgid "Attach file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:288
+msgid "Send"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:428
+#: ../../include/conversation.php:1368
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:430
+#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Lib/ThreadItem.php:744
+#: ../../include/conversation.php:1373
+msgid "Encrypt text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:387
+msgid "Delete message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:388
+msgid "Delivery report"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:389
+msgid "Recall message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:391
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:408
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:410
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:414
+msgid "Send Reply"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:419
+#, php-format
+msgid "Your message for %s (%s):"
 msgstr ""
 
 #: ../../Zotlabs/Module/Suggest.php:37
@@ -6294,15 +6076,15 @@ msgstr ""
 msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1962
+#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1963
 msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1963
+#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1964
 msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1964
+#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1965
 msgid "Authenticate"
 msgstr ""
 
@@ -6704,7 +6486,7 @@ msgid "Basic Settings"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Channel.php:482
-#: ../../include/channel.php:1228
+#: ../../include/channel.php:1229
 msgid "Full Name:"
 msgstr ""
 
@@ -7105,7 +6887,7 @@ msgid "post"
 msgstr ""
 
 #: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
-#: ../../include/text.php:1936
+#: ../../include/text.php:1951
 msgid "comment"
 msgstr ""
 
@@ -7127,74 +6909,314 @@ msgstr ""
 msgid "View Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:134
+#: ../../Zotlabs/Module/Photos.php:78
+msgid "Page owner information could not be retrieved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:94 ../../Zotlabs/Module/Photos.php:120
+msgid "Album not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:103
+msgid "Delete Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:174 ../../Zotlabs/Module/Photos.php:1023
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:501
+msgid "No photos selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:550
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:591
 #, php-format
-msgid "Your service plan only allows %d channels."
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:149
-msgid "No channel. Import failed."
+#: ../../Zotlabs/Module/Photos.php:594
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:467
-msgid "Import completed."
+#: ../../Zotlabs/Module/Photos.php:636
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:488
-msgid "You must be logged in to use this feature."
+#: ../../Zotlabs/Module/Photos.php:640
+msgid "Enter an album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:493
-msgid "Import Channel"
+#: ../../Zotlabs/Module/Photos.php:641
+msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:494
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You "
-"may retrieve the channel identity from the old server/hub via the network or "
-"provide an export file."
+#: ../../Zotlabs/Module/Photos.php:642
+msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:496
-msgid "Or provide the old server/hub details"
+#: ../../Zotlabs/Module/Photos.php:643
+msgid "Caption (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:497
-msgid "Your old identity address (xyz@example.com)"
+#: ../../Zotlabs/Module/Photos.php:644
+msgid "Description (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:498
-msgid "Your old login email address"
+#: ../../Zotlabs/Module/Photos.php:725
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:499
-msgid "Your old login password"
+#: ../../Zotlabs/Module/Photos.php:727
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:500
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be "
-"able to post from either location, but only one can be marked as the primary "
-"location for files, photos, and media."
+#: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290
+#: ../../Zotlabs/Module/Embedphotos.php:139 ../../Zotlabs/Widget/Album.php:78
+msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:501
-msgid "Make this hub my primary location"
+#: ../../Zotlabs/Module/Photos.php:782
+#: ../../Zotlabs/Module/Embedphotos.php:155 ../../Zotlabs/Widget/Album.php:95
+msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:502
-msgid "Move this channel (disable all previous locations)"
+#: ../../Zotlabs/Module/Photos.php:832
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:503
-msgid "Import a few months of posts if possible (limited by available memory"
+#: ../../Zotlabs/Module/Photos.php:834
+msgid "Photo not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:504
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+#: ../../Zotlabs/Module/Photos.php:892
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:893
+msgid "Use as cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:900
+msgid "Private Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:915
+msgid "View Full Size"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:997
+msgid "Edit photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:999
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1000
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1003
+msgid "Move photo to album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1004
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1005
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1008
+msgid "Caption"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1010
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1018
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1021
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412
+#: ../../include/conversation.php:739
+msgid "Please wait"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177
+#: ../../Zotlabs/Lib/ThreadItem.php:729
+msgid "This is you"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+msgctxt "title"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574
+msgctxt "title"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Agree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Disagree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575
+msgctxt "title"
+msgid "Abstain"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Not attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576
+msgctxt "title"
+msgid "Might attend"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1108
+#: ../../Zotlabs/Lib/ThreadItem.php:187 ../../Zotlabs/Lib/ThreadItem.php:199
+msgid "View all"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1247
+#: ../../include/conversation.php:1898
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196
+#: ../../include/conversation.php:1901
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1205
+msgid "Photo Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1214
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1219
+msgid "Map"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401
+msgctxt "noun"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402
+msgctxt "noun"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407
+#: ../../include/acl_selectors.php:220
+msgid "Close"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318
+#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:525
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:179
+msgid "Room not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:195
+msgid "Leave Room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:196
+msgid "Delete Room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "I am away right now"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "I am online"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "Bookmark this room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:230
+msgid "New Chatroom"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:231
+msgid "Chatroom name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "Expiration of chats (minutes)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:248
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:253
+msgid "No chatrooms available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:257
+msgid "Expiration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:258
+msgid "min"
 msgstr ""
 
 #: ../../Zotlabs/Module/Xchan.php:10
@@ -7205,10 +7227,6 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile.php:91
-msgid "vcard"
-msgstr ""
-
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr ""
@@ -7229,6 +7247,215 @@ msgstr ""
 msgid "Room is full"
 msgstr ""
 
+#: ../../Zotlabs/Lib/PermissionDescription.php:34
+#: ../../include/acl_selectors.php:128
+msgid "Visible to your default audience"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+#: ../../include/acl_selectors.php:201
+msgid "Only me"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Public"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+msgid "Anybody in the $Projectname network"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+#, php-format
+msgid "Any account on %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Any of my connections"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Only connections I specifically allow"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:114
+msgid "Any connections including those who haven't yet been approved"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:150
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:151
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid "This is your default setting for who can view your connections"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for the audience of your webpages"
+msgstr ""
+
+#: ../../Zotlabs/Lib/DB_Upgrade.php:93
+#, php-format
+msgid "Update Error at %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/DB_Upgrade.php:99
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Permcat.php:58
+msgctxt "permcat"
+msgid "default"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Permcat.php:96
+msgctxt "permcat"
+msgid "follower"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Permcat.php:100
+msgctxt "permcat"
+msgid "contributor"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Permcat.php:104
+msgctxt "permcat"
+msgid "publisher"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:212
+msgid "Site Admin"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:213
+#: ../../extend/addon/addon/buglink/buglink.php:16
+msgid "Report Bug"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:214
+msgid "View Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:215
+msgid "My Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:217
+msgid "Firefox Share"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:218
+msgid "Remote Diagnostics"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
+msgid "Suggest Channels"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:113
+#: ../../boot.php:1596
+msgid "Login"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:172
+msgid "Grid"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1848
+#: ../../include/features.php:99
+msgid "Wiki"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:176
+msgid "Channel Home"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:196
+#: ../../include/conversation.php:1793 ../../include/conversation.php:1796
+msgid "Events"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Directory"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:188
+msgid "Mail"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:236
+msgid "Chat"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:238
+msgid "Probe"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:239
+msgid "Suggest"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:240
+msgid "Random Channel"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:241
+msgid "Invite"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
+msgid "Features"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:243
+#: ../../extend/addon/addon/openid/MysqlProvider.php:69
+msgid "Language"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:244
+msgid "Post"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:245
+#: ../../extend/addon/addon/openid/MysqlProvider.php:58
+#: ../../extend/addon/addon/openid/MysqlProvider.php:59
+#: ../../extend/addon/addon/openid/MysqlProvider.php:60
+msgid "Profile Photo"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:355
+msgid "Purchase"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:359
+msgid "Undelete"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:364
+msgid "Add to app-tray"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:365
+msgid "Remove from app-tray"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1426
 msgid "$Projectname Notification"
 msgstr ""
@@ -7448,260 +7675,8 @@ msgstr ""
 msgid "commented on %s's post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/PermissionDescription.php:34
-#: ../../include/acl_selectors.php:128
-msgid "Visible to your default audience"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:107
-#: ../../include/acl_selectors.php:201
-msgid "Only me"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:108
-msgid "Public"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:109
-msgid "Anybody in the $Projectname network"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:110
-#, php-format
-msgid "Any account on %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:111
-msgid "Any of my connections"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:112
-msgid "Only connections I specifically allow"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:113
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:114
-msgid "Any connections including those who haven't yet been approved"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:150
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:151
-msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:152
-msgid "This is your default setting for who can view your connections"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:153
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr ""
-
-#: ../../Zotlabs/Lib/PermissionDescription.php:154
-msgid "This is your default setting for the audience of your webpages"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:660
-msgid "Private Message"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:652
-msgid "Select"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:136
-msgid "Save to Folder"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I will attend"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I will not attend"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I might attend"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I agree"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I disagree"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I abstain"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:223
-msgid "Add Star"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:224
-msgid "Remove Star"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:225
-msgid "Toggle Star Status"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:229
-msgid "starred"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:239 ../../include/conversation.php:667
-msgid "Message signature validated"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
-msgid "Message signature incorrect"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:248
-msgid "Add Tag"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:316
-msgid "like"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:317
-msgid "dislike"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:273
-msgid "Share This"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:273
-msgid "share"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:282
-msgid "Delivery Report"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:300
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:329 ../../Zotlabs/Lib/ThreadItem.php:330
-#, php-format
-msgid "View %s's profile - %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:333
-msgid "to"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:334
-msgid "via"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:335
-msgid "Wall-to-Wall"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:336
-msgid "via Wall-To-Wall:"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:349 ../../include/conversation.php:714
-#, php-format
-msgid "from %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:717
-#, php-format
-msgid "last edited: %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:718
-#, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:359
-msgid "Attend"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:360
-msgid "Attendance Options"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:361
-msgid "Vote"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:362
-msgid "Voting Options"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:382
-#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
-msgid "Save Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:383
-msgid "Add to Calendar"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:392
-msgid "Mark all seen"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7
-#, php-format
-msgid "%s show all"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1291
-msgid "Bold"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1292
-msgid "Italic"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1293
-msgid "Underline"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1294
-msgid "Quote"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1295
-msgid "Code"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:736
-msgid "Image"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:737
-msgid "Insert Link"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:738
-msgid "Video"
+#: ../../Zotlabs/Lib/NativeWiki.php:128
+msgid "Wiki files deleted successfully"
 msgstr ""
 
 #: ../../Zotlabs/Lib/NativeWikiPage.php:31
@@ -7773,154 +7748,193 @@ msgstr ""
 msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:79
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661
+msgid "Private Message"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653
+msgid "Select"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I will attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I will not attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I might attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I agree"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I disagree"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I abstain"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:224
+msgid "Add Star"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:225
+msgid "Remove Star"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:226
+msgid "Toggle Star Status"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:230
+msgid "starred"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669
+msgid "Message signature incorrect"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:249
+msgid "Add Tag"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316
+msgid "like"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317
+msgid "dislike"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "Share This"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "share"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:283
+msgid "Delivery Report"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:301
 #, php-format
-msgid "Update Error at %s"
-msgstr ""
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Lib/DB_Upgrade.php:85
+#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
 #, php-format
-msgid "Update %s failed. See error logs."
+msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:58
-msgctxt "permcat"
-msgid "default"
+#: ../../Zotlabs/Lib/ThreadItem.php:334
+msgid "to"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:96
-msgctxt "permcat"
-msgid "follower"
+#: ../../Zotlabs/Lib/ThreadItem.php:335
+msgid "via"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:100
-msgctxt "permcat"
-msgid "contributor"
+#: ../../Zotlabs/Lib/ThreadItem.php:336
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:104
-msgctxt "permcat"
-msgid "publisher"
+#: ../../Zotlabs/Lib/ThreadItem.php:337
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:212
-msgid "Site Admin"
+#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718
+#, php-format
+msgid "from %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:213
-#: ../../extend/addon/addon/buglink/buglink.php:16
-msgid "Report Bug"
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721
+#, php-format
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:214
-msgid "View Bookmarks"
+#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722
+#, php-format
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:215
-msgid "My Chatrooms"
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+msgid "Attend"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:217
-msgid "Firefox Share"
+#: ../../Zotlabs/Lib/ThreadItem.php:361
+msgid "Attendance Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:218
-msgid "Remote Diagnostics"
+#: ../../Zotlabs/Lib/ThreadItem.php:362
+msgid "Vote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
-msgid "Suggest Channels"
+#: ../../Zotlabs/Lib/ThreadItem.php:363
+msgid "Voting Options"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130
-#: ../../boot.php:1606
-msgid "Login"
+#: ../../Zotlabs/Lib/ThreadItem.php:384
+#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
+msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:194
-msgid "Grid"
+#: ../../Zotlabs/Lib/ThreadItem.php:385
+msgid "Add to Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1809
-#: ../../include/features.php:99
-msgid "Wiki"
+#: ../../Zotlabs/Lib/ThreadItem.php:394
+msgid "Mark all seen"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:198
-msgid "Channel Home"
+#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
+#, php-format
+msgid "%s show all"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1759
-#: ../../include/conversation.php:1762 ../../include/nav.php:218
-msgid "Events"
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318
+msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:182
-msgid "Directory"
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319
+msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:210
-msgid "Mail"
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320
+msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:236
-msgid "Chat"
+#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321
+msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:238
-msgid "Probe"
+#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322
+msgid "Code"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:239
-msgid "Suggest"
+#: ../../Zotlabs/Lib/ThreadItem.php:738
+msgid "Image"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:240
-msgid "Random Channel"
+#: ../../Zotlabs/Lib/ThreadItem.php:739
+msgid "Insert Link"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:241
-msgid "Invite"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
-msgid "Features"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:243
-#: ../../extend/addon/addon/openid/MysqlProvider.php:69
-msgid "Language"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:244
-msgid "Post"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:245
-#: ../../extend/addon/addon/openid/MysqlProvider.php:58
-#: ../../extend/addon/addon/openid/MysqlProvider.php:59
-#: ../../extend/addon/addon/openid/MysqlProvider.php:60
-msgid "Profile Photo"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:355
-msgid "Purchase"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:359
-msgid "Undelete"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:364
-msgid "Add to app-tray"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:365
-msgid "Remove from app-tray"
-msgstr ""
-
-#: ../../Zotlabs/Lib/NativeWiki.php:128
-msgid "Wiki files deleted successfully"
+#: ../../Zotlabs/Lib/ThreadItem.php:740
+msgid "Video"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Activity.php:50
@@ -7940,7 +7954,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:233
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:211
 msgid "Admin"
 msgstr ""
 
@@ -7972,7 +7986,7 @@ msgid "Bookmarked Chatrooms"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Chatroom_list.php:16
-#: ../../include/conversation.php:1772 ../../include/conversation.php:1775
+#: ../../include/conversation.php:1807 ../../include/conversation.php:1810
 msgid "Chatrooms"
 msgstr ""
 
@@ -7984,27 +7998,6 @@ msgstr ""
 msgid "Chat Members"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Conversations.php:17
-#: ../../Zotlabs/Widget/Conversations.php:29
-msgid "Conversations"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:21
-msgid "Received Messages"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:25
-msgid "Sent Messages"
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:39
-msgid "No messages."
-msgstr ""
-
-#: ../../Zotlabs/Widget/Conversations.php:57
-msgid "Delete conversation"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Cover_photo.php:54
 msgid "Click to show more"
 msgstr ""
@@ -8055,15 +8048,15 @@ msgstr ""
 msgid "Combined View"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:213
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:191
 msgid "Inbox"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:214
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:192
 msgid "Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:215
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:193
 msgid "New Message"
 msgstr ""
 
@@ -8151,10 +8144,6 @@ msgstr ""
 msgid "See more..."
 msgstr ""
 
-#: ../../Zotlabs/Widget/Tasklist.php:23
-msgid "Tasks"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Wiki_list.php:15
 #: ../../extend/addon/addon/gitwiki/gitwiki.php:95
 msgid "Wiki List"
@@ -8175,6 +8164,31 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
+#: ../../Zotlabs/Widget/Tasklist.php:23
+msgid "Tasks"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Zotlabs/Widget/Conversations.php:29
+msgid "Conversations"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:21
+msgid "Received Messages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:25
+msgid "Sent Messages"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:39
+msgid "No messages."
+msgstr ""
+
+#: ../../Zotlabs/Widget/Conversations.php:57
+msgid "Delete conversation"
+msgstr ""
+
 #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
 msgid "Flag Adult Photos"
 msgstr ""
@@ -8562,7 +8576,7 @@ msgid "IRC Chatroom"
 msgstr ""
 
 #: ../../extend/addon/addon/jappixmini/jappixmini.php:305
-#: ../../include/channel.php:1137 ../../include/channel.php:1274
+#: ../../include/channel.php:1138 ../../include/channel.php:1275
 msgid "Status:"
 msgstr ""
 
@@ -9098,7 +9112,7 @@ msgid "Page to load after image selection."
 msgstr ""
 
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:58
-#: ../../include/channel.php:1046 ../../include/nav.php:107
+#: ../../include/nav.php:107 ../../include/channel.php:1047
 msgid "Edit Profile"
 msgstr ""
 
@@ -9403,7 +9417,7 @@ msgstr ""
 msgid "Redmatrix Login Password"
 msgstr ""
 
-#: ../../extend/addon/addon/redfiles/redfilehelper.php:67
+#: ../../extend/addon/addon/redfiles/redfilehelper.php:64
 msgid "file"
 msgstr ""
 
@@ -10376,7 +10390,7 @@ msgstr ""
 msgid "Error creating new game."
 msgstr ""
 
-#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:897
+#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:898
 msgid "Requested channel is not available."
 msgstr ""
 
@@ -10669,12 +10683,12 @@ msgstr ""
 msgid "Search $Projectname"
 msgstr ""
 
-#: ../../include/dba/dba_driver.php:187
+#: ../../include/dba/dba_driver.php:189
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/language.php:367 ../../include/text.php:1772
+#: ../../include/language.php:367 ../../include/text.php:1787
 msgid "default"
 msgstr ""
 
@@ -10807,155 +10821,20 @@ msgstr ""
 msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
+#: ../../include/message.php:30
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/channel.php:67
-msgid "Empty name"
+#: ../../include/message.php:67
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/channel.php:70
-msgid "Name too long"
+#: ../../include/message.php:72
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/channel.php:181
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/channel.php:193
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/channel.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/channel.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/channel.php:270
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/channel.php:342
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/channel.php:1043
-msgid "Create New Profile"
-msgstr ""
-
-#: ../../include/channel.php:1063
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/channel.php:1136 ../../include/channel.php:1230
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/channel.php:1138 ../../include/channel.php:1285
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/channel.php:1139
-msgid "Online Now"
-msgstr ""
-
-#: ../../include/channel.php:1235
-msgid "Like this channel"
-msgstr ""
-
-#: ../../include/channel.php:1259
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/channel.php:1260
-msgid "j F"
-msgstr ""
-
-#: ../../include/channel.php:1267
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/channel.php:1280
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/channel.php:1283
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../include/channel.php:1289
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/channel.php:1291
-msgid "Political Views:"
-msgstr ""
-
-#: ../../include/channel.php:1293
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/channel.php:1297
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/channel.php:1299
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/channel.php:1301
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/channel.php:1303
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/channel.php:1305
-msgid "My other channels:"
-msgstr ""
-
-#: ../../include/channel.php:1307
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/channel.php:1309
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/channel.php:1311
-msgid "Television:"
-msgstr ""
-
-#: ../../include/channel.php:1313
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/channel.php:1315
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/channel.php:1317
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/channel.php:1319
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/channel.php:1342
-msgid "Like this thing"
-msgstr ""
-
-#: ../../include/channel.php:2115
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/message.php:223
+msgid "Stored post could not be verified."
 msgstr ""
 
 #: ../../include/datetime.php:147
@@ -10970,7 +10849,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:286 ../../boot.php:2431
+#: ../../include/datetime.php:286 ../../boot.php:2424
 msgid "never"
 msgstr ""
 
@@ -11296,341 +11175,68 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/event.php:22 ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/attach.php:250 ../../include/attach.php:339
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/event.php:73
-msgid "Starts:"
+#: ../../include/attach.php:500
+msgid "No source file."
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/event.php:77
-msgid "Finishes:"
+#: ../../include/attach.php:522
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/event.php:1008
-msgid "This event has been added to your calendar."
+#: ../../include/attach.php:540
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/event.php:1208
-msgid "Not specified"
-msgstr ""
-
-#: ../../include/event.php:1209
-msgid "Needs Action"
-msgstr ""
-
-#: ../../include/event.php:1210
-msgid "Completed"
-msgstr ""
-
-#: ../../include/event.php:1211
-msgid "In Process"
-msgstr ""
-
-#: ../../include/event.php:1212
-msgid "Cancelled"
-msgstr ""
-
-#: ../../include/help.php:33
-msgid "Help:"
-msgstr ""
-
-#: ../../include/help.php:65
-msgid "Not Found"
-msgstr ""
-
-#: ../../include/conversation.php:200
+#: ../../include/attach.php:671
 #, php-format
-msgid "%1$s is now connected with %2$s"
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/conversation.php:235
+#: ../../include/attach.php:685
 #, php-format
-msgid "%1$s poked %2$s"
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/conversation.php:239 ../../include/text.php:1097
-#: ../../include/text.php:1102
-msgid "poked"
+#: ../../include/attach.php:855
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/conversation.php:687
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/attach.php:868
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/conversation.php:707
-msgid "Categories:"
+#: ../../include/attach.php:923 ../../include/attach.php:939
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/conversation.php:708
-msgid "Filed under:"
+#: ../../include/attach.php:988 ../../include/attach.php:1153
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/conversation.php:733
-msgid "View in context"
+#: ../../include/attach.php:1014
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/conversation.php:829
-msgid "remove"
+#: ../../include/attach.php:1039
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/conversation.php:833 ../../include/nav.php:292
-msgid "Loading..."
+#: ../../include/attach.php:1107
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/conversation.php:834
-msgid "Delete Selected Items"
+#: ../../include/attach.php:1111
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/conversation.php:877
-msgid "View Source"
+#: ../../include/attach.php:1159
+msgid "Empty path"
 msgstr ""
 
-#: ../../include/conversation.php:887
-msgid "Follow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:896
-msgid "Unfollow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:965
-msgid "Activity/Posts"
-msgstr ""
-
-#: ../../include/conversation.php:985
-msgid "Edit Connection"
-msgstr ""
-
-#: ../../include/conversation.php:995
-msgid "Message"
-msgstr ""
-
-#: ../../include/conversation.php:1129
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: ../../include/conversation.php:1129
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1133
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1135
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1141
-msgid "and"
-msgstr ""
-
-#: ../../include/conversation.php:1144
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1145
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../include/conversation.php:1145
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1188
-msgid "Set your location"
-msgstr ""
-
-#: ../../include/conversation.php:1189
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../include/conversation.php:1237
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1238
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1243
-msgid "Choose a different album..."
-msgstr ""
-
-#: ../../include/conversation.php:1247
-msgid "Comments enabled"
-msgstr ""
-
-#: ../../include/conversation.php:1248
-msgid "Comments disabled"
-msgstr ""
-
-#: ../../include/conversation.php:1286
-msgid "Page link name"
-msgstr ""
-
-#: ../../include/conversation.php:1289
-msgid "Post as"
-msgstr ""
-
-#: ../../include/conversation.php:1303
-msgid "Toggle voting"
-msgstr ""
-
-#: ../../include/conversation.php:1306
-msgid "Disable comments"
-msgstr ""
-
-#: ../../include/conversation.php:1307
-msgid "Toggle comments"
-msgstr ""
-
-#: ../../include/conversation.php:1315
-msgid "Categories (optional, comma-separated list)"
-msgstr ""
-
-#: ../../include/conversation.php:1338
-msgid "Other networks and post services"
-msgstr ""
-
-#: ../../include/conversation.php:1344
-msgid "Set publish date"
-msgstr ""
-
-#: ../../include/conversation.php:1598
-msgid "Discover"
-msgstr ""
-
-#: ../../include/conversation.php:1601
-msgid "Imported public streams"
-msgstr ""
-
-#: ../../include/conversation.php:1606
-msgid "Commented Order"
-msgstr ""
-
-#: ../../include/conversation.php:1609
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../include/conversation.php:1613
-msgid "Posted Order"
-msgstr ""
-
-#: ../../include/conversation.php:1616
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../include/conversation.php:1624
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: ../../include/conversation.php:1633
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../include/conversation.php:1639
-msgid "Starred"
-msgstr ""
-
-#: ../../include/conversation.php:1642
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1649
-msgid "Spam"
-msgstr ""
-
-#: ../../include/conversation.php:1652
-msgid "Posts flagged as SPAM"
-msgstr ""
-
-#: ../../include/conversation.php:1724
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1736
-msgid "Profile Details"
-msgstr ""
-
-#: ../../include/conversation.php:1745 ../../include/photos.php:524
-msgid "Photo Albums"
-msgstr ""
-
-#: ../../include/conversation.php:1752
-msgid "Files and Storage"
-msgstr ""
-
-#: ../../include/conversation.php:1785
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1788
-msgid "Saved Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1798
-msgid "View Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1864
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1867
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1870
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1873
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1876
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1879
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
-
 #: ../../include/page_widgets.php:7
 msgid "New Page"
 msgstr ""
@@ -11689,15 +11295,15 @@ msgstr ""
 msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1605
+#: ../../include/nav.php:99 ../../include/nav.php:123 ../../boot.php:1595
 msgid "Logout"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/nav.php:140
+#: ../../include/nav.php:99 ../../include/nav.php:123
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:103
+#: ../../include/nav.php:102
 msgid "Your profile page"
 msgstr ""
 
@@ -11709,122 +11315,166 @@ msgstr ""
 msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:113
 msgid "Sign in"
 msgstr ""
 
-#: ../../include/nav.php:155
+#: ../../include/nav.php:138
 msgid "Take me home"
 msgstr ""
 
-#: ../../include/nav.php:157
+#: ../../include/nav.php:140
 msgid "Log me out of this site"
 msgstr ""
 
-#: ../../include/nav.php:162
+#: ../../include/nav.php:145
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:174
+#: ../../include/nav.php:157
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:178
-msgid "Applications, utilities, links, games"
-msgstr ""
-
-#: ../../include/nav.php:180
+#: ../../include/nav.php:160
 msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/nav.php:182
-msgid "Channel Directory"
-msgstr ""
-
-#: ../../include/nav.php:194
+#: ../../include/nav.php:172
 msgid "Your grid"
 msgstr ""
 
-#: ../../include/nav.php:195
+#: ../../include/nav.php:173
 msgid "View your network/grid"
 msgstr ""
 
-#: ../../include/nav.php:196
+#: ../../include/nav.php:174
 msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:198
+#: ../../include/nav.php:176
 msgid "Channel home"
 msgstr ""
 
-#: ../../include/nav.php:199
+#: ../../include/nav.php:177
 msgid "View your channel home"
 msgstr ""
 
-#: ../../include/nav.php:200
+#: ../../include/nav.php:178
 msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:206
+#: ../../include/nav.php:184
 msgid "Notices"
 msgstr ""
 
-#: ../../include/nav.php:206
+#: ../../include/nav.php:184
 msgid "Notifications"
 msgstr ""
 
-#: ../../include/nav.php:207
+#: ../../include/nav.php:185
 msgid "View all notifications"
 msgstr ""
 
-#: ../../include/nav.php:210
+#: ../../include/nav.php:188
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:211
+#: ../../include/nav.php:189
 msgid "View your private messages"
 msgstr ""
 
-#: ../../include/nav.php:212
+#: ../../include/nav.php:190
 msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/nav.php:218
+#: ../../include/nav.php:196
 msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/nav.php:219
+#: ../../include/nav.php:197
 msgid "View events"
 msgstr ""
 
-#: ../../include/nav.php:220
+#: ../../include/nav.php:198
 msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/nav.php:223
+#: ../../include/nav.php:201
 msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/nav.php:225
+#: ../../include/nav.php:203
 msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/nav.php:233
+#: ../../include/nav.php:211
 msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/nav.php:297
+#: ../../include/nav.php:268 ../../include/conversation.php:838
+msgid "Loading..."
+msgstr ""
+
+#: ../../include/nav.php:273
 msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/nav.php:298
+#: ../../include/nav.php:274
 msgid "Please wait..."
 msgstr ""
 
-#: ../../include/nav.php:300
+#: ../../include/nav.php:276
 msgid "Add Apps"
 msgstr ""
 
+#: ../../include/network.php:756
+msgid "view full size"
+msgstr ""
+
+#: ../../include/network.php:1490
+msgid "No Subject"
+msgstr ""
+
+#: ../../include/network.php:1744 ../../include/network.php:1745
+msgid "Friendica"
+msgstr ""
+
+#: ../../include/network.php:1746
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/network.php:1747
+msgid "GNU-Social"
+msgstr ""
+
+#: ../../include/network.php:1748
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/network.php:1750
+msgid "Diaspora"
+msgstr ""
+
+#: ../../include/network.php:1751
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/network.php:1752
+msgid "Zot"
+msgstr ""
+
+#: ../../include/network.php:1753
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/network.php:1754
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/network.php:1755
+msgid "MySpace"
+msgstr ""
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
@@ -11965,19 +11615,19 @@ msgstr ""
 msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1314
+#: ../../include/js_strings.php:45 ../../include/text.php:1332
 msgid "January"
 msgstr ""
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1314
+#: ../../include/js_strings.php:46 ../../include/text.php:1332
 msgid "February"
 msgstr ""
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1314
+#: ../../include/js_strings.php:47 ../../include/text.php:1332
 msgid "March"
 msgstr ""
 
-#: ../../include/js_strings.php:48 ../../include/text.php:1314
+#: ../../include/js_strings.php:48 ../../include/text.php:1332
 msgid "April"
 msgstr ""
 
@@ -11986,31 +11636,31 @@ msgctxt "long"
 msgid "May"
 msgstr ""
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1314
+#: ../../include/js_strings.php:50 ../../include/text.php:1332
 msgid "June"
 msgstr ""
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1314
+#: ../../include/js_strings.php:51 ../../include/text.php:1332
 msgid "July"
 msgstr ""
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1314
+#: ../../include/js_strings.php:52 ../../include/text.php:1332
 msgid "August"
 msgstr ""
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1314
+#: ../../include/js_strings.php:53 ../../include/text.php:1332
 msgid "September"
 msgstr ""
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1314
+#: ../../include/js_strings.php:54 ../../include/text.php:1332
 msgid "October"
 msgstr ""
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1314
+#: ../../include/js_strings.php:55 ../../include/text.php:1332
 msgid "November"
 msgstr ""
 
-#: ../../include/js_strings.php:56 ../../include/text.php:1314
+#: ../../include/js_strings.php:56 ../../include/text.php:1332
 msgid "December"
 msgstr ""
 
@@ -12063,31 +11713,31 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1310
+#: ../../include/js_strings.php:69 ../../include/text.php:1328
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1310
+#: ../../include/js_strings.php:70 ../../include/text.php:1328
 msgid "Monday"
 msgstr ""
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1310
+#: ../../include/js_strings.php:71 ../../include/text.php:1328
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1310
+#: ../../include/js_strings.php:72 ../../include/text.php:1328
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1310
+#: ../../include/js_strings.php:73 ../../include/text.php:1328
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1310
+#: ../../include/js_strings.php:74 ../../include/text.php:1328
 msgid "Friday"
 msgstr ""
 
-#: ../../include/js_strings.php:75 ../../include/text.php:1310
+#: ../../include/js_strings.php:75 ../../include/text.php:1328
 msgid "Saturday"
 msgstr ""
 
@@ -12160,350 +11810,6 @@ msgstr ""
 msgid "This Website Only"
 msgstr ""
 
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:268
-msgid "Add new connections to this privacy group"
-msgstr ""
-
-#: ../../include/group.php:309
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:331 ../../include/features.php:292
-msgid "Privacy Groups"
-msgstr ""
-
-#: ../../include/group.php:332
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:333
-msgid "Add privacy group"
-msgstr ""
-
-#: ../../include/group.php:334
-msgid "Channels not in any privacy group"
-msgstr ""
-
-#: ../../include/text.php:460
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:462
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:491
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:494
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:505
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:507
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:927
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:952
-#, php-format
-msgid "View all %s connections"
-msgstr ""
-
-#: ../../include/text.php:1097 ../../include/text.php:1102
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:1103
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:1103
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:1104
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:1104
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:1105
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:1105
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:1106
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:1106
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:1107
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:1107
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:1119
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:1120
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:1121
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:1122
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:1123
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:1124
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:1125
-msgid "stupefied"
-msgstr ""
-
-#: ../../include/text.php:1126
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:1127
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:1128
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:1129
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:1130
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:1131
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:1132
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:1133
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:1134
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:1135
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:1136
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:1137
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:1138
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:1139
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1314
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1391 ../../include/text.php:1395
-msgid "Unknown Attachment"
-msgstr ""
-
-#: ../../include/text.php:1397
-msgid "unknown"
-msgstr ""
-
-#: ../../include/text.php:1433
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1510
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1780
-msgid "Page layout"
-msgstr ""
-
-#: ../../include/text.php:1780
-msgid "You can create your own with the layouts tool"
-msgstr ""
-
-#: ../../include/text.php:1808
-msgid "Page content type"
-msgstr ""
-
-#: ../../include/text.php:1941
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:2255
-msgid "Design Tools"
-msgstr ""
-
-#: ../../include/text.php:2261
-msgid "Pages"
-msgstr ""
-
-#: ../../include/text.php:2283
-msgid "Import website..."
-msgstr ""
-
-#: ../../include/text.php:2284
-msgid "Select folder to import"
-msgstr ""
-
-#: ../../include/text.php:2285
-msgid "Import from a zipped folder:"
-msgstr ""
-
-#: ../../include/text.php:2286
-msgid "Import from cloud files:"
-msgstr ""
-
-#: ../../include/text.php:2287
-msgid "/cloud/channel/path/to/folder"
-msgstr ""
-
-#: ../../include/text.php:2288
-msgid "Enter path to website files"
-msgstr ""
-
-#: ../../include/text.php:2289
-msgid "Select folder"
-msgstr ""
-
-#: ../../include/text.php:2290
-msgid "Export website..."
-msgstr ""
-
-#: ../../include/text.php:2291
-msgid "Export to a zip file"
-msgstr ""
-
-#: ../../include/text.php:2292
-msgid "website.zip"
-msgstr ""
-
-#: ../../include/text.php:2293
-msgid "Enter a name for the zip file."
-msgstr ""
-
-#: ../../include/text.php:2294
-msgid "Export to cloud files"
-msgstr ""
-
-#: ../../include/text.php:2295
-msgid "/path/to/export/folder"
-msgstr ""
-
-#: ../../include/text.php:2296
-msgid "Enter a path to a cloud files destination."
-msgstr ""
-
-#: ../../include/text.php:2297
-msgid "Specify folder"
-msgstr ""
-
-#: ../../include/network.php:756
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1490
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:1744 ../../include/network.php:1745
-msgid "Friendica"
-msgstr ""
-
-#: ../../include/network.php:1746
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/network.php:1747
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:1748
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/network.php:1750
-msgid "Diaspora"
-msgstr ""
-
-#: ../../include/network.php:1751
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/network.php:1752
-msgid "Zot"
-msgstr ""
-
-#: ../../include/network.php:1753
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/network.php:1754
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/network.php:1755
-msgid "MySpace"
-msgstr ""
-
 #: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
 #: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
 #: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
@@ -12547,69 +11853,47 @@ msgstr ""
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/photos.php:111
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr ""
-
-#: ../../include/photos.php:118
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr ""
-
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr ""
-
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr ""
-
-#: ../../include/photos.php:529
-msgid "Upload New Photos"
-msgstr ""
-
-#: ../../include/message.php:32
-msgid "Unable to determine sender."
-msgstr ""
-
-#: ../../include/message.php:69
-msgid "No recipient provided."
-msgstr ""
-
-#: ../../include/message.php:74
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/message.php:225
-msgid "Stored post could not be verified."
-msgstr ""
-
-#: ../../include/security.php:117
-msgid "guest:"
-msgstr ""
-
-#: ../../include/security.php:532
+#: ../../include/group.php:26
 msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/import.php:30
+#: ../../include/group.php:268
+msgid "Add new connections to this privacy group"
+msgstr ""
+
+#: ../../include/group.php:309
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:331 ../../include/features.php:292
+msgid "Privacy Groups"
+msgstr ""
+
+#: ../../include/group.php:332
+msgid "Edit group"
+msgstr ""
+
+#: ../../include/group.php:333
+msgid "Add privacy group"
+msgstr ""
+
+#: ../../include/group.php:334
+msgid "Channels not in any privacy group"
+msgstr ""
+
+#: ../../include/import.php:41
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/import.php:51
+#: ../../include/import.php:62
 msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/import.php:94
+#: ../../include/import.php:105
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
@@ -12682,6 +11966,790 @@ msgctxt "edit_activity"
 msgid "Comment"
 msgstr ""
 
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr ""
+
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr ""
+
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr ""
+
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr ""
+
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr ""
+
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr ""
+
+#: ../../include/channel.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr ""
+
+#: ../../include/channel.php:271
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/channel.php:343
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/channel.php:1044
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/channel.php:1064
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/channel.php:1137 ../../include/channel.php:1231
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/channel.php:1139 ../../include/channel.php:1286
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/channel.php:1140
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/channel.php:1236
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/channel.php:1260
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/channel.php:1261
+msgid "j F"
+msgstr ""
+
+#: ../../include/channel.php:1268
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/channel.php:1281
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: ../../include/channel.php:1284
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../include/channel.php:1290
+msgid "Tags:"
+msgstr ""
+
+#: ../../include/channel.php:1292
+msgid "Political Views:"
+msgstr ""
+
+#: ../../include/channel.php:1294
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/channel.php:1298
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/channel.php:1300
+msgid "Likes:"
+msgstr ""
+
+#: ../../include/channel.php:1302
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../include/channel.php:1304
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/channel.php:1306
+msgid "My other channels:"
+msgstr ""
+
+#: ../../include/channel.php:1308
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/channel.php:1310
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/channel.php:1312
+msgid "Television:"
+msgstr ""
+
+#: ../../include/channel.php:1314
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/channel.php:1316
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/channel.php:1318
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/channel.php:1320
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/channel.php:1343
+msgid "Like this thing"
+msgstr ""
+
+#: ../../include/channel.php:2114
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: ../../include/conversation.php:200
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:235
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:239 ../../include/text.php:1115
+#: ../../include/text.php:1120
+msgid "poked"
+msgstr ""
+
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:711
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:712
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:737
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:834
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:839
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:882
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:892
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:901
+msgid "Unfollow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:992
+msgid "Activity/Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1012
+msgid "Edit Connection"
+msgstr ""
+
+#: ../../include/conversation.php:1022
+msgid "Message"
+msgstr ""
+
+#: ../../include/conversation.php:1156
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:1156
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1160
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1162
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1168
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1171
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1172
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1172
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1215
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1216
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1264
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1265
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1270
+msgid "Choose a different album..."
+msgstr ""
+
+#: ../../include/conversation.php:1274
+msgid "Comments enabled"
+msgstr ""
+
+#: ../../include/conversation.php:1275
+msgid "Comments disabled"
+msgstr ""
+
+#: ../../include/conversation.php:1313
+msgid "Page link name"
+msgstr ""
+
+#: ../../include/conversation.php:1316
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1330
+msgid "Toggle voting"
+msgstr ""
+
+#: ../../include/conversation.php:1333
+msgid "Disable comments"
+msgstr ""
+
+#: ../../include/conversation.php:1334
+msgid "Toggle comments"
+msgstr ""
+
+#: ../../include/conversation.php:1342
+msgid "Categories (optional, comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1365
+msgid "Other networks and post services"
+msgstr ""
+
+#: ../../include/conversation.php:1371
+msgid "Set publish date"
+msgstr ""
+
+#: ../../include/conversation.php:1625
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1628
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1633
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1636
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1640
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1643
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1651
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1660
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1666
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1669
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1676
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1679
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1754
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1767
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1777 ../../include/photos.php:524
+msgid "Photo Albums"
+msgstr ""
+
+#: ../../include/conversation.php:1785
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1821
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1824
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1835
+msgid "View Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1904
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1907
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1910
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1913
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1916
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1919
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/event.php:22 ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/event.php:30 ../../include/event.php:73
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:40 ../../include/event.php:77
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:1008
+msgid "This event has been added to your calendar."
+msgstr ""
+
+#: ../../include/event.php:1208
+msgid "Not specified"
+msgstr ""
+
+#: ../../include/event.php:1209
+msgid "Needs Action"
+msgstr ""
+
+#: ../../include/event.php:1210
+msgid "Completed"
+msgstr ""
+
+#: ../../include/event.php:1211
+msgid "In Process"
+msgstr ""
+
+#: ../../include/event.php:1212
+msgid "Cancelled"
+msgstr ""
+
+#: ../../include/help.php:33
+msgid "Help:"
+msgstr ""
+
+#: ../../include/help.php:65
+msgid "Not Found"
+msgstr ""
+
+#: ../../include/photos.php:111
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr ""
+
+#: ../../include/photos.php:118
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr ""
+
+#: ../../include/photos.php:529
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../include/security.php:117
+msgid "guest:"
+msgstr ""
+
+#: ../../include/security.php:532
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: ../../include/text.php:478
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:480
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:509
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:512
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:523
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:525
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:945
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:970
+#, php-format
+msgid "View all %s connections"
+msgstr ""
+
+#: ../../include/text.php:1115 ../../include/text.php:1120
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:1121
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:1121
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:1122
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:1122
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:1123
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:1123
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:1124
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:1124
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:1125
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:1125
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:1137
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:1138
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:1139
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:1140
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:1141
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:1142
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:1143
+msgid "stupefied"
+msgstr ""
+
+#: ../../include/text.php:1144
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:1145
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:1146
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:1147
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:1148
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:1149
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1150
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1151
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1152
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1153
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1154
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:1155
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1156
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1157
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1332
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1409 ../../include/text.php:1413
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1415
+msgid "unknown"
+msgstr ""
+
+#: ../../include/text.php:1451
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1525
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1795
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1795
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1823
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1956
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2270
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2276
+msgid "Pages"
+msgstr ""
+
+#: ../../include/text.php:2298
+msgid "Import website..."
+msgstr ""
+
+#: ../../include/text.php:2299
+msgid "Select folder to import"
+msgstr ""
+
+#: ../../include/text.php:2300
+msgid "Import from a zipped folder:"
+msgstr ""
+
+#: ../../include/text.php:2301
+msgid "Import from cloud files:"
+msgstr ""
+
+#: ../../include/text.php:2302
+msgid "/cloud/channel/path/to/folder"
+msgstr ""
+
+#: ../../include/text.php:2303
+msgid "Enter path to website files"
+msgstr ""
+
+#: ../../include/text.php:2304
+msgid "Select folder"
+msgstr ""
+
+#: ../../include/text.php:2305
+msgid "Export website..."
+msgstr ""
+
+#: ../../include/text.php:2306
+msgid "Export to a zip file"
+msgstr ""
+
+#: ../../include/text.php:2307
+msgid "website.zip"
+msgstr ""
+
+#: ../../include/text.php:2308
+msgid "Enter a name for the zip file."
+msgstr ""
+
+#: ../../include/text.php:2309
+msgid "Export to cloud files"
+msgstr ""
+
+#: ../../include/text.php:2310
+msgid "/path/to/export/folder"
+msgstr ""
+
+#: ../../include/text.php:2311
+msgid "Enter a path to a cloud files destination."
+msgstr ""
+
+#: ../../include/text.php:2312
+msgid "Specify folder"
+msgstr ""
+
 #: ../../include/acl_selectors.php:208
 msgid "Who can see this?"
 msgstr ""
@@ -12734,68 +12802,6 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/attach.php:250 ../../include/attach.php:339
-msgid "Item was not found."
-msgstr ""
-
-#: ../../include/attach.php:500
-msgid "No source file."
-msgstr ""
-
-#: ../../include/attach.php:522
-msgid "Cannot locate file to replace"
-msgstr ""
-
-#: ../../include/attach.php:540
-msgid "Cannot locate file to revise/update"
-msgstr ""
-
-#: ../../include/attach.php:671
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:685
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:855
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:868
-msgid "Stored file could not be verified. Upload failed."
-msgstr ""
-
-#: ../../include/attach.php:923 ../../include/attach.php:939
-msgid "Path not available."
-msgstr ""
-
-#: ../../include/attach.php:988 ../../include/attach.php:1153
-msgid "Empty pathname"
-msgstr ""
-
-#: ../../include/attach.php:1014
-msgid "duplicate filename or path"
-msgstr ""
-
-#: ../../include/attach.php:1039
-msgid "Path not found."
-msgstr ""
-
-#: ../../include/attach.php:1107
-msgid "mkdir failed."
-msgstr ""
-
-#: ../../include/attach.php:1111
-msgid "database storage failed."
-msgstr ""
-
-#: ../../include/attach.php:1159
-msgid "Empty path"
-msgstr ""
-
 #: ../../include/permissions.php:35
 msgid "Can view my normal stream and posts"
 msgstr ""
@@ -13201,172 +13207,132 @@ msgstr ""
 msgid "Focus (Hubzilla default)"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:110
+#: ../../view/theme/redbasic/php/config.php:88
 msgid "Theme settings"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:89
 msgid "Narrow navbar"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:112
+#: ../../view/theme/redbasic/php/config.php:90
 msgid "Navigation bar background color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:113
-msgid "Navigation bar gradient top color"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:114
-msgid "Navigation bar gradient bottom color"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:115
-msgid "Navigation active button gradient top color"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:116
-msgid "Navigation active button gradient bottom color"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:117
-msgid "Navigation bar border color "
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:118
+#: ../../view/theme/redbasic/php/config.php:91
 msgid "Navigation bar icon color "
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:119
+#: ../../view/theme/redbasic/php/config.php:92
 msgid "Navigation bar active icon color "
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:120
-msgid "link color"
+#: ../../view/theme/redbasic/php/config.php:93
+msgid "Link color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:121
+#: ../../view/theme/redbasic/php/config.php:94
 msgid "Set font-color for banner"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:122
+#: ../../view/theme/redbasic/php/config.php:95
 msgid "Set the background color"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:123
+#: ../../view/theme/redbasic/php/config.php:96
 msgid "Set the background image"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:124
+#: ../../view/theme/redbasic/php/config.php:97
 msgid "Set the background color of items"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:125
+#: ../../view/theme/redbasic/php/config.php:98
 msgid "Set the background color of comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:126
-msgid "Set the border color of comments"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:127
-msgid "Set the indent for comments"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:128
-msgid "Set the basic color for item icons"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:129
-msgid "Set the hover color for item icons"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:130
+#: ../../view/theme/redbasic/php/config.php:99
 msgid "Set font-size for the entire application"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:130
-msgid "Example: 14px"
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Examples: 87.5%, 14px"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:131
-msgid "Set font-size for posts and comments"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:132
+#: ../../view/theme/redbasic/php/config.php:100
 msgid "Set font-color for posts and comments"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:133
+#: ../../view/theme/redbasic/php/config.php:101
 msgid "Set radius of corners"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:134
+#: ../../view/theme/redbasic/php/config.php:101
+msgid "Example: 4px"
+msgstr ""
+
+#: ../../view/theme/redbasic/php/config.php:102
 msgid "Set shadow depth of photos"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:135
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Set maximum width of content region in pixel"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:135
+#: ../../view/theme/redbasic/php/config.php:103
 msgid "Leave empty for default width"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:136
+#: ../../view/theme/redbasic/php/config.php:104
 msgid "Left align page content"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:137
-msgid "Set minimum opacity of nav bar - to hide it"
-msgstr ""
-
-#: ../../view/theme/redbasic/php/config.php:138
+#: ../../view/theme/redbasic/php/config.php:105
 msgid "Set size of conversation author photo"
 msgstr ""
 
-#: ../../view/theme/redbasic/php/config.php:139
+#: ../../view/theme/redbasic/php/config.php:106
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1586
+#: ../../boot.php:1576
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1608
+#: ../../boot.php:1598
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1609
+#: ../../boot.php:1599
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1610
+#: ../../boot.php:1600
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1613
+#: ../../boot.php:1603
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2153
+#: ../../boot.php:2141
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2308
-msgid "Website SSL certificate is not valid. Please correct."
-msgstr ""
-
-#: ../../boot.php:2311
+#: ../../boot.php:2294
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2430
-msgid "Cron/Scheduled tasks not running."
+#: ../../boot.php:2299
+msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2434
+#: ../../boot.php:2418
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""
+
+#: ../../boot.php:2423
+msgid "Cron/Scheduled tasks not running."
+msgstr ""

From 810d9e21bcf35c3897718d8eb5a798372656f517 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 1 Apr 2017 15:30:59 -0700
Subject: [PATCH 090/299] use aes-ctr which is slightly/arguably better than a
 poke in the eye and don't restrict the crypto algorithm by server role.

---
 boot.php           |  7 -------
 include/crypto.php | 17 +++++++----------
 include/zot.php    |  3 ---
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/boot.php b/boot.php
index 1c8901f7b..206ba0bc9 100755
--- a/boot.php
+++ b/boot.php
@@ -604,10 +604,6 @@ function sys_boot() {
 		define( 'DEFAULT_NOTIFY_ICON', '/images/rm-32.png' );
 	}
 
-	if(! defined('CRYPTO_ALGORITHM')) {
-		define( 'CRYPTO_ALGORITHM', 'aes256cbc' );
-	}
-
 	/*
 	 * Try to open the database;
 	 */
@@ -2300,10 +2296,7 @@ function cert_bad_email() {
 			)
 		]
 	);
-<<<<<<< HEAD
 
-=======
->>>>>>> 95f4f14dca1ea982f67cccb31d860f7b8ed9055c
 }
 
 
diff --git a/include/crypto.php b/include/crypto.php
index bcbb3d388..187330c6c 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -79,16 +79,16 @@ function STD_decrypt($data,$key,$iv) {
 	return openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
 }
 
-function AES256GCM_encrypt($data,$key,$iv) {
+function AES256CTR_encrypt($data,$key,$iv) {
 	$key = substr($key,0,32);
-	$iv = substr($iv,0,12);
-	return openssl_encrypt($data,'aes-256-gcm',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,12,"\0"));
+	$iv = substr($iv,0,16);
+	return openssl_encrypt($data,'aes-256-ctr',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
 }
 
-function AES256GCM_decrypt($data,$key,$iv) {
+function AES256CTR_decrypt($data,$key,$iv) {
 	$key = substr($key,0,32);
-	$iv = substr($iv,0,12);
-	return openssl_decrypt($data,'aes-256-gcm',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,12,"\0"));
+	$iv = substr($iv,0,16);
+	return openssl_decrypt($data,'aes-256-ctr',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
 }
 
 
@@ -155,9 +155,6 @@ function other_encapsulate($data,$pubkey,$alg) {
 
 function crypto_methods() {
 
-	if(\Zotlabs\Lib\System::get_server_role() !== 'pro')
-		return [ 'aes256cbc' ];
-
 	// 'std' is the new project standard which is aes256cbc but transmits/receives 256-byte key and iv. 
 	// aes256cbc is provided for compatibility with earlier zot implementations which assume 32-byte key and 16-byte iv. 
 	// other_encapsulate() now produces these longer keys/ivs by default so that it is difficult to guess a
@@ -165,7 +162,7 @@ function crypto_methods() {
 	// The actual methods are responsible for deriving the actual key/iv from the provided parameters;
 	// possibly by truncation or segmentation - though many other methods could be used.  
 
-	$r = [ 'std', 'aes256cbc', 'aes128cbc', 'cast5cbc' ];
+	$r = [ 'aes256ctr', 'std', 'aes256cbc', 'aes128cbc', 'cast5cbc' ];
 	call_hooks('crypto_methods',$r);
 	return $r;
 
diff --git a/include/zot.php b/include/zot.php
index 8a2178913..b3999920f 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -165,9 +165,6 @@ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remot
 
 function zot_best_algorithm($methods) {
 
-	if(\Zotlabs\Lib\System::get_server_role() !== 'pro')
-		return 'aes256cbc';
-
 	$x = [ 'methods' => $methods, 'result' => '' ];
 	call_hooks('zot_best_algorithm',$x);
 	if($x['result'])

From 044067f0556be3b896fc1b183038777d971e9b57 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 16:40:36 -0700
Subject: [PATCH 091/299] harden security

---
 include/crypto.php | 42 +++++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/include/crypto.php b/include/crypto.php
index 187330c6c..2c5545e9b 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -55,6 +55,7 @@ function AES256CBC_decrypt($data,$key,$iv) {
 	return openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
 }
 
+
 function AES128CBC_encrypt($data,$key,$iv) {
 	$key = substr($key,0,16);
 	$iv = substr($iv,0,16);
@@ -67,17 +68,6 @@ function AES128CBC_decrypt($data,$key,$iv) {
 	return openssl_decrypt($data,'aes-128-cbc',str_pad($key,16,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
 }
 
-function STD_encrypt($data,$key,$iv) {
-	$key = substr($key,0,32);
-	$iv = substr($iv,0,16);
-	return openssl_encrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
-}
-
-function STD_decrypt($data,$key,$iv) {
-	$key = substr($key,0,32);
-	$iv = substr($iv,0,16);
-	return openssl_decrypt($data,'aes-256-cbc',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
-}
 
 function AES256CTR_encrypt($data,$key,$iv) {
 	$key = substr($key,0,32);
@@ -92,6 +82,19 @@ function AES256CTR_decrypt($data,$key,$iv) {
 }
 
 
+function CAMELLIA256CFB_encrypt($data,$key,$iv) {
+	$key = substr($key,0,32);
+	$iv = substr($iv,0,16);
+	return openssl_encrypt($data,'camellia-256-cfb',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+}
+
+function CAMELLIA256CFB_decrypt($data,$key,$iv) {
+	$key = substr($key,0,32);
+	$iv = substr($iv,0,16);
+	return openssl_decrypt($data,'camellia-256-cfb',str_pad($key,32,"\0"),OPENSSL_RAW_DATA,str_pad($iv,16,"\0"));
+}
+
+
 function CAST5CBC_encrypt($data,$key,$iv) {
 	$key = substr($key,0,16);
 	$iv = substr($iv,0,8);
@@ -104,6 +107,20 @@ function CAST5CBC_decrypt($data,$key,$iv) {
 	return openssl_decrypt($data,'cast5-cbc',str_pad($key,16,"\0"),OPENSSL_RAW_DATA,str_pad($iv,8,"\0"));
 }
 
+function CAST5CFB_encrypt($data,$key,$iv) {
+	$key = substr($key,0,16);
+	$iv = substr($iv,0,8);
+	return openssl_encrypt($data,'cast5-cfb',str_pad($key,16,"\0"),OPENSSL_RAW_DATA,str_pad($iv,8,"\0"));
+}
+
+function CAST5CFB_decrypt($data,$key,$iv) {
+	$key = substr($key,0,16);
+	$iv = substr($iv,0,8);
+	return openssl_decrypt($data,'cast5-cfb',str_pad($key,16,"\0"),OPENSSL_RAW_DATA,str_pad($iv,8,"\0"));
+}
+
+
+
 function crypto_encapsulate($data,$pubkey,$alg='aes256cbc') {
 	$fn = strtoupper($alg) . '_encrypt';
 	
@@ -155,14 +172,13 @@ function other_encapsulate($data,$pubkey,$alg) {
 
 function crypto_methods() {
 
-	// 'std' is the new project standard which is aes256cbc but transmits/receives 256-byte key and iv. 
 	// aes256cbc is provided for compatibility with earlier zot implementations which assume 32-byte key and 16-byte iv. 
 	// other_encapsulate() now produces these longer keys/ivs by default so that it is difficult to guess a
 	// particular implementation or choice of underlying implementations based on the key/iv length. 
 	// The actual methods are responsible for deriving the actual key/iv from the provided parameters;
 	// possibly by truncation or segmentation - though many other methods could be used.  
 
-	$r = [ 'aes256ctr', 'std', 'aes256cbc', 'aes128cbc', 'cast5cbc' ];
+	$r = [ 'aes256ctr', 'camellia256cfb', 'cast5cfb', 'aes256cbc', 'aes128cbc', 'cast5cbc' ];
 	call_hooks('crypto_methods',$r);
 	return $r;
 

From d985db60cca1256698f15a9cb7a39688c72ec082 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 17:09:51 -0700
Subject: [PATCH 092/299] import authors from any unrecognised network as
 network 'unknown'.

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

diff --git a/include/items.php b/include/items.php
index 3d0f380b4..4ef52fb41 100755
--- a/include/items.php
+++ b/include/items.php
@@ -762,6 +762,8 @@ function import_author_xchan($x) {
 	if($arr['xchan_hash'])
 		return $arr['xchan_hash'];
 
+	$y = false;
+
 	if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) {
 		$y = import_author_zot($x);
 	}
@@ -770,9 +772,7 @@ function import_author_xchan($x) {
 		$y = import_author_rss($x);
 	}
 
-	if($x['network'] === 'unknown') {
-		$y = import_author_unknown($x);
-	}
+	$y = import_author_unknown($x);
 
 	return(($y) ? $y : false);
 }

From 1a28fb2a0c8b183fc4463c7f2c08212d068deb69 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 17:12:42 -0700
Subject: [PATCH 093/299] logic error

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

diff --git a/include/items.php b/include/items.php
index 4ef52fb41..ea72d1d4e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -772,9 +772,11 @@ function import_author_xchan($x) {
 		$y = import_author_rss($x);
 	}
 
-	$y = import_author_unknown($x);
+	if(! $y) {
+		$y = import_author_unknown($x);
+	}
 
-	return(($y) ? $y : false);
+	return($y);
 }
 
 /**

From 29596d12e371cde577cdf741476698dc14ae3f14 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 17:34:16 -0700
Subject: [PATCH 094/299] app sorting issue

---
 Zotlabs/Lib/Apps.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 0ca2f7a99..edf050b95 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -219,7 +219,7 @@ class Apps {
 			'Suggest Channels' => t('Suggest Channels'),
 			'Login' => t('Login'),
 			'Channel Manager' => t('Channel Manager'), 
-			'Grid' => t('Grid'), 
+			'Grid' => t('Activity'), 
 			'Settings' => t('Settings'),
 			'Files' => t('Files'),
 			'Webpages' => t('Webpages'),
@@ -245,9 +245,19 @@ class Apps {
 			'Profile Photo' => t('Profile Photo')
 		);
 
-		if(array_key_exists($arr['name'],$apps)) {
-			$arr['name'] = $apps[$arr['name']];
+		if(array_key_exists('name',$arr)) {
+			if(array_key_exists($arr['name'],$apps)) {
+				$arr['name'] = $apps[$arr['name']];
+			}
 		}
+		else {
+			for($x = 0; $x < count($arr); $x++) {
+				if(array_key_exists($arr[$x]['name'],$apps)) {
+					$arr[$x]['name'] = $apps[$arr[$x]['name']];
+				}
+			}
+		}
+				
 	}
 
 

From 4a49643bcd125fde6c62c37a2d0a7902bbf502d7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 19:46:20 -0700
Subject: [PATCH 095/299] import_author_zot() - check for both hubloc and xchan
 entries. This should catch and repair entries which were subject to transient
 storage failures.

---
 include/zot.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/include/zot.php b/include/zot.php
index b3999920f..266060839 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3578,21 +3578,30 @@ function get_rpost_path($observer) {
 
 function import_author_zot($x) {
 
+	// Check that we have both a hubloc and xchan record - as occasionally storage calls will fail and
+	// we may only end up with one; which results in posts with no author name or photo and are a bit
+	// of a hassle to repair. If either or both are missing, do a full discovery probe.
+
 	$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
-	$r = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
+	$r1 = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
 		dbesc($x['guid']),
 		dbesc($x['guid_sig'])
 	);
 
-	if ($r) {
-		logger('import_author_zot: in cache', LOGGER_DEBUG);
+	$r2 = q("select xchan_hash from xchan where xchan_guid = '%s' and xchan_guid_sig = '%s' limit 1",
+		dbesc($x['guid']),
+		dbesc($x['guid_sig'])
+	);
+
+	if($r1 && $r2) {
+		logger('in cache', LOGGER_DEBUG);
 		return $hash;
 	}
 
-	logger('import_author_zot: entry not in cache - probing: ' . print_r($x,true), LOGGER_DEBUG);
+	logger('not in cache - probing: ' . print_r($x,true), LOGGER_DEBUG);
 
 	$them = array('hubloc_url' => $x['url'], 'xchan_guid' => $x['guid'], 'xchan_guid_sig' => $x['guid_sig']);
-	if (zot_refresh($them))
+	if(zot_refresh($them))
 		return $hash;
 
 	return false;

From af14020e42481088f0e9f2773bda6453b60bcdb9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 20:03:27 -0700
Subject: [PATCH 096/299] change hook for perm_is_allowed while retaining
 backwards compatibility

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

diff --git a/include/permissions.php b/include/permissions.php
index d21b45550..f719394c5 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -314,11 +314,12 @@ function perm_is_allowed($uid, $observer_xchan, $permission) {
 		'channel_id'    => $uid,
 		'observer_hash' => $observer_xchan,
 		'permission'    => $permission,
-		'result'        => false);
+		'result'        => 'unset');
 
 	call_hooks('perm_is_allowed', $arr);
-	if($arr['result'])
-		return true;
+	if($arr['result'] !== 'unset') {
+		return $arr['result'];
+	}
 
 	$global_perms = \Zotlabs\Access\Permissions::Perms();
 

From f25f5aeaaae106cc995fb3d42393fbe5813e8760 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 20:35:45 -0700
Subject: [PATCH 097/299] fix connectDefaultShare generated js function, though
 it isn't obvious if we still use it.

---
 Zotlabs/Module/Connedit.php | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 72bd3e86e..484e69b52 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -388,30 +388,22 @@ class Connedit extends \Zotlabs\Web\Controller {
 	
 		$section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : '');
 		$channel = \App::get_channel();
-		$my_perms = get_channel_default_perms(local_channel());
-		$role = get_pconfig(local_channel(),'system','permissions_role');
-		if($role) {
-			$x = \Zotlabs\Access\PermissionRoles::role_perms($role);
-			if($x['perms_connect'])
-				$my_perms = $x['perms_connect'];
-		}
 	
 		$yes_no = array(t('No'),t('Yes'));
 	
-		if($my_perms) {
-			$o .= "<script>function connectDefaultShare() {
-			\$('.abook-edit-me').each(function() {
-				if(! $(this).is(':disabled'))
-					$(this).prop('checked', false);
-			});\n\n";
-			$perms = get_perms();
-			foreach($perms as $p => $v) {
-				if($my_perms & $v[1]) {
-					$o .= "\$('#me_id_perms_" . $p . "').prop('checked', true); \n";
-				}
+		$connect_perms = \Zotlabs\Access\Permissions::connect_perms(local_channel());
+
+		$o .= "<script>function connectDefaultShare() {
+		\$('.abook-edit-me').each(function() {
+			if(! $(this).is(':disabled'))
+				$(this).prop('checked', false);
+		});\n\n";
+		foreach($connect_perms['perms'] as $p => $v) {
+			if($v) {
+				$o .= "\$('#me_id_perms_" . $p . "').prop('checked', true); \n";
 			}
-			$o .= " }\n</script>\n";
 		}
+		$o .= " }\n</script>\n";
 	
 		if(argc() == 3) {
 	

From 9a5ce2354d4abd7fd398bd10b1b22d7e09b6433b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 20:51:40 -0700
Subject: [PATCH 098/299] remove some obsolete permissions stuff

---
 Zotlabs/Access/Permissions.php |   1 +
 include/permissions.php        | 420 +--------------------------------
 2 files changed, 6 insertions(+), 415 deletions(-)

diff --git a/Zotlabs/Access/Permissions.php b/Zotlabs/Access/Permissions.php
index d51e4d0ea..110e536ce 100644
--- a/Zotlabs/Access/Permissions.php
+++ b/Zotlabs/Access/Permissions.php
@@ -147,6 +147,7 @@ class Permissions {
 		return true;
 	}
 
+
 	static public function connect_perms($channel_id) {
 
 		$my_perms = [];
diff --git a/include/permissions.php b/include/permissions.php
index f719394c5..f97142fab 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -7,60 +7,10 @@ require_once('include/security.php');
  *
  * This file conntains functions to check and work with permissions.
  * 
- * Most of this file is obsolete and has been superceded by extensible permissions in v1.12; it is left here 
- * for reference and because we haven't yet checked that all functions have been replaced and are available 
- * elsewhere (typically Zotlabs/Access/*).
  */
 
 
 
-/**
- * @brief Return an array with all available permissions.
- *
- * These are channel specific permissions.
- * The list of available permissions can get manipulated by the <i>hook</i>
- * <b>global_permissions</b>.
- *
- * @return array associative array containing all permissions
- */
-function get_perms() {
-
-// thinking about making element[2] a bitmask instead of boolean so that we can provide a list of applicable selections
-// for any given permission. Currently we use the boolean to disallow write access to "everybody", but we also want to be
-// able to handle troublesome settings such as allowing channel_w_stream to anybody in the network. You can allow it, but 
-// there's no way to implement sending it. 
-
-	$global_perms = array(
-		// Read only permissions
-		'view_stream'   => array('channel_r_stream',  intval(PERMS_R_STREAM),  true, t('Can view my normal stream and posts'), ''),
-		'view_profile'  => array('channel_r_profile', intval(PERMS_R_PROFILE), true, t('Can view my default channel profile'), ''),
-		'view_contacts' => array('channel_r_abook',   intval(PERMS_R_ABOOK),   true, t('Can view my connections'), ''),
-		'view_storage'  => array('channel_r_storage', intval(PERMS_R_STORAGE), true, t('Can view my file storage and photos'), ''),
-		'view_pages'    => array('channel_r_pages',   intval(PERMS_R_PAGES),   true, t('Can view my webpages'), ''),
-
-		// Write permissions
-		'send_stream'   => array('channel_w_stream',  intval(PERMS_W_STREAM),  false, t('Can send me their channel stream and posts'), ''),
-		'post_wall'     => array('channel_w_wall',    intval(PERMS_W_WALL),    false, t('Can post on my channel page ("wall")'), ''),
-		'post_comments' => array('channel_w_comment', intval(PERMS_W_COMMENT), false, t('Can comment on or like my posts'), ''),
-		'post_mail'     => array('channel_w_mail',    intval(PERMS_W_MAIL),    false, t('Can send me private mail messages'), ''),
-		'post_like'     => array('channel_w_like',    intval(PERMS_W_LIKE),    false, t('Can like/dislike stuff'), t('Profiles and things other than posts/comments')),
-
-		'tag_deliver'   => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post @mentions'), t('Advanced - useful for creating group forum channels')),
-		'chat'          => array('channel_w_chat',    intval(PERMS_W_CHAT),    false, t('Can chat with me (when available)'), t('')),
-		'write_storage' => array('channel_w_storage', intval(PERMS_W_STORAGE), false, t('Can write to my file storage and photos'), ''),
-		'write_pages'   => array('channel_w_pages',   intval(PERMS_W_PAGES),   false, t('Can edit my webpages'), ''),
-
-		'republish'     => array('channel_a_republish', intval(PERMS_A_REPUBLISH), false, t('Can source my public posts in derived channels'), t('Somewhat advanced - very useful in open communities')),
-
-		'delegate'      => array('channel_a_delegate', intval(PERMS_A_DELEGATE),   false, t('Can administer my channel resources'), t('Extremely advanced. Leave this alone unless you know what you are doing')),
-	);
-	$ret = array('global_permissions' => $global_perms);
-	call_hooks('global_permissions', $ret);
-
-	return $ret['global_permissions'];
-}
-
-
 /**
  * get_all_perms($uid,$observer_xchan)
  *
@@ -297,7 +247,6 @@ function get_all_perms($uid, $observer_xchan, $internal_use = true) {
  *
  * Checks if the given observer with the hash $observer_xchan has permission
  * $permission on channel_id $uid.
- * $permission is one defined in get_perms();
  *
  * @param int $uid The channel_id associated with the resource owner
  * @param string $observer_xchan The xchan_hash representing the observer
@@ -465,7 +414,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission) {
 
 function get_all_api_perms($uid,$api) {	
 
-	$global_perms = get_perms();
+	$global_perms = \Zotlabs\Access\Permissions::Perms();
 
 	$ret = array();
 
@@ -568,6 +517,7 @@ function site_default_perms() {
 		'view_contacts' => PERMS_PUBLIC,
 		'view_storage'  => PERMS_PUBLIC,
 		'view_pages'    => PERMS_PUBLIC,
+		'view_wiki'     => PERMS_PUBLIC,
 		'send_stream'   => PERMS_SPECIFIC,
 		'post_wall'     => PERMS_SPECIFIC,
 		'post_comments' => PERMS_SPECIFIC,
@@ -576,16 +526,15 @@ function site_default_perms() {
 		'chat'          => PERMS_SPECIFIC,
 		'write_storage' => PERMS_SPECIFIC,
 		'write_pages'   => PERMS_SPECIFIC,
+		'write_wiki'    => PERMS_SPECIFIC,
 		'delegate'      => PERMS_SPECIFIC,
 		'post_like'     => PERMS_NETWORK
 	);
 
-	$global_perms = get_perms();
+	$global_perms = \Zotlabs\Access\Permissions::Perms();
 
 	foreach($global_perms as $perm => $v) {
-		$x = get_config('default_perms', $perm);
-		if($x === false)
-			$x = $typical[$perm];
+		$x = get_config('default_perms', $perm, $typical[$perm]);
 		$ret[$perm] = $x;
 	}
 
@@ -593,362 +542,3 @@ function site_default_perms() {
 }
 
 
-/**
- * @brief Return an array of all permissions for this role.
- *
- * Given a string for the channel role ('social','forum', etc)
- * return an array of all permission fields pre-filled for this role.
- * This includes the channel permission scope indicators (anything beginning with 'channel_') as well as
- *  * perms_auto:   true or false to create auto-permissions for this channel
- *  * perms_follow: The permissions to apply when initiating a connection request to another channel
- *  * perms_accept: The permissions to apply when accepting a connection request from another channel (not automatic)
- *  * default_collection: true or false to make the default ACL include the channel's default collection 
- *  * directory_publish: true or false to publish this channel in the directory
- * Any attributes may be extended (new roles defined) and modified (specific permissions altered) by plugins
- *
- * @param string $role
- * @return array
- */
-function get_role_perms($role) {
-
-	$ret = array();
-
-	$ret['role'] = $role;
-
-	switch($role) {
-		case 'social':
-			$ret['perms_auto'] = false;
-			$ret['default_collection'] = false;
-			$ret['directory_publish'] = true;
-			$ret['online'] = true;
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'send_stream', 'post_wall', 'post_comments', 
-				'post_mail', 'chat', 'post_like', 'republish' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_PUBLIC,
-				'view_storage'   => PERMS_PUBLIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-			break;
-
-		case 'social_restricted':
-			$ret['perms_auto'] = false;
-			$ret['default_collection'] = true;
-			$ret['directory_publish'] = true;
-			$ret['online'] = true;
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'send_stream', 'post_wall', 'post_comments', 
-				'post_mail', 'chat', 'post_like' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_PUBLIC,
-				'view_storage'   => PERMS_PUBLIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-
-			break;
-
-		case 'social_private':
-			$ret['perms_auto'] = false;
-			$ret['default_collection'] = true;
-			$ret['directory_publish'] = false;
-			$ret['online'] = false;
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'send_stream', 'post_wall', 'post_comments', 
-				'post_mail', 'post_like' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_SPECIFIC,
-				'view_storage'   => PERMS_SPECIFIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-			break;
-
-		case 'forum':
-			$ret['perms_auto'] = true;
-			$ret['default_collection'] = false;
-			$ret['directory_publish'] = true;
-			$ret['online'] = false;
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'post_wall', 'post_comments', 'tag_deliver',
-				'post_mail', 'post_like' , 'republish', 'chat' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_PUBLIC,
-				'view_storage'   => PERMS_PUBLIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-			break;
-
-		case 'forum_restricted':
-			$ret['perms_auto'] = false;
-			$ret['default_collection'] = true;
-			$ret['directory_publish'] = true;
-			$ret['online'] = false;
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'post_wall', 'post_comments', 'tag_deliver',
-				'post_mail', 'post_like' , 'chat' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_PUBLIC,
-				'view_storage'   => PERMS_PUBLIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-			break;
-
-		case 'forum_private':
-			$ret['perms_auto'] = false;
-			$ret['default_collection'] = true;
-			$ret['directory_publish'] = false;
-			$ret['online'] = false;
-
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'post_wall', 'post_comments',
-				'post_mail', 'post_like' , 'chat' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_SPECIFIC,
-				'view_contacts'  => PERMS_SPECIFIC,
-				'view_storage'   => PERMS_SPECIFIC,
-				'view_pages'     => PERMS_SPECIFIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-			break;
-
-		case 'feed':
-			$ret['perms_auto'] = true;
-			$ret['default_collection'] = false;
-			$ret['directory_publish'] = true;
-			$ret['online'] = false;
-
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'send_stream', 'post_wall', 'post_comments', 
-				'post_mail', 'post_like' , 'republish' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_PUBLIC,
-				'view_storage'   => PERMS_PUBLIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-			break;
-
-		case 'feed_restricted':
-			$ret['perms_auto'] = false;
-			$ret['default_collection'] = true;
-			$ret['directory_publish'] = false;
-			$ret['online'] = false;
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'send_stream', 'post_wall', 'post_comments', 
-				'post_mail', 'post_like' , 'republish' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_PUBLIC,
-				'view_storage'   => PERMS_PUBLIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-			break;
-
-		case 'soapbox':
-			$ret['perms_auto'] = true;
-			$ret['default_collection'] = false;
-			$ret['directory_publish'] = true;
-			$ret['online'] = false;
-
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'post_like' , 'republish' ];
-
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_PUBLIC,
-				'view_storage'   => PERMS_PUBLIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-			break;
-
-		case 'repository':
-			$ret['perms_auto'] = true;
-			$ret['default_collection'] = false;
-			$ret['directory_publish'] = true;
-			$ret['online'] = false;
-
-			$ret['perms_connect'] = [ 
-				'view_stream', 'view_profile', 'view_contacts', 'view_storage',
-				'view_pages', 'write_storage', 'write_pages', 'post_wall', 'post_comments', 'tag_deliver',
-				'post_mail', 'post_like' , 'republish', 'chat' ];
-			$ret['limits'] = [
-				'view_stream'    => PERMS_PUBLIC,
-				'view_profile'   => PERMS_PUBLIC,
-				'view_contacts'  => PERMS_PUBLIC,
-				'view_storage'   => PERMS_PUBLIC,
-				'view_pages'     => PERMS_PUBLIC,
-				'send_stream'    => PERMS_SPECIFIC,
-				'post_wall'      => PERMS_SPECIFIC,
-				'post_comments'  => PERMS_SPECIFIC,
-				'post_mail'      => PERMS_SPECIFIC,
-				'post_like'      => PERMS_SPECIFIC,
-				'tag_deliver'    => PERMS_SPECIFIC,
-				'chat'           => PERMS_SPECIFIC,
-				'write_storage'  => PERMS_SPECIFIC,
-				'write_pages'    => PERMS_SPECIFIC,
-				'republish'      => PERMS_SPECIFIC,
-				'delegate'       => PERMS_SPECIFIC
-			];
-
-
-			break;
-
-		default:
-			break;
-	}
-
-	$x = get_config('system','role_perms');
-	// let system settings over-ride any or all 
-	if($x && is_array($x) && array_key_exists($role,$x))
-		$ret = array_merge($ret,$x[$role]);
-
-	call_hooks('get_role_perms',$ret);
-
-	return $ret;
-}
-
-/**
- * @brief Returns a list or roles, grouped by type.
- *
- * @return string Returns an array of roles, grouped by type
- */
-function get_roles() {
-	$roles = array(
-		t('Social Networking') => array('social' => t('Social - Mostly Public'), 'social_restricted' => t('Social - Restricted'), 'social_private' => t('Social - Private')),
-		t('Community Forum') => array('forum' => t('Forum - Mostly Public'), 'forum_restricted' => t('Forum - Restricted'), 'forum_private' => t('Forum - Private')),
-		t('Feed Republish') => array('feed' => t('Feed - Mostly Public'), 'feed_restricted' => t('Feed - Restricted')),
-		t('Special Purpose') => array('soapbox' => t('Special - Celebrity/Soapbox'), 'repository' => t('Special - Group Repository')),
-		t('Other') => array('custom' => t('Custom/Expert Mode'))
-	);
-
-	return $roles;
-}

From 263efbfe39d36a7133fca82e8e689435255fd9e2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 21:49:50 -0700
Subject: [PATCH 099/299] reference to deprecated function
 import_author_diaspora in socgraph.php

---
 include/socgraph.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/include/socgraph.php b/include/socgraph.php
index 69365f80f..d28531c43 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -122,7 +122,7 @@ function poco_load($xchan = '', $url = null) {
 					$profile_url = $url['value'];
 					continue;
 				}
-				if($url['type'] == 'zot' || $url['type'] == 'diaspora' || $url['type'] == 'friendica') {
+				if($url['type'] == 'zot') {
 					$network = $url['type'];
 					$address = str_replace('acct:' , '', $url['value']);
 					continue;
@@ -163,12 +163,6 @@ function poco_load($xchan = '', $url = null) {
 						continue;
 					}
 				}
-				else {
-					$x = import_author_diaspora(array('address' => $address));
-					if(! $x) {
-						continue;
-					}
-				}
 			}
 			else {
 				continue;
@@ -564,8 +558,6 @@ function poco($a,$extended = false) {
 				if($fields_ret['urls']) {
 					$entry['urls'] = array(array('value' => $rr['xchan_url'], 'type' => 'profile'));
 					$network = $rr['xchan_network'];
-					if(strpos($network,'friendica') !== false)
-						$network = 'friendica';
 					if($rr['xchan_addr'])
 						$entry['urls'][] = array('value' => 'acct:' . $rr['xchan_addr'], 'type' => $network);  
 				}

From 26125bcf0b8ce98fa4522f89792d7e77f25ff1ca Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 2 Apr 2017 22:20:37 -0700
Subject: [PATCH 100/299] sql error photos_albums_list with non-logged-in
 viewer

---
 Zotlabs/Widget/Photo_albums.php | 2 +-
 include/items.php               | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Widget/Photo_albums.php b/Zotlabs/Widget/Photo_albums.php
index 2a746e492..6df8ddf3c 100644
--- a/Zotlabs/Widget/Photo_albums.php
+++ b/Zotlabs/Widget/Photo_albums.php
@@ -16,7 +16,7 @@ class Photo_albums {
 		if((! $channelx) || (! perm_is_allowed(\App::$profile['profile_uid'], get_observer_hash(), 'view_storage')))
 			return '';
 
-		$sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'album');
+		$sortkey = ((array_key_exists('sortkey',$arr)) ? $arr['sortkey'] : 'display_path');
 		$direction = ((array_key_exists('direction',$arr)) ? $arr['direction'] : 'asc');
 
 		return photos_album_widget($channelx, \App::get_observer(),$sortkey,$direction);
diff --git a/include/items.php b/include/items.php
index ea72d1d4e..e3147dea4 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1776,9 +1776,12 @@ logger('revision: ' . $arr['revision']);
 		intval($arr['revision'])
 	);
 
-	if($r && count($r)) {
+	if($r) {
+		// This will gives us a fresh copy of what's now in the DB and undo the db escaping, 
+		// which really messes up the notifications
+
 		$current_post = $r[0]['id'];
-		$arr = $r[0];  // This will gives us a fresh copy of what's now in the DB and undo the db escaping, which really messes up the notifications
+		$arr = $r[0];
 		logger('item_store: created item ' . $current_post, LOGGER_DEBUG);
 	}
 	else {

From d6c23486d563e29862d3db891e67649d13e6def0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 3 Apr 2017 16:43:30 -0700
Subject: [PATCH 101/299] create site_store_lowlevel() to initialise data
 structures for the site table

---
 include/dir_fns.php  | 31 +++++++++++--------------------
 include/hubloc.php   | 27 +++++++++++++++++++++++++++
 include/queue_fn.php | 12 ++++++++----
 include/zot.php      | 32 +++++++++++++++++---------------
 4 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/include/dir_fns.php b/include/dir_fns.php
index 3922730fc..2bd1228ec 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -185,26 +185,17 @@ function sync_directories($dirmode) {
 	/** @FIXME What to do if we're in a different realm? */
 
 	if ((! $r) && (z_root() != DIRECTORY_FALLBACK_MASTER)) {
-		$r = array();
-		$r[] = array(
-			'site_url' => DIRECTORY_FALLBACK_MASTER,
-			'site_flags' => DIRECTORY_MODE_PRIMARY,
-			'site_update' => NULL_DATE, 
-			'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch',
-			'site_realm' => DIRECTORY_REALM,
-			'site_valid' => 1,
-			'site_crypto' => 'aes256cbc'
-			
-		);
-		$x = q("insert into site ( site_url, site_flags, site_update, site_directory, site_realm, site_valid, site_crypto )
-			values ( '%s', %d, '%s', '%s', '%s', %d, '%s' ) ",
-			dbesc($r[0]['site_url']),
-			intval($r[0]['site_flags']),
-			dbesc($r[0]['site_update']),
-			dbesc($r[0]['site_directory']),
-			dbesc($r[0]['site_realm']),
-			intval($r[0]['site_valid']),
-			dbesc($r[0]['site_crypto'])
+
+		$x = site_store_lowlevel(
+			[
+				'site_url'       => DIRECTORY_FALLBACK_MASTER,
+				'site_flags'     => DIRECTORY_MODE_PRIMARY,
+				'site_update'    => NULL_DATE, 
+				'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch',
+				'site_realm'     => DIRECTORY_REALM,
+				'site_valid'     => 1,
+				'site_crypto'    => 'aes256cbc'
+			]
 		);
 
 		$r = q("select * from site where site_flags in (%d, %d) and site_url != '%s' and site_type = %d ",
diff --git a/include/hubloc.php b/include/hubloc.php
index 599252522..0daa5908c 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -39,6 +39,33 @@ function hubloc_store_lowlevel($arr) {
 	return create_table_from_array('hubloc', $store);
 }
 
+function site_store_lowlevel($arr) {
+
+	$store = [
+		'site_url'        => ((array_key_exists('site_url',$arr))        ? $arr['site_url']         : ''),
+		'site_access'     => ((array_key_exists('site_access',$arr))     ? $arr['site_access']      : 0),
+		'site_flags'      => ((array_key_exists('site_flags',$arr))      ? $arr['site_flags']       : 0),
+		'site_update'     => ((array_key_exists('site_update',$arr))     ? $arr['site_update']      : NULL_DATE),
+		'site_pull'       => ((array_key_exists('site_pull',$arr))       ? $arr['site_pull']        : NULL_DATE),
+		'site_sync'       => ((array_key_exists('site_sync',$arr))       ? $arr['site_sync']        : NULL_DATE),
+		'site_directory'  => ((array_key_exists('site_directory',$arr))  ? $arr['site_directory']   : ''),
+		'site_register'   => ((array_key_exists('site_register',$arr))   ? $arr['site_register']    : 0),
+		'site_sellpage'   => ((array_key_exists('site_sellpage',$arr))   ? $arr['site_sellpage']    : ''),
+		'site_location'   => ((array_key_exists('site_location',$arr))   ? $arr['site_location']    : ''),
+		'site_realm'      => ((array_key_exists('site_realm',$arr))      ? $arr['site_realm']       : ''),
+		'site_valid'      => ((array_key_exists('site_valid',$arr))      ? $arr['site_valid']       : 0),
+		'site_dead'       => ((array_key_exists('site_dead',$arr))       ? $arr['site_dead']        : 0),
+		'site_type'       => ((array_key_exists('site_type',$arr))       ? $arr['site_type']        : 0),
+		'site_project'    => ((array_key_exists('site_project',$arr))    ? $arr['site_project']     : ''),
+		'site_version'    => ((array_key_exists('site_version',$arr))    ? $arr['site_version']     : ''),
+		'site_crypto'     => ((array_key_exists('site_crypto',$arr))     ? $arr['site_crypto']      : '')
+	];
+
+	return create_table_from_array('site', $store);
+}
+
+
+
 
 
 function prune_hub_reinstalls() {
diff --git a/include/queue_fn.php b/include/queue_fn.php
index ede6c8f11..c9179b953 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -146,10 +146,14 @@ function queue_deliver($outq, $immediate = false) {
 			// your site has existed. Since we don't know for sure what these sites are,
 			// call them unknown
 
-			q("insert into site (site_url, site_update, site_dead, site_type, site_crypto) values ('%s','%s',0,%d,'') ",
-				dbesc($base),
-				dbesc(datetime_convert()),
-				intval(($outq['outq_driver'] === 'post') ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN)
+			site_store_lowlevel( 
+				[
+					'site_url'    => $base,
+					'site_update' => datetime_convert(),
+					'site_dead'   => 0,
+					'site_type'   => intval(($outq['outq_driver'] === 'post') ? SITE_TYPE_NOTZOT : SITE_TYPE_UNKNOWN),
+					'site_crypto' => ''
+				]
 			);
 		}
 	}
diff --git a/include/zot.php b/include/zot.php
index 266060839..1a4f6534b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2897,22 +2897,24 @@ function import_site($arr, $pubkey) {
 	else {
 		$update = true;
 
-		$r = q("insert into site ( site_location, site_url, site_access, site_flags, site_update, site_directory, site_register, site_sellpage, site_realm, site_type, site_project, site_version, site_crypto )
-			values ( '%s', '%s', %d, %d, '%s', '%s', %d, '%s', '%s', %d, '%s', '%s', '%s' )",
-			dbesc($site_location),
-			dbesc($url),
-			intval($access_policy),
-			intval($site_directory),
-			dbesc(datetime_convert()),
-			dbesc($directory_url),
-			intval($register_policy),
-			dbesc($sellpage),
-			dbesc($site_realm),
-			intval(SITE_TYPE_ZOT),
-			dbesc($site_project),
-			dbesc($site_version),
-			dbesc($site_crypto)
+		$r = site_store_lowlevel( 
+			[
+				'site_location'  => $site_location,
+				'site_url'       => $url,
+				'site_access'    => intval($access_policy),
+				'site_flags'     => intval($site_directory),
+				'site_update'    => datetime_convert(),
+				'site_directory' => $directory_url,
+				'site_register'  => intval($register_policy),
+				'site_sellpage'  => $sellpage,
+				'site_realm'     => $site_realm,
+				'site_type'      => intval(SITE_TYPE_ZOT),
+				'site_project'   => $site_project,
+				'site_version'   => $site_version,
+				'site_crypto'    => $site_crypto
+			]
 		);
+
 		if(! $r) {
 			logger('import_site: record create failed. ' . print_r($arr,true));
 		}

From a92256e1cbd0b6bcaac5711c751479b97b30e00e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 3 Apr 2017 22:13:12 -0700
Subject: [PATCH 102/299] legal_webbie() now provides different character rules
 depending on whether you federate or not. Added some comments in a few places
 that needed them.

---
 include/text.php | 67 ++++++++++++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/include/text.php b/include/text.php
index 1b0150706..e02becf31 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2000,23 +2000,40 @@ function legal_webbie($s) {
 	if(! strlen($s))
 		return '';
 
+
+	// Has to start with a lowercase alphabetic character - not a number.
+	// This is so we can differentiate between something like channel=123
+	// and channel=foo and lookup the first by numeric id and the second
+	// by nickname.
+
 	$x = $s;
 	do {
 		$s = $x;
 		$x = preg_replace('/^([^a-z])(.*?)/',"$2",$s);
 	} while($x != $s);
 
-	return preg_replace('/([^a-z0-9\-\_])/','',$x);
+	// Use the lowest common denominator rules (letters, numbers, and underscore)
+	// if the site configuration allows federation with other networks
+
+	if(Zlib\System::get_server_role() === 'pro') {
+		return preg_replace('/([^a-z0-9\-\_\.])/','',$x);
+	}
+	else {
+		return preg_replace('/([^a-z0-9\_])/','',$x);
+	}
 }
 
 
 function check_webbie($arr) {
 
+
+	// These names conflict with the CalDAV server
+	$taken = [ 'principals', 'addressbooks', 'calendars' ];
+
 	$reservechan = get_config('system','reserved_channels');
-	if(strlen($reservechan))
-		$taken = explode(',', $reservechan);
-	else
-		$taken = array('principals','addressbooks','calendars');
+	if(strlen($reservechan)) {
+		$taken = array_merge($taken,explode(',', $reservechan));
+	}
 
 	$str = '';
 	if(count($arr)) {
@@ -2267,13 +2284,13 @@ function design_tools() {
 	$who = $channel['channel_address'];
 
 	return replace_macros(get_markup_template('design_tools.tpl'), array(
-		'$title' => t('Design Tools'),
-		'$who' => $who,
-		'$sys' => $sys,
+		'$title'  => t('Design Tools'),
+		'$who'    => $who,
+		'$sys'    => $sys,
 		'$blocks' => t('Blocks'),
-		'$menus' => t('Menus'),
+		'$menus'  => t('Menus'),
 		'$layout' => t('Layouts'),
-		'$pages' => t('Pages')
+		'$pages'  => t('Pages')
 	));
 }
 
@@ -2294,21 +2311,21 @@ function website_portation_tools() {
 	}
 
 	return replace_macros(get_markup_template('website_portation_tools.tpl'), array(
-		'$title' => t('Import'),
-		'$import_label' => t('Import website...'),
-		'$import_placeholder' => t('Select folder to import'),
-		'$file_upload_text' => t('Import from a zipped folder:'),
-		'$file_import_text' => t('Import from cloud files:'),
-		'$desc' => t('/cloud/channel/path/to/folder'),
-		'$hint' => t('Enter path to website files'),
-		'$select' => t('Select folder'),
-		'$export_label' => t('Export website...'),
-		'$file_download_text' => t('Export to a zip file'),
-		'$filename_desc' => t('website.zip'),
-		'$filename_hint' => t('Enter a name for the zip file.'),
-		'$cloud_export_text' => t('Export to cloud files'),
-		'$cloud_export_desc' => t('/path/to/export/folder'),
-		'$cloud_export_hint' => t('Enter a path to a cloud files destination.'),
+		'$title'               => t('Import'),
+		'$import_label'        => t('Import website...'),
+		'$import_placeholder'  => t('Select folder to import'),
+		'$file_upload_text'    => t('Import from a zipped folder:'),
+		'$file_import_text'    => t('Import from cloud files:'),
+		'$desc'                => t('/cloud/channel/path/to/folder'),
+		'$hint'                => t('Enter path to website files'),
+		'$select'              => t('Select folder'),
+		'$export_label'        => t('Export website...'),
+		'$file_download_text'  => t('Export to a zip file'),
+		'$filename_desc'       => t('website.zip'),
+		'$filename_hint'       => t('Enter a name for the zip file.'),
+		'$cloud_export_text'   => t('Export to cloud files'),
+		'$cloud_export_desc'   => t('/path/to/export/folder'),
+		'$cloud_export_hint'   => t('Enter a path to a cloud files destination.'),
 		'$cloud_export_select' => t('Specify folder'),
 	));
 }

From a4685e6df38dd530b348268f383f59a993607cad Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 5 Apr 2017 17:08:13 -0700
Subject: [PATCH 103/299] import_author_xchan - since we rarely refresh
 zot-info for non-connections, force a cache reload once a week to catch
 things like profile photo updates and location changes

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

diff --git a/include/zot.php b/include/zot.php
index 1a4f6534b..8afed1c3c 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3595,7 +3595,7 @@ function import_author_zot($x) {
 		dbesc($x['guid_sig'])
 	);
 
-	if($r1 && $r2) {
+	if($r1 && $r2 && $r1[0]['hubloc_updated'] > datetime_convert('UTC','UTC','now - 1 week')) {
 		logger('in cache', LOGGER_DEBUG);
 		return $hash;
 	}

From 9fb08fb5022c9eaf6368a9d3ac07bb1dcf856c20 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 5 Apr 2017 19:08:43 -0700
Subject: [PATCH 104/299] make legal_webbie() pluggable - * this should not be
 merged with federated projects unless the federation drivers make use of the
 hooks.

---
 doc/hook/legal_webbie.bb      | 10 +++++++++
 doc/hook/legal_webbie_text.bb |  7 ++++++
 doc/hooklist.bb               |  6 ++++++
 include/text.php              | 40 +++++++++++++++++++----------------
 4 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 doc/hook/legal_webbie.bb
 create mode 100644 doc/hook/legal_webbie_text.bb

diff --git a/doc/hook/legal_webbie.bb b/doc/hook/legal_webbie.bb
new file mode 100644
index 000000000..8c7d32d56
--- /dev/null
+++ b/doc/hook/legal_webbie.bb
@@ -0,0 +1,10 @@
+[h2]legal_webbie[/h2]
+
+Called when validating a channel address. By default the valid characters are 
+a-z,0-9,-,_, and . Uppercase ASCII characters are folded to lower and any invalid characters are stripped.  
+
+Some federated networks require more restrictive rules.
+
+The hook is called with an array [ 'input' => (supplied text), 'output' => (validated text) ]
+
+A plugin will generally perform a regex filter or text operation on 'input' and provide the results in 'output'. 
\ No newline at end of file
diff --git a/doc/hook/legal_webbie_text.bb b/doc/hook/legal_webbie_text.bb
new file mode 100644
index 000000000..32c74c93b
--- /dev/null
+++ b/doc/hook/legal_webbie_text.bb
@@ -0,0 +1,7 @@
+[h2]legal_webbie_text[/h2]
+
+Returns a string describing the text rules applied to legal_webbie().
+
+Called with an array [ 'text' => (descriptive text describing text character limitations) ]
+
+A plugin should return the description of the allowed characters and operation performed in the 'legal_webbie' hook to assist people when creating a new channel. 
\ No newline at end of file
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index 6933edad2..0b74a4df2 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -317,6 +317,12 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/jot_tool]jot_tool[/zrl]
 	Deprecated and possibly obsolete. Allows one to add action buttons to the post editor.
 
+[zrl=[baseurl]/help/hook/legal_webbie]legal_webbie[/zrl]
+	Called to validate a channel address
+
+[zrl=[baseurl]/help/hook/legal_webbie_text]legal_webbie_text[/zrl]
+	Provides an explanation of text/character restrictions for legal_webbie()
+
 [zrl=[baseurl]/help/hook/load_pdl]load_pdl[/zrl]
 	Called when we load a PDL file or description
 
diff --git a/include/text.php b/include/text.php
index e02becf31..bbf0b5b98 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2000,29 +2000,33 @@ function legal_webbie($s) {
 	if(! strlen($s))
 		return '';
 
+	// WARNING: This regex will not work in a federated environment.
+	// You will probably want something like 
+	// preg_replace('/([^a-z0-9\_])/','',strtolower($s));
 
-	// Has to start with a lowercase alphabetic character - not a number.
-	// This is so we can differentiate between something like channel=123
-	// and channel=foo and lookup the first by numeric id and the second
-	// by nickname.
+	$r = preg_replace('/([^a-z0-9\-\_\.])/','',strtolower($s));
 
-	$x = $s;
-	do {
-		$s = $x;
-		$x = preg_replace('/^([^a-z])(.*?)/',"$2",$s);
-	} while($x != $s);
+	$x = [ 'input' => $s, 'output' => $r ];
+	call_hooks('legal_webbie',$x);
+	return $x['output'];
 
-	// Use the lowest common denominator rules (letters, numbers, and underscore)
-	// if the site configuration allows federation with other networks
-
-	if(Zlib\System::get_server_role() === 'pro') {
-		return preg_replace('/([^a-z0-9\-\_\.])/','',$x);
-	}
-	else {
-		return preg_replace('/([^a-z0-9\_])/','',$x);
-	}
 }
 
+function legal_webbie_text() {
+
+	// WARNING: This will not work in a federated environment.
+
+	$s = t('a-z, 0-9, -, _, and . only');
+
+	$x = [ 'text' => $s ];
+	call_hooks('legal_webbie_text',$x);
+	return $x['text'];
+
+}
+
+
+
+
 
 function check_webbie($arr) {
 

From 8cb4a29a518fe13c1c6adb37b3c2fb48c9cbaffc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 5 Apr 2017 19:21:27 -0700
Subject: [PATCH 105/299] revert grid and bars icon size change

---
 view/css/bootstrap-red.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index feddc652a..92b4bce48 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -34,7 +34,7 @@ nav .badge {
 }
 
 #navbar-collapse-1 i {
-	font-size: 0.9rem;
+	font-size: 1.0rem;
 }
 
 nav .dropdown-menu {

From ebcfc7f2b2f8604671fb7729c8da578d42fe3d36 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 6 Apr 2017 16:24:19 -0700
Subject: [PATCH 106/299] revisit the import_author_zot algorithm yet again.
 There was one bug that we weren't returning necessary information in the
 first SQL query - and performance/loading problem if one tries to refresh a
 dead site.

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

diff --git a/include/zot.php b/include/zot.php
index 8afed1c3c..d1fd1db6a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3585,7 +3585,9 @@ function import_author_zot($x) {
 	// of a hassle to repair. If either or both are missing, do a full discovery probe.
 
 	$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
-	$r1 = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
+
+	$r1 = q("select hubloc_url, hubloc_updated, site_dead from hubloc left join site on
+		hubloc_url = site_url where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
 		dbesc($x['guid']),
 		dbesc($x['guid_sig'])
 	);
@@ -3595,12 +3597,42 @@ function import_author_zot($x) {
 		dbesc($x['guid_sig'])
 	);
 
+	$site_dead = false;
+
+	if($r1 && intval($r1[0]['site_dead'])) {
+		$site_dead = true;
+	}
+
+	// We have valid and somewhat fresh information. 
+
 	if($r1 && $r2 && $r1[0]['hubloc_updated'] > datetime_convert('UTC','UTC','now - 1 week')) {
 		logger('in cache', LOGGER_DEBUG);
 		return $hash;
 	}
 
-	logger('not in cache - probing: ' . print_r($x,true), LOGGER_DEBUG);
+	logger('not in cache or cache stale - probing: ' . print_r($x,true), LOGGER_DEBUG,LOG_INFO);
+
+	// The primary hub may be dead. Try to find another one associated with this identity that is 
+	// still alive. If we find one, use that url for the discovery/refresh probe. Otherwise, the dead site 
+	// is all we have and there is no point probing it. Just return the hash indicating we have a 
+	// cached entry and the identity is valid. It's just unreachable until they bring back their 
+	// server from the grave or create another clone elsewhere. 
+
+	if($site_dead) {
+		logger('dead site - ignoring', LOGGER_DEBUG,LOG_INFO);
+
+		$r = q("select hubloc_url from hubloc left join site on hubloc_url = site_url 
+			where hubloc_hash = '%s' and site_dead = 0",
+			dbesc($hash)
+		);
+		if($r) {
+			logger('found another site that is not dead: ' . $r[0]['hubloc_url'], LOGGER_DEBUG,LOG_INFO);
+			$x['url'] = $r[0]['hubloc_url'];
+		}
+		else {
+			return $hash;
+		}
+	} 
 
 	$them = array('hubloc_url' => $x['url'], 'xchan_guid' => $x['guid'], 'xchan_guid_sig' => $x['guid_sig']);
 	if(zot_refresh($them))

From d52ee7ae27133a526778b8a6553de5c318ded7fe Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 6 Apr 2017 19:55:43 -0700
Subject: [PATCH 107/299] only log zot_refresh content if json decode was
 successful.

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

diff --git a/include/zot.php b/include/zot.php
index d1fd1db6a..3e1b27c83 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -310,8 +310,6 @@ function zot_refresh($them, $channel = null, $force = false) {
 
 	$result = z_post_url($url . $rhs,$postvars);
 
-	logger('zot_refresh: zot-info: ' . print_r($result,true), LOGGER_DATA, LOG_DEBUG);
-
 	if ($result['success']) {
 
 		$j = json_decode($result['body'],true);
@@ -321,6 +319,8 @@ function zot_refresh($them, $channel = null, $force = false) {
 			return false;
 		}
 
+		logger('zot-info: ' . print_r($result,true), LOGGER_DATA, LOG_DEBUG);
+
 		$signed_token = ((is_array($j) && array_key_exists('signed_token',$j)) ? $j['signed_token'] : null);
 		if($signed_token) {
 			$valid = rsa_verify('token.' . $token,base64url_decode($signed_token),$j['key']);

From dbef80f7bdf43047c721518f888eb859cda1ea0e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 7 Apr 2017 13:37:18 -0700
Subject: [PATCH 108/299] fix from downstream

---
 util/hmessages.po         | 4234 ++++++++++++++++++-------------------
 view/tpl/photo_albums.tpl |    2 +-
 2 files changed, 2088 insertions(+), 2148 deletions(-)

diff --git a/util/hmessages.po b/util/hmessages.po
index c9e6ba337..58a125ce5 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 00:04-0700\n"
+"POT-Creation-Date: 2017-04-07 00:05-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,79 +18,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../../Zotlabs/Access/PermissionRoles.php:248
-#: ../../include/permissions.php:945
 msgid "Social Networking"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:249
-#: ../../include/permissions.php:945
 msgid "Social - Mostly Public"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:250
-#: ../../include/permissions.php:945
 msgid "Social - Restricted"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:251
-#: ../../include/permissions.php:945
 msgid "Social - Private"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:254
-#: ../../include/permissions.php:946
 msgid "Community Forum"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:255
-#: ../../include/permissions.php:946
 msgid "Forum - Mostly Public"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:256
-#: ../../include/permissions.php:946
 msgid "Forum - Restricted"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:257
-#: ../../include/permissions.php:946
 msgid "Forum - Private"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:260
-#: ../../include/permissions.php:947
 msgid "Feed Republish"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:261
-#: ../../include/permissions.php:947
 msgid "Feed - Mostly Public"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:262
-#: ../../include/permissions.php:947
 msgid "Feed - Restricted"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:265
-#: ../../include/permissions.php:948
 msgid "Special Purpose"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:266
-#: ../../include/permissions.php:948
 msgid "Special - Celebrity/Soapbox"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:267
-#: ../../include/permissions.php:948
 msgid "Special - Group Repository"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:270
 #: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Connedit.php:922
 #: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Connedit.php:914
 #: ../../Zotlabs/Module/Settings/Channel.php:463
 #: ../../extend/addon/addon/cdav/cdav.php:277
 #: ../../extend/addon/addon/cdav/cdav.php:284
@@ -98,12 +84,10 @@ msgstr ""
 #: ../../include/connections.php:675 ../../include/connections.php:682
 #: ../../include/selectors.php:49 ../../include/selectors.php:66
 #: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:949
 msgid "Other"
 msgstr ""
 
 #: ../../Zotlabs/Access/PermissionRoles.php:271
-#: ../../include/permissions.php:949
 msgid "Custom/Expert Mode"
 msgstr ""
 
@@ -111,19 +95,19 @@ msgstr ""
 msgid "Can view my channel stream and posts"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:47 ../../include/permissions.php:42
+#: ../../Zotlabs/Access/Permissions.php:47
 msgid "Can send me their channel stream and posts"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:48 ../../include/permissions.php:36
+#: ../../Zotlabs/Access/Permissions.php:48
 msgid "Can view my default channel profile"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:49 ../../include/permissions.php:37
+#: ../../Zotlabs/Access/Permissions.php:49
 msgid "Can view my connections"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:50 ../../include/permissions.php:38
+#: ../../Zotlabs/Access/Permissions.php:50
 msgid "Can view my file storage and photos"
 msgstr ""
 
@@ -151,11 +135,11 @@ msgstr ""
 msgid "Can post on my channel (wall) page"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:57 ../../include/permissions.php:44
+#: ../../Zotlabs/Access/Permissions.php:57
 msgid "Can comment on or like my posts"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:58 ../../include/permissions.php:45
+#: ../../Zotlabs/Access/Permissions.php:58
 msgid "Can send me private mail messages"
 msgstr ""
 
@@ -171,7 +155,7 @@ msgstr ""
 msgid "Can chat with me"
 msgstr ""
 
-#: ../../Zotlabs/Access/Permissions.php:62 ../../include/permissions.php:53
+#: ../../Zotlabs/Access/Permissions.php:62
 msgid "Can source my public posts in derived channels"
 msgstr ""
 
@@ -183,7 +167,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2685
+#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2706
 msgid "Collection"
 msgstr ""
 
@@ -209,8 +193,8 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:757
 #: ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:561
-#: ../../Zotlabs/Lib/Apps.php:639 ../../Zotlabs/Widget/Album.php:84
+#: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:571
+#: ../../Zotlabs/Lib/Apps.php:649 ../../Zotlabs/Widget/Album.php:84
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:746
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:753
@@ -234,9 +218,8 @@ msgstr ""
 #: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:332
 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Layouts.php:185
 #: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Menu.php:118
-#: ../../Zotlabs/Module/Connedit.php:925
 #: ../../Zotlabs/Module/New_channel.php:147
-#: ../../Zotlabs/Module/Blocks.php:159
+#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Blocks.php:159
 #: ../../extend/addon/addon/cdav/include/widgets.php:127
 #: ../../extend/addon/addon/cdav/include/widgets.php:164
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
@@ -255,7 +238,7 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:233
 #: ../../Zotlabs/Module/Admin/Channels.php:159
-#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Wiki.php:172
+#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902
 #: ../../Zotlabs/Module/Sharedwithme.php:100
 #: ../../Zotlabs/Module/Settings/Oauth.php:89
 #: ../../Zotlabs/Module/Settings/Oauth.php:115
@@ -293,15 +276,15 @@ msgstr ""
 #: ../../Zotlabs/Module/Wiki.php:165 ../../Zotlabs/Module/Wiki.php:275
 #: ../../Zotlabs/Module/Blocks.php:160
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:357
-#: ../../Zotlabs/Lib/ThreadItem.php:107
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:107
+#: ../../Zotlabs/Lib/Apps.php:367
 #: ../../extend/addon/addon/cdav/include/widgets.php:125
 #: ../../extend/addon/addon/cdav/include/widgets.php:161
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
 #: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
-#: ../../include/menu.php:113 ../../include/channel.php:1043
-#: ../../include/channel.php:1047
+#: ../../include/channel.php:1043 ../../include/channel.php:1047
+#: ../../include/menu.php:113
 msgid "Edit"
 msgstr ""
 
@@ -314,11 +297,11 @@ msgstr ""
 #: ../../Zotlabs/Module/Editlayout.php:138
 #: ../../Zotlabs/Module/Editwebpage.php:172 ../../Zotlabs/Module/Group.php:177
 #: ../../Zotlabs/Module/Editblock.php:139
-#: ../../Zotlabs/Module/Connedit.php:658 ../../Zotlabs/Module/Connedit.php:927
+#: ../../Zotlabs/Module/Connedit.php:650 ../../Zotlabs/Module/Connedit.php:919
 #: ../../Zotlabs/Module/Blocks.php:162
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1143
-#: ../../Zotlabs/Lib/Apps.php:358 ../../Zotlabs/Lib/ThreadItem.php:127
+#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Lib/Apps.php:368
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:864
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153
 #: ../../include/conversation.php:654
@@ -376,7 +359,7 @@ msgid "Permission denied"
 msgstr ""
 
 #: ../../Zotlabs/Web/WebServer.php:131
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Setup.php:212
+#: ../../Zotlabs/Module/Achievements.php:34
 #: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Message.php:18
 #: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635
 #: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Layouts.php:71
@@ -402,16 +385,17 @@ msgstr ""
 #: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Connedit.php:385
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Mitem.php:115
+#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:216
+#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Api.php:24
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
+#: ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100
 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
 #: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mood.php:116
-#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:216
-#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Blocks.php:73
 #: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Rate.php:113
 #: ../../Zotlabs/Module/Profile_photo.php:280
 #: ../../Zotlabs/Module/Profile_photo.php:293
@@ -435,13 +419,13 @@ msgstr ""
 #: ../../extend/addon/addon/openid/Mod_Id.php:53
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:196
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:292
-#: ../../include/attach.php:144 ../../include/attach.php:191
-#: ../../include/attach.php:255 ../../include/attach.php:269
-#: ../../include/attach.php:276 ../../include/attach.php:344
-#: ../../include/attach.php:358 ../../include/attach.php:365
-#: ../../include/attach.php:442 ../../include/attach.php:909
-#: ../../include/attach.php:983 ../../include/attach.php:1148
-#: ../../include/items.php:3358 ../../include/photos.php:28
+#: ../../include/photos.php:28 ../../include/attach.php:144
+#: ../../include/attach.php:191 ../../include/attach.php:255
+#: ../../include/attach.php:269 ../../include/attach.php:276
+#: ../../include/attach.php:344 ../../include/attach.php:358
+#: ../../include/attach.php:365 ../../include/attach.php:442
+#: ../../include/attach.php:909 ../../include/attach.php:983
+#: ../../include/attach.php:1148 ../../include/items.php:3395
 msgid "Permission denied."
 msgstr ""
 
@@ -473,530 +457,6 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:176
-msgid "$Projectname Server - Setup"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:180
-msgid "Could not connect to database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:184
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:191
-msgid "Could not create table."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:196
-msgid "Your site database has been installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:200
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:741
-msgid "Please see the file \"install/INSTALL.txt\"."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:260
-msgid "System check"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:690
-#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:920
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
-msgid "Next"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:265
-msgid "Check again"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:287
-msgid "Database connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:288
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:289
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:290
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Database Server Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Default is 127.0.0.1"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Database Port"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Communication port number - use 0 for default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:296
-msgid "Database Login Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:297
-msgid "Database Login Password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:298
-msgid "Database Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:299
-msgid "Database Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
-msgid "Site administrator email address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
-msgid "Website URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
-msgid "Please use SSL (https) URL if available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346
-msgid "Please select a default timezone for your website"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
-#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Import.php:514
-#: ../../Zotlabs/Module/Admin/Features.php:66
-#: ../../Zotlabs/Module/Admin/Logs.php:84
-#: ../../Zotlabs/Module/Admin/Profs.php:157
-#: ../../Zotlabs/Module/Admin/Security.php:104
-#: ../../Zotlabs/Module/Admin/Account_edit.php:74
-#: ../../Zotlabs/Module/Admin/Accounts.php:166
-#: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Plugins.php:438
-#: ../../Zotlabs/Module/Admin/Themes.php:158
-#: ../../Zotlabs/Module/Admin/Site.php:279 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Import_items.php:129
-#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Connedit.php:890
-#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Wiki.php:169 ../../Zotlabs/Module/Cal.php:343
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134
-#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493
-#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
-#: ../../Zotlabs/Module/Mail.php:425
-#: ../../Zotlabs/Module/Settings/Features.php:47
-#: ../../Zotlabs/Module/Settings/Oauth.php:87
-#: ../../Zotlabs/Module/Settings/Account.php:118
-#: ../../Zotlabs/Module/Settings/Display.php:203
-#: ../../Zotlabs/Module/Settings/Featured.php:50
-#: ../../Zotlabs/Module/Settings/Tokens.php:168
-#: ../../Zotlabs/Module/Settings/Channel.php:476
-#: ../../Zotlabs/Module/Settings/Permcats.php:110
-#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1022
-#: ../../Zotlabs/Module/Photos.php:1062 ../../Zotlabs/Module/Photos.php:1180
-#: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:240
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:732
-#: ../../Zotlabs/Widget/Eventstools.php:16
-#: ../../extend/addon/addon/chords/Mod_Chords.php:60
-#: ../../extend/addon/addon/dwpost/dwpost.php:89
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
-#: ../../extend/addon/addon/frphotos/frphotos.php:96
-#: ../../extend/addon/addon/hubwall/hubwall.php:95
-#: ../../extend/addon/addon/ijpost/ijpost.php:89
-#: ../../extend/addon/addon/irc/irc.php:53
-#: ../../extend/addon/addon/jappixmini/jappixmini.php:371
-#: ../../extend/addon/addon/libertree/libertree.php:85
-#: ../../extend/addon/addon/ljpost/ljpost.php:86
-#: ../../extend/addon/addon/logrot/logrot.php:35
-#: ../../extend/addon/addon/mailhost/mailhost.php:40
-#: ../../extend/addon/addon/nofed/nofed.php:80
-#: ../../extend/addon/addon/nsabait/nsabait.php:161
-#: ../../extend/addon/addon/nsfw/nsfw.php:92
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:53
-#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168
-#: ../../extend/addon/addon/pageheader/pageheader.php:48
-#: ../../extend/addon/addon/piwik/piwik.php:95
-#: ../../extend/addon/addon/planets/planets.php:157
-#: ../../extend/addon/addon/pumpio/pumpio.php:237
-#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85
-#: ../../extend/addon/addon/redfiles/redfiles.php:124
-#: ../../extend/addon/addon/redphotos/redphotos.php:136
-#: ../../extend/addon/addon/redred/redred.php:119
-#: ../../extend/addon/addon/rtof/rtof.php:101
-#: ../../extend/addon/addon/skeleton/skeleton.php:65
-#: ../../extend/addon/addon/smileybutton/smileybutton.php:281
-#: ../../extend/addon/addon/startpage/startpage.php:113
-#: ../../extend/addon/addon/statusnet/statusnet.php:322
-#: ../../extend/addon/addon/statusnet/statusnet.php:380
-#: ../../extend/addon/addon/statusnet/statusnet.php:432
-#: ../../extend/addon/addon/statusnet/statusnet.php:899
-#: ../../extend/addon/addon/superblock/superblock.php:120
-#: ../../extend/addon/addon/twitter/twitter.php:217
-#: ../../extend/addon/addon/twitter/twitter.php:259
-#: ../../extend/addon/addon/visage/visage.php:170
-#: ../../extend/addon/addon/wppost/wppost.php:113
-#: ../../extend/addon/addon/xmpp/xmpp.php:69
-#: ../../extend/addon/addon/cdav/cdav.php:246
-#: ../../extend/addon/addon/likebanner/likebanner.php:57
-#: ../../extend/addon/addon/mailtest/mailtest.php:100
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
-#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:84
-msgid "Submit"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:331
-msgid "Site settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:385
-msgid "PHP version 5.5 or greater is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:386
-msgid "PHP version"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:402
-msgid "Could not find a command line version of PHP in the web server PATH."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:403
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:407
-msgid "PHP executable path"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:407
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:412
-msgid "Command line PHP"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:422
-msgid ""
-"Unable to check command line PHP, as shell_exec() is disabled. This is "
-"required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:425
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:426
-msgid "This is required for message delivery to work."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:429
-msgid "PHP register_argc_argv"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:447
-#, php-format
-msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to "
-"upload is set to %s. You are allowed to upload up to %d files at once."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:452
-msgid "You can adjust these settings in the server php.ini file."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:454
-msgid "PHP upload limits"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:477
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:478
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:481
-msgid "Generate encryption keys"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:498
-msgid "libCurl PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:499
-msgid "GD graphics PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:500
-msgid "OpenSSL PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:501
-msgid "PDO database PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:502
-msgid "mb_string PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:503
-msgid "xml PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
-msgid "Apache mod_rewrite module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:507
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
-msgid "exec"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:513
-msgid ""
-"Error: exec is required but is either not installed or has been disabled in "
-"php.ini"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
-msgid "shell_exec"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:519
-msgid ""
-"Error: shell_exec is required but is either not installed or has been "
-"disabled in php.ini"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:527
-msgid "Error: libCURL PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:531
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: openssl PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:539
-msgid "Error: PDO database PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:543
-msgid "Error: mb_string PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:547
-msgid "Error: xml PHP module required for DAV but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:565
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:566
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:567
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:568
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:571
-msgid ".htconfig.php is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:585
-msgid ""
-"This software uses the Smarty3 template engine to render its web views. "
-"Smarty3 compiles templates to PHP to speed up rendering."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:586
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the top level web folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:588
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:591
-#, php-format
-msgid "%s is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:607
-msgid ""
-"This software uses the store directory to save uploaded files. The web "
-"server needs to have write access to the store directory under the top level "
-"web folder"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:611
-msgid "store is writable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:643
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:644
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:645
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:646
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:647
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:648
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:650
-msgid ""
-"If you are confident that the certificate is valid and signed by a trusted "
-"authority, check to see if you have failed to install an intermediate cert. "
-"These are not normally required by browsers, but are required for server-to-"
-"server communications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:652
-msgid "SSL certificate validation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:658
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:661
-msgid "Url rewrite is working"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:675
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:699
-#: ../../extend/addon/addon/cdav/cdav.php:41
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
-msgid "Errors encountered creating database tables."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:739
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:740
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
-msgstr ""
-
 #: ../../Zotlabs/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
@@ -1129,7 +589,7 @@ msgid "Membership on this site is by invitation only."
 msgstr ""
 
 #: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:145
-#: ../../boot.php:1577
+#: ../../boot.php:1572
 msgid "Register"
 msgstr ""
 
@@ -1346,7 +806,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793
 #: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:917
+#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:909
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
 msgid "Address"
 msgstr ""
@@ -1372,9 +832,9 @@ msgstr ""
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
 #: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Connedit.php:399
-#: ../../Zotlabs/Module/Connedit.php:783 ../../Zotlabs/Module/Api.php:97
-#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Wiki.php:180
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Connedit.php:392
+#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Events.php:470
 #: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../Zotlabs/Module/Settings/Channel.php:294
@@ -1426,7 +886,7 @@ msgstr ""
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:89
-#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1600
+#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1595
 msgid "No"
 msgstr ""
 
@@ -1435,8 +895,8 @@ msgstr ""
 #: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
 #: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Connedit.php:399
-#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Wiki.php:180
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Wiki.php:180
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Connedit.php:392
 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471
 #: ../../Zotlabs/Module/Removeme.php:63
 #: ../../Zotlabs/Module/Settings/Display.php:103
@@ -1489,7 +949,7 @@ msgstr ""
 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:89
-#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1600
+#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1595
 msgid "Yes"
 msgstr ""
 
@@ -1497,6 +957,90 @@ msgstr ""
 msgid "Edit Profile Details"
 msgstr ""
 
+#: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Import.php:514
+#: ../../Zotlabs/Module/Admin/Features.php:66
+#: ../../Zotlabs/Module/Admin/Logs.php:84
+#: ../../Zotlabs/Module/Admin/Profs.php:157
+#: ../../Zotlabs/Module/Admin/Security.php:104
+#: ../../Zotlabs/Module/Admin/Account_edit.php:74
+#: ../../Zotlabs/Module/Admin/Accounts.php:166
+#: ../../Zotlabs/Module/Admin/Channels.php:147
+#: ../../Zotlabs/Module/Admin/Plugins.php:438
+#: ../../Zotlabs/Module/Admin/Themes.php:158
+#: ../../Zotlabs/Module/Admin/Site.php:279 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350
+#: ../../Zotlabs/Module/Import_items.php:129
+#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Wiki.php:169
+#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Cal.php:343
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493
+#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
+#: ../../Zotlabs/Module/Mail.php:425
+#: ../../Zotlabs/Module/Settings/Features.php:47
+#: ../../Zotlabs/Module/Settings/Oauth.php:87
+#: ../../Zotlabs/Module/Settings/Account.php:118
+#: ../../Zotlabs/Module/Settings/Display.php:203
+#: ../../Zotlabs/Module/Settings/Featured.php:50
+#: ../../Zotlabs/Module/Settings/Tokens.php:168
+#: ../../Zotlabs/Module/Settings/Channel.php:476
+#: ../../Zotlabs/Module/Settings/Permcats.php:110
+#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
+#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1022
+#: ../../Zotlabs/Module/Photos.php:1062 ../../Zotlabs/Module/Photos.php:1180
+#: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:240
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:732
+#: ../../Zotlabs/Widget/Eventstools.php:16
+#: ../../extend/addon/addon/chords/Mod_Chords.php:60
+#: ../../extend/addon/addon/dwpost/dwpost.php:89
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
+#: ../../extend/addon/addon/frphotos/frphotos.php:96
+#: ../../extend/addon/addon/hubwall/hubwall.php:95
+#: ../../extend/addon/addon/ijpost/ijpost.php:89
+#: ../../extend/addon/addon/irc/irc.php:53
+#: ../../extend/addon/addon/jappixmini/jappixmini.php:371
+#: ../../extend/addon/addon/libertree/libertree.php:85
+#: ../../extend/addon/addon/ljpost/ljpost.php:86
+#: ../../extend/addon/addon/logrot/logrot.php:35
+#: ../../extend/addon/addon/mailhost/mailhost.php:40
+#: ../../extend/addon/addon/nofed/nofed.php:80
+#: ../../extend/addon/addon/nsabait/nsabait.php:161
+#: ../../extend/addon/addon/nsfw/nsfw.php:92
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:53
+#: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168
+#: ../../extend/addon/addon/pageheader/pageheader.php:48
+#: ../../extend/addon/addon/piwik/piwik.php:95
+#: ../../extend/addon/addon/planets/planets.php:157
+#: ../../extend/addon/addon/pumpio/pumpio.php:237
+#: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85
+#: ../../extend/addon/addon/redfiles/redfiles.php:124
+#: ../../extend/addon/addon/redphotos/redphotos.php:136
+#: ../../extend/addon/addon/redred/redred.php:119
+#: ../../extend/addon/addon/rtof/rtof.php:101
+#: ../../extend/addon/addon/skeleton/skeleton.php:65
+#: ../../extend/addon/addon/smileybutton/smileybutton.php:281
+#: ../../extend/addon/addon/startpage/startpage.php:113
+#: ../../extend/addon/addon/statusnet/statusnet.php:322
+#: ../../extend/addon/addon/statusnet/statusnet.php:380
+#: ../../extend/addon/addon/statusnet/statusnet.php:432
+#: ../../extend/addon/addon/statusnet/statusnet.php:899
+#: ../../extend/addon/addon/superblock/superblock.php:120
+#: ../../extend/addon/addon/twitter/twitter.php:217
+#: ../../extend/addon/addon/twitter/twitter.php:259
+#: ../../extend/addon/addon/visage/visage.php:170
+#: ../../extend/addon/addon/wppost/wppost.php:113
+#: ../../extend/addon/addon/xmpp/xmpp.php:69
+#: ../../extend/addon/addon/cdav/cdav.php:246
+#: ../../extend/addon/addon/likebanner/likebanner.php:57
+#: ../../extend/addon/addon/mailtest/mailtest.php:100
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:84
+msgid "Submit"
+msgstr ""
+
 #: ../../Zotlabs/Module/Profiles.php:727
 msgid "View this profile"
 msgstr ""
@@ -1605,7 +1149,7 @@ msgstr ""
 msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:935
+#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:927
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
 msgid "Country"
 msgstr ""
@@ -1691,7 +1235,7 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:913
+#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:905
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
 msgid "Phone"
 msgstr ""
@@ -1699,7 +1243,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Profiles.php:790
 #: ../../Zotlabs/Module/Admin/Accounts.php:169
 #: ../../Zotlabs/Module/Admin/Accounts.php:181
-#: ../../Zotlabs/Module/Connedit.php:914
+#: ../../Zotlabs/Module/Connedit.php:906
 #: ../../extend/addon/addon/redred/redred.php:107
 #: ../../extend/addon/addon/rtof/rtof.php:93
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140
@@ -1709,58 +1253,58 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:915
+#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:907
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
 msgid "Instant messenger"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:916
+#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:908
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
 msgid "Website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:918
+#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:910
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
 msgid "Note"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:919
+#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:911
 #: ../../extend/addon/addon/cdav/cdav.php:270
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145
 #: ../../include/connections.php:668
 msgid "Mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:920
+#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:912
 #: ../../extend/addon/addon/cdav/cdav.php:271
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
 #: ../../include/connections.php:669
 msgid "Home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:921
+#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:913
 #: ../../extend/addon/addon/cdav/cdav.php:274
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147
 #: ../../include/connections.php:672
 msgid "Work"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:923
+#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:915
 #: ../../extend/addon/addon/jappixmini/jappixmini.php:368
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149
 msgid "Add Contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:924
+#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:916
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
 msgid "Add Field"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:802
 #: ../../Zotlabs/Module/Admin/Plugins.php:453
-#: ../../Zotlabs/Module/Connedit.php:926
+#: ../../Zotlabs/Module/Connedit.php:918
 #: ../../Zotlabs/Module/Settings/Oauth.php:42
-#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:348
+#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:358
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152
 msgid "Update"
 msgstr ""
@@ -1768,8 +1312,8 @@ msgstr ""
 #: ../../Zotlabs/Module/Profiles.php:804
 #: ../../Zotlabs/Module/Admin/Plugins.php:423
 #: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Fbrowser.php:66
-#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Connedit.php:928
-#: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Wiki.php:265
+#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Connedit.php:920
 #: ../../Zotlabs/Module/Settings/Oauth.php:88
 #: ../../Zotlabs/Module/Settings/Oauth.php:114
 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
@@ -1839,7 +1383,7 @@ msgstr ""
 msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2275
+#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2296
 msgid "Layouts"
 msgstr ""
 
@@ -1936,7 +1480,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Themes.php:72
 #: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35
 #: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89
-#: ../../include/items.php:3279
+#: ../../include/items.php:3316
 msgid "Item not found."
 msgstr ""
 
@@ -2246,7 +1790,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:88
 #: ../../Zotlabs/Module/Connections.php:103
-#: ../../Zotlabs/Module/Connedit.php:717 ../../Zotlabs/Widget/Affinity.php:30
+#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30
 msgid "All"
 msgstr ""
 
@@ -2334,7 +1878,7 @@ msgid "Ignore connection"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:283
-#: ../../Zotlabs/Module/Connedit.php:634
+#: ../../Zotlabs/Module/Connedit.php:626
 msgid "Ignore"
 msgstr ""
 
@@ -2343,14 +1887,14 @@ msgid "Recent activity"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/nav.php:181 ../../include/text.php:957
+#: ../../include/text.php:957 ../../include/nav.php:181
 msgid "Connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Module/Search.php:44
 #: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31
-#: ../../include/nav.php:160 ../../include/text.php:1027
-#: ../../include/text.php:1039 ../../include/acl_selectors.php:213
+#: ../../include/text.php:1027 ../../include/text.php:1039
+#: ../../include/nav.php:160 ../../include/acl_selectors.php:213
 msgid "Search"
 msgstr ""
 
@@ -2392,25 +1936,25 @@ msgstr ""
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4187
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4224
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4188
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4225
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4189
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4226
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4190
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4227
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4192
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4229
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
@@ -2816,12 +2360,12 @@ msgid "Deny"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Zotlabs/Module/Connedit.php:618
 msgid "Block"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Accounts.php:175
-#: ../../Zotlabs/Module/Connedit.php:626
+#: ../../Zotlabs/Module/Connedit.php:618
 msgid "Unblock"
 msgstr ""
 
@@ -3117,7 +2661,7 @@ msgstr ""
 msgid "Install new repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358
 msgid "Install"
 msgstr ""
 
@@ -3172,7 +2716,7 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2921
+#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2942
 msgid "Default"
 msgstr ""
 
@@ -3679,7 +3223,7 @@ msgstr ""
 msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2274
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2295
 msgid "Menus"
 msgstr ""
 
@@ -3897,7 +3441,7 @@ msgid "Edit file permissions"
 msgstr ""
 
 #: ../../Zotlabs/Module/Filestorage.php:152
-#: ../../Zotlabs/Module/Connedit.php:680 ../../Zotlabs/Module/Thing.php:313
+#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Thing.php:313
 #: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:647
 #: ../../Zotlabs/Module/Photos.php:1011 ../../Zotlabs/Module/Chat.php:233
 #: ../../include/acl_selectors.php:218
@@ -3964,7 +3508,7 @@ msgid "Could not create privacy group."
 msgstr ""
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3810
+#: ../../include/items.php:3847
 msgid "Privacy group not found."
 msgstr ""
 
@@ -4095,6 +3639,446 @@ msgstr ""
 msgid "%s element installation failed"
 msgstr ""
 
+#: ../../Zotlabs/Module/Setup.php:176
+msgid "$Projectname Server - Setup"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:180
+msgid "Could not connect to database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:184
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:191
+msgid "Could not create table."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:196
+msgid "Your site database has been installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:200
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
+#: ../../Zotlabs/Module/Setup.php:741
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:260
+msgid "System check"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:690
+#: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:920
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
+msgid "Next"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:265
+msgid "Check again"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:287
+msgid "Database connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:288
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:289
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:290
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Database Server Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Default is 127.0.0.1"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Database Port"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Communication port number - use 0 for default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:296
+msgid "Database Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:297
+msgid "Database Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:298
+msgid "Database Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:299
+msgid "Database Type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+msgid "Site administrator email address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Website URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Please use SSL (https) URL if available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:331
+msgid "Site settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:385
+msgid "PHP version 5.5 or greater is required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:386
+msgid "PHP version"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:402
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:403
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:407
+msgid "PHP executable path"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:407
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:412
+msgid "Command line PHP"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:422
+msgid ""
+"Unable to check command line PHP, as shell_exec() is disabled. This is "
+"required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:425
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:426
+msgid "This is required for message delivery to work."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:429
+msgid "PHP register_argc_argv"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:447
+#, php-format
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to "
+"upload is set to %s. You are allowed to upload up to %d files at once."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:452
+msgid "You can adjust these settings in the server php.ini file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:454
+msgid "PHP upload limits"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:477
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:478
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:481
+msgid "Generate encryption keys"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:498
+msgid "libCurl PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:499
+msgid "GD graphics PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:500
+msgid "OpenSSL PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:501
+msgid "PDO database PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:502
+msgid "mb_string PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "xml PHP module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+msgid "Apache mod_rewrite module"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:507
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+msgid "exec"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:513
+msgid ""
+"Error: exec is required but is either not installed or has been disabled in "
+"php.ini"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+msgid "shell_exec"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:519
+msgid ""
+"Error: shell_exec is required but is either not installed or has been "
+"disabled in php.ini"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:527
+msgid "Error: libCURL PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:531
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:535
+msgid "Error: openssl PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:539
+msgid "Error: PDO database PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:543
+msgid "Error: mb_string PHP module required but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:547
+msgid "Error: xml PHP module required for DAV but not installed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:565
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:566
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:567
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:568
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:571
+msgid ".htconfig.php is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:585
+msgid ""
+"This software uses the Smarty3 template engine to render its web views. "
+"Smarty3 compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:586
+#, php-format
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the top level web folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:588
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:591
+#, php-format
+msgid "%s is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:607
+msgid ""
+"This software uses the store directory to save uploaded files. The web "
+"server needs to have write access to the store directory under the top level "
+"web folder"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:611
+msgid "store is writable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:643
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:644
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:645
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:646
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:647
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:648
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:650
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:652
+msgid "SSL certificate validation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:658
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:661
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:675
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:699
+#: ../../extend/addon/addon/cdav/cdav.php:41
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:401
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:739
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:740
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgstr ""
+
 #: ../../Zotlabs/Module/Import_items.php:108
 msgid "Import completed"
 msgstr ""
@@ -4314,393 +4298,188 @@ msgstr ""
 msgid "Item not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:79
-msgid "Could not access contact record."
+#: ../../Zotlabs/Module/Wiki.php:30
+msgid "Profile Unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:109
-msgid "Could not locate selected profile."
+#: ../../Zotlabs/Module/Wiki.php:44
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:246
-msgid "Connection updated."
+#: ../../Zotlabs/Module/Wiki.php:68
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62
+msgid "Invalid channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:248
-msgid "Failed to update connection record."
+#: ../../Zotlabs/Module/Wiki.php:160
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146
+#: ../../include/conversation.php:1845
+msgid "Wikis"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:298
-msgid "is now connected to"
+#: ../../Zotlabs/Module/Wiki.php:166
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
+msgid "Download"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:431
-msgid "Could not access address book record."
+#: ../../Zotlabs/Module/Wiki.php:170
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
+msgid "Wiki name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:479
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../Zotlabs/Module/Wiki.php:171
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
+msgid "Content type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:494 ../../Zotlabs/Module/Connedit.php:503
-#: ../../Zotlabs/Module/Connedit.php:512 ../../Zotlabs/Module/Connedit.php:521
-#: ../../Zotlabs/Module/Connedit.php:534
-msgid "Unable to set address book parameters."
+#: ../../Zotlabs/Module/Wiki.php:180
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
+msgid "Create a status post for this wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:558
-msgid "Connection has been removed."
+#: ../../Zotlabs/Module/Wiki.php:205
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185
+msgid "Wiki not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Lib/Apps.php:228
-#: ../../extend/addon/addon/openclipatar/openclipatar.php:57
-#: ../../include/nav.php:102 ../../include/conversation.php:982
-msgid "View Profile"
+#: ../../Zotlabs/Module/Wiki.php:229
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210
+msgid "Rename page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:601
-#, php-format
-msgid "View %s's profile"
+#: ../../Zotlabs/Module/Wiki.php:233
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214
+msgid "Error retrieving page content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:605
-msgid "Refresh Permissions"
+#: ../../Zotlabs/Module/Wiki.php:239
+msgid "New page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:608
-msgid "Fetch updated permissions"
+#: ../../Zotlabs/Module/Wiki.php:263
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
+msgid "Revision Comparison"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:612
-msgid "Refresh Photo"
+#: ../../Zotlabs/Module/Wiki.php:264
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
+msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:615
-msgid "Fetch updated photo"
+#: ../../Zotlabs/Module/Wiki.php:268
+msgid "Short description of your changes (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:619
-msgid "Recent Activity"
+#: ../../Zotlabs/Module/Wiki.php:275
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
+msgid "Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:622
-msgid "View recent posts and comments"
+#: ../../Zotlabs/Module/Wiki.php:283
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260
+msgid "New page name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Block (or Unblock) all communications with this connection"
+#: ../../Zotlabs/Module/Wiki.php:288
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
+#: ../../include/conversation.php:1232
+msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:630
-msgid "This connection is blocked!"
+#: ../../Zotlabs/Module/Wiki.php:289
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
+#: ../../include/conversation.php:1326
+msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:634
-msgid "Unignore"
+#: ../../Zotlabs/Module/Wiki.php:291
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
+#: ../../include/conversation.php:1328 ../../include/conversation.php:1375
+msgid "OK"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Ignore (or Unignore) all inbound communications from this connection"
+#: ../../Zotlabs/Module/Wiki.php:292
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
+#: ../../include/conversation.php:1268
+msgid "Choose images to embed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:638
-msgid "This connection is ignored!"
+#: ../../Zotlabs/Module/Wiki.php:293
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
+#: ../../include/conversation.php:1269
+msgid "Choose an album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:642
-msgid "Unarchive"
+#: ../../Zotlabs/Module/Wiki.php:294
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
+msgid "Choose a different album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:642
-msgid "Archive"
+#: ../../Zotlabs/Module/Wiki.php:295
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
+#: ../../include/conversation.php:1271
+msgid "Error getting album list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:645
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
+#: ../../Zotlabs/Module/Wiki.php:296
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
+#: ../../include/conversation.php:1272
+msgid "Error getting photo link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:646
-msgid "This connection is archived!"
+#: ../../Zotlabs/Module/Wiki.php:297
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274
+#: ../../include/conversation.php:1273
+msgid "Error getting album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:650
-msgid "Unhide"
+#: ../../Zotlabs/Module/Wiki.php:365
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
+msgid "Error creating wiki. Invalid name."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:650
-msgid "Hide"
+#: ../../Zotlabs/Module/Wiki.php:372
+msgid "A wiki with this name already exists."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:653
-msgid "Hide or Unhide this connection from your other connections"
+#: ../../Zotlabs/Module/Wiki.php:385
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
+msgid "Wiki created, but error creating Home page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:654
-msgid "This connection is hidden!"
+#: ../../Zotlabs/Module/Wiki.php:392
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
+msgid "Error creating wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:661
-msgid "Delete this connection"
+#: ../../Zotlabs/Module/Wiki.php:404
+msgid "Wiki delete permission denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:669
-msgid "Fetch Vcard"
+#: ../../Zotlabs/Module/Wiki.php:414
+msgid "Error deleting wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:672
-msgid "Fetch electronic calling card for this connection"
+#: ../../Zotlabs/Module/Wiki.php:440
+#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
+msgid "New page created"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:683
-msgid "Open Individual Permissions section by default"
+#: ../../Zotlabs/Module/Wiki.php:559
+msgid "Cannot delete Home"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:706
-msgid "Affinity"
+#: ../../Zotlabs/Module/Wiki.php:623
+msgid "Current Revision"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:709
-msgid "Open Set Affinity section by default"
+#: ../../Zotlabs/Module/Wiki.php:623
+msgid "Selected Revision"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:713 ../../Zotlabs/Widget/Affinity.php:26
-msgid "Me"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Widget/Affinity.php:27
-msgid "Family"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:715
-#: ../../Zotlabs/Module/Settings/Channel.php:62
-#: ../../Zotlabs/Module/Settings/Channel.php:66
-#: ../../Zotlabs/Module/Settings/Channel.php:67
-#: ../../Zotlabs/Module/Settings/Channel.php:70
-#: ../../Zotlabs/Module/Settings/Channel.php:81
-#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123
-#: ../../include/channel.php:407 ../../include/channel.php:408
-#: ../../include/channel.php:415
-msgid "Friends"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Widget/Affinity.php:29
-msgid "Acquaintances"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:743
-msgid "Filter"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:746
-msgid "Open Custom Filter section by default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:783
-msgid "Approve this connection"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:783
-msgid "Accept connection to allow communication"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:788
-msgid "Set Affinity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:791
-msgid "Set Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:794
-msgid "Set Affinity & Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:852
-msgid "none"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:855
-#: ../../Zotlabs/Widget/Settings_menu.php:107
-msgid "Connection Default Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:855 ../../include/items.php:3843
-#, php-format
-msgid "Connection: %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:856
-msgid "Apply these permissions automatically"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:856
-msgid "Connection requests will be approved without your interaction"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:857
-msgid "Permission role"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:858
-msgid "Add permission role"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:864
-msgid "This connection's primary address is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:865
-msgid "Available locations:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:869
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:870
-msgid "Connection Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:872
-msgid "Slide to adjust your degree of friendship"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:873 ../../Zotlabs/Module/Rate.php:155
-#: ../../include/js_strings.php:20
-msgid "Rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:874
-msgid "Slide to adjust your rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:875 ../../Zotlabs/Module/Connedit.php:880
-msgid "Optionally explain your rating"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:877
-msgid "Custom Filter"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:878
-msgid "Only import posts with this text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:878 ../../Zotlabs/Module/Connedit.php:879
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:879
-msgid "Do not import posts with this text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:881
-msgid "This information is public!"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:886
-msgid "Connection Pending Approval"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:889
-#: ../../Zotlabs/Module/Settings/Tokens.php:163
-#: ../../Zotlabs/Module/Settings/Permcats.php:105
-msgid "inherited"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:891
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:893
-#: ../../Zotlabs/Module/Settings/Tokens.php:160
-msgid "Their Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:894
-#: ../../Zotlabs/Module/Settings/Tokens.php:161
-#: ../../Zotlabs/Module/Settings/Permcats.php:103
-msgid "My Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:896
-#: ../../Zotlabs/Module/Settings/Tokens.php:166
-#: ../../Zotlabs/Module/Settings/Permcats.php:108
-msgid "Individual Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:897
-#: ../../Zotlabs/Module/Settings/Tokens.php:167
-#: ../../Zotlabs/Module/Settings/Permcats.php:109
-msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can <strong>not</strong> change those settings here."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:898
-msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can change those settings here but they wont have "
-"any impact unless the inherited setting changes."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:899
-msgid "Last update:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:908
-msgid "Details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:911
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
-msgid "Organisation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:912
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
-#: ../../include/page_widgets.php:46
-msgid "Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:929
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
-msgid "P.O. Box"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:930
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
-msgid "Additional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:931
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
-msgid "Street"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:932
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
-msgid "Locality"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:933
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
-msgid "Region"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connedit.php:934
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
-msgid "ZIP Code"
+#: ../../Zotlabs/Module/Wiki.php:673
+msgid "You must be authenticated."
 msgstr ""
 
 #: ../../Zotlabs/Module/Notify.php:57
@@ -4939,18 +4718,18 @@ msgstr ""
 #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
 #: ../../Zotlabs/Module/Tagger.php:47
 #: ../../extend/addon/addon/redphotos/redphotohelper.php:71
-#: ../../include/conversation.php:116 ../../include/text.php:1943
+#: ../../include/text.php:1943 ../../include/conversation.php:116
 msgid "photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:144 ../../include/text.php:1949
+#: ../../include/text.php:1949 ../../include/conversation.php:144
 msgid "status"
 msgstr ""
 
 #: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:119
-#: ../../include/event.php:1145 ../../include/text.php:1946
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1946
+#: ../../include/event.php:1145 ../../include/conversation.php:119
 msgid "event"
 msgstr ""
 
@@ -5049,191 +4828,396 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:30
-msgid "Profile Unavailable."
+#: ../../Zotlabs/Module/Connedit.php:79
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:44
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42
-msgid "Not found"
+#: ../../Zotlabs/Module/Connedit.php:109
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:68
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62
-msgid "Invalid channel"
+#: ../../Zotlabs/Module/Connedit.php:246
+msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:160
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146
-#: ../../include/conversation.php:1845
-msgid "Wikis"
+#: ../../Zotlabs/Module/Connedit.php:248
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:166
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152
-msgid "Download"
+#: ../../Zotlabs/Module/Connedit.php:298
+msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:170
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156
-msgid "Wiki name"
+#: ../../Zotlabs/Module/Connedit.php:423
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:171
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157
-msgid "Content type"
+#: ../../Zotlabs/Module/Connedit.php:471
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:180
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166
-msgid "Create a status post for this wiki"
+#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:495
+#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513
+#: ../../Zotlabs/Module/Connedit.php:526
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:205
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185
-msgid "Wiki not found"
+#: ../../Zotlabs/Module/Connedit.php:550
+msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:229
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210
-msgid "Rename page"
+#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228
+#: ../../extend/addon/addon/openclipatar/openclipatar.php:57
+#: ../../include/nav.php:102 ../../include/conversation.php:982
+msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:233
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214
-msgid "Error retrieving page content"
+#: ../../Zotlabs/Module/Connedit.php:593
+#, php-format
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:239
-msgid "New page"
+#: ../../Zotlabs/Module/Connedit.php:597
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:263
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242
-msgid "Revision Comparison"
+#: ../../Zotlabs/Module/Connedit.php:600
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:264
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243
-msgid "Revert"
+#: ../../Zotlabs/Module/Connedit.php:604
+msgid "Refresh Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:268
-msgid "Short description of your changes (optional)"
+#: ../../Zotlabs/Module/Connedit.php:607
+msgid "Fetch updated photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:275
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252
-msgid "Source"
+#: ../../Zotlabs/Module/Connedit.php:611
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:283
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260
-msgid "New page name"
+#: ../../Zotlabs/Module/Connedit.php:614
+msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:288
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265
-#: ../../include/conversation.php:1232
-msgid "Embed image from photo albums"
+#: ../../Zotlabs/Module/Connedit.php:621
+msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:289
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266
-#: ../../include/conversation.php:1326
-msgid "Embed an image from your albums"
+#: ../../Zotlabs/Module/Connedit.php:622
+msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:291
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268
-#: ../../include/conversation.php:1328 ../../include/conversation.php:1375
-msgid "OK"
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Unignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:292
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269
-#: ../../include/conversation.php:1268
-msgid "Choose images to embed"
+#: ../../Zotlabs/Module/Connedit.php:629
+msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:293
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270
-#: ../../include/conversation.php:1269
-msgid "Choose an album"
+#: ../../Zotlabs/Module/Connedit.php:630
+msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:294
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271
-msgid "Choose a different album"
+#: ../../Zotlabs/Module/Connedit.php:634
+msgid "Unarchive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:295
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272
-#: ../../include/conversation.php:1271
-msgid "Error getting album list"
+#: ../../Zotlabs/Module/Connedit.php:634
+msgid "Archive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:296
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273
-#: ../../include/conversation.php:1272
-msgid "Error getting photo link"
+#: ../../Zotlabs/Module/Connedit.php:637
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:297
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274
-#: ../../include/conversation.php:1273
-msgid "Error getting album"
+#: ../../Zotlabs/Module/Connedit.php:638
+msgid "This connection is archived!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:365
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337
-msgid "Error creating wiki. Invalid name."
+#: ../../Zotlabs/Module/Connedit.php:642
+msgid "Unhide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:372
-msgid "A wiki with this name already exists."
+#: ../../Zotlabs/Module/Connedit.php:642
+msgid "Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:385
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348
-msgid "Wiki created, but error creating Home page."
+#: ../../Zotlabs/Module/Connedit.php:645
+msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:392
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353
-msgid "Error creating wiki"
+#: ../../Zotlabs/Module/Connedit.php:646
+msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:404
-msgid "Wiki delete permission denied."
+#: ../../Zotlabs/Module/Connedit.php:653
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:414
-msgid "Error deleting wiki"
+#: ../../Zotlabs/Module/Connedit.php:661
+msgid "Fetch Vcard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:440
-#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400
-msgid "New page created"
+#: ../../Zotlabs/Module/Connedit.php:664
+msgid "Fetch electronic calling card for this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:559
-msgid "Cannot delete Home"
+#: ../../Zotlabs/Module/Connedit.php:675
+msgid "Open Individual Permissions section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:623
-msgid "Current Revision"
+#: ../../Zotlabs/Module/Connedit.php:698
+msgid "Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:623
-msgid "Selected Revision"
+#: ../../Zotlabs/Module/Connedit.php:701
+msgid "Open Set Affinity section by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:673
-msgid "You must be authenticated."
+#: ../../Zotlabs/Module/Connedit.php:705 ../../Zotlabs/Widget/Affinity.php:26
+msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2273
+#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Widget/Affinity.php:27
+msgid "Family"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:707
+#: ../../Zotlabs/Module/Settings/Channel.php:62
+#: ../../Zotlabs/Module/Settings/Channel.php:66
+#: ../../Zotlabs/Module/Settings/Channel.php:67
+#: ../../Zotlabs/Module/Settings/Channel.php:70
+#: ../../Zotlabs/Module/Settings/Channel.php:81
+#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123
+#: ../../include/channel.php:407 ../../include/channel.php:408
+#: ../../include/channel.php:415
+msgid "Friends"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29
+msgid "Acquaintances"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:735
+msgid "Filter"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:738
+msgid "Open Custom Filter section by default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:775
+msgid "Approve this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:775
+msgid "Accept connection to allow communication"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:780
+msgid "Set Affinity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:783
+msgid "Set Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:786
+msgid "Set Affinity & Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:844
+msgid "none"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:847
+#: ../../Zotlabs/Widget/Settings_menu.php:107
+msgid "Connection Default Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3880
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:848
+msgid "Apply these permissions automatically"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:848
+msgid "Connection requests will be approved without your interaction"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:849
+msgid "Permission role"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:850
+msgid "Add permission role"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:856
+msgid "This connection's primary address is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:857
+msgid "Available locations:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:861
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:862
+msgid "Connection Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:864
+msgid "Slide to adjust your degree of friendship"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Module/Rate.php:155
+#: ../../include/js_strings.php:20
+msgid "Rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:866
+msgid "Slide to adjust your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Connedit.php:872
+msgid "Optionally explain your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:869
+msgid "Custom Filter"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:870
+msgid "Only import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Connedit.php:871
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:871
+msgid "Do not import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:873
+msgid "This information is public!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:878
+msgid "Connection Pending Approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:881
+#: ../../Zotlabs/Module/Settings/Tokens.php:163
+#: ../../Zotlabs/Module/Settings/Permcats.php:105
+msgid "inherited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:883
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:885
+#: ../../Zotlabs/Module/Settings/Tokens.php:160
+msgid "Their Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:886
+#: ../../Zotlabs/Module/Settings/Tokens.php:161
+#: ../../Zotlabs/Module/Settings/Permcats.php:103
+msgid "My Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:888
+#: ../../Zotlabs/Module/Settings/Tokens.php:166
+#: ../../Zotlabs/Module/Settings/Permcats.php:108
+msgid "Individual Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:889
+#: ../../Zotlabs/Module/Settings/Tokens.php:167
+#: ../../Zotlabs/Module/Settings/Permcats.php:109
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:890
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can change those settings here but they wont have "
+"any impact unless the inherited setting changes."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:891
+msgid "Last update:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:900
+msgid "Details"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:903
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137
+msgid "Organisation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:904
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:921
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155
+msgid "P.O. Box"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:922
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156
+msgid "Additional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:923
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157
+msgid "Street"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:924
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158
+msgid "Locality"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:925
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159
+msgid "Region"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:926
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160
+msgid "ZIP Code"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2294
 msgid "Blocks"
 msgstr ""
 
@@ -5274,7 +5258,7 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2297
+#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2318
 msgid "Import"
 msgstr ""
 
@@ -5514,7 +5498,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1604
+#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1599
 msgid "Password Reset"
 msgstr ""
 
@@ -6886,8 +6870,8 @@ msgstr ""
 msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146
-#: ../../include/text.php:1951
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1951
+#: ../../include/conversation.php:146
 msgid "comment"
 msgstr ""
 
@@ -7320,6 +7304,195 @@ msgstr ""
 msgid "Update %s failed. See error logs."
 msgstr ""
 
+#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661
+msgid "Private Message"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653
+msgid "Select"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I will attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I will not attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:158
+msgid "I might attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I agree"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I disagree"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:168
+msgid "I abstain"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:224
+msgid "Add Star"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:225
+msgid "Remove Star"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:226
+msgid "Toggle Star Status"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:230
+msgid "starred"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669
+msgid "Message signature incorrect"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:249
+msgid "Add Tag"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316
+msgid "like"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317
+msgid "dislike"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "Share This"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:274
+msgid "share"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:283
+msgid "Delivery Report"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:301
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
+#, php-format
+msgid "View %s's profile - %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:334
+msgid "to"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:335
+msgid "via"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:336
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:337
+msgid "via Wall-To-Wall:"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718
+#, php-format
+msgid "from %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721
+#, php-format
+msgid "last edited: %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722
+#, php-format
+msgid "Expires: %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:360
+msgid "Attend"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:361
+msgid "Attendance Options"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:362
+msgid "Vote"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:363
+msgid "Voting Options"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:384
+#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
+msgid "Save Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:385
+msgid "Add to Calendar"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:394
+msgid "Mark all seen"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
+#, php-format
+msgid "%s show all"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318
+msgid "Bold"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319
+msgid "Italic"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320
+msgid "Underline"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321
+msgid "Quote"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322
+msgid "Code"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:738
+msgid "Image"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:739
+msgid "Insert Link"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:740
+msgid "Video"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Permcat.php:58
 msgctxt "permcat"
 msgid "default"
@@ -7370,12 +7543,12 @@ msgid "Suggest Channels"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:113
-#: ../../boot.php:1596
+#: ../../boot.php:1591
 msgid "Login"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:172
-msgid "Grid"
+#: ../../Zotlabs/Lib/Apps.php:222
+msgid "Activity"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1848
@@ -7440,19 +7613,19 @@ msgstr ""
 msgid "Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:355
+#: ../../Zotlabs/Lib/Apps.php:365
 msgid "Purchase"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:359
+#: ../../Zotlabs/Lib/Apps.php:369
 msgid "Undelete"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:364
+#: ../../Zotlabs/Lib/Apps.php:374
 msgid "Add to app-tray"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:365
+#: ../../Zotlabs/Lib/Apps.php:375
 msgid "Remove from app-tray"
 msgstr ""
 
@@ -7748,195 +7921,6 @@ msgstr ""
 msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661
-msgid "Private Message"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653
-msgid "Select"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:158
-msgid "I will attend"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:158
-msgid "I will not attend"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:158
-msgid "I might attend"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:168
-msgid "I agree"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:168
-msgid "I disagree"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:168
-msgid "I abstain"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:224
-msgid "Add Star"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:225
-msgid "Remove Star"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:226
-msgid "Toggle Star Status"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:230
-msgid "starred"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668
-msgid "Message signature validated"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669
-msgid "Message signature incorrect"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:249
-msgid "Add Tag"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316
-msgid "like"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317
-msgid "dislike"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:274
-msgid "Share This"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:274
-msgid "share"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:283
-msgid "Delivery Report"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:301
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331
-#, php-format
-msgid "View %s's profile - %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:334
-msgid "to"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:335
-msgid "via"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:336
-msgid "Wall-to-Wall"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:337
-msgid "via Wall-To-Wall:"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718
-#, php-format
-msgid "from %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721
-#, php-format
-msgid "last edited: %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722
-#, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:360
-msgid "Attend"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:361
-msgid "Attendance Options"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:362
-msgid "Vote"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:363
-msgid "Voting Options"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:384
-#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
-msgid "Save Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:385
-msgid "Add to Calendar"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:394
-msgid "Mark all seen"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7
-#, php-format
-msgid "%s show all"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318
-msgid "Bold"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319
-msgid "Italic"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320
-msgid "Underline"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321
-msgid "Quote"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322
-msgid "Code"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:738
-msgid "Image"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:739
-msgid "Insert Link"
-msgstr ""
-
-#: ../../Zotlabs/Lib/ThreadItem.php:740
-msgid "Video"
-msgstr ""
-
 #: ../../Zotlabs/Widget/Activity.php:50
 msgctxt "widget"
 msgid "Activity"
@@ -10696,6 +10680,50 @@ msgstr ""
 msgid "Select an alternate language"
 msgstr ""
 
+#: ../../include/import.php:41
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr ""
+
+#: ../../include/import.php:62
+msgid "Unable to create a unique channel address. Import failed."
+msgstr ""
+
+#: ../../include/import.php:105
+msgid "Cloned channel not found. Import failed."
+msgstr ""
+
+#: ../../include/photos.php:111
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr ""
+
+#: ../../include/photos.php:118
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr ""
+
+#: ../../include/photos.php:524 ../../include/conversation.php:1777
+msgid "Photo Albums"
+msgstr ""
+
+#: ../../include/photos.php:529
+msgid "Upload New Photos"
+msgstr ""
+
 #: ../../include/account.php:35
 msgid "Not a valid email address"
 msgstr ""
@@ -10764,21 +10792,350 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/zot.php:649
-msgid "Invalid data packet"
+#: ../../include/text.php:478
+msgid "prev"
 msgstr ""
 
-#: ../../include/zot.php:665
-msgid "Unable to verify channel signature"
+#: ../../include/text.php:480
+msgid "first"
 msgstr ""
 
-#: ../../include/zot.php:2316
+#: ../../include/text.php:509
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:512
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:523
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:525
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:945
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:970
 #, php-format
-msgid "Unable to verify site signature for %s"
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/zot.php:3722
-msgid "invalid target signature"
+#: ../../include/text.php:1115 ../../include/text.php:1120
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:1115 ../../include/text.php:1120
+#: ../../include/conversation.php:239
+msgid "poked"
+msgstr ""
+
+#: ../../include/text.php:1121
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:1121
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:1122
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:1122
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:1123
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:1123
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:1124
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:1124
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:1125
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:1125
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:1137
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:1138
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:1139
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:1140
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:1141
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:1142
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:1143
+msgid "stupefied"
+msgstr ""
+
+#: ../../include/text.php:1144
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:1145
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:1146
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:1147
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:1148
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:1149
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1150
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1151
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1152
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1153
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1154
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:1155
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1156
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1157
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1328 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1328 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1328 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1328 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1328 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1328 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1328 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:45
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:46
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:47
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:48
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1332
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:50
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:51
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:52
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:53
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:54
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:55
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1332 ../../include/js_strings.php:56
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1409 ../../include/text.php:1413
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1415
+msgid "unknown"
+msgstr ""
+
+#: ../../include/text.php:1451
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1525
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1795
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1795
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1823
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1956
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2019
+msgid "a-z, 0-9, -, _, and . only"
+msgstr ""
+
+#: ../../include/text.php:2291
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2297
+msgid "Pages"
+msgstr ""
+
+#: ../../include/text.php:2319
+msgid "Import website..."
+msgstr ""
+
+#: ../../include/text.php:2320
+msgid "Select folder to import"
+msgstr ""
+
+#: ../../include/text.php:2321
+msgid "Import from a zipped folder:"
+msgstr ""
+
+#: ../../include/text.php:2322
+msgid "Import from cloud files:"
+msgstr ""
+
+#: ../../include/text.php:2323
+msgid "/cloud/channel/path/to/folder"
+msgstr ""
+
+#: ../../include/text.php:2324
+msgid "Enter path to website files"
+msgstr ""
+
+#: ../../include/text.php:2325
+msgid "Select folder"
+msgstr ""
+
+#: ../../include/text.php:2326
+msgid "Export website..."
+msgstr ""
+
+#: ../../include/text.php:2327
+msgid "Export to a zip file"
+msgstr ""
+
+#: ../../include/text.php:2328
+msgid "website.zip"
+msgstr ""
+
+#: ../../include/text.php:2329
+msgid "Enter a name for the zip file."
+msgstr ""
+
+#: ../../include/text.php:2330
+msgid "Export to cloud files"
+msgstr ""
+
+#: ../../include/text.php:2331
+msgid "/path/to/export/folder"
+msgstr ""
+
+#: ../../include/text.php:2332
+msgid "Enter a path to a cloud files destination."
+msgstr ""
+
+#: ../../include/text.php:2333
+msgid "Specify folder"
 msgstr ""
 
 #: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
@@ -10821,20 +11178,21 @@ msgstr ""
 msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/message.php:30
-msgid "Unable to determine sender."
+#: ../../include/zot.php:646
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/message.php:67
-msgid "No recipient provided."
+#: ../../include/zot.php:662
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/message.php:72
-msgid "[no subject]"
+#: ../../include/zot.php:2313
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/message.php:223
-msgid "Stored post could not be verified."
+#: ../../include/zot.php:3762
+msgid "invalid target signature"
 msgstr ""
 
 #: ../../include/datetime.php:147
@@ -10849,7 +11207,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:286 ../../boot.php:2424
+#: ../../include/datetime.php:286 ../../boot.php:2419
 msgid "never"
 msgstr ""
 
@@ -11295,7 +11653,7 @@ msgstr ""
 msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/nav.php:123 ../../boot.php:1595
+#: ../../include/nav.php:99 ../../include/nav.php:123 ../../boot.php:1590
 msgid "Logout"
 msgstr ""
 
@@ -11339,6 +11697,10 @@ msgstr ""
 msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
+#: ../../include/nav.php:172
+msgid "Grid"
+msgstr ""
+
 #: ../../include/nav.php:172
 msgid "Your grid"
 msgstr ""
@@ -11427,545 +11789,6 @@ msgstr ""
 msgid "Add Apps"
 msgstr ""
 
-#: ../../include/network.php:756
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1490
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:1744 ../../include/network.php:1745
-msgid "Friendica"
-msgstr ""
-
-#: ../../include/network.php:1746
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/network.php:1747
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:1748
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/network.php:1750
-msgid "Diaspora"
-msgstr ""
-
-#: ../../include/network.php:1751
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/network.php:1752
-msgid "Zot"
-msgstr ""
-
-#: ../../include/network.php:1753
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/network.php:1754
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/network.php:1755
-msgid "MySpace"
-msgstr ""
-
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
-msgstr ""
-
-#: ../../include/js_strings.php:8
-#, php-format
-msgid "%s show less"
-msgstr ""
-
-#: ../../include/js_strings.php:9
-#, php-format
-msgid "%s expand"
-msgstr ""
-
-#: ../../include/js_strings.php:10
-#, php-format
-msgid "%s collapse"
-msgstr ""
-
-#: ../../include/js_strings.php:11
-msgid "Password too short"
-msgstr ""
-
-#: ../../include/js_strings.php:12
-msgid "Passwords do not match"
-msgstr ""
-
-#: ../../include/js_strings.php:13
-msgid "everybody"
-msgstr ""
-
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
-msgstr ""
-
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
-msgstr ""
-
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
-msgstr ""
-
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr ""
-
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
-msgstr ""
-
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
-msgstr ""
-
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
-msgstr ""
-
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr ""
-
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr ""
-
-#: ../../include/js_strings.php:27
-msgid "timeago.prefixAgo"
-msgstr ""
-
-#: ../../include/js_strings.php:28
-msgid "timeago.prefixFromNow"
-msgstr ""
-
-#: ../../include/js_strings.php:29
-msgid "ago"
-msgstr ""
-
-#: ../../include/js_strings.php:30
-msgid "from now"
-msgstr ""
-
-#: ../../include/js_strings.php:31
-msgid "less than a minute"
-msgstr ""
-
-#: ../../include/js_strings.php:32
-msgid "about a minute"
-msgstr ""
-
-#: ../../include/js_strings.php:33
-#, php-format
-msgid "%d minutes"
-msgstr ""
-
-#: ../../include/js_strings.php:34
-msgid "about an hour"
-msgstr ""
-
-#: ../../include/js_strings.php:35
-#, php-format
-msgid "about %d hours"
-msgstr ""
-
-#: ../../include/js_strings.php:36
-msgid "a day"
-msgstr ""
-
-#: ../../include/js_strings.php:37
-#, php-format
-msgid "%d days"
-msgstr ""
-
-#: ../../include/js_strings.php:38
-msgid "about a month"
-msgstr ""
-
-#: ../../include/js_strings.php:39
-#, php-format
-msgid "%d months"
-msgstr ""
-
-#: ../../include/js_strings.php:40
-msgid "about a year"
-msgstr ""
-
-#: ../../include/js_strings.php:41
-#, php-format
-msgid "%d years"
-msgstr ""
-
-#: ../../include/js_strings.php:42
-msgid " "
-msgstr ""
-
-#: ../../include/js_strings.php:43
-msgid "timeago.numbers"
-msgstr ""
-
-#: ../../include/js_strings.php:45 ../../include/text.php:1332
-msgid "January"
-msgstr ""
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1332
-msgid "February"
-msgstr ""
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1332
-msgid "March"
-msgstr ""
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1332
-msgid "April"
-msgstr ""
-
-#: ../../include/js_strings.php:49
-msgctxt "long"
-msgid "May"
-msgstr ""
-
-#: ../../include/js_strings.php:50 ../../include/text.php:1332
-msgid "June"
-msgstr ""
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1332
-msgid "July"
-msgstr ""
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1332
-msgid "August"
-msgstr ""
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1332
-msgid "September"
-msgstr ""
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1332
-msgid "October"
-msgstr ""
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1332
-msgid "November"
-msgstr ""
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1332
-msgid "December"
-msgstr ""
-
-#: ../../include/js_strings.php:57
-msgid "Jan"
-msgstr ""
-
-#: ../../include/js_strings.php:58
-msgid "Feb"
-msgstr ""
-
-#: ../../include/js_strings.php:59
-msgid "Mar"
-msgstr ""
-
-#: ../../include/js_strings.php:60
-msgid "Apr"
-msgstr ""
-
-#: ../../include/js_strings.php:61
-msgctxt "short"
-msgid "May"
-msgstr ""
-
-#: ../../include/js_strings.php:62
-msgid "Jun"
-msgstr ""
-
-#: ../../include/js_strings.php:63
-msgid "Jul"
-msgstr ""
-
-#: ../../include/js_strings.php:64
-msgid "Aug"
-msgstr ""
-
-#: ../../include/js_strings.php:65
-msgid "Sep"
-msgstr ""
-
-#: ../../include/js_strings.php:66
-msgid "Oct"
-msgstr ""
-
-#: ../../include/js_strings.php:67
-msgid "Nov"
-msgstr ""
-
-#: ../../include/js_strings.php:68
-msgid "Dec"
-msgstr ""
-
-#: ../../include/js_strings.php:69 ../../include/text.php:1328
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1328
-msgid "Monday"
-msgstr ""
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1328
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1328
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1328
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1328
-msgid "Friday"
-msgstr ""
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1328
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/js_strings.php:76
-msgid "Sun"
-msgstr ""
-
-#: ../../include/js_strings.php:77
-msgid "Mon"
-msgstr ""
-
-#: ../../include/js_strings.php:78
-msgid "Tue"
-msgstr ""
-
-#: ../../include/js_strings.php:79
-msgid "Wed"
-msgstr ""
-
-#: ../../include/js_strings.php:80
-msgid "Thu"
-msgstr ""
-
-#: ../../include/js_strings.php:81
-msgid "Fri"
-msgstr ""
-
-#: ../../include/js_strings.php:82
-msgid "Sat"
-msgstr ""
-
-#: ../../include/js_strings.php:83
-msgctxt "calendar"
-msgid "today"
-msgstr ""
-
-#: ../../include/js_strings.php:84
-msgctxt "calendar"
-msgid "month"
-msgstr ""
-
-#: ../../include/js_strings.php:85
-msgctxt "calendar"
-msgid "week"
-msgstr ""
-
-#: ../../include/js_strings.php:86
-msgctxt "calendar"
-msgid "day"
-msgstr ""
-
-#: ../../include/js_strings.php:87
-msgctxt "calendar"
-msgid "All day"
-msgstr ""
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr ""
-
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
-#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
-#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
-#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
-#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
-#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
-#: ../../include/bbcode.php:1079
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:189
-#, php-format
-msgid "Install %s element: "
-msgstr ""
-
-#: ../../include/bbcode.php:193
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr ""
-
-#: ../../include/bbcode.php:272
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/bbcode.php:357
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:1028
-msgid "$1 wrote:"
-msgstr ""
-
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:268
-msgid "Add new connections to this privacy group"
-msgstr ""
-
-#: ../../include/group.php:309
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:331 ../../include/features.php:292
-msgid "Privacy Groups"
-msgstr ""
-
-#: ../../include/group.php:332
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:333
-msgid "Add privacy group"
-msgstr ""
-
-#: ../../include/group.php:334
-msgid "Channels not in any privacy group"
-msgstr ""
-
-#: ../../include/import.php:41
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../include/import.php:62
-msgid "Unable to create a unique channel address. Import failed."
-msgstr ""
-
-#: ../../include/import.php:105
-msgid "Cloned channel not found. Import failed."
-msgstr ""
-
-#: ../../include/items.php:808 ../../include/items.php:855
-msgid "(Unknown)"
-msgstr ""
-
-#: ../../include/items.php:1046
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1048
-msgid "Visible to you only."
-msgstr ""
-
-#: ../../include/items.php:1050
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: ../../include/items.php:1052
-msgid "Visible to anybody authenticated."
-msgstr ""
-
-#: ../../include/items.php:1054
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: ../../include/items.php:1056
-msgid "Visible to all connections."
-msgstr ""
-
-#: ../../include/items.php:1058
-msgid "Visible to approved connections."
-msgstr ""
-
-#: ../../include/items.php:1060
-msgid "Visible to specific connections."
-msgstr ""
-
-#: ../../include/items.php:3826
-msgid "Privacy group is empty."
-msgstr ""
-
-#: ../../include/items.php:3833
-#, php-format
-msgid "Privacy group: %s"
-msgstr ""
-
-#: ../../include/items.php:3845
-msgid "Connection not found."
-msgstr ""
-
-#: ../../include/items.php:4194
-msgid "profile photo"
-msgstr ""
-
-#: ../../include/items.php:4390
-#, php-format
-msgid "[Edited %s]"
-msgstr ""
-
-#: ../../include/items.php:4390
-msgctxt "edit_activity"
-msgid "Post"
-msgstr ""
-
-#: ../../include/items.php:4390
-msgctxt "edit_activity"
-msgid "Comment"
-msgstr ""
-
 #: ../../include/channel.php:33
 msgid "Unable to obtain identity information from database"
 msgstr ""
@@ -12117,6 +11940,336 @@ msgstr ""
 msgid "User '%s' deleted"
 msgstr ""
 
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr ""
+
+#: ../../include/js_strings.php:8
+#, php-format
+msgid "%s show less"
+msgstr ""
+
+#: ../../include/js_strings.php:9
+#, php-format
+msgid "%s expand"
+msgstr ""
+
+#: ../../include/js_strings.php:10
+#, php-format
+msgid "%s collapse"
+msgstr ""
+
+#: ../../include/js_strings.php:11
+msgid "Password too short"
+msgstr ""
+
+#: ../../include/js_strings.php:12
+msgid "Passwords do not match"
+msgstr ""
+
+#: ../../include/js_strings.php:13
+msgid "everybody"
+msgstr ""
+
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
+msgstr ""
+
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
+msgstr ""
+
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
+msgstr ""
+
+#: ../../include/js_strings.php:17
+msgid "close all"
+msgstr ""
+
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr ""
+
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
+msgstr ""
+
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
+msgstr ""
+
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
+msgstr ""
+
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
+msgstr ""
+
+#: ../../include/js_strings.php:27
+msgid "timeago.prefixAgo"
+msgstr ""
+
+#: ../../include/js_strings.php:28
+msgid "timeago.prefixFromNow"
+msgstr ""
+
+#: ../../include/js_strings.php:29
+msgid "ago"
+msgstr ""
+
+#: ../../include/js_strings.php:30
+msgid "from now"
+msgstr ""
+
+#: ../../include/js_strings.php:31
+msgid "less than a minute"
+msgstr ""
+
+#: ../../include/js_strings.php:32
+msgid "about a minute"
+msgstr ""
+
+#: ../../include/js_strings.php:33
+#, php-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../include/js_strings.php:34
+msgid "about an hour"
+msgstr ""
+
+#: ../../include/js_strings.php:35
+#, php-format
+msgid "about %d hours"
+msgstr ""
+
+#: ../../include/js_strings.php:36
+msgid "a day"
+msgstr ""
+
+#: ../../include/js_strings.php:37
+#, php-format
+msgid "%d days"
+msgstr ""
+
+#: ../../include/js_strings.php:38
+msgid "about a month"
+msgstr ""
+
+#: ../../include/js_strings.php:39
+#, php-format
+msgid "%d months"
+msgstr ""
+
+#: ../../include/js_strings.php:40
+msgid "about a year"
+msgstr ""
+
+#: ../../include/js_strings.php:41
+#, php-format
+msgid "%d years"
+msgstr ""
+
+#: ../../include/js_strings.php:42
+msgid " "
+msgstr ""
+
+#: ../../include/js_strings.php:43
+msgid "timeago.numbers"
+msgstr ""
+
+#: ../../include/js_strings.php:49
+msgctxt "long"
+msgid "May"
+msgstr ""
+
+#: ../../include/js_strings.php:57
+msgid "Jan"
+msgstr ""
+
+#: ../../include/js_strings.php:58
+msgid "Feb"
+msgstr ""
+
+#: ../../include/js_strings.php:59
+msgid "Mar"
+msgstr ""
+
+#: ../../include/js_strings.php:60
+msgid "Apr"
+msgstr ""
+
+#: ../../include/js_strings.php:61
+msgctxt "short"
+msgid "May"
+msgstr ""
+
+#: ../../include/js_strings.php:62
+msgid "Jun"
+msgstr ""
+
+#: ../../include/js_strings.php:63
+msgid "Jul"
+msgstr ""
+
+#: ../../include/js_strings.php:64
+msgid "Aug"
+msgstr ""
+
+#: ../../include/js_strings.php:65
+msgid "Sep"
+msgstr ""
+
+#: ../../include/js_strings.php:66
+msgid "Oct"
+msgstr ""
+
+#: ../../include/js_strings.php:67
+msgid "Nov"
+msgstr ""
+
+#: ../../include/js_strings.php:68
+msgid "Dec"
+msgstr ""
+
+#: ../../include/js_strings.php:76
+msgid "Sun"
+msgstr ""
+
+#: ../../include/js_strings.php:77
+msgid "Mon"
+msgstr ""
+
+#: ../../include/js_strings.php:78
+msgid "Tue"
+msgstr ""
+
+#: ../../include/js_strings.php:79
+msgid "Wed"
+msgstr ""
+
+#: ../../include/js_strings.php:80
+msgid "Thu"
+msgstr ""
+
+#: ../../include/js_strings.php:81
+msgid "Fri"
+msgstr ""
+
+#: ../../include/js_strings.php:82
+msgid "Sat"
+msgstr ""
+
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "today"
+msgstr ""
+
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
+msgid "month"
+msgstr ""
+
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
+msgid "week"
+msgstr ""
+
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
+msgid "day"
+msgstr ""
+
+#: ../../include/js_strings.php:87
+msgctxt "calendar"
+msgid "All day"
+msgstr ""
+
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr ""
+
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr ""
+
+#: ../../include/group.php:268
+msgid "Add new connections to this privacy group"
+msgstr ""
+
+#: ../../include/group.php:309
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:331 ../../include/features.php:292
+msgid "Privacy Groups"
+msgstr ""
+
+#: ../../include/group.php:332
+msgid "Edit group"
+msgstr ""
+
+#: ../../include/group.php:333
+msgid "Add privacy group"
+msgstr ""
+
+#: ../../include/group.php:334
+msgid "Channels not in any privacy group"
+msgstr ""
+
+#: ../../include/event.php:22 ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/event.php:30 ../../include/event.php:73
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:40 ../../include/event.php:77
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:1008
+msgid "This event has been added to your calendar."
+msgstr ""
+
+#: ../../include/event.php:1208
+msgid "Not specified"
+msgstr ""
+
+#: ../../include/event.php:1209
+msgid "Needs Action"
+msgstr ""
+
+#: ../../include/event.php:1210
+msgid "Completed"
+msgstr ""
+
+#: ../../include/event.php:1211
+msgid "In Process"
+msgstr ""
+
+#: ../../include/event.php:1212
+msgid "Cancelled"
+msgstr ""
+
 #: ../../include/conversation.php:200
 #, php-format
 msgid "%1$s is now connected with %2$s"
@@ -12127,11 +12280,6 @@ msgstr ""
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:239 ../../include/text.php:1115
-#: ../../include/text.php:1120
-msgid "poked"
-msgstr ""
-
 #: ../../include/conversation.php:691
 #, php-format
 msgid "View %s's profile @ %s"
@@ -12342,10 +12490,6 @@ msgstr ""
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/conversation.php:1777 ../../include/photos.php:524
-msgid "Photo Albums"
-msgstr ""
-
 #: ../../include/conversation.php:1785
 msgid "Files and Storage"
 msgstr ""
@@ -12404,42 +12548,6 @@ msgid_plural "Abstains"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/event.php:22 ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/event.php:30 ../../include/event.php:73
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:40 ../../include/event.php:77
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/event.php:1008
-msgid "This event has been added to your calendar."
-msgstr ""
-
-#: ../../include/event.php:1208
-msgid "Not specified"
-msgstr ""
-
-#: ../../include/event.php:1209
-msgid "Needs Action"
-msgstr ""
-
-#: ../../include/event.php:1210
-msgid "Completed"
-msgstr ""
-
-#: ../../include/event.php:1211
-msgid "In Process"
-msgstr ""
-
-#: ../../include/event.php:1212
-msgid "Cancelled"
-msgstr ""
-
 #: ../../include/help.php:33
 msgid "Help:"
 msgstr ""
@@ -12448,33 +12556,6 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: ../../include/photos.php:111
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr ""
-
-#: ../../include/photos.php:118
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr ""
-
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr ""
-
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr ""
-
-#: ../../include/photos.php:529
-msgid "Upload New Photos"
-msgstr ""
-
 #: ../../include/security.php:117
 msgid "guest:"
 msgstr ""
@@ -12485,269 +12566,68 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/text.php:478
-msgid "prev"
+#: ../../include/message.php:30
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/text.php:480
-msgid "first"
+#: ../../include/message.php:67
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/text.php:509
-msgid "last"
+#: ../../include/message.php:72
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/text.php:512
-msgid "next"
+#: ../../include/message.php:223
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/text.php:523
-msgid "older"
+#: ../../include/network.php:756
+msgid "view full size"
 msgstr ""
 
-#: ../../include/text.php:525
-msgid "newer"
+#: ../../include/network.php:1490
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/text.php:945
-msgid "No connections"
+#: ../../include/network.php:1744 ../../include/network.php:1745
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/text.php:970
-#, php-format
-msgid "View all %s connections"
+#: ../../include/network.php:1746
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/text.php:1115 ../../include/text.php:1120
-msgid "poke"
+#: ../../include/network.php:1747
+msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "ping"
+#: ../../include/network.php:1748
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "pinged"
+#: ../../include/network.php:1750
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/text.php:1122
-msgid "prod"
+#: ../../include/network.php:1751
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/text.php:1122
-msgid "prodded"
+#: ../../include/network.php:1752
+msgid "Zot"
 msgstr ""
 
-#: ../../include/text.php:1123
-msgid "slap"
+#: ../../include/network.php:1753
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/text.php:1123
-msgid "slapped"
+#: ../../include/network.php:1754
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/text.php:1124
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:1124
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:1125
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:1125
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:1137
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:1138
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:1139
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:1140
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:1141
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:1142
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:1143
-msgid "stupefied"
-msgstr ""
-
-#: ../../include/text.php:1144
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:1145
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:1146
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:1147
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:1148
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:1149
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:1150
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:1151
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:1152
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:1153
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:1154
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:1155
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:1156
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:1157
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1332
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1409 ../../include/text.php:1413
-msgid "Unknown Attachment"
-msgstr ""
-
-#: ../../include/text.php:1415
-msgid "unknown"
-msgstr ""
-
-#: ../../include/text.php:1451
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1525
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1795
-msgid "Page layout"
-msgstr ""
-
-#: ../../include/text.php:1795
-msgid "You can create your own with the layouts tool"
-msgstr ""
-
-#: ../../include/text.php:1823
-msgid "Page content type"
-msgstr ""
-
-#: ../../include/text.php:1956
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:2270
-msgid "Design Tools"
-msgstr ""
-
-#: ../../include/text.php:2276
-msgid "Pages"
-msgstr ""
-
-#: ../../include/text.php:2298
-msgid "Import website..."
-msgstr ""
-
-#: ../../include/text.php:2299
-msgid "Select folder to import"
-msgstr ""
-
-#: ../../include/text.php:2300
-msgid "Import from a zipped folder:"
-msgstr ""
-
-#: ../../include/text.php:2301
-msgid "Import from cloud files:"
-msgstr ""
-
-#: ../../include/text.php:2302
-msgid "/cloud/channel/path/to/folder"
-msgstr ""
-
-#: ../../include/text.php:2303
-msgid "Enter path to website files"
-msgstr ""
-
-#: ../../include/text.php:2304
-msgid "Select folder"
-msgstr ""
-
-#: ../../include/text.php:2305
-msgid "Export website..."
-msgstr ""
-
-#: ../../include/text.php:2306
-msgid "Export to a zip file"
-msgstr ""
-
-#: ../../include/text.php:2307
-msgid "website.zip"
-msgstr ""
-
-#: ../../include/text.php:2308
-msgid "Enter a name for the zip file."
-msgstr ""
-
-#: ../../include/text.php:2309
-msgid "Export to cloud files"
-msgstr ""
-
-#: ../../include/text.php:2310
-msgid "/path/to/export/folder"
-msgstr ""
-
-#: ../../include/text.php:2311
-msgid "Enter a path to a cloud files destination."
-msgstr ""
-
-#: ../../include/text.php:2312
-msgid "Specify folder"
+#: ../../include/network.php:1755
+msgid "MySpace"
 msgstr ""
 
 #: ../../include/acl_selectors.php:208
@@ -12802,56 +12682,116 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
+#: ../../include/items.php:842 ../../include/items.php:889
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
+#: ../../include/items.php:1080
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/items.php:1082
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
+#: ../../include/items.php:1084
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
+#: ../../include/items.php:1086
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/items.php:1088
+#, php-format
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/items.php:1090
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
+#: ../../include/items.php:1092
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
+#: ../../include/items.php:1094
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
+#: ../../include/items.php:3863
+msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/items.php:3870
+#, php-format
+msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
+#: ../../include/items.php:3882
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/permissions.php:55
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/items.php:4231
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/items.php:4427
+#, php-format
+msgid "[Edited %s]"
+msgstr ""
+
+#: ../../include/items.php:4427
+msgctxt "edit_activity"
+msgid "Post"
+msgstr ""
+
+#: ../../include/items.php:4427
+msgctxt "edit_activity"
+msgid "Comment"
+msgstr ""
+
+#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040
+#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048
+#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054
+#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062
+#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070
+#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076
+#: ../../include/bbcode.php:1079
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:189
+#, php-format
+msgid "Install %s element: "
+msgstr ""
+
+#: ../../include/bbcode.php:193
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr ""
+
+#: ../../include/bbcode.php:272
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr ""
+
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/bbcode.php:357
+msgid "spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:1028
+msgid "$1 wrote:"
 msgstr ""
 
 #: ../../include/features.php:58
@@ -13256,7 +13196,7 @@ msgid "Set font-size for the entire application"
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:99
-msgid "Examples: 87.5%, 14px"
+msgid "Examples: 1rem, 100%, 16px"
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:100
@@ -13295,44 +13235,44 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1576
+#: ../../boot.php:1571
 msgid "Create an account to access services and applications"
 msgstr ""
 
-#: ../../boot.php:1598
+#: ../../boot.php:1593
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1599
+#: ../../boot.php:1594
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1600
+#: ../../boot.php:1595
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1603
+#: ../../boot.php:1598
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2141
+#: ../../boot.php:2136
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2294
+#: ../../boot.php:2289
 #, php-format
 msgid "[$Projectname] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2299
+#: ../../boot.php:2294
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2418
+#: ../../boot.php:2413
 #, php-format
 msgid "[$Projectname] Cron tasks not running on %s"
 msgstr ""
 
-#: ../../boot.php:2423
+#: ../../boot.php:2418
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index c565ccaf1..a238e61bc 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,7 +1,7 @@
 <div id="side-bar-photos-albums" class="widget">
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills flex-column">
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li>
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent}}</a></li>
 		{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.shorttext}}

From 65e5894363e5cd5a9c8a61a0387f90068215f58e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 7 Apr 2017 14:56:12 -0700
Subject: [PATCH 109/299] photo size-0 issue

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

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 923e34dbe..cc1f3b5d0 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -330,6 +330,7 @@ abstract class photo_driver {
 		$p['photo_usage'] = intval($arr['photo_usage']);
 		$p['os_storage'] = intval($arr['os_storage']);			
 		$p['os_path'] = $arr['os_path'];
+		$p['os_syspath'] = ((array_key_exists('os_syspath',$arr)) ? $arr['os_syspath'] : '');
 		$p['display_path'] = (($arr['display_path']) ? $arr['display_path'] : '');
 
 		if(! intval($p['imgscale']))

From 063577c19ea45918e332ec640fb7369bf757b348 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 9 Apr 2017 20:25:41 -0700
Subject: [PATCH 110/299] some signatures showing as invalid because of recent
 import_author_zot() changes.

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

diff --git a/include/items.php b/include/items.php
index c3b57f6cb..f290b5ec1 100755
--- a/include/items.php
+++ b/include/items.php
@@ -625,14 +625,17 @@ function get_item_elements($x,$allow_code = false) {
 		return array();
 
 	// save a potentially expensive lookup if author == owner
+
 	if($arr['author_xchan'] === make_xchan_hash($x['owner']['guid'],$x['owner']['guid_sig']))
 		$arr['owner_xchan'] = $arr['author_xchan'];
 	else {
 		$xchan_hash = import_author_xchan($x['owner']);
-		if($xchan_hash)
+		if($xchan_hash) {
 			$arr['owner_xchan'] = $xchan_hash;
-		else
+		}
+		else {
 			return array();
+		}
 	}
 
 	// Check signature on the body text received. 
@@ -649,10 +652,25 @@ function get_item_elements($x,$allow_code = false) {
 		$r = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
 			dbesc($arr['author_xchan'])
 		);
-		if($r && rsa_verify($x['body'],base64url_decode($arr['sig']),$r[0]['xchan_pubkey']))
-			$arr['item_verified'] = 1;
-		else
-			logger('get_item_elements: message verification failed.');
+		if($r) {
+			if($r[0]['xchan_pubkey']) {
+				if(rsa_verify($x['body'],base64url_decode($arr['sig']),$r[0]['xchan_pubkey'])) {
+					$arr['item_verified'] = 1;
+				}
+				else {
+					logger('get_item_elements: message verification failed.');
+				}
+			}
+			else {
+
+				// If we don't have a public key, strip the signature so it won't show as invalid.
+				// This won't happen in normal use, but could happen if import_author_xchan()
+				// failed to load the zot-info packet due to a server failure and had 
+				// to create an alternate xchan with network 'unknown'
+
+				unset($arr['sig']);
+			}
+		}
 	}
 
 	// if the input is markdown, remove one level of html escaping.
@@ -1107,7 +1125,7 @@ function encode_item_xchan($xchan) {
 	$ret['address']  = $xchan['xchan_addr'];
 	$ret['url']      = $xchan['xchan_url'];
 	$ret['network']  = $xchan['xchan_network'];
-	$ret['photo']    = array('mimetype' => $xchan['xchan_photo_mimetype'], 'src' => $xchan['xchan_photo_m']);
+	$ret['photo']    = [ 'mimetype' => $xchan['xchan_photo_mimetype'], 'src' => $xchan['xchan_photo_m'] ];
 	$ret['guid']     = $xchan['xchan_guid'];
 	$ret['guid_sig'] = $xchan['xchan_guid_sig'];
 

From ed8e4962b9c589941534b702efe0bc3fac628a95 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 10 Apr 2017 20:31:45 -0700
Subject: [PATCH 111/299] ugly hack to webfinger to allow connections to be
 made to mastodon servers.

---
 include/network.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/include/network.php b/include/network.php
index bce59d38c..e6a6fc2b4 100644
--- a/include/network.php
+++ b/include/network.php
@@ -22,7 +22,6 @@ function get_capath() {
  * @param int $redirects default 0
  *    internal use, recursion counter
  * @param array $opts (optional parameters) associative array with:
- *  * \b accept_content => supply Accept: header with 'accept_content' as the value
  *  * \b timeout => int seconds, default system config value or 60 seconds
  *  * \b headers => array of additional header fields
  *  * \b http_auth => username:password
@@ -202,7 +201,6 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
  * @param int $redirects = 0
  *    internal use, recursion counter
  * @param array $opts (optional parameters)
- *    'accept_content' => supply Accept: header with 'accept_content' as the value
  *    'timeout' => int seconds, default system config value or 60 seconds
  *    'http_auth' => username:password
  *    'novalidate' => do not validate SSL certs, default is to validate using our CA list
@@ -1204,7 +1202,16 @@ function webfinger_rfc7033($webbie,$zot = false) {
 	}
 	logger('fetching url from resource: ' . $rhs . ':' . $webbie);
 
-	$s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''));
+	// The default curl Accept: header is */*, which is incorrectly handled by Mastodon servers
+	// and results in a 406 (Not Acceptable) response, and will also incorrectly produce an XML
+	// document if you use 'application/jrd+json, */*'. We could set this to application/jrd+json,
+	// but some test webfinger servers may not explicitly set the content type and they would be
+	// blocked. The best compromise until Mastodon is fixed is to remove the Accept header which is 
+	// accomplished by setting it to nothing. 
+
+	$counter = 0;
+	$s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''), 
+		false, $counter, [ 'headers' => [ 'Accept:' ] ]);
 
 	if($s['success']) {
 		$j = json_decode($s['body'],true);

From 1609473e5d1bd9b131e61d41b6123669e7b8885d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 11 Apr 2017 20:17:22 -0700
Subject: [PATCH 112/299] correct the mastodon "boost" (aka 'share') author
 attribution by checking for share activities and pulling the original author
 info from the activity:object

---
 boot.php              |   1 +
 include/feedutils.php | 139 ++++++++++++++++++++++++++----------------
 2 files changed, 86 insertions(+), 54 deletions(-)

diff --git a/boot.php b/boot.php
index 206ba0bc9..436fcabd9 100755
--- a/boot.php
+++ b/boot.php
@@ -479,6 +479,7 @@ define ( 'ACTIVITY_JOIN',        NAMESPACE_ACTIVITY_SCHEMA . 'join' );
 define ( 'ACTIVITY_POST',        NAMESPACE_ACTIVITY_SCHEMA . 'post' );
 define ( 'ACTIVITY_UPDATE',      NAMESPACE_ACTIVITY_SCHEMA . 'update' );
 define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
+define ( 'ACTIVITY_SHARE',       NAMESPACE_ACTIVITY_SCHEMA . 'share' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
 define ( 'ACTIVITY_CREATE',      NAMESPACE_ACTIVITY_SCHEMA . 'create' );
 define ( 'ACTIVITY_WIN',         NAMESPACE_ACTIVITY_SCHEMA . 'win' );
diff --git a/include/feedutils.php b/include/feedutils.php
index d1985649d..477685f9a 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -254,81 +254,124 @@ function get_atom_elements($feed, $item, &$author) {
 	else
 		$base_url = '';
 
-	// look for a photo. We should check media size and find the best one,
-	// but for now let's just find any author photo
 
-	$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+	$rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
 
-	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-		foreach($base as $link) {
-			if(!x($author, 'author_photo') || ! $author['author_photo']) {
-				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-					$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-			}
-		}
+	// select between supported verbs
+
+	if($rawverb) {
+		$res['verb'] = unxmlify($rawverb[0]['data']);
 	}
 
-	$rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'actor');
+	// translate OStatus unfollow to activity streams if it happened to get selected
 
-	if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
-		$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-		if($base && count($base)) {
-			foreach($base as $link) {
-				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
-					$author['author_link'] = unxmlify($link['attribs']['']['href']);
-				if(!x($author, 'author_photo') || ! $author['author_photo']) {
-					if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
-						$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+	if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
+		$res['verb'] = ACTIVITY_UNFOLLOW;
+
+
+
+	if(array_key_exists('verb',$res) && $res['verb'] === ACTIVITY_SHARE) {
+		// For Mastodon shares ("boosts"), we need to parse the original author information
+		// from the activity:object -> author structure		
+		$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
+
+		if($rawobj) {
+			$rawauthor = $rawobj->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+			if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']) {
+				$author['author_name'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']);
+			}
+
+			if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri']) {
+				$author['author_link'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri']);
+			}
+			if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+				$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+				foreach($base as $link) {
+					if(!x($author, 'author_photo') || ! $author['author_photo']) {
+						if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+							$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+					}
 				}
 			}
 		}
 	}
+	else {
+		// look for a photo. We should check media size and find the best one,
+		// but for now let's just find any author photo
 
-	// check for a yahoo media element (github etc.)
+		$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
 
-	if(! $author['author_photo']) {
-		$rawmedia = $item->get_item_tags(NAMESPACE_YMEDIA,'thumbnail');
-		if($rawmedia && $rawmedia[0]['attribs']['']['url']) {
-			$author['author_photo'] = strip_tags(unxmlify($rawmedia[0]['attribs']['']['url']));
-		}
-	}
-
-
-	// No photo/profile-link on the item - look at the feed level
-
-	if((! (x($author,'author_link'))) || (! (x($author,'author_photo')))) {
-		$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
 		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
 			$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 			foreach($base as $link) {
-				if($link['attribs']['']['rel'] === 'alternate' && (! $author['author_link'])) {
-					$author['author_link'] = unxmlify($link['attribs']['']['href']);
-					$author['author_is_feed'] = true;
-				}
-				if(! $author['author_photo']) {
+				if(!x($author, 'author_photo') || ! $author['author_photo']) {
 					if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
 						$author['author_photo'] = unxmlify($link['attribs']['']['href']);
 				}
 			}
 		}
 
-		$rawactor = $feed->get_feed_tags(NAMESPACE_ACTIVITY, 'subject');
+		$rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'actor');
 
 		if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
 			$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-
 			if($base && count($base)) {
 				foreach($base as $link) {
 					if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
 						$author['author_link'] = unxmlify($link['attribs']['']['href']);
-					if(! (x($author,'author_photo'))) {
+					if(!x($author, 'author_photo') || ! $author['author_photo']) {
 						if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
 							$author['author_photo'] = unxmlify($link['attribs']['']['href']);
 					}
 				}
 			}
 		}
+
+		// check for a yahoo media element (github etc.)
+
+		if(! $author['author_photo']) {
+			$rawmedia = $item->get_item_tags(NAMESPACE_YMEDIA,'thumbnail');
+			if($rawmedia && $rawmedia[0]['attribs']['']['url']) {
+				$author['author_photo'] = strip_tags(unxmlify($rawmedia[0]['attribs']['']['url']));
+			}
+		}
+
+
+		// No photo/profile-link on the item - look at the feed level
+
+		if((! (x($author,'author_link'))) || (! (x($author,'author_photo')))) {
+			$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+			if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+				$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+				foreach($base as $link) {
+					if($link['attribs']['']['rel'] === 'alternate' && (! $author['author_link'])) {
+						$author['author_link'] = unxmlify($link['attribs']['']['href']);
+						$author['author_is_feed'] = true;
+					}
+					if(! $author['author_photo']) {
+						if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+							$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+					}
+				}
+			}
+
+			$rawactor = $feed->get_feed_tags(NAMESPACE_ACTIVITY, 'subject');
+
+			if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
+				$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+
+				if($base && count($base)) {
+					foreach($base as $link) {
+						if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
+							$author['author_link'] = unxmlify($link['attribs']['']['href']);
+						if(! (x($author,'author_photo'))) {
+							if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
+								$author['author_photo'] = unxmlify($link['attribs']['']['href']);
+						}
+					}
+				}
+			}
+		}
 	}
 
 	$ostatus_protocol = (($item->get_item_tags(NAMESPACE_OSTATUS,'conversation')) ? true : false);
@@ -492,18 +535,6 @@ function get_atom_elements($feed, $item, &$author) {
 		$res['coord'] = unxmlify($rawgeo[0]['data']);
 
 
-	$rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
-
-	// select between supported verbs
-
-	if($rawverb) {
-		$res['verb'] = unxmlify($rawverb[0]['data']);
-	}
-
-	// translate OStatus unfollow to activity streams if it happened to get selected
-
-	if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
-		$res['verb'] = ACTIVITY_UNFOLLOW;
 
 	$cats = $item->get_categories();
 	if($cats) {

From 940534e3031d8f57784d47f9c7c6d7e80a256dd4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 11 Apr 2017 22:02:29 -0700
Subject: [PATCH 113/299] webfinger cleanup

---
 Zotlabs/Module/Wfinger.php | 43 ++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 04eed47c3..5c22772c4 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -38,6 +38,9 @@ class Wfinger extends \Zotlabs\Web\Controller {
 				$channel = str_replace('acct:','',$resource);
 				if(strpos($channel,'@') !== false) {
 					$host = substr($channel,strpos($channel,'@')+1);
+
+					// If the webfinger address points off site, redirect to the correct site
+
 					if(strcasecmp($host,\App::get_hostname())) {
 						goaway('https://' . $host . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=' . $zot : ''));
 					}
@@ -77,54 +80,54 @@ class Wfinger extends \Zotlabs\Web\Controller {
 				}
 			}
 	
-			$result['aliases'] = array();
+			$result['aliases'] = [];
 	
-			$result['properties'] = array(
-					'http://webfinger.net/ns/name' => $r[0]['channel_name'],
+			$result['properties'] = [
+					'http://webfinger.net/ns/name'   => $r[0]['channel_name'],
 					'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name']
-			);
+			];
 	
 			foreach($aliases as $alias) 
 				if($alias != $resource)
 					$result['aliases'][] = $alias;
 	
-			$result['links'] = array(
+			$result['links'] = [
 	
-				array(
+				[
 					'rel' => 'http://webfinger.net/rel/avatar',
 					'type' => $r[0]['xchan_photo_mimetype'],
 					'href' => $r[0]['xchan_photo_l']	
-				),
+				],
 	
-				array(
+				[
 					'rel' => 'http://webfinger.net/rel/profile-page',
 					'href' => z_root() . '/profile/' . $r[0]['channel_address'],
-				),
+				],
 	
-				array(
+				[
 					'rel' => 'http://webfinger.net/rel/blog',
 					'href' => z_root() . '/channel/' . $r[0]['channel_address'],
-				),
+				],
 	
-				array(
+				[
 					'rel' => 'http://ostatus.org/schema/1.0/subscribe',
 					'template' => z_root() . '/follow/url={uri}',
-				),
+				],
 	
-				array(
+				[
 					'rel' => 'http://purl.org/zot/protocol',
 					'href' => z_root() . '/.well-known/zot-info' . '?address=' . $r[0]['xchan_addr'],
-				),
+				],
 	
-				array(
+				[
 					'rel' => 'magic-public-key',
 					'href' => 'data:application/magic-public-key,' . salmon_key($r[0]['channel_pubkey']),
-				)
-			);
+				]
+			];
 	
 			if($zot) {
 				// get a zotinfo packet and return it with webfinger
-				$result['zot'] = zotinfo(array('address' => $r[0]['xchan_addr']));
+				$result['zot'] = zotinfo( [ 'address' => $r[0]['xchan_addr'] ]);
 			}
 		}
 		else {
@@ -132,7 +135,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 			killme();
 		}
 	
-		$arr = array('channel' => $r[0], 'request' => $_REQUEST, 'result' => $result);
+		$arr = [ 'channel' => $r[0], 'request' => $_REQUEST, 'result' => $result ];
 		call_hooks('webfinger',$arr);
 	
 		json_return_and_die($arr['result'],'application/jrd+json');

From 63dd6ad01a173d640e5c49dede1246dba840aa74 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 11 Apr 2017 23:05:56 -0700
Subject: [PATCH 114/299] don't allow any null fields in notify creation

---
 Zotlabs/Lib/Enotify.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 5db5fb42d..a10675a87 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -495,13 +495,14 @@ class Enotify {
 		}
 	}
 
-	$r = q("insert into notify (hash,xname,url,photo,created,aid,uid,link,parent,seen,ntype,verb,otype)
-		values('%s','%s','%s','%s','%s',%d,%d,'%s','%s',%d,%d,'%s','%s')",
+	$r = q("insert into notify (hash,xname,url,photo,created,msg,aid,uid,link,parent,seen,ntype,verb,otype)
+		values('%s','%s','%s','%s','%s','%s',%d,%d,'%s','%s',%d,%d,'%s','%s')",
 		dbesc($datarray['hash']),
 		dbesc($datarray['xname']),
 		dbesc($datarray['url']),
 		dbesc($datarray['photo']),
 		dbesc($datarray['created']),
+		dbesc(''),      // will fill this in below after the record is created
 		intval($datarray['aid']),
 		intval($datarray['uid']),
 		dbesc($datarray['link']),

From 1c32564536cbfa12bd21a1c8161921b13d7dcc66 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 12 Apr 2017 17:32:28 -0700
Subject: [PATCH 115/299] backend infrastructure for 'channel protection
 password'; which will be used to optionally encrypt export files and resolve
 channel/identity ownership/hijacking disputes

---
 boot.php                    |  2 +-
 include/channel.php         |  7 ++++++-
 include/import.php          |  2 +-
 install/schema_mysql.sql    |  2 ++
 install/schema_postgres.sql |  4 +++-
 install/update.php          | 13 ++++++++++++-
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/boot.php b/boot.php
index 436fcabd9..d42d2608a 100755
--- a/boot.php
+++ b/boot.php
@@ -53,7 +53,7 @@ define ( 'STD_VERSION',             '5.3' );
 
 define ( 'ZOT_REVISION',            '1.2' );
 
-define ( 'DB_UPDATE_VERSION',       1188  );
+define ( 'DB_UPDATE_VERSION',       1189  );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 
diff --git a/include/channel.php b/include/channel.php
index 7394b1308..890bb8bd6 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -538,6 +538,8 @@ function identity_basic_export($channel_id, $sections = null) {
 		$ret['relocate'] = [ 'channel_address' => $r[0]['channel_address'], 'url' => z_root()];
 		if(in_array('channel',$sections)) {
 			$ret['channel'] = $r[0];
+			unset($ret['channel']['channel_password']);
+			unset($ret['channel']['channel_salt']);
 		}
 	}
 
@@ -1999,7 +2001,10 @@ function channel_store_lowlevel($arr) {
         'channel_deny_gid'        => ((array_key_exists('channel_deny_gid',$arr))        ? $arr['channel_deny_gid']        : ''),
         'channel_removed'         => ((array_key_exists('channel_removed',$arr))         ? $arr['channel_removed']         : '0'),
         'channel_system'          => ((array_key_exists('channel_system',$arr))          ? $arr['channel_system']          : '0'),
-        'channel_moved'           => ((array_key_exists('channel_moved',$arr))           ? $arr['channel_moved']           : '')
+
+		'channel_moved'           => ((array_key_exists('channel_moved',$arr))           ? $arr['channel_moved']           : ''),
+		'channel_password'        => ((array_key_exists('channel_password',$arr))        ? $arr['channel_password']        : ''),
+		'channel_salt'            => ((array_key_exists('channel_salt',$arr))            ? $arr['channel_salt']            : '')
 
 	];
 
diff --git a/include/import.php b/include/import.php
index 9007dbe74..224bb1803 100644
--- a/include/import.php
+++ b/include/import.php
@@ -82,7 +82,7 @@ function import_channel($channel, $account_id, $seize) {
 		'channel_r_storage',  'channel_r_pages',     'channel_w_stream',  'channel_w_wall',
 		'channel_w_comment',  'channel_w_mail',      'channel_w_like',    'channel_w_tagwall',
 		'channel_w_chat',     'channel_w_storage',   'channel_w_pages',   'channel_a_republish',
-		'channel_a_delegate', 'perm_limits'
+		'channel_a_delegate', 'perm_limits',         'channel_password',  'channel_salt'
 	];
 
 	$clean = array();
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index f3d46fa73..5b554583c 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -265,6 +265,8 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_removed` tinyint(1) NOT NULL DEFAULT '0',
   `channel_system` tinyint(1) NOT NULL DEFAULT '0',
   `channel_moved` char(255) NOT NULL DEFAULT '',
+  `channel_password` varchar(255) NOT NULL,
+  `channel_salt` varchar(255) NOT NULL,
   PRIMARY KEY (`channel_id`),
   UNIQUE KEY `channel_address_unique` (`channel_address`),
   KEY `channel_account_id` (`channel_account_id`),
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 4488d8271..f505801bd 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -166,7 +166,7 @@ CREATE TABLE "attach" (
   "is_photo" smallint NOT NULL DEFAULT '0',
   "os_storage" smallint NOT NULL DEFAULT '0',
   "os_path" text NOT NULL,
-  "display_path" text NOT NULL,
+4  "display_path" text NOT NULL,
   "content" bytea NOT NULL,
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -258,6 +258,8 @@ CREATE TABLE "channel" (
   "channel_removed" smallint NOT NULL DEFAULT '0',
   "channel_system" smallint NOT NULL DEFAULT '0',
   "channel_moved" text NOT NULL DEFAULT '',
+  "channel_password" varchar(255) NOT NULL,
+  "channel_salt" varchar(255) NOT NULL,
   PRIMARY KEY ("channel_id"),
   UNIQUE ("channel_address")
 );
diff --git a/install/update.php b/install/update.php
index dd3a42c78..b37af9cef 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1188 );
+define( 'UPDATE_VERSION' , 1189 );
 
 /**
  *
@@ -2510,3 +2510,14 @@ function update_r1187() {
 
 }
 
+function update_r1188() {
+
+	$r1 = q("alter table channel add channel_password varchar(255) not null ");
+	$r2 = q("alter table channel add channel_salt varchar(255) not null ");
+
+	if($r1 && $r2)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}
+

From 91d0f871817ba79131d4b55c7a9f8e2eac9eb8d4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 12 Apr 2017 17:43:27 -0700
Subject: [PATCH 116/299] make sure the new fields don't leak through sync
 packets and break older versions

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

diff --git a/include/zot.php b/include/zot.php
index 3e1b27c83..20a25ce3b 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2956,6 +2956,8 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 		return;
 
 	$channel = $r[0];
+	unset($channel['channel_password']);
+	unset($channel['channel_salt']);
 
 	translate_channel_perms_outbound($channel);
 	if($packet && array_key_exists('abook',$packet) && $packet['abook']) {

From 07d62bc1119b257e1271e05443c45b59e1f41670 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 12 Apr 2017 18:48:06 -0700
Subject: [PATCH 117/299] typo

---
 install/schema_postgres.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index f505801bd..40e320eb7 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -166,7 +166,7 @@ CREATE TABLE "attach" (
   "is_photo" smallint NOT NULL DEFAULT '0',
   "os_storage" smallint NOT NULL DEFAULT '0',
   "os_path" text NOT NULL,
-4  "display_path" text NOT NULL,
+  "display_path" text NOT NULL,
   "content" bytea NOT NULL,
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',

From c631da7b0d004761c4d8fc7bd1301181ae5d9f3b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 12 Apr 2017 19:25:46 -0700
Subject: [PATCH 118/299] whitespace

---
 Zotlabs/Widget/Tasklist.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php
index 6f7a8aaed..3961eecce 100644
--- a/Zotlabs/Widget/Tasklist.php
+++ b/Zotlabs/Widget/Tasklist.php
@@ -8,8 +8,8 @@ class Tasklist {
 
 	function widget($arr) {
 
-	if (! local_channel())
-		return;
+		if (! local_channel())
+			return;
 
 		$o .= '<script>var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});</script>';
 		$o .= '<script>function taskComplete(id) { $.post("tasks/complete/"+id, function(data) { tasksFetch();}); }

From 4a6a06fdc04963a8ad16ecd918d1d59d7be2bd14 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 12 Apr 2017 20:20:46 -0700
Subject: [PATCH 119/299] change default database settings

---
 install/schema_mysql.sql | 124 +++++++++++++++++++--------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 5b554583c..adcb204bb 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `abconfig` (
   KEY `xchan` (`xchan`),
   KEY `cat` (`cat`),
   KEY `k` (`k`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `abook` (
   `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS `abook` (
   KEY `abook_unconnected` (`abook_unconnected`),
   KEY `abook_self` (`abook_self`),
   KEY `abook_feed` (`abook_feed`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `account` (
   `account_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -88,7 +88,7 @@ CREATE TABLE IF NOT EXISTS `account` (
   KEY `account_external` (`account_external`),
   KEY `account_level` (`account_level`),
   KEY `account_password_changed` (`account_password_changed`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `addon` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -102,7 +102,7 @@ CREATE TABLE IF NOT EXISTS `addon` (
   KEY `hidden` (`hidden`),
   KEY `aname` (`aname`),
   KEY `installed` (`installed`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `app` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -136,7 +136,7 @@ CREATE TABLE IF NOT EXISTS `app` (
   KEY `app_deleted` (`app_deleted`),
   KEY `app_system` (`app_system`),
   KEY `app_edited` (`app_edited`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
 CREATE TABLE IF NOT EXISTS `atoken` (
@@ -153,7 +153,7 @@ CREATE TABLE IF NOT EXISTS `atoken` (
   KEY `atoken_name` (`atoken_name`),
   KEY `atoken_token` (`atoken_token`),
   KEY `atoken_expires` (`atoken_expires`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `attach` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -195,7 +195,7 @@ CREATE TABLE IF NOT EXISTS `attach` (
   KEY `is_dir` (`is_dir`),
   KEY `is_photo` (`is_photo`),
   KEY `os_storage` (`os_storage`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `auth_codes` (
   `id` varchar(40) NOT NULL DEFAULT '',
@@ -204,14 +204,14 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
   `expires` int(11) NOT NULL DEFAULT '0',
   `auth_scope` varchar(512) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `cache` (
   `k` char(255) NOT NULL DEFAULT '',
   `v` text NOT NULL,
   `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`k`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `cal` (
   `cal_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -231,7 +231,7 @@ CREATE TABLE IF NOT EXISTS `cal` (
   KEY `cal_hash` (`cal_hash`),
   KEY `cal_name` (`cal_name`),
   KEY `cal_types` (`cal_types`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `channel` (
   `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -289,7 +289,7 @@ CREATE TABLE IF NOT EXISTS `channel` (
   KEY `channel_system` (`channel_system`),
   KEY `channel_lastpost` (`channel_lastpost`),
   KEY `channel_moved` (`channel_moved`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `chat` (
   `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -301,7 +301,7 @@ CREATE TABLE IF NOT EXISTS `chat` (
   KEY `chat_room` (`chat_room`),
   KEY `chat_xchan` (`chat_xchan`),
   KEY `created` (`created`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `chatpresence` (
   `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -315,7 +315,7 @@ CREATE TABLE IF NOT EXISTS `chatpresence` (
   KEY `cp_xchan` (`cp_xchan`),
   KEY `cp_last` (`cp_last`),
   KEY `cp_status` (`cp_status`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `chatroom` (
   `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -336,7 +336,7 @@ CREATE TABLE IF NOT EXISTS `chatroom` (
   KEY `cr_created` (`cr_created`),
   KEY `cr_edited` (`cr_edited`),
   KEY `cr_expire` (`cr_expire`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `clients` (
   `client_id` varchar(20) NOT NULL DEFAULT '',
@@ -346,7 +346,7 @@ CREATE TABLE IF NOT EXISTS `clients` (
   `icon` text,
   `uid` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`client_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `config` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -355,7 +355,7 @@ CREATE TABLE IF NOT EXISTS `config` (
   `v` text NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `access` (`cat`,`k`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `conv` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -369,7 +369,7 @@ CREATE TABLE IF NOT EXISTS `conv` (
   PRIMARY KEY (`id`),
   KEY `created` (`created`),
   KEY `updated` (`updated`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `dreport` (
   `dreport_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -388,7 +388,7 @@ CREATE TABLE IF NOT EXISTS `dreport` (
   KEY `dreport_xchan` (`dreport_xchan`),
   KEY `dreport_queue` (`dreport_queue`),
   KEY `dreport_channel` (`dreport_channel`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `event` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -434,7 +434,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   KEY `event_status` (`event_status`),
   KEY `event_sequence` (`event_sequence`),
   KEY `event_priority` (`event_priority`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `groups` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -449,7 +449,7 @@ CREATE TABLE IF NOT EXISTS `groups` (
   KEY `deleted` (`deleted`),
   KEY `hash` (`hash`),
   KEY `gname` (`gname`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `group_member` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -460,7 +460,7 @@ CREATE TABLE IF NOT EXISTS `group_member` (
   KEY `uid` (`uid`),
   KEY `gid` (`gid`),
   KEY `xchan` (`xchan`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `hook` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -473,7 +473,7 @@ CREATE TABLE IF NOT EXISTS `hook` (
   KEY `hook` (`hook`),
   KEY `priority` (`priority`),
   KEY `hook_version` (`hook_version`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `hubloc` (
   `hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -511,7 +511,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
   KEY `hubloc_orphancheck` (`hubloc_orphancheck`),
   KEY `hubloc_deleted` (`hubloc_deleted`),
   KEY `hubloc_error` (`hubloc_error`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 
 CREATE TABLE IF NOT EXISTS `iconfig` (
@@ -526,7 +526,7 @@ CREATE TABLE IF NOT EXISTS `iconfig` (
   KEY `cat` (`cat`),
   KEY `k` (`k`),
   KEY `sharing` (`sharing`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `issue` (
   `issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -543,7 +543,7 @@ CREATE TABLE IF NOT EXISTS `issue` (
   KEY `issue_priority` (`issue_priority`),
   KEY `issue_status` (`issue_status`),
   KEY `issue_component` (`issue_component`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `item` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -676,7 +676,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   FULLTEXT KEY `allow_gid` (`allow_gid`),
   FULLTEXT KEY `deny_cid` (`deny_cid`),
   FULLTEXT KEY `deny_gid` (`deny_gid`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `item_id` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -689,7 +689,7 @@ CREATE TABLE IF NOT EXISTS `item_id` (
   KEY `sid` (`sid`),
   KEY `service` (`service`),
   KEY `iid` (`iid`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `likes` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -711,7 +711,7 @@ CREATE TABLE IF NOT EXISTS `likes` (
   KEY `target_type` (`target_type`),
   KEY `channel_id` (`channel_id`),
   KEY `target_id` (`target_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `mail` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -754,7 +754,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
   KEY `mail_seen` (`mail_seen`),
   KEY `mail_recalled` (`mail_recalled`),
   KEY `mail_obscured` (`mail_obscured`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `menu` (
   `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -770,7 +770,7 @@ CREATE TABLE IF NOT EXISTS `menu` (
   KEY `menu_flags` (`menu_flags`),
   KEY `menu_created` (`menu_created`),
   KEY `menu_edited` (`menu_edited`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `menu_item` (
   `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -788,7 +788,7 @@ CREATE TABLE IF NOT EXISTS `menu_item` (
   KEY `mitem_channel_id` (`mitem_channel_id`),
   KEY `mitem_menu_id` (`mitem_menu_id`),
   KEY `mitem_flags` (`mitem_flags`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `notify` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -816,7 +816,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
   KEY `link` (`link`),
   KEY `otype` (`otype`),
   KEY `aid` (`aid`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `obj` (
   `obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -847,7 +847,7 @@ CREATE TABLE IF NOT EXISTS `obj` (
   KEY `obj_edited` (`obj_edited`),
   KEY `obj_quantity` (`obj_quantity`),
   KEY `obj_obj` (`obj_obj`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `outq` (
   `outq_hash` char(255) NOT NULL,
@@ -873,7 +873,7 @@ CREATE TABLE IF NOT EXISTS `outq` (
   KEY `outq_async` (`outq_async`),
   KEY `outq_delivered` (`outq_delivered`),
   KEY `outq_priority` (`outq_priority`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `pconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -883,7 +883,7 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
   `v` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `access` (`uid`,`cat`,`k`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 
 CREATE TABLE IF NOT EXISTS `photo` (
@@ -929,7 +929,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
   KEY `is_nsfw` (`is_nsfw`),
   KEY `os_storage` (`os_storage`),
   KEY `photo_usage` (`photo_usage`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `poll` (
   `poll_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -941,7 +941,7 @@ CREATE TABLE IF NOT EXISTS `poll` (
   KEY `poll_channel` (`poll_channel`),
   KEY `poll_flags` (`poll_flags`),
   KEY `poll_votes` (`poll_votes`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `poll_elm` (
   `pelm_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -952,7 +952,7 @@ CREATE TABLE IF NOT EXISTS `poll_elm` (
   PRIMARY KEY (`pelm_id`),
   KEY `pelm_poll` (`pelm_poll`),
   KEY `pelm_result` (`pelm_result`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `profdef` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -963,7 +963,7 @@ CREATE TABLE IF NOT EXISTS `profdef` (
   `field_inputs` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
   KEY `field_name` (`field_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `profext` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -975,7 +975,7 @@ CREATE TABLE IF NOT EXISTS `profext` (
   KEY `channel_id` (`channel_id`),
   KEY `hash` (`hash`),
   KEY `k` (`k`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `profile` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -1038,7 +1038,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
   KEY `postal_code` (`postal_code`),
   KEY `country_name` (`country_name`),
   KEY `profile_guid` (`profile_guid`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `profile_check` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1053,7 +1053,7 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
   KEY `dfrn_id` (`dfrn_id`),
   KEY `sec` (`sec`),
   KEY `expire` (`expire`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `register` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1066,7 +1066,7 @@ CREATE TABLE IF NOT EXISTS `register` (
   KEY `hash` (`hash`),
   KEY `created` (`created`),
   KEY `uid` (`uid`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `session` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
@@ -1076,7 +1076,7 @@ CREATE TABLE IF NOT EXISTS `session` (
   PRIMARY KEY (`id`),
   KEY `sid` (`sid`),
   KEY `expire` (`expire`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `shares` (
   `share_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1087,7 +1087,7 @@ CREATE TABLE IF NOT EXISTS `shares` (
   KEY `share_type` (`share_type`),
   KEY `share_target` (`share_target`),
   KEY `share_xchan` (`share_xchan`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `sign` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1099,7 +1099,7 @@ CREATE TABLE IF NOT EXISTS `sign` (
   PRIMARY KEY (`id`),
   KEY `iid` (`iid`),
   KEY `retract_iid` (`retract_iid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `site` (
   `site_url` char(255) NOT NULL,
@@ -1132,7 +1132,7 @@ CREATE TABLE IF NOT EXISTS `site` (
   KEY `site_dead` (`site_dead`),
   KEY `site_type` (`site_type`),
   KEY `site_project` (`site_project`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `source` (
   `src_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1145,7 +1145,7 @@ CREATE TABLE IF NOT EXISTS `source` (
   KEY `src_channel_id` (`src_channel_id`),
   KEY `src_channel_xchan` (`src_channel_xchan`),
   KEY `src_xchan` (`src_xchan`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `sys_perms` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1154,7 +1154,7 @@ CREATE TABLE IF NOT EXISTS `sys_perms` (
   `v` mediumtext NOT NULL,
   `public_perm` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `term` (
   `tid` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1178,7 +1178,7 @@ CREATE TABLE IF NOT EXISTS `term` (
   KEY `imgurl` (`imgurl`),
   KEY `term_hash` (`term_hash`),
   KEY `parent_hash` (`parent_hash`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `tokens` (
   `id` varchar(40) NOT NULL DEFAULT '',
@@ -1191,7 +1191,7 @@ CREATE TABLE IF NOT EXISTS `tokens` (
   KEY `client_id` (`client_id`),
   KEY `expires` (`expires`),
   KEY `uid` (`uid`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `updates` (
   `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1208,7 +1208,7 @@ CREATE TABLE IF NOT EXISTS `updates` (
   KEY `ud_flags` (`ud_flags`),
   KEY `ud_addr` (`ud_addr`),
   KEY `ud_last` (`ud_last`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `verify` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1223,7 +1223,7 @@ CREATE TABLE IF NOT EXISTS `verify` (
   KEY `token` (`token`),
   KEY `meta` (`meta`),
   KEY `created` (`created`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `vote` (
   `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1235,7 +1235,7 @@ CREATE TABLE IF NOT EXISTS `vote` (
   UNIQUE KEY `vote_vote` (`vote_poll`,`vote_element`,`vote_xchan`),
   KEY `vote_poll` (`vote_poll`),
   KEY `vote_element` (`vote_element`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xchan` (
   `xchan_hash` char(255) NOT NULL,
@@ -1281,7 +1281,7 @@ CREATE TABLE IF NOT EXISTS `xchan` (
   KEY `xchan_system` (`xchan_system`),
   KEY `xchan_pubforum` (`xchan_pubforum`),
   KEY `xchan_deleted` (`xchan_deleted`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xchat` (
   `xchat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1294,7 +1294,7 @@ CREATE TABLE IF NOT EXISTS `xchat` (
   KEY `xchat_desc` (`xchat_desc`),
   KEY `xchat_xchan` (`xchat_xchan`),
   KEY `xchat_edited` (`xchat_edited`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xconfig` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1306,7 +1306,7 @@ CREATE TABLE IF NOT EXISTS `xconfig` (
   KEY `xchan` (`xchan`),
   KEY `cat` (`cat`),
   KEY `k` (`k`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xign` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1315,7 +1315,7 @@ CREATE TABLE IF NOT EXISTS `xign` (
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `xchan` (`xchan`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xlink` (
   `xlink_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1332,7 +1332,7 @@ CREATE TABLE IF NOT EXISTS `xlink` (
   KEY `xlink_updated` (`xlink_updated`),
   KEY `xlink_rating` (`xlink_rating`),
   KEY `xlink_static` (`xlink_static`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xperm` (
   `xp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1343,7 +1343,7 @@ CREATE TABLE IF NOT EXISTS `xperm` (
   KEY `xp_client` (`xp_client`),
   KEY `xp_channel` (`xp_channel`),
   KEY `xp_perm` (`xp_perm`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xprof` (
   `xprof_hash` char(255) NOT NULL,
@@ -1373,7 +1373,7 @@ CREATE TABLE IF NOT EXISTS `xprof` (
   KEY `xprof_country` (`xprof_country`),
   KEY `xprof_age` (`xprof_age`),
   KEY `xprof_hometown` (`xprof_hometown`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xtag` (
   `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
@@ -1384,4 +1384,4 @@ CREATE TABLE IF NOT EXISTS `xtag` (
   KEY `xtag_term` (`xtag_term`),
   KEY `xtag_hash` (`xtag_hash`),
   KEY `xtag_flags` (`xtag_flags`)
-) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;

From 60d4b4c4f6ed9f41bdf2e8ec17e448f39f699096 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 12 Apr 2017 20:21:56 -0700
Subject: [PATCH 120/299] remove fulltext indexes for innodb

---
 install/schema_mysql.sql | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index adcb204bb..7964c2a6a 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -669,13 +669,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `item_unpublished` (`item_unpublished`),
   KEY `item_delayed` (`item_delayed`),
   KEY `item_pending_remove` (`item_pending_remove`),
-  KEY `item_blocked` (`item_blocked`),
-  FULLTEXT KEY `title` (`title`),
-  FULLTEXT KEY `body` (`body`),
-  FULLTEXT KEY `allow_cid` (`allow_cid`),
-  FULLTEXT KEY `allow_gid` (`allow_gid`),
-  FULLTEXT KEY `deny_cid` (`deny_cid`),
-  FULLTEXT KEY `deny_gid` (`deny_gid`)
+  KEY `item_blocked` (`item_blocked`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `item_id` (

From 9c31e26cf1e7a25d287037c65161c4b952e21b19 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 17 Apr 2017 17:54:50 -0700
Subject: [PATCH 121/299] include attach.php here (boot.php) instead of each
 file that uses it. Eventually this needs to move to an autoloader.

---
 boot.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boot.php b/boot.php
index 65d198571..b063cd6f9 100755
--- a/boot.php
+++ b/boot.php
@@ -46,6 +46,7 @@ require_once('include/account.php');
 require_once('include/zid.php');
 require_once('include/xchan.php');
 require_once('include/hubloc.php');
+require_once('include/attach.php');
 
 
 define ( 'PLATFORM_NAME',           'red' );

From e3dc242a3c86482e2516e21d74f1fd6f5d25e6e9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 17 Apr 2017 20:45:53 -0700
Subject: [PATCH 122/299] allow downloading via viewsrc to support client side
 e2ee

---
 Zotlabs/Module/Viewsrc.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php
index cb305efc6..f84eddc69 100644
--- a/Zotlabs/Module/Viewsrc.php
+++ b/Zotlabs/Module/Viewsrc.php
@@ -13,6 +13,7 @@ class Viewsrc extends \Zotlabs\Web\Controller {
 	
 		$item_id = ((argc() > 1) ? intval(argv(1)) : 0);
 		$json    = ((argc() > 2 && argv(2) === 'json') ? true : false);
+		$dload   = ((argc() > 2 && argv(2) === 'download') ? true : false);
 	
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
@@ -27,7 +28,7 @@ class Viewsrc extends \Zotlabs\Web\Controller {
 		$item_normal = item_normal();
 	
 		if(local_channel() && $item_id) {
-			$r = q("select id, item_flags, item_obscured, body from item where uid in (%d , %d) and id = %d $item_normal limit 1",
+			$r = q("select id, item_flags, mimetype, item_obscured, body from item where uid in (%d , %d) and id = %d $item_normal limit 1",
 				intval(local_channel()),
 				intval($sys['channel_id']),
 				intval($item_id)
@@ -37,6 +38,14 @@ class Viewsrc extends \Zotlabs\Web\Controller {
 				if(intval($r[0]['item_obscured']))
 					$r[0]['body'] = crypto_unencapsulate(json_decode($r[0]['body'],true),get_config('system','prvkey')); 
 
+				if($dload) {
+					header('Content-type: ' . $r[0]['mimetype']);
+					header('Content-disposition: attachment; filename="' . t('item') . '-' . $item_id . '"' );
+					echo $r[0]['body'];
+					killme();
+				}
+
+
 				$content = escape_tags($r[0]['body']);
 				$o = (($json) ? json_encode($content) : str_replace("\n",'<br />',$content));
 			}

From ffce1fc177758092cb1f84cbbaf27241f6a7a9a4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 18 Apr 2017 17:26:50 -0700
Subject: [PATCH 123/299] envelope privacy

---
 Zotlabs/Daemon/Notifier.php | 60 ++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 63ced4f56..48f1d2757 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -5,6 +5,11 @@ namespace Zotlabs\Daemon;
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
 require_once('include/conversation.php');
+require_once('include/zot.php');
+require_once('include/items.php');
+require_once('include/bbcode.php');
+
+
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -68,13 +73,6 @@ require_once('include/conversation.php');
  */
 
 
-require_once('include/zot.php');
-require_once('include/queue_fn.php');
-require_once('include/datetime.php');
-require_once('include/items.php');
-require_once('include/bbcode.php');
-require_once('include/channel.php');
-
 
 class Notifier {
 
@@ -98,16 +96,6 @@ class Notifier {
 
 		$deliveries = array();
 
-		$dead_hubs = array();
-
-		$dh = q("select site_url from site where site_dead = 1");
-		if($dh) {
-			foreach($dh as $dead) {
-				$dead_hubs[] = $dead['site_url'];
-			}
-		}
-
-
 		$request = false;
 		$mail = false;
 		$top_level = false;
@@ -489,10 +477,10 @@ class Notifier {
 	
 
 		// Now we have collected recipients (except for external mentions, FIXME)
-		// Let's reduce this to a set of hubs.
+		// Let's reduce this to a set of hubs; checking that the site is not dead.
 
 		$r = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . implode(',',$recipients) . ") 
-			and hubloc_error = 0 and hubloc_deleted = 0"
+			and hubloc_error = 0 and hubloc_deleted = 0 and site_dead = 0"
 		);		
  
 
@@ -506,23 +494,31 @@ class Notifier {
 
 
 		/**
-		 * Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey, since it may have been 
-		 * a re-install which has not yet been detected and pruned.
+		 * Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey, 
+		 * since it may have been a re-install which has not yet been detected and pruned.
 		 * For other networks which don't have or require sitekeys, we'll have to use the URL
 		 */
 
 
-		$hublist = array(); // this provides an easily printable list for the logs
-		$dhubs   = array(); // delivery hubs where we store our resulting unique array
-		$keys    = array(); // array of keys to check uniquness for zot hubs
-		$urls    = array(); // array of urls to check uniqueness of hubs from other networks
-
+		$hublist = []; // this provides an easily printable list for the logs
+		$dhubs   = []; // delivery hubs where we store our resulting unique array
+		$keys    = []; // array of keys to check uniquness for zot hubs
+		$urls    = []; // array of urls to check uniqueness of hubs from other networks
+		$hub_env = []; // per-hub envelope so we don't broadcast the entire envelope to all
 
 		foreach($hubs as $hub) {
-			if(in_array($hub['hubloc_url'],$dead_hubs)) {
-				logger('skipping dead hub: ' . $hub['hubloc_url'], LOGGER_DEBUG, LOG_INFO);
-				continue;
+
+			if($env_recips) {
+				foreach($env_recips as $er) {
+					if($hub['hubloc_hash'] === $er['hash']) {
+						if(! array_key_exists($hub['hubloc_host'] . $hub['hubloc_sitekey'], $hub_env)) {
+							$hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] = [];
+						}
+						$hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']][] = $er;
+					}
+				}
 			}
+			
 
 			if($hub['hubloc_network'] == 'zot') {
 				if(! in_array($hub['hubloc_sitekey'],$keys)) {
@@ -603,7 +599,8 @@ class Notifier {
 				$packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null));
 			}
 			elseif($packet_type === 'request') {
-				$packet = zot_build_packet($channel,$packet_type,$env_recips,$hub['hubloc_sitekey'],$hub['site_crypto'],
+				$env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
+				$packet = zot_build_packet($channel,$packet_type,$env,$hub['hubloc_sitekey'],$hub['site_crypto'],
 					$hash, array('message_id' => $request_message_id)
 				);
 			}
@@ -618,7 +615,8 @@ class Notifier {
 				));
 			}
 			else {
-				$packet = zot_build_packet($channel,'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);	
+				$env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
+				$packet = zot_build_packet($channel,'notify',$env,(($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);	
 				queue_insert(array(
 					'hash'       => $hash,
 					'account_id' => $target_item['aid'],

From 53bd0146bb9a924a103646db0b628ede28d294a1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 18 Apr 2017 18:31:10 -0700
Subject: [PATCH 124/299] oembed cache: don't store the url (which may need to
 be truncated), store a hash instead. This will allow us to convert the table
 to utf8mb4 without running into mysql key length restrictions as well as
 dealing with the potential ambiguity of truncated urls.

---
 Zotlabs/Lib/Cache.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Lib/Cache.php b/Zotlabs/Lib/Cache.php
index f211269be..cea075659 100644
--- a/Zotlabs/Lib/Cache.php
+++ b/Zotlabs/Lib/Cache.php
@@ -9,10 +9,10 @@ namespace Zotlabs\Lib;
 class Cache {
 	public static function get($key) {
 
-		$key = substr($key,0,254);
+		$hash = hash('whirlpool',$key);
 
 		$r = q("SELECT v FROM cache WHERE k = '%s' limit 1",
-			dbesc($key)
+			dbesc($hash)
 		);
 			
 		if ($r)
@@ -22,20 +22,20 @@ class Cache {
 		
 	public static function set($key,$value) {
 
-		$key = substr($key,0,254);
+		$hash = hash('whirlpool',$key);
 
 		$r = q("SELECT * FROM cache WHERE k = '%s' limit 1",
-			dbesc($key)
+			dbesc($hash)
 		);
 		if($r) {
 			q("UPDATE cache SET v = '%s', updated = '%s' WHERE k = '%s'",
 				dbesc($value),
 				dbesc(datetime_convert()),
-				dbesc($key));
+				dbesc($hash));
 		}
 		else {
 			q("INSERT INTO cache ( k, v, updated) VALUES ('%s','%s','%s')",
-				dbesc($key),
+				dbesc($hash),
 				dbesc($value),
 				dbesc(datetime_convert()));
 		}

From 397fef519c7929c70636c50015f7a0389062bab5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 18 Apr 2017 21:18:49 -0700
Subject: [PATCH 125/299] give the item_obscured flag a new lease on life by
 using it to designate third party client-side e2ee or binary content which
 can only be downloaded and not viewed directly on the web (as a side effect
 this also allows binary files to be submitted as activities/content). The
 content display is suppressed and replaced with a download button. This is
 unfinished but harmless to backport while work is in progress unless told
 otherwise. Future development will take care of the remaining loose ends.

---
 include/conversation.php |  8 --------
 include/text.php         | 18 +++++++++++++++++-
 view/tpl/item_binary.tpl |  3 +++
 3 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 view/tpl/item_binary.tpl

diff --git a/include/conversation.php b/include/conversation.php
index 5b2d60583..93a6d7406 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -353,14 +353,6 @@ function localize_item(&$item){
 	}
 */
 
-	// if item body was obscured and we changed it, re-obscure it
-	// FIXME - we need a better filter than just the string 'data'; try and
-	// match the fact that it's json encoded
-
-	if(intval($item['item_obscured'])
-		&& strlen($item['body']) && (! strpos($item['body'],'data'))) {
-		$item['body']  = z_obscure($item['body']);
-	}
 
 }
 
diff --git a/include/text.php b/include/text.php
index bbf0b5b98..d276595ae 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1570,7 +1570,12 @@ function prepare_body(&$item,$attach = false) {
 		}
 	}
 
-	$s .= prepare_text($item['body'],$item['mimetype'], false);
+	if($item['item_obscured']) {
+		$s .= prepare_binary($item);
+	}
+	else {
+		$s .= prepare_text($item['body'],$item['mimetype'], false);
+	}
 
 	$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event_obj($item['obj']) : false);
 
@@ -1633,6 +1638,17 @@ function prepare_body(&$item,$attach = false) {
 	return $prep_arr;
 }
 
+
+function prepare_binary($item) {
+	return replace_macros(get_markup_template('item_binary.tpl'), [
+		'$download'  => t('Download binary/encrypted content'),
+		'$url'       => z_root() . '/viewsrc/' . $item['id'] . '/download'
+	]);
+}
+
+
+
+
 /**
  * @brief Given a text string, convert from bbcode to html and add smilie icons.
  *
diff --git a/view/tpl/item_binary.tpl b/view/tpl/item_binary.tpl
new file mode 100644
index 000000000..b19f7e7dd
--- /dev/null
+++ b/view/tpl/item_binary.tpl
@@ -0,0 +1,3 @@
+<p>
+<center><a class="zrl" href="{{$url}}"><button class="btn btn-warning fakelink">{{$download}}</button></a></center>
+</p>

From 1c6d2857cb6978ca7b87a0564013aa2b39024e96 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 19 Apr 2017 17:52:15 -0700
Subject: [PATCH 126/299] follow_from_feed issue when called from push

---
 include/feedutils.php | 2 +-
 include/follow.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index a5161dc6e..03eb1f256 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -946,7 +946,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 				$datarray['author_xchan'] = '';
 
 				if(activity_match($datarray['verb'],ACTIVITY_FOLLOW) && $datarray['obj_type'] === ACTIVITY_OBJ_PERSON) {
-					$cb = array('item' => $datarray,'channel' => $importer, 'xchan' => null, 'author' => $author, 'caught' => false);
+					$cb = array('item' => $datarray,'channel' => $importer, 'xchan' => [ 'placeholder' => '' ], 'author' => $author, 'caught' => false);
 					call_hooks('follow_from_feed',$cb);
 					if($cb['caught']) {
 						if($cb['return_code'])
diff --git a/include/follow.php b/include/follow.php
index 751d86db1..0d7c16aa3 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -49,7 +49,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 
 	$arr = array('url' => $url, 'channel' => array());
 
-	call_hooks('follow', $arr);
+	call_hooks('follow_init', $arr);
 
 	if($arr['channel']['success']) 
 		$ret = $arr['channel'];

From f52c670c05b01610f60e736c44c81e5b6f9f7ceb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 19 Apr 2017 20:48:10 -0700
Subject: [PATCH 127/299] support reverse magic-auth in oembed requests.

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

diff --git a/include/oembed.php b/include/oembed.php
index aac7d15b4..5865c95d5 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -149,7 +149,14 @@ function oembed_fetch_url($embedurl){
 		if ($action !== 'block') {
 			// try oembed autodiscovery
 			$redirects = 0;
-			$result = z_fetch_url($furl, false, $redirects, array('timeout' => 30, 'accept_content' => "text/*", 'novalidate' => true ));
+			$result = z_fetch_url($furl, false, $redirects, 
+				[
+					'timeout'        => 30, 
+					'accept_content' => "text/*", 
+					'novalidate'     => true, 
+					'session'        => ((local_channel() && $zrl) ? true : false) 
+				]
+			);
 
 			if($result['success'])
 				$html_text = $result['body'];
@@ -200,7 +207,7 @@ function oembed_fetch_url($embedurl){
 
 		if ($txt[0]!="{") $txt='{"type":"error"}';
 	
-		//save in cache
+		// save in cache
 
 		if(! get_config('system','oembed_cache_disable'))
 			Zlib\Cache::set('[' . App::$videowidth . '] ' . $furl, $txt);

From 2d90b831f0af1c276cc590a5fcec427de3eb32f8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 20 Apr 2017 19:52:50 -0700
Subject: [PATCH 128/299] In the rare case where a default channel is not
 selected but channels actually exist, you should be able to visit /manage and
 set a default channel. Originally I believe this may have been possible but
 the ability was lost when delegation was added to the interface - which
 requires an active channel. Remove the active channel restriction so that the
 rest of the interface works (channel selections can be made and the ability
 to set a default is provided) however delegation info isn't presented unless
 there is an active channel.

---
 Zotlabs/Module/Manage.php | 158 +++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 77 deletions(-)

diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php
index 3b7b3c3dd..e541ee077 100644
--- a/Zotlabs/Module/Manage.php
+++ b/Zotlabs/Module/Manage.php
@@ -46,107 +46,111 @@ class Manage extends \Zotlabs\Web\Controller {
 	
 		$channels = null;
 	
-		if(local_channel()) {
-			$r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
-				intval(get_account_id())
-			);
+		$r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
+			intval(get_account_id())
+		);
 	
-			$account = \App::get_account();
+		$account = \App::get_account();
 	
-			if($r && count($r)) {
-				$channels = $r;
-				for($x = 0; $x < count($channels); $x ++) {
-					$channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']);
-					$channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : ''); 
-					$channels[$x]['default_links'] = '1';
+		if($r && count($r)) {
+			$channels = $r;
+			for($x = 0; $x < count($channels); $x ++) {
+				$channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']);
+				$channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : ''); 
+				$channels[$x]['default_links'] = '1';
 	
 	
-					$c = q("SELECT id, item_wall FROM item
-						WHERE item_unseen = 1 and uid = %d " . item_normal(),
-						intval($channels[$x]['channel_id'])
-					);
+				$c = q("SELECT id, item_wall FROM item
+					WHERE item_unseen = 1 and uid = %d " . item_normal(),
+					intval($channels[$x]['channel_id'])
+				);
 	
-					if($c) {	
-						foreach ($c as $it) {
-							if(intval($it['item_wall']))
-								$channels[$x]['home'] ++;
-							else
-								$channels[$x]['network'] ++;
-						}
+				if($c) {	
+					foreach ($c as $it) {
+						if(intval($it['item_wall']))
+							$channels[$x]['home'] ++;
+						else
+							$channels[$x]['network'] ++;
 					}
+				}
 	
 	
-					$intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
-						intval($channels[$x]['channel_id'])
-					);
+				$intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ",
+					intval($channels[$x]['channel_id'])
+				);
 	
-					if($intr)
-						$channels[$x]['intros'] = intval($intr[0]['total']);
+				if($intr)
+					$channels[$x]['intros'] = intval($intr[0]['total']);
 	
 	
-					$mails = q("SELECT count(id) as total from mail WHERE channel_id = %d AND mail_seen = 0 and from_xchan != '%s' ",
-						intval($channels[$x]['channel_id']),
-						dbesc($channels[$x]['channel_hash'])
-					);
+				$mails = q("SELECT count(id) as total from mail WHERE channel_id = %d AND mail_seen = 0 and from_xchan != '%s' ",
+					intval($channels[$x]['channel_id']),
+					dbesc($channels[$x]['channel_hash'])
+				);
 	
-					if($mails)
-						$channels[$x]['mail'] = intval($mails[0]['total']);
+				if($mails)
+					$channels[$x]['mail'] = intval($mails[0]['total']);
 			
 	
-					$events = q("SELECT etype, dtstart, adjust FROM event
-						WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
-						ORDER BY dtstart ASC ",
-						intval($channels[$x]['channel_id']),
-						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')),
-						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
-					);
+				$events = q("SELECT etype, dtstart, adjust FROM event
+					WHERE event.uid = %d AND dtstart < '%s' AND dtstart > '%s' and dismissed = 0
+					ORDER BY dtstart ASC ",
+					intval($channels[$x]['channel_id']),
+					dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')),
+					dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
+				);
 	
-					if($events) {
-						$channels[$x]['all_events'] = count($events);
-	
-						if($channels[$x]['all_events']) {
-							$str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
-							foreach($events as $e) {
-								$bd = false;
-								if($e['etype'] === 'birthday') {
-									$channels[$x]['birthdays'] ++;
-									$bd = true;
-								}
-								else {
-									$channels[$x]['events'] ++;
-								}
-								if(datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['dtstart'], 'Y-m-d') === $str_now) {
-									$channels[$x]['all_events_today'] ++;
-									if($bd)
-										$channels[$x]['birthdays_today'] ++;
-									else
-										$channels[$x]['events_today'] ++;
-								}
+				if($events) {
+					$channels[$x]['all_events'] = count($events);
+
+					if($channels[$x]['all_events']) {
+						$str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
+						foreach($events as $e) {
+							$bd = false;
+							if($e['etype'] === 'birthday') {
+								$channels[$x]['birthdays'] ++;
+								$bd = true;
+							}
+							else {
+								$channels[$x]['events'] ++;
+							}
+							if(datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['dtstart'], 'Y-m-d') === $str_now) {
+								$channels[$x]['all_events_today'] ++;
+								if($bd)
+									$channels[$x]['birthdays_today'] ++;
+								else
+									$channels[$x]['events_today'] ++;
 							}
 						}
 					}
 				}
 			}
-			
-		    $r = q("select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0",
-				intval(get_account_id())
-			);
-			$limit = account_service_class_fetch(get_account_id(),'total_identities');
-			if($limit !== false) {
-				$channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit);
-			}
-			else {
-				$channel_usage_message = '';
-	 		}
+
+		}			
+		
+		$r = q("select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0",
+			intval(get_account_id())
+		);
+		$limit = account_service_class_fetch(get_account_id(),'total_identities');
+		if($limit !== false) {
+			$channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit);
 		}
+		else {
+			$channel_usage_message = '';
+	 	}
+	
 	
 		$create = array( 'new_channel', t('Create a new channel'), t('Create New'));
 	
-		$delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where 
-			abook_channel = %d and abook_xchan in ( select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'delegate' and v = '1' )",
-			intval(local_channel()),
-			intval(local_channel())
-		);
+		$delegates = null;
+
+		if(local_channel()) {
+			$delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where 
+				abook_channel = %d and abook_xchan in ( select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'delegate' and v = '1' )",
+				intval(local_channel()),
+				intval(local_channel())
+			);
+		}
 	
 		if($delegates) {
 			for($x = 0; $x < count($delegates); $x ++) {

From 94f15e355166f0abd3698414948abff2397a7ad0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 20 Apr 2017 20:19:15 -0700
Subject: [PATCH 129/299] The rest of the library and backend changes to
 support client-side e2ee and deprecate previous uses of item_obscured.

---
 Zotlabs/Module/Editpost.php    | 13 ++++---------
 Zotlabs/Module/Editwebpage.php | 13 ++++---------
 Zotlabs/Module/Item.php        |  1 +
 Zotlabs/Module/Viewsrc.php     |  2 +-
 include/items.php              | 35 +++++++++-------------------------
 include/text.php               | 15 +--------------
 6 files changed, 20 insertions(+), 59 deletions(-)

diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php
index d7612b165..629bdd3fd 100644
--- a/Zotlabs/Module/Editpost.php
+++ b/Zotlabs/Module/Editpost.php
@@ -31,7 +31,10 @@ class Editpost extends \Zotlabs\Web\Controller {
 			dbesc(get_observer_hash())
 		);
 
-		if(! count($itm)) {
+		// don't allow web editing of potentially binary content (item_obscured = 1)
+		// @FIXME how do we do it instead?
+
+		if((! $itm) || intval($itm[0]['item_obscured'])) {
 			notice( t('Item is not editable') . EOL);
 			return;
 		}
@@ -44,14 +47,6 @@ class Editpost extends \Zotlabs\Web\Controller {
 
 		$channel = \App::get_channel();
 
-		if(intval($itm[0]['item_obscured'])) {
-			$key = get_config('system','prvkey');
-			if($itm[0]['title'])
-				$itm[0]['title'] = crypto_unencapsulate(json_decode($itm[0]['title'],true),$key);
-			if($itm[0]['body'])
-				$itm[0]['body'] = crypto_unencapsulate(json_decode($itm[0]['body'],true),$key);
-		}
-
 		$category = '';
 		$catsenabled = ((feature_enabled($owner_uid,'categories')) ? 'categories' : '');
 
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
index 03b2aeab9..db33cd1db 100644
--- a/Zotlabs/Module/Editwebpage.php
+++ b/Zotlabs/Module/Editwebpage.php
@@ -100,19 +100,14 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 			intval($owner)
 		);
 
-		if(! $itm) {
+		// don't allow web editing of potentially binary content (item_obscured = 1)
+		// @FIXME how do we do it instead?
+
+		if((! $itm) || intval($itm[0]['item_obscured'])) {
 			notice( t('Permission denied.') . EOL);
 			return;
 		}
 
-		if(intval($itm[0]['item_obscured'])) {
-			$key = get_config('system','prvkey');
-			if($itm[0]['title'])
-				$itm[0]['title'] = crypto_unencapsulate(json_decode($itm[0]['title'],true),$key);
-			if($itm[0]['body'])
-				$itm[0]['body'] = crypto_unencapsulate(json_decode($itm[0]['body'],true),$key);
-		}
-
 		$item_id = q("select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1",
 			intval($itm[0]['id'])
 		);
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 71f410b2a..9fddafee6 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -110,6 +110,7 @@ class Item extends \Zotlabs\Web\Controller {
 		$preview     = ((x($_REQUEST,'preview'))     ? intval($_REQUEST['preview'])        : 0);
 		$categories  = ((x($_REQUEST,'category'))    ? escape_tags($_REQUEST['category'])  : '');
 		$webpage     = ((x($_REQUEST,'webpage'))     ? intval($_REQUEST['webpage'])        : 0);
+		$item_obscured = ((x($_REQUEST,'obscured'))  ? intval($_REQUEST['obscured'])        : 0);
 		$pagetitle   = ((x($_REQUEST,'pagetitle'))   ? escape_tags(urlencode($_REQUEST['pagetitle'])) : '');
 		$layout_mid  = ((x($_REQUEST,'layout_mid'))  ? escape_tags($_REQUEST['layout_mid']): '');
 		$plink       = ((x($_REQUEST,'permalink'))   ? escape_tags($_REQUEST['permalink']) : '');
diff --git a/Zotlabs/Module/Viewsrc.php b/Zotlabs/Module/Viewsrc.php
index f84eddc69..54ab89e81 100644
--- a/Zotlabs/Module/Viewsrc.php
+++ b/Zotlabs/Module/Viewsrc.php
@@ -36,7 +36,7 @@ class Viewsrc extends \Zotlabs\Web\Controller {
 	
 			if($r) {
 				if(intval($r[0]['item_obscured']))
-					$r[0]['body'] = crypto_unencapsulate(json_decode($r[0]['body'],true),get_config('system','prvkey')); 
+					$dload = true;
 
 				if($dload) {
 					header('Content-type: ' . $r[0]['mimetype']);
diff --git a/include/items.php b/include/items.php
index f290b5ec1..c71e8011d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -605,6 +605,9 @@ function get_item_elements($x,$allow_code = false) {
 		if(in_array('notshown',$x['flags']))
 			$arr['item_notshown'] = 1;
 
+		if(in_array('obscured',$x['flags']))
+			$arr['item_obscured'] = 1;
+
 		// hidden item are no longer propagated - notshown may be a suitable alternative
 
 		if(in_array('hidden',$x['flags']))
@@ -707,7 +710,7 @@ function get_item_elements($x,$allow_code = false) {
 		// local only		$arr['item_relay'] = $x['item_relay'];
 		$arr['item_mentionsme'] = $x['item_mentionsme'];
 		$arr['item_nocomment'] = $x['item_nocomment'];
-		// local only $arr['item_obscured'] = $x['item_obscured'];
+		$arr['item_obscured'] = $x['item_obscured'];
 		// local only $arr['item_verified'] = $x['item_verified'];
 		$arr['item_retained'] = $x['item_retained'];
 		$arr['item_rss'] = $x['item_rss'];
@@ -955,13 +958,6 @@ function encode_item($item,$mirror = false) {
 
 	$key = get_config('system','prvkey');
 
-	if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
-		if($item['title'])
-			$item['title'] = crypto_unencapsulate(json_decode($item['title'],true),$key);
-		if($item['body'])
-			$item['body'] = crypto_unencapsulate(json_decode($item['body'],true),$key);
-	}
-
 	// If we're trying to backup an item so that it's recoverable or for export/imprt,
 	// add all the attributes we need to recover it
 
@@ -1309,7 +1305,9 @@ function encode_item_flags($item) {
 		$ret[] = 'nsfw';
 	if(intval($item['item_consensus']))
 		$ret[] = 'consensus';
-	if(intval($item['item_private']))
+	if(intval($item['item_obscured']))
+		$ret[] = 'obscured';
+	if(intval($item['item_privat']))
 		$ret[] = 'private';
 
 	return $ret;
@@ -2479,15 +2477,7 @@ function tag_deliver($uid, $item_id) {
 		// Now let's check if this mention was inside a reshare so we don't spam a forum
 		// If it's private we may have to unobscure it momentarily so that we can parse it.
 
-		$body = '';
-
-		if(intval($item['item_obscured'])) {
-			$key = get_config('system','prvkey');
-			if($item['body'])
-				$body = crypto_unencapsulate(json_decode($item['body'],true),$key);
-		}
-		else
-			$body = $item['body'];
+		$body = $item['body'];
 
 		$body = preg_replace('/\[share(.*?)\[\/share\]/','',$body);
 
@@ -2638,11 +2628,6 @@ function tgroup_check($uid,$item) {
 
 	$body = $item['body'];
 
-	if(array_key_exists('item_obscured',$item) && intval($item['item_obscured']) && $body) {
-		$key = get_config('system','prvkey');
-		$body = crypto_unencapsulate(json_decode($body,true),$key);
-	}
-
 	$body = preg_replace('/\[share(.*?)\[\/share\]/','',$body);
 
 //	$pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/';
@@ -2736,7 +2721,6 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 	$item_origin = 1;
 	$item_uplink = 0;
 	$item_nocomment = 0;
-	$item_obscured = 0;
 
 	$flag_bits = $item['item_flags'];
 
@@ -2759,11 +2743,10 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
 	$title = $item['title'];
 	$body  = $item['body'];
 
-	$r = q("update item set item_uplink = %d, item_nocomment = %d, item_obscured = %d, item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
+	$r = q("update item set item_uplink = %d, item_nocomment = %d, item_flags = %d, owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
 		deny_cid = '%s', deny_gid = '%s', item_private = %d, public_policy = '%s', comment_policy = '%s', title = '%s', body = '%s', item_wall = %d, item_origin = %d  where id = %d",
 		intval($item_uplink),
 		intval($item_nocomment),
-		intval($item_obscured),
 		intval($flag_bits),
 		dbesc($channel['channel_hash']),
 		dbesc($channel['channel_allow_cid']),
diff --git a/include/text.php b/include/text.php
index d276595ae..1a4e2b223 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1372,20 +1372,7 @@ function link_compare($a, $b) {
 
 
 function unobscure(&$item) {
-	if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
-		$key = get_config('system','prvkey');
-		if($item['title'])
-			$item['title'] = crypto_unencapsulate(json_decode($item['title'],true),$key);
-		if($item['body'])
-			$item['body'] = crypto_unencapsulate(json_decode($item['body'],true),$key);
-		if(get_config('system','item_cache')) {
-			q("update item set title = '%s', body = '%s', item_obscured = 0 where id = %d",
-				dbesc($item['title']),
-				dbesc($item['body']),
-				intval($item['id'])
-			);
-		}
-	}
+	return;
 }
 
 function unobscure_mail(&$item) {

From 02ea713d6a12b767250eba12918018bb72cf4e38 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 20 Apr 2017 21:25:37 -0700
Subject: [PATCH 130/299] make it easier to hook into feed headers in the
 future

---
 include/feedutils.php | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 03eb1f256..079d57072 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -63,7 +63,7 @@ function get_public_feed($channel, $params) {
  */
 function get_feed_for($channel, $observer_hash, $params) {
 
-	if(! channel)
+	if(! $channel)
 		http_status_exit(401);
 
 	if($params['pages']) {
@@ -73,19 +73,6 @@ function get_feed_for($channel, $observer_hash, $params) {
 		if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_stream'))
 			http_status_exit(403);
 	}
-	$items = items_fetch(array(
-		'wall' => '1',
-		'datequery' => $params['end'],
-		'datequery2' => $params['begin'],
-		'start' => $params['start'],          // FIXME
-		'records' => $params['records'],      // FIXME
-		'direction' => $params['direction'],  // FIXME
-		'pages' => $params['pages'],
-		'order' => 'post',
-		'top'   => $params['top'],
-		'cat'   => $params['cat']
-		), $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module);
-
 
 	$feed_template = get_markup_template('atom_feed.tpl');
 
@@ -112,8 +99,27 @@ function get_feed_for($channel, $observer_hash, $params) {
 	));
 
 
+	$x = [ 'xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params ];
+	call_hooks('atom_feed_top',$x);
+
+	$atom = $x['xml'];
+
+	// a much simpler interface
 	call_hooks('atom_feed', $atom);
 
+	$items = items_fetch(array(
+		'wall' => '1',
+		'datequery' => $params['end'],
+		'datequery2' => $params['begin'],
+		'start' => $params['start'],          // FIXME
+		'records' => $params['records'],      // FIXME
+		'direction' => $params['direction'],  // FIXME
+		'pages' => $params['pages'],
+		'order' => 'post',
+		'top'   => $params['top'],
+		'cat'   => $params['cat']
+		), $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module);
+
 	if($items) {
 		$type = 'html';
 		foreach($items as $item) {

From c2ec3b0bf44847d19d95f568c2b23c50e920eb00 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 22 Apr 2017 23:15:00 -0700
Subject: [PATCH 131/299] if there is no site record, site_dead won't be 0, in
 a left join it will in fact be null. As long as it isn't 1, we should attempt
 delivery.

---
 Zotlabs/Daemon/Notifier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 48f1d2757..3afe1a5dc 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -480,7 +480,7 @@ class Notifier {
 		// Let's reduce this to a set of hubs; checking that the site is not dead.
 
 		$r = q("select hubloc.*, site.site_crypto from hubloc left join site on site_url = hubloc_url where hubloc_hash in (" . implode(',',$recipients) . ") 
-			and hubloc_error = 0 and hubloc_deleted = 0 and site_dead = 0"
+			and hubloc_error = 0 and hubloc_deleted = 0 and ( site_dead = 0 OR site_dead is null ) "
 		);		
  
 

From f1c6fd08c462b663a26cf58cfd81591129057c41 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 23 Apr 2017 20:28:04 -0700
Subject: [PATCH 132/299] database upgrade

---
 include/items.php        |   5 +-
 include/text.php         |   2 +-
 install/schema_mysql.sql | 423 ++++++++++++++++++++-------------------
 3 files changed, 214 insertions(+), 216 deletions(-)

diff --git a/include/items.php b/include/items.php
index c71e8011d..a4862208e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4263,10 +4263,7 @@ function sync_an_item($channel_id,$item_id) {
 	if($r) {
 		xchan_query($r);
 		$sync_item = fetch_post_tags($r);
-		$rid = q("select * from item_id where iid = %d",
-			intval($item_id)
-		);
-		build_sync_packet($channel_d,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
+		build_sync_packet($channel_d,array('item' => array(encode_item($sync_item[0],true))));
 	}
 }
 
diff --git a/include/text.php b/include/text.php
index 1a4e2b223..d9ee40fa9 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2930,7 +2930,7 @@ function pdl_selector($uid, $current='') {
 
 	$sql_extra = item_permissions_sql($uid);
 
-	$r = q("select iconfig.*, mid from item_id left join item on iconfig.iid = item.id
+	$r = q("select iconfig.*, mid from iconfig left join item on iconfig.iid = item.id
 		where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' $sql_extra order by v asc",
 		intval($uid)
 	);
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 7964c2a6a..19b8efc21 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `abook` (
   `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `abook_account` int(10) unsigned NOT NULL DEFAULT '0',
   `abook_channel` int(10) unsigned NOT NULL DEFAULT '0',
-  `abook_xchan` char(255) NOT NULL DEFAULT '',
+  `abook_xchan` char(191) NOT NULL DEFAULT '',
   `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99',
   `abook_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `abook_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -63,8 +63,8 @@ CREATE TABLE IF NOT EXISTS `account` (
   `account_default_channel` int(10) unsigned NOT NULL DEFAULT '0',
   `account_salt` char(32) NOT NULL DEFAULT '',
   `account_password` char(255) NOT NULL DEFAULT '',
-  `account_email` char(255) NOT NULL DEFAULT '',
-  `account_external` char(255) NOT NULL DEFAULT '',
+  `account_email` char(191) NOT NULL DEFAULT '',
+  `account_external` char(191) NOT NULL DEFAULT '',
   `account_language` char(16) NOT NULL DEFAULT 'en',
   `account_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `account_lastlog` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -92,7 +92,7 @@ CREATE TABLE IF NOT EXISTS `account` (
 
 CREATE TABLE IF NOT EXISTS `addon` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `aname` char(255) NOT NULL DEFAULT '',
+  `aname` char(191) NOT NULL DEFAULT '',
   `version` char(255) NOT NULL DEFAULT '',
   `installed` tinyint(1) NOT NULL DEFAULT '0',
   `hidden` tinyint(1) NOT NULL DEFAULT '0',
@@ -106,22 +106,22 @@ CREATE TABLE IF NOT EXISTS `addon` (
 
 CREATE TABLE IF NOT EXISTS `app` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `app_id` char(255) NOT NULL DEFAULT '',
+  `app_id` char(191) NOT NULL DEFAULT '',
   `app_sig` char(255) NOT NULL DEFAULT '',
   `app_author` char(255) NOT NULL DEFAULT '',
-  `app_name` char(255) NOT NULL DEFAULT '',
+  `app_name` char(191) NOT NULL DEFAULT '',
   `app_desc` text NOT NULL DEFAULT '',
-  `app_url` char(255) NOT NULL DEFAULT '',
-  `app_photo` char(255) NOT NULL DEFAULT '',
-  `app_version` char(255) NOT NULL DEFAULT '',
+  `app_url` char(191) NOT NULL DEFAULT '',
+  `app_photo` char(191) NOT NULL DEFAULT '',
+  `app_version` char(191) NOT NULL DEFAULT '',
   `app_channel` int(11) NOT NULL DEFAULT '0',
   `app_addr` char(255) NOT NULL DEFAULT '',
-  `app_price` char(255) NOT NULL DEFAULT '',
+  `app_price` char(191) NOT NULL DEFAULT '',
   `app_page` char(255) NOT NULL DEFAULT '',
   `app_requires` char(255) NOT NULL DEFAULT '',
   `app_deleted` int(11) NOT NULL DEFAULT '0',
   `app_system` int(11) NOT NULL DEFAULT '0',
-  `app_plugin` char(255) NOT NULL DEFAULT '',
+  `app_plugin` char(191) NOT NULL DEFAULT '',
   `app_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `app_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`id`),
@@ -143,8 +143,8 @@ CREATE TABLE IF NOT EXISTS `atoken` (
   `atoken_id` int(11) NOT NULL AUTO_INCREMENT,
   `atoken_aid` int(11) NOT NULL DEFAULT 0,
   `atoken_uid` int(11) NOT NULL DEFAULT 0,
-  `atoken_name` char(255) NOT NULL DEFAULT '',
-  `atoken_token` char(255) NOT NULL DEFAULT '',
+  `atoken_name` char(191) NOT NULL DEFAULT '',
+  `atoken_token` char(191) NOT NULL DEFAULT '',
   `atoken_expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`atoken_id`),
   KEY `atoken_aid` (`atoken_aid`),
@@ -159,13 +159,13 @@ CREATE TABLE IF NOT EXISTS `attach` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `hash` char(64) NOT NULL DEFAULT '',
-  `creator` char(128) NOT NULL DEFAULT '',
-  `filename` char(255) NOT NULL DEFAULT '',
-  `filetype` char(64) NOT NULL DEFAULT '',
+  `hash` char(191) NOT NULL DEFAULT '',
+  `creator` char(191) NOT NULL DEFAULT '',
+  `filename` char(191) NOT NULL DEFAULT '',
+  `filetype` char(191) NOT NULL DEFAULT '',
   `filesize` int(10) unsigned NOT NULL DEFAULT '0',
   `revision` int(10) unsigned NOT NULL DEFAULT '0',
-  `folder` char(64) NOT NULL DEFAULT '',
+  `folder` char(191) NOT NULL DEFAULT '',
   `flags` int(10) unsigned NOT NULL DEFAULT '0',
   `is_dir` tinyint(1) NOT NULL DEFAULT '0',
   `is_photo` tinyint(1) NOT NULL DEFAULT '0',
@@ -207,7 +207,7 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `cache` (
-  `k` char(255) NOT NULL DEFAULT '',
+  `k` char(191) NOT NULL DEFAULT '',
   `v` text NOT NULL,
   `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`k`)
@@ -217,14 +217,14 @@ CREATE TABLE IF NOT EXISTS `cal` (
   `cal_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `cal_aid` int(10) unsigned NOT NULL DEFAULT '0',
   `cal_uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `cal_hash` varchar(255) NOT NULL DEFAULT '',
-  `cal_name` varchar(255) NOT NULL DEFAULT '',
+  `cal_hash` varchar(191) NOT NULL DEFAULT '',
+  `cal_name` varchar(191) NOT NULL DEFAULT '',
   `uri` varchar(255) NOT NULL DEFAULT '',
   `logname` varchar(255) NOT NULL DEFAULT '',
   `pass` varchar(255) NOT NULL DEFAULT '',
   `ctag` varchar(255) NOT NULL DEFAULT '',
   `synctoken` varchar(255) NOT NULL DEFAULT '',
-  `cal_types` varchar(255) NOT NULL DEFAULT '',
+  `cal_types` varchar(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`cal_id`),
   KEY `cal_aid` (`cal_aid`),
   KEY `cal_uid` (`cal_uid`),
@@ -237,14 +237,14 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0',
   `channel_primary` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `channel_name` char(255) NOT NULL DEFAULT '',
-  `channel_address` char(255) NOT NULL DEFAULT '',
-  `channel_guid` char(255) NOT NULL DEFAULT '',
+  `channel_name` char(191) NOT NULL DEFAULT '',
+  `channel_address` char(191) NOT NULL DEFAULT '',
+  `channel_guid` char(191) NOT NULL DEFAULT '',
   `channel_guid_sig` text NOT NULL,
-  `channel_hash` char(255) NOT NULL DEFAULT '',
+  `channel_hash` char(191) NOT NULL DEFAULT '',
   `channel_timezone` char(128) NOT NULL DEFAULT 'UTC',
-  `channel_location` char(255) NOT NULL DEFAULT '',
-  `channel_theme` char(255) NOT NULL DEFAULT '',
+  `channel_location` char(191) NOT NULL DEFAULT '',
+  `channel_theme` char(191) NOT NULL DEFAULT '',
   `channel_startpage` char(255) NOT NULL DEFAULT '',
   `channel_pubkey` text NOT NULL,
   `channel_prvkey` text NOT NULL,
@@ -257,18 +257,18 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_max_friend_req` int(10) unsigned NOT NULL DEFAULT '10',
   `channel_expire_days` int(11) NOT NULL DEFAULT '0',
   `channel_passwd_reset` char(255) NOT NULL DEFAULT '',
-  `channel_default_group` char(255) NOT NULL DEFAULT '',
+  `channel_default_group` char(191) NOT NULL DEFAULT '',
   `channel_allow_cid` mediumtext NOT NULL,
   `channel_allow_gid` mediumtext NOT NULL,
   `channel_deny_cid` mediumtext NOT NULL,
   `channel_deny_gid` mediumtext NOT NULL,
   `channel_removed` tinyint(1) NOT NULL DEFAULT '0',
   `channel_system` tinyint(1) NOT NULL DEFAULT '0',
-  `channel_moved` char(255) NOT NULL DEFAULT '',
+  `channel_moved` char(191) NOT NULL DEFAULT '',
   `channel_password` varchar(255) NOT NULL,
   `channel_salt` varchar(255) NOT NULL,
   PRIMARY KEY (`channel_id`),
-  UNIQUE KEY `channel_address_unique` (`channel_address`),
+  KEY `channel_address` (`channel_address`),
   KEY `channel_account_id` (`channel_account_id`),
   KEY `channel_primary` (`channel_primary`),
   KEY `channel_name` (`channel_name`),
@@ -294,7 +294,7 @@ CREATE TABLE IF NOT EXISTS `channel` (
 CREATE TABLE IF NOT EXISTS `chat` (
   `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `chat_room` int(10) unsigned NOT NULL DEFAULT '0',
-  `chat_xchan` char(255) NOT NULL DEFAULT '',
+  `chat_xchan` char(191) NOT NULL DEFAULT '',
   `chat_text` mediumtext NOT NULL,
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`chat_id`),
@@ -306,9 +306,9 @@ CREATE TABLE IF NOT EXISTS `chat` (
 CREATE TABLE IF NOT EXISTS `chatpresence` (
   `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `cp_room` int(10) unsigned NOT NULL DEFAULT '0',
-  `cp_xchan` char(255) NOT NULL DEFAULT '',
+  `cp_xchan` char(191) NOT NULL DEFAULT '',
   `cp_last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `cp_status` char(255) NOT NULL DEFAULT '',
+  `cp_status` char(191) NOT NULL DEFAULT '',
   `cp_client` char(128) NOT NULL DEFAULT '',
   PRIMARY KEY (`cp_id`),
   KEY `cp_room` (`cp_room`),
@@ -321,7 +321,7 @@ CREATE TABLE IF NOT EXISTS `chatroom` (
   `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `cr_aid` int(10) unsigned NOT NULL DEFAULT '0',
   `cr_uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `cr_name` char(255) NOT NULL DEFAULT '',
+  `cr_name` char(191) NOT NULL DEFAULT '',
   `cr_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `cr_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `cr_expire` int(10) unsigned NOT NULL DEFAULT '0',
@@ -339,8 +339,8 @@ CREATE TABLE IF NOT EXISTS `chatroom` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `clients` (
-  `client_id` varchar(20) NOT NULL DEFAULT '',
-  `pw` varchar(20) NOT NULL DEFAULT '',
+  `client_id` varchar(191) NOT NULL DEFAULT '',
+  `pw` varchar(191) NOT NULL DEFAULT '',
   `redirect_uri` varchar(200) NOT NULL DEFAULT '',
   `clname` text,
   `icon` text,
@@ -350,8 +350,8 @@ CREATE TABLE IF NOT EXISTS `clients` (
 
 CREATE TABLE IF NOT EXISTS `config` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
-  `k` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
+  `cat` char(191) NOT NULL DEFAULT '',
+  `k` char(191) NOT NULL DEFAULT '',
   `v` text NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `access` (`cat`,`k`)
@@ -359,10 +359,10 @@ CREATE TABLE IF NOT EXISTS `config` (
 
 CREATE TABLE IF NOT EXISTS `conv` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `guid` char(255) NOT NULL DEFAULT '',
+  `guid` char(191) NOT NULL DEFAULT '',
   `recips` mediumtext NOT NULL,
   `uid` int(11) NOT NULL DEFAULT '0',
-  `creator` char(255) NOT NULL DEFAULT '',
+  `creator` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `subject` mediumtext NOT NULL,
@@ -374,13 +374,13 @@ CREATE TABLE IF NOT EXISTS `conv` (
 CREATE TABLE IF NOT EXISTS `dreport` (
   `dreport_id` int(11) NOT NULL AUTO_INCREMENT,
   `dreport_channel` int(11) NOT NULL DEFAULT '0',
-  `dreport_mid` char(255) NOT NULL DEFAULT '',
-  `dreport_site` char(255) NOT NULL DEFAULT '',
-  `dreport_recip` char(255) NOT NULL DEFAULT '',
-  `dreport_result` char(255) NOT NULL DEFAULT '',
+  `dreport_mid` char(191) NOT NULL DEFAULT '',
+  `dreport_site` char(191) NOT NULL DEFAULT '',
+  `dreport_recip` char(191) NOT NULL DEFAULT '',
+  `dreport_result` char(191) NOT NULL DEFAULT '',
   `dreport_time` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `dreport_xchan` char(255) NOT NULL DEFAULT '',
-  `dreport_queue` char(255) NOT NULL DEFAULT '',
+  `dreport_xchan` char(191) NOT NULL DEFAULT '',
+  `dreport_queue` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`dreport_id`),
   KEY `dreport_mid` (`dreport_mid`),
   KEY `dreport_site` (`dreport_site`),
@@ -395,8 +395,8 @@ CREATE TABLE IF NOT EXISTS `event` (
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
   `uid` int(11) NOT NULL DEFAULT '0',
   `cal_id` int(11) unsigned NOT NULL DEFAULT '0',
-  `event_xchan` char(255) NOT NULL DEFAULT '',
-  `event_hash` char(255) NOT NULL DEFAULT '',
+  `event_xchan` char(191) NOT NULL DEFAULT '',
+  `event_hash` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `dtstart` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -404,7 +404,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   `summary` text NOT NULL,
   `description` text NOT NULL,
   `location` text NOT NULL,
-  `etype` char(255) NOT NULL DEFAULT '',
+  `etype` char(191) NOT NULL DEFAULT '',
   `nofinish` tinyint(1) NOT NULL DEFAULT '0',
   `adjust` tinyint(1) NOT NULL DEFAULT '1',
   `dismissed` tinyint(1) NOT NULL DEFAULT '0',
@@ -412,7 +412,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
   `deny_gid` mediumtext NOT NULL,
-  `event_status` char(255) NOT NULL DEFAULT '',
+  `event_status` char(191) NOT NULL DEFAULT '',
   `event_status_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `event_percent` smallint(6) NOT NULL DEFAULT '0',
   `event_repeat` text NOT NULL,
@@ -438,11 +438,11 @@ CREATE TABLE IF NOT EXISTS `event` (
 
 CREATE TABLE IF NOT EXISTS `groups` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `hash` char(255) NOT NULL DEFAULT '',
+  `hash` char(191) NOT NULL DEFAULT '',
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
   `visible` tinyint(1) NOT NULL DEFAULT '0',
   `deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `gname` char(255) NOT NULL DEFAULT '',
+  `gname` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `visible` (`visible`),
@@ -455,7 +455,7 @@ CREATE TABLE IF NOT EXISTS `group_member` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
   `gid` int(10) unsigned NOT NULL DEFAULT '0',
-  `xchan` char(255) NOT NULL DEFAULT '',
+  `xchan` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `gid` (`gid`),
@@ -464,9 +464,9 @@ CREATE TABLE IF NOT EXISTS `group_member` (
 
 CREATE TABLE IF NOT EXISTS `hook` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `hook` char(255) NOT NULL DEFAULT '',
-  `file` char(255) NOT NULL DEFAULT '',
-  `fn` char(255) NOT NULL DEFAULT '',
+  `hook` char(191) NOT NULL DEFAULT '',
+  `file` char(191) NOT NULL DEFAULT '',
+  `fn` char(191) NOT NULL DEFAULT '',
   `priority` smallint NOT NULL DEFAULT '0',
   `hook_version` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
@@ -477,18 +477,18 @@ CREATE TABLE IF NOT EXISTS `hook` (
 
 CREATE TABLE IF NOT EXISTS `hubloc` (
   `hubloc_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `hubloc_guid` char(255) NOT NULL DEFAULT '',
+  `hubloc_guid` char(191) NOT NULL DEFAULT '',
   `hubloc_guid_sig` text NOT NULL,
-  `hubloc_hash` char(255) NOT NULL DEFAULT '',
-  `hubloc_addr` char(255) NOT NULL DEFAULT '',
+  `hubloc_hash` char(191) NOT NULL DEFAULT '',
+  `hubloc_addr` char(191) NOT NULL DEFAULT '',
   `hubloc_network` char(32) NOT NULL DEFAULT '',
   `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `hubloc_status` int(10) unsigned NOT NULL DEFAULT '0',
-  `hubloc_url` char(255) NOT NULL DEFAULT '',
+  `hubloc_url` char(191) NOT NULL DEFAULT '',
   `hubloc_url_sig` text NOT NULL,
-  `hubloc_host` char(255) NOT NULL DEFAULT '',
-  `hubloc_callback` char(255) NOT NULL DEFAULT '',
-  `hubloc_connect` char(255) NOT NULL DEFAULT '',
+  `hubloc_host` char(191) NOT NULL DEFAULT '',
+  `hubloc_callback` char(191) NOT NULL DEFAULT '',
+  `hubloc_connect` char(191) NOT NULL DEFAULT '',
   `hubloc_sitekey` text NOT NULL,
   `hubloc_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `hubloc_connected` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -499,6 +499,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
   PRIMARY KEY (`hubloc_id`),
   KEY `hubloc_url` (`hubloc_url`),
   KEY `hubloc_guid` (`hubloc_guid`),
+  KEY `hubloc_hash` (`hubloc_hash`),
   KEY `hubloc_flags` (`hubloc_flags`),
   KEY `hubloc_connect` (`hubloc_connect`),
   KEY `hubloc_host` (`hubloc_host`),
@@ -517,8 +518,8 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
 CREATE TABLE IF NOT EXISTS `iconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `iid` int(11) NOT NULL DEFAULT '0',
-  `cat` char(255) NOT NULL DEFAULT '',
-  `k` char(255) NOT NULL DEFAULT '',
+  `cat` char(191) NOT NULL DEFAULT '',
+  `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
   `sharing` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
@@ -532,10 +533,10 @@ CREATE TABLE IF NOT EXISTS `issue` (
   `issue_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `issue_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `issue_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `issue_assigned` char(255) NOT NULL DEFAULT '',
+  `issue_assigned` char(191) NOT NULL DEFAULT '',
   `issue_priority` int(11) NOT NULL DEFAULT '0',
   `issue_status` int(11) NOT NULL DEFAULT '0',
-  `issue_component` char(255) NOT NULL DEFAULT '',
+  `issue_component` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`issue_id`),
   KEY `issue_created` (`issue_created`),
   KEY `issue_updated` (`issue_updated`),
@@ -547,12 +548,12 @@ CREATE TABLE IF NOT EXISTS `issue` (
 
 CREATE TABLE IF NOT EXISTS `item` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
+  `mid` char(191) NOT NULL DEFAULT '',
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
   `parent` int(10) unsigned NOT NULL DEFAULT '0',
-  `parent_mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
-  `thr_parent` char(255) NOT NULL DEFAULT '',
+  `parent_mid` char(191) NOT NULL DEFAULT '',
+  `thr_parent` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -560,34 +561,34 @@ CREATE TABLE IF NOT EXISTS `item` (
   `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `comments_closed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `owner_xchan` char(255) NOT NULL DEFAULT '',
-  `author_xchan` char(255) NOT NULL DEFAULT '',
-  `source_xchan` char(255) NOT NULL DEFAULT '',
-  `mimetype` char(255) NOT NULL DEFAULT '',
+  `owner_xchan` char(191) NOT NULL DEFAULT '',
+  `author_xchan` char(191) NOT NULL DEFAULT '',
+  `source_xchan` char(191) NOT NULL DEFAULT '',
+  `mimetype` char(191) NOT NULL DEFAULT '',
   `title` text NOT NULL,
   `body` mediumtext NOT NULL,
   `html` mediumtext NOT NULL,
-  `app` char(255) NOT NULL DEFAULT '',
+  `app` char(191) NOT NULL DEFAULT '',
   `lang` char(64) NOT NULL DEFAULT '',
   `revision` int(10) unsigned NOT NULL DEFAULT '0',
-  `verb` char(255) NOT NULL DEFAULT '',
-  `obj_type` char(255) NOT NULL DEFAULT '',
+  `verb` char(191) NOT NULL DEFAULT '',
+  `obj_type` char(191) NOT NULL DEFAULT '',
   `obj` text NOT NULL,
-  `tgt_type` char(255) NOT NULL DEFAULT '',
+  `tgt_type` char(191) NOT NULL DEFAULT '',
   `target` text NOT NULL,
-  `layout_mid` char(255) NOT NULL DEFAULT '',
+  `layout_mid` char(191) NOT NULL DEFAULT '',
   `postopts` text NOT NULL,
   `route` text NOT NULL,
-  `llink` char(255) NOT NULL DEFAULT '',
-  `plink` char(255) NOT NULL DEFAULT '',
-  `resource_id` char(255) NOT NULL DEFAULT '',
+  `llink` char(191) NOT NULL DEFAULT '',
+  `plink` char(191) NOT NULL DEFAULT '',
+  `resource_id` char(191) NOT NULL DEFAULT '',
   `resource_type` char(16) NOT NULL DEFAULT '',
   `attach` mediumtext NOT NULL,
   `sig` text NOT NULL,
-  `location` char(255) NOT NULL DEFAULT '',
-  `coord` char(255) NOT NULL DEFAULT '',
-  `public_policy` char(255) NOT NULL DEFAULT '',
-  `comment_policy` char(255) NOT NULL DEFAULT '',
+  `location` char(191) NOT NULL DEFAULT '',
+  `coord` char(191) NOT NULL DEFAULT '',
+  `public_policy` char(191) NOT NULL DEFAULT '',
+  `comment_policy` char(191) NOT NULL DEFAULT '',
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -676,8 +677,8 @@ CREATE TABLE IF NOT EXISTS `item_id` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `iid` int(11) NOT NULL DEFAULT '0',
   `uid` int(11) NOT NULL DEFAULT '0',
-  `sid` char(255) NOT NULL DEFAULT '',
-  `service` char(255) NOT NULL DEFAULT '',
+  `sid` char(191) NOT NULL DEFAULT '',
+  `service` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `sid` (`sid`),
@@ -688,13 +689,13 @@ CREATE TABLE IF NOT EXISTS `item_id` (
 CREATE TABLE IF NOT EXISTS `likes` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `channel_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `liker` char(128) NOT NULL DEFAULT '',
-  `likee` char(128) NOT NULL DEFAULT '',
+  `liker` char(191) NOT NULL DEFAULT '',
+  `likee` char(191) NOT NULL DEFAULT '',
   `iid` int(11) unsigned NOT NULL DEFAULT '0',
-  `i_mid` char(255) NOT NULL DEFAULT '',
-  `verb` char(255) NOT NULL DEFAULT '',
-  `target_type` char(255) NOT NULL DEFAULT '',
-  `target_id` char(128) NOT NULL DEFAULT '',
+  `i_mid` char(191) NOT NULL DEFAULT '',
+  `verb` char(191) NOT NULL DEFAULT '',
+  `target_type` char(191) NOT NULL DEFAULT '',
+  `target_id` char(191) NOT NULL DEFAULT '',
   `target` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
   KEY `liker` (`liker`),
@@ -710,18 +711,18 @@ CREATE TABLE IF NOT EXISTS `likes` (
 CREATE TABLE IF NOT EXISTS `mail` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `convid` int(10) unsigned NOT NULL DEFAULT '0',
-  `conv_guid` char(255) NOT NULL DEFAULT '',
+  `conv_guid` char(191) NOT NULL DEFAULT '',
   `mail_flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `from_xchan` char(255) NOT NULL DEFAULT '',
-  `to_xchan` char(255) NOT NULL DEFAULT '',
+  `from_xchan` char(191) NOT NULL DEFAULT '',
+  `to_xchan` char(191) NOT NULL DEFAULT '',
   `account_id` int(10) unsigned NOT NULL DEFAULT '0',
   `channel_id` int(10) unsigned NOT NULL DEFAULT '0',
   `title` text NOT NULL,
   `body` mediumtext NOT NULL,
   `sig` text NOT NULL,
   `attach` mediumtext NOT NULL,
-  `mid` char(255) NOT NULL DEFAULT '',
-  `parent_mid` char(255) NOT NULL DEFAULT '',
+  `mid` char(191) NOT NULL DEFAULT '',
+  `parent_mid` char(191) NOT NULL DEFAULT '',
   `mail_deleted` tinyint(4) NOT NULL DEFAULT '0',
   `mail_replied` tinyint(4) NOT NULL DEFAULT '0',
   `mail_isreply` tinyint(4) NOT NULL DEFAULT '0',
@@ -753,8 +754,8 @@ CREATE TABLE IF NOT EXISTS `mail` (
 CREATE TABLE IF NOT EXISTS `menu` (
   `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `menu_name` char(255) NOT NULL DEFAULT '',
-  `menu_desc` char(255) NOT NULL DEFAULT '',
+  `menu_name` char(191) NOT NULL DEFAULT '',
+  `menu_desc` char(191) NOT NULL DEFAULT '',
   `menu_flags` int(11) NOT NULL DEFAULT '0',
   `menu_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `menu_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -768,8 +769,8 @@ CREATE TABLE IF NOT EXISTS `menu` (
 
 CREATE TABLE IF NOT EXISTS `menu_item` (
   `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `mitem_link` char(255) NOT NULL DEFAULT '',
-  `mitem_desc` char(255) NOT NULL DEFAULT '',
+  `mitem_link` char(191) NOT NULL DEFAULT '',
+  `mitem_desc` char(191) NOT NULL DEFAULT '',
   `mitem_flags` int(11) NOT NULL DEFAULT '0',
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
@@ -786,19 +787,19 @@ CREATE TABLE IF NOT EXISTS `menu_item` (
 
 CREATE TABLE IF NOT EXISTS `notify` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `hash` char(64) NOT NULL DEFAULT '',
-  `xname` char(255) NOT NULL DEFAULT '',
-  `url` char(255) NOT NULL DEFAULT '',
-  `photo` char(255) NOT NULL DEFAULT '',
+  `hash` char(191) NOT NULL DEFAULT '',
+  `xname` char(191) NOT NULL DEFAULT '',
+  `url` char(191) NOT NULL DEFAULT '',
+  `photo` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `msg` mediumtext NOT NULL,
   `aid` int(11) NOT NULL DEFAULT '0',
   `uid` int(11) NOT NULL DEFAULT '0',
-  `link` char(255) NOT NULL DEFAULT '',
-  `parent` char(255) NOT NULL DEFAULT '',
+  `link` char(191) NOT NULL DEFAULT '',
+  `parent` char(191) NOT NULL DEFAULT '',
   `seen` tinyint(1) NOT NULL DEFAULT '0',
   `ntype` int(11) NOT NULL DEFAULT '0',
-  `verb` char(255) NOT NULL DEFAULT '',
+  `verb` char(191) NOT NULL DEFAULT '',
   `otype` char(16) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `ntype` (`ntype`),
@@ -815,13 +816,13 @@ CREATE TABLE IF NOT EXISTS `notify` (
 CREATE TABLE IF NOT EXISTS `obj` (
   `obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `obj_page` char(64) NOT NULL DEFAULT '',
-  `obj_verb` char(255) NOT NULL DEFAULT '',
+  `obj_verb` char(191) NOT NULL DEFAULT '',
   `obj_type` int(10) unsigned NOT NULL DEFAULT '0',
-  `obj_obj` char(255) NOT NULL DEFAULT '',
+  `obj_obj` char(191) NOT NULL DEFAULT '',
   `obj_channel` int(10) unsigned NOT NULL DEFAULT '0',
-  `obj_term` char(255) NOT NULL DEFAULT '',
-  `obj_url` char(255) NOT NULL DEFAULT '',
-  `obj_imgurl` char(255) NOT NULL DEFAULT '',
+  `obj_term` char(191) NOT NULL DEFAULT '',
+  `obj_url` char(191) NOT NULL DEFAULT '',
+  `obj_imgurl` char(191) NOT NULL DEFAULT '',
   `obj_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `obj_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `obj_quantity` int(11) NOT NULL DEFAULT '0',
@@ -844,11 +845,11 @@ CREATE TABLE IF NOT EXISTS `obj` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `outq` (
-  `outq_hash` char(255) NOT NULL,
+  `outq_hash` char(191) NOT NULL,
   `outq_account` int(10) unsigned NOT NULL DEFAULT '0',
   `outq_channel` int(10) unsigned NOT NULL DEFAULT '0',
   `outq_driver` char(32) NOT NULL DEFAULT '',
-  `outq_posturl` char(255) NOT NULL DEFAULT '',
+  `outq_posturl` char(191) NOT NULL DEFAULT '',
   `outq_async` tinyint(1) NOT NULL DEFAULT '0',
   `outq_delivered` tinyint(1) NOT NULL DEFAULT '0',
   `outq_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -872,8 +873,8 @@ CREATE TABLE IF NOT EXISTS `outq` (
 CREATE TABLE IF NOT EXISTS `pconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL DEFAULT '0',
-  `cat` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
-  `k` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
+  `cat` char(100) NOT NULL DEFAULT '',
+  `k` char(100) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `access` (`uid`,`cat`,`k`)
@@ -884,14 +885,14 @@ CREATE TABLE IF NOT EXISTS `photo` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `xchan` char(255) NOT NULL DEFAULT '',
-  `resource_id` char(255) NOT NULL DEFAULT '',
+  `xchan` char(191) NOT NULL DEFAULT '',
+  `resource_id` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `title` char(255) NOT NULL DEFAULT '',
+  `title` char(191) NOT NULL DEFAULT '',
   `description` text NOT NULL,
-  `album` char(255) NOT NULL DEFAULT '',
-  `filename` char(255) NOT NULL DEFAULT '',
+  `album` char(191) NOT NULL DEFAULT '',
+  `filename` char(191) NOT NULL DEFAULT '',
   `mimetype` char(128) NOT NULL DEFAULT 'image/jpeg',
   `height` smallint(6) NOT NULL DEFAULT '0',
   `width` smallint(6) NOT NULL DEFAULT '0',
@@ -950,10 +951,10 @@ CREATE TABLE IF NOT EXISTS `poll_elm` (
 
 CREATE TABLE IF NOT EXISTS `profdef` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `field_name` char(255) NOT NULL DEFAULT '',
+  `field_name` char(191) NOT NULL DEFAULT '',
   `field_type` char(16) NOT NULL DEFAULT '',
-  `field_desc` char(255) NOT NULL DEFAULT '',
-  `field_help` char(255) NOT NULL DEFAULT '',
+  `field_desc` char(191) NOT NULL DEFAULT '',
+  `field_help` char(191) NOT NULL DEFAULT '',
   `field_inputs` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
   KEY `field_name` (`field_name`)
@@ -962,8 +963,8 @@ CREATE TABLE IF NOT EXISTS `profdef` (
 CREATE TABLE IF NOT EXISTS `profext` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `channel_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `hash` char(255) NOT NULL DEFAULT '',
-  `k` char(255) NOT NULL DEFAULT '',
+  `hash` char(191) NOT NULL DEFAULT '',
+  `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
   KEY `channel_id` (`channel_id`),
@@ -976,32 +977,32 @@ CREATE TABLE IF NOT EXISTS `profile` (
   `profile_guid` char(64) NOT NULL DEFAULT '',
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
   `uid` int(11) NOT NULL DEFAULT '0',
-  `profile_name` char(255) NOT NULL DEFAULT '',
+  `profile_name` char(191) NOT NULL DEFAULT '',
   `is_default` tinyint(1) NOT NULL DEFAULT '0',
   `hide_friends` tinyint(1) NOT NULL DEFAULT '0',
-  `fullname` char(255) NOT NULL DEFAULT '',
-  `pdesc` char(255) NOT NULL DEFAULT '',
+  `fullname` char(191) NOT NULL DEFAULT '',
+  `pdesc` char(191) NOT NULL DEFAULT '',
   `chandesc` text NOT NULL,
   `dob` char(32) NOT NULL DEFAULT '0000-00-00',
-  `dob_tz` char(255) NOT NULL DEFAULT 'UTC',
-  `address` char(255) NOT NULL DEFAULT '',
-  `locality` char(255) NOT NULL DEFAULT '',
-  `region` char(255) NOT NULL DEFAULT '',
+  `dob_tz` char(191) NOT NULL DEFAULT 'UTC',
+  `address` char(191) NOT NULL DEFAULT '',
+  `locality` char(191) NOT NULL DEFAULT '',
+  `region` char(191) NOT NULL DEFAULT '',
   `postal_code` char(32) NOT NULL DEFAULT '',
-  `country_name` char(255) NOT NULL DEFAULT '',
-  `hometown` char(255) NOT NULL DEFAULT '',
+  `country_name` char(191) NOT NULL DEFAULT '',
+  `hometown` char(191) NOT NULL DEFAULT '',
   `gender` char(32) NOT NULL DEFAULT '',
-  `marital` char(255) NOT NULL DEFAULT '',
+  `marital` char(191) NOT NULL DEFAULT '',
   `partner` text NOT NULL,
   `howlong` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `sexual` char(255) NOT NULL DEFAULT '',
-  `politic` char(255) NOT NULL DEFAULT '',
-  `religion` char(255) NOT NULL DEFAULT '',
+  `sexual` char(191) NOT NULL DEFAULT '',
+  `politic` char(191) NOT NULL DEFAULT '',
+  `religion` char(191) NOT NULL DEFAULT '',
   `keywords` text NOT NULL,
   `likes` text NOT NULL,
   `dislikes` text NOT NULL,
   `about` text NOT NULL,
-  `summary` char(255) NOT NULL DEFAULT '',
+  `summary` char(191) NOT NULL DEFAULT '',
   `music` text NOT NULL,
   `book` text NOT NULL,
   `tv` text NOT NULL,
@@ -1012,9 +1013,9 @@ CREATE TABLE IF NOT EXISTS `profile` (
   `education` text NOT NULL,
   `contact` text NOT NULL,
   `channels` text NOT NULL,
-  `homepage` char(255) NOT NULL DEFAULT '',
-  `photo` char(255) NOT NULL DEFAULT '',
-  `thumb` char(255) NOT NULL DEFAULT '',
+  `homepage` char(191) NOT NULL DEFAULT '',
+  `photo` char(191) NOT NULL DEFAULT '',
+  `thumb` char(191) NOT NULL DEFAULT '',
   `publish` tinyint(1) NOT NULL DEFAULT '0',
   `profile_vcard` text NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
@@ -1038,8 +1039,8 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
   `cid` int(10) unsigned NOT NULL DEFAULT '0',
-  `dfrn_id` char(255) NOT NULL DEFAULT '',
-  `sec` char(255) NOT NULL DEFAULT '',
+  `dfrn_id` char(191) NOT NULL DEFAULT '',
+  `sec` char(191) NOT NULL DEFAULT '',
   `expire` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
@@ -1051,10 +1052,10 @@ CREATE TABLE IF NOT EXISTS `profile_check` (
 
 CREATE TABLE IF NOT EXISTS `register` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `hash` char(255) NOT NULL DEFAULT '',
+  `hash` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `password` char(255) NOT NULL DEFAULT '',
+  `password` char(191) NOT NULL DEFAULT '',
   `lang` char(16) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `hash` (`hash`),
@@ -1064,7 +1065,7 @@ CREATE TABLE IF NOT EXISTS `register` (
 
 CREATE TABLE IF NOT EXISTS `session` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `sid` char(255) NOT NULL DEFAULT '',
+  `sid` char(191) NOT NULL DEFAULT '',
   `sess_data` text NOT NULL,
   `expire` bigint(20) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
@@ -1076,7 +1077,7 @@ CREATE TABLE IF NOT EXISTS `shares` (
   `share_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `share_type` int(11) NOT NULL DEFAULT '0',
   `share_target` int(10) unsigned NOT NULL DEFAULT '0',
-  `share_xchan` char(255) NOT NULL DEFAULT '',
+  `share_xchan` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`share_id`),
   KEY `share_type` (`share_type`),
   KEY `share_target` (`share_target`),
@@ -1089,28 +1090,28 @@ CREATE TABLE IF NOT EXISTS `sign` (
   `retract_iid` int(10) unsigned NOT NULL DEFAULT '0',
   `signed_text` mediumtext NOT NULL,
   `signature` text NOT NULL,
-  `signer` char(255) NOT NULL DEFAULT '',
+  `signer` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `iid` (`iid`),
   KEY `retract_iid` (`retract_iid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `site` (
-  `site_url` char(255) NOT NULL,
+  `site_url` char(191) NOT NULL,
   `site_access` int(11) NOT NULL DEFAULT '0',
   `site_flags` int(11) NOT NULL DEFAULT '0',
   `site_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `site_pull` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `site_sync` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `site_directory` char(255) NOT NULL DEFAULT '',
+  `site_directory` char(191) NOT NULL DEFAULT '',
   `site_register` int(11) NOT NULL DEFAULT '0',
-  `site_sellpage` char(255) NOT NULL DEFAULT '',
-  `site_location` char(255) NOT NULL DEFAULT '',
-  `site_realm` char(255) NOT NULL DEFAULT '',
+  `site_sellpage` char(191) NOT NULL DEFAULT '',
+  `site_location` char(191) NOT NULL DEFAULT '',
+  `site_realm` char(191) NOT NULL DEFAULT '',
   `site_valid` smallint NOT NULL DEFAULT '0',
   `site_dead` smallint NOT NULL DEFAULT '0',
   `site_type` smallint NOT NULL DEFAULT '0',
-  `site_project` char(255) NOT NULL DEFAULT '',
+  `site_project` char(191) NOT NULL DEFAULT '',
   `site_version` varchar(32) NOT NULL DEFAULT '',
   `site_crypto` text NOT NULL DEFAULT '',
   PRIMARY KEY (`site_url`),
@@ -1131,8 +1132,8 @@ CREATE TABLE IF NOT EXISTS `site` (
 CREATE TABLE IF NOT EXISTS `source` (
   `src_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `src_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `src_channel_xchan` char(255) NOT NULL DEFAULT '',
-  `src_xchan` char(255) NOT NULL DEFAULT '',
+  `src_channel_xchan` char(191) NOT NULL DEFAULT '',
+  `src_xchan` char(191) NOT NULL DEFAULT '',
   `src_patt` mediumtext NOT NULL,
   `src_tag` mediumtext NOT NULL,
   PRIMARY KEY (`src_id`),
@@ -1143,8 +1144,8 @@ CREATE TABLE IF NOT EXISTS `source` (
 
 CREATE TABLE IF NOT EXISTS `sys_perms` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `cat` char(255) NOT NULL DEFAULT '',
-  `k` char(255) NOT NULL DEFAULT '',
+  `cat` char(191) NOT NULL DEFAULT '',
+  `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
   `public_perm` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
@@ -1157,11 +1158,11 @@ CREATE TABLE IF NOT EXISTS `term` (
   `oid` int(10) unsigned NOT NULL DEFAULT '0',
   `otype` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ttype` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `term` char(255) NOT NULL DEFAULT '',
-  `url` char(255) NOT NULL DEFAULT '',
-  `imgurl` char(255) NOT NULL DEFAULT '',
-  `term_hash` char(255) NOT NULL DEFAULT '',
-  `parent_hash` char(255) NOT NULL DEFAULT '',
+  `term` char(191) NOT NULL DEFAULT '',
+  `url` char(191) NOT NULL DEFAULT '',
+  `imgurl` char(191) NOT NULL DEFAULT '',
+  `term_hash` char(191) NOT NULL DEFAULT '',
+  `parent_hash` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`tid`),
   KEY `oid` (`oid`),
   KEY `otype` (`otype`),
@@ -1175,9 +1176,9 @@ CREATE TABLE IF NOT EXISTS `term` (
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `tokens` (
-  `id` varchar(40) NOT NULL DEFAULT '',
+  `id` varchar(191) NOT NULL DEFAULT '',
   `secret` text NOT NULL,
-  `client_id` varchar(20) NOT NULL DEFAULT '',
+  `client_id` varchar(191) NOT NULL DEFAULT '',
   `expires` bigint(20) unsigned NOT NULL DEFAULT '0',
   `auth_scope` varchar(512) NOT NULL DEFAULT '',
   `uid` int(11) NOT NULL DEFAULT '0',
@@ -1189,12 +1190,12 @@ CREATE TABLE IF NOT EXISTS `tokens` (
 
 CREATE TABLE IF NOT EXISTS `updates` (
   `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `ud_hash` char(128) NOT NULL DEFAULT '',
-  `ud_guid` char(255) NOT NULL DEFAULT '',
+  `ud_hash` char(191) NOT NULL DEFAULT '',
+  `ud_guid` char(191) NOT NULL DEFAULT '',
   `ud_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `ud_last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `ud_flags` int(11) NOT NULL DEFAULT '0',
-  `ud_addr` char(255) NOT NULL DEFAULT '',
+  `ud_addr` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`ud_id`),
   KEY `ud_date` (`ud_date`),
   KEY `ud_guid` (`ud_guid`),
@@ -1208,8 +1209,8 @@ CREATE TABLE IF NOT EXISTS `verify` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `channel` int(10) unsigned NOT NULL DEFAULT '0',
   `vtype` char(32) NOT NULL DEFAULT '',
-  `token` char(255) NOT NULL DEFAULT '',
-  `meta` char(255) NOT NULL DEFAULT '',
+  `token` char(191) NOT NULL DEFAULT '',
+  `meta` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`id`),
   KEY `channel` (`channel`),
@@ -1224,7 +1225,7 @@ CREATE TABLE IF NOT EXISTS `vote` (
   `vote_poll` int(11) NOT NULL DEFAULT '0',
   `vote_element` int(11) NOT NULL DEFAULT '0',
   `vote_result` text NOT NULL,
-  `vote_xchan` char(255) NOT NULL DEFAULT '',
+  `vote_xchan` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`vote_id`),
   UNIQUE KEY `vote_vote` (`vote_poll`,`vote_element`,`vote_xchan`),
   KEY `vote_poll` (`vote_poll`),
@@ -1232,22 +1233,22 @@ CREATE TABLE IF NOT EXISTS `vote` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xchan` (
-  `xchan_hash` char(255) NOT NULL,
-  `xchan_guid` char(255) NOT NULL DEFAULT '',
+  `xchan_hash` char(191) NOT NULL,
+  `xchan_guid` char(191) NOT NULL DEFAULT '',
   `xchan_guid_sig` text NOT NULL,
   `xchan_pubkey` text NOT NULL,
   `xchan_photo_mimetype` char(32) NOT NULL DEFAULT 'image/jpeg',
-  `xchan_photo_l` char(255) NOT NULL DEFAULT '',
-  `xchan_photo_m` char(255) NOT NULL DEFAULT '',
-  `xchan_photo_s` char(255) NOT NULL DEFAULT '',
-  `xchan_addr` char(255) NOT NULL DEFAULT '',
-  `xchan_url` char(255) NOT NULL DEFAULT '',
-  `xchan_connurl` char(255) NOT NULL DEFAULT '',
-  `xchan_follow` char(255) NOT NULL DEFAULT '',
-  `xchan_connpage` char(255) NOT NULL DEFAULT '',
-  `xchan_name` char(255) NOT NULL DEFAULT '',
-  `xchan_network` char(255) NOT NULL DEFAULT '',
-  `xchan_instance_url` char(255) NOT NULL DEFAULT '',
+  `xchan_photo_l` char(191) NOT NULL DEFAULT '',
+  `xchan_photo_m` char(191) NOT NULL DEFAULT '',
+  `xchan_photo_s` char(191) NOT NULL DEFAULT '',
+  `xchan_addr` char(191) NOT NULL DEFAULT '',
+  `xchan_url` char(191) NOT NULL DEFAULT '',
+  `xchan_connurl` char(191) NOT NULL DEFAULT '',
+  `xchan_follow` char(191) NOT NULL DEFAULT '',
+  `xchan_connpage` char(191) NOT NULL DEFAULT '',
+  `xchan_name` char(191) NOT NULL DEFAULT '',
+  `xchan_network` char(191) NOT NULL DEFAULT '',
+  `xchan_instance_url` char(191) NOT NULL DEFAULT '',
   `xchan_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `xchan_photo_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `xchan_name_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -1279,9 +1280,9 @@ CREATE TABLE IF NOT EXISTS `xchan` (
 
 CREATE TABLE IF NOT EXISTS `xchat` (
   `xchat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `xchat_url` char(255) NOT NULL DEFAULT '',
-  `xchat_desc` char(255) NOT NULL DEFAULT '',
-  `xchat_xchan` char(255) NOT NULL DEFAULT '',
+  `xchat_url` char(191) NOT NULL DEFAULT '',
+  `xchat_desc` char(191) NOT NULL DEFAULT '',
+  `xchat_xchan` char(191) NOT NULL DEFAULT '',
   `xchat_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`xchat_id`),
   KEY `xchat_url` (`xchat_url`),
@@ -1292,9 +1293,9 @@ CREATE TABLE IF NOT EXISTS `xchat` (
 
 CREATE TABLE IF NOT EXISTS `xconfig` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `xchan` char(255) NOT NULL DEFAULT '',
-  `cat` char(255) NOT NULL DEFAULT '',
-  `k` char(255) NOT NULL DEFAULT '',
+  `xchan` char(191) NOT NULL DEFAULT '',
+  `cat` char(191) NOT NULL DEFAULT '',
+  `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
   KEY `xchan` (`xchan`),
@@ -1305,7 +1306,7 @@ CREATE TABLE IF NOT EXISTS `xconfig` (
 CREATE TABLE IF NOT EXISTS `xign` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL DEFAULT '0',
-  `xchan` char(255) NOT NULL DEFAULT '',
+  `xchan` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `xchan` (`xchan`)
@@ -1313,8 +1314,8 @@ CREATE TABLE IF NOT EXISTS `xign` (
 
 CREATE TABLE IF NOT EXISTS `xlink` (
   `xlink_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `xlink_xchan` char(255) NOT NULL DEFAULT '',
-  `xlink_link` char(255) NOT NULL DEFAULT '',
+  `xlink_xchan` char(191) NOT NULL DEFAULT '',
+  `xlink_link` char(191) NOT NULL DEFAULT '',
   `xlink_rating` int(11) NOT NULL DEFAULT '0',
   `xlink_rating_text` text NOT NULL,
   `xlink_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -1340,21 +1341,21 @@ CREATE TABLE IF NOT EXISTS `xperm` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `xprof` (
-  `xprof_hash` char(255) NOT NULL,
+  `xprof_hash` char(191) NOT NULL,
   `xprof_age` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `xprof_desc` char(255) NOT NULL DEFAULT '',
+  `xprof_desc` char(191) NOT NULL DEFAULT '',
   `xprof_dob` char(12) NOT NULL DEFAULT '',
-  `xprof_gender` char(255) NOT NULL DEFAULT '',
-  `xprof_marital` char(255) NOT NULL DEFAULT '',
-  `xprof_sexual` char(255) NOT NULL DEFAULT '',
-  `xprof_locale` char(255) NOT NULL DEFAULT '',
-  `xprof_region` char(255) NOT NULL DEFAULT '',
+  `xprof_gender` char(191) NOT NULL DEFAULT '',
+  `xprof_marital` char(191) NOT NULL DEFAULT '',
+  `xprof_sexual` char(191) NOT NULL DEFAULT '',
+  `xprof_locale` char(191) NOT NULL DEFAULT '',
+  `xprof_region` char(191) NOT NULL DEFAULT '',
   `xprof_postcode` char(32) NOT NULL DEFAULT '',
-  `xprof_country` char(255) NOT NULL DEFAULT '',
+  `xprof_country` char(191) NOT NULL DEFAULT '',
   `xprof_keywords` text NOT NULL,
   `xprof_about` text NOT NULL,
-  `xprof_homepage` char(255) NOT NULL DEFAULT '',
-  `xprof_hometown` char(255) NOT NULL DEFAULT '',
+  `xprof_homepage` char(191) NOT NULL DEFAULT '',
+  `xprof_hometown` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`xprof_hash`),
   KEY `xprof_desc` (`xprof_desc`),
   KEY `xprof_dob` (`xprof_dob`),
@@ -1371,8 +1372,8 @@ CREATE TABLE IF NOT EXISTS `xprof` (
 
 CREATE TABLE IF NOT EXISTS `xtag` (
   `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `xtag_hash` char(255) NOT NULL DEFAULT '',
-  `xtag_term` char(255) NOT NULL DEFAULT '',
+  `xtag_hash` char(191) NOT NULL DEFAULT '',
+  `xtag_term` char(191) NOT NULL DEFAULT '',
   `xtag_flags` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`xtag_id`),
   KEY `xtag_term` (`xtag_term`),

From a342a5f8e062bf3b1d8cfebaaa64214c7dae49cb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 25 Apr 2017 16:36:37 -0700
Subject: [PATCH 133/299] smilies - add param to only list default emoticons

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

diff --git a/include/text.php b/include/text.php
index d9ee40fa9..14a60f060 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1166,7 +1166,7 @@ function get_mood_verbs() {
  *
  * @return Returns array with keys 'texts' and 'icons'
  */
-function list_smilies() {
+function list_smilies($default_only = false) {
 
 	$texts =  array(
 		'&lt;3',
@@ -1240,10 +1240,15 @@ function list_smilies() {
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons);
+
+	if($default_only)
+		return $params;
+
 	call_hooks('smilie', $params);
 
 	return $params;
 }
+
 /**
  * @brief Replaces text emoticons with graphical images.
  *

From 3a3bd582b103bd0a08e68342b991e282ac1ca818 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 25 Apr 2017 19:42:06 -0700
Subject: [PATCH 134/299] mostly text formatting changes

---
 Zotlabs/Daemon/Notifier.php | 130 ++++++++++++++++++------------------
 1 file changed, 66 insertions(+), 64 deletions(-)

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 3afe1a5dc..e2dab4b2d 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -391,7 +391,6 @@ class Notifier {
 					return;
 				}
 			}
-
 		}
 
 		$walltowall = (($top_level_post && $channel['xchan_hash'] === $target_item['author_xchan']) ? true : false); 
@@ -408,7 +407,7 @@ class Notifier {
 		if(! $recipients)
 			return;
 
-//	logger('notifier: recipients: ' . print_r($recipients,true), LOGGER_NORMAL, LOG_DEBUG);
+		//	logger('notifier: recipients: ' . print_r($recipients,true), LOGGER_NORMAL, LOG_DEBUG);
 
 		$env_recips = (($private) ? array() : null);
 
@@ -421,8 +420,13 @@ class Notifier {
 			foreach($details as $d) {
 
 				$recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')'; 
-				if($private)
-					$env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig'],'hash' => $d['xchan_hash']);
+				if($private) {
+					$env_recips[] = [
+						'guid'     => $d['xchan_guid'],
+						'guid_sig' => $d['xchan_guid_sig'],
+						'hash'     => $d['xchan_hash']
+					];
+				}
 
 				if($d['xchan_network'] === 'mail' && $normal_mode) {
 					$delivery_options = get_xconfig($d['xchan_hash'],'system','delivery_mode');
@@ -433,28 +437,28 @@ class Notifier {
 		}
 
 
-		$narr = array(
-			'channel' => $channel,
-			'upstream' => $upstream,
-			'env_recips' => $env_recips,
-			'packet_recips' => $packet_recips,
-			'recipients' => $recipients,
-			'item' => $item,
-			'target_item' => $target_item,
+		$narr = [
+			'channel'        => $channel,
+			'upstream'       => $upstream,
+			'env_recips'     => $env_recips,
+			'packet_recips'  => $packet_recips,
+			'recipients'     => $recipients,
+			'item'           => $item,
+			'target_item'    => $target_item,
 			'top_level_post' => $top_level_post,
-			'private' => $private,
+			'private'        => $private,
 			'relay_to_owner' => $relay_to_owner,
-			'uplink' => $uplink,
-			'cmd' => $cmd,
-			'mail' => $mail,
-			'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
-			'location' => $location,
-			'request' => $request,
-			'normal_mode' => $normal_mode,
-			'packet_type' => $packet_type,
-			'walltowall' => $walltowall,
-			'queued' => array()
-		);
+			'uplink'         => $uplink,
+			'cmd'            => $cmd,
+			'mail'           => $mail,
+			'single'         => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
+			'location'       => $location,
+			'request'        => $request,
+			'normal_mode'    => $normal_mode,
+			'packet_type'    => $packet_type,
+			'walltowall'     => $walltowall,
+			'queued'         => []
+		];
 
 		call_hooks('notifier_process', $narr);
 		if($narr['queued']) {
@@ -491,8 +495,6 @@ class Notifier {
 
 		$hubs = $r;
 
-
-
 		/**
 		 * Reduce the hubs to those that are unique. For zot hubs, we need to verify uniqueness by the sitekey, 
 		 * since it may have been a re-install which has not yet been detected and pruned.
@@ -523,49 +525,47 @@ class Notifier {
 			if($hub['hubloc_network'] == 'zot') {
 				if(! in_array($hub['hubloc_sitekey'],$keys)) {
 					$hublist[] = $hub['hubloc_host'];
-					$dhubs[] = $hub;
-					$keys[] = $hub['hubloc_sitekey'];
+					$dhubs[]   = $hub;
+					$keys[]    = $hub['hubloc_sitekey'];
 				}
 			}
 			else {
 				if(! in_array($hub['hubloc_url'],$urls)) {
 					$hublist[] = $hub['hubloc_host'];
-					$dhubs[] = $hub;
-					$urls[] = $hub['hubloc_url'];
+					$dhubs[]   = $hub;
+					$urls[]    = $hub['hubloc_url'];
 				}
 			}
 		}
 
 		logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG, LOG_DEBUG);
 
-
 		foreach($dhubs as $hub) {
 
 			if($hub['hubloc_network'] !== 'zot') {
-
-				$narr = array(
-					'channel' => $channel,
-					'upstream' => $upstream,
-					'env_recips' => $env_recips,
-					'packet_recips' => $packet_recips,
-					'recipients' => $recipients,
-					'item' => $item,
-					'target_item' => $target_item,
-					'hub' => $hub,
+				$narr = [
+					'channel'        => $channel,
+					'upstream'       => $upstream,
+					'env_recips'     => $env_recips,
+					'packet_recips'  => $packet_recips,
+					'recipients'     => $recipients,
+					'item'           => $item,
+					'target_item'    => $target_item,
+					'hub'            => $hub,
 					'top_level_post' => $top_level_post,
-					'private' => $private,
+					'private'        => $private,
 					'relay_to_owner' => $relay_to_owner,
-					'uplink' => $uplink,
-					'cmd' => $cmd,
-					'mail' => $mail,
-					'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
-					'location' => $location,
-					'request' => $request,
-					'normal_mode' => $normal_mode,
-					'packet_type' => $packet_type,
-					'walltowall' => $walltowall,
-					'queued' => array()
-				);
+					'uplink'         => $uplink,
+					'cmd'            => $cmd,
+					'mail'           => $mail,
+					'single'         => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
+					'location'       => $location,
+					'request'        => $request,
+					'normal_mode'    => $normal_mode,
+					'packet_type'    => $packet_type,
+					'walltowall'     => $walltowall,
+					'queued'         => []
+				];
 
 
 				call_hooks('notifier_hub',$narr);
@@ -617,14 +617,16 @@ class Notifier {
 			else {
 				$env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : '');
 				$packet = zot_build_packet($channel,'notify',$env,(($private) ? $hub['hubloc_sitekey'] : null), $hub['site_crypto'],$hash);	
-				queue_insert(array(
-					'hash'       => $hash,
-					'account_id' => $target_item['aid'],
-					'channel_id' => $target_item['uid'],
-					'posturl'    => $hub['hubloc_callback'],
-					'notify'     => $packet,
-					'msg'        => json_encode($encoded_item)
-				));
+				queue_insert(
+					[
+						'hash'       => $hash,
+						'account_id' => $target_item['aid'],
+						'channel_id' => $target_item['uid'],
+						'posturl'    => $hub['hubloc_callback'],
+						'notify'     => $packet,
+						'msg'        => json_encode($encoded_item)
+					]
+				);
 
 				// only create delivery reports for normal undeleted items
 				if(is_array($target_item) && array_key_exists('postopts',$target_item) && (! $target_item['item_deleted']) && (! get_config('system','disable_dreport'))) {
@@ -645,9 +647,9 @@ class Notifier {
 	
 		if($normal_mode) {
 			$x = q("select * from hook where hook = 'notifier_normal'");
-			if($x)
-				Master::Summon(array('Deliver_hooks',$target_item['id']));
-
+			if($x) {
+				Master::Summon( [ 'Deliver_hooks', $target_item['id'] ] );
+			}
 		}
 
 		if($deliveries)

From b88be137ca68c6b52e13ce1738fbc55651f37138 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 25 Apr 2017 20:48:38 -0700
Subject: [PATCH 135/299] provide a broken feed for services which require a
 broken feed

---
 Zotlabs/Module/Feed.php    | 47 ++++++++++++------------
 Zotlabs/Module/Wfinger.php | 18 ++++++----
 Zotlabs/Module/Xrd.php     |  2 +-
 include/feedutils.php      | 73 +++++++++++++++++++++-----------------
 include/items.php          |  4 +++
 view/tpl/atom_feed.tpl     |  7 ++--
 6 files changed, 82 insertions(+), 69 deletions(-)

diff --git a/Zotlabs/Module/Feed.php b/Zotlabs/Module/Feed.php
index 47871eafb..06637b6d2 100644
--- a/Zotlabs/Module/Feed.php
+++ b/Zotlabs/Module/Feed.php
@@ -1,40 +1,41 @@
 <?php
+
 namespace Zotlabs\Module;
 
 
 require_once('include/items.php');
 
-
 class Feed extends \Zotlabs\Web\Controller {
 
 	function init() {
 	
-		$params = array();
+		$params = [];
 	
-		$params['begin']     = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin']      : NULL_DATE);
-		$params['end']       = ((x($_REQUEST,'date_end'))   ? $_REQUEST['date_end']        : '');
-		$params['type']      = ((stristr(argv(0),'json'))   ? 'json'                       : 'xml');
-		$params['pages']     = ((x($_REQUEST,'pages'))      ? intval($_REQUEST['pages'])   : 0);
-		$params['top']       = ((x($_REQUEST,'top'))        ? intval($_REQUEST['top'])     : 0);
-		$params['start']     = ((x($params,'start'))        ? intval($params['start'])     : 0);
-		$params['records']   = ((x($params,'records'))      ? intval($params['records'])   : 40);
-		$params['direction'] = ((x($params,'direction'))    ? dbesc($params['direction'])  : 'desc');
-		$params['cat']       = ((x($_REQUEST,'cat'))        ? escape_tags($_REQUEST['cat'])  : '');
-	
-		$channel = '';
+		$params['begin']     = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin']       : NULL_DATE);
+		$params['end']       = ((x($_REQUEST,'date_end'))   ? $_REQUEST['date_end']         : '');
+		$params['type']      = ((stristr(argv(0),'json'))   ? 'json'                        : 'xml');
+		$params['pages']     = ((x($_REQUEST,'pages'))      ? intval($_REQUEST['pages'])    : 0);
+		$params['top']       = ((x($_REQUEST,'top'))        ? intval($_REQUEST['top'])      : 0);
+		$params['start']     = ((x($params,'start'))        ? intval($params['start'])      : 0);
+		$params['records']   = ((x($params,'records'))      ? intval($params['records'])    : 40);
+		$params['direction'] = ((x($params,'direction'))    ? dbesc($params['direction'])   : 'desc');
+		$params['cat']       = ((x($_REQUEST,'cat'))        ? escape_tags($_REQUEST['cat']) : '');
+		$params['compat']    = ((x($_REQUEST,'compat'))     ? intval($_REQUEST['compat'])   : 0);	
+
+
 		if(argc() > 1) {
-			$r = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_address = '%s' limit 1",
-				dbesc(argv(1))
-			);
-			if(!($r && count($r)))
+
+			if(observer_prohibited(true)) {
 				killme();
-	
-			$channel = $r[0];
-	
-			if(observer_prohibited(true))
+			}
+
+			$channel = channelx_by_nick(argv(1));
+			if(! $channel) {
 				killme();
+			}
+	
 	 
-			logger('mod_feed: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
+			logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
 	
 			echo get_public_feed($channel,$params);
 	
@@ -43,6 +44,4 @@ class Feed extends \Zotlabs\Web\Controller {
 	
 	}
 	
-	
-	
 }
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 5c22772c4..3fdff691b 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -94,33 +94,39 @@ class Wfinger extends \Zotlabs\Web\Controller {
 			$result['links'] = [
 	
 				[
-					'rel' => 'http://webfinger.net/rel/avatar',
+					'rel'  => 'http://webfinger.net/rel/avatar',
 					'type' => $r[0]['xchan_photo_mimetype'],
 					'href' => $r[0]['xchan_photo_l']	
 				],
 	
 				[
-					'rel' => 'http://webfinger.net/rel/profile-page',
+					'rel'  => 'http://webfinger.net/rel/profile-page',
 					'href' => z_root() . '/profile/' . $r[0]['channel_address'],
 				],
 	
 				[
-					'rel' => 'http://webfinger.net/rel/blog',
+					'rel'  => 'http://schemas.google.com/g/2010#updates-from', 
+					'type' => 'application/atom+xml', 
+					'href' => z_root() . '/feed/'  . $r[0]['channel_address'] . '?f=&compat=1'
+				],
+
+				[
+					'rel'  => 'http://webfinger.net/rel/blog',
 					'href' => z_root() . '/channel/' . $r[0]['channel_address'],
 				],
 	
 				[
-					'rel' => 'http://ostatus.org/schema/1.0/subscribe',
+					'rel'      => 'http://ostatus.org/schema/1.0/subscribe',
 					'template' => z_root() . '/follow/url={uri}',
 				],
 	
 				[
-					'rel' => 'http://purl.org/zot/protocol',
+					'rel'  => 'http://purl.org/zot/protocol',
 					'href' => z_root() . '/.well-known/zot-info' . '?address=' . $r[0]['xchan_addr'],
 				],
 	
 				[
-					'rel' => 'magic-public-key',
+					'rel'  => 'magic-public-key',
 					'href' => 'data:application/magic-public-key,' . salmon_key($r[0]['channel_pubkey']),
 				]
 			];
diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 3ed19962b..ba650be55 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller {
 			'$aliases'     => $aliases,
 			'$profile_url' => z_root() . '/channel/'       . $r[0]['channel_address'],
 			'$hcard_url'   => z_root() . '/hcard/'         . $r[0]['channel_address'],
-			'$atom'        => z_root() . '/feed/'          . $r[0]['channel_address'],
+			'$atom'        => z_root() . '/feed/'          . $r[0]['channel_address'] . '?f=&compat=1',
 			'$zot_post'    => z_root() . '/post/'          . $r[0]['channel_address'],
 			'$poco_url'    => z_root() . '/poco/'          . $r[0]['channel_address'],
 			'$photo'       => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],
diff --git a/include/feedutils.php b/include/feedutils.php
index 079d57072..36ab75287 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -22,24 +22,20 @@ function get_public_feed($channel, $params) {
 */
 
 	if(! $params)
-		$params = array();
+		$params = [];
 
-	$params['type']      = ((x($params,'type'))      ? $params['type']          : 'xml');
-	$params['begin']     = ((x($params,'begin'))     ? $params['begin']         : NULL_DATE);
-	$params['end']       = ((x($params,'end'))       ? $params['end']           : datetime_convert('UTC','UTC','now'));
-	$params['start']     = ((x($params,'start'))     ? $params['start']         : 0);
-	$params['records']   = ((x($params,'records'))   ? $params['records']       : 40);
-	$params['direction'] = ((x($params,'direction')) ? $params['direction']     : 'desc');
-	$params['pages']     = ((x($params,'pages'))     ? intval($params['pages']) : 0);
-	$params['top']       = ((x($params,'top'))       ? intval($params['top'])   : 0);
-	$params['cat']       = ((x($params,'cat'))       ? $params['cat']           : '');
+	$params['type']        = ((x($params,'type'))     ? $params['type']           : 'xml');
+	$params['begin']       = ((x($params,'begin'))    ? $params['begin']          : NULL_DATE);
+	$params['end']         = ((x($params,'end'))      ? $params['end']            : datetime_convert('UTC','UTC','now'));
+	$params['start']       = ((x($params,'start'))    ? $params['start']          : 0);
+	$params['records']     = ((x($params,'records'))  ? $params['records']        : 40);
+	$params['direction']   = ((x($params,'direction'))? $params['direction']      : 'desc');
+	$params['pages']       = ((x($params,'pages'))    ? intval($params['pages'])  : 0);
+	$params['top']         = ((x($params,'top'))      ? intval($params['top'])    : 0);
+	$params['cat']         = ((x($params,'cat'))      ? $params['cat']            : '');
+	$params['compat']      = ((x($params,'compat'))   ? intval($params['compat']) : 0);
 
 
-	// put a sane lower limit on feed requests if not specified
-
-//	if($params['begin'] <= NULL_DATE)
-//		$params['begin'] = datetime_convert('UTC','UTC','now - 1 month');
-
 	switch($params['type']) {
 		case 'json':
 			header("Content-type: application/atom+json");
@@ -61,6 +57,7 @@ function get_public_feed($channel, $params) {
  * @param array $params
  * @return string with an atom feed
  */
+
 function get_feed_for($channel, $observer_hash, $params) {
 
 	if(! $channel)
@@ -74,18 +71,24 @@ function get_feed_for($channel, $observer_hash, $params) {
 			http_status_exit(403);
 	}
 
+	// logger('params: ' . print_r($params,true));
+
 	$feed_template = get_markup_template('atom_feed.tpl');
 
 	$atom = '';
 
+	$feed_author = '';
+	if(intval($params['compat']) === 1) {
+		$feed_author = atom_author('author',$channel['channel_address'],$channel['xchan_url'],300,300,$channel['xchan_photo_mimetype'],$channel['xchan_photo_l']);
+	}
+
 	$atom .= replace_macros($feed_template, array(
 		'$version'      => xmlify(Zotlabs\Lib\System::get_project_version()),
 		'$red'          => xmlify(Zotlabs\Lib\System::get_platform_name()),
 		'$feed_id'      => xmlify($channel['xchan_url']),
 		'$feed_title'   => xmlify($channel['channel_name']),
 		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
-		'$hub'          => '', // feed_hublinks(),
-		'$salmon'       => '', // feed_salmonlinks($channel['channel_address']),
+		'$author'       => $feed_author,
 		'$name'         => xmlify($channel['channel_name']),
 		'$profile_page' => xmlify($channel['xchan_url']),
 		'$mimephoto'    => xmlify($channel['xchan_photo_mimetype']),
@@ -107,18 +110,21 @@ function get_feed_for($channel, $observer_hash, $params) {
 	// a much simpler interface
 	call_hooks('atom_feed', $atom);
 
-	$items = items_fetch(array(
-		'wall' => '1',
-		'datequery' => $params['end'],
-		'datequery2' => $params['begin'],
-		'start' => $params['start'],          // FIXME
-		'records' => $params['records'],      // FIXME
-		'direction' => $params['direction'],  // FIXME
-		'pages' => $params['pages'],
-		'order' => 'post',
-		'top'   => $params['top'],
-		'cat'   => $params['cat']
-		), $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module);
+	$items = items_fetch(
+		[
+			'wall' => '1',
+			'datequery'  => $params['end'],
+			'datequery2' => $params['begin'],
+			'start'      => intval($params['start']),
+			'records'    => intval($params['records']),
+			'direction'  => dbesc($params['direction']),
+			'pages'      => $params['pages'],
+			'order'      => dbesc('post'),
+			'top'        => $params['top'],
+			'cat'        => $params['cat'],
+			'compat'     => $params['compat']
+		], $channel, $observer_hash, CLIENT_MODE_NORMAL, App::$module
+	);
 
 	if($items) {
 		$type = 'html';
@@ -1247,10 +1253,11 @@ function atom_author($tag, $name, $uri, $h, $w, $type, $photo) {
 	$photo = xmlify($photo);
 
 	$o .= "<$tag>\r\n";
-	$o .= "<name>$name</name>\r\n";
-	$o .= "<uri>$uri</uri>\r\n";
-	$o .= '<link rel="photo"  type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
-	$o .= '<link rel="avatar" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+	$o .= "  <id>$uri</id>\r\n";
+	$o .= "  <name>$name</name>\r\n";
+	$o .= "  <uri>$uri</uri>\r\n";
+	$o .= '  <link rel="photo"  type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
+	$o .= '  <link rel="avatar" type="' . $type . '" media:width="' . $w . '" media:height="' . $h . '" href="' . $photo . '" />' . "\r\n";
 
 	call_hooks('atom_author', $o);
 
diff --git a/include/items.php b/include/items.php
index a4862208e..1f79ee567 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3885,6 +3885,10 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 		}
 	}
 
+	if(intval($arr['compat']) === 1) {
+		$sql_extra = " AND author_xchan = owner_xchan and item_wall = 1 and item_private = 0 ";
+	}
+
 	if ($arr['datequery']) {
 		$sql_extra3 .= protect_sprintf(sprintf(" AND item.created <= '%s' ", dbesc(datetime_convert('UTC','UTC',$arr['datequery']))));
 	}
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index fb606af27..ba50867ff 100755
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
@@ -16,11 +16,8 @@
   <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   <link rel="alternate" type="text/html" href="{{$profile_page}}" />
-{{if $hub}}
-  {{$hub}}
-{{/if}}
-{{if $salmon}}
-  {{$salmon}}
+{{if $author}}
+{{$author}}
 {{/if}}
 
   <updated>{{$feed_updated}}</updated>

From 6fcfab34883e5e93e9438ed4872de304e22b0f00 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 26 Apr 2017 19:47:05 -0700
Subject: [PATCH 136/299] issues from hubzilla:#737

---
 Zotlabs/Lib/DB_Upgrade.php     |  2 +-
 Zotlabs/Lib/NativeWiki.php     |  4 ++--
 Zotlabs/Lib/NativeWikiPage.php | 15 +++++++++++++--
 install/update.php             |  4 ++--
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php
index 55c69bcca..bb72e7a05 100644
--- a/Zotlabs/Lib/DB_Upgrade.php
+++ b/Zotlabs/Lib/DB_Upgrade.php
@@ -83,7 +83,7 @@ class DB_Upgrade {
 								file_put_contents($lockfile, $x);
 							
 								$r = q("select account_language from account where account_email = '%s' limit 1",
-									dbesc(App::$config['system']['admin_email'])
+									dbesc(\App::$config['system']['admin_email'])
 								);
 								push_lang(($r) ? $r[0]['account_language'] : 'en');
 
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php
index 7786ec25a..4301feaa0 100644
--- a/Zotlabs/Lib/NativeWiki.php
+++ b/Zotlabs/Lib/NativeWiki.php
@@ -101,11 +101,11 @@ class NativeWiki {
 	static public function sync_a_wiki_item($uid,$id,$resource_id) {
 
 
-		$r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = %d )) ",
+		$r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = '%s' )) ",
 			intval($uid),
 			intval($id),
 			dbesc(NWIKI_ITEM_RESOURCE_TYPE),
-			intval($resource_id)
+			dbesc($resource_id)
 		);
 		if($r) {
 			xchan_query($r);
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index bd40367c9..ed3df436c 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -21,12 +21,23 @@ class NativeWikiPage {
 		$sql_extra = item_permissions_sql($channel_id,$observer_hash);
 
 		$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_deleted = 0 
-			$sql_extra group by mid order by created asc",
+			$sql_extra order by created asc",
 			dbesc($resource_id),
 			intval($channel_id)
 		);
 		if($r) {
-			$items = fetch_post_tags($r,true);
+			$x = [];
+			$y = [];
+
+			foreach($r as $rv) {
+				if(! in_array($rv['mid'],$x)) {
+					$y[] = $rv;
+					$x[] = $rv['mid'];
+				}
+			}
+
+			$items = fetch_post_tags($y,true);
+
 			foreach($items as $page_item) {
 				$title = get_iconfig($page_item['id'],'nwikipage','pagetitle',t('(No Title)'));
 				if(urldecode($title) !== 'Home') {
diff --git a/install/update.php b/install/update.php
index b37af9cef..75f9158c9 100644
--- a/install/update.php
+++ b/install/update.php
@@ -2512,8 +2512,8 @@ function update_r1187() {
 
 function update_r1188() {
 
-	$r1 = q("alter table channel add channel_password varchar(255) not null ");
-	$r2 = q("alter table channel add channel_salt varchar(255) not null ");
+	$r1 = q("alter table channel add channel_password varchar(255) not null default '' ");
+	$r2 = q("alter table channel add channel_salt varchar(255) not null default '' ");
 
 	if($r1 && $r2)
 		return UPDATE_SUCCESS;

From ac670856f67d5ff2b6a61e76103e331039dbf6b1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 26 Apr 2017 13:26:50 -0700
Subject: [PATCH 137/299] provide a broken feed as a separate module

---
 Zotlabs/Module/Ofeed.php   | 48 ++++++++++++++++++++++++++++++++++++++
 Zotlabs/Module/Wfinger.php |  2 +-
 Zotlabs/Module/Xrd.php     |  2 +-
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 Zotlabs/Module/Ofeed.php

diff --git a/Zotlabs/Module/Ofeed.php b/Zotlabs/Module/Ofeed.php
new file mode 100644
index 000000000..2b7acff99
--- /dev/null
+++ b/Zotlabs/Module/Ofeed.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Zotlabs\Module;
+
+/* Ofeed: Broken feed for software which requires broken feeds */
+
+require_once('include/items.php');
+
+class Ofeed extends \Zotlabs\Web\Controller {
+
+	function init() {
+	
+		$params = [];
+	
+		$params['begin']     = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin']       : NULL_DATE);
+		$params['end']       = ((x($_REQUEST,'date_end'))   ? $_REQUEST['date_end']         : '');
+		$params['type']      = ((stristr(argv(0),'json'))   ? 'json'                        : 'xml');
+		$params['pages']     = ((x($_REQUEST,'pages'))      ? intval($_REQUEST['pages'])    : 0);
+		$params['top']       = ((x($_REQUEST,'top'))        ? intval($_REQUEST['top'])      : 0);
+		$params['start']     = ((x($params,'start'))        ? intval($params['start'])      : 0);
+		$params['records']   = ((x($params,'records'))      ? intval($params['records'])    : 40);
+		$params['direction'] = ((x($params,'direction'))    ? dbesc($params['direction'])   : 'desc');
+		$params['cat']       = ((x($_REQUEST,'cat'))        ? escape_tags($_REQUEST['cat']) : '');
+		$params['compat']    = ((x($_REQUEST,'compat'))     ? intval($_REQUEST['compat'])   : 1);	
+
+
+		if(argc() > 1) {
+
+			if(observer_prohibited(true)) {
+				killme();
+			}
+
+			$channel = channelx_by_nick(argv(1));
+			if(! $channel) {
+				killme();
+			}
+	
+	 
+			logger('public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $channel['channel_address']);
+	
+			echo get_public_feed($channel,$params);
+	
+			killme();
+		}
+	
+	}
+	
+}
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php
index 118ec5e7c..9623a676b 100644
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -107,7 +107,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
 				[
 					'rel'  => 'http://schemas.google.com/g/2010#updates-from', 
 					'type' => 'application/atom+xml', 
-					'href' => z_root() . '/feed/'  . $r[0]['channel_address'] . '/?compat=1'
+					'href' => z_root() . '/ofeed/'  . $r[0]['channel_address']
 				],
 
 				[
diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 7fd81e490..7b36576e0 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller {
 			'$aliases'     => $aliases,
 			'$profile_url' => z_root() . '/channel/'       . $r[0]['channel_address'],
 			'$hcard_url'   => z_root() . '/hcard/'         . $r[0]['channel_address'],
-			'$atom'        => z_root() . '/feed/'          . $r[0]['channel_address'] . '/?compat=1',
+			'$atom'        => z_root() . '/ofeed/'         . $r[0]['channel_address'],
 			'$zot_post'    => z_root() . '/post/'          . $r[0]['channel_address'],
 			'$poco_url'    => z_root() . '/poco/'          . $r[0]['channel_address'],
 			'$photo'       => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],

From e8ea8d203db5bdf62995f1831b1503ac11556435 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 26 Apr 2017 23:05:30 -0700
Subject: [PATCH 138/299] more client-side mail privacy work

---
 Zotlabs/Module/Mail.php | 74 ++++++++++++++++-------------------------
 include/items.php       | 15 +++++++--
 include/message.php     | 19 ++++++++---
 3 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php
index 52f1ddf32..a240ccdae 100644
--- a/Zotlabs/Module/Mail.php
+++ b/Zotlabs/Module/Mail.php
@@ -22,32 +22,40 @@ class Mail extends \Zotlabs\Web\Controller {
 		$recipient = ((x($_REQUEST,'messageto'))    ? notags(trim($_REQUEST['messageto']))    : '');
 		$rstr      = ((x($_REQUEST,'messagerecip')) ? notags(trim($_REQUEST['messagerecip'])) : '');
 		$preview   = ((x($_REQUEST,'preview'))      ? intval($_REQUEST['preview'])            : 0);
-		$expires   = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE);
+		$expires   = ((x($_REQUEST,'expires'))      ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE);
+		$raw       = ((x($_REQUEST,'raw'))          ? intval($_REQUEST['raw'])                : 0);
+		$mimetype  = ((x($_REQUEST,'mimetype'))     ? notags(trim($_REQUEST['mimetype']))     : 'text/bbcode');
 
 		if($preview) {
 
-			$body = cleanup_bbcode($body);
-			$results = linkify_tags($a, $body, local_channel());
+			if($raw) {
+				$body = mail_prepare_binary(['id' => 'M0']);
+				echo json_encode(['preview' => $body]);
+			}
+			else {
+				$body = cleanup_bbcode($body);
+				$results = linkify_tags($a, $body, local_channel());
 
-			if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
-				$attachments = array();
-				foreach($match[2] as $mtch) {
-					$hash = substr($mtch,0,strpos($mtch,','));
-					$rev = intval(substr($mtch,strpos($mtch,',')));
-					$r = attach_by_hash_nodata($hash,get_observer_hash(),$rev);
-					if($r['success']) {
-						$attachments[] = array(
-							'href'     => z_root() . '/attach/' . $r['data']['hash'],
-							'length'   =>  $r['data']['filesize'],
-							'type'     => $r['data']['filetype'],
-							'title'    => urlencode($r['data']['filename']),
-							'revision' => $r['data']['revision']
-						);
+				if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
+					$attachments = array();
+					foreach($match[2] as $mtch) {
+						$hash = substr($mtch,0,strpos($mtch,','));
+						$rev = intval(substr($mtch,strpos($mtch,',')));
+						$r = attach_by_hash_nodata($hash,get_observer_hash(),$rev);
+						if($r['success']) {
+							$attachments[] = array(
+								'href'     => z_root() . '/attach/' . $r['data']['hash'],
+								'length'   =>  $r['data']['filesize'],
+								'type'     => $r['data']['filetype'],
+								'title'    => urlencode($r['data']['filename']),
+								'revision' => $r['data']['revision']
+							);
+						}
+						$body = trim(str_replace($match[1],'',$body));
 					}
-					$body = trim(str_replace($match[1],'',$body));
+					echo json_encode(['preview' => zidify_links(smilies(bbcode($body)))]);
 				}
 			}
-			echo json_encode(['preview' => zidify_links(smilies(bbcode($body)))]);
 			killme();
 		} 
 
@@ -102,36 +110,10 @@ class Mail extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-	//	if(feature_enabled(local_channel(),'richtext')) {
-	//		$body = fix_mce_lf($body);
-	//	}
-	
 		require_once('include/text.php');
 		linkify_tags($a, $body, local_channel());
 	
-		// I don't think this is used any more.
 
-		if($preview) {
-			$mail = [
-				'mailbox'     => 'outbox',
-				'id'          => 0,
-				'mid'         => 'M0',
-				'from_name'   => $channel['xchan_name'],
-				'from_url'    => $channel['xchan_url'],
-				'from_photo'  => $channel['xchan_photo_s'],
-				'subject'     => zidify_links(smilies(bbcode($subject))),
-				'body'        => zidify_links(smilies(bbcode($body))),
-				'attachments' => '',
-				'can_recall'  => false,
-				'is_recalled' => '',
-				'date'        => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c')
-			];
-			
-			echo replace_macros(get_markup_template('mail_conv.tpl'), [ '$mail' => $mail ] );
-			killme();
-
-		}
-	
 		if(! $recipient) {
 			notice('No recipient found.');
 			\App::$argc = 2;
@@ -141,7 +123,7 @@ class Mail extends \Zotlabs\Web\Controller {
 	
 		// We have a local_channel, let send_message use the session channel and save a lookup
 		
-		$ret = send_message(0, $recipient, $body, $subject, $replyto, $expires);
+		$ret = send_message(0, $recipient, $body, $subject, $replyto, $expires, $mimetype, $raw);
 	
 		if($ret['success']) {
 			xchan_mail_query($ret['mail']);
diff --git a/include/items.php b/include/items.php
index 1f79ee567..7cad3b168 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1333,6 +1333,8 @@ function encode_mail($item,$extended = false) {
 	$x['body']           = $item['body'];
 	$x['from']           = encode_item_xchan($item['from']);
 	$x['to']             = encode_item_xchan($item['to']);
+	$x['raw']            = $item['mail_raw'];
+	$x['mimetype']       = $item['mail_mimetype'];
 
 	if($item['attach'])
 		$x['attach']     = json_decode($item['attach'],true);
@@ -1366,9 +1368,16 @@ function get_mail_elements($x) {
 
 	$arr = array();
 
-	$arr['body']         = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : '');
-	$arr['title']        = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : '');
+	if(intval($x['raw'])) {
+		$arr['mail_raw'] = intval($x['raw']);
+		$arr['body']     = $x['body'];
+	}
+	else {
+		$arr['body']         = (($x['body']) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8',false) : '');
+	}
 
+	$arr['title']        = (($x['title'])? htmlspecialchars($x['title'],ENT_COMPAT,'UTF-8',false) : '');
+	$arr['mail_mimetype'] = (($x['mimetype']) ? htmlspecialchars($x['mimetype'],ENT_COMPAT,'UTF-8',false) : 'text/bbcode');
 	$arr['conv_guid']    = (($x['conv_guid'])? htmlspecialchars($x['conv_guid'],ENT_COMPAT,'UTF-8',false) : '');
 
 	$arr['created']      = datetime_convert('UTC','UTC',$x['created']);
@@ -2949,8 +2958,10 @@ function mail_store($arr) {
 	$arr['parent_mid']    = ((x($arr,'parent_mid'))    ? notags(trim($arr['parent_mid']))    : '');
 	$arr['body']          = ((x($arr,'body'))          ? trim($arr['body'])                  : '');
 	$arr['conv_guid']     = ((x($arr,'conv_guid'))     ? trim($arr['conv_guid'])             : '');
+	$arr['mail_mimetype'] = ((x($arr,'mail_mimetype')) ? trim($arr['mail_mimetype'])         : 'text/bbcode');
 
 	$arr['mail_flags']    = ((x($arr,'mail_flags'))    ? intval($arr['mail_flags'])          : 0 );
+	$arr['mail_raw']      = ((x($arr,'mail_raw'))      ? intval($arr['mail_raw'])            : 0 );
 
 	if(! $arr['parent_mid']) {
 		logger('mail_store: missing parent');
diff --git a/include/message.php b/include/message.php
index e7db98d7e..fd9c6ece1 100644
--- a/include/message.php
+++ b/include/message.php
@@ -5,10 +5,20 @@
 require_once('include/crypto.php');
 require_once('include/attach.php');
 
+
+function mail_prepare_binary($item) {
+
+	return replace_macros(get_markup_template('item_binary.tpl'), [
+		'$download'  => t('Download binary/encrypted content'),
+		'$url'       => z_root() . '/mail/' . $item['id'] . '/download'
+	]);
+}
+
+
 // send a private message
 	
 
-function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $replyto = '', $expires = NULL_DATE) { 
+function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $replyto = '', $expires = NULL_DATE, $mimetype = 'text/bbcode', $raw = false) { 
 
 	$ret = array('success' => false);
 	$is_reply = false;
@@ -190,8 +200,8 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 	$sig = ''; // placeholder
 	$mimetype = ''; //placeholder
 
-	$r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, mail_mimetype, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply )
-		VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
+	$r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, mail_mimetype, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply, mail_raw )
+		VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
 		intval($channel['channel_account_id']),
 		dbesc($conv_guid),
 		intval(1),
@@ -207,7 +217,8 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 		dbesc($replyto),
 		dbesc(datetime_convert()),
 		dbescdate($expires),
-		intval($is_reply)
+		intval($is_reply),
+		intval($raw)
 	);
 
 	// verify the save

From 89e7e5e4fbafa9bac7263513315f89cfe7ac02fb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 27 Apr 2017 20:08:38 -0700
Subject: [PATCH 139/299] make mail_store() safe for postgres or mysql5.7 -
 although this interface needs to be refactored in the future

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

diff --git a/include/items.php b/include/items.php
index 7cad3b168..30aa30048 100755
--- a/include/items.php
+++ b/include/items.php
@@ -2945,8 +2945,14 @@ function mail_store($arr) {
 			$arr['body'] = escape_tags($arr['body']);
 	}
 
-	if(array_key_exists('attach',$arr) && is_array($arr['attach']))
-		$arr['attach'] = json_encode($arr['attach']);
+	if(array_key_exists('attach',$arr)) {
+		if(is_array($arr['attach'])) {
+			$arr['attach'] = json_encode($arr['attach']);
+		}
+	}
+	else {
+		$arr['attach'] = '';
+	}
 
 	$arr['account_id']    = ((x($arr,'account_id'))           ? intval($arr['account_id'])                 : 0);
 	$arr['mid']           = ((x($arr,'mid'))           ? notags(trim($arr['mid']))           : random_string());
@@ -2957,6 +2963,7 @@ function mail_store($arr) {
 	$arr['title']         = ((x($arr,'title'))         ? trim($arr['title'])         : '');
 	$arr['parent_mid']    = ((x($arr,'parent_mid'))    ? notags(trim($arr['parent_mid']))    : '');
 	$arr['body']          = ((x($arr,'body'))          ? trim($arr['body'])                  : '');
+	$arr['sig']           = ((x($arr,'sig'))           ? trim($arr['sig'])                   : '');
 	$arr['conv_guid']     = ((x($arr,'conv_guid'))     ? trim($arr['conv_guid'])             : '');
 	$arr['mail_mimetype'] = ((x($arr,'mail_mimetype')) ? trim($arr['mail_mimetype'])         : 'text/bbcode');
 

From 70e17f91940cb7347d59a6b0d0f59facc2c3ce5c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 27 Apr 2017 20:22:28 -0700
Subject: [PATCH 140/299] more work client mail crypto

---
 include/message.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/include/message.php b/include/message.php
index fd9c6ece1..261a6a673 100644
--- a/include/message.php
+++ b/include/message.php
@@ -45,13 +45,15 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 	$body = cleanup_bbcode($body);
 	$results = linkify_tags($a, $body, $uid);
 
-
-	if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
-		$attaches = $match[1];
+	if(! $raw) {
+		if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) {
+			$attaches = $match[1];
+		}
+	}
 
 	$attachments = '';
 
-	if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
+	if((! $raw) && preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) {
 		$attachments = array();
 		foreach($match[2] as $mtch) {
 			$hash = substr($mtch,0,strpos($mtch,','));
@@ -194,7 +196,7 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 
 	if($subject)
 		$subject = str_rot47(base64url_encode($subject));
-	if($body)
+	if(($body )&& (! $raw))
 		$body  = str_rot47(base64url_encode($body));
 	
 	$sig = ''; // placeholder
@@ -364,6 +366,9 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
 			if($r[$k]['body'])
 				$r[$k]['body'] = base64url_decode(str_rot47($r[$k]['body']));
 		}
+		if($r[$k]['mail_raw'])
+			$r[$k]['body'] = mail_prepare_binary([ 'id' => $r[$k]['id'] ]);
+
 	}
 
 	return $r;
@@ -402,6 +407,8 @@ function private_messages_fetch_message($channel_id, $messageitem_id, $updatesee
 			if($messages[$k]['body'])
 				$messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
 		}
+		if($messages[$k]['mail_raw'])
+			$messages[$k]['body'] = mail_prepare_binary([ 'id' => $messages[$k]['id'] ]);
 	}
 
 
@@ -525,6 +532,9 @@ function private_messages_fetch_conversation($channel_id, $messageitem_id, $upda
 			if($messages[$k]['body'])
 				$messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
 		}
+		if($messages[$k]['mail_raw'])
+			$messages[$k]['body'] = mail_prepare_binary([ 'id' => $messages[$k]['id'] ]);
+
 	}
 
 

From 033cf6138071c1707b3bb448524761f086b8a445 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 27 Apr 2017 22:37:51 -0700
Subject: [PATCH 141/299] profile_tabs is now channel_apps (except the original
 was left behind as the gitwiki addon still uses it). A couple of things were
 modernised but basic functionality is the same as the latest revisions to the
 original.

---
 include/nav.php | 173 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 171 insertions(+), 2 deletions(-)

diff --git a/include/nav.php b/include/nav.php
index 2d12f2950..fecf28548 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -2,6 +2,10 @@
 
 use \Zotlabs\Lib as Zlib;
 
+require_once('include/security.php');
+require_once('include/menu.php');
+
+
 function nav() {
 
 	/**
@@ -38,8 +42,8 @@ EOT;
 		$observer = App::get_observer();
 
 	require_once('include/conversation.php');
-	$is_owner = (((local_channel()) && (\App::$profile['profile_uid'] == local_channel())) ? true : false);
-	$navapps[] = profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+	$is_owner = (((local_channel()) && (App::$profile['profile_uid'] == local_channel())) ? true : false);
+	$navapps[] = channel_apps($is_owner, App::$profile['channel_address']);
 
 	$myident = (($channel) ? $channel['xchan_addr'] : '');
 		
@@ -312,3 +316,168 @@ function nav_set_selected($item){
 	);
 	App::$nav_sel[$item] = 'active';
 }
+
+
+
+function channel_apps($is_owner = false, $nickname = null) {
+
+	// Don't provide any channel apps if we're running as the sys channel
+
+	if(App::$is_sys)
+		return '';
+
+	if(! get_pconfig($uid, 'system', 'channelapps','1'))
+		return '';
+
+	$channel = App::get_channel();
+
+	if($channel && is_null($nickname))
+		$nickname = $channel['channel_address'];
+
+	$uid = ((App::$profile['profile_uid']) ? App::$profile['profile_uid'] : local_channel());
+	$account_id = ((App::$profile['profile_uid']) ? App::$profile['channel_account_id'] : App::$channel['channel_account_id']);
+
+	if($uid == local_channel()) {
+		return;
+	}
+	else {
+		$cal_link = '/cal/' . $nickname;
+	}
+
+	$sql_options = item_permissions_sql($uid);
+
+	$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+		where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' 
+		and item.item_delayed = 0 and item.item_deleted = 0 
+		and ( iconfig.k = 'WEBPAGE' and item_type = %d ) 
+		$sql_options limit 1",
+		intval($uid),
+		dbesc('home'),
+		intval(ITEM_TYPE_WEBPAGE)
+	);
+
+	$has_webpages = (($r) ? true : false);
+
+	if(x($_GET, 'tab'))
+		$tab = notags(trim($_GET['tab']));
+
+	$url = z_root() . '/channel/' . $nickname;
+	$pr  = z_root() . '/profile/' . $nickname;
+
+	$tabs = [
+		[
+			'label' => t('Channel'),
+			'url'   => $url,
+			'sel'   => ((argv(0) == 'channel') ? 'active' : ''),
+			'title' => t('Status Messages and Posts'),
+			'id'    => 'status-tab',
+			'icon'  => 'home'
+		],
+	];
+
+	$p = get_all_perms($uid,get_observer_hash());
+
+	if ($p['view_profile']) {
+		$tabs[] = [
+			'label' => t('About'),
+			'url'   => $pr,
+			'sel'   => ((argv(0) == 'profile') ? 'active' : ''),
+			'title' => t('Profile Details'),
+			'id'    => 'profile-tab',
+			'icon'  => 'user'
+		];
+	}
+	if ($p['view_storage']) {
+		$tabs[] = [
+			'label' => t('Photos'),
+			'url'   => z_root() . '/photos/' . $nickname,
+			'sel'   => ((argv(0) == 'photos') ? 'active' : ''),
+			'title' => t('Photo Albums'),
+			'id'    => 'photo-tab',
+			'icon'  => 'photo'
+		];
+		$tabs[] = [
+			'label' => t('Files'),
+			'url'   => z_root() . '/cloud/' . $nickname,
+			'sel'   => ((argv(0) == 'cloud' || argv(0) == 'sharedwithme') ? 'active' : ''),
+			'title' => t('Files and Storage'),
+			'id'    => 'files-tab',
+			'icon'  => 'folder-open'
+		];
+	}
+
+	if($p['view_stream'] && $cal_link) {
+		$tabs[] = [
+			'label' => t('Events'),
+			'url'   => z_root() . $cal_link,
+			'sel'   => ((argv(0) == 'cal' || argv(0) == 'events') ? 'active' : ''),
+			'title' => t('Events'),
+			'id'    => 'event-tab',
+			'icon'  => 'calendar'
+		];
+	}
+
+
+	if ($p['chat'] && feature_enabled($uid,'ajaxchat')) {
+		$has_chats = ZLib\Chatroom::list_count($uid);
+		if ($has_chats) {
+			$tabs[] = [
+				'label' => t('Chatrooms'),
+				'url'   => z_root() . '/chat/' . $nickname,
+				'sel'   => ((argv(0) == 'chat') ? 'active' : '' ),
+				'title' => t('Chatrooms'),
+				'id'    => 'chat-tab',
+				'icon'  => 'comments-o'
+			];
+		}
+	}
+
+	$has_bookmarks = menu_list_count(local_channel(),'',MENU_BOOKMARK) + menu_list_count(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK);
+	if ($is_owner && $has_bookmarks) {
+		$tabs[] = [
+			'label' => t('Bookmarks'),
+			'url'   => z_root() . '/bookmarks',
+			'sel'   => ((argv(0) == 'bookmarks') ? 'active' : ''),
+			'title' => t('Saved Bookmarks'),
+			'id'    => 'bookmarks-tab',
+			'icon'  => 'bookmark'
+		];
+	}
+
+	if($has_webpages && feature_enabled($uid,'webpages')) {
+		$tabs[] = [
+			'label' => t('Webpages'),
+			'url'   => z_root() . '/page/' . $nickname . '/home',
+			'sel'   => ((argv(0) == 'webpages') ? 'active' : ''),
+			'title' => t('View Webpages'),
+			'id'    => 'webpages-tab',
+			'icon'  => 'newspaper-o'
+		];
+	}
+ 
+
+	if ($p['view_wiki']) {
+		if(feature_enabled($uid,'wiki') && (get_account_techlevel($account_id) > 3)) {
+			$tabs[] = [
+				'label' => t('Wikis'),
+				'url'   => z_root() . '/wiki/' . $nickname,
+				'sel'   => ((argv(0) == 'wiki') ? 'active' : ''),
+				'title' => t('Wiki'),
+				'id'    => 'wiki-tab',
+				'icon'  => 'pencil-square-o'
+			];
+		}
+	}
+
+	$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
+	call_hooks('profile_tabs', $arr);
+	call_hooks('channel_apps', $arr);	
+
+	return replace_macros(get_markup_template('profile_tabs.tpl'), 
+		[
+			'$tabs'  => $arr['tabs'],
+			'$name'  => App::$profile['channel_name'],
+			'$thumb' => App::$profile['thumb']
+		]
+	);
+}
\ No newline at end of file

From 230617208ba4ba81a7c9a289ba44da7319500397 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 29 Apr 2017 16:30:11 -0700
Subject: [PATCH 142/299] more work on client side e2ee

---
 Zotlabs/Module/Mail.php | 26 +++++++++++++++++++++++++-
 include/message.php     |  5 -----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php
index a240ccdae..f6add7778 100644
--- a/Zotlabs/Module/Mail.php
+++ b/Zotlabs/Module/Mail.php
@@ -160,6 +160,25 @@ class Mail extends \Zotlabs\Web\Controller {
 			'$header' => t('Messages'),
 		));
 	
+		if(argc() == 3 && intval(argv(1)) && argv(2) === 'download') {
+
+			$r = q("select * from mail where id = %d and channel_id = %d",
+				intval(argv(1)),
+				intval(local_channel())
+			);
+
+			if($r) {
+
+				header('Content-type: ' . $r[0]['mail_mimetype']);
+				header('Content-disposition: attachment; filename="' . t('message') . '-' . $r[0]['id'] . '"' );
+				$body = (($r[0]['mail_obscured']) ? base64url_decode(str_rot47($r[0]['body'])) : $r[0]['body']);				
+				echo $body;
+				killme();
+			}
+
+		}
+
+
 		if((argc() == 4) && (argv(2) === 'drop')) {
 			if(! intval(argv(3)))
 				return;
@@ -352,6 +371,11 @@ class Mail extends \Zotlabs\Web\Controller {
 		foreach($messages as $message) {
 	
 			$s = theme_attachments($message);
+
+			if($message['mail_raw'])
+				$message['body'] = mail_prepare_binary([ 'id' => $message['id'] ]);
+			else
+				$message['body'] = zidify_links(smilies(bbcode($message['body'])));
 	
 			$mails[] = array(
 				'mailbox' => $mailbox,
@@ -364,7 +388,7 @@ class Mail extends \Zotlabs\Web\Controller {
 				'to_url' =>  chanlink_hash($message['to_xchan']),
 				'to_photo' => $message['to']['xchan_photo_s'],
 				'subject' => $message['title'],
-				'body' => zidify_links(smilies(bbcode($message['body']))),
+				'body' => $message['body'],
 				'attachments' => $s,
 				'delete' => t('Delete message'),
 				'dreport' => t('Delivery report'),
diff --git a/include/message.php b/include/message.php
index 261a6a673..61c3e8afd 100644
--- a/include/message.php
+++ b/include/message.php
@@ -366,9 +366,6 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
 			if($r[$k]['body'])
 				$r[$k]['body'] = base64url_decode(str_rot47($r[$k]['body']));
 		}
-		if($r[$k]['mail_raw'])
-			$r[$k]['body'] = mail_prepare_binary([ 'id' => $r[$k]['id'] ]);
-
 	}
 
 	return $r;
@@ -407,8 +404,6 @@ function private_messages_fetch_message($channel_id, $messageitem_id, $updatesee
 			if($messages[$k]['body'])
 				$messages[$k]['body'] = base64url_decode(str_rot47($messages[$k]['body']));
 		}
-		if($messages[$k]['mail_raw'])
-			$messages[$k]['body'] = mail_prepare_binary([ 'id' => $messages[$k]['id'] ]);
 	}
 
 

From c845d20352300e2b8a6133bbf3fe270807ba0856 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 30 Apr 2017 16:03:01 -0700
Subject: [PATCH 143/299] ugly postgres fixes

---
 include/security.php | 56 +++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/include/security.php b/include/security.php
index b49ceec0d..ddbb3d806 100644
--- a/include/security.php
+++ b/include/security.php
@@ -597,18 +597,24 @@ function stream_perms_api_uids($perms = NULL, $limit = 0, $rand = 0 ) {
 	$random_sql = (($rand) ? " ORDER BY " . db_getfunc('RAND') . " " : '');
 	if(local_channel())
 		$ret[] = local_channel();
-	$x = q("select uid from pconfig where cat = 'perm_limits' and k = 'view_stream' and ( v & %d ) > 0 ",
-		intval($perms)
-	);
+	$x = q("select uid, v from pconfig where cat = 'perm_limits' and k = 'view_stream' ");
 	if($x) {
-		$ids = ids_to_querystr($x,'uid');
-		$r = q("select channel_id from channel where channel_id in ( $ids ) and ( channel_pageflags & %d ) = 0 and channel_system = 0 and channel_removed = 0 $random_sql $limit_sql ",
-			intval(PAGE_ADULT|PAGE_CENSORED)
-		);
-		if($r) {
-			foreach($r as $rr)
-				if(! in_array($rr['channel_id'], $ret))
-					$ret[] = $rr['channel_id'];
+		$y = [];
+		foreach($x as $xv) {
+			if(intval($xv['v']) & $perms) {
+				$y[] = $xv;
+			}
+		}
+		if($y) {		
+			$ids = ids_to_querystr($y,'uid');
+			$r = q("select channel_id from channel where channel_id in ( $ids ) and ( channel_pageflags & %d ) = 0 and channel_system = 0 and channel_removed = 0 $random_sql $limit_sql ",
+				intval(PAGE_ADULT|PAGE_CENSORED)
+			);
+			if($r) {
+				foreach($r as $rr)
+					if(! in_array($rr['channel_id'], $ret))
+						$ret[] = $rr['channel_id'];
+			}
 		}
 	}
 
@@ -635,19 +641,25 @@ function stream_perms_xchans($perms = NULL ) {
 	if(local_channel())
 		$ret[] = get_observer_hash();
 
-	$x = q("select uid from pconfig where cat = 'perm_limits' and k = 'view_stream' and ( v & %d ) > 0 ",
-		intval($perms)
-	);
+	$x = q("select uid from pconfig where cat = 'perm_limits' and k = 'view_stream' ");
 	if($x) {
-		$ids = ids_to_querystr($x,'uid');
-		$r = q("select channel_hash from channel where channel_id in ( $ids ) and ( channel_pageflags & %d ) = 0 and channel_system = 0 and channel_removed = 0 ",
-			intval(PAGE_ADULT|PAGE_CENSORED)
-		);
+		$y = [];
+		foreach($x as $xv) {
+			if(intval($xv['v']) & $perms) {
+				$y[] = $xv;
+			}
+		}
+		if($y) {		
+			$ids = ids_to_querystr($y,'uid');
+			$r = q("select channel_hash from channel where channel_id in ( $ids ) and ( channel_pageflags & %d ) = 0 and channel_system = 0 and channel_removed = 0 ",
+				intval(PAGE_ADULT|PAGE_CENSORED)
+			);
 
-		if($r) {
-			foreach($r as $rr)
-				if(! in_array($rr['channel_hash'], $ret))
-					$ret[] = $rr['channel_hash'];
+			if($r) {
+				foreach($r as $rr)
+					if(! in_array($rr['channel_hash'], $ret))
+						$ret[] = $rr['channel_hash'];
+			}
 		}
 	}
 	$str = '';

From 968209471ef807ed8d89ecc8cc2f0e3425509a19 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 30 Apr 2017 18:24:48 -0700
Subject: [PATCH 144/299] authenticate onepoll so we can receive private
 posts/comments in zotfeed; if local server bypass the network access and
 invoke zotfeed directly.

---
 Zotlabs/Daemon/Onepoll.php | 24 ++++++++++++++++++++----
 Zotlabs/Module/Zotfeed.php |  3 ++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php
index 33b244dc5..476e861d1 100644
--- a/Zotlabs/Daemon/Onepoll.php
+++ b/Zotlabs/Daemon/Onepoll.php
@@ -118,13 +118,29 @@ class Onepoll {
 
 			if($fetch_feed) {
 
-				$feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']);		
-				$feedurl .= '?f=&mindate=' . urlencode($last_update);
+				if(strpos($contact['xchan_connurl'],z_root()) === 0) {
+					// local channel - save a network fetch
+					$c = channelx_by_hash($contact['xchan_hash']);
+					if($c) {
+						$x = [ 
+							'success' => true, 
+							'body' => json_encode( [ 
+								'success' => true,
+								'messages' => zot_feed($c['channel_id'], $importer['xchan_hash'], [ 'mindate' => $last_update ])
+							])
+						];
+					}
+				}
+				else {
+					// remote fetch	
 
-				$x = z_fetch_url($feedurl);
+					$feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']);		
+					$feedurl .= '?f=&mindate=' . urlencode($last_update) . '&zid=' . $importer['channel_address'] . '@' . z_root();
+					$recurse = 0;
+					$x = z_fetch_url($feedurl, false, $recurse, [ 'session' => true ]);
+				}
 
 				logger('feed_update: ' . print_r($x,true), LOGGER_DATA);
-
 			}
 
 			if(($x) && ($x['success'])) {
diff --git a/Zotlabs/Module/Zotfeed.php b/Zotlabs/Module/Zotfeed.php
index 6b505c890..381e3acb2 100644
--- a/Zotlabs/Module/Zotfeed.php
+++ b/Zotlabs/Module/Zotfeed.php
@@ -22,7 +22,8 @@ class Zotfeed extends \Zotlabs\Web\Controller {
 	
 		$observer = \App::get_observer();
 	
-	
+		logger('observer: ' . get_observer_hash(), LOGGER_DEBUG);
+		
 		$channel_address = ((argc() > 1) ? argv(1) : '');
 		if($channel_address) {
 			$r = q("select channel_id, channel_name from channel where channel_address = '%s' and channel_removed = 0 limit 1",

From 3cdcb121c5cb7763d7c0b31f940e89ab4b4eab5f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 30 Apr 2017 19:40:17 -0700
Subject: [PATCH 145/299] use hostname, not url

---
 Zotlabs/Daemon/Onepoll.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php
index 476e861d1..920916828 100644
--- a/Zotlabs/Daemon/Onepoll.php
+++ b/Zotlabs/Daemon/Onepoll.php
@@ -135,7 +135,7 @@ class Onepoll {
 					// remote fetch	
 
 					$feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']);		
-					$feedurl .= '?f=&mindate=' . urlencode($last_update) . '&zid=' . $importer['channel_address'] . '@' . z_root();
+					$feedurl .= '?f=&mindate=' . urlencode($last_update) . '&zid=' . $importer['channel_address'] . '@' . \App::get_hostname();
 					$recurse = 0;
 					$x = z_fetch_url($feedurl, false, $recurse, [ 'session' => true ]);
 				}

From 5ed5c76d3f2628ffec348a61c681c86730e383de Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 May 2017 18:02:00 -0700
Subject: [PATCH 146/299] new function Hook::register_array() to bulk register
 several hooks from the same file with default settings

---
 Zotlabs/Extend/Hook.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Zotlabs/Extend/Hook.php b/Zotlabs/Extend/Hook.php
index fef3ebe9b..c6f9ea850 100644
--- a/Zotlabs/Extend/Hook.php
+++ b/Zotlabs/Extend/Hook.php
@@ -40,6 +40,15 @@ class Hook {
 		return $r;
 	}
 
+	static public function register_array($file,$arr) {
+		if($arr) {
+			foreach($arr as $k => $v) {
+				self::register($k,$file,$v);
+			}
+		}
+	}
+
+
 	static public function unregister($hook,$file,$function,$version = 1,$priority = 0) {
 		if(is_array($function)) {
 			$function = serialize($function);

From 42ed73ed4ac55ac62214301097f7d72cbcb37238 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 May 2017 21:07:11 -0700
Subject: [PATCH 147/299] add cdav files

---
 view/tpl/cdav_addressbook.tpl        | 462 +++++++++++++++++++++++++++
 view/tpl/cdav_calendar.tpl           | 349 ++++++++++++++++++++
 view/tpl/cdav_widget_addressbook.tpl |  66 ++++
 view/tpl/cdav_widget_calendar.tpl    | 121 +++++++
 4 files changed, 998 insertions(+)
 create mode 100644 view/tpl/cdav_addressbook.tpl
 create mode 100644 view/tpl/cdav_calendar.tpl
 create mode 100644 view/tpl/cdav_widget_addressbook.tpl
 create mode 100644 view/tpl/cdav_widget_calendar.tpl

diff --git a/view/tpl/cdav_addressbook.tpl b/view/tpl/cdav_addressbook.tpl
new file mode 100644
index 000000000..587a95caa
--- /dev/null
+++ b/view/tpl/cdav_addressbook.tpl
@@ -0,0 +1,462 @@
+<script>
+$(document).ready(function() {
+
+	$(document).on('click', '.vcard-header, .vcard-cancel-btn', updateView);
+	$(document).on('click', '.add-field', doAdd);
+	$(document).on('click', '.remove-field', doRemove);
+
+	function updateView() {
+		var id = $(this).data('id');
+		var action = $(this).data('action');
+		var header = $('#vcard-header-' + id);
+		var cancel = $('#vcard-cancel-' + id);
+		var addField = $('#vcard-add-field-' + id);
+		var info = $('#vcard-info-' + id);
+		var vcardPreview = $('#vcard-preview-' + id);
+		var fn = $('#vcard-fn-' + id);
+
+		if(action === 'open') {
+			$(header).addClass('active');
+			$(cancel).show();
+			$(addField).show();
+			$(info).show();
+			$(fn).show();
+			$(vcardPreview).hide();
+		}
+		else {
+			$(header).removeClass('active');
+			$(cancel).hide();
+			$(addField).hide();
+			$(info).hide();
+			$(fn).hide();
+			$(vcardPreview).show();
+		}
+	}
+
+	function doAdd(e) {
+		e.preventDefault();
+		var what = $(this).data('add');
+		var id = $(this).data('id');
+		var element = '#template-form-' + what;
+		var where = '#card_form_' + id;
+
+		$(element + ' .remove-field').attr('data-id', id)
+
+		if(what === 'vcard-adr') {
+			var adrCount = $(where + ' .form-' + what).length;
+			var attrName = 'adr[' + adrCount + '][]';
+			$(element + ' input').attr('name', attrName);
+		}
+
+		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
+			$(where + ' .add-' + what).hide()
+		}
+
+		$(element).clone().removeAttr('id').appendTo(where + ' .form-' + what + '-wrapper');
+	}
+
+	function doRemove() {
+		var what = $(this).data('remove');
+		var element = $(this).parents('div.form-' + what);
+		var where = '#card_form_' + $(this).data('id');
+
+		if(what === 'vcard-org' || what === 'vcard-title' || what === 'vcard-note') {
+			$(where + ' .add-' + what).show()
+		}
+
+		$(element).remove();
+	}
+
+});
+</script>
+<div id="template-form-vcard-org" class="form-group form-vcard-org">
+	<div class="form-group form-vcard-org">
+		<input type="text" name="org" value="" placeholder="{{$org_label}}">
+		<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+</div>
+
+<div id="template-form-vcard-title" class="form-group form-vcard-title">
+	<div class="form-group form-vcard-title">
+		<input type="text" name="title" value="" placeholder="{{$title_label}}">
+		<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+</div>
+
+<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+	<select name="tel_type[]">
+		<option value="CELL">{{$mobile}}</option>
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+	<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-email" class="form-group form-vcard-email">
+	<select name="email_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+	<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+	<select name="impp_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="impp[]" value="" placeholder="{{$impp_label}}">
+	<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-url" class="form-group form-vcard-url">
+	<select name="url_type[]">
+		<option value="HOME">{{$home}}</option>
+		<option value="WORK">{{$work}}</option>
+		<option value="OTHER">{{$other}}</option>
+	</select>
+	<input type="text" name="url[]" value="" placeholder="{{$url_label}}">
+	<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+</div>
+
+<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
+	<div class="form-group">
+		<select name="adr_type[]">
+			<option value="HOME">{{$home}}</option>
+			<option value="WORK">{{$work}}</option>
+			<option value="OTHER">{{$other}}</option>
+		</select>
+		<label>{{$adr_label}}</label>
+		<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$po_box}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$extra}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$street}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$locality}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$region}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$zip_code}}">
+	</div>
+	<div class="form-group">
+		<input type="text" name="" value="" placeholder="{{$country}}">
+	</div>
+</div>
+
+<div id="template-form-vcard-note" class="form-group form-vcard-note">
+	<label>{{$note_label}}</label>
+	<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+	<textarea name="note" class="form-control"></textarea>
+</div>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<button type="button" class="btn btn-success btn-sm float-right" onclick="openClose('create_form')"><i class="fa fa-plus-circle"></i> {{$add_card}}</button>
+		<h2>{{$displayname}}</h2>
+	</div>
+	<div id="create_form" class="section-content-tools-wrapper">
+		<form id="card_form_new" method="post" action="">
+			<input type="hidden" name="target" value="{{$id}}">
+			<div class="dropdown pull-right">
+				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					<a class="dropdown-item add-vcard-org add-field" style="display: none" href="#" data-add="vcard-org" data-id="new">{{$org_label}}</a>
+					<a class="dropdown-item add-vcard-title add-field" style="display: none" href="#" data-add="vcard-title" data-id="new">{{$title_label}}</a>
+					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="new">{{$tel_label}}</a>
+					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="new">{{$email_label}}</a>
+					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="new">{{$impp_label}}</a>
+					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="new">{{$url_label}}</a>
+					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="new">{{$adr_label}}</a>
+					<a class="dropdown-item add-vcard-note add-field" href="#" data-add="vcard-note" data-id="new">{{$note_label}}</a>
+				</div>
+			</div>
+
+			<div class="vcard-fn-create form-group">
+				<div class="form-vcard-fn-wrapper">
+					<div class="form-group form-vcard-fn">
+						<div class="vcard-nophoto"><i class="fa fa-user"></i></div><input type="text" name="fn" value="" placeholder="{{$name_label}}">
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-org form-group">
+				<div class="form-vcard-org-wrapper">
+					<div class="form-group form-vcard-org">
+						<input type="text" name="org" value="" placeholder="{{$org_label}}">
+						<i data-remove="vcard-org" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-title form-group">
+				<div class="form-vcard-title-wrapper">
+					<div class="form-group form-vcard-title">
+						<input type="text" name="title" value="" placeholder="{{$title_label}}">
+						<i data-remove="vcard-title" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-tel form-group">
+				<div class="form-vcard-tel-wrapper">
+					<div class="form-group form-vcard-tel">
+						<select name="tel_type[]">
+							<option value="CELL">{{$mobile}}</option>
+							<option value="HOME">{{$home}}</option>
+							<option value="WORK">{{$work}}</option>
+							<option value="OTHER">{{$other}}</option>
+						</select>
+						<input type="text" name="tel[]" value="" placeholder="{{$tel_label}}">
+						<i data-remove="vcard-tel" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+
+			<div class="vcard-email form-group">
+				<div class="form-vcard-email-wrapper">
+					<div class="form-group form-vcard-email">
+						<select name="email_type[]">
+							<option value="HOME">{{$home}}</option>
+							<option value="WORK">{{$work}}</option>
+							<option value="OTHER">{{$other}}</option>
+						</select>
+						<input type="text" name="email[]" value="" placeholder="{{$email_label}}">
+						<i data-remove="vcard-email" data-id="new" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+				</div>
+			</div>
+
+			<div class="vcard-impp form-group">
+				<div class="form-vcard-impp-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-url form-group">
+				<div class="form-vcard-url-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-adr form-group">
+				<div class="form-vcard-adr-wrapper">
+				</div>
+			</div>
+
+			<div class="vcard-note form-group">
+				<div class="form-vcard-note-wrapper">
+				</div>
+			</div>
+
+			<button type="submit" name="create" value="create_card" class="btn btn-primary btn-sm pull-right">{{$create}}</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm" onclick="openClose('create_form')">{{$cancel}}</button>
+			<div class="clear"></div>
+		</form>
+	</div>
+
+	{{foreach $cards as $card}}
+	<form id="card_form_{{$card.id}}" method="post" action="">
+		<input type="hidden" name="target" value="{{$id}}">
+		<input type="hidden" name="uri" value="{{$card.uri}}">
+		<div class="section-content-wrapper-np">
+			<div id="vcard-cancel-{{$card.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
+			<div id="vcard-add-field-{{$card.id}}" class="dropdown pull-right vcard-add-field">
+				<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					<a class="dropdown-item add-vcard-org add-field"{{if $card.org}} style="display: none"{{/if}} href="#" data-add="vcard-org" data-id="{{$card.id}}">{{$org_label}}</a>
+					<a class="dropdown-item add-vcard-title add-field"{{if $card.title}} style="display: none"{{/if}} href="#" data-add="vcard-title" data-id="{{$card.id}}">{{$title_label}}</a>
+					<a class="dropdown-item add-vcard-tel add-field" href="#" data-add="vcard-tel" data-id="{{$card.id}}">{{$tel_label}}</a>
+					<a class="dropdown-item add-vcard-email add-field" href="#" data-add="vcard-email" data-id="{{$card.id}}">{{$email_label}}</a>
+					<a class="dropdown-item add-vcard-impp add-field" href="#" data-add="vcard-impp" data-id="{{$card.id}}">{{$impp_label}}</a>
+					<a class="dropdown-item add-vcard-url add-field" href="#" data-add="vcard-url" data-id="{{$card.id}}">{{$url_label}}</a>
+					<a class="dropdown-item add-vcard-adr add-field" href="#" data-add="vcard-adr" data-id="{{$card.id}}">{{$adr_label}}</a>
+					<a class="dropdown-item add-vcard-note add-field"{{if $card.note}} style="display: none"{{/if}} href="#" data-add="vcard-note" data-id="{{$card.id}}">{{$note_label}}</a>
+				</div>
+			</div>
+			<div id="vcard-header-{{$card.id}}" class="vcard-header" data-id="{{$card.id}}" data-action="open">
+				{{if $card.photo}}<img class="vcard-photo" src="{{$card.photo}}" width="32px" height="32px">{{else}}<div class="vcard-nophoto"><i class="fa fa-user"></i></div>{{/if}}
+				<span id="vcard-preview-{{$card.id}}" class="vcard-preview">
+					{{if $card.fn}}<span class="vcard-fn-preview">{{$card.fn}}</span>{{/if}}
+					{{if $card.emails.0.address}}<span class="vcard-email-preview hidden-xs">{{$card.emails.0.address}}</span>{{/if}}
+					{{if $card.tels.0}}<span class="vcard-tel-preview hidden-xs">{{$card.tels.0.nr}}</span>{{/if}}
+				</span>
+				<input id="vcard-fn-{{$card.id}}" class="vcard-fn" type="text" name="fn" value="{{$card.fn}}" size="{{$card.fn|count_characters:true}}" placeholder="{{$name_label}}">
+			</div>
+		</div>
+		<div id="vcard-info-{{$card.id}}" class="vcard-info section-content-wrapper">
+
+			<div class="vcard-org form-group">
+				<div class="form-vcard-org-wrapper">
+					{{if $card.org}}
+					<div class="form-group form-vcard-org">
+						<input type="text" name="org" value="{{$card.org}}" size="{{$card.org|count_characters:true}}" placeholder="{{$org_label}}">
+						<i data-remove="vcard-org" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-title form-group">
+				<div class="form-vcard-title-wrapper">
+					{{if $card.title}}
+					<div class="form-group form-vcard-title">
+						<input type="text" name="title" value="{{$card.title}}" size="{{$card.title|count_characters:true}}" placeholder="{{$title_label}}">
+						<i data-remove="vcard-title" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/if}}
+				</div>
+			</div>
+
+
+			<div class="vcard-tel form-group">
+				<div class="form-vcard-tel-wrapper">
+					{{if $card.tels}}
+					{{foreach $card.tels as $tel}}
+					<div class="form-group form-vcard-tel">
+						<select name="tel_type[]">
+							<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
+							<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
+							<option value="HOME"{{if $tel.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $tel.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $tel.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="tel[]" value="{{$tel.nr}}" size="{{$tel.nr|count_characters:true}}" placeholder="{{$tel_label}}">
+						<i data-remove="vcard-tel" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+
+			<div class="vcard-email form-group">
+				<div class="form-vcard-email-wrapper">
+					{{if $card.emails}}
+					{{foreach $card.emails as $email}}
+					<div class="form-group form-vcard-email">
+						<select name="email_type[]">
+							<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
+							<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $email.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $email.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="email[]" value="{{$email.address}}" size="{{$email.address|count_characters:true}}" placeholder="{{$email_label}}">
+						<i data-remove="vcard-email" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-impp form-group">
+				<div class="form-vcard-impp-wrapper">
+					{{if $card.impps}}
+					{{foreach $card.impps as $impp}}
+					<div class="form-group form-vcard-impp">
+						<select name="impp_type[]">
+							<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
+							<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $impp.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $impp.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="impp[]" value="{{$impp.address}}" size="{{$impp.address|count_characters:true}}" placeholder="{{$impp_label}}">
+						<i data-remove="vcard-impp" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-url form-group">
+				<div class="form-vcard-url-wrapper">
+					{{if $card.urls}}
+					{{foreach $card.urls as $url}}
+					<div class="form-group form-vcard-url">
+						<select name="url_type[]">
+							<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
+							<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+							<option value="WORK"{{if $url.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+							<option value="OTHER"{{if $url.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+						</select>
+						<input type="text" name="url[]" value="{{$url.address}}" size="{{$url.address|count_characters:true}}" placeholder="{{$url_label}}">
+						<i data-remove="vcard-url" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-adr form-group">
+				<div class="form-vcard-adr-wrapper">
+					{{if $card.adrs}}
+					{{foreach $card.adrs as $adr}}
+					<div class="form-group form-vcard-adr">
+						<div class="form-group">
+							<label>{{$adr_label}}</label>
+							<select name="adr_type[]">
+								<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
+								<option value="HOME"{{if $adr.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
+								<option value="WORK"{{if $adr.type.0 == 'WORK'}} selected="selected"{{/if}}>{{$work}}</option>
+								<option value="OTHER"{{if $adr.type.0 == 'OTHER'}} selected="selected"{{/if}}>{{$other}}</option>
+							</select>
+							<i data-remove="vcard-adr" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
+						</div>
+						<div class="form-group">
+							<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
+						</div>
+					</div>
+					{{/foreach}}
+					{{/if}}
+				</div>
+			</div>
+
+			<div class="vcard-note form-group form-vcard-note">
+				<div class="form-vcard-note-wrapper">
+					{{if $card.note}}
+					<label>{{$note_label}}</label>
+					<i data-remove="vcard-note" data-id="{{$card.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
+					<textarea name="note" class="form-control">{{$card.note}}</textarea>
+					{{/if}}
+				</div>
+			</div>
+
+
+			<button type="submit" name="update" value="update_card" class="btn btn-primary btn-sm pull-right">{{$update}}</button>
+			<button type="submit" name="delete" value="delete_card" class="btn btn-danger btn-sm">{{$delete}}</button>
+			<button type="button" class="btn btn-outline-secondary btn-sm vcard-cancel-btn" data-id="{{$card.id}}" data-action="cancel">{{$cancel}}</button>
+			<div class="clear"></div>
+		</div>
+	</form>
+	{{/foreach}}
+</div>
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
new file mode 100644
index 000000000..5d683d751
--- /dev/null
+++ b/view/tpl/cdav_calendar.tpl
@@ -0,0 +1,349 @@
+<script>
+
+var new_event = [];
+var new_event_id = Math.random().toString(36).substring(7);
+var views = {'month' : '{{$month}}', 'agendaWeek' : '{{$week}}', 'agendaDay' : '{{$day}}', 'listMonth' : '{{$list_month}}', 'listWeek' : '{{$list_week}}', 'listDay' : '{{$list_day}}'};
+
+$(document).ready(function() {
+	$('#calendar').fullCalendar({
+		eventSources: [ {{$sources}} ],
+
+		header: false,
+		eventTextColor: 'white',
+
+		lang: '{{$lang}}',
+		firstDay: {{$first_day}},
+
+		monthNames: aStr['monthNames'],
+		monthNamesShort: aStr['monthNamesShort'],
+		dayNames: aStr['dayNames'],
+		dayNamesShort: aStr['dayNamesShort'],
+		allDayText: aStr['allday'],
+
+		timeFormat: 'HH:mm',
+		timezone: 'local',
+
+		defaultTimedEventDuration: '01:00:00',
+		snapDuration: '00:15:00',
+
+		dayClick: function(date, jsEvent, view) {
+
+			if(new_event.length)
+				$('#calendar').fullCalendar( 'removeEventSource', new_event);
+
+			$('#event_uri').val('');
+			$('#id_title').val('New event');
+			$('#calendar_select').val($("#calendar_select option:first").val()).attr('disabled', false);
+			$('#id_dtstart').val(date.format());
+			$('#id_dtend').val(date.hasTime() ? date.add(1, 'hours').format() : date.add(1, 'days').format());
+			$('#id_description').val('');
+			$('#id_location').val('');
+			$('#event_submit').val('create_event').html('Create');
+			$('#event_delete').hide();
+
+			new_event = [{ id: new_event_id, title  : 'New event', start: $('#id_dtstart').val(), end: $('#id_dtend').val(), editable: true, color: '#bbb' }]
+			$('#calendar').fullCalendar( 'addEventSource', new_event);
+		},
+
+		eventClick: function(event, jsEvent, view) {
+
+			if(event.id == new_event_id) {
+				$(window).scrollTop(0);
+				$('.section-content-tools-wrapper, #event_form_wrapper').show();
+				$('#recurrence_warning').hide();
+				$('#id_title').focus().val('');
+				return false;
+			}
+
+			if($('main').hasClass('fullscreen') && view.type !== 'month' && event.rw)
+				$('#calendar').fullCalendar('option', 'height', 'auto');
+
+			if(new_event.length && event.rw) {
+				$('#calendar').fullCalendar( 'removeEventSource', new_event);
+			}
+
+			if(!event.recurrent && event.rw) {
+				var start_clone = moment(event.start);
+				var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
+
+				$(window).scrollTop(0);
+				$('.section-content-tools-wrapper, #event_form_wrapper').show();
+				$('#recurrence_warning').hide();
+				$('#id_title').focus();
+
+				$('#event_uri').val(event.uri);
+				$('#id_title').val(event.title);
+				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
+				$('#id_dtstart').val(event.start.format());
+				$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
+				$('#id_description').val(event.description);
+				$('#id_location').val(event.location);
+				$('#event_submit').val('update_event').html('Update');
+				$('#event_delete').show();
+			}
+			else if(event.recurrent && event.rw) {
+				$('.section-content-tools-wrapper, #recurrence_warning').show();
+				$('#event_form_wrapper').hide();
+				$('#event_uri').val(event.uri);
+				$('#calendar_select').val(event.calendar_id[0] + ':' + event.calendar_id[1]).attr('disabled', true);
+			}
+		},
+
+		eventResize: function(event, delta, revertFunc) {
+
+			$('#id_title').val(event.title);
+			$('#id_dtstart').val(event.start.format());
+			$('#id_dtend').val(event.end.format());
+
+			$.post( 'cdav/calendar', {
+				'update': 'resize',
+				'id[]': event.calendar_id,
+				'uri': event.uri,
+				'dtstart': event.start ? event.start.format() : '',
+				'dtend': event.end ? event.end.format() : ''
+			})
+			.fail(function() {
+				revertFunc();
+			});
+		},
+
+		eventDrop: function(event, delta, revertFunc) {
+
+			var start_clone = moment(event.start);
+			var noend_allday = start_clone.add(1, 'day').format('YYYY-MM-DD');
+
+			$('#id_title').val(event.title);
+			$('#id_dtstart').val(event.start.format());
+			$('#id_dtend').val(event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday);
+
+			$.post( 'cdav/calendar', {
+				'update': 'drop',
+				'id[]': event.calendar_id,
+				'uri': event.uri,
+				'dtstart': event.start ? event.start.format() : '',
+				'dtend': event.end ? event.end.format() : event.start.hasTime() ? '' : noend_allday
+			})
+			.fail(function() {
+				revertFunc();
+			});
+		},
+
+		loading: function(isLoading, view) {
+			$('#events-spinner').spin('tiny');
+			$('#events-spinner > i').css('color', 'transparent');
+			if(!isLoading) {
+				$('#events-spinner').spin(false);
+				$('#events-spinner > i').css('color', '');
+			}
+		}
+	});
+
+	// echo the title
+	var view = $('#calendar').fullCalendar('getView');
+
+	$('#title').text(view.title);
+
+	$('#view_selector').html(views[view.name]);
+
+	$('.color-edit').colorpicker({ input: '.color-edit-input' });
+
+	$(document).on('click','#fullscreen-btn', on_fullscreen);
+	$(document).on('click','#inline-btn', on_inline);
+
+	$(document).on('click','#event_submit', on_submit);
+	$(document).on('click','#event_more', on_more);
+	$(document).on('click','#event_cancel, #event_cancel_recurrent', reset_form);
+	$(document).on('click','#event_delete, #event_delete_recurrent', on_delete);
+
+});
+
+function changeView(action, viewName) {
+	$('#calendar').fullCalendar(action, viewName);
+	var view = $('#calendar').fullCalendar('getView');
+
+	if($('main').hasClass('fullscreen'))
+		if(view.name !== 'month')
+			$('.section-content-tools-wrapper').css('display') === 'none' ? on_fullscreen() : on_inline() ;
+		else
+			on_fullscreen();
+	else
+		on_inline();
+
+	$('#title').text(view.title);
+	$('#view_selector').html(views[view.name]);
+}
+
+function add_remove_json_source(source, color, editable, status) {
+
+	if(status === undefined)
+		status = 'fa-calendar-check-o';
+
+	if(status === 'drop') {
+		reset_form();
+		$('#calendar').fullCalendar( 'removeEventSource', source );
+		return;
+	}
+
+	var parts = source.split('/');
+	var id = parts[4];
+
+	var selector = '#calendar-btn-' + id;
+
+	if($(selector).hasClass('fa-calendar-o')) {
+		$('#calendar').fullCalendar( 'addEventSource', { url: source, color: color, editable: editable });
+		$(selector).removeClass('fa-calendar-o');
+		$(selector).addClass(status);
+		$.get('/cdav/calendar/switch/' + id + '/1');
+	}
+	else {
+		$('#calendar').fullCalendar( 'removeEventSource', source );
+		$(selector).removeClass(status);
+		$(selector).addClass('fa-calendar-o');
+		$.get('/cdav/calendar/switch/' + id + '/0');
+	}
+}
+
+function on_fullscreen() {
+	var view = $('#calendar').fullCalendar('getView');
+	if(($('.section-content-tools-wrapper').css('display') === 'none') || ($('.section-content-tools-wrapper').css('display') !== 'none' && view.type === 'month'))
+		$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+}
+
+function on_inline() {
+	var view = $('#calendar').fullCalendar('getView');
+	((view.type === 'month') ? $('#calendar').fullCalendar('option', 'height', '') : $('#calendar').fullCalendar('option', 'height', 'auto'));
+}
+
+function on_submit() {
+	$.post( 'cdav/calendar', {
+		'submit': $('#event_submit').val(),
+		'target': $('#calendar_select').val(),
+		'uri': $('#event_uri').val(),
+		'title': $('#id_title').val(),
+		'dtstart': $('#id_dtstart').val(),
+		'dtend': $('#id_dtend').val(),
+		'description': $('#id_description').val(),
+		'location': $('#id_location').val()
+	})
+	.done(function() {
+		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
+		reset_form();
+	});
+}
+
+function on_delete() {
+	$.post( 'cdav/calendar', {
+		'delete': 'delete',
+		'target': $('#calendar_select').val(),
+		'uri': $('#event_uri').val(),
+	})
+	.done(function() {
+		$('#calendar').fullCalendar( 'refetchEventSources', [ {{$sources}} ] );
+		reset_form();
+	});
+}
+
+function reset_form() {
+	$('.section-content-tools-wrapper, #event_form_wrapper, #recurrence_warning').hide();
+
+	$('#event_submit').val('');
+	$('#calendar_select').val('');
+	$('#event_uri').val('');
+	$('#id_title').val('');
+	$('#id_dtstart').val('');
+	$('#id_dtend').val('');
+
+	if(new_event.length)
+		$('#calendar').fullCalendar( 'removeEventSource', new_event);
+
+	if($('#more_block').hasClass('open'))
+		on_more();
+
+	if($('main').hasClass('fullscreen'))
+		on_fullscreen();
+}
+
+function on_more() {
+	if($('#more_block').hasClass('open')) {
+		$('#event_more').html('<i class="fa fa-caret-down"></i> {{$more}}');
+		$('#more_block').removeClass('open').hide();
+	}
+	else {
+		$('#event_more').html('<i class="fa fa-caret-up"></i> {{$less}}');
+		$('#more_block').addClass('open').show();
+	}
+}
+
+</script>
+
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="float-right">
+			<div class="dropdown">
+				<button id="view_selector" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"></button>
+				<div class="dropdown-menu">
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
+					<div class="dropdown-divider"></div>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listMonth'); return false;">{{$list_month}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listWeek'); return false;">{{$list_week}}</a></li>
+					<a class="dropdown-item" href="#" onclick="changeView('changeView', 'listDay'); return false;">{{$list_day}}</a></li>
+				</div>
+				<div class="btn-group">
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+					<button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+				</div>
+				<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			</div>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper" style="display: none">
+		<div id="recurrence_warning" style="display: none">
+			<div class="section-content-warning-wrapper">
+				{{$recurrence_warning}}
+			</div>
+			<div>
+				<button id="event_delete_recurrent" type="button" class="btn btn-danger btn-sm">{{$delete_all}}</button>
+				<button id="event_cancel_recurrent" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
+			</div>
+		</div>
+		<div id="event_form_wrapper" style="display: none">
+			<form id="event_form" method="post" action="">
+				<input id="event_uri" type="hidden" name="uri" value="">
+				{{include file="field_input.tpl" field=$title}}
+				<label for="calendar_select">{{$calendar_select_label}}</label>
+				<select id="calendar_select" name="target" class="form-control form-group">
+					{{foreach $writable_calendars as $writable_calendar}}
+					<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}{{if $writable_calendar.sharer}} ({{$writable_calendar.sharer}}){{/if}}</option>
+					{{/foreach}}
+				</select>
+				<div id="more_block" style="display: none;">
+					{{include file="field_input.tpl" field=$dtstart}}
+					{{include file="field_input.tpl" field=$dtend}}
+					{{include file="field_textarea.tpl" field=$description}}
+					{{include file="field_textarea.tpl" field=$location}}
+				</div>
+				<div class="form-group">
+					<div class="pull-right">
+						<button id="event_more" type="button" class="btn btn-outline-secondary btn-sm"><i class="fa fa-caret-down"></i> {{$more}}</button>
+						<button id="event_submit" type="button" value="" class="btn btn-primary btn-sm"></button>
+
+					</div>
+					<div>
+						<button id="event_delete" type="button" class="btn btn-danger btn-sm">{{$delete}}</button>
+						<button id="event_cancel" type="button" class="btn btn-outline-secondary btn-sm">{{$cancel}}</button>
+					</div>
+					<div class="clear"></div>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="section-content-wrapper-np">
+		<div id="calendar"></div>
+	</div>
+</div>
diff --git a/view/tpl/cdav_widget_addressbook.tpl b/view/tpl/cdav_widget_addressbook.tpl
new file mode 100644
index 000000000..c875dc977
--- /dev/null
+++ b/view/tpl/cdav_widget_addressbook.tpl
@@ -0,0 +1,66 @@
+<div class="widget">
+	<h3>{{$addressbooks_label}}</h3>
+	{{foreach $addressbooks as $addressbook}}
+	<div id="addressbook-{{$addressbook.id}}" class="ml-3">
+		<div class="form-group">
+			<i class="fa fa-user generic-icons"></i><a href="/cdav/addressbook/{{$addressbook.id}}">{{$addressbook.displayname}}</a>
+			<div class="float-right">
+				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-addressbook-{{$addressbook.id}}')"></i>
+				<a href="/cdav/addressbooks/{{$addressbook.ownernick}}/{{$addressbook.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+				<a href="#" onclick="dropItem('/cdav/addressbook/drop/{{$addressbook.id}}', '#addressbook-{{$addressbook.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+			</div>
+		</div>
+		<div id="edit-addressbook-{{$addressbook.id}}" class="sub-menu" style="display: none;">
+			<form id="edit-addressbook-{{$addressbook.id}}" method="post" action="">
+				<label for="edit-{{$addressbook.id}}">{{$edit_label}}</label>
+				<div id="edit-form-{{$addressbook.id}}" class="form-group">
+					<input id="id-{{$addressbook.id}}" name="id" type="hidden" value="{{$addressbook.id}}">
+					<input id="edit-{{$addressbook.id}}" name="{DAV:}displayname" type="text" value="{{$addressbook.displayname}}" class="form-control">
+				</div>
+				<div class="form-group">
+					<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
+				</div>
+			</form>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+
+<div class="widget">
+	<h3>{{$tools_label}}</h3>
+	<ul class="nav nav-pills flex-column">
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('create-addressbook'); return false;"><i class="fa fa-user-plus generic-icons"></i> {{$create_label}}</a>
+		</li>
+		<div id="create-addressbook" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form method="post" action="">
+					<div class="form-group">
+						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control form-group">
+						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		</li>
+		<div id="upload-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+					<div class="form-group">
+						<select id="import" name="target" class="form-control">
+							<option value="">{{$import_placeholder}}</option>
+							{{foreach $addressbooks as $addressbook}}
+							<option value="{{$addressbook.id}}">{{$addressbook.displayname}}</option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="form-group">
+						<input class="form-control-file w-100" id="addressbook-upload-choose" type="file" name="userfile" />
+					</div>
+					<button class="btn btn-primary btn-sm" type="submit" name="a_upload" value="a_upload">{{$upload}}</button>
+				</form>
+			</div>
+		</div>
+	</ul>
+</div>
diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl
new file mode 100644
index 000000000..ec2257a19
--- /dev/null
+++ b/view/tpl/cdav_widget_calendar.tpl
@@ -0,0 +1,121 @@
+{{if $my_calendars}}
+<div class="widget">
+	<h3>{{$my_calendars_label}}</h3>
+	{{foreach $my_calendars as $calendar}}
+	<div id="calendar-{{$calendar.calendarid}}">
+		<div class="ml-3{{if !$calendar@last}} form-group{{/if}}">
+			<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}fa-calendar-check-o{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}})" style="color: {{$calendar.color}};"></i>{{$calendar.displayname}}
+			<div class="float-right">
+				<i id="edit-icon" class="fa fa-pencil fakelink generic-icons" onclick="openClose('edit-calendar-{{$calendar.calendarid}}')"></i>
+				<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+				<i id="share-icon" class="fa fa-share-alt fakelink generic-icons" onclick="openClose('share-calendar-{{$calendar.calendarid}}')"></i>
+				<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+			</div>
+			<div id="share-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
+				{{if $calendar.sharees}}
+				{{foreach $calendar.sharees as $sharee}}
+				<div id="sharee-{{$calendar.calendarid}}" class="form-group">
+					<i class="fa fa-share generic-icons"></i>{{$sharee.name}}&nbsp;{{$sharee.access}}
+					<div class="pull-right">
+						<a href="#" onclick="dropItem('/cdav/calendar/dropsharee/{{$calendar.calendarid}}/{{$calendar.instanceid}}/{{$sharee.hash}}', '#sharee-{{$calendar.calendarid}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+					</div>
+				</div>
+				{{/foreach}}
+				{{/if}}
+				<form method="post" action="">
+					<label for="share-{{$calendar.calendarid}}">{{$share_label}}</label>
+					<input name="calendarid" type="hidden" value="{{$calendar.calendarid}}">
+					<input name="instanceid" type="hidden" value="{{$calendar.instanceid}}">
+					<div class="form-group">
+						<select id="share-{{$calendar.calendarid}}" name="sharee" class="form-control">
+							{{$sharee_options}}
+						</select>
+					</div>
+					<div class="form-group">
+						<select name="access" class="form-control">
+							{{$access_options}}
+						</select>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="share" value="share" class="btn btn-primary btn-sm">{{$share}}</button>
+					</div>
+				</form>
+			</div>
+			<div id="edit-calendar-{{$calendar.calendarid}}" class="sub-menu" style="display: none; border-color: {{$calendar.color}};">
+				<form id="edit-calendar-{{$calendar.calendarid}}" method="post" action="" class="colorpicker-component color-edit">
+					<input id="id-{{$calendar.calendarid}}" name="id" type="hidden" value="{{$calendar.calendarid}}:{{$calendar.instanceid}}">
+					<input id="color-{{$calendar.calendarid}}" name="color" type="hidden" value="{{$calendar.color}}" class="color-edit-input">
+					<label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label>
+					<div id="edit-form-{{$calendar.calendarid}}" class="input-group form-group">
+						<input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control">
+						<span class="input-group-addon"><i></i></span>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+{{/if}}
+
+{{if $shared_calendars}}
+<div class="widget">
+	<h3>{{$shared_calendars_label}}</h3>
+	{{foreach $shared_calendars as $calendar}}
+	<div id="shared-calendar-{{$calendar.calendarid}}" class="ml-3{{if !$calendar@last}} form-group{{/if}}">
+		<i id="calendar-btn-{{$calendar.calendarid}}" class="fa {{if $calendar.switch}}{{if $calendar.access == 'read-write'}}fa-calendar-check-o{{else}}fa-calendar-times-o{{/if}}{{else}}fa-calendar-o{{/if}} generic-icons fakelink" onclick="add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, {{if $calendar.access == 'read-write'}}'fa-calendar-check-o'{{else}}'fa-calendar-times-o'{{/if}})"  style="color: {{$calendar.color}};"></i>{{$calendar.displayname}} ({{$calendar.sharer}})
+		<div class="pull-right">
+			<a href="/cdav/calendars/{{$calendar.ownernick}}/{{$calendar.uri}}/?export"><i id="download-icon" class="fa fa-cloud-download fakelink generic-icons"></i></a>
+			<a href="#" onclick="var drop = dropItem('/cdav/calendar/drop/{{$calendar.calendarid}}/{{$calendar.instanceid}}', '#shared-calendar-{{$calendar.calendarid}}'); if(drop) { add_remove_json_source('{{$calendar.json_source}}', '{{$calendar.color}}', {{$calendar.editable}}, 'drop'); } return false;"><i class="fa fa-trash-o drop-icons"></i></a>
+		</div>
+	</div>
+	{{/foreach}}
+</div>
+{{/if}}
+
+<div class="widget">
+	<h3>{{$tools_label}}</h3>
+	<div class="nav nav-pills flex-column">
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('create-calendar'); return false;"><i class="fa fa-calendar-plus-o generic-icons"></i> {{$create_label}}</a>
+		</li>
+		<div id="create-calendar" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form method="post" action="" class="colorpicker-component color-edit">
+					<input id="color" name="color" type="hidden" value="#3a87ad" class="color-edit-input">
+					<div id="create-form" class="input-group form-group">
+						<input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control">
+						<span class="input-group-addon"><i></i></span>
+					</div>
+					<div class="form-group">
+						<button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button>
+					</div>
+				</form>
+			</div>
+		</div>
+		<li class="nav-item">
+			<a class="nav-link" href="#" onclick="openClose('upload-form'); return false;"><i class="fa fa-cloud-upload generic-icons"></i> {{$import_label}}</a>
+		</li>
+		<div id="upload-form" class="sub-menu-wrapper">
+			<div class="sub-menu">
+				<form enctype="multipart/form-data" method="post" action="">
+					<div class="form-group">
+						<select id="import" name="target" class="form-control">
+							<option value="">{{$import_placeholder}}</option>
+							{{foreach $writable_calendars as $writable_calendar}}
+							<option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}</option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="form-group">
+						<input class="form-control-file w-100" id="event-upload-choose" type="file" name="userfile" />
+					</div>
+					<button class="btn btn-primary btn-sm" type="submit" name="c_upload" value="c_upload">{{$upload}}</button>
+				</form>
+			</div>
+		</div>
+	</div>
+</div>

From e332d1074f1b663ec66d37b0f575df2e41d5535c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 May 2017 21:10:04 -0700
Subject: [PATCH 148/299] move theme specific files to theme dir

---
 view/{ => theme/redbasic}/tpl/404.tpl                     | 0
 view/{ => theme/redbasic}/tpl/abook_edit.tpl              | 0
 view/{ => theme/redbasic}/tpl/achievements.tpl            | 0
 view/{ => theme/redbasic}/tpl/acl_selector.tpl            | 0
 view/{ => theme/redbasic}/tpl/admin_account_edit.tpl      | 0
 view/{ => theme/redbasic}/tpl/admin_accounts.tpl          | 0
 view/{ => theme/redbasic}/tpl/admin_aside.tpl             | 0
 view/{ => theme/redbasic}/tpl/admin_channels.tpl          | 0
 view/{ => theme/redbasic}/tpl/admin_hubloc.tpl            | 0
 view/{ => theme/redbasic}/tpl/admin_logs.tpl              | 0
 view/{ => theme/redbasic}/tpl/admin_plugins.tpl           | 0
 view/{ => theme/redbasic}/tpl/admin_plugins_addrepo.tpl   | 0
 view/{ => theme/redbasic}/tpl/admin_plugins_details.tpl   | 0
 view/{ => theme/redbasic}/tpl/admin_profiles.tpl          | 0
 view/{ => theme/redbasic}/tpl/admin_queue.tpl             | 0
 view/{ => theme/redbasic}/tpl/admin_security.tpl          | 0
 view/{ => theme/redbasic}/tpl/admin_settings_features.tpl | 0
 view/{ => theme/redbasic}/tpl/admin_site.tpl              | 0
 view/{ => theme/redbasic}/tpl/admin_summary.tpl           | 0
 view/{ => theme/redbasic}/tpl/album_edit.tpl              | 0
 view/{ => theme/redbasic}/tpl/alt_pager.tpl               | 0
 view/{ => theme/redbasic}/tpl/api_config_xml.tpl          | 0
 view/{ => theme/redbasic}/tpl/api_friends_xml.tpl         | 0
 view/{ => theme/redbasic}/tpl/api_ratelimit_xml.tpl       | 0
 view/{ => theme/redbasic}/tpl/api_status_xml.tpl          | 0
 view/{ => theme/redbasic}/tpl/api_test_xml.tpl            | 0
 view/{ => theme/redbasic}/tpl/api_timeline_atom.tpl       | 0
 view/{ => theme/redbasic}/tpl/api_timeline_rss.tpl        | 0
 view/{ => theme/redbasic}/tpl/api_timeline_xml.tpl        | 0
 view/{ => theme/redbasic}/tpl/api_user_xml.tpl            | 0
 view/{ => theme/redbasic}/tpl/app.tpl                     | 0
 view/{ => theme/redbasic}/tpl/app_create.tpl              | 0
 view/{ => theme/redbasic}/tpl/atom_feed.tpl               | 0
 view/{ => theme/redbasic}/tpl/attach_edit.tpl             | 0
 view/{ => theme/redbasic}/tpl/birthdays_reminder.tpl      | 0
 view/{ => theme/redbasic}/tpl/blocklist.tpl               | 0
 view/{ => theme/redbasic}/tpl/bookmarkedchats.tpl         | 0
 view/{ => theme/redbasic}/tpl/build_query.tpl             | 0
 view/{ => theme/redbasic}/tpl/categories_widget.tpl       | 0
 view/{ => theme/redbasic}/tpl/cdav_addressbook.tpl        | 0
 view/{ => theme/redbasic}/tpl/cdav_calendar.tpl           | 0
 view/{ => theme/redbasic}/tpl/cdav_widget_addressbook.tpl | 0
 view/{ => theme/redbasic}/tpl/cdav_widget_calendar.tpl    | 0
 view/{ => theme/redbasic}/tpl/channel.tpl                 | 0
 view/{ => theme/redbasic}/tpl/channel_id_select.tpl       | 0
 view/{ => theme/redbasic}/tpl/channel_import.tpl          | 0
 view/{ => theme/redbasic}/tpl/channels.tpl                | 0
 view/{ => theme/redbasic}/tpl/chanview.tpl                | 0
 view/{ => theme/redbasic}/tpl/chat.tpl                    | 0
 view/{ => theme/redbasic}/tpl/chatroom_members.tpl        | 0
 view/{ => theme/redbasic}/tpl/chatroom_new.tpl            | 0
 view/{ => theme/redbasic}/tpl/chatroomlist.tpl            | 0
 view/{ => theme/redbasic}/tpl/chatrooms.tpl               | 0
 view/{ => theme/redbasic}/tpl/cloud.tpl                   | 0
 view/{ => theme/redbasic}/tpl/cloud_actionspanel.tpl      | 0
 view/{ => theme/redbasic}/tpl/cloud_directory.tpl         | 0
 view/{ => theme/redbasic}/tpl/cloud_header.tpl            | 0
 view/{ => theme/redbasic}/tpl/comment_item.tpl            | 0
 view/{ => theme/redbasic}/tpl/common_friends.tpl          | 0
 view/{ => theme/redbasic}/tpl/common_tabs.tpl             | 0
 view/{ => theme/redbasic}/tpl/connection_template.tpl     | 0
 view/{ => theme/redbasic}/tpl/connections.tpl             | 0
 view/{ => theme/redbasic}/tpl/contact_block.tpl           | 0
 view/{ => theme/redbasic}/tpl/contact_head.tpl            | 0
 view/{ => theme/redbasic}/tpl/contact_slider.tpl          | 0
 view/{ => theme/redbasic}/tpl/contact_template.tpl        | 0
 view/{ => theme/redbasic}/tpl/contactsajax.tpl            | 0
 view/{ => theme/redbasic}/tpl/conv.tpl                    | 0
 view/{ => theme/redbasic}/tpl/conv_frame.tpl              | 0
 view/{ => theme/redbasic}/tpl/conv_item.tpl               | 0
 view/{ => theme/redbasic}/tpl/conv_list.tpl               | 0
 view/{ => theme/redbasic}/tpl/conversation.tpl            | 0
 view/{ => theme/redbasic}/tpl/convobj.tpl                 | 0
 view/{ => theme/redbasic}/tpl/cover_photo.tpl             | 0
 view/{ => theme/redbasic}/tpl/cover_photo_widget.tpl      | 0
 view/{ => theme/redbasic}/tpl/cropbody.tpl                | 0
 view/{ => theme/redbasic}/tpl/cropcover.tpl               | 0
 view/{ => theme/redbasic}/tpl/crophead.tpl                | 0
 view/{ => theme/redbasic}/tpl/delegate.tpl                | 0
 view/{ => theme/redbasic}/tpl/design_tools.tpl            | 0
 view/{ => theme/redbasic}/tpl/diaspora_vcard.tpl          | 0
 view/{ => theme/redbasic}/tpl/dir_sort_links.tpl          | 0
 view/{ => theme/redbasic}/tpl/directajax.tpl              | 0
 view/{ => theme/redbasic}/tpl/directory_header.tpl        | 0
 view/{ => theme/redbasic}/tpl/direntry.tpl                | 0
 view/{ => theme/redbasic}/tpl/display-head.tpl            | 0
 view/{ => theme/redbasic}/tpl/dreport.tpl                 | 0
 view/{ => theme/redbasic}/tpl/edpost_head.tpl             | 0
 view/{ => theme/redbasic}/tpl/email_notify_html.tpl       | 0
 view/{ => theme/redbasic}/tpl/email_notify_text.tpl       | 0
 view/{ => theme/redbasic}/tpl/event.tpl                   | 0
 view/{ => theme/redbasic}/tpl/event_cal.tpl               | 0
 view/{ => theme/redbasic}/tpl/event_form.tpl              | 0
 view/{ => theme/redbasic}/tpl/event_head.tpl              | 0
 view/{ => theme/redbasic}/tpl/event_item_content.tpl      | 0
 view/{ => theme/redbasic}/tpl/event_item_header.tpl       | 0
 view/{ => theme/redbasic}/tpl/events-js.tpl               | 0
 view/{ => theme/redbasic}/tpl/events_cal-js.tpl           | 0
 view/{ => theme/redbasic}/tpl/events_menu_side.tpl        | 0
 view/{ => theme/redbasic}/tpl/events_reminder.tpl         | 0
 view/{ => theme/redbasic}/tpl/events_tools_side.tpl       | 0
 view/{ => theme/redbasic}/tpl/failed_updates.tpl          | 0
 view/{ => theme/redbasic}/tpl/field.tpl                   | 0
 view/{ => theme/redbasic}/tpl/field_acheckbox.tpl         | 0
 view/{ => theme/redbasic}/tpl/field_checkbox.tpl          | 0
 view/{ => theme/redbasic}/tpl/field_colorinput.tpl        | 0
 view/{ => theme/redbasic}/tpl/field_combobox.tpl          | 0
 view/{ => theme/redbasic}/tpl/field_custom.tpl            | 0
 view/{ => theme/redbasic}/tpl/field_input.tpl             | 0
 view/{ => theme/redbasic}/tpl/field_intcheckbox.tpl       | 0
 view/{ => theme/redbasic}/tpl/field_password.tpl          | 0
 view/{ => theme/redbasic}/tpl/field_radio.tpl             | 0
 view/{ => theme/redbasic}/tpl/field_richtext.tpl          | 0
 view/{ => theme/redbasic}/tpl/field_select.tpl            | 0
 view/{ => theme/redbasic}/tpl/field_select_disabled.tpl   | 0
 view/{ => theme/redbasic}/tpl/field_select_grouped.tpl    | 0
 view/{ => theme/redbasic}/tpl/field_select_raw.tpl        | 0
 view/{ => theme/redbasic}/tpl/field_textarea.tpl          | 0
 view/{ => theme/redbasic}/tpl/field_themeselect.tpl       | 0
 view/{ => theme/redbasic}/tpl/field_yesno.tpl             | 0
 view/{ => theme/redbasic}/tpl/fileas_widget.tpl           | 0
 view/{ => theme/redbasic}/tpl/filebrowser.tpl             | 0
 view/{ => theme/redbasic}/tpl/filer_dialog.tpl            | 0
 view/{ => theme/redbasic}/tpl/follow.tpl                  | 0
 view/{ => theme/redbasic}/tpl/force_image_reload.tpl      | 0
 view/{ => theme/redbasic}/tpl/generic_addon_settings.tpl  | 0
 view/{ => theme/redbasic}/tpl/generic_links_widget.tpl    | 0
 view/{ => theme/redbasic}/tpl/generic_modal.tpl           | 0
 view/{ => theme/redbasic}/tpl/group_drop.tpl              | 0
 view/{ => theme/redbasic}/tpl/group_edit.tpl              | 0
 view/{ => theme/redbasic}/tpl/group_selection.tpl         | 0
 view/{ => theme/redbasic}/tpl/group_side.tpl              | 0
 view/{ => theme/redbasic}/tpl/groupeditor.tpl             | 0
 view/{ => theme/redbasic}/tpl/hdr.tpl                     | 0
 view/{ => theme/redbasic}/tpl/head.tpl                    | 0
 view/{ => theme/redbasic}/tpl/help.tpl                    | 0
 view/{ => theme/redbasic}/tpl/install.tpl                 | 0
 view/{ => theme/redbasic}/tpl/install_checks.tpl          | 0
 view/{ => theme/redbasic}/tpl/install_db.tpl              | 0
 view/{ => theme/redbasic}/tpl/install_settings.tpl        | 0
 view/{ => theme/redbasic}/tpl/invite.tpl                  | 0
 view/{ => theme/redbasic}/tpl/item_attach.tpl             | 0
 view/{ => theme/redbasic}/tpl/item_binary.tpl             | 0
 view/{ => theme/redbasic}/tpl/item_categories.tpl         | 0
 view/{ => theme/redbasic}/tpl/item_filer.tpl              | 0
 view/{ => theme/redbasic}/tpl/item_import.tpl             | 0
 view/{ => theme/redbasic}/tpl/jot-header.tpl              | 0
 view/{ => theme/redbasic}/tpl/jot.tpl                     | 0
 view/{ => theme/redbasic}/tpl/jot_geotag.tpl              | 0
 view/{ => theme/redbasic}/tpl/js_strings.tpl              | 0
 view/{ => theme/redbasic}/tpl/lang_selector.tpl           | 0
 view/{ => theme/redbasic}/tpl/layoutlist.tpl              | 0
 view/{ => theme/redbasic}/tpl/like_noshare.tpl            | 0
 view/{ => theme/redbasic}/tpl/locmanage.tpl               | 0
 view/{ => theme/redbasic}/tpl/login.tpl                   | 0
 view/{ => theme/redbasic}/tpl/logout.tpl                  | 0
 view/{ => theme/redbasic}/tpl/lostpass.tpl                | 0
 view/{ => theme/redbasic}/tpl/mail_conv.tpl               | 0
 view/{ => theme/redbasic}/tpl/mail_display.tpl            | 0
 view/{ => theme/redbasic}/tpl/mail_head.tpl               | 0
 view/{ => theme/redbasic}/tpl/mail_list.tpl               | 0
 view/{ => theme/redbasic}/tpl/main_slider.tpl             | 0
 view/{ => theme/redbasic}/tpl/match.tpl                   | 0
 view/{ => theme/redbasic}/tpl/menuedit.tpl                | 0
 view/{ => theme/redbasic}/tpl/menulist.tpl                | 0
 view/{ => theme/redbasic}/tpl/message_side.tpl            | 0
 view/{ => theme/redbasic}/tpl/micropro_img.tpl            | 0
 view/{ => theme/redbasic}/tpl/micropro_txt.tpl            | 0
 view/{ => theme/redbasic}/tpl/mitemedit.tpl               | 0
 view/{ => theme/redbasic}/tpl/mitemlist.tpl               | 0
 view/{ => theme/redbasic}/tpl/mood_content.tpl            | 0
 view/{ => theme/redbasic}/tpl/msg-header.tpl              | 0
 view/{ => theme/redbasic}/tpl/myapps.tpl                  | 0
 view/{ => theme/redbasic}/tpl/nav.tpl                     | 0
 view/{ => theme/redbasic}/tpl/nav_login.tpl               | 0
 view/{ => theme/redbasic}/tpl/new_channel.tpl             | 0
 view/{ => theme/redbasic}/tpl/notes.tpl                   | 0
 view/{ => theme/redbasic}/tpl/notifications.tpl           | 0
 view/{ => theme/redbasic}/tpl/notify.tpl                  | 0
 view/{ => theme/redbasic}/tpl/nwiki_page_history.tpl      | 0
 view/{ => theme/redbasic}/tpl/oauth_authorize.tpl         | 0
 view/{ => theme/redbasic}/tpl/oauth_authorize_done.tpl    | 0
 view/{ => theme/redbasic}/tpl/oembed_video.tpl            | 0
 view/{ => theme/redbasic}/tpl/oexchange_xrd.tpl           | 0
 view/{ => theme/redbasic}/tpl/page_display.tpl            | 0
 view/{ => theme/redbasic}/tpl/page_display_empty.tpl      | 0
 view/{ => theme/redbasic}/tpl/pdledit.tpl                 | 0
 view/{ => theme/redbasic}/tpl/peoplefind.tpl              | 0
 view/{ => theme/redbasic}/tpl/photo_album.tpl             | 0
 view/{ => theme/redbasic}/tpl/photo_albums.tpl            | 0
 view/{ => theme/redbasic}/tpl/photo_drop.tpl              | 0
 view/{ => theme/redbasic}/tpl/photo_item.tpl              | 0
 view/{ => theme/redbasic}/tpl/photo_top.tpl               | 0
 view/{ => theme/redbasic}/tpl/photo_view.tpl              | 0
 view/{ => theme/redbasic}/tpl/photos_recent.tpl           | 0
 view/{ => theme/redbasic}/tpl/photos_upload.tpl           | 0
 view/{ => theme/redbasic}/tpl/photosajax.tpl              | 0
 view/{ => theme/redbasic}/tpl/poco_entry_xml.tpl          | 0
 view/{ => theme/redbasic}/tpl/poco_xml.tpl                | 0
 view/{ => theme/redbasic}/tpl/poke_content.tpl            | 0
 view/{ => theme/redbasic}/tpl/posted_date_widget.tpl      | 0
 view/{ => theme/redbasic}/tpl/prep.tpl                    | 0
 view/{ => theme/redbasic}/tpl/profdef_edit.tpl            | 0
 view/{ => theme/redbasic}/tpl/profed_head.tpl             | 0
 view/{ => theme/redbasic}/tpl/profile_advanced.tpl        | 0
 view/{ => theme/redbasic}/tpl/profile_edit.tpl            | 0
 view/{ => theme/redbasic}/tpl/profile_entry.tpl           | 0
 view/{ => theme/redbasic}/tpl/profile_listing_header.tpl  | 0
 view/{ => theme/redbasic}/tpl/profile_photo.tpl           | 0
 view/{ => theme/redbasic}/tpl/profile_tabs.tpl            | 0
 view/{ => theme/redbasic}/tpl/profile_vcard.tpl           | 0
 view/{ => theme/redbasic}/tpl/profile_vcard_short.tpl     | 0
 view/{ => theme/redbasic}/tpl/prv_message.tpl             | 0
 view/{ => theme/redbasic}/tpl/pwdreset.tpl                | 0
 view/{ => theme/redbasic}/tpl/rating_form.tpl             | 0
 view/{ => theme/redbasic}/tpl/rating_slider.tpl           | 0
 view/{ => theme/redbasic}/tpl/rbmark.tpl                  | 0
 view/{ => theme/redbasic}/tpl/register.tpl                | 0
 view/{ => theme/redbasic}/tpl/remote_friends_common.tpl   | 0
 view/{ => theme/redbasic}/tpl/remote_login.tpl            | 0
 view/{ => theme/redbasic}/tpl/removeaccount.tpl           | 0
 view/{ => theme/redbasic}/tpl/removeme.tpl                | 0
 view/{ => theme/redbasic}/tpl/rmagic.tpl                  | 0
 view/{ => theme/redbasic}/tpl/safesearch.tpl              | 0
 view/{ => theme/redbasic}/tpl/saved_searches.tpl          | 0
 view/{ => theme/redbasic}/tpl/search_item.tpl             | 0
 view/{ => theme/redbasic}/tpl/searchbox.tpl               | 0
 view/{ => theme/redbasic}/tpl/section_title.tpl           | 0
 view/{ => theme/redbasic}/tpl/select_timezone.tpl         | 0
 view/{ => theme/redbasic}/tpl/sellpage_edit.tpl           | 0
 view/{ => theme/redbasic}/tpl/sellpage_submit.tpl         | 0
 view/{ => theme/redbasic}/tpl/sellpage_view.tpl           | 0
 view/{ => theme/redbasic}/tpl/settings.tpl                | 0
 view/{ => theme/redbasic}/tpl/settings_account.tpl        | 0
 view/{ => theme/redbasic}/tpl/settings_addons.tpl         | 0
 view/{ => theme/redbasic}/tpl/settings_connectors.tpl     | 0
 view/{ => theme/redbasic}/tpl/settings_display.tpl        | 0
 view/{ => theme/redbasic}/tpl/settings_features.tpl       | 0
 view/{ => theme/redbasic}/tpl/settings_nick_set.tpl       | 0
 view/{ => theme/redbasic}/tpl/settings_oauth.tpl          | 0
 view/{ => theme/redbasic}/tpl/settings_oauth_edit.tpl     | 0
 view/{ => theme/redbasic}/tpl/settings_permcats.tpl       | 0
 view/{ => theme/redbasic}/tpl/settings_tokens.tpl         | 0
 view/{ => theme/redbasic}/tpl/sharedwithme.tpl            | 0
 view/{ => theme/redbasic}/tpl/show_thing.tpl              | 0
 view/{ => theme/redbasic}/tpl/siteinfo.tpl                | 0
 view/{ => theme/redbasic}/tpl/sitesearch.tpl              | 0
 view/{ => theme/redbasic}/tpl/sources_edit.tpl            | 0
 view/{ => theme/redbasic}/tpl/sources_list.tpl            | 0
 view/{ => theme/redbasic}/tpl/sources_new.tpl             | 0
 view/{ => theme/redbasic}/tpl/suggest_friends.tpl         | 0
 view/{ => theme/redbasic}/tpl/suggest_page.tpl            | 0
 view/{ => theme/redbasic}/tpl/suggest_widget.tpl          | 0
 view/{ => theme/redbasic}/tpl/thing_edit.tpl              | 0
 view/{ => theme/redbasic}/tpl/thing_input.tpl             | 0
 view/{ => theme/redbasic}/tpl/threaded_conversation.tpl   | 0
 view/{ => theme/redbasic}/tpl/toggle_mobile_footer.tpl    | 0
 view/{ => theme/redbasic}/tpl/uexport.tpl                 | 0
 view/{ => theme/redbasic}/tpl/usermenu.tpl                | 0
 view/{ => theme/redbasic}/tpl/viewcontact_template.tpl    | 0
 view/{ => theme/redbasic}/tpl/viewcontactsajax.tpl        | 0
 view/{ => theme/redbasic}/tpl/webpage_export_list.tpl     | 0
 view/{ => theme/redbasic}/tpl/webpage_import.tpl          | 0
 view/{ => theme/redbasic}/tpl/webpagelist.tpl             | 0
 view/{ => theme/redbasic}/tpl/website_portation_tools.tpl | 0
 view/{ => theme/redbasic}/tpl/wiki.tpl                    | 0
 view/{ => theme/redbasic}/tpl/wiki_page_history.tpl       | 0
 view/{ => theme/redbasic}/tpl/wiki_page_list.tpl          | 0
 view/{ => theme/redbasic}/tpl/wikilist.tpl                | 0
 view/{ => theme/redbasic}/tpl/wikilist_widget.tpl         | 0
 view/{ => theme/redbasic}/tpl/write_pages.tpl             | 0
 view/{ => theme/redbasic}/tpl/xchan_vcard.tpl             | 0
 view/{ => theme/redbasic}/tpl/xrd_diaspora.tpl            | 0
 view/{ => theme/redbasic}/tpl/xrd_host.tpl                | 0
 view/{ => theme/redbasic}/tpl/xrd_person.tpl              | 0
 view/{ => theme/redbasic}/tpl/zcard.tpl                   | 0
 view/{ => theme/redbasic}/tpl/zcard_embed.tpl             | 0
 277 files changed, 0 insertions(+), 0 deletions(-)
 rename view/{ => theme/redbasic}/tpl/404.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/abook_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/achievements.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/acl_selector.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_account_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_accounts.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_aside.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_channels.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_hubloc.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_logs.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_plugins.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_plugins_addrepo.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_plugins_details.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_profiles.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_queue.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_security.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_settings_features.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_site.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/admin_summary.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/album_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/alt_pager.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_config_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_friends_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_ratelimit_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_status_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_test_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_timeline_atom.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_timeline_rss.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_timeline_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/api_user_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/app.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/app_create.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/atom_feed.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/attach_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/birthdays_reminder.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/blocklist.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/bookmarkedchats.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/build_query.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/categories_widget.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cdav_addressbook.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cdav_calendar.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cdav_widget_addressbook.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cdav_widget_calendar.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/channel.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/channel_id_select.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/channel_import.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/channels.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/chanview.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/chat.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/chatroom_members.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/chatroom_new.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/chatroomlist.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/chatrooms.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cloud.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cloud_actionspanel.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cloud_directory.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cloud_header.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/comment_item.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/common_friends.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/common_tabs.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/connection_template.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/connections.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/contact_block.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/contact_head.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/contact_slider.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/contact_template.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/contactsajax.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/conv.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/conv_frame.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/conv_item.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/conv_list.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/conversation.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/convobj.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cover_photo.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cover_photo_widget.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cropbody.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/cropcover.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/crophead.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/delegate.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/design_tools.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/diaspora_vcard.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/dir_sort_links.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/directajax.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/directory_header.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/direntry.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/display-head.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/dreport.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/edpost_head.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/email_notify_html.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/email_notify_text.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/event.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/event_cal.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/event_form.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/event_head.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/event_item_content.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/event_item_header.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/events-js.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/events_cal-js.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/events_menu_side.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/events_reminder.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/events_tools_side.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/failed_updates.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_acheckbox.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_checkbox.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_colorinput.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_combobox.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_custom.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_input.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_intcheckbox.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_password.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_radio.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_richtext.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_select.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_select_disabled.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_select_grouped.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_select_raw.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_textarea.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_themeselect.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/field_yesno.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/fileas_widget.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/filebrowser.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/filer_dialog.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/follow.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/force_image_reload.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/generic_addon_settings.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/generic_links_widget.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/generic_modal.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/group_drop.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/group_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/group_selection.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/group_side.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/groupeditor.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/hdr.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/head.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/help.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/install.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/install_checks.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/install_db.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/install_settings.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/invite.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/item_attach.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/item_binary.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/item_categories.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/item_filer.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/item_import.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/jot-header.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/jot.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/jot_geotag.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/js_strings.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/lang_selector.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/layoutlist.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/like_noshare.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/locmanage.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/login.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/logout.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/lostpass.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/mail_conv.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/mail_display.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/mail_head.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/mail_list.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/main_slider.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/match.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/menuedit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/menulist.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/message_side.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/micropro_img.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/micropro_txt.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/mitemedit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/mitemlist.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/mood_content.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/msg-header.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/myapps.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/nav.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/nav_login.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/new_channel.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/notes.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/notifications.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/notify.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/nwiki_page_history.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/oauth_authorize.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/oauth_authorize_done.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/oembed_video.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/oexchange_xrd.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/page_display.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/page_display_empty.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/pdledit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/peoplefind.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photo_album.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photo_albums.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photo_drop.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photo_item.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photo_top.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photo_view.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photos_recent.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photos_upload.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/photosajax.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/poco_entry_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/poco_xml.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/poke_content.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/posted_date_widget.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/prep.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profdef_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profed_head.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profile_advanced.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profile_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profile_entry.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profile_listing_header.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profile_photo.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profile_tabs.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profile_vcard.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/profile_vcard_short.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/prv_message.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/pwdreset.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/rating_form.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/rating_slider.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/rbmark.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/register.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/remote_friends_common.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/remote_login.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/removeaccount.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/removeme.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/rmagic.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/safesearch.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/saved_searches.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/search_item.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/searchbox.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/section_title.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/select_timezone.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/sellpage_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/sellpage_submit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/sellpage_view.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_account.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_addons.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_connectors.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_display.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_features.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_nick_set.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_oauth.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_oauth_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_permcats.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/settings_tokens.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/sharedwithme.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/show_thing.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/siteinfo.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/sitesearch.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/sources_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/sources_list.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/sources_new.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/suggest_friends.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/suggest_page.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/suggest_widget.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/thing_edit.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/thing_input.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/threaded_conversation.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/toggle_mobile_footer.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/uexport.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/usermenu.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/viewcontact_template.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/viewcontactsajax.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/webpage_export_list.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/webpage_import.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/webpagelist.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/website_portation_tools.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/wiki.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/wiki_page_history.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/wiki_page_list.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/wikilist.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/wikilist_widget.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/write_pages.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/xchan_vcard.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/xrd_diaspora.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/xrd_host.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/xrd_person.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/zcard.tpl (100%)
 rename view/{ => theme/redbasic}/tpl/zcard_embed.tpl (100%)

diff --git a/view/tpl/404.tpl b/view/theme/redbasic/tpl/404.tpl
similarity index 100%
rename from view/tpl/404.tpl
rename to view/theme/redbasic/tpl/404.tpl
diff --git a/view/tpl/abook_edit.tpl b/view/theme/redbasic/tpl/abook_edit.tpl
similarity index 100%
rename from view/tpl/abook_edit.tpl
rename to view/theme/redbasic/tpl/abook_edit.tpl
diff --git a/view/tpl/achievements.tpl b/view/theme/redbasic/tpl/achievements.tpl
similarity index 100%
rename from view/tpl/achievements.tpl
rename to view/theme/redbasic/tpl/achievements.tpl
diff --git a/view/tpl/acl_selector.tpl b/view/theme/redbasic/tpl/acl_selector.tpl
similarity index 100%
rename from view/tpl/acl_selector.tpl
rename to view/theme/redbasic/tpl/acl_selector.tpl
diff --git a/view/tpl/admin_account_edit.tpl b/view/theme/redbasic/tpl/admin_account_edit.tpl
similarity index 100%
rename from view/tpl/admin_account_edit.tpl
rename to view/theme/redbasic/tpl/admin_account_edit.tpl
diff --git a/view/tpl/admin_accounts.tpl b/view/theme/redbasic/tpl/admin_accounts.tpl
similarity index 100%
rename from view/tpl/admin_accounts.tpl
rename to view/theme/redbasic/tpl/admin_accounts.tpl
diff --git a/view/tpl/admin_aside.tpl b/view/theme/redbasic/tpl/admin_aside.tpl
similarity index 100%
rename from view/tpl/admin_aside.tpl
rename to view/theme/redbasic/tpl/admin_aside.tpl
diff --git a/view/tpl/admin_channels.tpl b/view/theme/redbasic/tpl/admin_channels.tpl
similarity index 100%
rename from view/tpl/admin_channels.tpl
rename to view/theme/redbasic/tpl/admin_channels.tpl
diff --git a/view/tpl/admin_hubloc.tpl b/view/theme/redbasic/tpl/admin_hubloc.tpl
similarity index 100%
rename from view/tpl/admin_hubloc.tpl
rename to view/theme/redbasic/tpl/admin_hubloc.tpl
diff --git a/view/tpl/admin_logs.tpl b/view/theme/redbasic/tpl/admin_logs.tpl
similarity index 100%
rename from view/tpl/admin_logs.tpl
rename to view/theme/redbasic/tpl/admin_logs.tpl
diff --git a/view/tpl/admin_plugins.tpl b/view/theme/redbasic/tpl/admin_plugins.tpl
similarity index 100%
rename from view/tpl/admin_plugins.tpl
rename to view/theme/redbasic/tpl/admin_plugins.tpl
diff --git a/view/tpl/admin_plugins_addrepo.tpl b/view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
similarity index 100%
rename from view/tpl/admin_plugins_addrepo.tpl
rename to view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
diff --git a/view/tpl/admin_plugins_details.tpl b/view/theme/redbasic/tpl/admin_plugins_details.tpl
similarity index 100%
rename from view/tpl/admin_plugins_details.tpl
rename to view/theme/redbasic/tpl/admin_plugins_details.tpl
diff --git a/view/tpl/admin_profiles.tpl b/view/theme/redbasic/tpl/admin_profiles.tpl
similarity index 100%
rename from view/tpl/admin_profiles.tpl
rename to view/theme/redbasic/tpl/admin_profiles.tpl
diff --git a/view/tpl/admin_queue.tpl b/view/theme/redbasic/tpl/admin_queue.tpl
similarity index 100%
rename from view/tpl/admin_queue.tpl
rename to view/theme/redbasic/tpl/admin_queue.tpl
diff --git a/view/tpl/admin_security.tpl b/view/theme/redbasic/tpl/admin_security.tpl
similarity index 100%
rename from view/tpl/admin_security.tpl
rename to view/theme/redbasic/tpl/admin_security.tpl
diff --git a/view/tpl/admin_settings_features.tpl b/view/theme/redbasic/tpl/admin_settings_features.tpl
similarity index 100%
rename from view/tpl/admin_settings_features.tpl
rename to view/theme/redbasic/tpl/admin_settings_features.tpl
diff --git a/view/tpl/admin_site.tpl b/view/theme/redbasic/tpl/admin_site.tpl
similarity index 100%
rename from view/tpl/admin_site.tpl
rename to view/theme/redbasic/tpl/admin_site.tpl
diff --git a/view/tpl/admin_summary.tpl b/view/theme/redbasic/tpl/admin_summary.tpl
similarity index 100%
rename from view/tpl/admin_summary.tpl
rename to view/theme/redbasic/tpl/admin_summary.tpl
diff --git a/view/tpl/album_edit.tpl b/view/theme/redbasic/tpl/album_edit.tpl
similarity index 100%
rename from view/tpl/album_edit.tpl
rename to view/theme/redbasic/tpl/album_edit.tpl
diff --git a/view/tpl/alt_pager.tpl b/view/theme/redbasic/tpl/alt_pager.tpl
similarity index 100%
rename from view/tpl/alt_pager.tpl
rename to view/theme/redbasic/tpl/alt_pager.tpl
diff --git a/view/tpl/api_config_xml.tpl b/view/theme/redbasic/tpl/api_config_xml.tpl
similarity index 100%
rename from view/tpl/api_config_xml.tpl
rename to view/theme/redbasic/tpl/api_config_xml.tpl
diff --git a/view/tpl/api_friends_xml.tpl b/view/theme/redbasic/tpl/api_friends_xml.tpl
similarity index 100%
rename from view/tpl/api_friends_xml.tpl
rename to view/theme/redbasic/tpl/api_friends_xml.tpl
diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/theme/redbasic/tpl/api_ratelimit_xml.tpl
similarity index 100%
rename from view/tpl/api_ratelimit_xml.tpl
rename to view/theme/redbasic/tpl/api_ratelimit_xml.tpl
diff --git a/view/tpl/api_status_xml.tpl b/view/theme/redbasic/tpl/api_status_xml.tpl
similarity index 100%
rename from view/tpl/api_status_xml.tpl
rename to view/theme/redbasic/tpl/api_status_xml.tpl
diff --git a/view/tpl/api_test_xml.tpl b/view/theme/redbasic/tpl/api_test_xml.tpl
similarity index 100%
rename from view/tpl/api_test_xml.tpl
rename to view/theme/redbasic/tpl/api_test_xml.tpl
diff --git a/view/tpl/api_timeline_atom.tpl b/view/theme/redbasic/tpl/api_timeline_atom.tpl
similarity index 100%
rename from view/tpl/api_timeline_atom.tpl
rename to view/theme/redbasic/tpl/api_timeline_atom.tpl
diff --git a/view/tpl/api_timeline_rss.tpl b/view/theme/redbasic/tpl/api_timeline_rss.tpl
similarity index 100%
rename from view/tpl/api_timeline_rss.tpl
rename to view/theme/redbasic/tpl/api_timeline_rss.tpl
diff --git a/view/tpl/api_timeline_xml.tpl b/view/theme/redbasic/tpl/api_timeline_xml.tpl
similarity index 100%
rename from view/tpl/api_timeline_xml.tpl
rename to view/theme/redbasic/tpl/api_timeline_xml.tpl
diff --git a/view/tpl/api_user_xml.tpl b/view/theme/redbasic/tpl/api_user_xml.tpl
similarity index 100%
rename from view/tpl/api_user_xml.tpl
rename to view/theme/redbasic/tpl/api_user_xml.tpl
diff --git a/view/tpl/app.tpl b/view/theme/redbasic/tpl/app.tpl
similarity index 100%
rename from view/tpl/app.tpl
rename to view/theme/redbasic/tpl/app.tpl
diff --git a/view/tpl/app_create.tpl b/view/theme/redbasic/tpl/app_create.tpl
similarity index 100%
rename from view/tpl/app_create.tpl
rename to view/theme/redbasic/tpl/app_create.tpl
diff --git a/view/tpl/atom_feed.tpl b/view/theme/redbasic/tpl/atom_feed.tpl
similarity index 100%
rename from view/tpl/atom_feed.tpl
rename to view/theme/redbasic/tpl/atom_feed.tpl
diff --git a/view/tpl/attach_edit.tpl b/view/theme/redbasic/tpl/attach_edit.tpl
similarity index 100%
rename from view/tpl/attach_edit.tpl
rename to view/theme/redbasic/tpl/attach_edit.tpl
diff --git a/view/tpl/birthdays_reminder.tpl b/view/theme/redbasic/tpl/birthdays_reminder.tpl
similarity index 100%
rename from view/tpl/birthdays_reminder.tpl
rename to view/theme/redbasic/tpl/birthdays_reminder.tpl
diff --git a/view/tpl/blocklist.tpl b/view/theme/redbasic/tpl/blocklist.tpl
similarity index 100%
rename from view/tpl/blocklist.tpl
rename to view/theme/redbasic/tpl/blocklist.tpl
diff --git a/view/tpl/bookmarkedchats.tpl b/view/theme/redbasic/tpl/bookmarkedchats.tpl
similarity index 100%
rename from view/tpl/bookmarkedchats.tpl
rename to view/theme/redbasic/tpl/bookmarkedchats.tpl
diff --git a/view/tpl/build_query.tpl b/view/theme/redbasic/tpl/build_query.tpl
similarity index 100%
rename from view/tpl/build_query.tpl
rename to view/theme/redbasic/tpl/build_query.tpl
diff --git a/view/tpl/categories_widget.tpl b/view/theme/redbasic/tpl/categories_widget.tpl
similarity index 100%
rename from view/tpl/categories_widget.tpl
rename to view/theme/redbasic/tpl/categories_widget.tpl
diff --git a/view/tpl/cdav_addressbook.tpl b/view/theme/redbasic/tpl/cdav_addressbook.tpl
similarity index 100%
rename from view/tpl/cdav_addressbook.tpl
rename to view/theme/redbasic/tpl/cdav_addressbook.tpl
diff --git a/view/tpl/cdav_calendar.tpl b/view/theme/redbasic/tpl/cdav_calendar.tpl
similarity index 100%
rename from view/tpl/cdav_calendar.tpl
rename to view/theme/redbasic/tpl/cdav_calendar.tpl
diff --git a/view/tpl/cdav_widget_addressbook.tpl b/view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
similarity index 100%
rename from view/tpl/cdav_widget_addressbook.tpl
rename to view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/theme/redbasic/tpl/cdav_widget_calendar.tpl
similarity index 100%
rename from view/tpl/cdav_widget_calendar.tpl
rename to view/theme/redbasic/tpl/cdav_widget_calendar.tpl
diff --git a/view/tpl/channel.tpl b/view/theme/redbasic/tpl/channel.tpl
similarity index 100%
rename from view/tpl/channel.tpl
rename to view/theme/redbasic/tpl/channel.tpl
diff --git a/view/tpl/channel_id_select.tpl b/view/theme/redbasic/tpl/channel_id_select.tpl
similarity index 100%
rename from view/tpl/channel_id_select.tpl
rename to view/theme/redbasic/tpl/channel_id_select.tpl
diff --git a/view/tpl/channel_import.tpl b/view/theme/redbasic/tpl/channel_import.tpl
similarity index 100%
rename from view/tpl/channel_import.tpl
rename to view/theme/redbasic/tpl/channel_import.tpl
diff --git a/view/tpl/channels.tpl b/view/theme/redbasic/tpl/channels.tpl
similarity index 100%
rename from view/tpl/channels.tpl
rename to view/theme/redbasic/tpl/channels.tpl
diff --git a/view/tpl/chanview.tpl b/view/theme/redbasic/tpl/chanview.tpl
similarity index 100%
rename from view/tpl/chanview.tpl
rename to view/theme/redbasic/tpl/chanview.tpl
diff --git a/view/tpl/chat.tpl b/view/theme/redbasic/tpl/chat.tpl
similarity index 100%
rename from view/tpl/chat.tpl
rename to view/theme/redbasic/tpl/chat.tpl
diff --git a/view/tpl/chatroom_members.tpl b/view/theme/redbasic/tpl/chatroom_members.tpl
similarity index 100%
rename from view/tpl/chatroom_members.tpl
rename to view/theme/redbasic/tpl/chatroom_members.tpl
diff --git a/view/tpl/chatroom_new.tpl b/view/theme/redbasic/tpl/chatroom_new.tpl
similarity index 100%
rename from view/tpl/chatroom_new.tpl
rename to view/theme/redbasic/tpl/chatroom_new.tpl
diff --git a/view/tpl/chatroomlist.tpl b/view/theme/redbasic/tpl/chatroomlist.tpl
similarity index 100%
rename from view/tpl/chatroomlist.tpl
rename to view/theme/redbasic/tpl/chatroomlist.tpl
diff --git a/view/tpl/chatrooms.tpl b/view/theme/redbasic/tpl/chatrooms.tpl
similarity index 100%
rename from view/tpl/chatrooms.tpl
rename to view/theme/redbasic/tpl/chatrooms.tpl
diff --git a/view/tpl/cloud.tpl b/view/theme/redbasic/tpl/cloud.tpl
similarity index 100%
rename from view/tpl/cloud.tpl
rename to view/theme/redbasic/tpl/cloud.tpl
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/theme/redbasic/tpl/cloud_actionspanel.tpl
similarity index 100%
rename from view/tpl/cloud_actionspanel.tpl
rename to view/theme/redbasic/tpl/cloud_actionspanel.tpl
diff --git a/view/tpl/cloud_directory.tpl b/view/theme/redbasic/tpl/cloud_directory.tpl
similarity index 100%
rename from view/tpl/cloud_directory.tpl
rename to view/theme/redbasic/tpl/cloud_directory.tpl
diff --git a/view/tpl/cloud_header.tpl b/view/theme/redbasic/tpl/cloud_header.tpl
similarity index 100%
rename from view/tpl/cloud_header.tpl
rename to view/theme/redbasic/tpl/cloud_header.tpl
diff --git a/view/tpl/comment_item.tpl b/view/theme/redbasic/tpl/comment_item.tpl
similarity index 100%
rename from view/tpl/comment_item.tpl
rename to view/theme/redbasic/tpl/comment_item.tpl
diff --git a/view/tpl/common_friends.tpl b/view/theme/redbasic/tpl/common_friends.tpl
similarity index 100%
rename from view/tpl/common_friends.tpl
rename to view/theme/redbasic/tpl/common_friends.tpl
diff --git a/view/tpl/common_tabs.tpl b/view/theme/redbasic/tpl/common_tabs.tpl
similarity index 100%
rename from view/tpl/common_tabs.tpl
rename to view/theme/redbasic/tpl/common_tabs.tpl
diff --git a/view/tpl/connection_template.tpl b/view/theme/redbasic/tpl/connection_template.tpl
similarity index 100%
rename from view/tpl/connection_template.tpl
rename to view/theme/redbasic/tpl/connection_template.tpl
diff --git a/view/tpl/connections.tpl b/view/theme/redbasic/tpl/connections.tpl
similarity index 100%
rename from view/tpl/connections.tpl
rename to view/theme/redbasic/tpl/connections.tpl
diff --git a/view/tpl/contact_block.tpl b/view/theme/redbasic/tpl/contact_block.tpl
similarity index 100%
rename from view/tpl/contact_block.tpl
rename to view/theme/redbasic/tpl/contact_block.tpl
diff --git a/view/tpl/contact_head.tpl b/view/theme/redbasic/tpl/contact_head.tpl
similarity index 100%
rename from view/tpl/contact_head.tpl
rename to view/theme/redbasic/tpl/contact_head.tpl
diff --git a/view/tpl/contact_slider.tpl b/view/theme/redbasic/tpl/contact_slider.tpl
similarity index 100%
rename from view/tpl/contact_slider.tpl
rename to view/theme/redbasic/tpl/contact_slider.tpl
diff --git a/view/tpl/contact_template.tpl b/view/theme/redbasic/tpl/contact_template.tpl
similarity index 100%
rename from view/tpl/contact_template.tpl
rename to view/theme/redbasic/tpl/contact_template.tpl
diff --git a/view/tpl/contactsajax.tpl b/view/theme/redbasic/tpl/contactsajax.tpl
similarity index 100%
rename from view/tpl/contactsajax.tpl
rename to view/theme/redbasic/tpl/contactsajax.tpl
diff --git a/view/tpl/conv.tpl b/view/theme/redbasic/tpl/conv.tpl
similarity index 100%
rename from view/tpl/conv.tpl
rename to view/theme/redbasic/tpl/conv.tpl
diff --git a/view/tpl/conv_frame.tpl b/view/theme/redbasic/tpl/conv_frame.tpl
similarity index 100%
rename from view/tpl/conv_frame.tpl
rename to view/theme/redbasic/tpl/conv_frame.tpl
diff --git a/view/tpl/conv_item.tpl b/view/theme/redbasic/tpl/conv_item.tpl
similarity index 100%
rename from view/tpl/conv_item.tpl
rename to view/theme/redbasic/tpl/conv_item.tpl
diff --git a/view/tpl/conv_list.tpl b/view/theme/redbasic/tpl/conv_list.tpl
similarity index 100%
rename from view/tpl/conv_list.tpl
rename to view/theme/redbasic/tpl/conv_list.tpl
diff --git a/view/tpl/conversation.tpl b/view/theme/redbasic/tpl/conversation.tpl
similarity index 100%
rename from view/tpl/conversation.tpl
rename to view/theme/redbasic/tpl/conversation.tpl
diff --git a/view/tpl/convobj.tpl b/view/theme/redbasic/tpl/convobj.tpl
similarity index 100%
rename from view/tpl/convobj.tpl
rename to view/theme/redbasic/tpl/convobj.tpl
diff --git a/view/tpl/cover_photo.tpl b/view/theme/redbasic/tpl/cover_photo.tpl
similarity index 100%
rename from view/tpl/cover_photo.tpl
rename to view/theme/redbasic/tpl/cover_photo.tpl
diff --git a/view/tpl/cover_photo_widget.tpl b/view/theme/redbasic/tpl/cover_photo_widget.tpl
similarity index 100%
rename from view/tpl/cover_photo_widget.tpl
rename to view/theme/redbasic/tpl/cover_photo_widget.tpl
diff --git a/view/tpl/cropbody.tpl b/view/theme/redbasic/tpl/cropbody.tpl
similarity index 100%
rename from view/tpl/cropbody.tpl
rename to view/theme/redbasic/tpl/cropbody.tpl
diff --git a/view/tpl/cropcover.tpl b/view/theme/redbasic/tpl/cropcover.tpl
similarity index 100%
rename from view/tpl/cropcover.tpl
rename to view/theme/redbasic/tpl/cropcover.tpl
diff --git a/view/tpl/crophead.tpl b/view/theme/redbasic/tpl/crophead.tpl
similarity index 100%
rename from view/tpl/crophead.tpl
rename to view/theme/redbasic/tpl/crophead.tpl
diff --git a/view/tpl/delegate.tpl b/view/theme/redbasic/tpl/delegate.tpl
similarity index 100%
rename from view/tpl/delegate.tpl
rename to view/theme/redbasic/tpl/delegate.tpl
diff --git a/view/tpl/design_tools.tpl b/view/theme/redbasic/tpl/design_tools.tpl
similarity index 100%
rename from view/tpl/design_tools.tpl
rename to view/theme/redbasic/tpl/design_tools.tpl
diff --git a/view/tpl/diaspora_vcard.tpl b/view/theme/redbasic/tpl/diaspora_vcard.tpl
similarity index 100%
rename from view/tpl/diaspora_vcard.tpl
rename to view/theme/redbasic/tpl/diaspora_vcard.tpl
diff --git a/view/tpl/dir_sort_links.tpl b/view/theme/redbasic/tpl/dir_sort_links.tpl
similarity index 100%
rename from view/tpl/dir_sort_links.tpl
rename to view/theme/redbasic/tpl/dir_sort_links.tpl
diff --git a/view/tpl/directajax.tpl b/view/theme/redbasic/tpl/directajax.tpl
similarity index 100%
rename from view/tpl/directajax.tpl
rename to view/theme/redbasic/tpl/directajax.tpl
diff --git a/view/tpl/directory_header.tpl b/view/theme/redbasic/tpl/directory_header.tpl
similarity index 100%
rename from view/tpl/directory_header.tpl
rename to view/theme/redbasic/tpl/directory_header.tpl
diff --git a/view/tpl/direntry.tpl b/view/theme/redbasic/tpl/direntry.tpl
similarity index 100%
rename from view/tpl/direntry.tpl
rename to view/theme/redbasic/tpl/direntry.tpl
diff --git a/view/tpl/display-head.tpl b/view/theme/redbasic/tpl/display-head.tpl
similarity index 100%
rename from view/tpl/display-head.tpl
rename to view/theme/redbasic/tpl/display-head.tpl
diff --git a/view/tpl/dreport.tpl b/view/theme/redbasic/tpl/dreport.tpl
similarity index 100%
rename from view/tpl/dreport.tpl
rename to view/theme/redbasic/tpl/dreport.tpl
diff --git a/view/tpl/edpost_head.tpl b/view/theme/redbasic/tpl/edpost_head.tpl
similarity index 100%
rename from view/tpl/edpost_head.tpl
rename to view/theme/redbasic/tpl/edpost_head.tpl
diff --git a/view/tpl/email_notify_html.tpl b/view/theme/redbasic/tpl/email_notify_html.tpl
similarity index 100%
rename from view/tpl/email_notify_html.tpl
rename to view/theme/redbasic/tpl/email_notify_html.tpl
diff --git a/view/tpl/email_notify_text.tpl b/view/theme/redbasic/tpl/email_notify_text.tpl
similarity index 100%
rename from view/tpl/email_notify_text.tpl
rename to view/theme/redbasic/tpl/email_notify_text.tpl
diff --git a/view/tpl/event.tpl b/view/theme/redbasic/tpl/event.tpl
similarity index 100%
rename from view/tpl/event.tpl
rename to view/theme/redbasic/tpl/event.tpl
diff --git a/view/tpl/event_cal.tpl b/view/theme/redbasic/tpl/event_cal.tpl
similarity index 100%
rename from view/tpl/event_cal.tpl
rename to view/theme/redbasic/tpl/event_cal.tpl
diff --git a/view/tpl/event_form.tpl b/view/theme/redbasic/tpl/event_form.tpl
similarity index 100%
rename from view/tpl/event_form.tpl
rename to view/theme/redbasic/tpl/event_form.tpl
diff --git a/view/tpl/event_head.tpl b/view/theme/redbasic/tpl/event_head.tpl
similarity index 100%
rename from view/tpl/event_head.tpl
rename to view/theme/redbasic/tpl/event_head.tpl
diff --git a/view/tpl/event_item_content.tpl b/view/theme/redbasic/tpl/event_item_content.tpl
similarity index 100%
rename from view/tpl/event_item_content.tpl
rename to view/theme/redbasic/tpl/event_item_content.tpl
diff --git a/view/tpl/event_item_header.tpl b/view/theme/redbasic/tpl/event_item_header.tpl
similarity index 100%
rename from view/tpl/event_item_header.tpl
rename to view/theme/redbasic/tpl/event_item_header.tpl
diff --git a/view/tpl/events-js.tpl b/view/theme/redbasic/tpl/events-js.tpl
similarity index 100%
rename from view/tpl/events-js.tpl
rename to view/theme/redbasic/tpl/events-js.tpl
diff --git a/view/tpl/events_cal-js.tpl b/view/theme/redbasic/tpl/events_cal-js.tpl
similarity index 100%
rename from view/tpl/events_cal-js.tpl
rename to view/theme/redbasic/tpl/events_cal-js.tpl
diff --git a/view/tpl/events_menu_side.tpl b/view/theme/redbasic/tpl/events_menu_side.tpl
similarity index 100%
rename from view/tpl/events_menu_side.tpl
rename to view/theme/redbasic/tpl/events_menu_side.tpl
diff --git a/view/tpl/events_reminder.tpl b/view/theme/redbasic/tpl/events_reminder.tpl
similarity index 100%
rename from view/tpl/events_reminder.tpl
rename to view/theme/redbasic/tpl/events_reminder.tpl
diff --git a/view/tpl/events_tools_side.tpl b/view/theme/redbasic/tpl/events_tools_side.tpl
similarity index 100%
rename from view/tpl/events_tools_side.tpl
rename to view/theme/redbasic/tpl/events_tools_side.tpl
diff --git a/view/tpl/failed_updates.tpl b/view/theme/redbasic/tpl/failed_updates.tpl
similarity index 100%
rename from view/tpl/failed_updates.tpl
rename to view/theme/redbasic/tpl/failed_updates.tpl
diff --git a/view/tpl/field.tpl b/view/theme/redbasic/tpl/field.tpl
similarity index 100%
rename from view/tpl/field.tpl
rename to view/theme/redbasic/tpl/field.tpl
diff --git a/view/tpl/field_acheckbox.tpl b/view/theme/redbasic/tpl/field_acheckbox.tpl
similarity index 100%
rename from view/tpl/field_acheckbox.tpl
rename to view/theme/redbasic/tpl/field_acheckbox.tpl
diff --git a/view/tpl/field_checkbox.tpl b/view/theme/redbasic/tpl/field_checkbox.tpl
similarity index 100%
rename from view/tpl/field_checkbox.tpl
rename to view/theme/redbasic/tpl/field_checkbox.tpl
diff --git a/view/tpl/field_colorinput.tpl b/view/theme/redbasic/tpl/field_colorinput.tpl
similarity index 100%
rename from view/tpl/field_colorinput.tpl
rename to view/theme/redbasic/tpl/field_colorinput.tpl
diff --git a/view/tpl/field_combobox.tpl b/view/theme/redbasic/tpl/field_combobox.tpl
similarity index 100%
rename from view/tpl/field_combobox.tpl
rename to view/theme/redbasic/tpl/field_combobox.tpl
diff --git a/view/tpl/field_custom.tpl b/view/theme/redbasic/tpl/field_custom.tpl
similarity index 100%
rename from view/tpl/field_custom.tpl
rename to view/theme/redbasic/tpl/field_custom.tpl
diff --git a/view/tpl/field_input.tpl b/view/theme/redbasic/tpl/field_input.tpl
similarity index 100%
rename from view/tpl/field_input.tpl
rename to view/theme/redbasic/tpl/field_input.tpl
diff --git a/view/tpl/field_intcheckbox.tpl b/view/theme/redbasic/tpl/field_intcheckbox.tpl
similarity index 100%
rename from view/tpl/field_intcheckbox.tpl
rename to view/theme/redbasic/tpl/field_intcheckbox.tpl
diff --git a/view/tpl/field_password.tpl b/view/theme/redbasic/tpl/field_password.tpl
similarity index 100%
rename from view/tpl/field_password.tpl
rename to view/theme/redbasic/tpl/field_password.tpl
diff --git a/view/tpl/field_radio.tpl b/view/theme/redbasic/tpl/field_radio.tpl
similarity index 100%
rename from view/tpl/field_radio.tpl
rename to view/theme/redbasic/tpl/field_radio.tpl
diff --git a/view/tpl/field_richtext.tpl b/view/theme/redbasic/tpl/field_richtext.tpl
similarity index 100%
rename from view/tpl/field_richtext.tpl
rename to view/theme/redbasic/tpl/field_richtext.tpl
diff --git a/view/tpl/field_select.tpl b/view/theme/redbasic/tpl/field_select.tpl
similarity index 100%
rename from view/tpl/field_select.tpl
rename to view/theme/redbasic/tpl/field_select.tpl
diff --git a/view/tpl/field_select_disabled.tpl b/view/theme/redbasic/tpl/field_select_disabled.tpl
similarity index 100%
rename from view/tpl/field_select_disabled.tpl
rename to view/theme/redbasic/tpl/field_select_disabled.tpl
diff --git a/view/tpl/field_select_grouped.tpl b/view/theme/redbasic/tpl/field_select_grouped.tpl
similarity index 100%
rename from view/tpl/field_select_grouped.tpl
rename to view/theme/redbasic/tpl/field_select_grouped.tpl
diff --git a/view/tpl/field_select_raw.tpl b/view/theme/redbasic/tpl/field_select_raw.tpl
similarity index 100%
rename from view/tpl/field_select_raw.tpl
rename to view/theme/redbasic/tpl/field_select_raw.tpl
diff --git a/view/tpl/field_textarea.tpl b/view/theme/redbasic/tpl/field_textarea.tpl
similarity index 100%
rename from view/tpl/field_textarea.tpl
rename to view/theme/redbasic/tpl/field_textarea.tpl
diff --git a/view/tpl/field_themeselect.tpl b/view/theme/redbasic/tpl/field_themeselect.tpl
similarity index 100%
rename from view/tpl/field_themeselect.tpl
rename to view/theme/redbasic/tpl/field_themeselect.tpl
diff --git a/view/tpl/field_yesno.tpl b/view/theme/redbasic/tpl/field_yesno.tpl
similarity index 100%
rename from view/tpl/field_yesno.tpl
rename to view/theme/redbasic/tpl/field_yesno.tpl
diff --git a/view/tpl/fileas_widget.tpl b/view/theme/redbasic/tpl/fileas_widget.tpl
similarity index 100%
rename from view/tpl/fileas_widget.tpl
rename to view/theme/redbasic/tpl/fileas_widget.tpl
diff --git a/view/tpl/filebrowser.tpl b/view/theme/redbasic/tpl/filebrowser.tpl
similarity index 100%
rename from view/tpl/filebrowser.tpl
rename to view/theme/redbasic/tpl/filebrowser.tpl
diff --git a/view/tpl/filer_dialog.tpl b/view/theme/redbasic/tpl/filer_dialog.tpl
similarity index 100%
rename from view/tpl/filer_dialog.tpl
rename to view/theme/redbasic/tpl/filer_dialog.tpl
diff --git a/view/tpl/follow.tpl b/view/theme/redbasic/tpl/follow.tpl
similarity index 100%
rename from view/tpl/follow.tpl
rename to view/theme/redbasic/tpl/follow.tpl
diff --git a/view/tpl/force_image_reload.tpl b/view/theme/redbasic/tpl/force_image_reload.tpl
similarity index 100%
rename from view/tpl/force_image_reload.tpl
rename to view/theme/redbasic/tpl/force_image_reload.tpl
diff --git a/view/tpl/generic_addon_settings.tpl b/view/theme/redbasic/tpl/generic_addon_settings.tpl
similarity index 100%
rename from view/tpl/generic_addon_settings.tpl
rename to view/theme/redbasic/tpl/generic_addon_settings.tpl
diff --git a/view/tpl/generic_links_widget.tpl b/view/theme/redbasic/tpl/generic_links_widget.tpl
similarity index 100%
rename from view/tpl/generic_links_widget.tpl
rename to view/theme/redbasic/tpl/generic_links_widget.tpl
diff --git a/view/tpl/generic_modal.tpl b/view/theme/redbasic/tpl/generic_modal.tpl
similarity index 100%
rename from view/tpl/generic_modal.tpl
rename to view/theme/redbasic/tpl/generic_modal.tpl
diff --git a/view/tpl/group_drop.tpl b/view/theme/redbasic/tpl/group_drop.tpl
similarity index 100%
rename from view/tpl/group_drop.tpl
rename to view/theme/redbasic/tpl/group_drop.tpl
diff --git a/view/tpl/group_edit.tpl b/view/theme/redbasic/tpl/group_edit.tpl
similarity index 100%
rename from view/tpl/group_edit.tpl
rename to view/theme/redbasic/tpl/group_edit.tpl
diff --git a/view/tpl/group_selection.tpl b/view/theme/redbasic/tpl/group_selection.tpl
similarity index 100%
rename from view/tpl/group_selection.tpl
rename to view/theme/redbasic/tpl/group_selection.tpl
diff --git a/view/tpl/group_side.tpl b/view/theme/redbasic/tpl/group_side.tpl
similarity index 100%
rename from view/tpl/group_side.tpl
rename to view/theme/redbasic/tpl/group_side.tpl
diff --git a/view/tpl/groupeditor.tpl b/view/theme/redbasic/tpl/groupeditor.tpl
similarity index 100%
rename from view/tpl/groupeditor.tpl
rename to view/theme/redbasic/tpl/groupeditor.tpl
diff --git a/view/tpl/hdr.tpl b/view/theme/redbasic/tpl/hdr.tpl
similarity index 100%
rename from view/tpl/hdr.tpl
rename to view/theme/redbasic/tpl/hdr.tpl
diff --git a/view/tpl/head.tpl b/view/theme/redbasic/tpl/head.tpl
similarity index 100%
rename from view/tpl/head.tpl
rename to view/theme/redbasic/tpl/head.tpl
diff --git a/view/tpl/help.tpl b/view/theme/redbasic/tpl/help.tpl
similarity index 100%
rename from view/tpl/help.tpl
rename to view/theme/redbasic/tpl/help.tpl
diff --git a/view/tpl/install.tpl b/view/theme/redbasic/tpl/install.tpl
similarity index 100%
rename from view/tpl/install.tpl
rename to view/theme/redbasic/tpl/install.tpl
diff --git a/view/tpl/install_checks.tpl b/view/theme/redbasic/tpl/install_checks.tpl
similarity index 100%
rename from view/tpl/install_checks.tpl
rename to view/theme/redbasic/tpl/install_checks.tpl
diff --git a/view/tpl/install_db.tpl b/view/theme/redbasic/tpl/install_db.tpl
similarity index 100%
rename from view/tpl/install_db.tpl
rename to view/theme/redbasic/tpl/install_db.tpl
diff --git a/view/tpl/install_settings.tpl b/view/theme/redbasic/tpl/install_settings.tpl
similarity index 100%
rename from view/tpl/install_settings.tpl
rename to view/theme/redbasic/tpl/install_settings.tpl
diff --git a/view/tpl/invite.tpl b/view/theme/redbasic/tpl/invite.tpl
similarity index 100%
rename from view/tpl/invite.tpl
rename to view/theme/redbasic/tpl/invite.tpl
diff --git a/view/tpl/item_attach.tpl b/view/theme/redbasic/tpl/item_attach.tpl
similarity index 100%
rename from view/tpl/item_attach.tpl
rename to view/theme/redbasic/tpl/item_attach.tpl
diff --git a/view/tpl/item_binary.tpl b/view/theme/redbasic/tpl/item_binary.tpl
similarity index 100%
rename from view/tpl/item_binary.tpl
rename to view/theme/redbasic/tpl/item_binary.tpl
diff --git a/view/tpl/item_categories.tpl b/view/theme/redbasic/tpl/item_categories.tpl
similarity index 100%
rename from view/tpl/item_categories.tpl
rename to view/theme/redbasic/tpl/item_categories.tpl
diff --git a/view/tpl/item_filer.tpl b/view/theme/redbasic/tpl/item_filer.tpl
similarity index 100%
rename from view/tpl/item_filer.tpl
rename to view/theme/redbasic/tpl/item_filer.tpl
diff --git a/view/tpl/item_import.tpl b/view/theme/redbasic/tpl/item_import.tpl
similarity index 100%
rename from view/tpl/item_import.tpl
rename to view/theme/redbasic/tpl/item_import.tpl
diff --git a/view/tpl/jot-header.tpl b/view/theme/redbasic/tpl/jot-header.tpl
similarity index 100%
rename from view/tpl/jot-header.tpl
rename to view/theme/redbasic/tpl/jot-header.tpl
diff --git a/view/tpl/jot.tpl b/view/theme/redbasic/tpl/jot.tpl
similarity index 100%
rename from view/tpl/jot.tpl
rename to view/theme/redbasic/tpl/jot.tpl
diff --git a/view/tpl/jot_geotag.tpl b/view/theme/redbasic/tpl/jot_geotag.tpl
similarity index 100%
rename from view/tpl/jot_geotag.tpl
rename to view/theme/redbasic/tpl/jot_geotag.tpl
diff --git a/view/tpl/js_strings.tpl b/view/theme/redbasic/tpl/js_strings.tpl
similarity index 100%
rename from view/tpl/js_strings.tpl
rename to view/theme/redbasic/tpl/js_strings.tpl
diff --git a/view/tpl/lang_selector.tpl b/view/theme/redbasic/tpl/lang_selector.tpl
similarity index 100%
rename from view/tpl/lang_selector.tpl
rename to view/theme/redbasic/tpl/lang_selector.tpl
diff --git a/view/tpl/layoutlist.tpl b/view/theme/redbasic/tpl/layoutlist.tpl
similarity index 100%
rename from view/tpl/layoutlist.tpl
rename to view/theme/redbasic/tpl/layoutlist.tpl
diff --git a/view/tpl/like_noshare.tpl b/view/theme/redbasic/tpl/like_noshare.tpl
similarity index 100%
rename from view/tpl/like_noshare.tpl
rename to view/theme/redbasic/tpl/like_noshare.tpl
diff --git a/view/tpl/locmanage.tpl b/view/theme/redbasic/tpl/locmanage.tpl
similarity index 100%
rename from view/tpl/locmanage.tpl
rename to view/theme/redbasic/tpl/locmanage.tpl
diff --git a/view/tpl/login.tpl b/view/theme/redbasic/tpl/login.tpl
similarity index 100%
rename from view/tpl/login.tpl
rename to view/theme/redbasic/tpl/login.tpl
diff --git a/view/tpl/logout.tpl b/view/theme/redbasic/tpl/logout.tpl
similarity index 100%
rename from view/tpl/logout.tpl
rename to view/theme/redbasic/tpl/logout.tpl
diff --git a/view/tpl/lostpass.tpl b/view/theme/redbasic/tpl/lostpass.tpl
similarity index 100%
rename from view/tpl/lostpass.tpl
rename to view/theme/redbasic/tpl/lostpass.tpl
diff --git a/view/tpl/mail_conv.tpl b/view/theme/redbasic/tpl/mail_conv.tpl
similarity index 100%
rename from view/tpl/mail_conv.tpl
rename to view/theme/redbasic/tpl/mail_conv.tpl
diff --git a/view/tpl/mail_display.tpl b/view/theme/redbasic/tpl/mail_display.tpl
similarity index 100%
rename from view/tpl/mail_display.tpl
rename to view/theme/redbasic/tpl/mail_display.tpl
diff --git a/view/tpl/mail_head.tpl b/view/theme/redbasic/tpl/mail_head.tpl
similarity index 100%
rename from view/tpl/mail_head.tpl
rename to view/theme/redbasic/tpl/mail_head.tpl
diff --git a/view/tpl/mail_list.tpl b/view/theme/redbasic/tpl/mail_list.tpl
similarity index 100%
rename from view/tpl/mail_list.tpl
rename to view/theme/redbasic/tpl/mail_list.tpl
diff --git a/view/tpl/main_slider.tpl b/view/theme/redbasic/tpl/main_slider.tpl
similarity index 100%
rename from view/tpl/main_slider.tpl
rename to view/theme/redbasic/tpl/main_slider.tpl
diff --git a/view/tpl/match.tpl b/view/theme/redbasic/tpl/match.tpl
similarity index 100%
rename from view/tpl/match.tpl
rename to view/theme/redbasic/tpl/match.tpl
diff --git a/view/tpl/menuedit.tpl b/view/theme/redbasic/tpl/menuedit.tpl
similarity index 100%
rename from view/tpl/menuedit.tpl
rename to view/theme/redbasic/tpl/menuedit.tpl
diff --git a/view/tpl/menulist.tpl b/view/theme/redbasic/tpl/menulist.tpl
similarity index 100%
rename from view/tpl/menulist.tpl
rename to view/theme/redbasic/tpl/menulist.tpl
diff --git a/view/tpl/message_side.tpl b/view/theme/redbasic/tpl/message_side.tpl
similarity index 100%
rename from view/tpl/message_side.tpl
rename to view/theme/redbasic/tpl/message_side.tpl
diff --git a/view/tpl/micropro_img.tpl b/view/theme/redbasic/tpl/micropro_img.tpl
similarity index 100%
rename from view/tpl/micropro_img.tpl
rename to view/theme/redbasic/tpl/micropro_img.tpl
diff --git a/view/tpl/micropro_txt.tpl b/view/theme/redbasic/tpl/micropro_txt.tpl
similarity index 100%
rename from view/tpl/micropro_txt.tpl
rename to view/theme/redbasic/tpl/micropro_txt.tpl
diff --git a/view/tpl/mitemedit.tpl b/view/theme/redbasic/tpl/mitemedit.tpl
similarity index 100%
rename from view/tpl/mitemedit.tpl
rename to view/theme/redbasic/tpl/mitemedit.tpl
diff --git a/view/tpl/mitemlist.tpl b/view/theme/redbasic/tpl/mitemlist.tpl
similarity index 100%
rename from view/tpl/mitemlist.tpl
rename to view/theme/redbasic/tpl/mitemlist.tpl
diff --git a/view/tpl/mood_content.tpl b/view/theme/redbasic/tpl/mood_content.tpl
similarity index 100%
rename from view/tpl/mood_content.tpl
rename to view/theme/redbasic/tpl/mood_content.tpl
diff --git a/view/tpl/msg-header.tpl b/view/theme/redbasic/tpl/msg-header.tpl
similarity index 100%
rename from view/tpl/msg-header.tpl
rename to view/theme/redbasic/tpl/msg-header.tpl
diff --git a/view/tpl/myapps.tpl b/view/theme/redbasic/tpl/myapps.tpl
similarity index 100%
rename from view/tpl/myapps.tpl
rename to view/theme/redbasic/tpl/myapps.tpl
diff --git a/view/tpl/nav.tpl b/view/theme/redbasic/tpl/nav.tpl
similarity index 100%
rename from view/tpl/nav.tpl
rename to view/theme/redbasic/tpl/nav.tpl
diff --git a/view/tpl/nav_login.tpl b/view/theme/redbasic/tpl/nav_login.tpl
similarity index 100%
rename from view/tpl/nav_login.tpl
rename to view/theme/redbasic/tpl/nav_login.tpl
diff --git a/view/tpl/new_channel.tpl b/view/theme/redbasic/tpl/new_channel.tpl
similarity index 100%
rename from view/tpl/new_channel.tpl
rename to view/theme/redbasic/tpl/new_channel.tpl
diff --git a/view/tpl/notes.tpl b/view/theme/redbasic/tpl/notes.tpl
similarity index 100%
rename from view/tpl/notes.tpl
rename to view/theme/redbasic/tpl/notes.tpl
diff --git a/view/tpl/notifications.tpl b/view/theme/redbasic/tpl/notifications.tpl
similarity index 100%
rename from view/tpl/notifications.tpl
rename to view/theme/redbasic/tpl/notifications.tpl
diff --git a/view/tpl/notify.tpl b/view/theme/redbasic/tpl/notify.tpl
similarity index 100%
rename from view/tpl/notify.tpl
rename to view/theme/redbasic/tpl/notify.tpl
diff --git a/view/tpl/nwiki_page_history.tpl b/view/theme/redbasic/tpl/nwiki_page_history.tpl
similarity index 100%
rename from view/tpl/nwiki_page_history.tpl
rename to view/theme/redbasic/tpl/nwiki_page_history.tpl
diff --git a/view/tpl/oauth_authorize.tpl b/view/theme/redbasic/tpl/oauth_authorize.tpl
similarity index 100%
rename from view/tpl/oauth_authorize.tpl
rename to view/theme/redbasic/tpl/oauth_authorize.tpl
diff --git a/view/tpl/oauth_authorize_done.tpl b/view/theme/redbasic/tpl/oauth_authorize_done.tpl
similarity index 100%
rename from view/tpl/oauth_authorize_done.tpl
rename to view/theme/redbasic/tpl/oauth_authorize_done.tpl
diff --git a/view/tpl/oembed_video.tpl b/view/theme/redbasic/tpl/oembed_video.tpl
similarity index 100%
rename from view/tpl/oembed_video.tpl
rename to view/theme/redbasic/tpl/oembed_video.tpl
diff --git a/view/tpl/oexchange_xrd.tpl b/view/theme/redbasic/tpl/oexchange_xrd.tpl
similarity index 100%
rename from view/tpl/oexchange_xrd.tpl
rename to view/theme/redbasic/tpl/oexchange_xrd.tpl
diff --git a/view/tpl/page_display.tpl b/view/theme/redbasic/tpl/page_display.tpl
similarity index 100%
rename from view/tpl/page_display.tpl
rename to view/theme/redbasic/tpl/page_display.tpl
diff --git a/view/tpl/page_display_empty.tpl b/view/theme/redbasic/tpl/page_display_empty.tpl
similarity index 100%
rename from view/tpl/page_display_empty.tpl
rename to view/theme/redbasic/tpl/page_display_empty.tpl
diff --git a/view/tpl/pdledit.tpl b/view/theme/redbasic/tpl/pdledit.tpl
similarity index 100%
rename from view/tpl/pdledit.tpl
rename to view/theme/redbasic/tpl/pdledit.tpl
diff --git a/view/tpl/peoplefind.tpl b/view/theme/redbasic/tpl/peoplefind.tpl
similarity index 100%
rename from view/tpl/peoplefind.tpl
rename to view/theme/redbasic/tpl/peoplefind.tpl
diff --git a/view/tpl/photo_album.tpl b/view/theme/redbasic/tpl/photo_album.tpl
similarity index 100%
rename from view/tpl/photo_album.tpl
rename to view/theme/redbasic/tpl/photo_album.tpl
diff --git a/view/tpl/photo_albums.tpl b/view/theme/redbasic/tpl/photo_albums.tpl
similarity index 100%
rename from view/tpl/photo_albums.tpl
rename to view/theme/redbasic/tpl/photo_albums.tpl
diff --git a/view/tpl/photo_drop.tpl b/view/theme/redbasic/tpl/photo_drop.tpl
similarity index 100%
rename from view/tpl/photo_drop.tpl
rename to view/theme/redbasic/tpl/photo_drop.tpl
diff --git a/view/tpl/photo_item.tpl b/view/theme/redbasic/tpl/photo_item.tpl
similarity index 100%
rename from view/tpl/photo_item.tpl
rename to view/theme/redbasic/tpl/photo_item.tpl
diff --git a/view/tpl/photo_top.tpl b/view/theme/redbasic/tpl/photo_top.tpl
similarity index 100%
rename from view/tpl/photo_top.tpl
rename to view/theme/redbasic/tpl/photo_top.tpl
diff --git a/view/tpl/photo_view.tpl b/view/theme/redbasic/tpl/photo_view.tpl
similarity index 100%
rename from view/tpl/photo_view.tpl
rename to view/theme/redbasic/tpl/photo_view.tpl
diff --git a/view/tpl/photos_recent.tpl b/view/theme/redbasic/tpl/photos_recent.tpl
similarity index 100%
rename from view/tpl/photos_recent.tpl
rename to view/theme/redbasic/tpl/photos_recent.tpl
diff --git a/view/tpl/photos_upload.tpl b/view/theme/redbasic/tpl/photos_upload.tpl
similarity index 100%
rename from view/tpl/photos_upload.tpl
rename to view/theme/redbasic/tpl/photos_upload.tpl
diff --git a/view/tpl/photosajax.tpl b/view/theme/redbasic/tpl/photosajax.tpl
similarity index 100%
rename from view/tpl/photosajax.tpl
rename to view/theme/redbasic/tpl/photosajax.tpl
diff --git a/view/tpl/poco_entry_xml.tpl b/view/theme/redbasic/tpl/poco_entry_xml.tpl
similarity index 100%
rename from view/tpl/poco_entry_xml.tpl
rename to view/theme/redbasic/tpl/poco_entry_xml.tpl
diff --git a/view/tpl/poco_xml.tpl b/view/theme/redbasic/tpl/poco_xml.tpl
similarity index 100%
rename from view/tpl/poco_xml.tpl
rename to view/theme/redbasic/tpl/poco_xml.tpl
diff --git a/view/tpl/poke_content.tpl b/view/theme/redbasic/tpl/poke_content.tpl
similarity index 100%
rename from view/tpl/poke_content.tpl
rename to view/theme/redbasic/tpl/poke_content.tpl
diff --git a/view/tpl/posted_date_widget.tpl b/view/theme/redbasic/tpl/posted_date_widget.tpl
similarity index 100%
rename from view/tpl/posted_date_widget.tpl
rename to view/theme/redbasic/tpl/posted_date_widget.tpl
diff --git a/view/tpl/prep.tpl b/view/theme/redbasic/tpl/prep.tpl
similarity index 100%
rename from view/tpl/prep.tpl
rename to view/theme/redbasic/tpl/prep.tpl
diff --git a/view/tpl/profdef_edit.tpl b/view/theme/redbasic/tpl/profdef_edit.tpl
similarity index 100%
rename from view/tpl/profdef_edit.tpl
rename to view/theme/redbasic/tpl/profdef_edit.tpl
diff --git a/view/tpl/profed_head.tpl b/view/theme/redbasic/tpl/profed_head.tpl
similarity index 100%
rename from view/tpl/profed_head.tpl
rename to view/theme/redbasic/tpl/profed_head.tpl
diff --git a/view/tpl/profile_advanced.tpl b/view/theme/redbasic/tpl/profile_advanced.tpl
similarity index 100%
rename from view/tpl/profile_advanced.tpl
rename to view/theme/redbasic/tpl/profile_advanced.tpl
diff --git a/view/tpl/profile_edit.tpl b/view/theme/redbasic/tpl/profile_edit.tpl
similarity index 100%
rename from view/tpl/profile_edit.tpl
rename to view/theme/redbasic/tpl/profile_edit.tpl
diff --git a/view/tpl/profile_entry.tpl b/view/theme/redbasic/tpl/profile_entry.tpl
similarity index 100%
rename from view/tpl/profile_entry.tpl
rename to view/theme/redbasic/tpl/profile_entry.tpl
diff --git a/view/tpl/profile_listing_header.tpl b/view/theme/redbasic/tpl/profile_listing_header.tpl
similarity index 100%
rename from view/tpl/profile_listing_header.tpl
rename to view/theme/redbasic/tpl/profile_listing_header.tpl
diff --git a/view/tpl/profile_photo.tpl b/view/theme/redbasic/tpl/profile_photo.tpl
similarity index 100%
rename from view/tpl/profile_photo.tpl
rename to view/theme/redbasic/tpl/profile_photo.tpl
diff --git a/view/tpl/profile_tabs.tpl b/view/theme/redbasic/tpl/profile_tabs.tpl
similarity index 100%
rename from view/tpl/profile_tabs.tpl
rename to view/theme/redbasic/tpl/profile_tabs.tpl
diff --git a/view/tpl/profile_vcard.tpl b/view/theme/redbasic/tpl/profile_vcard.tpl
similarity index 100%
rename from view/tpl/profile_vcard.tpl
rename to view/theme/redbasic/tpl/profile_vcard.tpl
diff --git a/view/tpl/profile_vcard_short.tpl b/view/theme/redbasic/tpl/profile_vcard_short.tpl
similarity index 100%
rename from view/tpl/profile_vcard_short.tpl
rename to view/theme/redbasic/tpl/profile_vcard_short.tpl
diff --git a/view/tpl/prv_message.tpl b/view/theme/redbasic/tpl/prv_message.tpl
similarity index 100%
rename from view/tpl/prv_message.tpl
rename to view/theme/redbasic/tpl/prv_message.tpl
diff --git a/view/tpl/pwdreset.tpl b/view/theme/redbasic/tpl/pwdreset.tpl
similarity index 100%
rename from view/tpl/pwdreset.tpl
rename to view/theme/redbasic/tpl/pwdreset.tpl
diff --git a/view/tpl/rating_form.tpl b/view/theme/redbasic/tpl/rating_form.tpl
similarity index 100%
rename from view/tpl/rating_form.tpl
rename to view/theme/redbasic/tpl/rating_form.tpl
diff --git a/view/tpl/rating_slider.tpl b/view/theme/redbasic/tpl/rating_slider.tpl
similarity index 100%
rename from view/tpl/rating_slider.tpl
rename to view/theme/redbasic/tpl/rating_slider.tpl
diff --git a/view/tpl/rbmark.tpl b/view/theme/redbasic/tpl/rbmark.tpl
similarity index 100%
rename from view/tpl/rbmark.tpl
rename to view/theme/redbasic/tpl/rbmark.tpl
diff --git a/view/tpl/register.tpl b/view/theme/redbasic/tpl/register.tpl
similarity index 100%
rename from view/tpl/register.tpl
rename to view/theme/redbasic/tpl/register.tpl
diff --git a/view/tpl/remote_friends_common.tpl b/view/theme/redbasic/tpl/remote_friends_common.tpl
similarity index 100%
rename from view/tpl/remote_friends_common.tpl
rename to view/theme/redbasic/tpl/remote_friends_common.tpl
diff --git a/view/tpl/remote_login.tpl b/view/theme/redbasic/tpl/remote_login.tpl
similarity index 100%
rename from view/tpl/remote_login.tpl
rename to view/theme/redbasic/tpl/remote_login.tpl
diff --git a/view/tpl/removeaccount.tpl b/view/theme/redbasic/tpl/removeaccount.tpl
similarity index 100%
rename from view/tpl/removeaccount.tpl
rename to view/theme/redbasic/tpl/removeaccount.tpl
diff --git a/view/tpl/removeme.tpl b/view/theme/redbasic/tpl/removeme.tpl
similarity index 100%
rename from view/tpl/removeme.tpl
rename to view/theme/redbasic/tpl/removeme.tpl
diff --git a/view/tpl/rmagic.tpl b/view/theme/redbasic/tpl/rmagic.tpl
similarity index 100%
rename from view/tpl/rmagic.tpl
rename to view/theme/redbasic/tpl/rmagic.tpl
diff --git a/view/tpl/safesearch.tpl b/view/theme/redbasic/tpl/safesearch.tpl
similarity index 100%
rename from view/tpl/safesearch.tpl
rename to view/theme/redbasic/tpl/safesearch.tpl
diff --git a/view/tpl/saved_searches.tpl b/view/theme/redbasic/tpl/saved_searches.tpl
similarity index 100%
rename from view/tpl/saved_searches.tpl
rename to view/theme/redbasic/tpl/saved_searches.tpl
diff --git a/view/tpl/search_item.tpl b/view/theme/redbasic/tpl/search_item.tpl
similarity index 100%
rename from view/tpl/search_item.tpl
rename to view/theme/redbasic/tpl/search_item.tpl
diff --git a/view/tpl/searchbox.tpl b/view/theme/redbasic/tpl/searchbox.tpl
similarity index 100%
rename from view/tpl/searchbox.tpl
rename to view/theme/redbasic/tpl/searchbox.tpl
diff --git a/view/tpl/section_title.tpl b/view/theme/redbasic/tpl/section_title.tpl
similarity index 100%
rename from view/tpl/section_title.tpl
rename to view/theme/redbasic/tpl/section_title.tpl
diff --git a/view/tpl/select_timezone.tpl b/view/theme/redbasic/tpl/select_timezone.tpl
similarity index 100%
rename from view/tpl/select_timezone.tpl
rename to view/theme/redbasic/tpl/select_timezone.tpl
diff --git a/view/tpl/sellpage_edit.tpl b/view/theme/redbasic/tpl/sellpage_edit.tpl
similarity index 100%
rename from view/tpl/sellpage_edit.tpl
rename to view/theme/redbasic/tpl/sellpage_edit.tpl
diff --git a/view/tpl/sellpage_submit.tpl b/view/theme/redbasic/tpl/sellpage_submit.tpl
similarity index 100%
rename from view/tpl/sellpage_submit.tpl
rename to view/theme/redbasic/tpl/sellpage_submit.tpl
diff --git a/view/tpl/sellpage_view.tpl b/view/theme/redbasic/tpl/sellpage_view.tpl
similarity index 100%
rename from view/tpl/sellpage_view.tpl
rename to view/theme/redbasic/tpl/sellpage_view.tpl
diff --git a/view/tpl/settings.tpl b/view/theme/redbasic/tpl/settings.tpl
similarity index 100%
rename from view/tpl/settings.tpl
rename to view/theme/redbasic/tpl/settings.tpl
diff --git a/view/tpl/settings_account.tpl b/view/theme/redbasic/tpl/settings_account.tpl
similarity index 100%
rename from view/tpl/settings_account.tpl
rename to view/theme/redbasic/tpl/settings_account.tpl
diff --git a/view/tpl/settings_addons.tpl b/view/theme/redbasic/tpl/settings_addons.tpl
similarity index 100%
rename from view/tpl/settings_addons.tpl
rename to view/theme/redbasic/tpl/settings_addons.tpl
diff --git a/view/tpl/settings_connectors.tpl b/view/theme/redbasic/tpl/settings_connectors.tpl
similarity index 100%
rename from view/tpl/settings_connectors.tpl
rename to view/theme/redbasic/tpl/settings_connectors.tpl
diff --git a/view/tpl/settings_display.tpl b/view/theme/redbasic/tpl/settings_display.tpl
similarity index 100%
rename from view/tpl/settings_display.tpl
rename to view/theme/redbasic/tpl/settings_display.tpl
diff --git a/view/tpl/settings_features.tpl b/view/theme/redbasic/tpl/settings_features.tpl
similarity index 100%
rename from view/tpl/settings_features.tpl
rename to view/theme/redbasic/tpl/settings_features.tpl
diff --git a/view/tpl/settings_nick_set.tpl b/view/theme/redbasic/tpl/settings_nick_set.tpl
similarity index 100%
rename from view/tpl/settings_nick_set.tpl
rename to view/theme/redbasic/tpl/settings_nick_set.tpl
diff --git a/view/tpl/settings_oauth.tpl b/view/theme/redbasic/tpl/settings_oauth.tpl
similarity index 100%
rename from view/tpl/settings_oauth.tpl
rename to view/theme/redbasic/tpl/settings_oauth.tpl
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/theme/redbasic/tpl/settings_oauth_edit.tpl
similarity index 100%
rename from view/tpl/settings_oauth_edit.tpl
rename to view/theme/redbasic/tpl/settings_oauth_edit.tpl
diff --git a/view/tpl/settings_permcats.tpl b/view/theme/redbasic/tpl/settings_permcats.tpl
similarity index 100%
rename from view/tpl/settings_permcats.tpl
rename to view/theme/redbasic/tpl/settings_permcats.tpl
diff --git a/view/tpl/settings_tokens.tpl b/view/theme/redbasic/tpl/settings_tokens.tpl
similarity index 100%
rename from view/tpl/settings_tokens.tpl
rename to view/theme/redbasic/tpl/settings_tokens.tpl
diff --git a/view/tpl/sharedwithme.tpl b/view/theme/redbasic/tpl/sharedwithme.tpl
similarity index 100%
rename from view/tpl/sharedwithme.tpl
rename to view/theme/redbasic/tpl/sharedwithme.tpl
diff --git a/view/tpl/show_thing.tpl b/view/theme/redbasic/tpl/show_thing.tpl
similarity index 100%
rename from view/tpl/show_thing.tpl
rename to view/theme/redbasic/tpl/show_thing.tpl
diff --git a/view/tpl/siteinfo.tpl b/view/theme/redbasic/tpl/siteinfo.tpl
similarity index 100%
rename from view/tpl/siteinfo.tpl
rename to view/theme/redbasic/tpl/siteinfo.tpl
diff --git a/view/tpl/sitesearch.tpl b/view/theme/redbasic/tpl/sitesearch.tpl
similarity index 100%
rename from view/tpl/sitesearch.tpl
rename to view/theme/redbasic/tpl/sitesearch.tpl
diff --git a/view/tpl/sources_edit.tpl b/view/theme/redbasic/tpl/sources_edit.tpl
similarity index 100%
rename from view/tpl/sources_edit.tpl
rename to view/theme/redbasic/tpl/sources_edit.tpl
diff --git a/view/tpl/sources_list.tpl b/view/theme/redbasic/tpl/sources_list.tpl
similarity index 100%
rename from view/tpl/sources_list.tpl
rename to view/theme/redbasic/tpl/sources_list.tpl
diff --git a/view/tpl/sources_new.tpl b/view/theme/redbasic/tpl/sources_new.tpl
similarity index 100%
rename from view/tpl/sources_new.tpl
rename to view/theme/redbasic/tpl/sources_new.tpl
diff --git a/view/tpl/suggest_friends.tpl b/view/theme/redbasic/tpl/suggest_friends.tpl
similarity index 100%
rename from view/tpl/suggest_friends.tpl
rename to view/theme/redbasic/tpl/suggest_friends.tpl
diff --git a/view/tpl/suggest_page.tpl b/view/theme/redbasic/tpl/suggest_page.tpl
similarity index 100%
rename from view/tpl/suggest_page.tpl
rename to view/theme/redbasic/tpl/suggest_page.tpl
diff --git a/view/tpl/suggest_widget.tpl b/view/theme/redbasic/tpl/suggest_widget.tpl
similarity index 100%
rename from view/tpl/suggest_widget.tpl
rename to view/theme/redbasic/tpl/suggest_widget.tpl
diff --git a/view/tpl/thing_edit.tpl b/view/theme/redbasic/tpl/thing_edit.tpl
similarity index 100%
rename from view/tpl/thing_edit.tpl
rename to view/theme/redbasic/tpl/thing_edit.tpl
diff --git a/view/tpl/thing_input.tpl b/view/theme/redbasic/tpl/thing_input.tpl
similarity index 100%
rename from view/tpl/thing_input.tpl
rename to view/theme/redbasic/tpl/thing_input.tpl
diff --git a/view/tpl/threaded_conversation.tpl b/view/theme/redbasic/tpl/threaded_conversation.tpl
similarity index 100%
rename from view/tpl/threaded_conversation.tpl
rename to view/theme/redbasic/tpl/threaded_conversation.tpl
diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/theme/redbasic/tpl/toggle_mobile_footer.tpl
similarity index 100%
rename from view/tpl/toggle_mobile_footer.tpl
rename to view/theme/redbasic/tpl/toggle_mobile_footer.tpl
diff --git a/view/tpl/uexport.tpl b/view/theme/redbasic/tpl/uexport.tpl
similarity index 100%
rename from view/tpl/uexport.tpl
rename to view/theme/redbasic/tpl/uexport.tpl
diff --git a/view/tpl/usermenu.tpl b/view/theme/redbasic/tpl/usermenu.tpl
similarity index 100%
rename from view/tpl/usermenu.tpl
rename to view/theme/redbasic/tpl/usermenu.tpl
diff --git a/view/tpl/viewcontact_template.tpl b/view/theme/redbasic/tpl/viewcontact_template.tpl
similarity index 100%
rename from view/tpl/viewcontact_template.tpl
rename to view/theme/redbasic/tpl/viewcontact_template.tpl
diff --git a/view/tpl/viewcontactsajax.tpl b/view/theme/redbasic/tpl/viewcontactsajax.tpl
similarity index 100%
rename from view/tpl/viewcontactsajax.tpl
rename to view/theme/redbasic/tpl/viewcontactsajax.tpl
diff --git a/view/tpl/webpage_export_list.tpl b/view/theme/redbasic/tpl/webpage_export_list.tpl
similarity index 100%
rename from view/tpl/webpage_export_list.tpl
rename to view/theme/redbasic/tpl/webpage_export_list.tpl
diff --git a/view/tpl/webpage_import.tpl b/view/theme/redbasic/tpl/webpage_import.tpl
similarity index 100%
rename from view/tpl/webpage_import.tpl
rename to view/theme/redbasic/tpl/webpage_import.tpl
diff --git a/view/tpl/webpagelist.tpl b/view/theme/redbasic/tpl/webpagelist.tpl
similarity index 100%
rename from view/tpl/webpagelist.tpl
rename to view/theme/redbasic/tpl/webpagelist.tpl
diff --git a/view/tpl/website_portation_tools.tpl b/view/theme/redbasic/tpl/website_portation_tools.tpl
similarity index 100%
rename from view/tpl/website_portation_tools.tpl
rename to view/theme/redbasic/tpl/website_portation_tools.tpl
diff --git a/view/tpl/wiki.tpl b/view/theme/redbasic/tpl/wiki.tpl
similarity index 100%
rename from view/tpl/wiki.tpl
rename to view/theme/redbasic/tpl/wiki.tpl
diff --git a/view/tpl/wiki_page_history.tpl b/view/theme/redbasic/tpl/wiki_page_history.tpl
similarity index 100%
rename from view/tpl/wiki_page_history.tpl
rename to view/theme/redbasic/tpl/wiki_page_history.tpl
diff --git a/view/tpl/wiki_page_list.tpl b/view/theme/redbasic/tpl/wiki_page_list.tpl
similarity index 100%
rename from view/tpl/wiki_page_list.tpl
rename to view/theme/redbasic/tpl/wiki_page_list.tpl
diff --git a/view/tpl/wikilist.tpl b/view/theme/redbasic/tpl/wikilist.tpl
similarity index 100%
rename from view/tpl/wikilist.tpl
rename to view/theme/redbasic/tpl/wikilist.tpl
diff --git a/view/tpl/wikilist_widget.tpl b/view/theme/redbasic/tpl/wikilist_widget.tpl
similarity index 100%
rename from view/tpl/wikilist_widget.tpl
rename to view/theme/redbasic/tpl/wikilist_widget.tpl
diff --git a/view/tpl/write_pages.tpl b/view/theme/redbasic/tpl/write_pages.tpl
similarity index 100%
rename from view/tpl/write_pages.tpl
rename to view/theme/redbasic/tpl/write_pages.tpl
diff --git a/view/tpl/xchan_vcard.tpl b/view/theme/redbasic/tpl/xchan_vcard.tpl
similarity index 100%
rename from view/tpl/xchan_vcard.tpl
rename to view/theme/redbasic/tpl/xchan_vcard.tpl
diff --git a/view/tpl/xrd_diaspora.tpl b/view/theme/redbasic/tpl/xrd_diaspora.tpl
similarity index 100%
rename from view/tpl/xrd_diaspora.tpl
rename to view/theme/redbasic/tpl/xrd_diaspora.tpl
diff --git a/view/tpl/xrd_host.tpl b/view/theme/redbasic/tpl/xrd_host.tpl
similarity index 100%
rename from view/tpl/xrd_host.tpl
rename to view/theme/redbasic/tpl/xrd_host.tpl
diff --git a/view/tpl/xrd_person.tpl b/view/theme/redbasic/tpl/xrd_person.tpl
similarity index 100%
rename from view/tpl/xrd_person.tpl
rename to view/theme/redbasic/tpl/xrd_person.tpl
diff --git a/view/tpl/zcard.tpl b/view/theme/redbasic/tpl/zcard.tpl
similarity index 100%
rename from view/tpl/zcard.tpl
rename to view/theme/redbasic/tpl/zcard.tpl
diff --git a/view/tpl/zcard_embed.tpl b/view/theme/redbasic/tpl/zcard_embed.tpl
similarity index 100%
rename from view/tpl/zcard_embed.tpl
rename to view/theme/redbasic/tpl/zcard_embed.tpl

From 83c4dd6bda1677a3441d06247ea076094394703e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 May 2017 22:56:11 -0700
Subject: [PATCH 149/299] typo

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

diff --git a/include/bbcode.php b/include/bbcode.php
index 5aa61760f..6a14b665f 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1174,7 +1174,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 
 		$Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/ism",$sub,$Text); 
 
-		$Text = preg_replace("/\event\](.*?)\[\/event\]/ism",'',$Text);
+		$Text = preg_replace("/\[event\](.*?)\[\/event\]/ism",'',$Text);
 		$Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text);
 		$Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text);
 		$Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/ism",'',$Text);

From 80ec92ce8d9f615eeb06d92b67ad1ff840cad0cc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 12:46:50 -0700
Subject: [PATCH 150/299] Revert "move theme specific files to theme dir"

This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c.
---
 view/{theme/redbasic => }/tpl/404.tpl                     | 0
 view/{theme/redbasic => }/tpl/abook_edit.tpl              | 0
 view/{theme/redbasic => }/tpl/achievements.tpl            | 0
 view/{theme/redbasic => }/tpl/acl_selector.tpl            | 0
 view/{theme/redbasic => }/tpl/admin_account_edit.tpl      | 0
 view/{theme/redbasic => }/tpl/admin_accounts.tpl          | 0
 view/{theme/redbasic => }/tpl/admin_aside.tpl             | 0
 view/{theme/redbasic => }/tpl/admin_channels.tpl          | 0
 view/{theme/redbasic => }/tpl/admin_hubloc.tpl            | 0
 view/{theme/redbasic => }/tpl/admin_logs.tpl              | 0
 view/{theme/redbasic => }/tpl/admin_plugins.tpl           | 0
 view/{theme/redbasic => }/tpl/admin_plugins_addrepo.tpl   | 0
 view/{theme/redbasic => }/tpl/admin_plugins_details.tpl   | 0
 view/{theme/redbasic => }/tpl/admin_profiles.tpl          | 0
 view/{theme/redbasic => }/tpl/admin_queue.tpl             | 0
 view/{theme/redbasic => }/tpl/admin_security.tpl          | 0
 view/{theme/redbasic => }/tpl/admin_settings_features.tpl | 0
 view/{theme/redbasic => }/tpl/admin_site.tpl              | 0
 view/{theme/redbasic => }/tpl/admin_summary.tpl           | 0
 view/{theme/redbasic => }/tpl/album_edit.tpl              | 0
 view/{theme/redbasic => }/tpl/alt_pager.tpl               | 0
 view/{theme/redbasic => }/tpl/api_config_xml.tpl          | 0
 view/{theme/redbasic => }/tpl/api_friends_xml.tpl         | 0
 view/{theme/redbasic => }/tpl/api_ratelimit_xml.tpl       | 0
 view/{theme/redbasic => }/tpl/api_status_xml.tpl          | 0
 view/{theme/redbasic => }/tpl/api_test_xml.tpl            | 0
 view/{theme/redbasic => }/tpl/api_timeline_atom.tpl       | 0
 view/{theme/redbasic => }/tpl/api_timeline_rss.tpl        | 0
 view/{theme/redbasic => }/tpl/api_timeline_xml.tpl        | 0
 view/{theme/redbasic => }/tpl/api_user_xml.tpl            | 0
 view/{theme/redbasic => }/tpl/app.tpl                     | 0
 view/{theme/redbasic => }/tpl/app_create.tpl              | 0
 view/{theme/redbasic => }/tpl/atom_feed.tpl               | 0
 view/{theme/redbasic => }/tpl/attach_edit.tpl             | 0
 view/{theme/redbasic => }/tpl/birthdays_reminder.tpl      | 0
 view/{theme/redbasic => }/tpl/blocklist.tpl               | 0
 view/{theme/redbasic => }/tpl/bookmarkedchats.tpl         | 0
 view/{theme/redbasic => }/tpl/build_query.tpl             | 0
 view/{theme/redbasic => }/tpl/categories_widget.tpl       | 0
 view/{theme/redbasic => }/tpl/cdav_addressbook.tpl        | 0
 view/{theme/redbasic => }/tpl/cdav_calendar.tpl           | 0
 view/{theme/redbasic => }/tpl/cdav_widget_addressbook.tpl | 0
 view/{theme/redbasic => }/tpl/cdav_widget_calendar.tpl    | 0
 view/{theme/redbasic => }/tpl/channel.tpl                 | 0
 view/{theme/redbasic => }/tpl/channel_id_select.tpl       | 0
 view/{theme/redbasic => }/tpl/channel_import.tpl          | 0
 view/{theme/redbasic => }/tpl/channels.tpl                | 0
 view/{theme/redbasic => }/tpl/chanview.tpl                | 0
 view/{theme/redbasic => }/tpl/chat.tpl                    | 0
 view/{theme/redbasic => }/tpl/chatroom_members.tpl        | 0
 view/{theme/redbasic => }/tpl/chatroom_new.tpl            | 0
 view/{theme/redbasic => }/tpl/chatroomlist.tpl            | 0
 view/{theme/redbasic => }/tpl/chatrooms.tpl               | 0
 view/{theme/redbasic => }/tpl/cloud.tpl                   | 0
 view/{theme/redbasic => }/tpl/cloud_actionspanel.tpl      | 0
 view/{theme/redbasic => }/tpl/cloud_directory.tpl         | 0
 view/{theme/redbasic => }/tpl/cloud_header.tpl            | 0
 view/{theme/redbasic => }/tpl/comment_item.tpl            | 0
 view/{theme/redbasic => }/tpl/common_friends.tpl          | 0
 view/{theme/redbasic => }/tpl/common_tabs.tpl             | 0
 view/{theme/redbasic => }/tpl/connection_template.tpl     | 0
 view/{theme/redbasic => }/tpl/connections.tpl             | 0
 view/{theme/redbasic => }/tpl/contact_block.tpl           | 0
 view/{theme/redbasic => }/tpl/contact_head.tpl            | 0
 view/{theme/redbasic => }/tpl/contact_slider.tpl          | 0
 view/{theme/redbasic => }/tpl/contact_template.tpl        | 0
 view/{theme/redbasic => }/tpl/contactsajax.tpl            | 0
 view/{theme/redbasic => }/tpl/conv.tpl                    | 0
 view/{theme/redbasic => }/tpl/conv_frame.tpl              | 0
 view/{theme/redbasic => }/tpl/conv_item.tpl               | 0
 view/{theme/redbasic => }/tpl/conv_list.tpl               | 0
 view/{theme/redbasic => }/tpl/conversation.tpl            | 0
 view/{theme/redbasic => }/tpl/convobj.tpl                 | 0
 view/{theme/redbasic => }/tpl/cover_photo.tpl             | 0
 view/{theme/redbasic => }/tpl/cover_photo_widget.tpl      | 0
 view/{theme/redbasic => }/tpl/cropbody.tpl                | 0
 view/{theme/redbasic => }/tpl/cropcover.tpl               | 0
 view/{theme/redbasic => }/tpl/crophead.tpl                | 0
 view/{theme/redbasic => }/tpl/delegate.tpl                | 0
 view/{theme/redbasic => }/tpl/design_tools.tpl            | 0
 view/{theme/redbasic => }/tpl/diaspora_vcard.tpl          | 0
 view/{theme/redbasic => }/tpl/dir_sort_links.tpl          | 0
 view/{theme/redbasic => }/tpl/directajax.tpl              | 0
 view/{theme/redbasic => }/tpl/directory_header.tpl        | 0
 view/{theme/redbasic => }/tpl/direntry.tpl                | 0
 view/{theme/redbasic => }/tpl/display-head.tpl            | 0
 view/{theme/redbasic => }/tpl/dreport.tpl                 | 0
 view/{theme/redbasic => }/tpl/edpost_head.tpl             | 0
 view/{theme/redbasic => }/tpl/email_notify_html.tpl       | 0
 view/{theme/redbasic => }/tpl/email_notify_text.tpl       | 0
 view/{theme/redbasic => }/tpl/event.tpl                   | 0
 view/{theme/redbasic => }/tpl/event_cal.tpl               | 0
 view/{theme/redbasic => }/tpl/event_form.tpl              | 0
 view/{theme/redbasic => }/tpl/event_head.tpl              | 0
 view/{theme/redbasic => }/tpl/event_item_content.tpl      | 0
 view/{theme/redbasic => }/tpl/event_item_header.tpl       | 0
 view/{theme/redbasic => }/tpl/events-js.tpl               | 0
 view/{theme/redbasic => }/tpl/events_cal-js.tpl           | 0
 view/{theme/redbasic => }/tpl/events_menu_side.tpl        | 0
 view/{theme/redbasic => }/tpl/events_reminder.tpl         | 0
 view/{theme/redbasic => }/tpl/events_tools_side.tpl       | 0
 view/{theme/redbasic => }/tpl/failed_updates.tpl          | 0
 view/{theme/redbasic => }/tpl/field.tpl                   | 0
 view/{theme/redbasic => }/tpl/field_acheckbox.tpl         | 0
 view/{theme/redbasic => }/tpl/field_checkbox.tpl          | 0
 view/{theme/redbasic => }/tpl/field_colorinput.tpl        | 0
 view/{theme/redbasic => }/tpl/field_combobox.tpl          | 0
 view/{theme/redbasic => }/tpl/field_custom.tpl            | 0
 view/{theme/redbasic => }/tpl/field_input.tpl             | 0
 view/{theme/redbasic => }/tpl/field_intcheckbox.tpl       | 0
 view/{theme/redbasic => }/tpl/field_password.tpl          | 0
 view/{theme/redbasic => }/tpl/field_radio.tpl             | 0
 view/{theme/redbasic => }/tpl/field_richtext.tpl          | 0
 view/{theme/redbasic => }/tpl/field_select.tpl            | 0
 view/{theme/redbasic => }/tpl/field_select_disabled.tpl   | 0
 view/{theme/redbasic => }/tpl/field_select_grouped.tpl    | 0
 view/{theme/redbasic => }/tpl/field_select_raw.tpl        | 0
 view/{theme/redbasic => }/tpl/field_textarea.tpl          | 0
 view/{theme/redbasic => }/tpl/field_themeselect.tpl       | 0
 view/{theme/redbasic => }/tpl/field_yesno.tpl             | 0
 view/{theme/redbasic => }/tpl/fileas_widget.tpl           | 0
 view/{theme/redbasic => }/tpl/filebrowser.tpl             | 0
 view/{theme/redbasic => }/tpl/filer_dialog.tpl            | 0
 view/{theme/redbasic => }/tpl/follow.tpl                  | 0
 view/{theme/redbasic => }/tpl/force_image_reload.tpl      | 0
 view/{theme/redbasic => }/tpl/generic_addon_settings.tpl  | 0
 view/{theme/redbasic => }/tpl/generic_links_widget.tpl    | 0
 view/{theme/redbasic => }/tpl/generic_modal.tpl           | 0
 view/{theme/redbasic => }/tpl/group_drop.tpl              | 0
 view/{theme/redbasic => }/tpl/group_edit.tpl              | 0
 view/{theme/redbasic => }/tpl/group_selection.tpl         | 0
 view/{theme/redbasic => }/tpl/group_side.tpl              | 0
 view/{theme/redbasic => }/tpl/groupeditor.tpl             | 0
 view/{theme/redbasic => }/tpl/hdr.tpl                     | 0
 view/{theme/redbasic => }/tpl/head.tpl                    | 0
 view/{theme/redbasic => }/tpl/help.tpl                    | 0
 view/{theme/redbasic => }/tpl/install.tpl                 | 0
 view/{theme/redbasic => }/tpl/install_checks.tpl          | 0
 view/{theme/redbasic => }/tpl/install_db.tpl              | 0
 view/{theme/redbasic => }/tpl/install_settings.tpl        | 0
 view/{theme/redbasic => }/tpl/invite.tpl                  | 0
 view/{theme/redbasic => }/tpl/item_attach.tpl             | 0
 view/{theme/redbasic => }/tpl/item_binary.tpl             | 0
 view/{theme/redbasic => }/tpl/item_categories.tpl         | 0
 view/{theme/redbasic => }/tpl/item_filer.tpl              | 0
 view/{theme/redbasic => }/tpl/item_import.tpl             | 0
 view/{theme/redbasic => }/tpl/jot-header.tpl              | 0
 view/{theme/redbasic => }/tpl/jot.tpl                     | 0
 view/{theme/redbasic => }/tpl/jot_geotag.tpl              | 0
 view/{theme/redbasic => }/tpl/js_strings.tpl              | 0
 view/{theme/redbasic => }/tpl/lang_selector.tpl           | 0
 view/{theme/redbasic => }/tpl/layoutlist.tpl              | 0
 view/{theme/redbasic => }/tpl/like_noshare.tpl            | 0
 view/{theme/redbasic => }/tpl/locmanage.tpl               | 0
 view/{theme/redbasic => }/tpl/login.tpl                   | 0
 view/{theme/redbasic => }/tpl/logout.tpl                  | 0
 view/{theme/redbasic => }/tpl/lostpass.tpl                | 0
 view/{theme/redbasic => }/tpl/mail_conv.tpl               | 0
 view/{theme/redbasic => }/tpl/mail_display.tpl            | 0
 view/{theme/redbasic => }/tpl/mail_head.tpl               | 0
 view/{theme/redbasic => }/tpl/mail_list.tpl               | 0
 view/{theme/redbasic => }/tpl/main_slider.tpl             | 0
 view/{theme/redbasic => }/tpl/match.tpl                   | 0
 view/{theme/redbasic => }/tpl/menuedit.tpl                | 0
 view/{theme/redbasic => }/tpl/menulist.tpl                | 0
 view/{theme/redbasic => }/tpl/message_side.tpl            | 0
 view/{theme/redbasic => }/tpl/micropro_img.tpl            | 0
 view/{theme/redbasic => }/tpl/micropro_txt.tpl            | 0
 view/{theme/redbasic => }/tpl/mitemedit.tpl               | 0
 view/{theme/redbasic => }/tpl/mitemlist.tpl               | 0
 view/{theme/redbasic => }/tpl/mood_content.tpl            | 0
 view/{theme/redbasic => }/tpl/msg-header.tpl              | 0
 view/{theme/redbasic => }/tpl/myapps.tpl                  | 0
 view/{theme/redbasic => }/tpl/nav.tpl                     | 0
 view/{theme/redbasic => }/tpl/nav_login.tpl               | 0
 view/{theme/redbasic => }/tpl/new_channel.tpl             | 0
 view/{theme/redbasic => }/tpl/notes.tpl                   | 0
 view/{theme/redbasic => }/tpl/notifications.tpl           | 0
 view/{theme/redbasic => }/tpl/notify.tpl                  | 0
 view/{theme/redbasic => }/tpl/nwiki_page_history.tpl      | 0
 view/{theme/redbasic => }/tpl/oauth_authorize.tpl         | 0
 view/{theme/redbasic => }/tpl/oauth_authorize_done.tpl    | 0
 view/{theme/redbasic => }/tpl/oembed_video.tpl            | 0
 view/{theme/redbasic => }/tpl/oexchange_xrd.tpl           | 0
 view/{theme/redbasic => }/tpl/page_display.tpl            | 0
 view/{theme/redbasic => }/tpl/page_display_empty.tpl      | 0
 view/{theme/redbasic => }/tpl/pdledit.tpl                 | 0
 view/{theme/redbasic => }/tpl/peoplefind.tpl              | 0
 view/{theme/redbasic => }/tpl/photo_album.tpl             | 0
 view/{theme/redbasic => }/tpl/photo_albums.tpl            | 0
 view/{theme/redbasic => }/tpl/photo_drop.tpl              | 0
 view/{theme/redbasic => }/tpl/photo_item.tpl              | 0
 view/{theme/redbasic => }/tpl/photo_top.tpl               | 0
 view/{theme/redbasic => }/tpl/photo_view.tpl              | 0
 view/{theme/redbasic => }/tpl/photos_recent.tpl           | 0
 view/{theme/redbasic => }/tpl/photos_upload.tpl           | 0
 view/{theme/redbasic => }/tpl/photosajax.tpl              | 0
 view/{theme/redbasic => }/tpl/poco_entry_xml.tpl          | 0
 view/{theme/redbasic => }/tpl/poco_xml.tpl                | 0
 view/{theme/redbasic => }/tpl/poke_content.tpl            | 0
 view/{theme/redbasic => }/tpl/posted_date_widget.tpl      | 0
 view/{theme/redbasic => }/tpl/prep.tpl                    | 0
 view/{theme/redbasic => }/tpl/profdef_edit.tpl            | 0
 view/{theme/redbasic => }/tpl/profed_head.tpl             | 0
 view/{theme/redbasic => }/tpl/profile_advanced.tpl        | 0
 view/{theme/redbasic => }/tpl/profile_edit.tpl            | 0
 view/{theme/redbasic => }/tpl/profile_entry.tpl           | 0
 view/{theme/redbasic => }/tpl/profile_listing_header.tpl  | 0
 view/{theme/redbasic => }/tpl/profile_photo.tpl           | 0
 view/{theme/redbasic => }/tpl/profile_tabs.tpl            | 0
 view/{theme/redbasic => }/tpl/profile_vcard.tpl           | 0
 view/{theme/redbasic => }/tpl/profile_vcard_short.tpl     | 0
 view/{theme/redbasic => }/tpl/prv_message.tpl             | 0
 view/{theme/redbasic => }/tpl/pwdreset.tpl                | 0
 view/{theme/redbasic => }/tpl/rating_form.tpl             | 0
 view/{theme/redbasic => }/tpl/rating_slider.tpl           | 0
 view/{theme/redbasic => }/tpl/rbmark.tpl                  | 0
 view/{theme/redbasic => }/tpl/register.tpl                | 0
 view/{theme/redbasic => }/tpl/remote_friends_common.tpl   | 0
 view/{theme/redbasic => }/tpl/remote_login.tpl            | 0
 view/{theme/redbasic => }/tpl/removeaccount.tpl           | 0
 view/{theme/redbasic => }/tpl/removeme.tpl                | 0
 view/{theme/redbasic => }/tpl/rmagic.tpl                  | 0
 view/{theme/redbasic => }/tpl/safesearch.tpl              | 0
 view/{theme/redbasic => }/tpl/saved_searches.tpl          | 0
 view/{theme/redbasic => }/tpl/search_item.tpl             | 0
 view/{theme/redbasic => }/tpl/searchbox.tpl               | 0
 view/{theme/redbasic => }/tpl/section_title.tpl           | 0
 view/{theme/redbasic => }/tpl/select_timezone.tpl         | 0
 view/{theme/redbasic => }/tpl/sellpage_edit.tpl           | 0
 view/{theme/redbasic => }/tpl/sellpage_submit.tpl         | 0
 view/{theme/redbasic => }/tpl/sellpage_view.tpl           | 0
 view/{theme/redbasic => }/tpl/settings.tpl                | 0
 view/{theme/redbasic => }/tpl/settings_account.tpl        | 0
 view/{theme/redbasic => }/tpl/settings_addons.tpl         | 0
 view/{theme/redbasic => }/tpl/settings_connectors.tpl     | 0
 view/{theme/redbasic => }/tpl/settings_display.tpl        | 0
 view/{theme/redbasic => }/tpl/settings_features.tpl       | 0
 view/{theme/redbasic => }/tpl/settings_nick_set.tpl       | 0
 view/{theme/redbasic => }/tpl/settings_oauth.tpl          | 0
 view/{theme/redbasic => }/tpl/settings_oauth_edit.tpl     | 0
 view/{theme/redbasic => }/tpl/settings_permcats.tpl       | 0
 view/{theme/redbasic => }/tpl/settings_tokens.tpl         | 0
 view/{theme/redbasic => }/tpl/sharedwithme.tpl            | 0
 view/{theme/redbasic => }/tpl/show_thing.tpl              | 0
 view/{theme/redbasic => }/tpl/siteinfo.tpl                | 0
 view/{theme/redbasic => }/tpl/sitesearch.tpl              | 0
 view/{theme/redbasic => }/tpl/sources_edit.tpl            | 0
 view/{theme/redbasic => }/tpl/sources_list.tpl            | 0
 view/{theme/redbasic => }/tpl/sources_new.tpl             | 0
 view/{theme/redbasic => }/tpl/suggest_friends.tpl         | 0
 view/{theme/redbasic => }/tpl/suggest_page.tpl            | 0
 view/{theme/redbasic => }/tpl/suggest_widget.tpl          | 0
 view/{theme/redbasic => }/tpl/thing_edit.tpl              | 0
 view/{theme/redbasic => }/tpl/thing_input.tpl             | 0
 view/{theme/redbasic => }/tpl/threaded_conversation.tpl   | 0
 view/{theme/redbasic => }/tpl/toggle_mobile_footer.tpl    | 0
 view/{theme/redbasic => }/tpl/uexport.tpl                 | 0
 view/{theme/redbasic => }/tpl/usermenu.tpl                | 0
 view/{theme/redbasic => }/tpl/viewcontact_template.tpl    | 0
 view/{theme/redbasic => }/tpl/viewcontactsajax.tpl        | 0
 view/{theme/redbasic => }/tpl/webpage_export_list.tpl     | 0
 view/{theme/redbasic => }/tpl/webpage_import.tpl          | 0
 view/{theme/redbasic => }/tpl/webpagelist.tpl             | 0
 view/{theme/redbasic => }/tpl/website_portation_tools.tpl | 0
 view/{theme/redbasic => }/tpl/wiki.tpl                    | 0
 view/{theme/redbasic => }/tpl/wiki_page_history.tpl       | 0
 view/{theme/redbasic => }/tpl/wiki_page_list.tpl          | 0
 view/{theme/redbasic => }/tpl/wikilist.tpl                | 0
 view/{theme/redbasic => }/tpl/wikilist_widget.tpl         | 0
 view/{theme/redbasic => }/tpl/write_pages.tpl             | 0
 view/{theme/redbasic => }/tpl/xchan_vcard.tpl             | 0
 view/{theme/redbasic => }/tpl/xrd_diaspora.tpl            | 0
 view/{theme/redbasic => }/tpl/xrd_host.tpl                | 0
 view/{theme/redbasic => }/tpl/xrd_person.tpl              | 0
 view/{theme/redbasic => }/tpl/zcard.tpl                   | 0
 view/{theme/redbasic => }/tpl/zcard_embed.tpl             | 0
 277 files changed, 0 insertions(+), 0 deletions(-)
 rename view/{theme/redbasic => }/tpl/404.tpl (100%)
 rename view/{theme/redbasic => }/tpl/abook_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/achievements.tpl (100%)
 rename view/{theme/redbasic => }/tpl/acl_selector.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_account_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_accounts.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_aside.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_channels.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_hubloc.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_logs.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_plugins.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_plugins_addrepo.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_plugins_details.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_profiles.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_queue.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_security.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_settings_features.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_site.tpl (100%)
 rename view/{theme/redbasic => }/tpl/admin_summary.tpl (100%)
 rename view/{theme/redbasic => }/tpl/album_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/alt_pager.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_config_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_friends_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_ratelimit_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_status_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_test_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_timeline_atom.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_timeline_rss.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_timeline_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/api_user_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/app.tpl (100%)
 rename view/{theme/redbasic => }/tpl/app_create.tpl (100%)
 rename view/{theme/redbasic => }/tpl/atom_feed.tpl (100%)
 rename view/{theme/redbasic => }/tpl/attach_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/birthdays_reminder.tpl (100%)
 rename view/{theme/redbasic => }/tpl/blocklist.tpl (100%)
 rename view/{theme/redbasic => }/tpl/bookmarkedchats.tpl (100%)
 rename view/{theme/redbasic => }/tpl/build_query.tpl (100%)
 rename view/{theme/redbasic => }/tpl/categories_widget.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cdav_addressbook.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cdav_calendar.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cdav_widget_addressbook.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cdav_widget_calendar.tpl (100%)
 rename view/{theme/redbasic => }/tpl/channel.tpl (100%)
 rename view/{theme/redbasic => }/tpl/channel_id_select.tpl (100%)
 rename view/{theme/redbasic => }/tpl/channel_import.tpl (100%)
 rename view/{theme/redbasic => }/tpl/channels.tpl (100%)
 rename view/{theme/redbasic => }/tpl/chanview.tpl (100%)
 rename view/{theme/redbasic => }/tpl/chat.tpl (100%)
 rename view/{theme/redbasic => }/tpl/chatroom_members.tpl (100%)
 rename view/{theme/redbasic => }/tpl/chatroom_new.tpl (100%)
 rename view/{theme/redbasic => }/tpl/chatroomlist.tpl (100%)
 rename view/{theme/redbasic => }/tpl/chatrooms.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cloud.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cloud_actionspanel.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cloud_directory.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cloud_header.tpl (100%)
 rename view/{theme/redbasic => }/tpl/comment_item.tpl (100%)
 rename view/{theme/redbasic => }/tpl/common_friends.tpl (100%)
 rename view/{theme/redbasic => }/tpl/common_tabs.tpl (100%)
 rename view/{theme/redbasic => }/tpl/connection_template.tpl (100%)
 rename view/{theme/redbasic => }/tpl/connections.tpl (100%)
 rename view/{theme/redbasic => }/tpl/contact_block.tpl (100%)
 rename view/{theme/redbasic => }/tpl/contact_head.tpl (100%)
 rename view/{theme/redbasic => }/tpl/contact_slider.tpl (100%)
 rename view/{theme/redbasic => }/tpl/contact_template.tpl (100%)
 rename view/{theme/redbasic => }/tpl/contactsajax.tpl (100%)
 rename view/{theme/redbasic => }/tpl/conv.tpl (100%)
 rename view/{theme/redbasic => }/tpl/conv_frame.tpl (100%)
 rename view/{theme/redbasic => }/tpl/conv_item.tpl (100%)
 rename view/{theme/redbasic => }/tpl/conv_list.tpl (100%)
 rename view/{theme/redbasic => }/tpl/conversation.tpl (100%)
 rename view/{theme/redbasic => }/tpl/convobj.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cover_photo.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cover_photo_widget.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cropbody.tpl (100%)
 rename view/{theme/redbasic => }/tpl/cropcover.tpl (100%)
 rename view/{theme/redbasic => }/tpl/crophead.tpl (100%)
 rename view/{theme/redbasic => }/tpl/delegate.tpl (100%)
 rename view/{theme/redbasic => }/tpl/design_tools.tpl (100%)
 rename view/{theme/redbasic => }/tpl/diaspora_vcard.tpl (100%)
 rename view/{theme/redbasic => }/tpl/dir_sort_links.tpl (100%)
 rename view/{theme/redbasic => }/tpl/directajax.tpl (100%)
 rename view/{theme/redbasic => }/tpl/directory_header.tpl (100%)
 rename view/{theme/redbasic => }/tpl/direntry.tpl (100%)
 rename view/{theme/redbasic => }/tpl/display-head.tpl (100%)
 rename view/{theme/redbasic => }/tpl/dreport.tpl (100%)
 rename view/{theme/redbasic => }/tpl/edpost_head.tpl (100%)
 rename view/{theme/redbasic => }/tpl/email_notify_html.tpl (100%)
 rename view/{theme/redbasic => }/tpl/email_notify_text.tpl (100%)
 rename view/{theme/redbasic => }/tpl/event.tpl (100%)
 rename view/{theme/redbasic => }/tpl/event_cal.tpl (100%)
 rename view/{theme/redbasic => }/tpl/event_form.tpl (100%)
 rename view/{theme/redbasic => }/tpl/event_head.tpl (100%)
 rename view/{theme/redbasic => }/tpl/event_item_content.tpl (100%)
 rename view/{theme/redbasic => }/tpl/event_item_header.tpl (100%)
 rename view/{theme/redbasic => }/tpl/events-js.tpl (100%)
 rename view/{theme/redbasic => }/tpl/events_cal-js.tpl (100%)
 rename view/{theme/redbasic => }/tpl/events_menu_side.tpl (100%)
 rename view/{theme/redbasic => }/tpl/events_reminder.tpl (100%)
 rename view/{theme/redbasic => }/tpl/events_tools_side.tpl (100%)
 rename view/{theme/redbasic => }/tpl/failed_updates.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_acheckbox.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_checkbox.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_colorinput.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_combobox.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_custom.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_input.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_intcheckbox.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_password.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_radio.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_richtext.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_select.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_select_disabled.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_select_grouped.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_select_raw.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_textarea.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_themeselect.tpl (100%)
 rename view/{theme/redbasic => }/tpl/field_yesno.tpl (100%)
 rename view/{theme/redbasic => }/tpl/fileas_widget.tpl (100%)
 rename view/{theme/redbasic => }/tpl/filebrowser.tpl (100%)
 rename view/{theme/redbasic => }/tpl/filer_dialog.tpl (100%)
 rename view/{theme/redbasic => }/tpl/follow.tpl (100%)
 rename view/{theme/redbasic => }/tpl/force_image_reload.tpl (100%)
 rename view/{theme/redbasic => }/tpl/generic_addon_settings.tpl (100%)
 rename view/{theme/redbasic => }/tpl/generic_links_widget.tpl (100%)
 rename view/{theme/redbasic => }/tpl/generic_modal.tpl (100%)
 rename view/{theme/redbasic => }/tpl/group_drop.tpl (100%)
 rename view/{theme/redbasic => }/tpl/group_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/group_selection.tpl (100%)
 rename view/{theme/redbasic => }/tpl/group_side.tpl (100%)
 rename view/{theme/redbasic => }/tpl/groupeditor.tpl (100%)
 rename view/{theme/redbasic => }/tpl/hdr.tpl (100%)
 rename view/{theme/redbasic => }/tpl/head.tpl (100%)
 rename view/{theme/redbasic => }/tpl/help.tpl (100%)
 rename view/{theme/redbasic => }/tpl/install.tpl (100%)
 rename view/{theme/redbasic => }/tpl/install_checks.tpl (100%)
 rename view/{theme/redbasic => }/tpl/install_db.tpl (100%)
 rename view/{theme/redbasic => }/tpl/install_settings.tpl (100%)
 rename view/{theme/redbasic => }/tpl/invite.tpl (100%)
 rename view/{theme/redbasic => }/tpl/item_attach.tpl (100%)
 rename view/{theme/redbasic => }/tpl/item_binary.tpl (100%)
 rename view/{theme/redbasic => }/tpl/item_categories.tpl (100%)
 rename view/{theme/redbasic => }/tpl/item_filer.tpl (100%)
 rename view/{theme/redbasic => }/tpl/item_import.tpl (100%)
 rename view/{theme/redbasic => }/tpl/jot-header.tpl (100%)
 rename view/{theme/redbasic => }/tpl/jot.tpl (100%)
 rename view/{theme/redbasic => }/tpl/jot_geotag.tpl (100%)
 rename view/{theme/redbasic => }/tpl/js_strings.tpl (100%)
 rename view/{theme/redbasic => }/tpl/lang_selector.tpl (100%)
 rename view/{theme/redbasic => }/tpl/layoutlist.tpl (100%)
 rename view/{theme/redbasic => }/tpl/like_noshare.tpl (100%)
 rename view/{theme/redbasic => }/tpl/locmanage.tpl (100%)
 rename view/{theme/redbasic => }/tpl/login.tpl (100%)
 rename view/{theme/redbasic => }/tpl/logout.tpl (100%)
 rename view/{theme/redbasic => }/tpl/lostpass.tpl (100%)
 rename view/{theme/redbasic => }/tpl/mail_conv.tpl (100%)
 rename view/{theme/redbasic => }/tpl/mail_display.tpl (100%)
 rename view/{theme/redbasic => }/tpl/mail_head.tpl (100%)
 rename view/{theme/redbasic => }/tpl/mail_list.tpl (100%)
 rename view/{theme/redbasic => }/tpl/main_slider.tpl (100%)
 rename view/{theme/redbasic => }/tpl/match.tpl (100%)
 rename view/{theme/redbasic => }/tpl/menuedit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/menulist.tpl (100%)
 rename view/{theme/redbasic => }/tpl/message_side.tpl (100%)
 rename view/{theme/redbasic => }/tpl/micropro_img.tpl (100%)
 rename view/{theme/redbasic => }/tpl/micropro_txt.tpl (100%)
 rename view/{theme/redbasic => }/tpl/mitemedit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/mitemlist.tpl (100%)
 rename view/{theme/redbasic => }/tpl/mood_content.tpl (100%)
 rename view/{theme/redbasic => }/tpl/msg-header.tpl (100%)
 rename view/{theme/redbasic => }/tpl/myapps.tpl (100%)
 rename view/{theme/redbasic => }/tpl/nav.tpl (100%)
 rename view/{theme/redbasic => }/tpl/nav_login.tpl (100%)
 rename view/{theme/redbasic => }/tpl/new_channel.tpl (100%)
 rename view/{theme/redbasic => }/tpl/notes.tpl (100%)
 rename view/{theme/redbasic => }/tpl/notifications.tpl (100%)
 rename view/{theme/redbasic => }/tpl/notify.tpl (100%)
 rename view/{theme/redbasic => }/tpl/nwiki_page_history.tpl (100%)
 rename view/{theme/redbasic => }/tpl/oauth_authorize.tpl (100%)
 rename view/{theme/redbasic => }/tpl/oauth_authorize_done.tpl (100%)
 rename view/{theme/redbasic => }/tpl/oembed_video.tpl (100%)
 rename view/{theme/redbasic => }/tpl/oexchange_xrd.tpl (100%)
 rename view/{theme/redbasic => }/tpl/page_display.tpl (100%)
 rename view/{theme/redbasic => }/tpl/page_display_empty.tpl (100%)
 rename view/{theme/redbasic => }/tpl/pdledit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/peoplefind.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photo_album.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photo_albums.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photo_drop.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photo_item.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photo_top.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photo_view.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photos_recent.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photos_upload.tpl (100%)
 rename view/{theme/redbasic => }/tpl/photosajax.tpl (100%)
 rename view/{theme/redbasic => }/tpl/poco_entry_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/poco_xml.tpl (100%)
 rename view/{theme/redbasic => }/tpl/poke_content.tpl (100%)
 rename view/{theme/redbasic => }/tpl/posted_date_widget.tpl (100%)
 rename view/{theme/redbasic => }/tpl/prep.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profdef_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profed_head.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profile_advanced.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profile_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profile_entry.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profile_listing_header.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profile_photo.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profile_tabs.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profile_vcard.tpl (100%)
 rename view/{theme/redbasic => }/tpl/profile_vcard_short.tpl (100%)
 rename view/{theme/redbasic => }/tpl/prv_message.tpl (100%)
 rename view/{theme/redbasic => }/tpl/pwdreset.tpl (100%)
 rename view/{theme/redbasic => }/tpl/rating_form.tpl (100%)
 rename view/{theme/redbasic => }/tpl/rating_slider.tpl (100%)
 rename view/{theme/redbasic => }/tpl/rbmark.tpl (100%)
 rename view/{theme/redbasic => }/tpl/register.tpl (100%)
 rename view/{theme/redbasic => }/tpl/remote_friends_common.tpl (100%)
 rename view/{theme/redbasic => }/tpl/remote_login.tpl (100%)
 rename view/{theme/redbasic => }/tpl/removeaccount.tpl (100%)
 rename view/{theme/redbasic => }/tpl/removeme.tpl (100%)
 rename view/{theme/redbasic => }/tpl/rmagic.tpl (100%)
 rename view/{theme/redbasic => }/tpl/safesearch.tpl (100%)
 rename view/{theme/redbasic => }/tpl/saved_searches.tpl (100%)
 rename view/{theme/redbasic => }/tpl/search_item.tpl (100%)
 rename view/{theme/redbasic => }/tpl/searchbox.tpl (100%)
 rename view/{theme/redbasic => }/tpl/section_title.tpl (100%)
 rename view/{theme/redbasic => }/tpl/select_timezone.tpl (100%)
 rename view/{theme/redbasic => }/tpl/sellpage_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/sellpage_submit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/sellpage_view.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_account.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_addons.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_connectors.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_display.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_features.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_nick_set.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_oauth.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_oauth_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_permcats.tpl (100%)
 rename view/{theme/redbasic => }/tpl/settings_tokens.tpl (100%)
 rename view/{theme/redbasic => }/tpl/sharedwithme.tpl (100%)
 rename view/{theme/redbasic => }/tpl/show_thing.tpl (100%)
 rename view/{theme/redbasic => }/tpl/siteinfo.tpl (100%)
 rename view/{theme/redbasic => }/tpl/sitesearch.tpl (100%)
 rename view/{theme/redbasic => }/tpl/sources_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/sources_list.tpl (100%)
 rename view/{theme/redbasic => }/tpl/sources_new.tpl (100%)
 rename view/{theme/redbasic => }/tpl/suggest_friends.tpl (100%)
 rename view/{theme/redbasic => }/tpl/suggest_page.tpl (100%)
 rename view/{theme/redbasic => }/tpl/suggest_widget.tpl (100%)
 rename view/{theme/redbasic => }/tpl/thing_edit.tpl (100%)
 rename view/{theme/redbasic => }/tpl/thing_input.tpl (100%)
 rename view/{theme/redbasic => }/tpl/threaded_conversation.tpl (100%)
 rename view/{theme/redbasic => }/tpl/toggle_mobile_footer.tpl (100%)
 rename view/{theme/redbasic => }/tpl/uexport.tpl (100%)
 rename view/{theme/redbasic => }/tpl/usermenu.tpl (100%)
 rename view/{theme/redbasic => }/tpl/viewcontact_template.tpl (100%)
 rename view/{theme/redbasic => }/tpl/viewcontactsajax.tpl (100%)
 rename view/{theme/redbasic => }/tpl/webpage_export_list.tpl (100%)
 rename view/{theme/redbasic => }/tpl/webpage_import.tpl (100%)
 rename view/{theme/redbasic => }/tpl/webpagelist.tpl (100%)
 rename view/{theme/redbasic => }/tpl/website_portation_tools.tpl (100%)
 rename view/{theme/redbasic => }/tpl/wiki.tpl (100%)
 rename view/{theme/redbasic => }/tpl/wiki_page_history.tpl (100%)
 rename view/{theme/redbasic => }/tpl/wiki_page_list.tpl (100%)
 rename view/{theme/redbasic => }/tpl/wikilist.tpl (100%)
 rename view/{theme/redbasic => }/tpl/wikilist_widget.tpl (100%)
 rename view/{theme/redbasic => }/tpl/write_pages.tpl (100%)
 rename view/{theme/redbasic => }/tpl/xchan_vcard.tpl (100%)
 rename view/{theme/redbasic => }/tpl/xrd_diaspora.tpl (100%)
 rename view/{theme/redbasic => }/tpl/xrd_host.tpl (100%)
 rename view/{theme/redbasic => }/tpl/xrd_person.tpl (100%)
 rename view/{theme/redbasic => }/tpl/zcard.tpl (100%)
 rename view/{theme/redbasic => }/tpl/zcard_embed.tpl (100%)

diff --git a/view/theme/redbasic/tpl/404.tpl b/view/tpl/404.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/404.tpl
rename to view/tpl/404.tpl
diff --git a/view/theme/redbasic/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/abook_edit.tpl
rename to view/tpl/abook_edit.tpl
diff --git a/view/theme/redbasic/tpl/achievements.tpl b/view/tpl/achievements.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/achievements.tpl
rename to view/tpl/achievements.tpl
diff --git a/view/theme/redbasic/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/acl_selector.tpl
rename to view/tpl/acl_selector.tpl
diff --git a/view/theme/redbasic/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_account_edit.tpl
rename to view/tpl/admin_account_edit.tpl
diff --git a/view/theme/redbasic/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_accounts.tpl
rename to view/tpl/admin_accounts.tpl
diff --git a/view/theme/redbasic/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_aside.tpl
rename to view/tpl/admin_aside.tpl
diff --git a/view/theme/redbasic/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_channels.tpl
rename to view/tpl/admin_channels.tpl
diff --git a/view/theme/redbasic/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_hubloc.tpl
rename to view/tpl/admin_hubloc.tpl
diff --git a/view/theme/redbasic/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_logs.tpl
rename to view/tpl/admin_logs.tpl
diff --git a/view/theme/redbasic/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_plugins.tpl
rename to view/tpl/admin_plugins.tpl
diff --git a/view/theme/redbasic/tpl/admin_plugins_addrepo.tpl b/view/tpl/admin_plugins_addrepo.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_plugins_addrepo.tpl
rename to view/tpl/admin_plugins_addrepo.tpl
diff --git a/view/theme/redbasic/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_plugins_details.tpl
rename to view/tpl/admin_plugins_details.tpl
diff --git a/view/theme/redbasic/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_profiles.tpl
rename to view/tpl/admin_profiles.tpl
diff --git a/view/theme/redbasic/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_queue.tpl
rename to view/tpl/admin_queue.tpl
diff --git a/view/theme/redbasic/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_security.tpl
rename to view/tpl/admin_security.tpl
diff --git a/view/theme/redbasic/tpl/admin_settings_features.tpl b/view/tpl/admin_settings_features.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_settings_features.tpl
rename to view/tpl/admin_settings_features.tpl
diff --git a/view/theme/redbasic/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_site.tpl
rename to view/tpl/admin_site.tpl
diff --git a/view/theme/redbasic/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/admin_summary.tpl
rename to view/tpl/admin_summary.tpl
diff --git a/view/theme/redbasic/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/album_edit.tpl
rename to view/tpl/album_edit.tpl
diff --git a/view/theme/redbasic/tpl/alt_pager.tpl b/view/tpl/alt_pager.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/alt_pager.tpl
rename to view/tpl/alt_pager.tpl
diff --git a/view/theme/redbasic/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_config_xml.tpl
rename to view/tpl/api_config_xml.tpl
diff --git a/view/theme/redbasic/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_friends_xml.tpl
rename to view/tpl/api_friends_xml.tpl
diff --git a/view/theme/redbasic/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_ratelimit_xml.tpl
rename to view/tpl/api_ratelimit_xml.tpl
diff --git a/view/theme/redbasic/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_status_xml.tpl
rename to view/tpl/api_status_xml.tpl
diff --git a/view/theme/redbasic/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_test_xml.tpl
rename to view/tpl/api_test_xml.tpl
diff --git a/view/theme/redbasic/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_timeline_atom.tpl
rename to view/tpl/api_timeline_atom.tpl
diff --git a/view/theme/redbasic/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_timeline_rss.tpl
rename to view/tpl/api_timeline_rss.tpl
diff --git a/view/theme/redbasic/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_timeline_xml.tpl
rename to view/tpl/api_timeline_xml.tpl
diff --git a/view/theme/redbasic/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/api_user_xml.tpl
rename to view/tpl/api_user_xml.tpl
diff --git a/view/theme/redbasic/tpl/app.tpl b/view/tpl/app.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/app.tpl
rename to view/tpl/app.tpl
diff --git a/view/theme/redbasic/tpl/app_create.tpl b/view/tpl/app_create.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/app_create.tpl
rename to view/tpl/app_create.tpl
diff --git a/view/theme/redbasic/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/atom_feed.tpl
rename to view/tpl/atom_feed.tpl
diff --git a/view/theme/redbasic/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/attach_edit.tpl
rename to view/tpl/attach_edit.tpl
diff --git a/view/theme/redbasic/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/birthdays_reminder.tpl
rename to view/tpl/birthdays_reminder.tpl
diff --git a/view/theme/redbasic/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/blocklist.tpl
rename to view/tpl/blocklist.tpl
diff --git a/view/theme/redbasic/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/bookmarkedchats.tpl
rename to view/tpl/bookmarkedchats.tpl
diff --git a/view/theme/redbasic/tpl/build_query.tpl b/view/tpl/build_query.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/build_query.tpl
rename to view/tpl/build_query.tpl
diff --git a/view/theme/redbasic/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/categories_widget.tpl
rename to view/tpl/categories_widget.tpl
diff --git a/view/theme/redbasic/tpl/cdav_addressbook.tpl b/view/tpl/cdav_addressbook.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cdav_addressbook.tpl
rename to view/tpl/cdav_addressbook.tpl
diff --git a/view/theme/redbasic/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cdav_calendar.tpl
rename to view/tpl/cdav_calendar.tpl
diff --git a/view/theme/redbasic/tpl/cdav_widget_addressbook.tpl b/view/tpl/cdav_widget_addressbook.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cdav_widget_addressbook.tpl
rename to view/tpl/cdav_widget_addressbook.tpl
diff --git a/view/theme/redbasic/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cdav_widget_calendar.tpl
rename to view/tpl/cdav_widget_calendar.tpl
diff --git a/view/theme/redbasic/tpl/channel.tpl b/view/tpl/channel.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/channel.tpl
rename to view/tpl/channel.tpl
diff --git a/view/theme/redbasic/tpl/channel_id_select.tpl b/view/tpl/channel_id_select.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/channel_id_select.tpl
rename to view/tpl/channel_id_select.tpl
diff --git a/view/theme/redbasic/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/channel_import.tpl
rename to view/tpl/channel_import.tpl
diff --git a/view/theme/redbasic/tpl/channels.tpl b/view/tpl/channels.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/channels.tpl
rename to view/tpl/channels.tpl
diff --git a/view/theme/redbasic/tpl/chanview.tpl b/view/tpl/chanview.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/chanview.tpl
rename to view/tpl/chanview.tpl
diff --git a/view/theme/redbasic/tpl/chat.tpl b/view/tpl/chat.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/chat.tpl
rename to view/tpl/chat.tpl
diff --git a/view/theme/redbasic/tpl/chatroom_members.tpl b/view/tpl/chatroom_members.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/chatroom_members.tpl
rename to view/tpl/chatroom_members.tpl
diff --git a/view/theme/redbasic/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/chatroom_new.tpl
rename to view/tpl/chatroom_new.tpl
diff --git a/view/theme/redbasic/tpl/chatroomlist.tpl b/view/tpl/chatroomlist.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/chatroomlist.tpl
rename to view/tpl/chatroomlist.tpl
diff --git a/view/theme/redbasic/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/chatrooms.tpl
rename to view/tpl/chatrooms.tpl
diff --git a/view/theme/redbasic/tpl/cloud.tpl b/view/tpl/cloud.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cloud.tpl
rename to view/tpl/cloud.tpl
diff --git a/view/theme/redbasic/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cloud_actionspanel.tpl
rename to view/tpl/cloud_actionspanel.tpl
diff --git a/view/theme/redbasic/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cloud_directory.tpl
rename to view/tpl/cloud_directory.tpl
diff --git a/view/theme/redbasic/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cloud_header.tpl
rename to view/tpl/cloud_header.tpl
diff --git a/view/theme/redbasic/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/comment_item.tpl
rename to view/tpl/comment_item.tpl
diff --git a/view/theme/redbasic/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/common_friends.tpl
rename to view/tpl/common_friends.tpl
diff --git a/view/theme/redbasic/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/common_tabs.tpl
rename to view/tpl/common_tabs.tpl
diff --git a/view/theme/redbasic/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/connection_template.tpl
rename to view/tpl/connection_template.tpl
diff --git a/view/theme/redbasic/tpl/connections.tpl b/view/tpl/connections.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/connections.tpl
rename to view/tpl/connections.tpl
diff --git a/view/theme/redbasic/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/contact_block.tpl
rename to view/tpl/contact_block.tpl
diff --git a/view/theme/redbasic/tpl/contact_head.tpl b/view/tpl/contact_head.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/contact_head.tpl
rename to view/tpl/contact_head.tpl
diff --git a/view/theme/redbasic/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/contact_slider.tpl
rename to view/tpl/contact_slider.tpl
diff --git a/view/theme/redbasic/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/contact_template.tpl
rename to view/tpl/contact_template.tpl
diff --git a/view/theme/redbasic/tpl/contactsajax.tpl b/view/tpl/contactsajax.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/contactsajax.tpl
rename to view/tpl/contactsajax.tpl
diff --git a/view/theme/redbasic/tpl/conv.tpl b/view/tpl/conv.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/conv.tpl
rename to view/tpl/conv.tpl
diff --git a/view/theme/redbasic/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/conv_frame.tpl
rename to view/tpl/conv_frame.tpl
diff --git a/view/theme/redbasic/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/conv_item.tpl
rename to view/tpl/conv_item.tpl
diff --git a/view/theme/redbasic/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/conv_list.tpl
rename to view/tpl/conv_list.tpl
diff --git a/view/theme/redbasic/tpl/conversation.tpl b/view/tpl/conversation.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/conversation.tpl
rename to view/tpl/conversation.tpl
diff --git a/view/theme/redbasic/tpl/convobj.tpl b/view/tpl/convobj.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/convobj.tpl
rename to view/tpl/convobj.tpl
diff --git a/view/theme/redbasic/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cover_photo.tpl
rename to view/tpl/cover_photo.tpl
diff --git a/view/theme/redbasic/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cover_photo_widget.tpl
rename to view/tpl/cover_photo_widget.tpl
diff --git a/view/theme/redbasic/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cropbody.tpl
rename to view/tpl/cropbody.tpl
diff --git a/view/theme/redbasic/tpl/cropcover.tpl b/view/tpl/cropcover.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/cropcover.tpl
rename to view/tpl/cropcover.tpl
diff --git a/view/theme/redbasic/tpl/crophead.tpl b/view/tpl/crophead.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/crophead.tpl
rename to view/tpl/crophead.tpl
diff --git a/view/theme/redbasic/tpl/delegate.tpl b/view/tpl/delegate.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/delegate.tpl
rename to view/tpl/delegate.tpl
diff --git a/view/theme/redbasic/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/design_tools.tpl
rename to view/tpl/design_tools.tpl
diff --git a/view/theme/redbasic/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/diaspora_vcard.tpl
rename to view/tpl/diaspora_vcard.tpl
diff --git a/view/theme/redbasic/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/dir_sort_links.tpl
rename to view/tpl/dir_sort_links.tpl
diff --git a/view/theme/redbasic/tpl/directajax.tpl b/view/tpl/directajax.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/directajax.tpl
rename to view/tpl/directajax.tpl
diff --git a/view/theme/redbasic/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/directory_header.tpl
rename to view/tpl/directory_header.tpl
diff --git a/view/theme/redbasic/tpl/direntry.tpl b/view/tpl/direntry.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/direntry.tpl
rename to view/tpl/direntry.tpl
diff --git a/view/theme/redbasic/tpl/display-head.tpl b/view/tpl/display-head.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/display-head.tpl
rename to view/tpl/display-head.tpl
diff --git a/view/theme/redbasic/tpl/dreport.tpl b/view/tpl/dreport.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/dreport.tpl
rename to view/tpl/dreport.tpl
diff --git a/view/theme/redbasic/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/edpost_head.tpl
rename to view/tpl/edpost_head.tpl
diff --git a/view/theme/redbasic/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/email_notify_html.tpl
rename to view/tpl/email_notify_html.tpl
diff --git a/view/theme/redbasic/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/email_notify_text.tpl
rename to view/tpl/email_notify_text.tpl
diff --git a/view/theme/redbasic/tpl/event.tpl b/view/tpl/event.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/event.tpl
rename to view/tpl/event.tpl
diff --git a/view/theme/redbasic/tpl/event_cal.tpl b/view/tpl/event_cal.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/event_cal.tpl
rename to view/tpl/event_cal.tpl
diff --git a/view/theme/redbasic/tpl/event_form.tpl b/view/tpl/event_form.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/event_form.tpl
rename to view/tpl/event_form.tpl
diff --git a/view/theme/redbasic/tpl/event_head.tpl b/view/tpl/event_head.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/event_head.tpl
rename to view/tpl/event_head.tpl
diff --git a/view/theme/redbasic/tpl/event_item_content.tpl b/view/tpl/event_item_content.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/event_item_content.tpl
rename to view/tpl/event_item_content.tpl
diff --git a/view/theme/redbasic/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/event_item_header.tpl
rename to view/tpl/event_item_header.tpl
diff --git a/view/theme/redbasic/tpl/events-js.tpl b/view/tpl/events-js.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/events-js.tpl
rename to view/tpl/events-js.tpl
diff --git a/view/theme/redbasic/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/events_cal-js.tpl
rename to view/tpl/events_cal-js.tpl
diff --git a/view/theme/redbasic/tpl/events_menu_side.tpl b/view/tpl/events_menu_side.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/events_menu_side.tpl
rename to view/tpl/events_menu_side.tpl
diff --git a/view/theme/redbasic/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/events_reminder.tpl
rename to view/tpl/events_reminder.tpl
diff --git a/view/theme/redbasic/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/events_tools_side.tpl
rename to view/tpl/events_tools_side.tpl
diff --git a/view/theme/redbasic/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/failed_updates.tpl
rename to view/tpl/failed_updates.tpl
diff --git a/view/theme/redbasic/tpl/field.tpl b/view/tpl/field.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field.tpl
rename to view/tpl/field.tpl
diff --git a/view/theme/redbasic/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_acheckbox.tpl
rename to view/tpl/field_acheckbox.tpl
diff --git a/view/theme/redbasic/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_checkbox.tpl
rename to view/tpl/field_checkbox.tpl
diff --git a/view/theme/redbasic/tpl/field_colorinput.tpl b/view/tpl/field_colorinput.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_colorinput.tpl
rename to view/tpl/field_colorinput.tpl
diff --git a/view/theme/redbasic/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_combobox.tpl
rename to view/tpl/field_combobox.tpl
diff --git a/view/theme/redbasic/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_custom.tpl
rename to view/tpl/field_custom.tpl
diff --git a/view/theme/redbasic/tpl/field_input.tpl b/view/tpl/field_input.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_input.tpl
rename to view/tpl/field_input.tpl
diff --git a/view/theme/redbasic/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_intcheckbox.tpl
rename to view/tpl/field_intcheckbox.tpl
diff --git a/view/theme/redbasic/tpl/field_password.tpl b/view/tpl/field_password.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_password.tpl
rename to view/tpl/field_password.tpl
diff --git a/view/theme/redbasic/tpl/field_radio.tpl b/view/tpl/field_radio.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_radio.tpl
rename to view/tpl/field_radio.tpl
diff --git a/view/theme/redbasic/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_richtext.tpl
rename to view/tpl/field_richtext.tpl
diff --git a/view/theme/redbasic/tpl/field_select.tpl b/view/tpl/field_select.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_select.tpl
rename to view/tpl/field_select.tpl
diff --git a/view/theme/redbasic/tpl/field_select_disabled.tpl b/view/tpl/field_select_disabled.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_select_disabled.tpl
rename to view/tpl/field_select_disabled.tpl
diff --git a/view/theme/redbasic/tpl/field_select_grouped.tpl b/view/tpl/field_select_grouped.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_select_grouped.tpl
rename to view/tpl/field_select_grouped.tpl
diff --git a/view/theme/redbasic/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_select_raw.tpl
rename to view/tpl/field_select_raw.tpl
diff --git a/view/theme/redbasic/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_textarea.tpl
rename to view/tpl/field_textarea.tpl
diff --git a/view/theme/redbasic/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_themeselect.tpl
rename to view/tpl/field_themeselect.tpl
diff --git a/view/theme/redbasic/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/field_yesno.tpl
rename to view/tpl/field_yesno.tpl
diff --git a/view/theme/redbasic/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/fileas_widget.tpl
rename to view/tpl/fileas_widget.tpl
diff --git a/view/theme/redbasic/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/filebrowser.tpl
rename to view/tpl/filebrowser.tpl
diff --git a/view/theme/redbasic/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/filer_dialog.tpl
rename to view/tpl/filer_dialog.tpl
diff --git a/view/theme/redbasic/tpl/follow.tpl b/view/tpl/follow.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/follow.tpl
rename to view/tpl/follow.tpl
diff --git a/view/theme/redbasic/tpl/force_image_reload.tpl b/view/tpl/force_image_reload.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/force_image_reload.tpl
rename to view/tpl/force_image_reload.tpl
diff --git a/view/theme/redbasic/tpl/generic_addon_settings.tpl b/view/tpl/generic_addon_settings.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/generic_addon_settings.tpl
rename to view/tpl/generic_addon_settings.tpl
diff --git a/view/theme/redbasic/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/generic_links_widget.tpl
rename to view/tpl/generic_links_widget.tpl
diff --git a/view/theme/redbasic/tpl/generic_modal.tpl b/view/tpl/generic_modal.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/generic_modal.tpl
rename to view/tpl/generic_modal.tpl
diff --git a/view/theme/redbasic/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/group_drop.tpl
rename to view/tpl/group_drop.tpl
diff --git a/view/theme/redbasic/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/group_edit.tpl
rename to view/tpl/group_edit.tpl
diff --git a/view/theme/redbasic/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/group_selection.tpl
rename to view/tpl/group_selection.tpl
diff --git a/view/theme/redbasic/tpl/group_side.tpl b/view/tpl/group_side.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/group_side.tpl
rename to view/tpl/group_side.tpl
diff --git a/view/theme/redbasic/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/groupeditor.tpl
rename to view/tpl/groupeditor.tpl
diff --git a/view/theme/redbasic/tpl/hdr.tpl b/view/tpl/hdr.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/hdr.tpl
rename to view/tpl/hdr.tpl
diff --git a/view/theme/redbasic/tpl/head.tpl b/view/tpl/head.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/head.tpl
rename to view/tpl/head.tpl
diff --git a/view/theme/redbasic/tpl/help.tpl b/view/tpl/help.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/help.tpl
rename to view/tpl/help.tpl
diff --git a/view/theme/redbasic/tpl/install.tpl b/view/tpl/install.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/install.tpl
rename to view/tpl/install.tpl
diff --git a/view/theme/redbasic/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/install_checks.tpl
rename to view/tpl/install_checks.tpl
diff --git a/view/theme/redbasic/tpl/install_db.tpl b/view/tpl/install_db.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/install_db.tpl
rename to view/tpl/install_db.tpl
diff --git a/view/theme/redbasic/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/install_settings.tpl
rename to view/tpl/install_settings.tpl
diff --git a/view/theme/redbasic/tpl/invite.tpl b/view/tpl/invite.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/invite.tpl
rename to view/tpl/invite.tpl
diff --git a/view/theme/redbasic/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/item_attach.tpl
rename to view/tpl/item_attach.tpl
diff --git a/view/theme/redbasic/tpl/item_binary.tpl b/view/tpl/item_binary.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/item_binary.tpl
rename to view/tpl/item_binary.tpl
diff --git a/view/theme/redbasic/tpl/item_categories.tpl b/view/tpl/item_categories.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/item_categories.tpl
rename to view/tpl/item_categories.tpl
diff --git a/view/theme/redbasic/tpl/item_filer.tpl b/view/tpl/item_filer.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/item_filer.tpl
rename to view/tpl/item_filer.tpl
diff --git a/view/theme/redbasic/tpl/item_import.tpl b/view/tpl/item_import.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/item_import.tpl
rename to view/tpl/item_import.tpl
diff --git a/view/theme/redbasic/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/jot-header.tpl
rename to view/tpl/jot-header.tpl
diff --git a/view/theme/redbasic/tpl/jot.tpl b/view/tpl/jot.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/jot.tpl
rename to view/tpl/jot.tpl
diff --git a/view/theme/redbasic/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/jot_geotag.tpl
rename to view/tpl/jot_geotag.tpl
diff --git a/view/theme/redbasic/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/js_strings.tpl
rename to view/tpl/js_strings.tpl
diff --git a/view/theme/redbasic/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/lang_selector.tpl
rename to view/tpl/lang_selector.tpl
diff --git a/view/theme/redbasic/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/layoutlist.tpl
rename to view/tpl/layoutlist.tpl
diff --git a/view/theme/redbasic/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/like_noshare.tpl
rename to view/tpl/like_noshare.tpl
diff --git a/view/theme/redbasic/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/locmanage.tpl
rename to view/tpl/locmanage.tpl
diff --git a/view/theme/redbasic/tpl/login.tpl b/view/tpl/login.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/login.tpl
rename to view/tpl/login.tpl
diff --git a/view/theme/redbasic/tpl/logout.tpl b/view/tpl/logout.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/logout.tpl
rename to view/tpl/logout.tpl
diff --git a/view/theme/redbasic/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/lostpass.tpl
rename to view/tpl/lostpass.tpl
diff --git a/view/theme/redbasic/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/mail_conv.tpl
rename to view/tpl/mail_conv.tpl
diff --git a/view/theme/redbasic/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/mail_display.tpl
rename to view/tpl/mail_display.tpl
diff --git a/view/theme/redbasic/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/mail_head.tpl
rename to view/tpl/mail_head.tpl
diff --git a/view/theme/redbasic/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/mail_list.tpl
rename to view/tpl/mail_list.tpl
diff --git a/view/theme/redbasic/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/main_slider.tpl
rename to view/tpl/main_slider.tpl
diff --git a/view/theme/redbasic/tpl/match.tpl b/view/tpl/match.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/match.tpl
rename to view/tpl/match.tpl
diff --git a/view/theme/redbasic/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/menuedit.tpl
rename to view/tpl/menuedit.tpl
diff --git a/view/theme/redbasic/tpl/menulist.tpl b/view/tpl/menulist.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/menulist.tpl
rename to view/tpl/menulist.tpl
diff --git a/view/theme/redbasic/tpl/message_side.tpl b/view/tpl/message_side.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/message_side.tpl
rename to view/tpl/message_side.tpl
diff --git a/view/theme/redbasic/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/micropro_img.tpl
rename to view/tpl/micropro_img.tpl
diff --git a/view/theme/redbasic/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/micropro_txt.tpl
rename to view/tpl/micropro_txt.tpl
diff --git a/view/theme/redbasic/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/mitemedit.tpl
rename to view/tpl/mitemedit.tpl
diff --git a/view/theme/redbasic/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/mitemlist.tpl
rename to view/tpl/mitemlist.tpl
diff --git a/view/theme/redbasic/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/mood_content.tpl
rename to view/tpl/mood_content.tpl
diff --git a/view/theme/redbasic/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/msg-header.tpl
rename to view/tpl/msg-header.tpl
diff --git a/view/theme/redbasic/tpl/myapps.tpl b/view/tpl/myapps.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/myapps.tpl
rename to view/tpl/myapps.tpl
diff --git a/view/theme/redbasic/tpl/nav.tpl b/view/tpl/nav.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/nav.tpl
rename to view/tpl/nav.tpl
diff --git a/view/theme/redbasic/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/nav_login.tpl
rename to view/tpl/nav_login.tpl
diff --git a/view/theme/redbasic/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/new_channel.tpl
rename to view/tpl/new_channel.tpl
diff --git a/view/theme/redbasic/tpl/notes.tpl b/view/tpl/notes.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/notes.tpl
rename to view/tpl/notes.tpl
diff --git a/view/theme/redbasic/tpl/notifications.tpl b/view/tpl/notifications.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/notifications.tpl
rename to view/tpl/notifications.tpl
diff --git a/view/theme/redbasic/tpl/notify.tpl b/view/tpl/notify.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/notify.tpl
rename to view/tpl/notify.tpl
diff --git a/view/theme/redbasic/tpl/nwiki_page_history.tpl b/view/tpl/nwiki_page_history.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/nwiki_page_history.tpl
rename to view/tpl/nwiki_page_history.tpl
diff --git a/view/theme/redbasic/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/oauth_authorize.tpl
rename to view/tpl/oauth_authorize.tpl
diff --git a/view/theme/redbasic/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/oauth_authorize_done.tpl
rename to view/tpl/oauth_authorize_done.tpl
diff --git a/view/theme/redbasic/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/oembed_video.tpl
rename to view/tpl/oembed_video.tpl
diff --git a/view/theme/redbasic/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/oexchange_xrd.tpl
rename to view/tpl/oexchange_xrd.tpl
diff --git a/view/theme/redbasic/tpl/page_display.tpl b/view/tpl/page_display.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/page_display.tpl
rename to view/tpl/page_display.tpl
diff --git a/view/theme/redbasic/tpl/page_display_empty.tpl b/view/tpl/page_display_empty.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/page_display_empty.tpl
rename to view/tpl/page_display_empty.tpl
diff --git a/view/theme/redbasic/tpl/pdledit.tpl b/view/tpl/pdledit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/pdledit.tpl
rename to view/tpl/pdledit.tpl
diff --git a/view/theme/redbasic/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/peoplefind.tpl
rename to view/tpl/peoplefind.tpl
diff --git a/view/theme/redbasic/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photo_album.tpl
rename to view/tpl/photo_album.tpl
diff --git a/view/theme/redbasic/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photo_albums.tpl
rename to view/tpl/photo_albums.tpl
diff --git a/view/theme/redbasic/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photo_drop.tpl
rename to view/tpl/photo_drop.tpl
diff --git a/view/theme/redbasic/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photo_item.tpl
rename to view/tpl/photo_item.tpl
diff --git a/view/theme/redbasic/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photo_top.tpl
rename to view/tpl/photo_top.tpl
diff --git a/view/theme/redbasic/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photo_view.tpl
rename to view/tpl/photo_view.tpl
diff --git a/view/theme/redbasic/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photos_recent.tpl
rename to view/tpl/photos_recent.tpl
diff --git a/view/theme/redbasic/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photos_upload.tpl
rename to view/tpl/photos_upload.tpl
diff --git a/view/theme/redbasic/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/photosajax.tpl
rename to view/tpl/photosajax.tpl
diff --git a/view/theme/redbasic/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/poco_entry_xml.tpl
rename to view/tpl/poco_entry_xml.tpl
diff --git a/view/theme/redbasic/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/poco_xml.tpl
rename to view/tpl/poco_xml.tpl
diff --git a/view/theme/redbasic/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/poke_content.tpl
rename to view/tpl/poke_content.tpl
diff --git a/view/theme/redbasic/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/posted_date_widget.tpl
rename to view/tpl/posted_date_widget.tpl
diff --git a/view/theme/redbasic/tpl/prep.tpl b/view/tpl/prep.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/prep.tpl
rename to view/tpl/prep.tpl
diff --git a/view/theme/redbasic/tpl/profdef_edit.tpl b/view/tpl/profdef_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profdef_edit.tpl
rename to view/tpl/profdef_edit.tpl
diff --git a/view/theme/redbasic/tpl/profed_head.tpl b/view/tpl/profed_head.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profed_head.tpl
rename to view/tpl/profed_head.tpl
diff --git a/view/theme/redbasic/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profile_advanced.tpl
rename to view/tpl/profile_advanced.tpl
diff --git a/view/theme/redbasic/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profile_edit.tpl
rename to view/tpl/profile_edit.tpl
diff --git a/view/theme/redbasic/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profile_entry.tpl
rename to view/tpl/profile_entry.tpl
diff --git a/view/theme/redbasic/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profile_listing_header.tpl
rename to view/tpl/profile_listing_header.tpl
diff --git a/view/theme/redbasic/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profile_photo.tpl
rename to view/tpl/profile_photo.tpl
diff --git a/view/theme/redbasic/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profile_tabs.tpl
rename to view/tpl/profile_tabs.tpl
diff --git a/view/theme/redbasic/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profile_vcard.tpl
rename to view/tpl/profile_vcard.tpl
diff --git a/view/theme/redbasic/tpl/profile_vcard_short.tpl b/view/tpl/profile_vcard_short.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/profile_vcard_short.tpl
rename to view/tpl/profile_vcard_short.tpl
diff --git a/view/theme/redbasic/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/prv_message.tpl
rename to view/tpl/prv_message.tpl
diff --git a/view/theme/redbasic/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/pwdreset.tpl
rename to view/tpl/pwdreset.tpl
diff --git a/view/theme/redbasic/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/rating_form.tpl
rename to view/tpl/rating_form.tpl
diff --git a/view/theme/redbasic/tpl/rating_slider.tpl b/view/tpl/rating_slider.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/rating_slider.tpl
rename to view/tpl/rating_slider.tpl
diff --git a/view/theme/redbasic/tpl/rbmark.tpl b/view/tpl/rbmark.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/rbmark.tpl
rename to view/tpl/rbmark.tpl
diff --git a/view/theme/redbasic/tpl/register.tpl b/view/tpl/register.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/register.tpl
rename to view/tpl/register.tpl
diff --git a/view/theme/redbasic/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/remote_friends_common.tpl
rename to view/tpl/remote_friends_common.tpl
diff --git a/view/theme/redbasic/tpl/remote_login.tpl b/view/tpl/remote_login.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/remote_login.tpl
rename to view/tpl/remote_login.tpl
diff --git a/view/theme/redbasic/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/removeaccount.tpl
rename to view/tpl/removeaccount.tpl
diff --git a/view/theme/redbasic/tpl/removeme.tpl b/view/tpl/removeme.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/removeme.tpl
rename to view/tpl/removeme.tpl
diff --git a/view/theme/redbasic/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/rmagic.tpl
rename to view/tpl/rmagic.tpl
diff --git a/view/theme/redbasic/tpl/safesearch.tpl b/view/tpl/safesearch.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/safesearch.tpl
rename to view/tpl/safesearch.tpl
diff --git a/view/theme/redbasic/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/saved_searches.tpl
rename to view/tpl/saved_searches.tpl
diff --git a/view/theme/redbasic/tpl/search_item.tpl b/view/tpl/search_item.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/search_item.tpl
rename to view/tpl/search_item.tpl
diff --git a/view/theme/redbasic/tpl/searchbox.tpl b/view/tpl/searchbox.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/searchbox.tpl
rename to view/tpl/searchbox.tpl
diff --git a/view/theme/redbasic/tpl/section_title.tpl b/view/tpl/section_title.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/section_title.tpl
rename to view/tpl/section_title.tpl
diff --git a/view/theme/redbasic/tpl/select_timezone.tpl b/view/tpl/select_timezone.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/select_timezone.tpl
rename to view/tpl/select_timezone.tpl
diff --git a/view/theme/redbasic/tpl/sellpage_edit.tpl b/view/tpl/sellpage_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/sellpage_edit.tpl
rename to view/tpl/sellpage_edit.tpl
diff --git a/view/theme/redbasic/tpl/sellpage_submit.tpl b/view/tpl/sellpage_submit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/sellpage_submit.tpl
rename to view/tpl/sellpage_submit.tpl
diff --git a/view/theme/redbasic/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/sellpage_view.tpl
rename to view/tpl/sellpage_view.tpl
diff --git a/view/theme/redbasic/tpl/settings.tpl b/view/tpl/settings.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings.tpl
rename to view/tpl/settings.tpl
diff --git a/view/theme/redbasic/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_account.tpl
rename to view/tpl/settings_account.tpl
diff --git a/view/theme/redbasic/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_addons.tpl
rename to view/tpl/settings_addons.tpl
diff --git a/view/theme/redbasic/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_connectors.tpl
rename to view/tpl/settings_connectors.tpl
diff --git a/view/theme/redbasic/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_display.tpl
rename to view/tpl/settings_display.tpl
diff --git a/view/theme/redbasic/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_features.tpl
rename to view/tpl/settings_features.tpl
diff --git a/view/theme/redbasic/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_nick_set.tpl
rename to view/tpl/settings_nick_set.tpl
diff --git a/view/theme/redbasic/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_oauth.tpl
rename to view/tpl/settings_oauth.tpl
diff --git a/view/theme/redbasic/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_oauth_edit.tpl
rename to view/tpl/settings_oauth_edit.tpl
diff --git a/view/theme/redbasic/tpl/settings_permcats.tpl b/view/tpl/settings_permcats.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_permcats.tpl
rename to view/tpl/settings_permcats.tpl
diff --git a/view/theme/redbasic/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/settings_tokens.tpl
rename to view/tpl/settings_tokens.tpl
diff --git a/view/theme/redbasic/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/sharedwithme.tpl
rename to view/tpl/sharedwithme.tpl
diff --git a/view/theme/redbasic/tpl/show_thing.tpl b/view/tpl/show_thing.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/show_thing.tpl
rename to view/tpl/show_thing.tpl
diff --git a/view/theme/redbasic/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/siteinfo.tpl
rename to view/tpl/siteinfo.tpl
diff --git a/view/theme/redbasic/tpl/sitesearch.tpl b/view/tpl/sitesearch.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/sitesearch.tpl
rename to view/tpl/sitesearch.tpl
diff --git a/view/theme/redbasic/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/sources_edit.tpl
rename to view/tpl/sources_edit.tpl
diff --git a/view/theme/redbasic/tpl/sources_list.tpl b/view/tpl/sources_list.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/sources_list.tpl
rename to view/tpl/sources_list.tpl
diff --git a/view/theme/redbasic/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/sources_new.tpl
rename to view/tpl/sources_new.tpl
diff --git a/view/theme/redbasic/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/suggest_friends.tpl
rename to view/tpl/suggest_friends.tpl
diff --git a/view/theme/redbasic/tpl/suggest_page.tpl b/view/tpl/suggest_page.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/suggest_page.tpl
rename to view/tpl/suggest_page.tpl
diff --git a/view/theme/redbasic/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/suggest_widget.tpl
rename to view/tpl/suggest_widget.tpl
diff --git a/view/theme/redbasic/tpl/thing_edit.tpl b/view/tpl/thing_edit.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/thing_edit.tpl
rename to view/tpl/thing_edit.tpl
diff --git a/view/theme/redbasic/tpl/thing_input.tpl b/view/tpl/thing_input.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/thing_input.tpl
rename to view/tpl/thing_input.tpl
diff --git a/view/theme/redbasic/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/threaded_conversation.tpl
rename to view/tpl/threaded_conversation.tpl
diff --git a/view/theme/redbasic/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/toggle_mobile_footer.tpl
rename to view/tpl/toggle_mobile_footer.tpl
diff --git a/view/theme/redbasic/tpl/uexport.tpl b/view/tpl/uexport.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/uexport.tpl
rename to view/tpl/uexport.tpl
diff --git a/view/theme/redbasic/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/usermenu.tpl
rename to view/tpl/usermenu.tpl
diff --git a/view/theme/redbasic/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/viewcontact_template.tpl
rename to view/tpl/viewcontact_template.tpl
diff --git a/view/theme/redbasic/tpl/viewcontactsajax.tpl b/view/tpl/viewcontactsajax.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/viewcontactsajax.tpl
rename to view/tpl/viewcontactsajax.tpl
diff --git a/view/theme/redbasic/tpl/webpage_export_list.tpl b/view/tpl/webpage_export_list.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/webpage_export_list.tpl
rename to view/tpl/webpage_export_list.tpl
diff --git a/view/theme/redbasic/tpl/webpage_import.tpl b/view/tpl/webpage_import.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/webpage_import.tpl
rename to view/tpl/webpage_import.tpl
diff --git a/view/theme/redbasic/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/webpagelist.tpl
rename to view/tpl/webpagelist.tpl
diff --git a/view/theme/redbasic/tpl/website_portation_tools.tpl b/view/tpl/website_portation_tools.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/website_portation_tools.tpl
rename to view/tpl/website_portation_tools.tpl
diff --git a/view/theme/redbasic/tpl/wiki.tpl b/view/tpl/wiki.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/wiki.tpl
rename to view/tpl/wiki.tpl
diff --git a/view/theme/redbasic/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/wiki_page_history.tpl
rename to view/tpl/wiki_page_history.tpl
diff --git a/view/theme/redbasic/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/wiki_page_list.tpl
rename to view/tpl/wiki_page_list.tpl
diff --git a/view/theme/redbasic/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/wikilist.tpl
rename to view/tpl/wikilist.tpl
diff --git a/view/theme/redbasic/tpl/wikilist_widget.tpl b/view/tpl/wikilist_widget.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/wikilist_widget.tpl
rename to view/tpl/wikilist_widget.tpl
diff --git a/view/theme/redbasic/tpl/write_pages.tpl b/view/tpl/write_pages.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/write_pages.tpl
rename to view/tpl/write_pages.tpl
diff --git a/view/theme/redbasic/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/xchan_vcard.tpl
rename to view/tpl/xchan_vcard.tpl
diff --git a/view/theme/redbasic/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/xrd_diaspora.tpl
rename to view/tpl/xrd_diaspora.tpl
diff --git a/view/theme/redbasic/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/xrd_host.tpl
rename to view/tpl/xrd_host.tpl
diff --git a/view/theme/redbasic/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/xrd_person.tpl
rename to view/tpl/xrd_person.tpl
diff --git a/view/theme/redbasic/tpl/zcard.tpl b/view/tpl/zcard.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/zcard.tpl
rename to view/tpl/zcard.tpl
diff --git a/view/theme/redbasic/tpl/zcard_embed.tpl b/view/tpl/zcard_embed.tpl
similarity index 100%
rename from view/theme/redbasic/tpl/zcard_embed.tpl
rename to view/tpl/zcard_embed.tpl

From 7acb0685904bd66cd89ef15e181148d31c6813dc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 18:24:18 -0700
Subject: [PATCH 151/299] profile_sidebar hook ignored the updated html content

---
 include/channel.php         |  3 +-
 view/tpl/diaspora_vcard.tpl | 69 -------------------------------------
 2 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 view/tpl/diaspora_vcard.tpl

diff --git a/include/channel.php b/include/channel.php
index 890bb8bd6..6220ff179 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1196,7 +1196,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 
 	call_hooks('profile_sidebar', $arr);
 
-	return $o;
+	return $arr['entry'];
+
 }
 
 
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
deleted file mode 100644
index 017eb555c..000000000
--- a/view/tpl/diaspora_vcard.tpl
+++ /dev/null
@@ -1,69 +0,0 @@
-<div style="display:none;">
-	<dl class="entity_uid">
- 		<dt>Uid</dt>
- 		<dd>
-			<span class="uid p-uid">{{$diaspora.guid}}</span>
- 		</dd>
-	</dl>
-	<dl class='entity_nickname'>
-		<dt>Nickname</dt>
-		<dd>		
-			<span class="nickname p-nickname">{{$diaspora.nickname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_full_name'>
-		<dt>Full name</dt>
-		<dd>
-			<span class='fn p-name'>{{$diaspora.fullname}}</span>
-		</dd>
-	</dl>
-
-	<dl class='entity_first_name'>
-		<dt>First name</dt>
-		<dd>
-		<span class='given_name p-given-name'>{{$diaspora.firstname}}</span>
-		</dd>
-	</dl>
-	<dl class='entity_family_name'>
-		<dt>Family name</dt>
-		<dd>
-		<span class='family_name p-family-name'>{{$diaspora.lastname}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_url">
-		<dt>URL</dt>
-		<dd>
-			<a href="{{$diaspora.podloc}}/" id="pod_location" class="url" rel="me" >{{$diaspora.podloc}}/</a>
-		</dd>
-	</dl>
-	<dl class="entity_photo">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}" />
-		</dd>
-	</dl>
-	<dl class="entity_photo_medium">
-		<dt>Photo</dt>
-		<dd> 
-			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}" />
-		</dd>
-	</dl>
-	<dl class="entity_photo_small">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}" />
-		</dd>
-	</dl>
-	<dl class="entity_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">{{$diaspora.searchable}}</span>
-		</dd>
-	</dl>
-	<dl class="entity_key">
-		<dt>Key</dt>
-		<dd>
-		<pre class="key">{{$diaspora.pubkey}}</pre>
-		</dd>
-	</dl>
-</div>

From b2d2dcc7fe7af1b61e2636ed7e12c805fe67f49b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 20:17:47 -0700
Subject: [PATCH 152/299] more code refactoring to put external protocol
 dependencies in plugins.

---
 include/items.php   | 36 +++-----------------
 include/network.php | 80 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 31 deletions(-)

diff --git a/include/items.php b/include/items.php
index 30aa30048..a3f423836 100755
--- a/include/items.php
+++ b/include/items.php
@@ -801,37 +801,6 @@ function import_author_xchan($x) {
 
 }
 
-/**
- * @brief Imports an author from Diaspora.
- *
- * @param array $x an associative array with
- *   * \e string \b address
- * @return boolean|string false on error, otherwise xchan_hash of the new entry
- */
-function import_author_diaspora($x) {
-	if(! $x['address'])
-		return false;
-
-	$r = q("select * from xchan where xchan_addr = '%s' limit 1",
-		dbesc($x['address'])
-	);
-	if($r) {
-		logger('in_cache: ' . $x['address'], LOGGER_DATA);
-		return $r[0]['xchan_hash'];
-	}
-
-	if(discover_by_webbie($x['address'])) {
-		$r = q("select xchan_hash from xchan where xchan_addr = '%s' limit 1",
-			dbesc($x['address'])
-		);
-		if($r)
-			return $r[0]['xchan_hash'];
-	}
-
-	return false;
-
-}
-
 /**
  * @brief Imports an author from a RSS feed.
  *
@@ -889,6 +858,11 @@ function import_author_rss($x) {
 
 function import_author_unknown($x) {
 
+	$arr = [ 'author' => $x, 'result' => false ];
+	call_hooks('import_author', $arr);
+	if($arr['result'])
+		return $arr['result'];
+
 	if(! $x['url'])
 		return false;
 
diff --git a/include/network.php b/include/network.php
index 6cc53e8b5..d4b9e73ee 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1900,3 +1900,83 @@ function probe_api_path($host) {
 
 	return '';
 }
+
+
+function scrape_vcard($url) {
+
+	require_once('library/HTML5/Parser.php');
+
+	$ret = array();
+
+	logger('url=' . $url);
+
+	$x = z_fetch_url($url);
+	if(! $x['success'])
+		return $ret;
+
+	$s = $x['body'];
+
+	if(! $s)
+		return $ret;
+
+	$headers = $x['header'];
+	$lines = explode("\n",$headers);
+	if(count($lines)) {
+		foreach($lines as $line) {
+			// don't try and run feeds through the html5 parser
+			if(stristr($line,'content-type:') && ((stristr($line,'application/atom+xml')) || (stristr($line,'application/rss+xml'))))
+				return ret;
+		}
+	}
+
+	try {
+		$dom = HTML5_Parser::parse($s);
+	} catch (DOMException $e) {
+		logger('Parse error: ' . $e);
+	}
+
+	if(! $dom)
+		return $ret;
+
+	// Pull out hCard profile elements
+
+	$largest_photo = 0;
+
+	$items = $dom->getElementsByTagName('*');
+	foreach($items as $item) {
+		if(attribute_contains($item->getAttribute('class'), 'vcard')) {
+			$level2 = $item->getElementsByTagName('*');
+			foreach($level2 as $x) {
+				if(attribute_contains($x->getAttribute('id'),'pod_location'))
+					$ret['pod_location'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'fn'))
+					$ret['fn'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'uid'))
+					$ret['uid'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'nickname'))
+					$ret['nick'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'searchable'))
+					$ret['searchable'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'key'))
+					$ret['public_key'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'given_name'))
+					$ret['given_name'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'family_name'))
+					$ret['family_name'] = $x->textContent;
+				if(attribute_contains($x->getAttribute('class'),'url'))
+					$ret['url'] = $x->textContent;
+
+				if((attribute_contains($x->getAttribute('class'),'photo'))
+					|| (attribute_contains($x->getAttribute('class'),'avatar'))) {
+					$size = intval($x->getAttribute('width'));
+					if(($size > $largest_photo) || (! $largest_photo)) {
+						$ret['photo'] = $x->getAttribute('src');
+						$largest_photo = $size;
+					}
+				}
+			}
+		}
+	}
+
+	return $ret;
+}

From 0e5d824bff18acfcaceecd8bd87664c7f1546ef7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 22:10:53 -0700
Subject: [PATCH 153/299] finish the red conversion of the markdown utilities
 considering their relation to protocol plugins.

---
 include/markdown.php | 52 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/include/markdown.php b/include/markdown.php
index 841540357..90266afc9 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -151,3 +151,55 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) {
 }
 
 
+
+function bb_to_markdown($Text) {
+
+	/*
+	 * Transform #tags, strip off the [url] and replace spaces with underscore
+	 */
+
+	$Text = preg_replace_callback('/#\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i', 
+		create_function('$match', 'return \'#\'. str_replace(\' \', \'_\', $match[3]);'), $Text);
+
+	$Text = preg_replace('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text);
+
+	// Converting images with size parameters to simple images. Markdown doesn't know it.
+	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
+
+
+	call_hooks('bb_to_markdown_bb',$Text);
+
+	// Convert it to HTML - don't try oembed
+	$Text = bbcode($Text, $preserve_nl, false);
+
+	// Markdownify does not preserve previously escaped html entities such as <> and &.
+
+	$Text = str_replace(array('&lt;','&gt;','&amp;'),array('&_lt_;','&_gt_;','&_amp_;'),$Text);
+
+	// Now convert HTML to Markdown
+	$md = new Converter(Converter::LINK_AFTER_CONTENT, false, false);
+	$Text = $md->parseString($Text);
+
+   // The converter adds backslashes to our attempt at getting around the html entity preservation for some weird reason.
+
+	$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('&lt;','&gt;','&amp;'),$Text);
+
+	// If the text going into bbcode() has a plain URL in it, i.e.
+	// with no [url] tags around it, it will come out of parseString()
+	// looking like: <http://url.com>, which gets removed by strip_tags().
+	// So take off the angle brackets of any such URL
+	$Text = preg_replace("/<http(.*?)>/is", "http$1", $Text);
+
+	// Remove empty zrl links
+	$Text = preg_replace("/\[zrl\=\].*?\[\/zrl\]/is", "", $Text);
+
+	// escape all unconverted tags
+	$Text = escape_tags($Text);
+
+	$Text = trim($Text);
+
+	call_hooks('bb_to_markdown', $Text);
+
+	return $Text;
+
+}
\ No newline at end of file

From 4933aef543dbdec66f50f27599d6eb68b4a8432a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 22:40:31 -0700
Subject: [PATCH 154/299] more cleanup

---
 view/pdl/mod_cdav.pdl | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 view/pdl/mod_cdav.pdl

diff --git a/view/pdl/mod_cdav.pdl b/view/pdl/mod_cdav.pdl
new file mode 100644
index 000000000..ae26810c4
--- /dev/null
+++ b/view/pdl/mod_cdav.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=cdav][/widget]
+[/region]

From 05cbdc6915cfd5cd814f08596567403cc7e777e7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 3 May 2017 18:30:11 -0700
Subject: [PATCH 155/299] cleanup fallback directory list

---
 boot.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boot.php b/boot.php
index 031c1562e..19901aa1d 100755
--- a/boot.php
+++ b/boot.php
@@ -82,7 +82,6 @@ define ( 'DIRECTORY_REALM',            'RED_GLOBAL');
 define ( 'DIRECTORY_FALLBACK_MASTER',  'https://gravizot.de');
 
 $DIRECTORY_FALLBACK_SERVERS = array( 
-	//'https://hubzilla.site',
 	'https://hubzilla.zottel.net',
 	'https://my.federated.social',
 	'https://hubzilla.nl',

From b08af13872a698c85bb2cf9abd6651bc5c98f7bd Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 3 May 2017 22:37:06 -0700
Subject: [PATCH 156/299] oauth2/oidc testing (please do not port - this
 requires several extra DB tables to work)

---
 Zotlabs/Module/Authorize.php | 71 ++++++++++++++++++++++++++++++++++++
 Zotlabs/Module/Token.php     | 40 ++++++++++++++++++++
 include/oauth2.php           | 21 +++++++++++
 3 files changed, 132 insertions(+)
 create mode 100644 Zotlabs/Module/Authorize.php
 create mode 100644 Zotlabs/Module/Token.php
 create mode 100644 include/oauth2.php

diff --git a/Zotlabs/Module/Authorize.php b/Zotlabs/Module/Authorize.php
new file mode 100644
index 000000000..06f66c456
--- /dev/null
+++ b/Zotlabs/Module/Authorize.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Zotlabs\Module;
+
+
+class Authorize extends \Zotlabs\Web\Controller {
+
+
+	function get() {
+
+
+			// workaround for HTTP-auth in CGI mode
+			if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
+				$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
+				if(strlen($userpass)) {
+					list($name, $password) = explode(':', $userpass);
+					$_SERVER['PHP_AUTH_USER'] = $name;
+					$_SERVER['PHP_AUTH_PW'] = $password;
+				}
+			}
+
+			if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
+				$userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ;
+				if(strlen($userpass)) {
+					list($name, $password) = explode(':', $userpass);
+					$_SERVER['PHP_AUTH_USER'] = $name;
+					$_SERVER['PHP_AUTH_PW'] = $password;
+				}
+			}
+
+
+
+
+	require_once('include/oauth2.php');
+
+	$request = \OAuth2\Request::createFromGlobals();
+	$response = new \OAuth2\Response();
+
+	// validate the authorize request
+	if (! $oauth2_server->validateAuthorizeRequest($request, $response)) {
+	    $response->send();
+    	killme();
+	}
+
+	// display an authorization form
+	if (empty($_POST)) {
+
+	  return '
+<form method="post">
+  <label>Do You Authorize TestClient?</label><br />
+  <input type="submit" name="authorized" value="yes">
+  <input type="submit" name="authorized" value="no">
+</form>';
+	}
+
+	// print the authorization code if the user has authorized your client
+	$is_authorized = ($_POST['authorized'] === 'yes');
+	$oauth2_server->handleAuthorizeRequest($request, $response, $is_authorized);
+	if ($is_authorized) {
+		// this is only here so that you get to see your code in the cURL request. Otherwise, 
+		// we'd redirect back to the client
+		$code = substr($response->getHttpHeader('Location'), strpos($response->getHttpHeader('Location'), 'code=')+5, 40);
+		echo("SUCCESS! Authorization Code: $code");
+		
+	}
+
+	$response->send();
+	killme();
+	}
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Module/Token.php b/Zotlabs/Module/Token.php
new file mode 100644
index 000000000..e0d9d74d7
--- /dev/null
+++ b/Zotlabs/Module/Token.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Zotlabs\Module;
+
+
+class Token extends \Zotlabs\Web\Controller {
+
+
+	function get() {
+
+
+			// workaround for HTTP-auth in CGI mode
+			if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
+				$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
+				if(strlen($userpass)) {
+					list($name, $password) = explode(':', $userpass);
+					$_SERVER['PHP_AUTH_USER'] = $name;
+					$_SERVER['PHP_AUTH_PW'] = $password;
+				}
+			}
+
+			if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
+				$userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ;
+				if(strlen($userpass)) {
+					list($name, $password) = explode(':', $userpass);
+					$_SERVER['PHP_AUTH_USER'] = $name;
+					$_SERVER['PHP_AUTH_PW'] = $password;
+				}
+			}
+
+
+
+
+	require_once('include/oauth2.php');
+	$oauth2_server->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send(); 
+
+	killme();
+	}
+
+}
\ No newline at end of file
diff --git a/include/oauth2.php b/include/oauth2.php
new file mode 100644
index 000000000..a0d65a995
--- /dev/null
+++ b/include/oauth2.php
@@ -0,0 +1,21 @@
+<?php
+
+	$storage = new OAuth2\Storage\Pdo(\DBA::$dba->db);
+	$config = [
+		'use_openid_connect'] => true,
+		'issuer' => \Zotlabs\Lib\System::get_site_name()
+	];
+
+	$oauth2_server = new OAuth2\Server($storage,$config);
+
+	$oauth2_server->addGrantType(new OAuth2\GrantType\ClientCredentials($storage));
+	$oauth2_server->addGrantType(new OAuth2\GrantType\AuthorizationCode($storage));
+
+	$keyStorage = new OAuth2\Storage\Memory( [ 
+		'keys' => [ 
+			'public_key' => get_config('system','pubkey'),
+			'private_key' => get_config('system','prvkey')
+		]
+	]);
+
+	$oauth2_server->addStorage($keyStorage,'public_key');

From faf98147882857f09ed5bdb694bebaae416b2526 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 4 May 2017 19:18:54 -0700
Subject: [PATCH 157/299] typo

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

diff --git a/include/items.php b/include/items.php
index a3f423836..7b88ee7f3 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1281,7 +1281,7 @@ function encode_item_flags($item) {
 		$ret[] = 'consensus';
 	if(intval($item['item_obscured']))
 		$ret[] = 'obscured';
-	if(intval($item['item_privat']))
+	if(intval($item['item_private']))
 		$ret[] = 'private';
 
 	return $ret;

From 67918033f94e277240a826534f03ed6d13e4be9d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 4 May 2017 20:58:19 -0700
Subject: [PATCH 158/299] oauth2 dynamic client registration

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

diff --git a/include/api.php b/include/api.php
index 693967696..c91590070 100644
--- a/include/api.php
+++ b/include/api.php
@@ -194,15 +194,25 @@ require_once('include/api_zot.php');
 		else
 			$redirect = trim($_REQUEST['redirect_uris']);
 		$icon = trim($_REQUEST['logo_uri']);
-		$r = q("INSERT INTO clients (client_id, pw, clname, redirect_uri, icon, uid)
-			VALUES ('%s','%s','%s','%s','%s',%d)",
-			dbesc($key),
-			dbesc($secret),
-			dbesc($name),
-			dbesc($redirect),
-			dbesc($icon),
-			intval(0)
-		);
+		if($oauth2) {
+			$r = q("INSERT INTO oauth_clients (client_id, client_secret, redirect_uri, grant_types, scope, user_id)
+				VALUES ( '%s', '%s', '%s', null, null, null ) ",
+				dbesc($key),
+				dbesc($secret),
+				dbesc($redirect)
+			);  
+		}
+		else {
+			$r = q("INSERT INTO clients (client_id, pw, clname, redirect_uri, icon, uid)
+				VALUES ('%s','%s','%s','%s','%s',%d)",
+				dbesc($key),
+				dbesc($secret),
+				dbesc($name),
+				dbesc($redirect),
+				dbesc($icon),
+				intval(0)
+			);
+		}
 
 		$ret['client_id'] = $key;
 		$ret['client_secret'] = $secret;

From f0a2747d80b29810eddeb62063c231d7178ac3db Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 4 May 2017 21:55:56 -0700
Subject: [PATCH 159/299] make service_plink pluggable

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

diff --git a/include/network.php b/include/network.php
index d4b9e73ee..5bf626908 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1980,3 +1980,26 @@ function scrape_vcard($url) {
 
 	return $ret;
 }
+
+function service_plink($contact, $guid) {
+
+	$plink = '';
+
+	$m = parse_url($contact['xchan_url']);
+	if($m) {
+		$url = $m['scheme'] . '://' . $m['host'] . (($m['port']) ? ':' . $m['port'] : '');
+	}
+	else {
+		$url = 'https://' . substr($contact['xchan_addr'],strpos($contact['xchan_addr'],'@')+1);
+	}
+
+	$handle = substr($contact['xchan_addr'], 0, strpos($contact['xchan_addr'],'@'));
+
+	$plink = $url . '/channel/' . $handle . '?f=&mid=' . $guid;
+
+	$x = [ 'xchan' => $contact, 'guid' => $guid, '$url' => $url, 'plink' => $plink ];
+	call_hooks('service_plink', $x);
+
+	return $x['plink'];
+}
+

From c70ac572fabb7e808adb58ada201aa0e7acf0c36 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 4 May 2017 22:08:12 -0700
Subject: [PATCH 160/299] do away with single delivery (delivery from clones to
 singleton networks attached to other clones)

---
 Zotlabs/Daemon/Notifier.php | 23 +++--------------------
 include/import.php          |  9 ---------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index e2dab4b2d..56a9691bc 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -64,8 +64,6 @@ require_once('include/bbcode.php');
  *       purge_all              channel_id
  *       expire                 channel_id
  *       relay					item_id (item was relayed to owner, we will deliver it as owner)
- *       single_activity        item_id (deliver to a singleton network from the appropriate clone)
- *       single_mail            mail_id (deliver to a singleton network from the appropriate clone)
  *       location               channel_id
  *       request                channel_id            xchan_hash             message_id
  *       rating                 xlink_id
@@ -105,7 +103,7 @@ class Notifier {
 		$normal_mode = true;
 		$packet_type = 'undefined';
 
-		if($cmd === 'mail' || $cmd === 'single_mail') {
+		if($cmd === 'mail') {
 			$normal_mode = false;
 			$mail = true;
 			$private = true;
@@ -451,7 +449,7 @@ class Notifier {
 			'uplink'         => $uplink,
 			'cmd'            => $cmd,
 			'mail'           => $mail,
-			'single'         => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
+			'single'         => false,
 			'location'       => $location,
 			'request'        => $request,
 			'normal_mode'    => $normal_mode,
@@ -558,7 +556,7 @@ class Notifier {
 					'uplink'         => $uplink,
 					'cmd'            => $cmd,
 					'mail'           => $mail,
-					'single'         => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
+					'single'         => false,
 					'location'       => $location,
 					'request'        => $request,
 					'normal_mode'    => $normal_mode,
@@ -577,21 +575,6 @@ class Notifier {
 
 			}
 
-			// singleton deliveries by definition 'not got zot'.
-			// Single deliveries are other federated networks (plugins) and we're essentially 
-			// delivering only to those that have this site url in their abook_instance
-			// and only from within a sync operation. This means if you post from a clone,
-			// and a connection is connected to one of your other clones; assuming that hub
-			// is running it will receive a sync packet. On receipt of this sync packet it
-			// will invoke a delivery to those connections which are connected to just that
-			// hub instance. 
-
-			if($cmd === 'single_mail' || $cmd === 'single_activity') {
-				continue;
-			}
-
-			// default: zot protocol
-
 			$hash = random_string();
 			$packet = null;
 
diff --git a/include/import.php b/include/import.php
index 224bb1803..d67689290 100644
--- a/include/import.php
+++ b/include/import.php
@@ -631,12 +631,6 @@ function import_items($channel, $items, $sync = false, $relocate = null) {
 
 			fix_attached_file_permissions($channel,$item['author_xchan'],$item['body'],$item['allow_cid'],$item['allow_gid'],$item['deny_cid'],$item['deny_gid']);
 
-			if($sync && $item['item_wall']) {
-				// deliver singletons if we have any
-				if($item_result && $item_result['success']) {
-					Zotlabs\Daemon\Master::Summon( [ 'Notifier','single_activity',$item_result['item_id'] ]);
-				}
-			}
 		}
 	}
 }
@@ -1005,9 +999,6 @@ function import_mail($channel, $mails, $sync = false) {
 			$m['aid'] = $channel['channel_account_id'];
 			$m['uid'] = $channel['channel_id'];
 			$mail_id = mail_store($m);
-			if($sync && $mail_id) {
-				Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id));
-			}
  		}
 	}
 }

From 47ebddf99f5487cbcdfbabaa367c7b09fa0a86e3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 5 May 2017 02:27:24 -0700
Subject: [PATCH 161/299] markdown autolinks - hubzilla bug #752

---
 Zotlabs/Lib/MarkdownSoap.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php
index a0214bbe4..534ad819f 100644
--- a/Zotlabs/Lib/MarkdownSoap.php
+++ b/Zotlabs/Lib/MarkdownSoap.php
@@ -77,15 +77,22 @@ class MarkdownSoap {
 	}
 
 	function purify($s) {
-//		$s = str_replace("\n",'<br>',$s);
-//		$s = str_replace("\t",'&nbsp;&nbsp;&nbsp;&nbsp;',$s);
-//		$s = str_replace(' ','&nbsp;',$s);
+		$s = $this->protect_autolinks($s);
 		$s = purify_html($s);
-//		$s = str_replace(['&nbsp;', mb_convert_encoding('&#x00a0;','UTF-8','HTML-ENTITIES')], [ ' ', ' ' ],$s);
-//		$s = str_replace(['<br>','<br />', '&lt;', '&gt;' ],["\n","\n", '<', '>'],$s);
+		$s = $this->unprotect_autolinks($s);
 		return $s;
 	}
 
+	function protect_autolinks($s) {
+		$s = preg_replace('/\<(https?\:\/\/)(.*?)\>/','[$1$2]($1$2)',$s);
+		return $s;
+	}
+
+	function unprotect_autolinks($s) {
+		return $s;
+
+	}
+
 	function escape($s) {
 		return htmlspecialchars($s,ENT_QUOTES);
 	}

From 2c2ee706ac84926ceca21f5a4522034eb1b67d54 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 7 May 2017 14:40:11 -0700
Subject: [PATCH 162/299] get rid of edit activities

---
 Zotlabs/Module/Item.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 9fddafee6..ec36c22d8 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -860,7 +860,17 @@ class Item extends \Zotlabs\Web\Controller {
 	
 			$x = item_store_update($datarray,$execflag);
 			
-			item_create_edit_activity($x);			
+			// We only need edit activities for other federated protocols
+			// which do not support edits natively. While this does federate 
+			// edits, it presents a number of issues locally - such as #757 and #758.
+			// The SQL check for an edit activity would not perform that well so to fix these issues
+			// requires an additional item flag (perhaps 'item_edit_activity') that we can add to the 
+			// query for searches and notifications.
+
+			// For now we'll just forget about trying to make edits work on network protocols that 
+			// don't support them.   
+
+			// item_create_edit_activity($x);			
 
 			if(! $parent) {
 				$r = q("select * from item where id = %d",

From acb8e85b6108610f927811c52c9304b207963015 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 7 May 2017 17:25:38 -0700
Subject: [PATCH 163/299] cover photo was unintentionally disabled when
 block_public in effect

---
 Zotlabs/Module/Photo.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 256a51e71..dc4ae670e 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -127,7 +127,6 @@ class Photo extends \Zotlabs\Web\Controller {
 				  }
 			}
 			
-
 			$r = q("SELECT uid FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
 				dbesc($photo),
 				intval($resolution)
@@ -150,12 +149,14 @@ class Photo extends \Zotlabs\Web\Controller {
 				$channel = channelx_by_n($r[0]['uid']);
 
 				// Now we'll see if we can access the photo
-	
 				$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
 					dbesc($photo),
 					intval($resolution)
 				);
-	
+
+				if($r && $r[0]['photo_usage'] == PHOTO_COVER)
+					$allowed = 1;
+ 
 				$d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r, 'allowed' => $allowed ];
 				call_hooks('get_photo',$d);
 

From 1a05939e0bde75d251612c10e49aa7a3b61de64c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 7 May 2017 18:05:29 -0700
Subject: [PATCH 164/299] cleanup of last checkin

---
 Zotlabs/Module/Photo.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index dc4ae670e..8963480e6 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -154,10 +154,12 @@ class Photo extends \Zotlabs\Web\Controller {
 					intval($resolution)
 				);
 
-				if($r && $r[0]['photo_usage'] == PHOTO_COVER)
+				// viewing cover photos is allowed unless a plugin chooses to block it. 
+
+				if($r && intval($r[0]['photo_usage']) === PHOTO_COVER && $resolution >= PHOTO_RES_COVER_1200)
 					$allowed = 1;
  
-				$d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r, 'allowed' => $allowed ];
+				$d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r[0], 'allowed' => $allowed ];
 				call_hooks('get_photo',$d);
 
 				$resolution = $d['imgscale'];

From 2e531c103f33e798d979bd9dcda168cc6cb5d3e0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 8 May 2017 02:00:00 -0700
Subject: [PATCH 165/299] error

---
 Zotlabs/Daemon/Notifier.php |   6 --
 Zotlabs/Module/Photo.php    |   2 +-
 include/network.php         | 109 +-----------------------------------
 3 files changed, 2 insertions(+), 115 deletions(-)

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 56a9691bc..0e7284793 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -425,12 +425,6 @@ class Notifier {
 						'hash'     => $d['xchan_hash']
 					];
 				}
-
-				if($d['xchan_network'] === 'mail' && $normal_mode) {
-					$delivery_options = get_xconfig($d['xchan_hash'],'system','delivery_mode');
-					if(! $delivery_options)
-						format_and_send_email($channel,$d,$target_item);
-				}
 			}
 		}
 
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 8963480e6..8a110f925 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -159,7 +159,7 @@ class Photo extends \Zotlabs\Web\Controller {
 				if($r && intval($r[0]['photo_usage']) === PHOTO_COVER && $resolution >= PHOTO_RES_COVER_1200)
 					$allowed = 1;
  
-				$d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r[0], 'allowed' => $allowed ];
+				$d = [ 'imgscale' => $resolution, 'resource_id' => $photo, 'photo' => $r, 'allowed' => $allowed ];
 				call_hooks('get_photo',$d);
 
 				$resolution = $d['imgscale'];
diff --git a/include/network.php b/include/network.php
index 5bf626908..d3ccc498d 100644
--- a/include/network.php
+++ b/include/network.php
@@ -343,7 +343,7 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 		if (isset($url_parsed)) {
 			curl_close($ch);
 			if($http_code == 303) {
-				return z_fetch_url($newurl,false,$redirects++,$opts);
+				return z_fetch_url($newurl,false,++$redirects,$opts);
 			} else {
 				return z_post_url($newurl,$params,++$redirects,$opts);
 			}
@@ -397,31 +397,6 @@ function json_return_and_die($x, $content_type = 'application/json') {
 	killme();
 }
 
-
-/**
- * @brief Generic XML return.
- *
- * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
- * of $st and an optional text <message> of $message and terminates the current
- * process.
- *
- * @param string $st
- * @param string $message
- */
-function xml_status($st, $message = '') {
-
-	$xml_message = ((strlen($message)) ? "\t<message>" . xmlify($message) . "</message>\r\n" : '');
-
-	if($st)
-		logger('Returning non_zero: ' . $st . " message=" . $message);
-
-	header( "Content-type: text/xml" );
-	echo '<?xml version="1.0" encoding="UTF-8"?>'."\r\n";
-	echo "<result>\r\n\t<status>$st</status>\r\n$xml_message</result>\r\n";
-	killme();
-}
-
-
 /**
  * @brief Send HTTP status header.
  *
@@ -1452,88 +1427,6 @@ function scrape_feed($url) {
 }
 
 
-function format_and_send_email($sender,$xchan,$item) {
-
-	$title = $item['title'];
-	$body = $item['body'];
-
-	$textversion = strip_tags(html_entity_decode(bbcode(str_replace(array("\\r", "\\n"), array( "", "\n"), $body)),ENT_QUOTES,'UTF-8'));
-
-	$htmlversion = bbcode(str_replace(array("\\r","\\n"), array("","<br />\n"),$body));
-
-	$banner     = t('$Projectname Notification');
-
-    $product    = t('$projectname'); // PLATFORM_NAME;
-    $siteurl    = z_root();
-    $thanks     = t('Thank You,');
-    $sitename   = get_config('system','sitename');
-    $site_admin = sprintf( t('%s Administrator'), $sitename);
-
-		// load the template for private message notifications
-		$tpl = get_markup_template('email_notify_html.tpl');
-		$email_html_body = replace_macros($tpl,array(
-			'$banner'	    => $banner,
-			'$notify_icon'  => Zotlabs\Lib\System::get_notify_icon(),
-			'$product'	    => $product,
-			'$preamble'	    => '',
-			'$sitename'	    => $sitename,
-			'$siteurl'	    => $siteurl,
-			'$source_name'  => $sender['xchan_name'],
-			'$source_link'  => $sender['xchan_url'],
-			'$source_photo' => $sender['xchan_photo_m'],
-			'$username'	    => $xchan['xchan_name'],
-			'$hsitelink'	=> $datarray['hsitelink'],
-			'$hitemlink'	=> $datarray['hitemlink'],
-			'$thanks'	    => $thanks,
-			'$site_admin'   => $site_admin,
-			'$title'		=> $title,
-			'$htmlversion'  => $htmlversion,
-		));
-
-		// load the template for private message notifications
-		$tpl = get_markup_template('email_notify_text.tpl');
-		$email_text_body = replace_macros($tpl, array(
-			'$banner'       => $banner,
-			'$product'      => $product,
-			'$preamble'     => '',
-			'$sitename'     => $sitename,
-			'$siteurl'      => $siteurl,
-			'$source_name'  => $sender['xchan_name'],
-			'$source_link'  => $sender['xchan_url'],
-			'$source_photo' => $sender['xchan_photo_m'],
-			'$username'     => $xchan['xchan_name'],
-			'$hsitelink'    => $datarray['hsitelink'],
-			'$hitemlink'    => $datarray['hitemlink'],
-			'$thanks'       => $thanks,
-			'$site_admin'   => $site_admin,
-			'$title'        => $title,
-			'$textversion'  => $textversion
-		));
-
-		$sender_name = t('Administrator');
-
-  		$hostname = App::get_hostname();
-	    if(strpos($hostname,':'))
-    	    $hostname = substr($hostname,0,strpos($hostname,':'));
-		$sender_email = get_config('system','reply_address');
-		if(! $sender_email)
-			$sender_email = 'noreply' . '@' . $hostname;
-
-		// use the EmailNotification library to send the message
-
-		Zotlabs\Lib\Enotify::send(array(
-			'fromName'             => $product,
-			'fromEmail'            => $sender_email,
-			'replyTo'              => $sender_email,
-			'toEmail'              => str_replace('mailto:','',$xchan['xchan_addr']),
-			'messageSubject'       => (($title) ? $title : t('No Subject')),
-			'htmlVersion'          => $email_html_body,
-			'textVersion'          => $email_text_body,
-			'additionalMailHeader' => '',
-		));
-
-}
-
 
 function do_delivery($deliveries) {
 

From e059efb4c47dec32524ee2ff61d5cd9e7ad0cb84 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 8 May 2017 19:10:08 -0700
Subject: [PATCH 166/299] handle mastodon urls in markdown/bbcode conversion

---
 include/bbcode.php   | 2 +-
 include/markdown.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index 6a14b665f..e0a19c8f0 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -776,7 +776,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 
 	// Perform URL Search
 
-	$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,\@\(\)]';
+	$urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]';
 
 	if (strpos($Text,'http') !== false) {
 		if($tryoembed) {
diff --git a/include/markdown.php b/include/markdown.php
index 90266afc9..5826cb089 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -133,10 +133,10 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) {
 	// Convert everything that looks like a link to a link
 	if($use_zrl) {
 		$s = str_replace(array('[img','/img]'),array('[zmg','/zmg]'),$s);
-		$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\(\)]+)/ism", '$1[zrl=$2$3]$2$3[/zrl]',$s);
+		$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ism", '$1[zrl=$2$3]$2$3[/zrl]',$s);
 	}
 	else {
-		$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\(\)]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
+		$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
 	}
 
 	// remove duplicate adjacent code tags

From f629dc51aa20d7aa95f968a81e5504ce48c7c107 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 9 May 2017 19:02:02 -0700
Subject: [PATCH 167/299] zot protocol doco updates

---
 Zotlabs/Zot/Receiver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Zot/Receiver.php b/Zotlabs/Zot/Receiver.php
index 71d57eb35..03cbd0e9e 100644
--- a/Zotlabs/Zot/Receiver.php
+++ b/Zotlabs/Zot/Receiver.php
@@ -138,7 +138,6 @@ class Receiver {
  * This packet is optionally encrypted, which we will discover if the json has an 'iv' element.
  * $contents => array( 'alg' => 'aes256cbc', 'iv' => initialisation vector, 'key' => decryption key, 'data' => encrypted data);
  * $contents->iv and $contents->key are random strings encrypted with this site's RSA public key and then base64url encoded.
- * Currently only 'aes256cbc' is used, but this is extensible should that algorithm prove inadequate.
  *
  * Once decrypted, one will find the normal json_encoded zot message packet.
  * 
@@ -156,7 +155,8 @@ class Receiver {
  *   },
  *   "recipients": { optional recipient array },
  *   "callback":"\/post",
- *   "version":1,
+ *   "version":1.2,
+ *   "encryption":["aes256cbc"],
  *   "secret":"1eaa...",
  *   "secret_sig": "df89025470fac8..."
  * }

From a862bf488c4cce6e514d05b674dc0a1a25069f78 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 9 May 2017 19:03:16 -0700
Subject: [PATCH 168/299] use correct data type

---
 Zotlabs/Zot/Receiver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Zot/Receiver.php b/Zotlabs/Zot/Receiver.php
index 03cbd0e9e..0050a2559 100644
--- a/Zotlabs/Zot/Receiver.php
+++ b/Zotlabs/Zot/Receiver.php
@@ -155,7 +155,7 @@ class Receiver {
  *   },
  *   "recipients": { optional recipient array },
  *   "callback":"\/post",
- *   "version":1.2,
+ *   "version":"1.2",
  *   "encryption":["aes256cbc"],
  *   "secret":"1eaa...",
  *   "secret_sig": "df89025470fac8..."

From 76d78571d6d7a5adfc6da9e3bbad56c15056bc4a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 9 May 2017 20:33:25 -0700
Subject: [PATCH 169/299] don't allow html in plugin comment blocks

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

diff --git a/include/plugin.php b/include/plugin.php
index 29474735e..db20152ea 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -356,6 +356,7 @@ function get_plugin_info($plugin){
 		return $info;
 
 	$f = file_get_contents("addon/$plugin/$plugin.php");
+	$f = escape_tags($f);
 	$r = preg_match("|/\*.*\*/|msU", $f, $m);
 
 	if ($r){

From 84064b90a6ea1d968da76749a9816363462f3831 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 10 May 2017 22:15:01 -0700
Subject: [PATCH 170/299] disable oauth2 until I can get back to it - it's
 throwing typos

---
 include/connections.php | 2 +-
 include/oauth2.php      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/connections.php b/include/connections.php
index 8f4f84e1a..0e9f25c8f 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -629,7 +629,7 @@ function get_vcard_array($vc,$id) {
 				'address' => $adr->getParts()
 			];
 			$last_entry = end($adrs);
-			if($adrs[$last_entry]['address'])
+			if($last_entry && $adrs[$last_entry]['address'])
 				array_walk($adrs[$last_entry]['address'],'array_escape_tags');
 		}
 	}
diff --git a/include/oauth2.php b/include/oauth2.php
index a0d65a995..3a71a651d 100644
--- a/include/oauth2.php
+++ b/include/oauth2.php
@@ -1,8 +1,9 @@
 <?php
 
+/*
 	$storage = new OAuth2\Storage\Pdo(\DBA::$dba->db);
 	$config = [
-		'use_openid_connect'] => true,
+		'use_openid_connect' => true,
 		'issuer' => \Zotlabs\Lib\System::get_site_name()
 	];
 
@@ -19,3 +20,4 @@
 	]);
 
 	$oauth2_server->addStorage($keyStorage,'public_key');
+*/
\ No newline at end of file

From 4f577cbdebea44dfedece4eeddb99138d5f02f65 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 11 May 2017 18:32:34 -0700
Subject: [PATCH 171/299] issue #769

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

diff --git a/include/zot.php b/include/zot.php
index a168dff1b..748fe7b99 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3160,8 +3160,8 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 		if(array_key_exists('menu',$arr) && $arr['menu'])
 			sync_menus($channel,$arr['menu']);
 
-		if(array_key_exists('menu',$arr) && $arr['menu'])
-			sync_menus($channel,$arr['menu']);
+		if(array_key_exists('file',$arr) && $arr['file'])
+			sync_files($channel,$arr['file']);
 
 		if(array_key_exists('wiki',$arr) && $arr['wiki'])
 			sync_items($channel,$arr['wiki'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));

From 1de1b58a087afbadb55b7f18b93fb0b502a2de3a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 11 May 2017 19:01:04 -0700
Subject: [PATCH 172/299] consolidate email validation checks

---
 Zotlabs/Module/Invite.php           |  2 +-
 Zotlabs/Module/Settings/Account.php |  2 +-
 include/account.php                 |  2 +-
 include/text.php                    | 13 -------------
 tests/unit/includes/TextTest.php    | 12 ------------
 5 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php
index 6b6f80a31..927e7beae 100644
--- a/Zotlabs/Module/Invite.php
+++ b/Zotlabs/Module/Invite.php
@@ -49,7 +49,7 @@ class Invite extends \Zotlabs\Web\Controller {
 			if(! $recip)
 				continue;
 	
-			if(! valid_email($recip)) {
+			if(! validate_email($recip)) {
 				notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
 				continue;
 			}
diff --git a/Zotlabs/Module/Settings/Account.php b/Zotlabs/Module/Settings/Account.php
index ec176797d..18890e89f 100644
--- a/Zotlabs/Module/Settings/Account.php
+++ b/Zotlabs/Module/Settings/Account.php
@@ -16,7 +16,7 @@ class Account {
 
 		$account = \App::get_account();
 		if($email != $account['account_email']) {
-			if(! valid_email($email))
+			if(! validate_email($email))
 				$errs[] = t('Not valid email.');
 			$adm = trim(get_config('system','admin_email'));
 			if(($adm) && (strcasecmp($email,$adm) == 0)) {
diff --git a/include/account.php b/include/account.php
index 5e57d53a8..c188ce0d7 100644
--- a/include/account.php
+++ b/include/account.php
@@ -31,7 +31,7 @@ function check_account_email($email) {
 	if(! strlen($email))
 		return $result;
 
-	if((! valid_email($email)) || (! validate_email($email)))
+	if(! validate_email($email))
 		$result['message'] .= t('Not a valid email address') . EOL;
 	elseif(! allowed_email($email))
 		$result['message'] = t('Your email domain is not among those allowed on this site');
diff --git a/include/text.php b/include/text.php
index dc01f97bd..fb39313a2 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1042,19 +1042,6 @@ function searchbox($s,$id='search-box',$url='/search',$save = false) {
 	));
 }
 
-function valid_email_regex($x){
-	if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
-		return true;
-	return false;
-}
-
-function valid_email($x){
-	if(get_config('system','disable_email_validation'))
-		return true;
-
-	return valid_email_regex($x);
-}
-
 /**
  * @brief Replace naked text hyperlink with HTML formatted hyperlink.
  *
diff --git a/tests/unit/includes/TextTest.php b/tests/unit/includes/TextTest.php
index e2c7cbb9a..25a997f7a 100644
--- a/tests/unit/includes/TextTest.php
+++ b/tests/unit/includes/TextTest.php
@@ -11,18 +11,6 @@ use Zotlabs\Tests\Unit\UnitTestCase;
  */
 class TextTest extends UnitTestCase {
 
-	public function testGoodEmail() {
-		$this->assertTrue(valid_email_regex('ken@spaz.org'));
-		$this->assertTrue(valid_email_regex('ken@restivo.org'));
-		$this->assertTrue(valid_email_regex('nobody@hubzilla.org'));
-		$this->assertTrue(valid_email_regex('foo+nobody@hubzilla.org'));
-	}
-
-	public function testBadEmail() {
-		$this->assertFalse(valid_email_regex('nobody!uses!these!any.more'));
-		$this->assertFalse(valid_email_regex('foo@bar@hubzilla.org'));
-	}
-
 	public function testPurifyHTML() {
 		// linebreaks
 		$htmlbr = 'first line<br />

From ef51c1c2b2b598a69391f95043b9ab32616ffea8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 14 May 2017 18:02:22 -0700
Subject: [PATCH 173/299] Do not yet understand why on postgres, app['plugin']
 gets set to 3 linefeeds but this prevents it from rendering

---
 Zotlabs/Lib/Apps.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index edf050b95..2ace361ca 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -34,7 +34,7 @@ class Apps {
 		if($files) {
 			foreach($files as $f) {
 				$path = explode('/',$f);
-				$plugin = $path[1];
+				$plugin = trim($path[1]);
 				if(plugin_is_installed($plugin)) {
 					$x = self::parse_app_description($f,$translate);
 					if($x) {
@@ -285,7 +285,7 @@ class Apps {
 
 		self::translate_system_apps($papp);
 
-		if(($papp['plugin']) && (! plugin_is_installed($papp['plugin'])))
+		if(trim($papp['plugin']) && (! plugin_is_installed(trim($papp['plugin']))))
 			return '';
 
 		$papp['papp'] = self::papp_encode($papp);
@@ -575,7 +575,7 @@ class Apps {
 		$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']) : '');
-		$darray['app_plugin']   = ((x($arr,'plugin'))   ? escape_tags($arr['plugin']) : '');
+		$darray['app_plugin']   = ((x($arr,'plugin'))   ? escape_tags(trim($arr['plugin'])) : '');
 		$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
 		$darray['app_system']   = ((x($arr,'system'))   ? intval($arr['system']) : 0);
 		$darray['app_deleted']  = ((x($arr,'deleted'))  ? intval($arr['deleted']) : 0);
@@ -653,7 +653,7 @@ class Apps {
 		$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']) : '');
-		$darray['app_plugin']   = ((x($arr,'plugin')) ? escape_tags($arr['plugin']) : '');
+		$darray['app_plugin']   = ((x($arr,'plugin')) ? escape_tags(trim($arr['plugin'])) : '');
 		$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
 		$darray['app_system']   = ((x($arr,'system'))   ? intval($arr['system']) : 0);
 		$darray['app_deleted']  = ((x($arr,'deleted'))  ? intval($arr['deleted']) : 0);
@@ -763,7 +763,7 @@ class Apps {
 			$ret['system'] = $app['app_system'];
 
 		if($app['app_plugin'])
-			$ret['plugin'] = $app['app_plugin'];
+			$ret['plugin'] = trim($app['app_plugin']);
 
 		if($app['app_deleted'])
 			$ret['deleted'] = $app['app_deleted'];

From 2cc1844d979a73e07efd242368ff1bf3651369c0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 14 May 2017 20:51:15 -0700
Subject: [PATCH 174/299] hubzilla issue #777

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

diff --git a/include/bbcode.php b/include/bbcode.php
index e0a19c8f0..04c5b6fdc 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -383,7 +383,7 @@ function bb_definitionList($match) {
 	$eatLeadingSpaces = '(?:&nbsp;|[ \t])*'; // prevent spaces infront of [*= from adding another line to the previous element
 	$listElements = preg_replace('/^(\n|<br \/>)/', '', $match[2]); // ltrim the first newline
 	$listElements = preg_replace(
-		'/' . $eatLeadingSpaces . '\[\*=([[:print:]]*?)(?<!\\\)\]/ism', 
+		'/' . $eatLeadingSpaces . '\[\*=([\p{Any}]*?)(?<!\\\)\]/uism', 
 		$closeDescriptionTag . '<dt>$1</dt><dd>', 
 		$listElements
 	);

From 5c8a911c9334ad9b24a5c9a2e6e928519a586b92 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 14 May 2017 21:04:34 -0700
Subject: [PATCH 175/299] this looks like a slightly cleaner solution to the
 unicode dl issue

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

diff --git a/include/bbcode.php b/include/bbcode.php
index 04c5b6fdc..d38397be7 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -383,7 +383,7 @@ function bb_definitionList($match) {
 	$eatLeadingSpaces = '(?:&nbsp;|[ \t])*'; // prevent spaces infront of [*= from adding another line to the previous element
 	$listElements = preg_replace('/^(\n|<br \/>)/', '', $match[2]); // ltrim the first newline
 	$listElements = preg_replace(
-		'/' . $eatLeadingSpaces . '\[\*=([\p{Any}]*?)(?<!\\\)\]/uism', 
+		'/' . $eatLeadingSpaces . '\[\*=([[:print:]]*?)(?<!\\\)\]/uism', 
 		$closeDescriptionTag . '<dt>$1</dt><dd>', 
 		$listElements
 	);

From d9fdd0ce369766f41b87aebae5580a6fa67510ba Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 15 May 2017 20:37:29 -0700
Subject: [PATCH 176/299] no bug reporting info in docs

---
 doc/bugs.bb  | 21 +++++++++++----------
 doc/toc.html |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/doc/bugs.bb b/doc/bugs.bb
index f50337648..cc1ea3a20 100644
--- a/doc/bugs.bb
+++ b/doc/bugs.bb
@@ -1,31 +1,32 @@
 [h2]Bugs, Issues, and things that go bump in the night...[/h2]
 [h3]Something went wrong! Who is charge of fixing it?[/h3]
 
-[b]Hubzilla Community Server[/b]
+[b]$Projectname Community Server[/b]
 
-Hubzilla Community Server is open source software which is maintained by "the community" - essentially unpaid volunteers.
+$Projectname Community Server is open source software which is maintained by "the community" - essentially unpaid volunteers. Nobody is in charge of fixing bugs. We work together to keep the software and network running smoothly and error free. You are a member of this community, so we also require your help to provide quality software. There are no mythical "developers" who magically fix everything. It's up to all of us to pitch in and help.   
 
 The first thing you need to do is talk to your hub administrator - the person who runs and manages your site. They are in the unique position of having access to the internal software and database and [b]logfiles[/b] and will need to be involved in fixing your problem. Other people "on the net" can't really help with this. The first thing the hub administrator needs to do is look at their logs and/or try to reproduce the problem. So try to be as helpful and courteous as possible in helping them look into the problem. 
 
-To find your hub administrator (if you don't know who they are) please look at [url=[baseurl]/siteinfo]this page[/url]. If they have not provided any contact info on that page or provided an "Impressum" there, see [url=[baseurl]/siteinfo/json]this site info summary[/url] under the heading "admin:".
+To find your hub administrator (if you don't know who they are) please look at [url=[baseurl]/siteinfo]this page[/url]. If they have not provided any contact info on that page or provided an "Impressum" there, see [url=[baseurl]/siteinfo.json]this site info summary[/url] under the heading "admin:".
+
+It is highly recommended that bug reports be filed by hub administrators so that they can include the relevant logfile and database information relevant to the issue and be available to try workarounds and followup tests. Without this level of cooperation it may not be possible to fix the problem.  
 
 [h3]I'm a hub administrator; what do I do?[/h3]
 
-The software instructions which provide this server are open source and are available for your inspection. If an error message was reported, often one can do a search on the source files for that error message and find out what triggered it. With this information and the site logfiles it may be possible to figure out the sequence of events leading to the error. There could also be other sites involved, and the problem may not even be on your site but elsewhere in the network. Try to pin down the communication endpoints (hubs or sites) involved in the problem and contact the administrator of that site or those sites. Please try and provide an event time of when things went wrong so it can be found in the logs. Work with the other administrator(s) to try and find the cause of the problem. Logfiles are your friend. When something happens in the software that we didn't expect, it is nearly always logged. 
+The software instructions which provide this web service are open source and are available for your inspection. We encourage everybody to read it and see how everything works and verify that we aren't doing anything evil or negligent with your personal communications. If an error message was reported, often one can do a search on the source files for that error message and find out what triggered it. With this information and the site logfiles it may be possible to figure out the sequence of events leading to the error. There could also be other sites involved, and the problem may not even be on your site but elsewhere in the network. Try to pin down the communication endpoints (hubs or sites) involved in the problem and contact the administrator of that site or those sites. Please try and provide an event time of when things went wrong so it can be found in the logs. Work with the other administrator(s) to try and find the cause of the problem. Logfiles are your friend. When something happens in the software that we didn't expect, it is nearly always logged. 
 
 [h3]The white screen of death[/h3]
 
-If you get a blank white screen when doing something, this is almost always a code or syntax error. There are instructions in your .htconfig.php file for enabling syntax logging. We recommend all sites use this. With syntax logging enabled repeat the sequence which led to the error and it should log the offending line of code. Hopefully you will be able to fix the problem with this information. When you do, please submit the fix "upstream" so that we can share the fix with the rest of the project members and other communities. This is a key benefit of using open source software - we share with each other and everybody benefits.
+If you get a blank white screen when doing something, this is almost always a code or syntax error. There are instructions in the site .htconfig.php file which will allow the site administrator to enabling syntax logging. We recommend all sites use this. With syntax logging enabled repeat the sequence which led to the error and it should log the offending line of code. Hopefully you will be able to fix the problem with this information. When you do, please submit the fix "upstream" so that we can share the fix with the rest of the project members and other communities. This is a key benefit of using open source software - we share with each other and everybody benefits.
 
 [h3]I'm stumped. I can't figure out what is wrong.[/h3]
 
-At this point it might be worthwhile discussing the issue on one of the online forums. There may be several of these and some may be more suited to your spoken language. As a last resort, try "Channel One", which is in English.
+At this point it might be worthwhile discussing the issue on one of the online forums. There may be several of these and some may be more suited to your spoken language. At this time, the 'Hubzilla Support' channel (support@gravizot.de) is the recommended forum for discussing bugs. 
 
-If the community developers can't help you right away, understand that they are volunteers and may have a lot of other work and demands on their time. At this point you need to file a bug report. You will need an account on github.com to do this. So register, and then visit https://github.com/redmatrix/hubzilla/issues
-. Create an issue here and provide all the same information that you provided online. Don't leave out anything. 
+If community members with software engineering training/expertise can't help you right away, understand that they are volunteers and may have a lot of other work and demands on their time. At this point you need to file a bug report. You will need an account on github.com to do this. So register, and then visit https://github.com/redmatrix/hubzilla/issues . Create an issue here and provide all the same information that you provided online. Don't leave out anything. 
 
-Then you wait. If it's a high profile issue, it may get fixed quickly. But nobody is in charge of fixing bugs. If it lingers without resolution, please spend some more time investigating the problem. Ask about anything you don't understand related to the behaviour. You will learn more about how the software works and quite possibly figure out why it isn't working now. Ultimately it is somebody in the community who is going to fix this and you are a member of the community; and this is how the open source process works.
+Then you wait. If it's a high profile issue, it may get fixed quickly. But nobody is in charge of fixing bugs. If it lingers without resolution, please spend some more time investigating the problem. Ask about anything you don't understand related to the behaviour. You will learn more about how the software works and quite possibly figure out why it isn't working now. Ultimately it is somebody in the community who is going to fix this and you are a member of the community; and this is how the open source process works. 
 
 
-Other developers working to fix the problem may need to find out more, so do your homework and document what is happening and everything you've tried. Don't say "I did xyz and it didn't work." That doesn't tell us anything. Tell us precisely what steps you took and what you expected the result to be, and precisely what happened as a result. If there were any error messages, don't say "there was an error message". Tell us exactly what the message said. Tell us what version you're running and any other details that may be unique about your site configuration. 
+Other people working to fix the problem may need to find out more, so do your homework and document what is happening and everything you've tried. Don't say "I did xyz and it didn't work." That doesn't tell us anything. Tell us precisely what steps you took and what you expected the result to be, and precisely what happened as a result. What page/URL were you looking at or what form were you filling in? If there were any error messages, don't say "there was an error message". Tell us exactly what the message said. Also tell us what hub you are using, what software version you're running and any other details that may be unique about your site configuration. It is understood that you might wish to keep some information and your connections private, however if you aren't willing to share the information other people need to reproduce/fix the problem, it may not get fixed. 
        
\ No newline at end of file
diff --git a/doc/toc.html b/doc/toc.html
index 9a01af39f..9e34fc8d9 100644
--- a/doc/toc.html
+++ b/doc/toc.html
@@ -23,6 +23,7 @@
             <div class="flex-column">
                <a class="nav-link" href="/help/member/member_guide">Guide</a>
                <a class="nav-link" href="/help/member/bbcode">BBcode Reference</a>
+               <a class="nav-link" href="/help/bugs">Reporting Bugs</a>	
                <a class="nav-link" href="/help/member/member_faq">FAQ</a>
             </div>
         </div>

From df3eb562f09dc8c9248d9f76c7cf48480027075e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 15 May 2017 22:58:13 -0700
Subject: [PATCH 177/299] danger - do not use 'char(n)' with postgres it
 creates a thing called a bpchar which is different than a normal text field
 in subtle ways.

---
 install/schema_postgres.sql | 44 ++++++++++++++++++-------------------
 install/update.php          |  4 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 2ff3623b7..0249d447a 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -31,7 +31,7 @@ CREATE TABLE "abook" (
   "abook_self" smallint NOT NULL DEFAULT '0',
   "abook_feed" smallint NOT NULL DEFAULT '0',
   "abook_not_here" smallint NOT NULL DEFAULT '0',
-  "abook_profile" char(64) NOT NULL DEFAULT '',
+  "abook_profile" varchar(64) NOT NULL DEFAULT '',
   "abook_incl" TEXT NOT NULL DEFAULT '',
   "abook_excl" TEXT NOT NULL DEFAULT '',
   "abook_instance" TEXT NOT NULL DEFAULT '',
@@ -62,7 +62,7 @@ CREATE TABLE "account" (
   "account_id" serial  NOT NULL,
   "account_parent" bigint  NOT NULL DEFAULT '0',
   "account_default_channel" bigint  NOT NULL DEFAULT '0',
-  "account_salt" char(32) NOT NULL DEFAULT '',
+  "account_salt" varchar(32) NOT NULL DEFAULT '',
   "account_password" text NOT NULL DEFAULT '',
   "account_email" text NOT NULL DEFAULT '',
   "account_external" text NOT NULL DEFAULT '',
@@ -302,7 +302,7 @@ CREATE TABLE "chatpresence" (
   "cp_xchan" text NOT NULL DEFAULT '',
   "cp_last" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "cp_status" text NOT NULL,
-  "cp_client" char(128) NOT NULL DEFAULT '',
+  "cp_client" varchar(128) NOT NULL DEFAULT '',
   PRIMARY KEY ("cp_id")
 );
 create index "cp_room" on chatpresence ("cp_room");
@@ -364,13 +364,13 @@ create index "conv_updated_idx" on conv ("updated");
 CREATE TABLE IF NOT EXISTS "dreport" (
   "dreport_id" serial NOT NULL,
   "dreport_channel" int NOT NULL DEFAULT '0',
-  "dreport_mid" char(255) NOT NULL DEFAULT '',
-  "dreport_site" char(255) NOT NULL DEFAULT '',
-  "dreport_recip" char(255) NOT NULL DEFAULT '',
-  "dreport_result" char(255) NOT NULL DEFAULT '',
+  "dreport_mid" varchar(255) NOT NULL DEFAULT '',
+  "dreport_site" varchar(255) NOT NULL DEFAULT '',
+  "dreport_recip" varchar(255) NOT NULL DEFAULT '',
+  "dreport_result" varchar(255) NOT NULL DEFAULT '',
   "dreport_time" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "dreport_xchan" char(255) NOT NULL DEFAULT '',
-  "dreport_queue" char(255) NOT NULL DEFAULT '',
+  "dreport_xchan" varchar(255) NOT NULL DEFAULT '',
+  "dreport_queue" varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY ("dreport_id")
 );
 
@@ -403,7 +403,7 @@ CREATE TABLE "event" (
   "allow_gid" text NOT NULL,
   "deny_cid" text NOT NULL,
   "deny_gid" text NOT NULL,
-  "event_status" char(255) NOT NULL DEFAULT '',
+  "event_status" varchar(255) NOT NULL DEFAULT '',
   "event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "event_percent" smallint NOT NULL DEFAULT '0',
   "event_repeat" text NOT NULL,
@@ -685,13 +685,13 @@ create index "itemid_iid" on item_id ("iid");
 CREATE TABLE "likes" (
   "id" serial  NOT NULL,
   "channel_id" bigint  NOT NULL DEFAULT '0',
-  "liker" char(128) NOT NULL DEFAULT '',
-  "likee" char(128) NOT NULL DEFAULT '',
+  "liker" varchar(128) NOT NULL DEFAULT '',
+  "likee" varchar(128) NOT NULL DEFAULT '',
   "iid" bigint  NOT NULL DEFAULT '0',
-  "i_mid" char(255) NOT NULL DEFAULT '',
+  "i_mid" varchar(255) NOT NULL DEFAULT '',
   "verb" text NOT NULL DEFAULT '',
   "target_type" text NOT NULL DEFAULT '',
-  "target_id" char(128) NOT NULL DEFAULT '',
+  "target_id" varchar(128) NOT NULL DEFAULT '',
   "target" text NOT NULL,
   PRIMARY KEY ("id")
 );
@@ -712,7 +712,7 @@ CREATE TABLE "mail" (
   "to_xchan" text NOT NULL DEFAULT '',
   "account_id" bigint  NOT NULL DEFAULT '0',
   "channel_id" bigint  NOT NULL DEFAULT '0',
-  "mail_mimetype" char(64) NOT NULL DEFAULT '0',
+  "mail_mimetype" varchar(64) NOT NULL DEFAULT '0',
   "title" text NOT NULL,
   "body" text NOT NULL,
   "sig" text NOT NULL,
@@ -782,7 +782,7 @@ create index "mitem_menu_id" on menu_item ("mitem_menu_id");
 create index "mitem_flags" on menu_item ("mitem_flags");
 CREATE TABLE "notify" (
   "id" serial NOT NULL,
-  "hash" char(64) NOT NULL,
+  "hash" varchar(64) NOT NULL,
   "xname" text NOT NULL,
   "url" text NOT NULL,
   "photo" text NOT NULL,
@@ -809,14 +809,14 @@ create index "notify_otype" on notify ("otype");
 create index "notify_aid" on notify ("aid");
 CREATE TABLE "obj" (
   "obj_id" serial  NOT NULL,
-  "obj_page" char(64) NOT NULL DEFAULT '',
+  "obj_page" varchar(64) NOT NULL DEFAULT '',
   "obj_verb" text NOT NULL DEFAULT '',
   "obj_type" bigint  NOT NULL DEFAULT 0,
   "obj_obj" text NOT NULL DEFAULT '',
   "obj_channel" bigint  NOT NULL DEFAULT 0,
-  "obj_term" char(255) NOT NULL DEFAULT '',
-  "obj_url" char(255) NOT NULL DEFAULT '',
-  "obj_imgurl" char(255) NOT NULL DEFAULT '',
+  "obj_term" varchar(255) NOT NULL DEFAULT '',
+  "obj_url" varchar(255) NOT NULL DEFAULT '',
+  "obj_imgurl" varchar(255) NOT NULL DEFAULT '',
   "obj_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "obj_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "obj_quantity" bigint NOT NULL DEFAULT 0,
@@ -967,7 +967,7 @@ create index "profext_k" on profext ("k");
 
 CREATE TABLE "profile" (
   "id" serial NOT NULL,
-  "profile_guid" char(64) NOT NULL DEFAULT '',
+  "profile_guid" varchar(64) NOT NULL DEFAULT '',
   "aid" bigint  NOT NULL DEFAULT '0',
   "uid" bigint NOT NULL,
   "profile_name" text NOT NULL,
@@ -1177,7 +1177,7 @@ create index "tokens_uid" on tokens ("uid");
 
 CREATE TABLE "updates" (
   "ud_id" serial  NOT NULL,
-  "ud_hash" char(128) NOT NULL,
+  "ud_hash" varchar(128) NOT NULL,
   "ud_guid" text NOT NULL DEFAULT '',
   "ud_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   "ud_last" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
diff --git a/install/update.php b/install/update.php
index 65506a2f7..affdb6ffb 100644
--- a/install/update.php
+++ b/install/update.php
@@ -2475,7 +2475,7 @@ function update_r1184() {
 
 function update_r1185() {
 
-	$r1 = q("alter table app add app_plugin char(255) not null default '' ");
+	$r1 = q("alter table app add app_plugin text not null default '' ");
 
 	if($r1)
 		return UPDATE_SUCCESS;
@@ -2523,7 +2523,7 @@ function update_r1188() {
 
 function update_r1189() {
 
-	$r1 = q("alter table mail add mail_mimetype char(64) not null default 'text/bbcode' ");
+	$r1 = q("alter table mail add mail_mimetype varchar(64) not null default 'text/bbcode' ");
 	$r2 = q("alter table mail add mail_raw int(4) not null default '0' ");
 
 	if($r1 && $r2)

From 21103f8bc4d4a54211ba4edaefc1bce694a8fa05 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 16 May 2017 22:57:34 -0700
Subject: [PATCH 178/299] provide mechanism to arbitrarily sort the nav tray
 apps, currently the preferred order list needs to be manually created

---
 Zotlabs/Lib/Apps.php | 44 ++++++++++++++++++++++++++++++++++++++++++++
 include/nav.php      |  2 ++
 2 files changed, 46 insertions(+)

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 2ace361ca..102ed8bd1 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -539,6 +539,50 @@ class Apps {
 		return($r);
 	}
 
+	static public function app_order($uid,$apps) {
+
+		if(! $apps)
+			return $apps;
+
+		$x = (($uid) ? get_pconfig($uid,'system','app_order') : get_config('system','app_order'));
+		if(($x) && (! is_array($x))) {
+			$y = explode(',',$x);
+			$y = array_map('trim',$y);
+			$x = $y;
+		}
+
+		if(! (is_array($x) && ($x)))
+			return $apps;
+
+		$ret = [];
+		foreach($x as $xx) {
+			$y = self::find_app_in_array($xx,$apps);
+			if($y) {
+				$ret[] = $y;
+			}
+		}
+		foreach($apps as $ap) {
+			if(! self::find_app_in_array($ap['name'],$ret)) {
+				$ret[] = $ap;
+			}
+		}
+		return $ret;
+
+	}
+
+	static function find_app_in_array($name,$arr) {
+		if(! $arr)
+			return false;
+		foreach($arr as $x) {
+			if($x['name'] === $name) {
+					return $x;
+			}
+		}
+		return false;
+	}
+
+
+
 
 	static public function app_decode($s) {
 		$x = base64_decode(str_replace(array('<br />',"\r","\n",' '),array('','','',''),$s));
diff --git a/include/nav.php b/include/nav.php
index 849e19d9a..0fd555abf 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -257,6 +257,8 @@ EOT;
 
 	usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
 
+	$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
+
 	foreach($syslist as $app) {
 		$nav_apps[] = Zlib\Apps::app_render($app,'nav');
 	}

From e4448423fbcee4e685b410a62844a245601d2e0b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 21 May 2017 22:23:36 -0700
Subject: [PATCH 179/299] apporder module and all the associated backend stuff
 to make it work; probably needs a bit of UI cleanup and a link to it from
 somewhere

---
 Zotlabs/Lib/Apps.php        | 87 ++++++++++++++++++++++++++++++++++++-
 Zotlabs/Module/Appman.php   | 14 ++++++
 Zotlabs/Module/Apporder.php | 40 +++++++++++++++++
 view/tpl/app.tpl            |  7 ++-
 view/tpl/apporder.tpl       |  7 +++
 5 files changed, 153 insertions(+), 2 deletions(-)
 create mode 100644 Zotlabs/Module/Apporder.php
 create mode 100644 view/tpl/apporder.tpl

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 102ed8bd1..a655f47b0 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -370,7 +370,8 @@ class Apps {
 			'$deleted' => $papp['deleted'],
 			'$feature' => (($papp['embed']) ? false : true),
 			'$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
-			'$navapps' => (($mode == 'nav') ? true : false),
+			'$navapps' => (($mode == 'nav' || $mode='nav-order') ? true : false),
+			'$order' => (($mode='nav-order') ? true : false),
 			'$add' => t('Add to app-tray'),
 			'$remove' => t('Remove from app-tray')
 		));
@@ -581,6 +582,90 @@ class Apps {
 		return false;
 	}
 
+	static function moveup($uid,$guid) {
+		$syslist = array();
+		$list = self::app_list($uid, false, 'nav_featured_app');
+		if($list) {
+			foreach($list as $li) {
+				$syslist[] = self::app_encode($li);
+			}
+		}
+		self::translate_system_apps($syslist);
+
+		usort($syslist,'self::app_name_compare');
+
+		$syslist = self::app_order($uid,$syslist);
+
+		if(! $syslist)
+			return;
+
+		$newlist = [];
+
+		foreach($syslist as $k => $li) {
+			if($li['guid'] === $guid) {
+				$position = $k;
+				break;
+			}
+		}
+		if(! $position)
+			return;
+		$dest_position = $position - 1;
+		$saved = $syslist[$dest_position];
+		$syslist[$dest_position] = $syslist[$position];
+		$syslist[$position] = $saved;
+
+		$narr = [];
+		foreach($syslist as $x) {
+			$narr[] = $x['name'];
+		}
+
+		set_pconfig($uid,'system','app_order',implode(',',$narr));
+
+	}
+
+	static function movedown($uid,$guid) {
+		$syslist = array();
+		$list = self::app_list($uid, false, 'nav_featured_app');
+		if($list) {
+			foreach($list as $li) {
+				$syslist[] = self::app_encode($li);
+			}
+		}
+		self::translate_system_apps($syslist);
+
+		usort($syslist,'self::app_name_compare');
+
+		$syslist = self::app_order($uid,$syslist);
+
+		if(! $syslist)
+			return;
+
+		$newlist = [];
+
+		foreach($syslist as $k => $li) {
+			if($li['guid'] === $guid) {
+				$position = $k;
+				break;
+			}
+		}
+		if($position >= count($syslist) - 1)
+			return;
+		$dest_position = $position + 1;
+		$saved = $syslist[$dest_position];
+		$syslist[$dest_position] = $syslist[$position];
+		$syslist[$position] = $saved;
+
+		$narr = [];
+		foreach($syslist as $x) {
+			$narr[] = $x['name'];
+		}
+
+		set_pconfig($uid,'system','app_order',implode(',',$narr));
+
+	}
+
+
+
 
 
 
diff --git a/Zotlabs/Module/Appman.php b/Zotlabs/Module/Appman.php
index 70cc7e44b..5c0667357 100644
--- a/Zotlabs/Module/Appman.php
+++ b/Zotlabs/Module/Appman.php
@@ -84,6 +84,20 @@ class Appman extends \Zotlabs\Web\Controller {
 		}
 
 		$channel = \App::get_channel();
+
+		if(argc() > 2) {
+			if(argv(2) === 'moveup') {
+				Zlib\Apps::moveup(local_channel(),argv(1));
+			}
+			if(argv(2) === 'movedown') {
+				Zlib\Apps::movedown(local_channel(),argv(1));
+			}
+			goaway(z_root() . '/apporder');
+		}
+
+
+
+
 		$app = null;
 		$embed = null;
 		if($_REQUEST['appid']) {
diff --git a/Zotlabs/Module/Apporder.php b/Zotlabs/Module/Apporder.php
new file mode 100644
index 000000000..1097a01eb
--- /dev/null
+++ b/Zotlabs/Module/Apporder.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Zotlabs\Module;
+
+use \Zotlabs\Lib as Zlib;
+
+class Apporder extends \Zotlabs\Web\Controller {
+
+	function post() {
+
+	}
+
+	function get() {
+       $syslist = array();
+        $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
+        if($list) {
+            foreach($list as $li) {
+                $syslist[] = Zlib\Apps::app_encode($li);
+            }
+        }
+        Zlib\Apps::translate_system_apps($syslist);
+
+	    usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
+
+    	$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
+
+	    foreach($syslist as $app) {
+    	    $nav_apps[] = Zlib\Apps::app_render($app,'nav-order');
+
+		}
+
+	return replace_macros(get_markup_template('apporder.tpl'),
+		[
+			'$header' => t('Change Order of Navigation Apps'),
+			'$desc' => t('Use arrows to move the corresponding app up or down in the display list'),
+			'$nav_apps' => $nav_apps
+		]
+	);
+	}
+}
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 28f28611e..f45510a58 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -25,6 +25,11 @@
 	{{/if}}
 </div>
 {{else}}
+{{if $order}}
+<a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
+{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
+{{else}}
 <a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
 {{/if}}
-
+{{/if}}
diff --git a/view/tpl/apporder.tpl b/view/tpl/apporder.tpl
new file mode 100644
index 000000000..fdb726131
--- /dev/null
+++ b/view/tpl/apporder.tpl
@@ -0,0 +1,7 @@
+<h2>{{$header}}</h2>
+
+<div class="descriptive-text">{{$desc}}</div>
+<br><br><br>
+{{foreach $nav_apps as $nav_app}}
+{{$nav_app}}
+{{/foreach}}

From 07ee4984cbdb3fa59441792a23c1cf3fc4151936 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 21 May 2017 22:42:22 -0700
Subject: [PATCH 180/299] some issues with the app order template logic

---
 Zotlabs/Lib/Apps.php |  4 ++--
 view/tpl/app.tpl     | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index a655f47b0..ed18ff3cb 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -370,8 +370,8 @@ class Apps {
 			'$deleted' => $papp['deleted'],
 			'$feature' => (($papp['embed']) ? false : true),
 			'$featured' => ((strpos($papp['categories'], 'nav_featured_app') === false) ? false : true),
-			'$navapps' => (($mode == 'nav' || $mode='nav-order') ? true : false),
-			'$order' => (($mode='nav-order') ? true : false),
+			'$navapps' => (($mode == 'nav') ? true : false),
+			'$order' => (($mode == 'nav-order') ? true : false),
 			'$add' => t('Add to app-tray'),
 			'$remove' => t('Remove from app-tray')
 		));
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index f45510a58..0c8ba7459 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -1,4 +1,4 @@
-{{if !$navapps}}
+{{if ! ($navapps || $order)}}
 <div class="app-container">
 	<div class="app-detail{{if $deleted}} app-deleted{{/if}}">
 		<a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
@@ -24,12 +24,13 @@
 	{{/if}}
 	{{/if}}
 </div>
-{{else}}
+{{/if}}
+{{if $navapps}}
+<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
+{{/if}}
 {{if $order}}
 <a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
 <a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
 {{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
-{{else}}
-<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
-{{/if}}
 {{/if}}
+

From 36a960adec9f216463890640340324d6d37a65d0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 22 May 2017 00:57:56 -0700
Subject: [PATCH 181/299] schema fixes

---
 Zotlabs/Module/Like.php  | 4 ++++
 install/schema_mysql.sql | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index 5ce8ec7f0..71336e8f3 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -373,6 +373,10 @@ class Like extends \Zotlabs\Web\Controller {
 	
 			$links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink']));
 			$objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); 
+
+			if($objtype === ACTIVITY_OBJ_NOTE && (! intval($item['item_thread_top'])))
+				$objtype = ACTIVITY_OBJ_COMMENT;
+
 	
 			$body = $item['body'];
 	
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 72e028764..41ed62958 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -2,9 +2,9 @@
 CREATE TABLE IF NOT EXISTS `abconfig` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `chan` int(10) unsigned NOT NULL DEFAULT '0',
-  `xchan` char(255) NOT NULL DEFAULT '',
-  `cat` char(255) NOT NULL DEFAULT '',
-  `k` char(255) NOT NULL DEFAULT '',
+  `xchan` char(191) NOT NULL DEFAULT '',
+  `cat` char(191) NOT NULL DEFAULT '',
+  `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
   PRIMARY KEY (`id`),
   KEY `chan` (`chan`),

From 7ae0317b6a2bed323492ef987ddbaaf4f2a1a9b9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 22 May 2017 17:07:34 -0700
Subject: [PATCH 182/299] apporder style improvement and add to nav menu, also
 add language awareness to webpages

---
 Zotlabs/Module/Editwebpage.php |  2 +-
 Zotlabs/Module/Page.php        | 59 +++++++++++++++++++++++++++-------
 Zotlabs/Module/Webpages.php    |  4 +--
 include/nav.php                |  1 +
 view/tpl/app.tpl               |  4 +--
 view/tpl/nav.tpl               |  2 ++
 6 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
index db33cd1db..3effe7ff5 100644
--- a/Zotlabs/Module/Editwebpage.php
+++ b/Zotlabs/Module/Editwebpage.php
@@ -112,7 +112,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 			intval($itm[0]['id'])
 		);
 		if($item_id)
-			$page_title = $item_id[0]['v'];
+			$page_title = str_replace('%2f','/',$item_id[0]['v']);
 
 		$mimetype = $itm[0]['mimetype'];
 
diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php
index 6ef285dd0..7bc90c091 100644
--- a/Zotlabs/Module/Page.php
+++ b/Zotlabs/Module/Page.php
@@ -43,11 +43,31 @@ class Page extends \Zotlabs\Web\Controller {
 	
 		$channel_address = argv(1);
 	
+		// Always look first for the page name prefixed by the observer language; for instance page/nickname/de/foo
+		// followed by page/nickname/foo if that is not found.
+		// If your browser language is de and you want to access the default in this case, 
+		// use page/nickname/-/foo to over-ride the language and access only the page with pagelink of 'foo'
+
+		$page_name = '';
+		$ignore_language = false;
+
+		for($x = 2; $x < argc(); $x ++) {
+			if($page_name === '' && argv($x) === '-') {
+				$ignore_language = true;
+				continue;
+			}
+			if($page_name)
+				$page_name .= '/';
+			$page_name .= argv($x);
+		}
+
+
 		// The page link title was stored in a urlencoded format
 		// php or the browser may/will have decoded it, so re-encode it for our search
 	
-		$page_id = urlencode(argv(2));
-	
+		$page_id = urlencode($page_name);
+		$lang_page_id = urlencode(\App::$language . '/' . $page_name);
+
 		$u = q("select channel_id from channel where channel_address = '%s' limit 1",
 			dbesc($channel_address)
 		);
@@ -64,16 +84,31 @@ class Page extends \Zotlabs\Web\Controller {
 	
 		require_once('include/security.php');
 		$sql_options = item_permissions_sql($u[0]['channel_id']);
-	
-		$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
-			where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 
-			and (( iconfig.k = 'WEBPAGE' and item_type = %d ) 
-			OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
-			intval($u[0]['channel_id']),
-			dbesc($page_id),
-			intval(ITEM_TYPE_WEBPAGE),
-			intval(ITEM_TYPE_PDL)
-		);
+
+		$r = null;	
+
+		if(! $ignore_language) {
+			$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 
+				and (( iconfig.k = 'WEBPAGE' and item_type = %d ) 
+				OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
+				intval($u[0]['channel_id']),
+				dbesc($lang_page_id),
+				intval(ITEM_TYPE_WEBPAGE),
+				intval(ITEM_TYPE_PDL)
+			);
+		}
+		if(! $r) {
+			$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 
+				and (( iconfig.k = 'WEBPAGE' and item_type = %d ) 
+				OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
+				intval($u[0]['channel_id']),
+				dbesc($page_id),
+				intval(ITEM_TYPE_WEBPAGE),
+				intval(ITEM_TYPE_PDL)
+			);
+		}
 		if(! $r) {
 	
 			// Check again with no permissions clause to see if it is a permissions issue
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index effe92614..be697ba2c 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -218,13 +218,13 @@ class Webpages extends \Zotlabs\Web\Controller {
 					'created'	=> $rr['created'],
 					'edited'	=> $rr['edited'],
 					'mimetype'	=> $rr['mimetype'],
-					'pagetitle'	=> $rr['v'],
+					'pagetitle'	=> str_replace('%2f','/',$rr['v']),
 					'mid'		=> $rr['mid'],
 					'layout_mid'    => $rr['layout_mid']
 				);
 				$pages[$rr['iid']][] = array(
 					'url'		=> $rr['iid'],
-					'pagetitle'	=> $rr['v'],
+					'pagetitle'	=> str_replace('%2f','/',$rr['v']),
 					'title'		=> $rr['title'],
 					'created'	=> datetime_convert('UTC',date_default_timezone_get(),$rr['created']),
 					'edited'	=> datetime_convert('UTC',date_default_timezone_get(),$rr['edited']),
diff --git a/include/nav.php b/include/nav.php
index 0fd555abf..91bade5a7 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -281,6 +281,7 @@ EOT;
 		'$nav_apps' => $nav_apps,
 		'$channel_apps' => $channel_apps,
 		'$addapps' => t('Add Apps'),
+		'$orderapps' => t('Arrange Apps'),
 		'$sysapps_toggle' => t('Toggle System Apps')
 	));
 
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 0c8ba7459..804db426f 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -29,8 +29,8 @@
 <a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
 {{/if}}
 {{if $order}}
-<a href="{{$hosturl}}appman/{{$app.guid}}/moveup"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
-<a href="{{$hosturl}}appman/{{$app.guid}}/movedown"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/moveup" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/movedown" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
 {{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}<br>
 {{/if}}
 
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 5c301b4d2..39fe686a9 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -207,6 +207,7 @@
 				{{if $localuser}}
 				<div class="dropdown-divider"></div>
 				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 				{{/if}}
 			</div>
 		</li>
@@ -232,6 +233,7 @@
 		{{if $localuser}}
 		<div class="dropdown-divider"></div>
 		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
 		{{/if}}
 	</div>
 </div>

From 53057830e0388e0888cca925a99aa62cda0168cf Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 22 May 2017 20:18:47 -0700
Subject: [PATCH 183/299] wiki auto language select to match webpages
 implementation

---
 Zotlabs/Lib/NativeWikiPage.php |  2 +-
 Zotlabs/Module/Wiki.php        | 32 +++++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index ed3df436c..78b54ebda 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -44,7 +44,7 @@ class NativeWikiPage {
 					$pages[] = [
 						'resource_id' => $resource_id,
 						'title'       => escape_tags($title),
-						'url'         => urlencode(urlencode($title)),
+						'url'         => str_replace('%2F','/',urlencode(str_replace('%2F','/',urlencode($title)))),
 						'link_id'     => 'id_' . substr($resource_id, 0, 10) . '_' . $page_item['id']
 					];
 				}
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index d577226dc..5a93046e3 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -192,12 +192,28 @@ class Wiki extends \Zotlabs\Web\Controller {
 				goaway(z_root() . '/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/Home');
 
 			case 4:
+			default:
 
 				// GET /wiki/channel/wiki/page
 				// Fetch the wiki info and determine observer permissions
 
 				$wikiUrlName = urldecode(argv(2));
-				$pageUrlName = urldecode(argv(3));
+
+				$page_name = '';
+				$ignore_language = false;
+
+				for($x = 3; $x < argc(); $x ++) {
+					if($page_name === '' && argv($x) === '-') {
+						$ignore_language = true;
+						continue;
+					}
+					if($page_name)
+						$page_name .= '/';
+            		$page_name .= argv($x);
+				}
+
+				$pageUrlName = urldecode($page_name);
+				$langPageUrlName = urldecode(\App::$language . '/' . $page_name);
 
 				$w = Zlib\NativeWiki::exists_by_name($owner['channel_id'], $wikiUrlName);
 
@@ -227,9 +243,15 @@ class Wiki extends \Zotlabs\Web\Controller {
 				$wikiheaderPage = urldecode($pageUrlName);
 
 				$renamePage = (($wikiheaderPage === 'Home') ? '' : t('Rename page'));
+				$p = [];
 
-				$p = Zlib\NativeWikiPage::get_page_content(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
-				if(! $p['success']) {
+				if(! $ignore_language) {
+					$p = Zlib\NativeWikiPage::get_page_content(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $langPageUrlName));
+				}
+				if(! ($p && $p['success'])) {
+					$p = Zlib\NativeWikiPage::get_page_content(array('channel_id' => $owner['channel_id'], 'observer_hash' => $observer_hash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
+				}
+				if(! ($p && $p['success'])) {
 					notice( t('Error retrieving page content') . EOL);
 					goaway(z_root() . '/' . argv(0) . '/' . argv(1) );
 				}
@@ -251,8 +273,8 @@ class Wiki extends \Zotlabs\Web\Controller {
 				}
 				$showPageControls = $wiki_editor;
 				break;
-			default:	// Strip the extraneous URL components
-				goaway('/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName);
+//			default:	// Strip the extraneous URL components
+//				goaway('/' . argv(0) . '/' . argv(1) . '/' . $wikiUrlName . '/' . $pageUrlName);
 		}
 		
 

From 357e7af6adb303aa12f6506585e7d59a1250da99 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 23 May 2017 01:18:34 -0700
Subject: [PATCH 184/299] add 'apps' app

---
 Zotlabs/Lib/Apps.php | 1 +
 app/apps.apd         | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 app/apps.apd

diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 06ec7c39d..df5fb4aec 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -209,6 +209,7 @@ class Apps {
 
 	static public function translate_system_apps(&$arr) {
 		$apps = array(
+			'Apps' => t('Apps'),
 			'Site Admin' => t('Site Admin'),
 			'Report Bug' => t('Report Bug'),
 			'View Bookmarks' => t('View Bookmarks'),
diff --git a/app/apps.apd b/app/apps.apd
new file mode 100644
index 000000000..c063f8f19
--- /dev/null
+++ b/app/apps.apd
@@ -0,0 +1,5 @@
+version: 2
+url: $baseurl/apps
+name: Apps
+photo: icon:bars
+categories: System

From 3a00140797fa0d557db2434402ce20258b4ce570 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 23 May 2017 21:20:40 -0700
Subject: [PATCH 185/299] remove php version checks for older ( < 5.4) code
 incompatibilities

---
 Zotlabs/Module/Admin.php   |  6 ------
 include/dba/dba_driver.php |  7 ++-----
 include/text.php           | 32 +++++++++++++-------------------
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 536d85dde..65ce363c0 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -120,12 +120,6 @@ class Admin extends \Zotlabs\Web\Controller {
 
 		// Could be extended to provide also other alerts to the admin
 		$alertmsg = '';
-		// annoy admin about upcoming unsupported PHP version
-		if (version_compare(PHP_VERSION, '5.4', '<')) {
-			$alertmsg = 'Your PHP version ' . PHP_VERSION . ' will not be supported with the next major release of $Projectname. You are strongly urged to upgrade to a current version.'
-				. '<br>PHP 5.3 has reached its <a href="http://php.net/eol.php" class="alert-link">End of Life (EOL)</a> in August 2014.'
-				. ' A list about current PHP versions can be found <a href="http://php.net/supported-versions.php" class="alert-link">here</a>.';
-		}
 
 		$vmaster = get_repository_version('master');
 		$vdev = get_repository_version('dev');
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index d362f58b2..b0ad7936c 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -344,11 +344,8 @@ function q($sql) {
 	if(\DBA::$dba && \DBA::$dba->connected) {
 		$stmt = vsprintf($sql, $args);
 		if($stmt === false) {
-			if(version_compare(PHP_VERSION, '5.4.0') >= 0)
-				db_logger('dba: vsprintf error: ' .
-					print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1), true),LOGGER_NORMAL,LOG_CRIT);
-			else
-				db_logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true),LOGGER_NORMAL,LOG_CRIT);
+			db_logger('dba: vsprintf error: ' .
+				print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 1), true),LOGGER_NORMAL,LOG_CRIT);
 		}
 		if(\DBA::$dba->debug)
 			db_logger('Sql: ' . $stmt, LOGGER_DEBUG, LOG_INFO);
diff --git a/include/text.php b/include/text.php
index b17564b9f..2e77dca84 100644
--- a/include/text.php
+++ b/include/text.php
@@ -648,12 +648,8 @@ function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
 
 	$where = '';
 
-	// We require > 5.4 but leave the version check so that install issues (including version) can be logged
-
-	if(version_compare(PHP_VERSION, '5.4.0') >= 0) {
-		$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-		$where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': ';
-	}
+	$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+	$where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': ';
 
 	$s = datetime_convert() . ':' . log_priority_str($priority) . ':' . session_id() . ':' . $where . $msg . PHP_EOL;
 	$pluginfo = array('filename' => $logfile, 'loglevel' => $level, 'message' => $s,'priority' => $priority, 'logged' => false);
@@ -687,16 +683,14 @@ function btlogger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
 		@file_put_contents(BTLOGGER_DEBUG_FILE, $s, FILE_APPEND);
 	}
 
-	if(version_compare(PHP_VERSION, '5.4.0') >= 0) {
-		$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		if($stack) {
-			for($x = 1; $x < count($stack); $x ++) {
-				$s = 'stack: ' . basename($stack[$x]['file']) . ':' . $stack[$x]['line'] . ':' . $stack[$x]['function'] . '()';
-				logger($s,$level, $priority);
+	$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+	if($stack) {
+		for($x = 1; $x < count($stack); $x ++) {
+			$s = 'stack: ' . basename($stack[$x]['file']) . ':' . $stack[$x]['line'] . ':' . $stack[$x]['function'] . '()';
+			logger($s,$level, $priority);
 
-				if(file_exists(BTLOGGER_DEBUG_FILE) && is_writable(BTLOGGER_DEBUG_FILE)) {
-					@file_put_contents(BTLOGGER_DEBUG_FILE, $s . PHP_EOL, FILE_APPEND);
-				}
+			if(file_exists(BTLOGGER_DEBUG_FILE) && is_writable(BTLOGGER_DEBUG_FILE)) {
+				@file_put_contents(BTLOGGER_DEBUG_FILE, $s . PHP_EOL, FILE_APPEND);
 			}
 		}
 	}
@@ -751,10 +745,10 @@ function dlogger($msg, $level = 0) {
 		return;
 
 	$where = '';
-	if(version_compare(PHP_VERSION, '5.4.0') >= 0) {
-		$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-		$where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': ';
-	}
+
+	$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+	$where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': ';
+
 
 	@file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $where . $msg . PHP_EOL, FILE_APPEND);
 }

From df8c69f73b54d33ba2bec7d227f6e6f948f4b451 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 24 May 2017 22:24:45 -0700
Subject: [PATCH 186/299] some minor help cleanup - add '-/foo' override of
 language detection

---
 Zotlabs/Module/Help.php | 74 ++++++++++++++++++++---------------------
 include/help.php        | 13 +++++---
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php
index e247416d9..0373a4aab 100644
--- a/Zotlabs/Module/Help.php
+++ b/Zotlabs/Module/Help.php
@@ -44,42 +44,42 @@ class Help extends \Zotlabs\Web\Controller {
 
 			return $o;
 		}
-                
-                
-                if(argc() > 2 && argv(argc()-2) === 'assets') {
-                        $path = '';
-                        for($x = 1; $x < argc(); $x ++) {
-                                if(strlen($path))
-                                        $path .= '/';
-                                $path .= argv($x);
-                        }
-                        $realpath = 'doc/' . $path;
-                         //Set the content-type header as appropriate
-                        $imageInfo = getimagesize($realpath);
-                        switch ($imageInfo[2]) {
-                            case IMAGETYPE_JPEG:
-                                header("Content-Type: image/jpeg");
-                                break;
-                            case IMAGETYPE_GIF:
-                                header("Content-Type: image/gif");
-                                break;
-                            case IMAGETYPE_PNG:
-                                header("Content-Type: image/png");
-                                break;
-                           default:
-                                break;
-                        }
-                        header("Content-Length: " . filesize($realpath));
+				
+				
+		if(argc() > 2 && argv(argc()-2) === 'assets') {
+			$path = '';
+			for($x = 1; $x < argc(); $x ++) {
+				if(strlen($path))
+					$path .= '/';
+				$path .= argv($x);
+			}
+			$realpath = 'doc/' . $path;
+			 //Set the content-type header as appropriate
+			$imageInfo = getimagesize($realpath);
+			switch ($imageInfo[2]) {
+				case IMAGETYPE_JPEG:
+					header("Content-Type: image/jpeg");
+					break;
+				case IMAGETYPE_GIF:
+					header("Content-Type: image/gif");
+					break;
+				case IMAGETYPE_PNG:
+					header("Content-Type: image/png");
+					break;
+			   default:
+					break;
+			}
+			header("Content-Length: " . filesize($realpath));
 
-                        // dump the picture and stop the script
-                        readfile($realpath);
-                        killme();
-                }
+			// dump the picture and stop the script
+			readfile($realpath);
+			killme();
+		}
 
 		$headings = [
-			'about' => t('About'),
-			'member' => t('Members'),
-			'admin' => t('Administrators'),
+			'about'     => t('About'),
+			'member'    => t('Members'),
+			'admin'     => t('Administrators'),
 			'developer' => t('Developers'),
 			'tutorials' => t('Tutorials')
 		];
@@ -87,13 +87,13 @@ class Help extends \Zotlabs\Web\Controller {
 		if(array_key_exists(argv(1), $headings))
 			$heading = $headings[argv(1)];
 
-                $content =  get_help_content();
+		$content =  get_help_content();
 
 		return replace_macros(get_markup_template('help.tpl'), array(
-			'$title' => t('$Projectname Documentation'),
+			'$title'      => t('$Projectname Documentation'),
 			'$tocHeading' => t('Contents'),
-			'$content' => $content,
-			'$heading' => $heading
+			'$content'    => $content,
+			'$heading'    => $heading
 		));
 	}
 
diff --git a/include/help.php b/include/help.php
index ab31e9400..4f9251b1b 100644
--- a/include/help.php
+++ b/include/help.php
@@ -116,9 +116,11 @@ function load_doc_file($s) {
 	$b = basename($s);
 	$d = dirname($s);
 
-	$c = find_doc_file("$d/$lang/$b");
-	if($c)
-		return $c;
+	if($dirname !== '-') {
+		$c = find_doc_file("$d/$lang/$b");
+		if($c)
+			return $c;
+	}
 	$c = find_doc_file($s);
 	if($c)
 		return $c;
@@ -140,8 +142,8 @@ function find_doc_file($s) {
  */
 function search_doc_files($s) {
 
-	$itemspage = get_pconfig(local_channel(),'system','itemspage');
-	\App::set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
+
+	\App::set_pager_itemspage(60);
 	$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']), intval(\App::$pager['start']));
 
 	$regexop = db_getfunc('REGEXP');
@@ -198,6 +200,7 @@ function doc_rank_sort($s1, $s2) {
  *
  * @return string
  */
+
 function load_context_help() {
 
 	$path = App::$cmd;

From fd357f87be5bbdbe135173305cdc9ba550a34e21 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 24 May 2017 22:34:52 -0700
Subject: [PATCH 187/299] only store search info for text filetypes when
 updating the documentation indexes

---
 Zotlabs/Daemon/Importdoc.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Daemon/Importdoc.php b/Zotlabs/Daemon/Importdoc.php
index 3109a5d86..0ca589e4a 100755
--- a/Zotlabs/Daemon/Importdoc.php
+++ b/Zotlabs/Daemon/Importdoc.php
@@ -21,12 +21,18 @@ class Importdoc {
 		$files = glob("$d/$f");
 		if($files) {
 			foreach($files as $fi) {
-				if($fi === 'doc/html')
+				if($fi === 'doc/html') {
 					continue;
-				if(is_dir($fi))
+				}
+				if(is_dir($fi)) {
 					self::update_docs_dir("$fi/*");
-				else
-					store_doc_file($fi);
+				}
+				else {
+					// don't update media content
+					if(strpos(z_mime_content_type($fi),'text') === 0) {
+						store_doc_file($fi);
+					}
+				}
 			}
 		}
 	}

From b4da2d35bf8084da812be0716917a0f88cf68f91 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 25 May 2017 13:37:13 -0700
Subject: [PATCH 188/299] start using the abook_not_here flag (requires changes
 in addons, not easily portable to hubzilla)

---
 Zotlabs/Module/Import.php |  4 ++++
 include/follow.php        | 10 +++++-----
 include/zot.php           |  5 +++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index ce3fd469a..a2f83e1cb 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -333,6 +333,10 @@ class Import extends \Zotlabs\Web\Controller {
 					$abook['abook_feed']        = (($abook['abook_flags'] & 0x0100 ) ? 1 : 0);
 				}
 
+				if(array_key_exists('abook_instance',$abook) && $abook['abook_instance'] && strpos($abook['abook_instance'],z_root()) === false) {
+					$abook['abook_not_here'] = 1;
+				} 
+
 				if($abook['abook_self']) {
 					$role = get_pconfig($channel['channel_id'],'system','permissions_role');
 					if(($role === 'forum') || ($abook['abook_my_perms'] & PERMS_W_TAGWALL)) {
diff --git a/include/follow.php b/include/follow.php
index 0d7c16aa3..2c2f5e209 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -226,12 +226,12 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 			if($abook_instance)
 				$abook_instance .= ',';
 			$abook_instance .= z_root();
-		}
 
-		$x = q("update abook set abook_instance = '%s' where abook_id = %d",
-			dbesc($abook_instance),
-			intval($r[0]['abook_id'])
-		);
+			$x = q("update abook set abook_instance = '%s', abook_not_here = 0 where abook_id = %d",
+				dbesc($abook_instance),
+				intval($r[0]['abook_id'])
+			);
+		}
 
 		if(intval($r[0]['abook_pending'])) {
 			$x = q("update abook set abook_pending = 0 where abook_id = %d",
diff --git a/include/zot.php b/include/zot.php
index 748fe7b99..d2088f272 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3289,6 +3289,11 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 				if(! array_key_exists('abook_xchan',$clean))
 					continue;
 
+				if(array_key_exists('abook_instance',$clean) && $clean['abook_instance'] && strpos($clean['abook_instance'],z_root()) === false) {
+					$clean['abook_not_here'] = 1;
+				} 
+
+
 				$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
 					dbesc($clean['abook_xchan']),
 					intval($channel['channel_id'])

From 57edfa7ae80c91d6d73cf009dd02931e4d21f4aa Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 25 May 2017 22:10:01 -0700
Subject: [PATCH 189/299] put back obsolete permission fields in abook and
 channel schema files so we can restore the old data without choking when
 upgrading the table type

---
 install/schema_mysql.sql | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index ec70aa33b..183fcd56d 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -18,6 +18,8 @@ CREATE TABLE IF NOT EXISTS `abook` (
   `abook_account` int(10) unsigned NOT NULL DEFAULT '0',
   `abook_channel` int(10) unsigned NOT NULL DEFAULT '0',
   `abook_xchan` char(191) NOT NULL DEFAULT '',
+  `abook_my_perms` int(11) NOT NULL DEFAULT '0',
+  `abook_their_perms` int(11) NOT NULL DEFAULT '0',
   `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99',
   `abook_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `abook_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -264,6 +266,24 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_allow_gid` mediumtext NOT NULL,
   `channel_deny_cid` mediumtext NOT NULL,
   `channel_deny_gid` mediumtext NOT NULL,
+  `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_w_like` int(10) unsigned NOT NULL DEFAULT '0',
   `channel_removed` tinyint(1) NOT NULL DEFAULT '0',
   `channel_system` tinyint(1) NOT NULL DEFAULT '0',
   `channel_moved` char(191) NOT NULL DEFAULT '',

From 583a047e83dd4fe353d996308f86f16ca0c884e8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 25 May 2017 22:50:16 -0700
Subject: [PATCH 190/299] looks like a commit was lost someplace, but I'll
 re-do it later (convert sql schema files to default integers to int values);
 in any event change all the mysql strings that were 255 maxlength to 191
 maxlength in case they get used as indexes down the line

---
 install/schema_mysql.sql | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 183fcd56d..27ee4dda3 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS `abook` (
   `abook_self` tinyint(4) NOT NULL DEFAULT '0',
   `abook_feed` tinyint(4) NOT NULL DEFAULT '0',
   `abook_not_here` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_profile` char(64) NOT NULL DEFAULT '',
+  `abook_profile` char(191) NOT NULL DEFAULT '',
   `abook_incl` TEXT NOT NULL DEFAULT '',
   `abook_excl` TEXT NOT NULL DEFAULT '',
   `abook_instance` TEXT NOT NULL DEFAULT '',
@@ -66,7 +66,7 @@ CREATE TABLE IF NOT EXISTS `account` (
   `account_parent` int(10) unsigned NOT NULL DEFAULT '0',
   `account_default_channel` int(10) unsigned NOT NULL DEFAULT '0',
   `account_salt` char(32) NOT NULL DEFAULT '',
-  `account_password` char(255) NOT NULL DEFAULT '',
+  `account_password` char(191) NOT NULL DEFAULT '',
   `account_email` char(191) NOT NULL DEFAULT '',
   `account_external` char(191) NOT NULL DEFAULT '',
   `account_language` char(16) NOT NULL DEFAULT 'en',
@@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS `account` (
   `account_lastlog` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `account_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `account_roles` int(10) unsigned NOT NULL DEFAULT '0',
-  `account_reset` char(255) NOT NULL DEFAULT '',
+  `account_reset` char(191) NOT NULL DEFAULT '',
   `account_expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `account_expire_notified` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `account_service_class` char(32) NOT NULL DEFAULT '',
@@ -97,7 +97,7 @@ CREATE TABLE IF NOT EXISTS `account` (
 CREATE TABLE IF NOT EXISTS `addon` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `aname` char(191) NOT NULL DEFAULT '',
-  `version` char(255) NOT NULL DEFAULT '',
+  `version` char(191) NOT NULL DEFAULT '',
   `installed` tinyint(1) NOT NULL DEFAULT '0',
   `hidden` tinyint(1) NOT NULL DEFAULT '0',
   `tstamp` bigint(20) NOT NULL DEFAULT '0',
@@ -111,18 +111,18 @@ CREATE TABLE IF NOT EXISTS `addon` (
 CREATE TABLE IF NOT EXISTS `app` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `app_id` char(191) NOT NULL DEFAULT '',
-  `app_sig` char(255) NOT NULL DEFAULT '',
-  `app_author` char(255) NOT NULL DEFAULT '',
+  `app_sig` char(191) NOT NULL DEFAULT '',
+  `app_author` char(191) NOT NULL DEFAULT '',
   `app_name` char(191) NOT NULL DEFAULT '',
   `app_desc` text NOT NULL DEFAULT '',
   `app_url` char(191) NOT NULL DEFAULT '',
   `app_photo` char(191) NOT NULL DEFAULT '',
   `app_version` char(191) NOT NULL DEFAULT '',
   `app_channel` int(11) NOT NULL DEFAULT '0',
-  `app_addr` char(255) NOT NULL DEFAULT '',
+  `app_addr` char(191) NOT NULL DEFAULT '',
   `app_price` char(191) NOT NULL DEFAULT '',
-  `app_page` char(255) NOT NULL DEFAULT '',
-  `app_requires` char(255) NOT NULL DEFAULT '',
+  `app_page` char(191) NOT NULL DEFAULT '',
+  `app_requires` char(191) NOT NULL DEFAULT '',
   `app_deleted` int(11) NOT NULL DEFAULT '0',
   `app_system` int(11) NOT NULL DEFAULT '0',
   `app_plugin` char(191) NOT NULL DEFAULT '',
@@ -223,11 +223,11 @@ CREATE TABLE IF NOT EXISTS `cal` (
   `cal_uid` int(10) unsigned NOT NULL DEFAULT '0',
   `cal_hash` varchar(191) NOT NULL DEFAULT '',
   `cal_name` varchar(191) NOT NULL DEFAULT '',
-  `uri` varchar(255) NOT NULL DEFAULT '',
-  `logname` varchar(255) NOT NULL DEFAULT '',
-  `pass` varchar(255) NOT NULL DEFAULT '',
-  `ctag` varchar(255) NOT NULL DEFAULT '',
-  `synctoken` varchar(255) NOT NULL DEFAULT '',
+  `uri` varchar(191) NOT NULL DEFAULT '',
+  `logname` varchar(191) NOT NULL DEFAULT '',
+  `pass` varchar(191) NOT NULL DEFAULT '',
+  `ctag` varchar(191) NOT NULL DEFAULT '',
+  `synctoken` varchar(191) NOT NULL DEFAULT '',
   `cal_types` varchar(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`cal_id`),
   KEY `cal_aid` (`cal_aid`),
@@ -249,7 +249,7 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_timezone` char(128) NOT NULL DEFAULT 'UTC',
   `channel_location` char(191) NOT NULL DEFAULT '',
   `channel_theme` char(191) NOT NULL DEFAULT '',
-  `channel_startpage` char(255) NOT NULL DEFAULT '',
+  `channel_startpage` char(191) NOT NULL DEFAULT '',
   `channel_pubkey` text NOT NULL,
   `channel_prvkey` text NOT NULL,
   `channel_notifyflags` int(10) unsigned NOT NULL DEFAULT '65535',
@@ -260,7 +260,7 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_max_anon_mail` int(10) unsigned NOT NULL DEFAULT '10',
   `channel_max_friend_req` int(10) unsigned NOT NULL DEFAULT '10',
   `channel_expire_days` int(11) NOT NULL DEFAULT '0',
-  `channel_passwd_reset` char(255) NOT NULL DEFAULT '',
+  `channel_passwd_reset` char(191) NOT NULL DEFAULT '',
   `channel_default_group` char(191) NOT NULL DEFAULT '',
   `channel_allow_cid` mediumtext NOT NULL,
   `channel_allow_gid` mediumtext NOT NULL,
@@ -287,8 +287,8 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_removed` tinyint(1) NOT NULL DEFAULT '0',
   `channel_system` tinyint(1) NOT NULL DEFAULT '0',
   `channel_moved` char(191) NOT NULL DEFAULT '',
-  `channel_password` varchar(255) NOT NULL,
-  `channel_salt` varchar(255) NOT NULL,
+  `channel_password` varchar(191) NOT NULL,
+  `channel_salt` varchar(191) NOT NULL,
   PRIMARY KEY (`channel_id`),
   KEY `channel_address` (`channel_address`),
   KEY `channel_account_id` (`channel_account_id`),

From 938a6218104d08e44dc2daf2a3884f96a4c6aa31 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 25 May 2017 23:02:48 -0700
Subject: [PATCH 191/299] update the link to account roles help on register
 page

---
 Zotlabs/Module/Register.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index 1d8944d8e..d1986bea5 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -237,7 +237,7 @@ class Register extends \Zotlabs\Web\Controller {
 		$name = array('name', t('Name or caption'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"'));
 		$nickhub = '@' . str_replace(array('http://','https://','/'), '', get_config('system','baseurl'));
 		$nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub));
-		$role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/roles" target="_blank">' . t('Read more about roles') . '</a>',$perm_roles);
+		$role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/member/member_guide#Account_Permission_Roles" target="_blank">' . t('Read more about roles') . '</a>',$perm_roles);
 		$tos = array('tos', $label_tos, '', '', array(t('no'),t('yes')));
 
 		$server_role = get_config('system','server_role');	

From 2deafa0deab1dc8696cd1e1c2d93aece8ac24338 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 25 May 2017 23:03:55 -0700
Subject: [PATCH 192/299] update link to account roles help on new_channel page

---
 Zotlabs/Module/New_channel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php
index 8e6fd1d37..cfd45e909 100644
--- a/Zotlabs/Module/New_channel.php
+++ b/Zotlabs/Module/New_channel.php
@@ -134,7 +134,7 @@ class New_channel extends \Zotlabs\Web\Controller {
 		$name = array('name', t('Name or caption'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"'), "*");
 		$nickhub = '@' . \App::get_hostname();
 		$nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub), "*");
-		$role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/roles" target="_blank">' . t('Read more about roles') . '</a>',$perm_roles);
+		$role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/member/member_guide#Account_Permission_Roles" target="_blank">' . t('Read more about roles') . '</a>',$perm_roles);
 	
 		$o = replace_macros(get_markup_template('new_channel.tpl'), array(
 			'$title'        => t('Create Channel'),

From 1b75e4de0db02389108aba2b89830f7804f289f4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 26 May 2017 14:52:45 -0700
Subject: [PATCH 193/299] hubzilla issue #795

---
 Zotlabs/Module/Editwebpage.php | 2 +-
 Zotlabs/Module/Webpages.php    | 6 ++++--
 view/tpl/webpagelist.tpl       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
index 3effe7ff5..da536a729 100644
--- a/Zotlabs/Module/Editwebpage.php
+++ b/Zotlabs/Module/Editwebpage.php
@@ -112,7 +112,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 			intval($itm[0]['id'])
 		);
 		if($item_id)
-			$page_title = str_replace('%2f','/',$item_id[0]['v']);
+			$page_title = urldecode($item_id[0]['v']);
 
 		$mimetype = $itm[0]['mimetype'];
 
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index be697ba2c..a8fd5222b 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -218,13 +218,15 @@ class Webpages extends \Zotlabs\Web\Controller {
 					'created'	=> $rr['created'],
 					'edited'	=> $rr['edited'],
 					'mimetype'	=> $rr['mimetype'],
-					'pagetitle'	=> str_replace('%2f','/',$rr['v']),
+					'pageurl'	=> str_replace('%2f','/',$rr['v']),
+					'pagetitle'	=> urldecode($rr['v']),
 					'mid'		=> $rr['mid'],
 					'layout_mid'    => $rr['layout_mid']
 				);
 				$pages[$rr['iid']][] = array(
 					'url'		=> $rr['iid'],
-					'pagetitle'	=> str_replace('%2f','/',$rr['v']),
+					'pageurl'	=> str_replace('%2f','/',$rr['v']),
+					'pagetitle'	=> urldecode($rr['v']),
 					'title'		=> $rr['title'],
 					'created'	=> datetime_convert('UTC',date_default_timezone_get(),$rr['created']),
 					'edited'	=> datetime_convert('UTC',date_default_timezone_get(),$rr['edited']),
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index fcf9de75a..1c909b9b8 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -31,7 +31,7 @@
 			<tr id="webpage-list-item-{{$item.url}}">
 				<td>
 					{{if $view}}
-					<a href="page/{{$channel}}/{{$item.pagetitle}}" title="{{$view}}">{{$item.pagetitle}}</a>
+					<a href="page/{{$channel}}/{{$item.pageurl}}" title="{{$view}}">{{$item.pagetitle}}</a>
 					{{else}}
 					{{$item.pagetitle}}
 					{{/if}}

From 7738083f3e26656cba0b53bbf652c0efa089d8ba Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 28 May 2017 16:02:10 -0700
Subject: [PATCH 194/299] replace really old example widgets with pointer to
 current widget list

---
 doc/member/member_guide.bb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index 50f0b581b..f81bd0741 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -687,14 +687,8 @@ This places a block named &quot;contributors&quot; in this region. Additionally
 The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block.
 
 [h4]Widgets[/h4]
-Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. (TODO: list available widgets and arguments). The base system provides
+Widgets are executable apps provided by the system which you can place on your page. Some widgets take arguments which allows you to tailor the widget to your purpose. System widgets are listed [url=help/Widgets]here[/url]. Widgets can also ve created by plugins, themes, or your site administrator to provide additional functionality.
 
-[code]
-	profile - widget which duplicates the profile sidebar of your channel page. This widget takes no arguments
-	tagcloud - provides a tag cloud of categories
-		count - maximum number of category tags to list	
-
-[/code]
 
 Widgets and arguments are specified with the 'widget' and 'var' tags.
 [code]

From b15a5f03e61eeef2086d87f497464b00ada3798e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 28 May 2017 19:17:46 -0700
Subject: [PATCH 195/299] work through the diaspora_v2 outgoing status posts

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

diff --git a/include/text.php b/include/text.php
index 2e77dca84..0666a5e0d 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3049,7 +3049,8 @@ function array2XML($obj, $array) {
 		if(is_array($value)) {
 			$node = $obj->addChild($key);
 			array2XML($node, $value);
-		} else {
+		}
+		else {
 			$obj->addChild($key, htmlspecialchars($value));
 		}
 	}

From 4fcfcc81172ebdfa4a27d3bca94bffe97356f600 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 29 May 2017 13:50:02 -0700
Subject: [PATCH 196/299] start deprecation of server_role

---
 Zotlabs/Lib/ThreadItem.php          |  2 --
 Zotlabs/Module/Admin/Site.php       | 10 ----------
 Zotlabs/Module/Chanview.php         |  6 +-----
 Zotlabs/Module/Import.php           |  3 +--
 Zotlabs/Module/Register.php         |  8 +++-----
 Zotlabs/Module/Settings/Channel.php |  1 -
 Zotlabs/Module/Setup.php            |  8 +-------
 include/account.php                 | 10 ++--------
 include/features.php                | 23 +++++++++--------------
 include/nav.php                     |  9 +++------
 include/zot.php                     |  7 -------
 view/tpl/admin_site.tpl             |  3 ---
 view/tpl/settings.tpl               |  9 +++------
 13 files changed, 23 insertions(+), 76 deletions(-)

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 5910ea672..ff4e3205e 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -251,8 +251,6 @@ class ThreadItem {
 			);
 		}
 
-		$server_role = get_config('system','server_role');
-
 		$has_bookmarks = false;
 		if(is_array($item['term'])) {
 			foreach($item['term'] as $t) {
diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index d05e70aa9..4c5b82e78 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -17,7 +17,6 @@ class Site {
 		check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
 
 		$sitename 			=	((x($_POST,'sitename'))			? notags(trim($_POST['sitename']))			: '');
-		$server_role 		=	((x($_POST,'server_role'))		? notags(trim($_POST['server_role']))		: 'standard');
 
 		$banner				=	((x($_POST,'banner'))			? trim($_POST['banner'])				: false);
 
@@ -68,7 +67,6 @@ class Site {
 		if(array_key_exists('techlevel', $_POST))
 			$techlevel = intval($_POST['techlevel']);
 
-		set_config('system', 'server_role', $server_role);
 		set_config('system', 'feed_contacts', $feed_contacts);
 		set_config('system', 'delivery_interval', $delivery_interval);
 		set_config('system', 'delivery_batch_count', $delivery_batch_count);
@@ -254,12 +252,6 @@ class Site {
 		// now invert the logic for the setting.
 		$discover_tab = (1 - $discover_tab);
 
-		$server_roles = [
-			'basic'    => t('Basic/Minimal Social Networking'),
-			'standard' => t('Standard Configuration (default)'),
-			'pro'      => t('Professional')
-		];
-
 		$techlevels = [
 			'0' => t('Beginner/Basic'),
 			'1' => t('Novice - not skilled but willing to learn'),
@@ -286,8 +278,6 @@ class Site {
 			// name, label, value, help string, extra data...
 			'$sitename' 		=> array('sitename', t("Site name"), htmlspecialchars(get_config('system','sitename'), ENT_QUOTES, 'UTF-8'),''),
 
-			'$server_role' 		=> array('server_role', t("Server Configuration/Role"), get_config('system','server_role'),'',$server_roles),
-
 			'$techlevel' => [ 'techlevel', t('Site default technical skill level'), get_config('system','techlevel'), t('Used to provide a member experience matched to technical comfort level'), $techlevels ],
 
 			'$techlock' => [ 'techlock', t('Lock the technical skill level setting'), get_config('system','techlevel_lock'), t('Members can set their own technical comfort level by default') ],
diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php
index 01ee74d5a..c3194184a 100644
--- a/Zotlabs/Module/Chanview.php
+++ b/Zotlabs/Module/Chanview.php
@@ -117,12 +117,8 @@ class Chanview extends \Zotlabs\Web\Controller {
 		// the remote profile. 
 
 		// Zot channels will usually have a connect link.
-		// If it isn't zot, 'pro' members won't be able to use the connect
-		// button as it is a foreign network so just send them to the remote
-		// profile.  
-
 	
-		if($is_zot || \Zotlabs\Lib\System::get_server_role() === 'pro') {
+		if($is_zot) {
 			if($is_zot && $observer) {
 				$url = zid($url);
 			}
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index a2f83e1cb..40ce8f6d1 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -121,8 +121,7 @@ class Import extends \Zotlabs\Web\Controller {
 				$t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 );
 				notice($t);
 			}
-			if(array_key_exists('server_role',$data['compatibility']) && $data['compatibility']['server_role'] == 'basic')
-				$moving = true;
+
 		}
 
 		if($moving)
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index d1986bea5..d4573156c 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -151,7 +151,7 @@ class Register extends \Zotlabs\Web\Controller {
 		$new_channel = false;
 		$next_page = 'new_channel';
 	
-		if(get_config('system','auto_channel_create') || get_config('system','server_role') == 'basic') {
+		if(get_config('system','auto_channel_create')) {
 			$new_channel = auto_channel_create($result['account']['account_id']);
 			if($new_channel['success']) {
 				$channel_id = $new_channel['channel']['channel_id'];
@@ -240,11 +240,9 @@ class Register extends \Zotlabs\Web\Controller {
 		$role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/member/member_guide#Account_Permission_Roles" target="_blank">' . t('Read more about roles') . '</a>',$perm_roles);
 		$tos = array('tos', $label_tos, '', '', array(t('no'),t('yes')));
 
-		$server_role = get_config('system','server_role');	
 
-
-		$auto_create  = (($server_role == 'basic') || (get_config('system','auto_channel_create')) ? true : false);
-		$default_role = (($server_role == 'basic') ? 'social' : get_config('system','default_permissions_role'));
+		$auto_create  = (get_config('system','auto_channel_create') ? true : false);
+		$default_role = get_config('system','default_permissions_role');
 	
 		require_once('include/bbcode.php');
 	
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index 56a7d0d8e..7c30ef93e 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -489,7 +489,6 @@ class Channel {
 	
 			'$h_prv' 	=> t('Security and Privacy Settings'),
 			'$permissions_set' => $permissions_set,
-			'$server_role' => \Zotlabs\Lib\System::get_server_role(),
 			'$perms_set_msg' => t('Your permissions are already configured. Click to view/adjust'),
 	
 			'$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online'), $yes_no),
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index aa28204d3..e5b54cc5f 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -73,9 +73,6 @@ class Setup extends \Zotlabs\Web\Controller {
 				$phpath = trim($_POST['phpath']);
 				$adminmail = trim($_POST['adminmail']);
 				$siteurl = trim($_POST['siteurl']);
-				$server_role = trim($_POST['server_role']);
-				if(! $server_role)
-					$server_role = 'standard';
 
 				// $siteurl should not have a trailing slash
 
@@ -103,9 +100,6 @@ class Setup extends \Zotlabs\Web\Controller {
 				$timezone = trim($_POST['timezone']);
 				$adminmail = trim($_POST['adminmail']);
 				$siteurl = trim($_POST['siteurl']);
-				$server_role = trim($_POST['server_role']);
-				if(! $server_role)
-					$server_role = 'standard';
 
 				if($siteurl != z_root()) {
 					$test = z_fetch_url($siteurl."/setup/testrewrite");
@@ -134,7 +128,7 @@ class Setup extends \Zotlabs\Web\Controller {
 					'$dbpass'      => $dbpass,
 					'$dbdata'      => $dbdata,
 					'$dbtype'      => $dbtype,
-					'$server_role' => $server_role,
+					'$server_role' => 'pro',
 					'$timezone'    => $timezone,
 					'$siteurl'     => $siteurl,
 					'$site_id'     => random_string(),
diff --git a/include/account.php b/include/account.php
index c188ce0d7..499f7303a 100644
--- a/include/account.php
+++ b/include/account.php
@@ -424,7 +424,7 @@ function account_allow($hash) {
 
 	pop_lang();
 
-	if(get_config('system','auto_channel_create') || get_config('system','server_role') === 'basic')
+	if(get_config('system','auto_channel_create'))
 		auto_channel_create($register[0]['uid']);
 
 	if ($res) {
@@ -528,7 +528,7 @@ function account_approve($hash) {
 
 
 
-	if(get_config('system','auto_channel_create') || get_config('system','server_role') === 'basic')
+	if(get_config('system','auto_channel_create'))
 		auto_channel_create($register[0]['uid']);
 	else {
 		$_SESSION['login_return_url'] = 'new_channel';
@@ -772,12 +772,6 @@ function upgrade_bool_message($bbcode = false) {
 
 function get_account_techlevel($account_id = 0) {
 
-	$role = \Zotlabs\Lib\System::get_server_role();
-	if($role == 'basic')
-		return 0;
-	if($role == 'standard')
-		return 5;
-
 	if(! $account_id) {
 		$x = \App::get_account();
 	}
diff --git a/include/features.php b/include/features.php
index 0fc6fbc1d..f32dbe82e 100644
--- a/include/features.php
+++ b/include/features.php
@@ -45,10 +45,6 @@ function feature_level($feature,$def) {
 
 function get_features($filtered = true) {
 
-	$server_role = \Zotlabs\Lib\System::get_server_role();
-
-	if($server_role === 'basic' && $filtered)
-		return array();
 
 	$arr = [
 
@@ -424,16 +420,15 @@ function get_features($filtered = true) {
 	];
 
 
-	if($server_role === 'pro') {
-		$arr['general'][] = [
-			'premium_channel', 
-			t('Premium Channel'), 
-			t('Allows you to set restrictions and terms on those that connect with your channel'),
-			false,
-			get_config('feature_lock','premium_channel'),
-			feature_level('premium_channel',4),
-		];
-	}
+	$arr['general'][] = [
+		'premium_channel', 
+		t('Premium Channel'), 
+		t('Allows you to set restrictions and terms on those that connect with your channel'),
+		false,
+		get_config('feature_lock','premium_channel'),
+		feature_level('premium_channel',4),
+	];
+
 
 	$techlevel = get_account_techlevel();
 
diff --git a/include/nav.php b/include/nav.php
index 91bade5a7..4d6c479da 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -65,8 +65,6 @@ EOT;
 		//we could additionally use this to display important system notifications e.g. for updates
 	));
 
-	$server_role = get_config('system','server_role');
-	$basic = (($server_role === 'basic') ? true : false);
 	$techlevel = get_account_techlevel();
 
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
@@ -97,7 +95,7 @@ EOT;
 	if(local_channel()) {
 
 
-		if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select') && (! $basic))
+		if($chans && count($chans) > 1 && feature_enabled(local_channel(),'nav_channel_select'))
 			$nav['channels'] = $chans;
 
 		$nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];
@@ -105,7 +103,7 @@ EOT;
 		// user menu
 		$nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page'),'profile_nav_btn'];
 
-		if(feature_enabled(local_channel(),'multi_profiles') && (! $basic))
+		if(feature_enabled(local_channel(),'multi_profiles'))
 			$nav['usermenu'][]   = ['profiles', t('Edit Profiles'),"", t('Manage/Edit profiles'),'profiles_nav_btn'];
 		else
 			$nav['usermenu'][]   = ['profiles/' . $prof[0]['id'], t('Edit Profile'),"", t('Edit your profile'),'profiles_nav_btn'];
@@ -201,8 +199,7 @@ EOT;
 		$nav['all_events']['all']=array('events', t('View events'), "", "");
 		$nav['all_events']['mark'] = array('', t('Mark all events seen'), '','');
 
-		if(! $basic)		
-			$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn');
+		$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'),'manage_nav_btn');
 
 		$nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'),'settings_nav_btn');
 
diff --git a/include/zot.php b/include/zot.php
index d2088f272..9458b1f1e 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2237,9 +2237,6 @@ function check_location_move($sender_hash,$locations) {
 	if(! $locations)
 		return;
 
-	if(get_config('system','server_role') !== 'basic')
-		return;
-
 	if(count($locations) != 1)
 		return;
 
@@ -2935,8 +2932,6 @@ function import_site($arr, $pubkey) {
 
 function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 
-	if(get_config('system','server_role') === 'basic')
-		return;
 
 	logger('build_sync_packet');
 
@@ -3086,8 +3081,6 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 
 function process_channel_sync_delivery($sender, $arr, $deliveries) {
 
-	if(get_config('system','server_role') === 'basic')
-		return;
 
 	require_once('include/import.php');
 
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 6fd0fd9ce..e995f82b2 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -41,12 +41,9 @@
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_select.tpl" field=$server_role}}
 
-	{{if $z_server_role == 'pro'}}
 	{{include file="field_select.tpl" field=$techlevel}}
     {{include file="field_checkbox.tpl" field=$techlock}}
-	{{/if}}
 
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_textarea.tpl" field=$siteinfo}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index dd5fecb43..6673e5815 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		{{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>{{/if}}
+		<a title="{{$removechannel}}" class="btn btn-danger btn-sm pull-right" href="removeme"><i class="fa fa-trash-o"></i>&nbsp;{{$removeme}}</a>
 		<h2>{{$ptitle}}</h2>
 		<div class="clear"></div>
 	</div>
@@ -44,12 +44,9 @@
 				</div>
 				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
 					<div class="section-content-tools-wrapper">
-						{{if $server_role != 'basic'}}
 						{{include file="field_select_grouped.tpl" field=$role}}
-						{{/if}}
-						<div id="advanced-perm" style="display:{{if $permissions_set && $server_role != 'basic' }}none{{else}}block{{/if}};">
+						<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
 
-							{{if $server_role != 'basic'}}
 							<div class="form-group">
 								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
 							</div>
@@ -71,7 +68,7 @@
 									</div><!-- /.modal-content -->
 								</div><!-- /.modal-dialog -->
 							</div><!-- /.modal -->
-							{{/if}}
+
 							<div id="settings-default-perms" class="form-group" >
 								<button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
 							</div>

From fd915138322b920036a2a21c56fdfb6a56749303 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 29 May 2017 16:25:27 -0700
Subject: [PATCH 197/299] more deprecate server_role

---
 Zotlabs/Module/Editpost.php     | 5 +++++
 install/htconfig.sample.php     | 8 --------
 view/tpl/admin_account_edit.tpl | 5 -----
 view/tpl/settings_account.tpl   | 2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php
index 629bdd3fd..a54c42e7f 100644
--- a/Zotlabs/Module/Editpost.php
+++ b/Zotlabs/Module/Editpost.php
@@ -39,6 +39,11 @@ class Editpost extends \Zotlabs\Web\Controller {
 			return;
 		}
 
+		if($itm[0]['resource_type'] === 'photo' && $itm[0]['resource_id']) {
+			notice( t('Item is not editable') . EOL);
+			return;
+		}
+
 		if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) {
 			goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1');
 		}
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index f37b3dc79..07725e3f4 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -44,14 +44,6 @@ App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = 'if the auto install failed, put a unique random string here';
 
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything, but removes cross-platform federation/emulation
-
-App::$config['system']['server_role'] = 'standard';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl
index 82d137de4..239d9084a 100644
--- a/view/tpl/admin_account_edit.tpl
+++ b/view/tpl/admin_account_edit.tpl
@@ -8,12 +8,7 @@
 
 {{include file="field_password.tpl" field=$pass1}}
 {{include file="field_password.tpl" field=$pass2}}
-
-{{if $z_server_role == 'pro'}}
 {{include file="field_select.tpl" field=$account_level}}
-{{else}}
-<input type="hidden" name="account_level" value="{{$account_level.2}}" />
-{{/if}}
 {{include file="field_select.tpl" field=$account_language}}
 {{include file="field_input.tpl" field=$service_class}}
 
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index b7fdfb9a9..dd1d0d0c9 100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -12,7 +12,7 @@
 			{{include file="field_password.tpl" field=$password1}}
 			{{include file="field_password.tpl" field=$password2}}
 
-			{{if $z_server_role == 'pro' && ! $techlock}}
+			{{if ! $techlock}}
 			{{include file="field_select.tpl" field=$techlevel}}
 			{{else}}
 			<input type="hidden" name="techlevel" value="{{$techlevel.2}}" />

From 321957781e047b8da55e2d8b5510bc595c0d2cf9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 29 May 2017 20:59:05 -0700
Subject: [PATCH 198/299] remove server role from language configs

---
 view/de/htconfig.tpl    | 7 -------
 view/en-au/htconfig.tpl | 7 -------
 view/en-gb/htconfig.tpl | 8 --------
 view/en/htconfig.tpl    | 9 ---------
 view/fr/htconfig.tpl    | 9 ---------
 view/it/htconfig.tpl    | 8 --------
 view/nb-no/htconfig.tpl | 8 --------
 view/pt-br/htconfig.tpl | 8 --------
 view/ru/htconfig.tpl    | 7 -------
 view/sv/htconfig.tpl    | 7 -------
 10 files changed, 78 deletions(-)

diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 9d4333fb0..46bf0de14 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -34,13 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl
index 090bbf06f..cefcba727 100644
--- a/view/en-au/htconfig.tpl
+++ b/view/en-au/htconfig.tpl
@@ -34,13 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl
index 515957b36..ea458d664 100644
--- a/view/en-gb/htconfig.tpl
+++ b/view/en-gb/htconfig.tpl
@@ -34,14 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 042c89797..8159b6d44 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -34,15 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the server for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro disables protocol federation plugins and only supports the zot protocol
-// if you are in doubt or are unsure, it is strongly advised that you select 'standard'. 
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index fae8e3f98..ddc1d1053 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -35,15 +35,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index ea3f5b5c2..5acb0ebe2 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -34,14 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl
index ea3f5b5c2..5acb0ebe2 100644
--- a/view/nb-no/htconfig.tpl
+++ b/view/nb-no/htconfig.tpl
@@ -34,14 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl
index ea3f5b5c2..5acb0ebe2 100644
--- a/view/pt-br/htconfig.tpl
+++ b/view/pt-br/htconfig.tpl
@@ -34,14 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
-
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl
index 00da08c91..58a18fbd0 100644
--- a/view/ru/htconfig.tpl
+++ b/view/ru/htconfig.tpl
@@ -34,13 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 
 // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index 00da08c91..58a18fbd0 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -34,13 +34,6 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
-// Choices are 'basic', 'standard', and 'pro'.
-// basic sets up the sevrer for basic social networking and removes "complicated" features
-// standard provides most desired features except e-commerce
-// pro gives you access to everything
-
-App::$config['system']['server_role'] = '{{$server_role}}';
-
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 
 // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 

From 6962bc5147bed48a0fd6ab31580ba9a0f8f75bf7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 29 May 2017 21:46:38 -0700
Subject: [PATCH 199/299] create account_store_lowlevel()

---
 include/account.php | 92 ++++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 34 deletions(-)

diff --git a/include/account.php b/include/account.php
index 499f7303a..6c6fdece4 100644
--- a/include/account.php
+++ b/include/account.php
@@ -105,6 +105,33 @@ function account_total() {
 }
 
 
+function account_store_lowlevel($arr) {
+
+    $store = [
+        'account_parent'           => ((array_key_exists('account_parent',$arr))           ? $arr['account_parent']           : '0'),
+        'account_default_channel'  => ((array_key_exists('account_default_channel',$arr))  ? $arr['account_default_channel']  : '0'),
+        'account_salt'             => ((array_key_exists('account_salt',$arr))             ? $arr['account_salt']             : ''),
+        'account_password'         => ((array_key_exists('account_password',$arr))         ? $arr['account_password']         : ''),
+        'account_email'            => ((array_key_exists('account_email',$arr))            ? $arr['account_email']            : ''),
+        'account_external'         => ((array_key_exists('account_external',$arr))         ? $arr['account_external']         : ''),
+        'account_language'         => ((array_key_exists('account_language',$arr))         ? $arr['account_language']         : 'en'),
+        'account_created'          => ((array_key_exists('account_created',$arr))          ? $arr['account_created']          : '0001-01-01 00:00:00'),
+        'account_lastlog'          => ((array_key_exists('account_lastlog',$arr))          ? $arr['account_lastlog']          : '0001-01-01 00:00:00'),
+        'account_flags'            => ((array_key_exists('account_flags',$arr))            ? $arr['account_flags']            : '0'),
+        'account_roles'            => ((array_key_exists('account_roles',$arr))            ? $arr['account_roles']            : '0'),
+        'account_reset'            => ((array_key_exists('account_reset',$arr))            ? $arr['account_reset']            : ''),
+        'account_expires'          => ((array_key_exists('account_expires',$arr))          ? $arr['account_expires']          : '0001-01-01 00:00:00'),
+        'account_expire_notified'  => ((array_key_exists('account_expire_notified',$arr))  ? $arr['account_expire_notified']  : '0001-01-01 00:00:00'),
+        'account_service_class'    => ((array_key_exists('account_service_class',$arr))    ? $arr['account_service_class']    : ''),
+        'account_level'            => ((array_key_exists('account_level',$arr))            ? $arr['account_level']            : '0'),
+        'account_password_changed' => ((array_key_exists('account_password_changed',$arr)) ? $arr['account_password_changed'] : '0001-01-01 00:00:00')
+	];
+
+	return create_table_from_array('account',$store);
+
+}
+
+
 function create_account($arr) {
 
 	// Required: { email, password }
@@ -177,21 +204,20 @@ function create_account($arr) {
 	$salt = random_string(32);
 	$password_encoded = hash('whirlpool', $salt . $password);
 
-	$r = q("INSERT INTO account 
-			( account_parent,  account_salt,  account_password, account_email,   account_language, 
-			  account_created, account_flags, account_roles,  account_level,  account_expires, account_service_class )
-		VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s' )",
-		intval($parent),
-		dbesc($salt),
-		dbesc($password_encoded),
-		dbesc($email),
-		dbesc(get_best_language()),
-		dbesc(datetime_convert()),
-		intval($flags),
-		intval($roles),
-		intval($techlevel),
-		dbesc($expires),
-		dbesc($default_service_class)
+	$r = account_store_lowlevel(
+		[
+			'account_parent'        => intval($parent),
+			'account_salt'          => $salt,
+			'account_password'      => $password_encoded,
+			'account_email'         => $email,
+			'account_language'      => get_best_language(),
+			'account_created'       => datetime_convert(),
+			'account_flags'         => intval($flags),
+			'account_roles'         => intval($roles),
+			'account_level'         => intval($techlevel),
+			'account_expires'       => $expires,
+			'account_service_class' => $default_service_class
+		]
 	);
 	if(! $r) {
 		logger('create_account: DB INSERT failed.');
@@ -246,16 +272,18 @@ function verify_email_address($arr) {
 		dbesc($arr['account']['account_language'])
 	);
 
-//@fixme - get correct language template
+	push_lang(($arr['account']['account_language']) ? $arr['account']['account_language'] : 'en');
 
-	$email_msg = replace_macros(get_intltext_template('register_verify_member.tpl'), array(
-		'$sitename' => get_config('system','sitename'),
-		'$siteurl'  => z_root(),
-		'$email'    => $arr['email'],
-		'$uid'      => $arr['account']['account_id'],
-		'$hash'     => $hash,
-		'$details'  => $details
-	 ));
+	$email_msg = replace_macros(get_intltext_template('register_verify_member.tpl'),
+		[
+			'$sitename' => get_config('system','sitename'),
+			'$siteurl'  => z_root(),
+			'$email'    => $arr['email'],
+			'$uid'      => $arr['account']['account_id'],
+			'$hash'     => $hash,
+			'$details'  => $details
+	 	]
+	);
 
 	$res = z_mail(
 		[ 
@@ -265,10 +293,12 @@ function verify_email_address($arr) {
 		]
 	);
 
+	pop_lang();
+
 	if($res)
 		$delivered ++;
 	else
-		logger('send_reg_approval_email: failed to ' . $admin['email'] . 'account_id: ' . $arr['account']['account_id']);
+		logger('send_reg_approval_email: failed to account_id: ' . $arr['account']['account_id']);
 
 	return $res;
 }
@@ -354,9 +384,9 @@ function send_register_success_email($email,$password) {
 
 	$res = z_mail(
 		[ 
-		'toEmail' => $email,
-		'messageSubject' => sprintf( t('Registration details for %s'), get_config('system','sitename')),
-		'textVersion' => $email_msg,
+			'toEmail' => $email,
+			'messageSubject' => sprintf( t('Registration details for %s'), get_config('system','sitename')),
+			'textVersion' => $email_msg,
 		]
 	);
 
@@ -525,9 +555,6 @@ function account_approve($hash) {
 	if(! $account)
 		return $ret;
 
-
-
-
 	if(get_config('system','auto_channel_create'))
 		auto_channel_create($register[0]['uid']);
 	else {
@@ -535,9 +562,6 @@ function account_approve($hash) {
 		authenticate_success($account[0],null,true,true,false,true);
 	}	
 
-
-	// info( t('Account verified. Please login.') . EOL );
-
 	return true;
 }
 

From e48d5383cec4f5e7bd40bbac005819d60f38c970 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 16:50:57 -0700
Subject: [PATCH 200/299] move disapora xrd stuff to plugin

---
 Zotlabs/Module/Xrd.php    | 15 ++-------------
 view/tpl/xrd_diaspora.tpl |  3 ---
 view/tpl/xrd_person.tpl   |  5 +----
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 view/tpl/xrd_diaspora.tpl

diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 7b36576e0..17c0faa78 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -30,13 +30,7 @@ class Xrd extends \Zotlabs\Web\Controller {
 		);
 		if(! $r) 
 			killme();
-	
-		$dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array(
-			'$baseurl' => z_root(),
-			'$dspr_guid' => $r[0]['channel_guid'] . str_replace('.','',\App::get_hostname()),
-			'$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey']))
-		));
-	
+		
 		$salmon_key = salmon_key($r[0]['channel_pubkey']);
 	
 		header('Access-Control-Allow-Origin: *');
@@ -49,8 +43,7 @@ class Xrd extends \Zotlabs\Web\Controller {
 			if($aliases[$x] === $resource)
 				unset($aliases[$x]);
 		}
-	
-	
+		
 		$o = replace_macros(get_markup_template('xrd_person.tpl'), array(
 			'$nick'        => $r[0]['channel_address'],
 			'$accturi'     => $resource,
@@ -61,12 +54,8 @@ class Xrd extends \Zotlabs\Web\Controller {
 			'$zot_post'    => z_root() . '/post/'          . $r[0]['channel_address'],
 			'$poco_url'    => z_root() . '/poco/'          . $r[0]['channel_address'],
 			'$photo'       => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],
-			'$dspr'        => $dspr,
-	//		'$salmon'      => z_root() . '/salmon/'        . $r[0]['channel_address'],
-	//		'$salmen'      => z_root() . '/salmon/'        . $r[0]['channel_address'] . '/mention',
 			'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
 			'$subscribe'   => z_root() . '/follow?url={uri}',
-			'$bigkey'      =>  salmon_key($r[0]['channel_pubkey'])
 		));
 	
 	
diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl
deleted file mode 100644
index aa0d8c740..000000000
--- a/view/tpl/xrd_diaspora.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
-	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
-	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 93fdcb1df..225892d70 100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -22,10 +22,7 @@
           href="{{$hcard_url}}" />
     <Link rel="http://ostatus.org/schema/1.0/subscribe"
           template="{{$subscribe}}" />
-
-   <Link rel="magic-public-key"
+    <Link rel="magic-public-key"
           href="{{$modexp}}" />
 
-	{{$dspr}}
-
 </XRD>

From 893ae17b99d1a1a720a58879e8075fc9bb1de087 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 17:06:50 -0700
Subject: [PATCH 201/299] provide ability to search webpages (either public or
 which contain the observer in the acl) in addition to conversations

---
 Zotlabs/Module/Search.php | 4 ++--
 include/items.php         | 7 +++++++
 include/security.php      | 1 -
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index aacdc88e7..a78a023ff 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -15,7 +15,7 @@ class Search extends \Zotlabs\Web\Controller {
 		if((get_config('system','block_public')) || (get_config('system','block_public_search'))) {
 			if ((! local_channel()) && (! remote_channel())) {
 				notice( t('Public access denied.') . EOL);
-			return;
+				return;
 			}
 		}
 	
@@ -144,7 +144,7 @@ class Search extends \Zotlabs\Web\Controller {
 	
 		}
 	
-		$item_normal = item_normal();
+		$item_normal = item_normal_search();
 		$pub_sql = public_permissions_sql($observer_hash);
 	
 		require_once('include/channel.php');
diff --git a/include/items.php b/include/items.php
index a375ee3c3..707f07f4a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -175,6 +175,13 @@ function item_normal() {
 		and item.item_blocked = 0 ";
 }
 
+function item_normal_search() {
+	return " and item.item_hidden = 0 and item.item_type in (0,3) and item.item_deleted = 0
+		and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
+		and item.item_blocked = 0 ";
+}
+
+
 /**
  * @brief
  *
diff --git a/include/security.php b/include/security.php
index ddbb3d806..6e7b3dbb2 100644
--- a/include/security.php
+++ b/include/security.php
@@ -467,7 +467,6 @@ function scopes_sql($uid,$observer) {
  */
 function public_permissions_sql($observer_hash) {
 
-	//$observer = App::get_observer();
 	$groups = init_groups_visitor($observer_hash);
 
 	$gs = '<<>>'; // should be impossible to match

From 062b9ecbf3a3b315097428a6d608376055d4cae5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 18:22:48 -0700
Subject: [PATCH 202/299] bring back html2markdown which went away in the merge

---
 include/markdown.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/include/markdown.php b/include/markdown.php
index 1c42937b3..947b5c5e3 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -204,3 +204,33 @@ function bb_to_markdown($Text) {
 	return $Text;
 
 }
+
+
+
+/**
+ * @brief Convert a HTML text into Markdown.
+ *
+ * This function uses the library league/html-to-markdown for this task.
+ *
+ * If the HTML text can not get parsed it will return an empty string.
+ *
+ * @see HTMLToMarkdown
+ *
+ * @param string $html The HTML code to convert
+ * @return string Markdown representation of the given HTML text, empty on error
+ */
+function html2markdown($html) {
+	$markdown = '';
+	$converter = new HtmlConverter();
+
+	try {
+		$markdown = $converter->convert($html);
+	} catch (InvalidArgumentException $e) {
+		logger("Invalid HTML. HTMLToMarkdown library threw an exception.");
+	}
+
+	// The old html 2 markdown library "pixel418/markdownify": "^2.2",
+	//$md = new HtmlConverter();
+	//$markdown = $md->convert($Text);
+	return $markdown;
+}

From bfad624528499e27125fae18799940319fc32c6d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 18:36:19 -0700
Subject: [PATCH 203/299] re-arrange a few functions

---
 include/bbcode.php   | 60 +++++++++++++++++++++++++++++++++++++++
 include/markdown.php | 67 --------------------------------------------
 include/text.php     |  8 ++++++
 3 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/include/bbcode.php b/include/bbcode.php
index d38397be7..d12630e23 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -9,6 +9,66 @@ require_once('include/event.php');
 require_once('include/zot.php');
 
 
+function get_bb_tag_pos($s, $name, $occurance = 1) {
+
+	if($occurance < 1)
+		$occurance = 1;
+
+	$start_open = -1;
+	for($i = 1; $i <= $occurance; $i++) {
+		if( $start_open !== false)
+			$start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags
+	}
+
+	if( $start_open === false)
+		return false;
+
+	$start_equal = strpos($s, '=', $start_open);
+	$start_close = strpos($s, ']', $start_open);
+
+	if( $start_close === false)
+		return false;
+
+	$start_close++;
+
+	$end_open = strpos($s, '[/' . $name . ']', $start_close);
+
+	if( $end_open === false)
+		return false;
+
+	$res = array( 'start' => array('open' => $start_open, 'close' => $start_close),
+	              'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) );
+	if( $start_equal !== false)
+		$res['start']['equal'] = $start_equal + 1;
+
+	return $res;
+}
+
+function bb_tag_preg_replace($pattern, $replace, $name, $s) {
+
+	$string = $s;
+
+	$occurance = 1;
+	$pos = get_bb_tag_pos($string, $name, $occurance);
+	while($pos !== false && $occurance < 1000) {
+
+		$start = substr($string, 0, $pos['start']['open']);
+		$subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']);
+		$end = substr($string, $pos['end']['close']);
+		if($end === false)
+			$end = '';
+
+		$subject = preg_replace($pattern, $replace, $subject);
+		$string = $start . $subject . $end;
+
+		$occurance++;
+		$pos = get_bb_tag_pos($string, $name, $occurance);
+	}
+
+	return $string;
+}
+
+
 function tryoembed($match) {
 	$url = ((count($match) == 2) ? $match[1] : $match[2]);
 
diff --git a/include/markdown.php b/include/markdown.php
index 947b5c5e3..9201993df 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -13,73 +13,6 @@ require_once("include/html2bbcode.php");
 require_once("include/bbcode.php");
 
 
-function get_bb_tag_pos($s, $name, $occurance = 1) {
-
-	if($occurance < 1)
-		$occurance = 1;
-
-	$start_open = -1;
-	for($i = 1; $i <= $occurance; $i++) {
-		if( $start_open !== false)
-			$start_open = strpos($s, '[' . $name, $start_open + 1); // allow [name= type tags
-	}
-
-	if( $start_open === false)
-		return false;
-
-	$start_equal = strpos($s, '=', $start_open);
-	$start_close = strpos($s, ']', $start_open);
-
-	if( $start_close === false)
-		return false;
-
-	$start_close++;
-
-	$end_open = strpos($s, '[/' . $name . ']', $start_close);
-
-	if( $end_open === false)
-		return false;
-
-	$res = array( 'start' => array('open' => $start_open, 'close' => $start_close),
-	              'end' => array('open' => $end_open, 'close' => $end_open + strlen('[/' . $name . ']')) );
-	if( $start_equal !== false)
-		$res['start']['equal'] = $start_equal + 1;
-
-	return $res;
-}
-
-function bb_tag_preg_replace($pattern, $replace, $name, $s) {
-
-	$string = $s;
-
-	$occurance = 1;
-	$pos = get_bb_tag_pos($string, $name, $occurance);
-	while($pos !== false && $occurance < 1000) {
-
-		$start = substr($string, 0, $pos['start']['open']);
-		$subject = substr($string, $pos['start']['open'], $pos['end']['close'] - $pos['start']['open']);
-		$end = substr($string, $pos['end']['close']);
-		if($end === false)
-			$end = '';
-
-		$subject = preg_replace($pattern, $replace, $subject);
-		$string = $start . $subject . $end;
-
-		$occurance++;
-		$pos = get_bb_tag_pos($string, $name, $occurance);
-	}
-
-	return $string;
-}
-
-function share_shield($m) {
-	return str_replace($m[1],'!=+=+=!' . base64url_encode($m[1]) . '=+!=+!=',$m[0]);
-}
-
-function share_unshield($m) {
-	$x = str_replace(array('!=+=+=!','=+!=+!='),array('',''),$m[1]);
-	return str_replace($m[1], base64url_decode($x), $m[0]);
-}
 
 /**
  * @brief
diff --git a/include/text.php b/include/text.php
index 0666a5e0d..1a4cb7ced 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3082,6 +3082,14 @@ function create_table_from_array($table, $arr) {
 	return $r;
 }
 
+function share_shield($m) {
+	return str_replace($m[1],'!=+=+=!' . base64url_encode($m[1]) . '=+!=+!=',$m[0]);
+}
+
+function share_unshield($m) {
+	$x = str_replace(array('!=+=+=!','=+!=+!='),array('',''),$m[1]);
+	return str_replace($m[1], base64url_decode($x), $m[0]);
+}
 
 
 function cleanup_bbcode($body) {

From dfc0d4cf59a9de98bc088c80e75877d9fc9fcab9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 19:50:41 -0700
Subject: [PATCH 204/299] move code syntax highlighting to plugin

---
 include/bbcode.php                            |    5 +-
 include/text.php                              |   39 +-
 library/Text_Highlighter/README               |  455 ---
 library/Text_Highlighter/TODO                 |   12 -
 library/Text_Highlighter/Text/Highlighter.php |  398 ---
 .../Text/Highlighter/ABAP.php                 |  519 ---
 .../Text/Highlighter/AVRC.php                 |  894 ------
 .../Text_Highlighter/Text/Highlighter/CPP.php |  891 ------
 .../Text_Highlighter/Text/Highlighter/CSS.php |  437 ---
 .../Text/Highlighter/DIFF.php                 |  384 ---
 .../Text_Highlighter/Text/Highlighter/DTD.php |  426 ---
 .../Text/Highlighter/Generator.php            | 1291 --------
 .../Text/Highlighter/HTML.php                 |  234 --
 .../Text/Highlighter/JAVA.php                 |  802 -----
 .../Text/Highlighter/JAVASCRIPT.php           |  631 ----
 .../Text/Highlighter/MYSQL.php                |  434 ---
 .../Text/Highlighter/PERL.php                 | 1352 --------
 .../Text_Highlighter/Text/Highlighter/PHP.php | 1107 -------
 .../Text/Highlighter/PYTHON.php               |  647 ----
 .../Text/Highlighter/RUBY.php                 |  825 -----
 .../Text/Highlighter/Renderer.php             |  164 -
 .../Text/Highlighter/Renderer/Array.php       |  202 --
 .../Text/Highlighter/Renderer/BB.php          |  238 --
 .../Text/Highlighter/Renderer/Console.php     |  208 --
 .../Text/Highlighter/Renderer/Html.php        |  465 ---
 .../Text/Highlighter/Renderer/HtmlTags.php    |  187 --
 .../Text/Highlighter/Renderer/JSON.php        |   86 -
 .../Text/Highlighter/Renderer/XML.php         |  104 -
 .../Text_Highlighter/Text/Highlighter/SH.php  | 1225 -------
 .../Text_Highlighter/Text/Highlighter/SQL.php |  419 ---
 .../Text/Highlighter/VBSCRIPT.php             |  318 --
 .../Text_Highlighter/Text/Highlighter/XML.php |  263 --
 library/Text_Highlighter/abap.xml             |  802 -----
 library/Text_Highlighter/avrc.xml             |  316 --
 library/Text_Highlighter/cpp.xml              |  201 --
 library/Text_Highlighter/css.xml              |  368 ---
 library/Text_Highlighter/diff.xml             |   45 -
 library/Text_Highlighter/dtd.xml              |   66 -
 library/Text_Highlighter/generate             |  171 -
 library/Text_Highlighter/generate.bat         |  188 --
 library/Text_Highlighter/html.xml             |   33 -
 library/Text_Highlighter/java.xml             | 2824 -----------------
 library/Text_Highlighter/javascript.xml       |  174 -
 library/Text_Highlighter/mysql.xml            |  424 ---
 library/Text_Highlighter/perl.xml             |  439 ---
 library/Text_Highlighter/php.xml              |  194 --
 library/Text_Highlighter/python.xml           |  229 --
 library/Text_Highlighter/release              |    4 -
 library/Text_Highlighter/ruby.xml             |  141 -
 library/Text_Highlighter/sample.css           |   62 -
 library/Text_Highlighter/sh.xml               |  242 --
 library/Text_Highlighter/sql.xml              |  496 ---
 library/Text_Highlighter/vbscript.xml         |  305 --
 library/Text_Highlighter/xml.xml              |   37 -
 54 files changed, 7 insertions(+), 23416 deletions(-)
 delete mode 100644 library/Text_Highlighter/README
 delete mode 100644 library/Text_Highlighter/TODO
 delete mode 100644 library/Text_Highlighter/Text/Highlighter.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/ABAP.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/AVRC.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/CPP.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/CSS.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/DIFF.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/DTD.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Generator.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/HTML.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/JAVA.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/JAVASCRIPT.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/MYSQL.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/PERL.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/PHP.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/PYTHON.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/RUBY.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Renderer.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Renderer/Array.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Renderer/BB.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Renderer/Console.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Renderer/Html.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Renderer/HtmlTags.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Renderer/JSON.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/Renderer/XML.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/SH.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/SQL.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/VBSCRIPT.php
 delete mode 100644 library/Text_Highlighter/Text/Highlighter/XML.php
 delete mode 100644 library/Text_Highlighter/abap.xml
 delete mode 100644 library/Text_Highlighter/avrc.xml
 delete mode 100644 library/Text_Highlighter/cpp.xml
 delete mode 100644 library/Text_Highlighter/css.xml
 delete mode 100644 library/Text_Highlighter/diff.xml
 delete mode 100644 library/Text_Highlighter/dtd.xml
 delete mode 100644 library/Text_Highlighter/generate
 delete mode 100644 library/Text_Highlighter/generate.bat
 delete mode 100644 library/Text_Highlighter/html.xml
 delete mode 100644 library/Text_Highlighter/java.xml
 delete mode 100644 library/Text_Highlighter/javascript.xml
 delete mode 100644 library/Text_Highlighter/mysql.xml
 delete mode 100644 library/Text_Highlighter/perl.xml
 delete mode 100644 library/Text_Highlighter/php.xml
 delete mode 100644 library/Text_Highlighter/python.xml
 delete mode 100644 library/Text_Highlighter/release
 delete mode 100644 library/Text_Highlighter/ruby.xml
 delete mode 100644 library/Text_Highlighter/sample.css
 delete mode 100644 library/Text_Highlighter/sh.xml
 delete mode 100644 library/Text_Highlighter/sql.xml
 delete mode 100644 library/Text_Highlighter/vbscript.xml
 delete mode 100644 library/Text_Highlighter/xml.xml

diff --git a/include/bbcode.php b/include/bbcode.php
index d12630e23..6805f008c 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -615,10 +615,7 @@ function bb_code_options($match) {
 }
 
 function bb_highlight($match) {
-	$lang = ((in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby',
-		'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','json','sh']))
-		? strtolower($match[1]) : 'php' );
-	return text_highlight($match[2],$lang);
+	return text_highlight($match[2],strtolower($match[1]));
 }
 
 function bb_fixtable_lf($match) {
diff --git a/include/text.php b/include/text.php
index 1a4cb7ced..c791b50ee 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2985,40 +2985,13 @@ function text_highlight($s, $lang) {
 			$s = jindent($s);
 	}
 
-	if(! strpos('Text_Highlighter', get_include_path())) {
-		set_include_path(get_include_path() . PATH_SEPARATOR . 'library/Text_Highlighter');
-	}
-	require_once('library/Text_Highlighter/Text/Highlighter.php');
-	require_once('library/Text_Highlighter/Text/Highlighter/Renderer/Html.php');
-	$options = array(
-		'numbers' => HL_NUMBERS_LI,
-		'tabsize' => 4,
-	);
-	$tag_added = false;
-	$s = trim(html_entity_decode($s, ENT_COMPAT));
-	$s = str_replace("    ", "\t", $s);
+	$arr = [ 'text' => $s, 'language' => $lang, 'success' => false ];
+	call_hooks('text_highlight',$arr);
 
-	// The highlighter library insists on an opening php tag for php code blocks. If
-	// it isn't present, nothing is highlighted. So we're going to see if it's present.
-	// If not, we'll add it, and then quietly remove it after we get the processed output back.
-
-	if($lang === 'php') {
-		if(strpos('<?php', $s) !== 0) {
-			$s = '<?php' . "\n" . $s;
-			$tag_added = true;
-		}
-	}
-	$renderer = new Text_Highlighter_Renderer_HTML($options);
-	$hl = Text_Highlighter::factory($lang);
-	$hl->setRenderer($renderer);
-	$o = $hl->highlight($s);
-	$o = str_replace(["    ", "\n"], ["&nbsp;&nbsp;&nbsp;&nbsp;", ''], $o);
-
-	if($tag_added) {
-		$b = substr($o, 0, strpos($o, '<li>'));
-		$e = substr($o, strpos($o, '</li>'));
-		$o = $b . $e;
-	}
+	if($arr['success'])
+		$o = $arr['text'];
+	else
+		$o = $s;
 
 	return('<code>' . $o . '</code>');
 }
diff --git a/library/Text_Highlighter/README b/library/Text_Highlighter/README
deleted file mode 100644
index 88f71aed2..000000000
--- a/library/Text_Highlighter/README
+++ /dev/null
@@ -1,455 +0,0 @@
-# $Id$
-
-Introduction
-============
-
-Text_Highlighter is a class for syntax highlighting. The main idea is to
-simplify creation of subclasses implementing syntax highlighting for
-particular language. Subclasses do not implement any new functioanality, they
-just provide syntax highlighting rules. The rules sources are in XML format.
-To create a highlighter for a language, there is no need to code a new class
-manually. Simply describe the rules in XML file and use Text_Highlighter_Generator
-to create a new class.
-
-
-This document does not contain a formal description of API - it is very
-simple, and I believe providing some examples of code is sufficient.
-
-
-Highlighter XML source
-======================
-
-Basics
-------
-
-Creating a new syntax highlighter begins with describing the highlighting
-rules. There are two basic elements: block and region. A block is just a
-portion of text matching a regular expression and highlighted with a single
-color. Keyword is an example of a block. A region is defined by two regular
-expressions: one for start of region, and another for the end. The main
-difference from a block is that a region can contain blocks and regions
-(including same-named regions). An example of a region is a group of
-statements enclosed in curly brackets (this is used in many languages, for
-example PHP and C). Also, characters matching start and end of a region may be
-highlighted with their own color, and region contents with another.
-
-Blocks and regions may be declared as contained. Contained blocks and regions
-can only appear inside regions. If a region or a block is not declared as
-contained, it can appear both on top level and inside regions. Block or region
-declared as not-contained can only appear on top level.
-
-For any region, a list of blocks and regions that can appear inside this
-region can be specified.
-
-In this document, the term "color group" is used. Chunks of text assigned to
-same color group will be highlighted with same color. Note that in versions
-prior 0.5.0 color goups were refered as CSS classes, but since 0.5.0 not only
-HTML output is supported, so "color group" is more appropriate term.
-
-Elements
---------
-
-The toplevel element is <highlight>. Attribute lang is required and denotes
-the name of the language. Its value is used as a part of generated class name,
-and must only contain letters, digits and underscores. Optional attribute
-case, when given value yes, makes the language case sensitive (default is case
-insensitive). Allowed subelements are:
-
-    * <authors>: Information about the authors of the file.
-        <author>: Information about a single author of the file. (May be used
-        multiple times, one per author.)
-                - name="...": Author's name. Required.
-                - email="...": Author's email address. Optional.
-
-    * <default>: Default color group.
-          - innerGroup="...": color group name. Required.
-    
-    * <region>: Region definition
-          - name="...": Region name. Required.
-          - innerGroup="...": Default color group of region contents. Required.
-          - delimGroup="...": color group of start and end of region. Optional,
-            defaults to value of innerGroup attribute.
-          - start="...", end="...": Regular expression matching start and end
-            of region. Required. Regular expression delimiters are optional, but
-            if you need to specify delimiter, use /. The only case when the
-            delimiters are needed, is specifying regular expression modifiers,
-            such as m or U. Examples: \/\* or /$/m.
-          - contained="yes": Marks region as contained.
-          - never-contained="yes": Marks region as not-contained.
-          - <contains>: Elements allowed inside this region.
-                - all="yes" Region can contain any other region or block
-                (except not-contained). May be used multiple times.
-                      - <but> Do not allow certain regions or blocks.
-                            - region="..." Name of region not allowed within
-                              current region.
-                            - block="..." Name of block not allowed within
-                              current region.
-                - region="..." Name of region allowed within current region.
-                - block="..." Name of block allowed within current region.
-          - <onlyin> Only allow this region within certain regions. May be
-            used multiple times.
-                - block="..." Name of parent region
-    
-    * <block>: Block definition
-          - name="...": Block name. Required.
-          - innerGroup="...": color group of block contents. Optional. If not
-            specified, color group of parent region or default color group will be
-            used. One would only want to omit this attribute if there are
-            keyword groups (see below) inherited from this block, and no special
-            highlighting should apply when the block does not match the keyword.
-          - match="..." Regular expression matching the block. Required.
-            Regular expression delimiters are optional, but if you need to
-            specify delimiter, use /. The only case when the delimiters are
-            needed, is specifying regular expression modifiers, such as m or U.
-            Examples: #|\/\/ or /$/m.
-          - contained="yes": Marks block as contained.
-          - never-contained="yes": Marks block as not-contained.
-          - <onlyin> Only allow this block within certain regions. May be used
-              multiple times.
-                - block="..." Name of parent region
-          - multiline="yes": Marks block as multi-line. By default, whole
-            blocks are assumed to reside in a single line. This make the things
-            faster. If you need to declare a multi-line block, use this
-            attribute.
-          - <partgroup>: Assigns another color group to a part of the block that
-              matched a subpattern.
-                - index="n": Subpattern index. Required.
-                - innerGroup="...": color group name. Required.
-
-              This is an example from CSS highlighter: the measure is matched as
-              a whole, but the measurement units are highlighted with different
-              color.
-
-                <block name="measure"  match="\d*\.?\d+(\%|em|ex|pc|pt|px|in|mm|cm)"
-                        innerGroup="number" contained="yes">
-                    <onlyin region="property"/>
-                    <partGroup index="1" innerGroup="string" />
-                </block>
-  
-    * <keywords>: Keyword group definition. Keyword groups are useful when you
-      want to highlight some words that match a condition for a block with a
-      different color. Keywords are defined with literal match, not regular
-      expressions. For example, you have a block named identifier matching a
-      general identifier, and want to highlight reserved words (which match
-      this block as well) with different color. You inherit a keyword group
-      "reserved" from "identifier" block.
-          - name="...": Keyword group. Required.
-          - ifdef="...", ifndef="..." : Conditional declaration. See
-            "Conditions" below.
-          - inherits="...": Inherited block name. Required.
-          - innerGroup="...": color group of keyword group. Required.
-          - case="yes|no": Overrides case-sensitivity of the language.
-            Optional, defaults to global value.
-          - <keyword>: Single keyword definition.
-                - match="..." The keyword. Note: this is not a regular
-                  expression, but literal match (possibly case insensitive).
-
-Note that for BC reasons element partClass is alias for partGroup, and
-attributes innerClass and  delimClass  are aliases of innerGroup and
-delimGroup, respectively.
-    
-
-Conditions
-----------
-
-Conditional declarations allow enabling or disabling certain highlighting
-rules at runtime. For example, Java highlighter has a very big list of
-keywords matching Java standard classes. Finding a match in this list can take
-much time. For that reason, corresponding keyword group is declared with
-"ifdef" attribute :
-
-  <keywords name="builtin" inherits="identifier" innerClass="builtin" 
-            case="yes" ifdef="java.builtins">
-	<keyword match="AbstractAction" />
-	<keyword match="AbstractBorder" />
-	<keyword match="AbstractButton" />
-    ...
-    ...
-	<keyword match="_Remote_Stub" />
-	<keyword match="_ServantActivatorStub" />
-	<keyword match="_ServantLocatorStub" />
-  </keywords>
-
-This keyword group will be only enabled when "java.builtins" is passed as an
-element of "defines" option:
-
-    $options = array(
-        'defines' => array(
-            'java.builtins',
-        ),
-        'numbers' => HL_NUMBERS_TABLE,
-    );
-    $highlighter = Text_Highlighter::factory('java', $options);
-
-"ifndef" attribute has reverse meaning.
-
-Currently, "ifdef" and "ifndef" attributes are only supported for <keywords>
-tag. 
-
-
-
-Class generation
-================
-
-Creating XML description of highlighting rules is the most complicated part of
-the process. To generate the class, you need just few lines of code:
-
-    <?php
-    require_once 'Text/Highlighter/Generator.php';
-    $generator = new Text_Highlighter_Generator('php.xml');
-    $generator->generate();
-    $generator->saveCode('PHP.php');
-    ?>
-
-
-
-Command-line class generation tool
-==================================
-
-Example from previous section looks pretty simple, but it does not handle any
-errors which may occur during parsing of XML source. The package provides a
-command-line script to make generation of classes even more simple, and takes
-care of possible errors. It is called generate (on Unix/Linux) or generate.bat
-(on Windows). This script is able to process multiple files in one run, and
-also to process XML from standard input and write generated code to standard
-output.
-
-    Usage:
-    generate options
-
-    Options:
-      -x filename, --xml=filename
-            source XML file. Multiple input files can be specified, in which
-            case each -x option must be followed by -p unless -d is specified
-            Defaults to stdin
-      -p filename, --php=filename
-            destination PHP file. Defaults to stdout. If specied multiple times,
-            each -p must follow -x
-      -d dirname, --dir=dirname
-            Default destination directory. File names will be taken from XML input
-            ("lang" attribute of <highlight> tag)
-      -h, --help
-            This help
-
-Examples
-
-    Read from php.xml, write to PHP.php
-
-        generate -x php.xml -p PHP.php
-
-    Read from php.xml, write to standard output
-
-        generate -x php.xml
-
-    Read from php.xml, write to PHP.php, read from xml.xml, write to XML.php
-
-        generate -x php.xml -p PHP.php -x xml.xml -p XML.php
-
-    Read from php.xml, write to /some/dir/PHP.php, read from xml.xml, write to
-    /some/dir/XML.php (assuming that xml.xml contains <highlight lang="xml">, and
-    php.xml contains <highlight lang="php">)
-
-        generate -x php.xml -x xml.xml -d /some/dir/
-
-
-
-Renderers
-=========
-
-Introduction
-------------
-
-Text_Highlighter supports renderes. Using renderers, you can get output in
-different formats. Two renderers are included in the package:
-
-    - HTML renderer. Generates HTML output. A style sheet should be linked to
-      the document to display colored text
-
-    - Console renderer. Can be used to output highlighted text to
-      color-capable terminals, either directly or trough less -r
-
-
-Renderers API
--------------
-
-Renderers are subclasses of Text_Highlighter_Renderer. Renderer should
-override at least two methods - acceptToken and getOutput. Overriding other
-methods is optional, depending on the nature of renderer's output and details
-of implementation.
-
-    string reset()
-        resets renderer state. This method is called every time before a new
-        source file is highlighted.
-
-    string preprocess(string $code)
-        preprocesses code. Can be used, for example, to normalize whitespace
-        before highlighting. Returns preprocessed string.
-
-    void acceptToken(string $group, string $content)
-        the core method of the renderer. Highlighter passes chunks of text to
-        this method in $content, and color group in $group
-
-    void finalize()
-        signals the renderer that no more tokens are available.
-
-    mixed getOutput()
-        returns generated output.
-
-
-Setting renderer options
---------------------------------
-
-Renderers accept an optional argument to their constructor  - options array.
-Elements of this array are renderer-specific.
-
-HTML renderer
--------------
-
-HTML renderer produces HTML output with optional line numbering. The renderer
-itself does not provide information about actual colors of highlighted text.
-Instead, <span class="hl-XXX"> is used, where XXX is replaced with color group
-name (hl-var, hl-string, etc.). It is up to you to create a CSS stylesheet.
-If 'use_language' option with value evaluating to true was passed, class names
-will be formatted as "LANG-hl-XXX", where LANG is language name as defined in
-highlighter XML source ("lang" attribute of <highlight> tag) in lower case.
-
-There are 3 special CSS classes:
-
-    hl-main - this class applies to whole output or right table column,
-              depending on 'numbers' option
-    hl-gutter - applies to left column in table
-    hl-table - applies to whole table
-
-HTML renderer accepts following options (each being optional):
-    
-    * numbers - line numbering style.
-        0 - no numbering (default)
-        HL_NUMBERS_LI - use <ol></ol> for line numbering
-        HL_NUMBERS_TABLE  - create a 2-column table, with line numbers in left
-                            column and highlighted text in right column
-
-    * tabsize - tabulation size. Defaults to 4
-
-    Example:
-        
-        require_once 'Text/Highlighter/Renderer/Html.php';
-        $options = array(
-            'numbers' => HL_NUMBERS_LI,
-            'tabsize' => 8,
-        );
-        $renderer = new Text_Highlighter_Renderer_HTML($options);
-
-Console renderer
-----------------
-
-Console renderer produces output for displaying on a color-capable terminal,
-either directly or through less -r, using ANSI escape sequences. By default,
-this renderer only highlights most common color groups. Additional colors
-can be specified using 'colors' option. This renderer also accepts 'numbers'
-option - a boolean value, and 'tabsize' option.
-
-    Example :
-
-        require_once 'Text/Highlighter/Renderer/Console.php';
-        $colors = array(
-            'prepro' => "\033[35m",
-            'types' => "\033[32m",
-        );
-        $options = array(
-            'numbers' => true,
-            'tabsize' => 8,
-            'colors' => $colors,
-        );
-        $renderer = new Text_Highlighter_Renderer_Console($options);
-
-
-ANSI color escape sequences have the following format:
-
-    ESC[#;#;....;#m
-
-where ESC is character with ASCII code 27 (033 octal, 0x1B hexadecimal). # is
-one of the following:
-
-        0 for normal display
-        1 for bold on
-        4 underline (mono only)
-        5 blink on
-        7 reverse video on
-        8 nondisplayed (invisible)
-        30 black foreground
-        31 red foreground
-        32 green foreground
-        33 yellow foreground
-        34 blue foreground
-        35 magenta foreground
-        36 cyan foreground
-        37 white foreground
-        40 black background
-        41 red background
-        42 green background
-        43 yellow background
-        44 blue background
-        45 magenta background
-        46 cyan background
-        47 white background
-
-
-How to use Text_Highlighter class
-=================================
-
-Creating a highlighter object
------------------------------
-
-To create a highlighter for a certain language, use Text_Highlighter::factory()
-static method:
-
-    require_once 'Text/Highlighter.php';
-    $hl = Text_Highlighter::factory('php');
-
-
-Setting a renderer
-------------------
-
-Actual output is produced by a renderer.
-
-    require_once 'Text/Highlighter.php';
-    require_once 'Text/Highlighter/Renderer/Html.php';
-    $options = array(
-        'numbers' => HL_NUMBERS_LI,
-        'tabsize' => 8,
-    );
-    $renderer = new Text_Highlighter_Renderer_HTML($options);
-    $hl = Text_Highlighter::factory('php');
-    $hl->setRenderer($renderer);
-
-Note that for BC reasons, it is possible to use highlighter without setting a
-renderer. If no renderer is set, HTML renderer will be used by default. In
-this case, you should pass options as second parameter to factory method. The
-following example works exactly as previous one:
-
-    require_once 'Text/Highlighter.php';
-    $options = array(
-        'numbers' => HL_NUMBERS_LI,
-        'tabsize' => 8,
-    );
-    $hl = Text_Highlighter::factory('php', $options);
-
-
-Getting output
---------------
-
-And finally, do the highlighting and get the output:
-
-    require_once 'Text/Highlighter.php';
-    require_once 'Text/Highlighter/Renderer/Html.php';
-    $options = array(
-        'numbers' => HL_NUMBERS_LI,
-        'tabsize' => 8,
-    );
-    $renderer = new Text_Highlighter_Renderer_HTML($options);
-    $hl = Text_Highlighter::factory('php');
-    $hl->setRenderer($renderer);
-    $html = $hl->highlight(file_get_contents('example.php'));
-
-# vim: set autoindent tabstop=4 shiftwidth=4 softtabstop=4 tw=78: */
-
diff --git a/library/Text_Highlighter/TODO b/library/Text_Highlighter/TODO
deleted file mode 100644
index 77a148b8a..000000000
--- a/library/Text_Highlighter/TODO
+++ /dev/null
@@ -1,12 +0,0 @@
-# $Id$
-
-Major issues to solve (but I currently have no idea how) :
-
-- speedup highlighting process
-
-- switching between highlighters depending on context, for example :
-  PHP code -> HTML -> (JavaScript|CSS)
-
-
-# vim: set autoindent tabstop=4 shiftwidth=4 softtabstop=4 tw=78: */
-
diff --git a/library/Text_Highlighter/Text/Highlighter.php b/library/Text_Highlighter/Text/Highlighter.php
deleted file mode 100644
index 480113c16..000000000
--- a/library/Text_Highlighter/Text/Highlighter.php
+++ /dev/null
@@ -1,398 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * Highlighter base class
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-// require_once 'PEAR.php';
-
-// {{{ BC constants
-
-// BC trick : define constants related to default
-// renderer if needed
-if (!defined('HL_NUMBERS_LI')) {
-    /**#@+
-     * Constant for use with $options['numbers']
-     * @see Text_Highlighter_Renderer_Html::_init()
-     */
-    /**
-     * use numbered list
-     */
-    define ('HL_NUMBERS_LI'    ,    1);
-    /**
-     * Use 2-column table with line numbers in left column and code in  right column.
-     * Forces $options['tag'] = HL_TAG_PRE
-     */
-    define ('HL_NUMBERS_TABLE'    , 2);
-    /**#@-*/
-}
-
-// }}}
-// {{{ constants
-/**
- * for our purpose, it is infinity
- */
-define ('HL_INFINITY',      1000000000);
-
-// }}}
-
-/**
- * Text highlighter base class
- *
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-// {{{ Text_Highlighter
-
-/**
- * Text highlighter base class
- *
- * This class implements all functions necessary for highlighting,
- * but it does not contain highlighting rules. Actual highlighting is
- * done using a descendent of this class.
- *
- * One is not supposed to manually create descendent classes.
- * Instead, describe highlighting  rules in XML format and
- * use {@link Text_Highlighter_Generator} to create descendent class.
- * Alternatively, an instance of a descendent class can be created
- * directly.
- *
- * Use {@link Text_Highlighter::factory()} to create an
- * object for particular language highlighter
- *
- * Usage example
- * <code>
- *require_once 'Text/Highlighter.php';
- *$hlSQL = Text_Highlighter::factory('SQL',array('numbers'=>true));
- *echo $hlSQL->highlight('SELECT * FROM table a WHERE id = 12');
- * </code>
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @package Text_Highlighter
- * @access public
- */
-
-class Text_Highlighter
-{
-    // {{{ members
-    
-    /**
-     * Syntax highlighting rules.
-     * Auto-generated classes set this var
-     *
-     * @access protected
-     * @see _init
-     * @var array
-     */
-    var $_syntax;
-
-    /**
-     * Renderer object.
-     *
-     * @access private
-     * @var array
-     */
-    var $_renderer;
-
-    /**
-     * Options. Keeped for BC
-     *
-     * @access protected
-     * @var array
-     */
-    var $_options = array();
-
-    /**
-     * Conditionds
-     *
-     * @access protected
-     * @var array
-     */
-    var $_conditions = array();
-
-    /**
-     * Disabled keywords
-     *
-     * @access protected
-     * @var array
-     */
-    var $_disabled = array();
-
-    /**
-     * Language
-     *
-     * @access protected
-     * @var string
-     */
-    var $_language = '';
-
-    // }}}
-    // {{{ _checkDefines
-    
-    /**
-     * Called by subclssses' constructors to enable/disable
-     * optional highlighter rules
-     *
-     * @param array $defines  Conditional defines
-     *
-     * @access protected
-     */
-    function _checkDefines()
-    {
-        if (isset($this->_options['defines'])) {
-            $defines = $this->_options['defines'];
-        } else {
-            $defines = array();
-        }
-        foreach ($this->_conditions as $name => $actions) {
-            foreach($actions as $action) {
-                $present = in_array($name, $defines);
-                if (!$action[1]) {
-                    $present = !$present;
-                }
-                if ($present) {
-                    unset($this->_disabled[$action[0]]);
-                } else {
-                    $this->_disabled[$action[0]] = true;
-                }
-            }
-        }
-    }
-
-    // }}}
-    // {{{ factory
-    
-    /**
-     * Create a new Highlighter object for specified language
-     *
-     * @param string $lang    language, for example "SQL"
-     * @param array  $options Rendering options. This
-     * parameter is only keeped for BC reasons, use 
-     * {@link Text_Highlighter::setRenderer()} instead
-     *
-     * @return mixed a newly created Highlighter object, or 
-     * a PEAR error object on error
-     *
-     * @static
-     * @access public
-     */
-    function &factory($lang, $options = array())
-    {
-        $lang = strtoupper($lang);
-        @include_once 'Text/Highlighter/' . $lang . '.php';
-
-        $classname = 'Text_Highlighter_' . $lang;
-
-        if (!class_exists($classname)) {
-            return PEAR::raiseError('Highlighter for ' . $lang . ' not found');
-        }
-
-        $obj = new $classname($options);
-
-        return $obj;
-    }
-
-    // }}}
-    // {{{ setRenderer
-    
-    /**
-     * Set renderer object
-     *
-     * @param object $renderer  Text_Highlighter_Renderer
-     *
-     * @access public
-     */
-    function setRenderer(&$renderer)
-    {
-        $this->_renderer = $renderer;
-    }
-
-    // }}}
-
-    /**
-     * Helper function to find matching brackets
-     *
-     * @access private
-     */
-    function _matchingBrackets($str)
-    {
-        return strtr($str, '()<>[]{}', ')(><][}{');
-    }
-
-
-    
-    
-    function _getToken()
-    {
-        if (!empty($this->_tokenStack)) {
-            return array_pop($this->_tokenStack);
-        }
-        if ($this->_pos >= $this->_len) {
-            return NULL;
-        }
-
-        if ($this->_state != -1 && preg_match($this->_endpattern, $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos)) {
-            $endpos = $m[0][1];
-            $endmatch = $m[0][0];
-        } else {
-            $endpos = -1;
-        }
-        preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
-        $n = 1;
- 
- 
-         foreach ($this->_counts[$this->_state] as $i=>$count) {
-            if (!isset($m[$n])) {
-                break;
-            }
-            if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
-                if ($this->_states[$this->_state][$i] != -1) {
-                    $this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
-                } else {
-                    $inner = $this->_inner[$this->_state][$i];
-                    if (isset($this->_parts[$this->_state][$i])) {
-                        $parts = array();
-                        $partpos = $m[$n][1];
-                        for ($j=1; $j<=$count; $j++) {
-                            if ($m[$j+$n][1] < 0) {
-                                continue;
-                            }
-                            if (isset($this->_parts[$this->_state][$i][$j])) {
-                                if ($m[$j+$n][1] > $partpos) {
-                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
-                                }
-                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
-                            }
-                            $partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
-                        }
-                        if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
-                            array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
-                        }
-                        $this->_tokenStack = array_merge($this->_tokenStack, $parts);
-                    } else {
-                        foreach ($this->_keywords[$this->_state][$i] as $g => $re) {
-                            if (isset($this->_disabled[$g])) {
-                                continue;
-                            }
-                            if (preg_match($re, $m[$n][0])) {
-                                $inner = $this->_kwmap[$g];
-                                break;
-                            }
-                        }
-                        $this->_tokenStack[] = array($inner, $m[$n][0]);
-                    }
-                }
-                if ($m[$n][1] > $this->_pos) {
-                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
-                }
-                $this->_pos = $m[$n][1] + strlen($m[$n][0]);
-                if ($this->_states[$this->_state][$i] != -1) {
-                    $this->_stack[] = array($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern);
-                    $this->_lastinner = $this->_inner[$this->_state][$i];
-                    $this->_lastdelim = $this->_delim[$this->_state][$i];
-                    $l = $this->_state;
-                    $this->_state = $this->_states[$this->_state][$i];
-                    $this->_endpattern = $this->_end[$this->_state];
-                    if ($this->_subst[$l][$i]) {
-                        for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
-                            if (!isset($m[$i+$k])) {
-                                break;
-                            }
-                            $quoted = preg_quote($m[$n+$k][0], '/');
-                            $this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
-                            $this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
-                        }
-                    }
-                }
-                return array_pop($this->_tokenStack);
-            }
-            $n += $count + 1;
-        }
-
-        if ($endpos > -1) {
-            $this->_tokenStack[] = array($this->_lastdelim, $endmatch);
-            if ($endpos > $this->_pos) {
-                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
-            }
-            list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
-            $this->_pos = $endpos + strlen($endmatch);
-            return array_pop($this->_tokenStack);
-        }
-        $p = $this->_pos;
-        $this->_pos = HL_INFINITY;
-        return array($this->_lastinner, substr($this->_str, $p));
-    }
-    
-    
-    
-    
-    // {{{ highlight
-
-    /**
-     * Highlights code
-     *
-     * @param  string $str      Code to highlight
-     * @access public
-     * @return string Highlighted text
-     *
-     */
-
-    function highlight($str)
-    {
-        if (!($this->_renderer)) {
-            include_once('Text/Highlighter/Renderer/Html.php');
-            $this->_renderer = new Text_Highlighter_Renderer_Html($this->_options);
-        }
-        $this->_state = -1;
-        $this->_pos = 0;
-        $this->_stack = array();
-        $this->_tokenStack = array();
-        $this->_lastinner = $this->_defClass;
-        $this->_lastdelim = $this->_defClass;
-        $this->_endpattern = '';
-        $this->_renderer->reset();
-        $this->_renderer->setCurrentLanguage($this->_language);
-        $this->_str = $this->_renderer->preprocess($str);
-        $this->_len = strlen($this->_str);
-        while ($token = $this->_getToken()) {
-            $this->_renderer->acceptToken($token[0], $token[1]);
-        }
-        $this->_renderer->finalize();
-        return $this->_renderer->getOutput();
-    }
-    
-    // }}}
-    
-}
-
-// }}}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/ABAP.php b/library/Text_Highlighter/Text/Highlighter/ABAP.php
deleted file mode 100644
index b2f7bda94..000000000
--- a/library/Text_Highlighter/Text/Highlighter/ABAP.php
+++ /dev/null
@@ -1,519 +0,0 @@
-<?php
-/**
- * Auto-generated class. ABAP syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : abap.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Stoyan Stefanov <ssttoo@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. ABAP syntax highlighting
- *
- * @author Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_ABAP extends Text_Highlighter
-{
-    var $_language = 'abap';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_ABAP($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)[a-z_\\-]\\w*)/',
-            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)[a-z_\\-]\\w*)/',
-            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)[a-z_\\-]\\w*)/',
-            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)[a-z_\\-]\\w*)/',
-            3 => '//',
-            4 => '//',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-            ),
-            0 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => '',
-            ),
-            0 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => '',
-            ),
-            1 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => '',
-            ),
-            2 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => '',
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'identifier',
-            ),
-            0 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'identifier',
-            ),
-            1 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'identifier',
-            ),
-            2 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'identifier',
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\}/',
-            1 => '/(?i)\\)/',
-            2 => '/(?i)\\]/',
-            3 => '/(?mi)$/',
-            4 => '/(?i)\'/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => -1,
-            ),
-            0 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                    'sy' => '/^((?i)screen-name|screen-group1|screen-group2|screen-group3|screen-group4|screen-required|screen-input|screen-output|screen-intensified|screen-invisible|screen-length|screen-active|sy-index|sy-pagno|sy-tabix|sy-tfill|sy-tlopc|sy-tmaxl|sy-toccu|sy-ttabc|sy-tstis|sy-ttabi|sy-dbcnt|sy-fdpos|sy-colno|sy-linct|sy-linno|sy-linsz|sy-pagct|sy-macol|sy-marow|sy-tleng|sy-sfoff|sy-willi|sy-lilli|sy-subrc|sy-fleng|sy-cucol|sy-curow|sy-lsind|sy-listi|sy-stepl|sy-tpagi|sy-winx1|sy-winy1|sy-winx2|sy-winy2|sy-winco|sy-winro|sy-windi|sy-srows|sy-scols|sy-loopc|sy-folen|sy-fodec|sy-tzone|sy-dayst|sy-ftype|sy-appli|sy-fdayw|sy-ccurs|sy-ccurt|sy-debug|sy-ctype|sy-input|sy-langu|sy-modno|sy-batch|sy-binpt|sy-calld|sy-dynnr|sy-dyngr|sy-newpa|sy-pri40|sy-rstrt|sy-wtitl|sy-cpage|sy-dbnam|sy-mandt|sy-prefx|sy-fmkey|sy-pexpi|sy-prini|sy-primm|sy-prrel|sy-playo|sy-prbig|sy-playp|sy-prnew|sy-prlog|sy-pdest|sy-plist|sy-pauth|sy-prdsn|sy-pnwpa|sy-callr|sy-repi2|sy-rtitl|sy-prrec|sy-prtxt|sy-prabt|sy-lpass|sy-nrpag|sy-paart|sy-prcop|sy-batzs|sy-bspld|sy-brep4|sy-batzo|sy-batzd|sy-batzw|sy-batzm|sy-ctabl|sy-dbsys|sy-dcsys|sy-macdb|sy-sysid|sy-opsys|sy-pfkey|sy-saprl|sy-tcode|sy-ucomm|sy-cfwae|sy-chwae|sy-spono|sy-sponr|sy-waers|sy-cdate|sy-datum|sy-slset|sy-subty|sy-subcs|sy-group|sy-ffile|sy-uzeit|sy-dsnam|sy-repid|sy-tabid|sy-tfdsn|sy-uname|sy-lstat|sy-abcde|sy-marky|sy-sfnam|sy-tname|sy-msgli|sy-title|sy-entry|sy-lisel|sy-uline|sy-xcode|sy-cprog|sy-xprog|sy-xform|sy-ldbpg|sy-tvar0|sy-tvar1|sy-tvar2|sy-tvar3|sy-tvar4|sy-tvar5|sy-tvar6|sy-tvar7|sy-tvar8|sy-tvar9|sy-msgid|sy-msgty|sy-msgno|sy-msgv1|sy-msgv2|sy-msgv3|sy-msgv4|sy-oncom|sy-vline|sy-winsl|sy-staco|sy-staro|sy-datar|sy-host|sy-locdb|sy-locop|sy-datlo|sy-timlo|sy-zonlo|syst-index|syst-pagno|syst-tabix|syst-tfill|syst-tlopc|syst-tmaxl|syst-toccu|syst-ttabc|syst-tstis|syst-ttabi|syst-dbcnt|syst-fdpos|syst-colno|syst-linct|syst-linno|syst-linsz|syst-pagct|syst-macol|syst-marow|syst-tleng|syst-sfoff|syst-willi|syst-lilli|syst-subrc|syst-fleng|syst-cucol|syst-curow|syst-lsind|syst-listi|syst-stepl|syst-tpagi|syst-winx1|syst-winy1|syst-winx2|syst-winy2|syst-winco|syst-winro|syst-windi|syst-srows|syst-scols|syst-loopc|syst-folen|syst-fodec|syst-tzone|syst-dayst|syst-ftype|syst-appli|syst-fdayw|syst-ccurs|syst-ccurt|syst-debug|syst-ctype|syst-input|syst-langu|syst-modno|syst-batch|syst-binpt|syst-calld|syst-dynnr|syst-dyngr|syst-newpa|syst-pri40|syst-rstrt|syst-wtitl|syst-cpage|syst-dbnam|syst-mandt|syst-prefx|syst-fmkey|syst-pexpi|syst-prini|syst-primm|syst-prrel|syst-playo|syst-prbig|syst-playp|syst-prnew|syst-prlog|syst-pdest|syst-plist|syst-pauth|syst-prdsn|syst-pnwpa|syst-callr|syst-repi2|syst-rtitl|syst-prrec|syst-prtxt|syst-prabt|syst-lpass|syst-nrpag|syst-paart|syst-prcop|syst-batzs|syst-bspld|syst-brep4|syst-batzo|syst-batzd|syst-batzw|syst-batzm|syst-ctabl|syst-dbsys|syst-dcsys|syst-macdb|syst-sysid|syst-opsys|syst-pfkey|syst-saprl|syst-tcode|syst-ucomm|syst-cfwae|syst-chwae|syst-spono|syst-sponr|syst-waers|syst-cdate|syst-datum|syst-slset|syst-subty|syst-subcs|syst-group|syst-ffile|syst-uzeit|syst-dsnam|syst-repid|syst-tabid|syst-tfdsn|syst-uname|syst-lstat|syst-abcde|syst-marky|syst-sfnam|syst-tname|syst-msgli|syst-title|syst-entry|syst-lisel|syst-uline|syst-xcode|syst-cprog|syst-xprog|syst-xform|syst-ldbpg|syst-tvar0|syst-tvar1|syst-tvar2|syst-tvar3|syst-tvar4|syst-tvar5|syst-tvar6|syst-tvar7|syst-tvar8|syst-tvar9|syst-msgid|syst-msgty|syst-msgno|syst-msgv1|syst-msgv2|syst-msgv3|syst-msgv4|syst-oncom|syst-vline|syst-winsl|syst-staco|syst-staro|syst-datar|syst-host|syst-locdb|syst-locop|syst-datlo|syst-timlo|syst-zonlo)$/',
-                    'reserved' => '/^((?i)abs|acos|add|add-corresponding|adjacent|after|aliases|all|analyzer|and|any|append|as|ascending|asin|assign|assigned|assigning|at|atan|authority-check|avg|back|before|begin|binary|bit|bit-and|bit-not|bit-or|bit-xor|blank|block|break-point|buffer|by|c|call|case|catch|ceil|centered|chain|change|changing|check|checkbox|class|class-data|class-events|class-methods|class-pool|clear|client|close|cnt|code|collect|color|comment|commit|communication|compute|concatenate|condense|constants|context|contexts|continue|control|controls|convert|copy|corresponding|cos|cosh|count|country|create|currency|cursor|customer-function|data|database|dataset|delete|decimals|default|define|demand|descending|describe|dialog|distinct|div|divide|divide-corresponding|do|duplicates|dynpro|edit|editor-call|else|elseif|end|end-of-definition|end-of-page|end-of-selection|endat|endcase|endcatch|endchain|endclass|enddo|endexec|endform|endfunction|endif|endinterface|endloop|endmethod|endmodule|endon|endprovide|endselect|endwhile|entries|events|exec|exit|exit-command|exp|exponent|export|exporting|exceptions|extended|extract|fetch|field|field-groups|field-symbols|fields|floor|for|form|format|frac|frame|free|from|function|function-pool|generate|get|group|hashed|header|help-id|help-request|hide|hotspot|icon|id|if|import|importing|include|index|infotypes|initialization|inner|input|insert|intensified|interface|interface-pool|interfaces|into|inverse|join|key|language|last|leave|left|left-justified|like|line|line-count|line-selection|line-size|lines|list-processing|load|load-of-program|local|locale|log|log10|loop|m|margin|mask|matchcode|max|memory|message|message-id|messages|method|methods|min|mod|mode|modif|modify|module|move|move-corresponding|multiply|multiply-corresponding|new|new-line|new-page|next|no|no-gap|no-gaps|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unique|o|object|obligatory|occurs|of|off|on|open|or|order|others|outer|output|overlay|pack|page|parameter|parameters|perform|pf-status|position|print|print-control|private|process|program|property|protected|provide|public|put|radiobutton|raise|raising|range|ranges|read|receive|refresh|reject|replace|report|requested|reserve|reset|right-justified|rollback|round|rows|rtti|run|scan|screen|search|separated|scroll|scroll-boundary|select|select-options|selection-screen|selection-table|set|shared|shift|sign|sin|single|sinh|size|skip|sort|sorted|split|sql|sqrt|stamp|standard|start-of-selection|statics|stop|string|strlen|structure|submit|subtract|subtract-corresponding|sum|supply|suppress|symbol|syntax-check|syntax-trace|system-call|system-exceptions|table|table_line|tables|tan|tanh|text|textpool|time|times|title|titlebar|to|top-of-page|transaction|transfer|translate|transporting|trunc|type|type-pool|type-pools|types|uline|under|unique|unit|unpack|up|update|user-command|using|value|value-request|values|vary|when|where|while|window|with|with-title|work|write|x|xstring|z|zone)$/',
-                    'constants' => '/^((?i)initial|null|space|col_background|col_heading|col_normal|col_total|col_key|col_positive|col_negative|col_group)$/',
-                ),
-            ),
-            0 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                    'sy' => '/^((?i)screen-name|screen-group1|screen-group2|screen-group3|screen-group4|screen-required|screen-input|screen-output|screen-intensified|screen-invisible|screen-length|screen-active|sy-index|sy-pagno|sy-tabix|sy-tfill|sy-tlopc|sy-tmaxl|sy-toccu|sy-ttabc|sy-tstis|sy-ttabi|sy-dbcnt|sy-fdpos|sy-colno|sy-linct|sy-linno|sy-linsz|sy-pagct|sy-macol|sy-marow|sy-tleng|sy-sfoff|sy-willi|sy-lilli|sy-subrc|sy-fleng|sy-cucol|sy-curow|sy-lsind|sy-listi|sy-stepl|sy-tpagi|sy-winx1|sy-winy1|sy-winx2|sy-winy2|sy-winco|sy-winro|sy-windi|sy-srows|sy-scols|sy-loopc|sy-folen|sy-fodec|sy-tzone|sy-dayst|sy-ftype|sy-appli|sy-fdayw|sy-ccurs|sy-ccurt|sy-debug|sy-ctype|sy-input|sy-langu|sy-modno|sy-batch|sy-binpt|sy-calld|sy-dynnr|sy-dyngr|sy-newpa|sy-pri40|sy-rstrt|sy-wtitl|sy-cpage|sy-dbnam|sy-mandt|sy-prefx|sy-fmkey|sy-pexpi|sy-prini|sy-primm|sy-prrel|sy-playo|sy-prbig|sy-playp|sy-prnew|sy-prlog|sy-pdest|sy-plist|sy-pauth|sy-prdsn|sy-pnwpa|sy-callr|sy-repi2|sy-rtitl|sy-prrec|sy-prtxt|sy-prabt|sy-lpass|sy-nrpag|sy-paart|sy-prcop|sy-batzs|sy-bspld|sy-brep4|sy-batzo|sy-batzd|sy-batzw|sy-batzm|sy-ctabl|sy-dbsys|sy-dcsys|sy-macdb|sy-sysid|sy-opsys|sy-pfkey|sy-saprl|sy-tcode|sy-ucomm|sy-cfwae|sy-chwae|sy-spono|sy-sponr|sy-waers|sy-cdate|sy-datum|sy-slset|sy-subty|sy-subcs|sy-group|sy-ffile|sy-uzeit|sy-dsnam|sy-repid|sy-tabid|sy-tfdsn|sy-uname|sy-lstat|sy-abcde|sy-marky|sy-sfnam|sy-tname|sy-msgli|sy-title|sy-entry|sy-lisel|sy-uline|sy-xcode|sy-cprog|sy-xprog|sy-xform|sy-ldbpg|sy-tvar0|sy-tvar1|sy-tvar2|sy-tvar3|sy-tvar4|sy-tvar5|sy-tvar6|sy-tvar7|sy-tvar8|sy-tvar9|sy-msgid|sy-msgty|sy-msgno|sy-msgv1|sy-msgv2|sy-msgv3|sy-msgv4|sy-oncom|sy-vline|sy-winsl|sy-staco|sy-staro|sy-datar|sy-host|sy-locdb|sy-locop|sy-datlo|sy-timlo|sy-zonlo|syst-index|syst-pagno|syst-tabix|syst-tfill|syst-tlopc|syst-tmaxl|syst-toccu|syst-ttabc|syst-tstis|syst-ttabi|syst-dbcnt|syst-fdpos|syst-colno|syst-linct|syst-linno|syst-linsz|syst-pagct|syst-macol|syst-marow|syst-tleng|syst-sfoff|syst-willi|syst-lilli|syst-subrc|syst-fleng|syst-cucol|syst-curow|syst-lsind|syst-listi|syst-stepl|syst-tpagi|syst-winx1|syst-winy1|syst-winx2|syst-winy2|syst-winco|syst-winro|syst-windi|syst-srows|syst-scols|syst-loopc|syst-folen|syst-fodec|syst-tzone|syst-dayst|syst-ftype|syst-appli|syst-fdayw|syst-ccurs|syst-ccurt|syst-debug|syst-ctype|syst-input|syst-langu|syst-modno|syst-batch|syst-binpt|syst-calld|syst-dynnr|syst-dyngr|syst-newpa|syst-pri40|syst-rstrt|syst-wtitl|syst-cpage|syst-dbnam|syst-mandt|syst-prefx|syst-fmkey|syst-pexpi|syst-prini|syst-primm|syst-prrel|syst-playo|syst-prbig|syst-playp|syst-prnew|syst-prlog|syst-pdest|syst-plist|syst-pauth|syst-prdsn|syst-pnwpa|syst-callr|syst-repi2|syst-rtitl|syst-prrec|syst-prtxt|syst-prabt|syst-lpass|syst-nrpag|syst-paart|syst-prcop|syst-batzs|syst-bspld|syst-brep4|syst-batzo|syst-batzd|syst-batzw|syst-batzm|syst-ctabl|syst-dbsys|syst-dcsys|syst-macdb|syst-sysid|syst-opsys|syst-pfkey|syst-saprl|syst-tcode|syst-ucomm|syst-cfwae|syst-chwae|syst-spono|syst-sponr|syst-waers|syst-cdate|syst-datum|syst-slset|syst-subty|syst-subcs|syst-group|syst-ffile|syst-uzeit|syst-dsnam|syst-repid|syst-tabid|syst-tfdsn|syst-uname|syst-lstat|syst-abcde|syst-marky|syst-sfnam|syst-tname|syst-msgli|syst-title|syst-entry|syst-lisel|syst-uline|syst-xcode|syst-cprog|syst-xprog|syst-xform|syst-ldbpg|syst-tvar0|syst-tvar1|syst-tvar2|syst-tvar3|syst-tvar4|syst-tvar5|syst-tvar6|syst-tvar7|syst-tvar8|syst-tvar9|syst-msgid|syst-msgty|syst-msgno|syst-msgv1|syst-msgv2|syst-msgv3|syst-msgv4|syst-oncom|syst-vline|syst-winsl|syst-staco|syst-staro|syst-datar|syst-host|syst-locdb|syst-locop|syst-datlo|syst-timlo|syst-zonlo)$/',
-                    'reserved' => '/^((?i)abs|acos|add|add-corresponding|adjacent|after|aliases|all|analyzer|and|any|append|as|ascending|asin|assign|assigned|assigning|at|atan|authority-check|avg|back|before|begin|binary|bit|bit-and|bit-not|bit-or|bit-xor|blank|block|break-point|buffer|by|c|call|case|catch|ceil|centered|chain|change|changing|check|checkbox|class|class-data|class-events|class-methods|class-pool|clear|client|close|cnt|code|collect|color|comment|commit|communication|compute|concatenate|condense|constants|context|contexts|continue|control|controls|convert|copy|corresponding|cos|cosh|count|country|create|currency|cursor|customer-function|data|database|dataset|delete|decimals|default|define|demand|descending|describe|dialog|distinct|div|divide|divide-corresponding|do|duplicates|dynpro|edit|editor-call|else|elseif|end|end-of-definition|end-of-page|end-of-selection|endat|endcase|endcatch|endchain|endclass|enddo|endexec|endform|endfunction|endif|endinterface|endloop|endmethod|endmodule|endon|endprovide|endselect|endwhile|entries|events|exec|exit|exit-command|exp|exponent|export|exporting|exceptions|extended|extract|fetch|field|field-groups|field-symbols|fields|floor|for|form|format|frac|frame|free|from|function|function-pool|generate|get|group|hashed|header|help-id|help-request|hide|hotspot|icon|id|if|import|importing|include|index|infotypes|initialization|inner|input|insert|intensified|interface|interface-pool|interfaces|into|inverse|join|key|language|last|leave|left|left-justified|like|line|line-count|line-selection|line-size|lines|list-processing|load|load-of-program|local|locale|log|log10|loop|m|margin|mask|matchcode|max|memory|message|message-id|messages|method|methods|min|mod|mode|modif|modify|module|move|move-corresponding|multiply|multiply-corresponding|new|new-line|new-page|next|no|no-gap|no-gaps|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unique|o|object|obligatory|occurs|of|off|on|open|or|order|others|outer|output|overlay|pack|page|parameter|parameters|perform|pf-status|position|print|print-control|private|process|program|property|protected|provide|public|put|radiobutton|raise|raising|range|ranges|read|receive|refresh|reject|replace|report|requested|reserve|reset|right-justified|rollback|round|rows|rtti|run|scan|screen|search|separated|scroll|scroll-boundary|select|select-options|selection-screen|selection-table|set|shared|shift|sign|sin|single|sinh|size|skip|sort|sorted|split|sql|sqrt|stamp|standard|start-of-selection|statics|stop|string|strlen|structure|submit|subtract|subtract-corresponding|sum|supply|suppress|symbol|syntax-check|syntax-trace|system-call|system-exceptions|table|table_line|tables|tan|tanh|text|textpool|time|times|title|titlebar|to|top-of-page|transaction|transfer|translate|transporting|trunc|type|type-pool|type-pools|types|uline|under|unique|unit|unpack|up|update|user-command|using|value|value-request|values|vary|when|where|while|window|with|with-title|work|write|x|xstring|z|zone)$/',
-                    'constants' => '/^((?i)initial|null|space|col_background|col_heading|col_normal|col_total|col_key|col_positive|col_negative|col_group)$/',
-                ),
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                    'sy' => '/^((?i)screen-name|screen-group1|screen-group2|screen-group3|screen-group4|screen-required|screen-input|screen-output|screen-intensified|screen-invisible|screen-length|screen-active|sy-index|sy-pagno|sy-tabix|sy-tfill|sy-tlopc|sy-tmaxl|sy-toccu|sy-ttabc|sy-tstis|sy-ttabi|sy-dbcnt|sy-fdpos|sy-colno|sy-linct|sy-linno|sy-linsz|sy-pagct|sy-macol|sy-marow|sy-tleng|sy-sfoff|sy-willi|sy-lilli|sy-subrc|sy-fleng|sy-cucol|sy-curow|sy-lsind|sy-listi|sy-stepl|sy-tpagi|sy-winx1|sy-winy1|sy-winx2|sy-winy2|sy-winco|sy-winro|sy-windi|sy-srows|sy-scols|sy-loopc|sy-folen|sy-fodec|sy-tzone|sy-dayst|sy-ftype|sy-appli|sy-fdayw|sy-ccurs|sy-ccurt|sy-debug|sy-ctype|sy-input|sy-langu|sy-modno|sy-batch|sy-binpt|sy-calld|sy-dynnr|sy-dyngr|sy-newpa|sy-pri40|sy-rstrt|sy-wtitl|sy-cpage|sy-dbnam|sy-mandt|sy-prefx|sy-fmkey|sy-pexpi|sy-prini|sy-primm|sy-prrel|sy-playo|sy-prbig|sy-playp|sy-prnew|sy-prlog|sy-pdest|sy-plist|sy-pauth|sy-prdsn|sy-pnwpa|sy-callr|sy-repi2|sy-rtitl|sy-prrec|sy-prtxt|sy-prabt|sy-lpass|sy-nrpag|sy-paart|sy-prcop|sy-batzs|sy-bspld|sy-brep4|sy-batzo|sy-batzd|sy-batzw|sy-batzm|sy-ctabl|sy-dbsys|sy-dcsys|sy-macdb|sy-sysid|sy-opsys|sy-pfkey|sy-saprl|sy-tcode|sy-ucomm|sy-cfwae|sy-chwae|sy-spono|sy-sponr|sy-waers|sy-cdate|sy-datum|sy-slset|sy-subty|sy-subcs|sy-group|sy-ffile|sy-uzeit|sy-dsnam|sy-repid|sy-tabid|sy-tfdsn|sy-uname|sy-lstat|sy-abcde|sy-marky|sy-sfnam|sy-tname|sy-msgli|sy-title|sy-entry|sy-lisel|sy-uline|sy-xcode|sy-cprog|sy-xprog|sy-xform|sy-ldbpg|sy-tvar0|sy-tvar1|sy-tvar2|sy-tvar3|sy-tvar4|sy-tvar5|sy-tvar6|sy-tvar7|sy-tvar8|sy-tvar9|sy-msgid|sy-msgty|sy-msgno|sy-msgv1|sy-msgv2|sy-msgv3|sy-msgv4|sy-oncom|sy-vline|sy-winsl|sy-staco|sy-staro|sy-datar|sy-host|sy-locdb|sy-locop|sy-datlo|sy-timlo|sy-zonlo|syst-index|syst-pagno|syst-tabix|syst-tfill|syst-tlopc|syst-tmaxl|syst-toccu|syst-ttabc|syst-tstis|syst-ttabi|syst-dbcnt|syst-fdpos|syst-colno|syst-linct|syst-linno|syst-linsz|syst-pagct|syst-macol|syst-marow|syst-tleng|syst-sfoff|syst-willi|syst-lilli|syst-subrc|syst-fleng|syst-cucol|syst-curow|syst-lsind|syst-listi|syst-stepl|syst-tpagi|syst-winx1|syst-winy1|syst-winx2|syst-winy2|syst-winco|syst-winro|syst-windi|syst-srows|syst-scols|syst-loopc|syst-folen|syst-fodec|syst-tzone|syst-dayst|syst-ftype|syst-appli|syst-fdayw|syst-ccurs|syst-ccurt|syst-debug|syst-ctype|syst-input|syst-langu|syst-modno|syst-batch|syst-binpt|syst-calld|syst-dynnr|syst-dyngr|syst-newpa|syst-pri40|syst-rstrt|syst-wtitl|syst-cpage|syst-dbnam|syst-mandt|syst-prefx|syst-fmkey|syst-pexpi|syst-prini|syst-primm|syst-prrel|syst-playo|syst-prbig|syst-playp|syst-prnew|syst-prlog|syst-pdest|syst-plist|syst-pauth|syst-prdsn|syst-pnwpa|syst-callr|syst-repi2|syst-rtitl|syst-prrec|syst-prtxt|syst-prabt|syst-lpass|syst-nrpag|syst-paart|syst-prcop|syst-batzs|syst-bspld|syst-brep4|syst-batzo|syst-batzd|syst-batzw|syst-batzm|syst-ctabl|syst-dbsys|syst-dcsys|syst-macdb|syst-sysid|syst-opsys|syst-pfkey|syst-saprl|syst-tcode|syst-ucomm|syst-cfwae|syst-chwae|syst-spono|syst-sponr|syst-waers|syst-cdate|syst-datum|syst-slset|syst-subty|syst-subcs|syst-group|syst-ffile|syst-uzeit|syst-dsnam|syst-repid|syst-tabid|syst-tfdsn|syst-uname|syst-lstat|syst-abcde|syst-marky|syst-sfnam|syst-tname|syst-msgli|syst-title|syst-entry|syst-lisel|syst-uline|syst-xcode|syst-cprog|syst-xprog|syst-xform|syst-ldbpg|syst-tvar0|syst-tvar1|syst-tvar2|syst-tvar3|syst-tvar4|syst-tvar5|syst-tvar6|syst-tvar7|syst-tvar8|syst-tvar9|syst-msgid|syst-msgty|syst-msgno|syst-msgv1|syst-msgv2|syst-msgv3|syst-msgv4|syst-oncom|syst-vline|syst-winsl|syst-staco|syst-staro|syst-datar|syst-host|syst-locdb|syst-locop|syst-datlo|syst-timlo|syst-zonlo)$/',
-                    'reserved' => '/^((?i)abs|acos|add|add-corresponding|adjacent|after|aliases|all|analyzer|and|any|append|as|ascending|asin|assign|assigned|assigning|at|atan|authority-check|avg|back|before|begin|binary|bit|bit-and|bit-not|bit-or|bit-xor|blank|block|break-point|buffer|by|c|call|case|catch|ceil|centered|chain|change|changing|check|checkbox|class|class-data|class-events|class-methods|class-pool|clear|client|close|cnt|code|collect|color|comment|commit|communication|compute|concatenate|condense|constants|context|contexts|continue|control|controls|convert|copy|corresponding|cos|cosh|count|country|create|currency|cursor|customer-function|data|database|dataset|delete|decimals|default|define|demand|descending|describe|dialog|distinct|div|divide|divide-corresponding|do|duplicates|dynpro|edit|editor-call|else|elseif|end|end-of-definition|end-of-page|end-of-selection|endat|endcase|endcatch|endchain|endclass|enddo|endexec|endform|endfunction|endif|endinterface|endloop|endmethod|endmodule|endon|endprovide|endselect|endwhile|entries|events|exec|exit|exit-command|exp|exponent|export|exporting|exceptions|extended|extract|fetch|field|field-groups|field-symbols|fields|floor|for|form|format|frac|frame|free|from|function|function-pool|generate|get|group|hashed|header|help-id|help-request|hide|hotspot|icon|id|if|import|importing|include|index|infotypes|initialization|inner|input|insert|intensified|interface|interface-pool|interfaces|into|inverse|join|key|language|last|leave|left|left-justified|like|line|line-count|line-selection|line-size|lines|list-processing|load|load-of-program|local|locale|log|log10|loop|m|margin|mask|matchcode|max|memory|message|message-id|messages|method|methods|min|mod|mode|modif|modify|module|move|move-corresponding|multiply|multiply-corresponding|new|new-line|new-page|next|no|no-gap|no-gaps|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unique|o|object|obligatory|occurs|of|off|on|open|or|order|others|outer|output|overlay|pack|page|parameter|parameters|perform|pf-status|position|print|print-control|private|process|program|property|protected|provide|public|put|radiobutton|raise|raising|range|ranges|read|receive|refresh|reject|replace|report|requested|reserve|reset|right-justified|rollback|round|rows|rtti|run|scan|screen|search|separated|scroll|scroll-boundary|select|select-options|selection-screen|selection-table|set|shared|shift|sign|sin|single|sinh|size|skip|sort|sorted|split|sql|sqrt|stamp|standard|start-of-selection|statics|stop|string|strlen|structure|submit|subtract|subtract-corresponding|sum|supply|suppress|symbol|syntax-check|syntax-trace|system-call|system-exceptions|table|table_line|tables|tan|tanh|text|textpool|time|times|title|titlebar|to|top-of-page|transaction|transfer|translate|transporting|trunc|type|type-pool|type-pools|types|uline|under|unique|unit|unpack|up|update|user-command|using|value|value-request|values|vary|when|where|while|window|with|with-title|work|write|x|xstring|z|zone)$/',
-                    'constants' => '/^((?i)initial|null|space|col_background|col_heading|col_normal|col_total|col_key|col_positive|col_negative|col_group)$/',
-                ),
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                    'sy' => '/^((?i)screen-name|screen-group1|screen-group2|screen-group3|screen-group4|screen-required|screen-input|screen-output|screen-intensified|screen-invisible|screen-length|screen-active|sy-index|sy-pagno|sy-tabix|sy-tfill|sy-tlopc|sy-tmaxl|sy-toccu|sy-ttabc|sy-tstis|sy-ttabi|sy-dbcnt|sy-fdpos|sy-colno|sy-linct|sy-linno|sy-linsz|sy-pagct|sy-macol|sy-marow|sy-tleng|sy-sfoff|sy-willi|sy-lilli|sy-subrc|sy-fleng|sy-cucol|sy-curow|sy-lsind|sy-listi|sy-stepl|sy-tpagi|sy-winx1|sy-winy1|sy-winx2|sy-winy2|sy-winco|sy-winro|sy-windi|sy-srows|sy-scols|sy-loopc|sy-folen|sy-fodec|sy-tzone|sy-dayst|sy-ftype|sy-appli|sy-fdayw|sy-ccurs|sy-ccurt|sy-debug|sy-ctype|sy-input|sy-langu|sy-modno|sy-batch|sy-binpt|sy-calld|sy-dynnr|sy-dyngr|sy-newpa|sy-pri40|sy-rstrt|sy-wtitl|sy-cpage|sy-dbnam|sy-mandt|sy-prefx|sy-fmkey|sy-pexpi|sy-prini|sy-primm|sy-prrel|sy-playo|sy-prbig|sy-playp|sy-prnew|sy-prlog|sy-pdest|sy-plist|sy-pauth|sy-prdsn|sy-pnwpa|sy-callr|sy-repi2|sy-rtitl|sy-prrec|sy-prtxt|sy-prabt|sy-lpass|sy-nrpag|sy-paart|sy-prcop|sy-batzs|sy-bspld|sy-brep4|sy-batzo|sy-batzd|sy-batzw|sy-batzm|sy-ctabl|sy-dbsys|sy-dcsys|sy-macdb|sy-sysid|sy-opsys|sy-pfkey|sy-saprl|sy-tcode|sy-ucomm|sy-cfwae|sy-chwae|sy-spono|sy-sponr|sy-waers|sy-cdate|sy-datum|sy-slset|sy-subty|sy-subcs|sy-group|sy-ffile|sy-uzeit|sy-dsnam|sy-repid|sy-tabid|sy-tfdsn|sy-uname|sy-lstat|sy-abcde|sy-marky|sy-sfnam|sy-tname|sy-msgli|sy-title|sy-entry|sy-lisel|sy-uline|sy-xcode|sy-cprog|sy-xprog|sy-xform|sy-ldbpg|sy-tvar0|sy-tvar1|sy-tvar2|sy-tvar3|sy-tvar4|sy-tvar5|sy-tvar6|sy-tvar7|sy-tvar8|sy-tvar9|sy-msgid|sy-msgty|sy-msgno|sy-msgv1|sy-msgv2|sy-msgv3|sy-msgv4|sy-oncom|sy-vline|sy-winsl|sy-staco|sy-staro|sy-datar|sy-host|sy-locdb|sy-locop|sy-datlo|sy-timlo|sy-zonlo|syst-index|syst-pagno|syst-tabix|syst-tfill|syst-tlopc|syst-tmaxl|syst-toccu|syst-ttabc|syst-tstis|syst-ttabi|syst-dbcnt|syst-fdpos|syst-colno|syst-linct|syst-linno|syst-linsz|syst-pagct|syst-macol|syst-marow|syst-tleng|syst-sfoff|syst-willi|syst-lilli|syst-subrc|syst-fleng|syst-cucol|syst-curow|syst-lsind|syst-listi|syst-stepl|syst-tpagi|syst-winx1|syst-winy1|syst-winx2|syst-winy2|syst-winco|syst-winro|syst-windi|syst-srows|syst-scols|syst-loopc|syst-folen|syst-fodec|syst-tzone|syst-dayst|syst-ftype|syst-appli|syst-fdayw|syst-ccurs|syst-ccurt|syst-debug|syst-ctype|syst-input|syst-langu|syst-modno|syst-batch|syst-binpt|syst-calld|syst-dynnr|syst-dyngr|syst-newpa|syst-pri40|syst-rstrt|syst-wtitl|syst-cpage|syst-dbnam|syst-mandt|syst-prefx|syst-fmkey|syst-pexpi|syst-prini|syst-primm|syst-prrel|syst-playo|syst-prbig|syst-playp|syst-prnew|syst-prlog|syst-pdest|syst-plist|syst-pauth|syst-prdsn|syst-pnwpa|syst-callr|syst-repi2|syst-rtitl|syst-prrec|syst-prtxt|syst-prabt|syst-lpass|syst-nrpag|syst-paart|syst-prcop|syst-batzs|syst-bspld|syst-brep4|syst-batzo|syst-batzd|syst-batzw|syst-batzm|syst-ctabl|syst-dbsys|syst-dcsys|syst-macdb|syst-sysid|syst-opsys|syst-pfkey|syst-saprl|syst-tcode|syst-ucomm|syst-cfwae|syst-chwae|syst-spono|syst-sponr|syst-waers|syst-cdate|syst-datum|syst-slset|syst-subty|syst-subcs|syst-group|syst-ffile|syst-uzeit|syst-dsnam|syst-repid|syst-tabid|syst-tfdsn|syst-uname|syst-lstat|syst-abcde|syst-marky|syst-sfnam|syst-tname|syst-msgli|syst-title|syst-entry|syst-lisel|syst-uline|syst-xcode|syst-cprog|syst-xprog|syst-xform|syst-ldbpg|syst-tvar0|syst-tvar1|syst-tvar2|syst-tvar3|syst-tvar4|syst-tvar5|syst-tvar6|syst-tvar7|syst-tvar8|syst-tvar9|syst-msgid|syst-msgty|syst-msgno|syst-msgv1|syst-msgv2|syst-msgv3|syst-msgv4|syst-oncom|syst-vline|syst-winsl|syst-staco|syst-staro|syst-datar|syst-host|syst-locdb|syst-locop|syst-datlo|syst-timlo|syst-zonlo)$/',
-                    'reserved' => '/^((?i)abs|acos|add|add-corresponding|adjacent|after|aliases|all|analyzer|and|any|append|as|ascending|asin|assign|assigned|assigning|at|atan|authority-check|avg|back|before|begin|binary|bit|bit-and|bit-not|bit-or|bit-xor|blank|block|break-point|buffer|by|c|call|case|catch|ceil|centered|chain|change|changing|check|checkbox|class|class-data|class-events|class-methods|class-pool|clear|client|close|cnt|code|collect|color|comment|commit|communication|compute|concatenate|condense|constants|context|contexts|continue|control|controls|convert|copy|corresponding|cos|cosh|count|country|create|currency|cursor|customer-function|data|database|dataset|delete|decimals|default|define|demand|descending|describe|dialog|distinct|div|divide|divide-corresponding|do|duplicates|dynpro|edit|editor-call|else|elseif|end|end-of-definition|end-of-page|end-of-selection|endat|endcase|endcatch|endchain|endclass|enddo|endexec|endform|endfunction|endif|endinterface|endloop|endmethod|endmodule|endon|endprovide|endselect|endwhile|entries|events|exec|exit|exit-command|exp|exponent|export|exporting|exceptions|extended|extract|fetch|field|field-groups|field-symbols|fields|floor|for|form|format|frac|frame|free|from|function|function-pool|generate|get|group|hashed|header|help-id|help-request|hide|hotspot|icon|id|if|import|importing|include|index|infotypes|initialization|inner|input|insert|intensified|interface|interface-pool|interfaces|into|inverse|join|key|language|last|leave|left|left-justified|like|line|line-count|line-selection|line-size|lines|list-processing|load|load-of-program|local|locale|log|log10|loop|m|margin|mask|matchcode|max|memory|message|message-id|messages|method|methods|min|mod|mode|modif|modify|module|move|move-corresponding|multiply|multiply-corresponding|new|new-line|new-page|next|no|no-gap|no-gaps|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unique|o|object|obligatory|occurs|of|off|on|open|or|order|others|outer|output|overlay|pack|page|parameter|parameters|perform|pf-status|position|print|print-control|private|process|program|property|protected|provide|public|put|radiobutton|raise|raising|range|ranges|read|receive|refresh|reject|replace|report|requested|reserve|reset|right-justified|rollback|round|rows|rtti|run|scan|screen|search|separated|scroll|scroll-boundary|select|select-options|selection-screen|selection-table|set|shared|shift|sign|sin|single|sinh|size|skip|sort|sorted|split|sql|sqrt|stamp|standard|start-of-selection|statics|stop|string|strlen|structure|submit|subtract|subtract-corresponding|sum|supply|suppress|symbol|syntax-check|syntax-trace|system-call|system-exceptions|table|table_line|tables|tan|tanh|text|textpool|time|times|title|titlebar|to|top-of-page|transaction|transfer|translate|transporting|trunc|type|type-pool|type-pools|types|uline|under|unique|unit|unpack|up|update|user-command|using|value|value-request|values|vary|when|where|while|window|with|with-title|work|write|x|xstring|z|zone)$/',
-                    'constants' => '/^((?i)initial|null|space|col_background|col_heading|col_normal|col_total|col_key|col_positive|col_negative|col_group)$/',
-                ),
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-            ),
-            1 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-            ),
-            0 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'sy' => 'reserved',
-            'reserved' => 'reserved',
-            'constants' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/AVRC.php b/library/Text_Highlighter/Text/Highlighter/AVRC.php
deleted file mode 100644
index de4b82ccd..000000000
--- a/library/Text_Highlighter/Text/Highlighter/AVRC.php
+++ /dev/null
@@ -1,894 +0,0 @@
-
-<?php
-/**
- * Auto-generated class. AVRC syntax highlighting
- * 
- * 
- * 		C/C++ highlighter specific to Atmel AVR microcontrollers
- *      
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: avrc.xml
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. AVRC syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_AVRC extends Text_Highlighter
-{
-    var $_language = 'avrc';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_AVRC($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            0 => '/((?i)\\\\)/',
-            1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            2 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            3 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            4 => '//',
-            5 => '/((?i)")|((?i)<)/',
-            6 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            7 => '/((?i)\\$\\w+\\s*:.+\\$)/',
-            8 => '/((?i)\\$\\w+\\s*:.+\\$)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-            ),
-            0 => 
-            array (
-                0 => 0,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 0,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 2,
-                8 => 0,
-                9 => 0,
-            ),
-            7 => 
-            array (
-                0 => 0,
-            ),
-            8 => 
-            array (
-                0 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => 'prepro',
-                10 => 'prepro',
-                11 => '',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            0 => 
-            array (
-                0 => '',
-            ),
-            1 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => 'prepro',
-                10 => 'prepro',
-                11 => '',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            2 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => 'prepro',
-                10 => 'prepro',
-                11 => '',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            3 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => 'prepro',
-                10 => 'prepro',
-                11 => '',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => 'quotes',
-                1 => 'quotes',
-            ),
-            6 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => '',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => 'mlcomment',
-                9 => 'comment',
-            ),
-            7 => 
-            array (
-                0 => '',
-            ),
-            8 => 
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'identifier',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'prepro',
-                10 => 'code',
-                11 => 'number',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            0 => 
-            array (
-                0 => 'special',
-            ),
-            1 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'identifier',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'prepro',
-                10 => 'code',
-                11 => 'number',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            2 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'identifier',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'prepro',
-                10 => 'code',
-                11 => 'number',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            3 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'identifier',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'prepro',
-                10 => 'code',
-                11 => 'number',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => 'string',
-                1 => 'string',
-            ),
-            6 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'identifier',
-                4 => 'number',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'mlcomment',
-                9 => 'comment',
-            ),
-            7 => 
-            array (
-                0 => 'inlinedoc',
-            ),
-            8 => 
-            array (
-                0 => 'inlinedoc',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)"/',
-            1 => '/(?i)\\}/',
-            2 => '/(?i)\\)/',
-            3 => '/(?i)\\]/',
-            4 => '/(?i)>/',
-            5 => '/(?mi)(?<!\\\\)$/',
-            6 => '/(?mi)(?<!\\\\)$/',
-            7 => '/(?i)\\*\\//',
-            8 => '/(?mi)$/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 5,
-                10 => 6,
-                11 => -1,
-                12 => 7,
-                13 => 8,
-            ),
-            0 => 
-            array (
-                0 => -1,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 5,
-                10 => 6,
-                11 => -1,
-                12 => 7,
-                13 => 8,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 5,
-                10 => 6,
-                11 => -1,
-                12 => 7,
-                13 => 8,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 5,
-                10 => 6,
-                11 => -1,
-                12 => 7,
-                13 => 8,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 4,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => 7,
-                9 => 8,
-            ),
-            7 => 
-            array (
-                0 => -1,
-            ),
-            8 => 
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => -1,
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => -1,
-            ),
-            0 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => -1,
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => -1,
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => -1,
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => -1,
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => -1,
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => -1,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => -1,
-                1 => -1,
-            ),
-            6 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                4 => 
-                array (
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => -1,
-                9 => -1,
-            ),
-            7 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            8 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-                0 => NULL,
-            ),
-            1 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-            ),
-            6 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-            ),
-            7 => 
-            array (
-                0 => NULL,
-            ),
-            8 => 
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-            ),
-            0 => 
-            array (
-                0 => false,
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => false,
-                1 => false,
-            ),
-            6 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-            ),
-            7 => 
-            array (
-                0 => false,
-            ),
-            8 => 
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'reserved' => 'reserved',
-            'registers' => 'reserved',
-            'types' => 'types',
-            'Common Macros' => 'prepro',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/CPP.php b/library/Text_Highlighter/Text/Highlighter/CPP.php
deleted file mode 100644
index eaa47c575..000000000
--- a/library/Text_Highlighter/Text/Highlighter/CPP.php
+++ /dev/null
@@ -1,891 +0,0 @@
-
-<?php
-/**
- * Auto-generated class. CPP syntax highlighting
- * 
- * 
- * Thanks to Aaron Kalin for initial
- * implementation of this highlighter
- *      
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: cpp.xml
- * @author Aaron Kalin
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. CPP syntax highlighting
- *
- * @author Aaron Kalin
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_CPP extends Text_Highlighter
-{
-    var $_language = 'cpp';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_CPP($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            0 => '/((?i)\\\\)/',
-            1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            2 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            3 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            4 => '//',
-            5 => '/((?i)")|((?i)<)/',
-            6 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\/\\*)|((?i)\\/\\/.+)/',
-            7 => '/((?i)\\$\\w+\\s*:.+\\$)/',
-            8 => '/((?i)\\$\\w+\\s*:.+\\$)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-            ),
-            0 => 
-            array (
-                0 => 0,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 0,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 2,
-                8 => 0,
-                9 => 0,
-            ),
-            7 => 
-            array (
-                0 => 0,
-            ),
-            8 => 
-            array (
-                0 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => 'prepro',
-                10 => 'prepro',
-                11 => '',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            0 => 
-            array (
-                0 => '',
-            ),
-            1 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => 'prepro',
-                10 => 'prepro',
-                11 => '',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            2 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => 'prepro',
-                10 => 'prepro',
-                11 => '',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            3 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => 'prepro',
-                10 => 'prepro',
-                11 => '',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => 'quotes',
-                1 => 'quotes',
-            ),
-            6 => 
-            array (
-                0 => 'quotes',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => '',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => 'mlcomment',
-                9 => 'comment',
-            ),
-            7 => 
-            array (
-                0 => '',
-            ),
-            8 => 
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'identifier',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'prepro',
-                10 => 'code',
-                11 => 'number',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            0 => 
-            array (
-                0 => 'special',
-            ),
-            1 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'identifier',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'prepro',
-                10 => 'code',
-                11 => 'number',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            2 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'identifier',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'prepro',
-                10 => 'code',
-                11 => 'number',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            3 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'identifier',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'number',
-                9 => 'prepro',
-                10 => 'code',
-                11 => 'number',
-                12 => 'mlcomment',
-                13 => 'comment',
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => 'string',
-                1 => 'string',
-            ),
-            6 => 
-            array (
-                0 => 'string',
-                1 => 'code',
-                2 => 'code',
-                3 => 'identifier',
-                4 => 'number',
-                5 => 'number',
-                6 => 'number',
-                7 => 'number',
-                8 => 'mlcomment',
-                9 => 'comment',
-            ),
-            7 => 
-            array (
-                0 => 'inlinedoc',
-            ),
-            8 => 
-            array (
-                0 => 'inlinedoc',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)"/',
-            1 => '/(?i)\\}/',
-            2 => '/(?i)\\)/',
-            3 => '/(?i)\\]/',
-            4 => '/(?i)>/',
-            5 => '/(?mi)(?<!\\\\)$/',
-            6 => '/(?mi)(?<!\\\\)$/',
-            7 => '/(?i)\\*\\//',
-            8 => '/(?mi)$/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 5,
-                10 => 6,
-                11 => -1,
-                12 => 7,
-                13 => 8,
-            ),
-            0 => 
-            array (
-                0 => -1,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 5,
-                10 => 6,
-                11 => -1,
-                12 => 7,
-                13 => 8,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 5,
-                10 => 6,
-                11 => -1,
-                12 => 7,
-                13 => 8,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 5,
-                10 => 6,
-                11 => -1,
-                12 => 7,
-                13 => 8,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 4,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => 7,
-                9 => 8,
-            ),
-            7 => 
-            array (
-                0 => -1,
-            ),
-            8 => 
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => -1,
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => -1,
-            ),
-            0 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => -1,
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => -1,
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => -1,
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => -1,
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => -1,
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => -1,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => -1,
-                1 => -1,
-            ),
-            6 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => 
-                array (
-                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
-                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
-                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
-                ),
-                4 => 
-                array (
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => -1,
-                9 => -1,
-            ),
-            7 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            8 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-                0 => NULL,
-            ),
-            1 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-            ),
-            6 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-            ),
-            7 => 
-            array (
-                0 => NULL,
-            ),
-            8 => 
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-            ),
-            0 => 
-            array (
-                0 => false,
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-            ),
-            4 => 
-            array (
-            ),
-            5 => 
-            array (
-                0 => false,
-                1 => false,
-            ),
-            6 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-            ),
-            7 => 
-            array (
-                0 => false,
-            ),
-            8 => 
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'reserved' => 'reserved',
-            'types' => 'types',
-            'Common Macros' => 'prepro',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/CSS.php b/library/Text_Highlighter/Text/Highlighter/CSS.php
deleted file mode 100644
index 51757c88e..000000000
--- a/library/Text_Highlighter/Text/Highlighter/CSS.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-/**
- * Auto-generated class. CSS syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: css.xml
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. CSS syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_CSS extends Text_Highlighter
-{
-    var $_language = 'css';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_CSS($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\/\\*)|((?i)(@[a-z\\d]+))|((?i)(((\\.|#)?[a-z]+[a-z\\d\\-]*(?![a-z\\d\\-]))|(\\*))(?!\\s*:\\s*[\\s\\{]))|((?i):[a-z][a-z\\d\\-]*)|((?i)\\[)|((?i)\\{)/',
-            0 => '//',
-            1 => '/((?i)\\d*\\.?\\d+(\\%|em|ex|pc|pt|px|in|mm|cm))|((?i)\\d*\\.?\\d+)|((?i)[a-z][a-z\\d\\-]*)|((?i)#([\\da-f]{6}|[\\da-f]{3})\\b)/',
-            2 => '/((?i)\')|((?i)")|((?i)[\\w\\-\\:]+)/',
-            3 => '/((?i)\\/\\*)|((?i)[a-z][a-z\\d\\-]*\\s*:)|((?i)(((\\.|#)?[a-z]+[a-z\\d\\-]*(?![a-z\\d\\-]))|(\\*))(?!\\s*:\\s*[\\s\\{]))|((?i)\\{)/',
-            4 => '/((?i)\\\\[\\\\(\\\\)\\\\])/',
-            5 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            6 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`|\\\\t|\\\\n|\\\\r)/',
-        );
-        $this->_counts = array (
-            -1 =>
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 4,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-                0 => 1,
-                1 => 0,
-                2 => 0,
-                3 => 1,
-            ),
-            2 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            3 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 4,
-                3 => 0,
-            ),
-            4 =>
-            array (
-                0 => 0,
-            ),
-            5 =>
-            array (
-                0 => 0,
-            ),
-            6 =>
-            array (
-                0 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 =>
-            array (
-                0 => 'comment',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => 'brackets',
-                5 => 'brackets',
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-            2 =>
-            array (
-                0 => 'quotes',
-                1 => 'quotes',
-                2 => '',
-            ),
-            3 =>
-            array (
-                0 => 'comment',
-                1 => 'reserved',
-                2 => '',
-                3 => 'brackets',
-            ),
-            4 =>
-            array (
-                0 => '',
-            ),
-            5 =>
-            array (
-                0 => '',
-            ),
-            6 =>
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 =>
-            array (
-                0 => 'comment',
-                1 => 'var',
-                2 => 'identifier',
-                3 => 'special',
-                4 => 'code',
-                5 => 'code',
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-                0 => 'number',
-                1 => 'number',
-                2 => 'code',
-                3 => 'var',
-            ),
-            2 =>
-            array (
-                0 => 'string',
-                1 => 'string',
-                2 => 'var',
-            ),
-            3 =>
-            array (
-                0 => 'comment',
-                1 => 'code',
-                2 => 'identifier',
-                3 => 'code',
-            ),
-            4 =>
-            array (
-                0 => 'string',
-            ),
-            5 =>
-            array (
-                0 => 'special',
-            ),
-            6 =>
-            array (
-                0 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\*\\//',
-            1 => '/(?i)(?=;|\\})/',
-            2 => '/(?i)\\]/',
-            3 => '/(?i)\\}/',
-            4 => '/(?i)\\)/',
-            5 => '/(?i)\'/',
-            6 => '/(?i)"/',
-        );
-        $this->_states = array (
-            -1 =>
-            array (
-                0 => 0,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 2,
-                5 => 3,
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-            2 =>
-            array (
-                0 => 5,
-                1 => 6,
-                2 => -1,
-            ),
-            3 =>
-            array (
-                0 => 0,
-                1 => 1,
-                2 => -1,
-                3 => 3,
-            ),
-            4 =>
-            array (
-                0 => -1,
-            ),
-            5 =>
-            array (
-                0 => -1,
-            ),
-            6 =>
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 =>
-            array (
-                0 => -1,
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-                3 =>
-                array (
-                ),
-                4 => -1,
-                5 => -1,
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                    'propertyValue' => '/^((?i)far-left|left|center-left|center-right|center|far-right|right-side|right|behind|leftwards|rightwards|inherit|scroll|fixed|transparent|none|repeat-x|repeat-y|repeat|no-repeat|collapse|separate|auto|top|bottom|both|open-quote|close-quote|no-open-quote|no-close-quote|crosshair|default|pointer|move|e-resize|ne-resize|nw-resize|n-resize|se-resize|sw-resize|s-resize|text|wait|help|ltr|rtl|inline|block|list-item|run-in|compact|marker|table|inline-table|table-row-group|table-header-group|table-footer-group|table-row|table-column-group|table-column|table-cell|table-caption|below|level|above|higher|lower|show|hide|caption|icon|menu|message-box|small-caption|status-bar|normal|wider|narrower|ultra-condensed|extra-condensed|condensed|semi-condensed|semi-expanded|expanded|extra-expanded|ultra-expanded|italic|oblique|small-caps|bold|bolder|lighter|inside|outside|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-greek|lower-alpha|lower-latin|upper-alpha|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha|crop|cross|invert|visible|hidden|always|avoid|x-low|low|medium|high|x-high|mix?|repeat?|static|relative|absolute|portrait|landscape|spell-out|once|digits|continuous|code|x-slow|slow|fast|x-fast|faster|slower|justify|underline|overline|line-through|blink|capitalize|uppercase|lowercase|embed|bidi-override|baseline|sub|super|text-top|middle|text-bottom|silent|x-soft|soft|loud|x-loud|pre|nowrap|serif|sans-serif|cursive|fantasy|monospace|empty|string|strict|loose|char|true|false|dotted|dashed|solid|double|groove|ridge|inset|outset|larger|smaller|xx-small|x-small|small|large|x-large|xx-large|all|newspaper|distribute|distribute-all-lines|distribute-center-last|inter-word|inter-ideograph|inter-cluster|kashida|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|keep-all|break-all|break-word|lr-tb|tb-rl|thin|thick|inline-block|w-resize|hand|distribute-letter|distribute-space|whitespace|male|female|child)$/',
-                    'namedcolor' => '/^((?i)aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow|activeborder|activecaption|appworkspace|background|buttonface|buttonhighlight|buttonshadow|buttontext|captiontext|graytext|highlight|highlighttext|inactiveborder|inactivecaption|inactivecaptiontext|infobackground|infotext|menu|menutext|scrollbar|threeddarkshadow|threedface|threedhighlight|threedlightshadow|threedshadow|window|windowframe|windowtext)$/',
-                ),
-                3 =>
-                array (
-                ),
-            ),
-            2 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 =>
-                array (
-                ),
-            ),
-            3 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 =>
-                array (
-                ),
-                3 => -1,
-            ),
-            4 =>
-            array (
-                0 =>
-                array (
-                ),
-            ),
-            5 =>
-            array (
-                0 =>
-                array (
-                ),
-            ),
-            6 =>
-            array (
-                0 =>
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-                0 =>
-                array (
-                    1 => 'string',
-                ),
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-            2 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            3 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-            4 =>
-            array (
-                0 => NULL,
-            ),
-            5 =>
-            array (
-                0 => NULL,
-            ),
-            6 =>
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-            ),
-            0 =>
-            array (
-            ),
-            1 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            2 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            3 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            4 =>
-            array (
-                0 => false,
-            ),
-            5 =>
-            array (
-                0 => false,
-            ),
-            6 =>
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'propertyValue' => 'string',
-            'namedcolor' => 'var',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
-}
diff --git a/library/Text_Highlighter/Text/Highlighter/DIFF.php b/library/Text_Highlighter/Text/Highlighter/DIFF.php
deleted file mode 100644
index 2bb25a453..000000000
--- a/library/Text_Highlighter/Text/Highlighter/DIFF.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-/**
- * Auto-generated class. DIFF syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : diff.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. DIFF syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_DIFF extends Text_Highlighter
-{
-    var $_language = 'diff';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_DIFF($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?m)^\\\\\\sNo\\snewline.+$)|((?m)^\\-\\-\\-$)|((?m)^(diff\\s+\\-|Only\\s+|Index).*$)|((?m)^(\\-\\-\\-|\\+\\+\\+)\\s.+$)|((?m)^\\*.*$)|((?m)^\\+.*$)|((?m)^!.*$)|((?m)^\\<\\s.*$)|((?m)^\\>\\s.*$)|((?m)^\\d+(\\,\\d+)?[acd]\\d+(,\\d+)?$)|((?m)^\\-.*$)|((?m)^\\+.*$)|((?m)^@@.+@@$)|((?m)^d\\d+\\s\\d+$)|((?m)^a\\d+\\s\\d+$)|((?m)^(\\d+)(,\\d+)?(a)$)|((?m)^(\\d+)(,\\d+)?(c)$)|((?m)^(\\d+)(,\\d+)?(d)$)|((?m)^a(\\d+)(\\s\\d+)?$)|((?m)^c(\\d+)(\\s\\d+)?$)|((?m)^d(\\d+)(\\s\\d+)?$)/',
-            0 => '//',
-            1 => '//',
-            2 => '//',
-            3 => '//',
-            4 => '//',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-                3 => 1,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 2,
-                10 => 0,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 3,
-                16 => 3,
-                17 => 3,
-                18 => 2,
-                19 => 2,
-                20 => 2,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => 'code',
-                15 => 'code',
-                16 => 'code',
-                17 => '',
-                18 => 'code',
-                19 => 'code',
-                20 => '',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'special',
-                1 => 'code',
-                2 => 'var',
-                3 => 'reserved',
-                4 => 'quotes',
-                5 => 'string',
-                6 => 'inlinedoc',
-                7 => 'quotes',
-                8 => 'string',
-                9 => 'code',
-                10 => 'quotes',
-                11 => 'string',
-                12 => 'code',
-                13 => 'code',
-                14 => 'var',
-                15 => 'string',
-                16 => 'inlinedoc',
-                17 => 'code',
-                18 => 'string',
-                19 => 'inlinedoc',
-                20 => 'code',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?m)(?=^[ad]\\d+\\s\\d+)/',
-            1 => '/(?m)^(\\.)$/',
-            2 => '/(?m)^(\\.)$/',
-            3 => '/(?m)^(\\.)$/',
-            4 => '/(?m)^(\\.)$/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => 0,
-                15 => 1,
-                16 => 2,
-                17 => -1,
-                18 => 3,
-                19 => 4,
-                20 => -1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-                4 => 
-                array (
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => -1,
-                15 => -1,
-                16 => -1,
-                17 => 
-                array (
-                ),
-                18 => -1,
-                19 => -1,
-                20 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-            ),
-            3 => 
-            array (
-            ),
-            4 => 
-            array (
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-        );
-        $this->_defClass = 'default';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/DTD.php b/library/Text_Highlighter/Text/Highlighter/DTD.php
deleted file mode 100644
index 41b0faa78..000000000
--- a/library/Text_Highlighter/Text/Highlighter/DTD.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-/**
- * Auto-generated class. DTD syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : dtd.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. DTD syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_DTD extends Text_Highlighter
-{
-    var $_language = 'dtd';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_DTD($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/(\\<!--)|(\\<\\!\\[)|((\\&|\\%)[\\w\\-\\.]+;)/',
-            0 => '//',
-            1 => '/(\\<!--)|(\\<)|(#PCDATA\\b)|((\\&|\\%)[\\w\\-\\.]+;)|((?i)[a-z][a-z\\d\\-\\,:]+)/',
-            2 => '/(\\<!--)|(\\()|(\')|(")|((?<=\\<)!(ENTITY|ATTLIST|ELEMENT|NOTATION)\\b)|(\\s(#(IMPLIED|REQUIRED|FIXED))|CDATA|ENTITY|NOTATION|NMTOKENS?|PUBLIC|SYSTEM\\b)|(#PCDATA\\b)|((\\&|\\%)[\\w\\-\\.]+;)|((?i)[a-z][a-z\\d\\-\\,:]+)/',
-            3 => '/(\\()|((\\&|\\%)[\\w\\-\\.]+;)|((?i)[a-z][a-z\\d\\-\\,:]+)/',
-            4 => '/((\\&|\\%)[\\w\\-\\.]+;)/',
-            5 => '/((\\&|\\%)[\\w\\-\\.]+;)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 1,
-                4 => 0,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 1,
-                5 => 2,
-                6 => 0,
-                7 => 1,
-                8 => 0,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 0,
-            ),
-            4 => 
-            array (
-                0 => 1,
-            ),
-            5 => 
-            array (
-                0 => 1,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'comment',
-                1 => 'brackets',
-                2 => '',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 'comment',
-                1 => 'brackets',
-                2 => '',
-                3 => '',
-                4 => '',
-            ),
-            2 => 
-            array (
-                0 => 'comment',
-                1 => 'brackets',
-                2 => 'quotes',
-                3 => 'quotes',
-                4 => '',
-                5 => '',
-                6 => '',
-                7 => '',
-                8 => '',
-            ),
-            3 => 
-            array (
-                0 => 'brackets',
-                1 => '',
-                2 => '',
-            ),
-            4 => 
-            array (
-                0 => '',
-            ),
-            5 => 
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'comment',
-                1 => 'code',
-                2 => 'special',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 'comment',
-                1 => 'code',
-                2 => 'reserved',
-                3 => 'special',
-                4 => 'identifier',
-            ),
-            2 => 
-            array (
-                0 => 'comment',
-                1 => 'code',
-                2 => 'string',
-                3 => 'string',
-                4 => 'var',
-                5 => 'reserved',
-                6 => 'reserved',
-                7 => 'special',
-                8 => 'identifier',
-            ),
-            3 => 
-            array (
-                0 => 'code',
-                1 => 'special',
-                2 => 'identifier',
-            ),
-            4 => 
-            array (
-                0 => 'special',
-            ),
-            5 => 
-            array (
-                0 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/--\\>/',
-            1 => '/\\]\\]\\>/',
-            2 => '/\\>/',
-            3 => '/\\)/',
-            4 => '/\'/',
-            5 => '/"/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => -1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 2,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 3,
-                2 => 4,
-                3 => 5,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-            ),
-            3 => 
-            array (
-                0 => 3,
-                1 => -1,
-                2 => -1,
-            ),
-            4 => 
-            array (
-                0 => -1,
-            ),
-            5 => 
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-                4 => 
-                array (
-                ),
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                ),
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            5 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-            ),
-            5 => 
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-            ),
-            5 => 
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/Generator.php b/library/Text_Highlighter/Text/Highlighter/Generator.php
deleted file mode 100644
index 39c4edccb..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Generator.php
+++ /dev/null
@@ -1,1291 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
-* Syntax highlighter class generator
-*
-* To simplify the process of creating new syntax highlighters
-* for different languages, {@link Text_Highlighter_Generator} class is
-* provided. It takes highlighting rules from XML file and generates
-* a code of a class inherited from {@link Text_Highlighter}.
-*
-* PHP versions 4 and 5
-*
-* LICENSE: This source file is subject to version 3.0 of the PHP license
-* that is available through the world-wide-web at the following URI:
-* http://www.php.net/license/3_0.txt.  If you did not receive a copy of
-* the PHP License and are unable to obtain it through the web, please
-* send a note to license@php.net so we can mail you a copy immediately.
-*
-* @category   Text
-* @package    Text_Highlighter
-* @author     Andrey Demenev <demenev@gmail.com>
-* @copyright  2004-2006 Andrey Demenev
-* @license    http://www.php.net/license/3_0.txt  PHP License
-* @version    CVS: $Id$
-* @link       http://pear.php.net/package/Text_Highlighter
-*/
-
-/**
-* @ignore
-*/
-require_once 'PEAR.php';
-require_once 'XML/Parser.php';
-
-// {{{ error codes
-
-define ('TEXT_HIGHLIGHTER_EMPTY_RE',          1);
-define ('TEXT_HIGHLIGHTER_INVALID_RE',        2);
-define ('TEXT_HIGHLIGHTER_EMPTY_OR_MISSING',  3);
-define ('TEXT_HIGHLIGHTER_EMPTY',             4);
-define ('TEXT_HIGHLIGHTER_REGION_REGION',     5);
-define ('TEXT_HIGHLIGHTER_REGION_BLOCK',      6);
-define ('TEXT_HIGHLIGHTER_BLOCK_REGION',      7);
-define ('TEXT_HIGHLIGHTER_KEYWORD_BLOCK',     8);
-define ('TEXT_HIGHLIGHTER_KEYWORD_INHERITS',  9);
-define ('TEXT_HIGHLIGHTER_PARSE',            10);
-define ('TEXT_HIGHLIGHTER_FILE_WRITE',       11);
-define ('TEXT_HIGHLIGHTER_FILE_READ',        12);
-// }}}
-
-/**
-* Syntax highliter class generator class
-*
-* This class is used to generate PHP classes
-* from XML files with highlighting rules
-*
-* Usage example
-* <code>
-*require_once 'Text/Highlighter/Generator.php';
-*$generator = new Text_Highlighter_Generator('php.xml');
-*$generator->generate();
-*$generator->saveCode('PHP.php');
-* </code>
-*
-* A command line script <b>generate</b> is provided for
-* class generation (installs in scripts/Text/Highlighter).
-*
-* @author     Andrey Demenev <demenev@gmail.com>
-* @copyright  2004-2006 Andrey Demenev
-* @license    http://www.php.net/license/3_0.txt  PHP License
-* @version    Release: @package_version@
-* @link       http://pear.php.net/package/Text_Highlighter
-*/
-
-class Text_Highlighter_Generator extends  XML_Parser
-{
-    // {{{ properties
-    /**
-    * Whether to do case folding.
-    * We have to declare it here, because XML_Parser
-    * sets case folding in constructor
-    *
-    * @var  boolean
-    */
-    var $folding = false;
-
-    /**
-    * Holds name of file with highlighting rules
-    *
-    * @var string
-    * @access private
-    */
-    var $_syntaxFile;
-
-    /**
-    * Current element being processed
-    *
-    * @var array
-    * @access private
-    */
-    var $_element;
-
-    /**
-    * List of regions
-    *
-    * @var array
-    * @access private
-    */
-    var $_regions = array();
-
-    /**
-    * List of blocks
-    *
-    * @var array
-    * @access private
-    */
-    var $_blocks = array();
-
-    /**
-    * List of keyword groups
-    *
-    * @var array
-    * @access private
-    */
-    var $_keywords = array();
-
-    /**
-    * List of authors
-    *
-    * @var array
-    * @access private
-    */
-    var $_authors = array();
-
-    /**
-    * Name of language
-    *
-    * @var string
-    * @access public
-    */
-    var $language = '';
-
-    /**
-    * Generated code
-    *
-    * @var string
-    * @access private
-    */
-    var $_code = '';
-
-    /**
-    * Default class
-    *
-    * @var string
-    * @access private
-    */
-    var $_defClass = 'default';
-
-    /**
-    * Comment
-    *
-    * @var string
-    * @access private
-    */
-    var $_comment = '';
-
-    /**
-    * Flag for comment processing
-    *
-    * @var boolean
-    * @access private
-    */
-    var $_inComment = false;
-
-    /**
-    * Sorting order of current block/region
-    *
-    * @var integer
-    * @access private
-    */
-    var $_blockOrder = 0;
-
-    /**
-    * Generation errors
-    *
-    * @var array
-    * @access private
-    */
-    var $_errors;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-    * PHP4 compatable constructor
-    *
-    * @param string $syntaxFile Name of XML file
-    * with syntax highlighting rules
-    *
-    * @access public
-    */
-
-    function Text_Highlighter_Generator($syntaxFile = '')
-    {
-        return $this->__construct($syntaxFile);
-    }
-
-    /**
-    * Constructor
-    *
-    * @param string $syntaxFile Name of XML file
-    * with syntax highlighting rules
-    *
-    * @access public
-    */
-
-    function __construct($syntaxFile = '')
-    {
-        XML_Parser::XML_Parser(null, 'func');
-        $this->_errors = array();
-        $this->_declareErrorMessages();
-        if ($syntaxFile) {
-            $this->setInputFile($syntaxFile);
-        }
-    }
-
-    // }}}
-    // {{{ _formatError
-
-    /**
-    * Format error message
-    *
-    * @param int $code error code
-    * @param string $params parameters
-    * @param string $fileName file name
-    * @param int $lineNo line number
-    * @return  array
-    * @access  public
-    */
-    function _formatError($code, $params, $fileName, $lineNo)
-    {
-        $template = $this->_templates[$code];
-        $ret = call_user_func_array('sprintf', array_merge(array($template), $params));
-        if ($fileName) {
-            $ret = '[' . $fileName . '] ' . $ret;
-        }
-        if ($lineNo) {
-            $ret .= ' (line ' . $lineNo . ')';
-        }
-        return $ret;
-    }
-
-    // }}}
-    // {{{ declareErrorMessages
-
-    /**
-    * Set up error message templates
-    *
-    * @access  private
-    */
-    function _declareErrorMessages()
-    {
-        $this->_templates = array (
-        TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
-        TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
-        TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
-        TEXT_HIGHLIGHTER_EMPTY  => 'Empty %s',
-        TEXT_HIGHLIGHTER_REGION_REGION => 'Region %s refers undefined region %s',
-        TEXT_HIGHLIGHTER_REGION_BLOCK => 'Region %s refers undefined block %s',
-        TEXT_HIGHLIGHTER_BLOCK_REGION => 'Block %s refers undefined region %s',
-        TEXT_HIGHLIGHTER_KEYWORD_BLOCK => 'Keyword group %s refers undefined block %s',
-        TEXT_HIGHLIGHTER_KEYWORD_INHERITS => 'Keyword group %s inherits undefined block %s',
-        TEXT_HIGHLIGHTER_PARSE => '%s',
-        TEXT_HIGHLIGHTER_FILE_WRITE => 'Error writing file %s',
-        TEXT_HIGHLIGHTER_FILE_READ => '%s'
-        );
-    }
-
-    // }}}
-    // {{{ setInputFile
-
-    /**
-    * Sets the input xml file to be parsed
-    *
-    * @param    string      Filename (full path)
-    * @return   boolean
-    * @access   public
-    */
-    function setInputFile($file)
-    {
-        $this->_syntaxFile = $file;
-        $ret = parent::setInputFile($file);
-        if (PEAR::isError($ret)) {
-            $this->_error(TEXT_HIGHLIGHTER_FILE_READ, $ret->message);
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ generate
-
-    /**
-    * Generates class code
-    *
-    * @access public
-    */
-
-    function generate()
-    {
-        $this->_regions    = array();
-        $this->_blocks     = array();
-        $this->_keywords   = array();
-        $this->language    = '';
-        $this->_code       = '';
-        $this->_defClass   = 'default';
-        $this->_comment    = '';
-        $this->_inComment  = false;
-        $this->_authors    = array();
-        $this->_blockOrder = 0;
-        $this->_errors   = array();
-
-        $ret = $this->parse();
-        if (PEAR::isError($ret)) {
-            $this->_error(TEXT_HIGHLIGHTER_PARSE, $ret->message);
-            return false;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ getCode
-
-    /**
-    * Returns generated code as a string.
-    *
-    * @return string Generated code
-    * @access public
-    */
-
-    function getCode()
-    {
-        return $this->_code;
-    }
-
-    // }}}
-    // {{{ saveCode
-
-    /**
-    * Saves generated class to file. Note that {@link Text_Highlighter::factory()}
-    * assumes that filename is uppercase (SQL.php, DTD.php, etc), and file
-    * is located in Text/Highlighter
-    *
-    * @param string $filename Name of file to write the code to
-    * @return boolean true on success, false on failure
-    * @access public
-    */
-
-    function saveCode($filename)
-    {
-        $f = @fopen($filename, 'wb');
-        if (!$f) {
-            $this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
-            return false;
-        }
-        fwrite ($f, $this->_code);
-        fclose($f);
-        return true;
-    }
-
-    // }}}
-    // {{{ hasErrors
-
-    /**
-    * Reports if there were errors
-    *
-    * @return boolean
-    * @access public
-    */
-
-    function hasErrors()
-    {
-        return count($this->_errors) > 0;
-    }
-
-    // }}}
-    // {{{ getErrors
-
-    /**
-    * Returns errors
-    *
-    * @return array
-    * @access public
-    */
-
-    function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    // }}}
-    // {{{ _sortBlocks
-
-    /**
-    * Sorts blocks
-    *
-    * @access private
-    */
-
-    function _sortBlocks($b1, $b2) {
-        return $b1['order'] - $b2['order'];
-    }
-
-    // }}}
-    // {{{ _sortLookFor
-    /**
-    * Sort 'look for' list
-    * @return int
-    * @param string $b1
-    * @param string $b2
-    */
-    function _sortLookFor($b1, $b2) {
-        $o1 = isset($this->_blocks[$b1]) ? $this->_blocks[$b1]['order'] : $this->_regions[$b1]['order'];
-        $o2 = isset($this->_blocks[$b2]) ? $this->_blocks[$b2]['order'] : $this->_regions[$b2]['order'];
-        return $o1 - $o2;
-    }
-
-    // }}}
-    // {{{ _makeRE
-
-    /**
-    * Adds delimiters and modifiers to regular expression if necessary
-    *
-    * @param string $text Original RE
-    * @return string Final RE
-    * @access private
-    */
-    function _makeRE($text, $case = false)
-    {
-        if (!strlen($text)) {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_RE);
-        }
-        if (!strlen($text) || $text{0} != '/') {
-            $text = '/' . $text . '/';
-        }
-        if (!$case) {
-            $text .= 'i';
-        }
-        $php_errormsg = '';
-        @preg_match($text, '');
-        if ($php_errormsg) {
-            $this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
-        }
-        preg_match ('#^/(.+)/(.*)$#', $text, $m);
-        if (@$m[2]) {
-            $text = '(?' . $m[2] . ')' . $m[1];
-        } else {
-            $text = $m[1];
-        }
-        return $text;
-    }
-
-    // }}}
-    // {{{ _exportArray
-
-    /**
-    * Exports array as PHP code
-    *
-    * @param array $array
-    * @return string Code
-    * @access private
-    */
-    function _exportArray($array)
-    {
-        $array = var_export($array, true);
-        return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
-    }
-
-    // }}}
-    // {{{ _countSubpatterns
-    /**
-    * Find number of capturing suppaterns in regular expression
-    * @return int
-    * @param string $re Regular expression (without delimiters)
-    */
-    function _countSubpatterns($re)
-    {
-        preg_match_all('/' . $re . '/', '', $m);
-        return count($m)-1;
-    }
-
-    // }}}
-
-    /**#@+
-    * @access private
-    * @param resource $xp      XML parser resource
-    * @param string   $elem    XML element name
-    * @param array    $attribs XML element attributes
-    */
-
-    // {{{ xmltag_Default
-
-    /**
-    * start handler for <default> element
-    */
-    function xmltag_Default($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_defClass = @$attribs['innerGroup'];
-    }
-
-    // }}}
-    // {{{ xmltag_Region
-
-    /**
-    * start handler for <region> element
-    */
-    function xmltag_Region($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region name');
-        }
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_element = array('name' => $attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        $this->_element['innerGroup'] = $attribs['innerGroup'];
-        $this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
-        $attribs['delimGroup'] :
-        $attribs['innerGroup'];
-        $this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
-        $this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
-        $this->_element['contained'] = @$attribs['contained'] == 'yes';
-        $this->_element['never-contained'] = @$attribs['never-contained'] == 'yes';
-        $this->_element['remember'] = @$attribs['remember'] == 'yes';
-        if (isset($attribs['startBOL']) && $attribs['startBOL'] == 'yes') {
-            $this->_element['startBOL'] = true;
-        }
-        if (isset($attribs['endBOL']) && $attribs['endBOL'] == 'yes') {
-            $this->_element['endBOL'] = true;
-        }
-        if (isset($attribs['neverAfter'])) {
-            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Block
-
-    /**
-    * start handler for <block> element
-    */
-    function xmltag_Block($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'block name');
-        }
-        if (isset($attribs['innerGroup']) && $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY, 'innerGroup');
-        }
-        $this->_element = array('name' => $attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        if (isset($attribs['innerGroup'])) {
-            $this->_element['innerGroup'] = @$attribs['innerGroup'];
-        }
-        $this->_element['match'] = $this->_makeRE($attribs['match'], $this->_element['case']);
-        $this->_element['contained'] = @$attribs['contained'] == 'yes';
-        $this->_element['multiline'] = @$attribs['multiline'] == 'yes';
-        if (isset($attribs['BOL']) && $attribs['BOL'] == 'yes') {
-            $this->_element['BOL'] = true;
-        }
-        if (isset($attribs['neverAfter'])) {
-            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
-        }
-    }
-
-    // }}}
-    // {{{ cdataHandler
-
-    /**
-    * Character data handler. Used for comment
-    */
-    function cdataHandler($xp, $cdata)
-    {
-        if ($this->_inComment) {
-            $this->_comment .= $cdata;
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Comment
-
-    /**
-    * start handler for <comment> element
-    */
-    function xmltag_Comment($xp, $elem, $attribs)
-    {
-        $this->_comment = '';
-        $this->_inComment = true;
-    }
-
-    // }}}
-    // {{{ xmltag_PartGroup
-
-    /**
-    * start handler for <partgroup> element
-    */
-    function xmltag_PartGroup($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        $this->_element['partClass'][$attribs['index']] = @$attribs['innerGroup'];
-    }
-
-    // }}}
-    // {{{ xmltag_PartClass
-
-    /**
-    * start handler for <partclass> element
-    */
-    function xmltag_PartClass($xp, $elem, $attribs)
-    {
-        $this->xmltag_PartGroup($xp, $elem, $attribs);
-    }
-
-    // }}}
-    // {{{ xmltag_Keywords
-
-    /**
-    * start handler for <keywords> element
-    */
-    function xmltag_Keywords($xp, $elem, $attribs)
-    {
-        $this->_aliasAttributes($attribs);
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'keyword group name');
-        }
-        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
-        }
-        if (!isset($attribs['inherits']) || $attribs['inherits'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'inherits');
-        }
-        $this->_element = array('name'=>@$attribs['name']);
-        $this->_element['line'] = xml_get_current_line_number($this->parser);
-        $this->_element['innerGroup'] = @$attribs['innerGroup'];
-        if (isset($attribs['case'])) {
-            $this->_element['case'] = $attribs['case'] == 'yes';
-        } else {
-            $this->_element['case'] = $this->_case;
-        }
-        $this->_element['inherits'] = @$attribs['inherits'];
-        if (isset($attribs['otherwise'])) {
-            $this->_element['otherwise'] = $attribs['otherwise'];
-        }
-        if (isset($attribs['ifdef'])) {
-            $this->_element['ifdef'] = $attribs['ifdef'];
-        }
-        if (isset($attribs['ifndef'])) {
-            $this->_element['ifndef'] = $attribs['ifndef'];
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Keyword
-
-    /**
-    * start handler for <keyword> element
-    */
-    function xmltag_Keyword($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['match']) || $attribs['match'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'match');
-        }
-        $keyword = @$attribs['match'];
-        if (!$this->_element['case']) {
-            $keyword = strtolower($keyword);
-        }
-        $this->_element['match'][$keyword] = true;
-    }
-
-    // }}}
-    // {{{ xmltag_Contains
-
-    /**
-    * start handler for <contains> element
-    */
-    function xmltag_Contains($xp, $elem, $attribs)
-    {
-        $this->_element['contains-all'] = @$attribs['all'] == 'yes';
-        if (isset($attribs['region'])) {
-            $this->_element['contains']['region'][$attribs['region']] =
-            xml_get_current_line_number($this->parser);
-        }
-        if (isset($attribs['block'])) {
-            $this->_element['contains']['block'][$attribs['block']] =
-            xml_get_current_line_number($this->parser);
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_But
-
-    /**
-    * start handler for <but> element
-    */
-    function xmltag_But($xp, $elem, $attribs)
-    {
-        if (isset($attribs['region'])) {
-            $this->_element['not-contains']['region'][$attribs['region']] = true;
-        }
-        if (isset($attribs['block'])) {
-            $this->_element['not-contains']['block'][$attribs['block']] = true;
-        }
-    }
-
-    // }}}
-    // {{{ xmltag_Onlyin
-
-    /**
-    * start handler for <onlyin> element
-    */
-    function xmltag_Onlyin($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['region']) || $attribs['region'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region');
-        }
-        $this->_element['onlyin'][$attribs['region']] = xml_get_current_line_number($this->parser);
-    }
-
-    // }}}
-    // {{{ xmltag_Author
-
-    /**
-    * start handler for <author> element
-    */
-    function xmltag_Author($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['name']) || $attribs['name'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'author name');
-        }
-        $this->_authors[] = array(
-        'name'  => @$attribs['name'],
-        'email' => (string)@$attribs['email']
-        );
-    }
-
-    // }}}
-    // {{{ xmltag_Highlight
-
-    /**
-    * start handler for <highlight> element
-    */
-    function xmltag_Highlight($xp, $elem, $attribs)
-    {
-        if (!isset($attribs['lang']) || $attribs['lang'] === '') {
-            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'language name');
-        }
-        $this->_code = '';
-        $this->language = strtoupper(@$attribs['lang']);
-        $this->_case = @$attribs['case'] == 'yes';
-    }
-
-    // }}}
-
-    /**#@-*/
-
-    // {{{ _error
-
-    /**
-    * Add an error message
-    *
-    * @param integer $code Error code
-    * @param mixed   $message Error message or array with error message parameters
-    * @param integer $lineNo Source code line number
-    * @access private
-    */
-    function _error($code, $params = array(), $lineNo = 0)
-    {
-        if (!$lineNo && !empty($this->parser)) {
-            $lineNo = xml_get_current_line_number($this->parser);
-        }
-        $this->_errors[] = $this->_formatError($code, $params, $this->_syntaxFile, $lineNo);
-    }
-
-    // }}}
-    // {{{ _aliasAttributes
-
-    /**
-    * BC trick
-    *
-    * @param array $attrs attributes
-    */
-    function _aliasAttributes(&$attrs)
-    {
-        if (isset($attrs['innerClass']) && !isset($attrs['innerGroup'])) {
-            $attrs['innerGroup'] = $attrs['innerClass'];
-        }
-        if (isset($attrs['delimClass']) && !isset($attrs['delimGroup'])) {
-            $attrs['delimGroup'] = $attrs['delimClass'];
-        }
-        if (isset($attrs['partClass']) && !isset($attrs['partGroup'])) {
-            $attrs['partGroup'] = $attrs['partClass'];
-        }
-    }
-
-    // }}}
-
-    /**#@+
-    * @access private
-    * @param resource $xp      XML parser resource
-    * @param string   $elem    XML element name
-    */
-
-    // {{{ xmltag_Comment_
-
-    /**
-    * end handler for <comment> element
-    */
-    function xmltag_Comment_($xp, $elem)
-    {
-        $this->_inComment = false;
-    }
-
-    // }}}
-    // {{{ xmltag_Region_
-
-    /**
-    * end handler for <region> element
-    */
-    function xmltag_Region_($xp, $elem)
-    {
-        $this->_element['type'] = 'region';
-        $this->_element['order'] = $this->_blockOrder ++;
-        $this->_regions[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Keywords_
-
-    /**
-    * end handler for <keywords> element
-    */
-    function xmltag_Keywords_($xp, $elem)
-    {
-        $this->_keywords[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Block_
-
-    /**
-    * end handler for <block> element
-    */
-    function xmltag_Block_($xp, $elem)
-    {
-        $this->_element['type'] = 'block';
-        $this->_element['order'] = $this->_blockOrder ++;
-        $this->_blocks[$this->_element['name']] = $this->_element;
-    }
-
-    // }}}
-    // {{{ xmltag_Highlight_
-
-    /**
-    * end handler for <highlight> element
-    */
-    function xmltag_Highlight_($xp, $elem)
-    {
-        $conditions = array();
-        $toplevel = array();
-        foreach ($this->_blocks as $i => $current) {
-            if (!$current['contained'] && !isset($current['onlyin'])) {
-                $toplevel[] = $i;
-            }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
-                    array(
-                    'block' => $current['name'],
-                    'region' => $region
-                    ));
-                }
-            }
-        }
-        foreach ($this->_regions as $i=>$current) {
-            if (!$current['contained'] && !isset($current['onlyin'])) {
-                $toplevel[] = $i;
-            }
-            foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
-                    array(
-                    'region1' => $current['name'],
-                    'region2' => $region
-                    ));
-                }
-            }
-            foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
-                if (!isset($this->_blocks[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
-                    array(
-                    'block' => $current['name'],
-                    'region' => $region
-                    ));
-                }
-            }
-            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
-                if (!isset($this->_regions[$region])) {
-                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
-                    array(
-                    'region1' => $current['name'],
-                    'region2' => $region
-                    ));
-                }
-            }
-            foreach ($this->_regions as $j => $region) {
-                if (isset($region['onlyin'])) {
-                    $suits = isset($region['onlyin'][$current['name']]);
-                } elseif (isset($current['not-contains']['region'][$region['name']])) {
-                    $suits = false;
-                } elseif (isset($current['contains']['region'][$region['name']])) {
-                    $suits = true;
-                } else {
-                    $suits = @$current['contains-all'] && @!$region['never-contained'];
-                }
-                if ($suits) {
-                    $this->_regions[$i]['lookfor'][] = $j;
-                }
-            }
-            foreach ($this->_blocks as $j=>$region) {
-                if (isset($region['onlyin'])) {
-                    $suits = isset($region['onlyin'][$current['name']]);
-                } elseif (isset($current['not-contains']['block'][$region['name']])) {
-                    $suits = false;
-                } elseif (isset($current['contains']['block'][$region['name']])) {
-                    $suits = true;
-                } else {
-                    $suits = @$current['contains-all'] && @!$region['never-contained'];
-                }
-                if ($suits) {
-                    $this->_regions[$i]['lookfor'][] = $j;
-                }
-            }
-        }
-        foreach ($this->_blocks as $i=>$current) {
-            unset ($this->_blocks[$i]['never-contained']);
-            unset ($this->_blocks[$i]['contained']);
-            unset ($this->_blocks[$i]['contains-all']);
-            unset ($this->_blocks[$i]['contains']);
-            unset ($this->_blocks[$i]['onlyin']);
-            unset ($this->_blocks[$i]['line']);
-        }
-
-        foreach ($this->_regions as $i=>$current) {
-            unset ($this->_regions[$i]['never-contained']);
-            unset ($this->_regions[$i]['contained']);
-            unset ($this->_regions[$i]['contains-all']);
-            unset ($this->_regions[$i]['contains']);
-            unset ($this->_regions[$i]['onlyin']);
-            unset ($this->_regions[$i]['line']);
-        }
-
-        foreach ($this->_keywords as $name => $keyword) {
-            if (isset($keyword['ifdef'])) {
-                $conditions[$keyword['ifdef']][] = array($name, true);
-            }
-            if (isset($keyword['ifndef'])) {
-                $conditions[$keyword['ifndef']][] = array($name, false);
-            }
-            unset($this->_keywords[$name]['line']);
-            if (!isset($this->_blocks[$keyword['inherits']])) {
-                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_INHERITS,
-                array(
-                'keyword' => $keyword['name'],
-                'block' => $keyword['inherits']
-                ));
-            }
-            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
-                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
-                array(
-                'keyword' => $keyword['name'],
-                'block' => $keyword['inherits']
-                ));
-            }
-        }
-
-        $syntax=array(
-        'keywords'   => $this->_keywords,
-        'blocks'     => array_merge($this->_blocks, $this->_regions),
-        'toplevel'   => $toplevel,
-        );
-        uasort($syntax['blocks'], array(&$this, '_sortBlocks'));
-        foreach ($syntax['blocks'] as $name => $block) {
-            if ($block['type'] == 'block') {
-                continue;
-            }
-            if (is_array(@$syntax['blocks'][$name]['lookfor'])) {
-                usort($syntax['blocks'][$name]['lookfor'], array(&$this, '_sortLookFor'));
-            }
-        }
-        usort($syntax['toplevel'], array(&$this, '_sortLookFor'));
-        $syntax['case'] = $this->_case;
-        $this->_code = <<<CODE
-<?php
-/**
- * Auto-generated class. {$this->language} syntax highlighting
-CODE;
-
-        if ($this->_comment) {
-            $comment = preg_replace('~^~m',' * ',$this->_comment);
-            $this->_code .= "\n * \n" . $comment;
-        }
-
-        $this->_code .= <<<CODE
- 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: $this->_syntaxFile
-
-CODE;
-
-        foreach ($this->_authors as $author) {
-            $this->_code .= ' * @author ' . $author['name'];
-            if ($author['email']) {
-                $this->_code .= ' <' . $author['email'] . '>';
-            }
-            $this->_code .= "\n";
-        }
-
-        $this->_code .= <<<CODE
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. {$this->language} syntax highlighting
- *
-
-CODE;
-        foreach ($this->_authors as $author) {
-            $this->_code .= ' * @author ' . $author['name'];
-            if ($author['email']) {
-                $this->_code .= ' <' . $author['email']. '>';
-            }
-            $this->_code .= "\n";
-        }
-
-
-        $this->_code .= <<<CODE
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_{$this->language} extends Text_Highlighter
-{
-    
-CODE;
-        $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
-        $array = var_export($syntax, true);
-        $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
-        //        \$this->_syntax = $array;
-        $this->_code .= <<<CODE
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  \$options
-     * @access public
-     */
-    function Text_Highlighter_{$this->language}(\$options=array())
-    {
-        \$this->__construct(\$options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  \$options
-     * @access public
-     */
-    function __construct(\$options=array())
-    {
-
-CODE;
-        $this->_code .= <<<CODE
-
-        \$this->_options = \$options;
-CODE;
-        $states = array();
-        $i = 0;
-        foreach ($syntax['blocks'] as $name => $block) {
-            if ($block['type'] == 'region') {
-                $states[$name] = $i++;
-            }
-        }
-        $regs = array();
-        $counts = array();
-        $delim = array();
-        $inner = array();
-        $end = array();
-        $stat = array();
-        $keywords = array();
-        $parts = array();
-        $kwmap = array();
-        $subst = array();
-        $re = array();
-        $ce = array();
-        $rd = array();
-        $in = array();
-        $st = array();
-        $kw = array();
-        $sb = array();
-        foreach ($syntax['toplevel'] as $name) {
-            $block = $syntax['blocks'][$name];
-            if ($block['type'] == 'block') {
-                $kwm = array();
-                $re[] = '(' . $block['match'] . ')';
-                $ce[] = $this->_countSubpatterns($block['match']);
-                $rd[] = '';
-                $sb[] = false;;
-                $st[] = -1;
-                foreach ($syntax['keywords'] as $kwname => $kwgroup) {
-                    if ($kwgroup['inherits'] != $name) {
-                        continue;
-                    }
-                    $gre = implode('|', array_keys($kwgroup['match']));
-                    if (!$kwgroup['case']) {
-                        $gre = '(?i)' . $gre;
-                    }
-                    $kwm[$kwname][] =  $gre;
-                    $kwmap[$kwname] = $kwgroup['innerGroup'];
-                }
-                foreach ($kwm as $g => $ma) {
-                    $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
-                }
-                $kw[] = $kwm;
-            } else {
-                $kw[] = -1;
-                $re[] = '(' . $block['start'] . ')';
-                $ce[] = $this->_countSubpatterns($block['start']);
-                $rd[] = $block['delimGroup'];
-                $st[] = $states[$name];
-                $sb[] = $block['remember'];
-            }
-            $in[] = $block['innerGroup'];
-        }
-        $re = implode('|', $re);
-        $regs[-1] = '/' . $re . '/';
-        $counts[-1] = $ce;
-        $delim[-1] = $rd;
-        $inner[-1] = $in;
-        $stat[-1] = $st;
-        $keywords[-1] = $kw;
-        $subst[-1] = $sb;
-
-        foreach ($syntax['blocks'] as $ablock) {
-            if ($ablock['type'] != 'region') {
-                continue;
-            }
-            $end[] = '/' . $ablock['end'] . '/';
-            $re = array();
-            $ce = array();
-            $rd = array();
-            $in = array();
-            $st = array();
-            $kw = array();
-            $pc = array();
-            $sb = array();
-            foreach ((array)@$ablock['lookfor'] as $name) {
-                $block = $syntax['blocks'][$name];
-                if (isset($block['partClass'])) {
-                    $pc[] = $block['partClass'];
-                } else {
-                    $pc[] = null;
-                }
-                if ($block['type'] == 'block') {
-                    $kwm = array();;
-                    $re[] = '(' . $block['match'] . ')';
-                    $ce[] = $this->_countSubpatterns($block['match']);
-                    $rd[] = '';
-                    $sb[] = false;
-                    $st[] = -1;
-                    foreach ($syntax['keywords'] as $kwname => $kwgroup) {
-                        if ($kwgroup['inherits'] != $name) {
-                            continue;
-                        }
-                        $gre = implode('|', array_keys($kwgroup['match']));
-                        if (!$kwgroup['case']) {
-                            $gre = '(?i)' . $gre;
-                        }
-                        $kwm[$kwname][] =  $gre;
-                        $kwmap[$kwname] = $kwgroup['innerGroup'];
-                    }
-                    foreach ($kwm as $g => $ma) {
-                        $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
-                    }
-                    $kw[] = $kwm;
-                } else {
-                    $sb[] = $block['remember'];
-                    $kw[] = -1;
-                    $re[] = '(' . $block['start'] . ')';
-                    $ce[] = $this->_countSubpatterns($block['start']);
-                    $rd[] = $block['delimGroup'];
-                    $st[] = $states[$name];
-                }
-                $in[] = $block['innerGroup'];
-            }
-            $re = implode('|', $re);
-            $regs[] = '/' . $re . '/';
-            $counts[] = $ce;
-            $delim[] = $rd;
-            $inner[] = $in;
-            $stat[] = $st;
-            $keywords[] = $kw;
-            $parts[] = $pc;
-            $subst[] = $sb;
-        }
-
-
-        $this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
-        $this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
-        $this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
-        $this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
-        $this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
-        $this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
-        $this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
-        $this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
-        $this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
-        $this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
-        $this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
-        $this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
-        $this->_code .= <<<CODE
-;
-        \$this->_checkDefines();
-    }
-    
-}
-CODE;
-}
-
-// }}}
-}
-
-
-/*
-* Local variables:
-* tab-width: 4
-* c-basic-offset: 4
-* c-hanging-comment-ender-p: nil
-* End:
-*/
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/HTML.php b/library/Text_Highlighter/Text/Highlighter/HTML.php
deleted file mode 100644
index 14d0a783f..000000000
--- a/library/Text_Highlighter/Text/Highlighter/HTML.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * Auto-generated class. HTML syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : html.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. HTML syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_HTML extends Text_Highlighter
-{
-    var $_language = 'html';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_HTML($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\<!--)|((?i)\\<[\\?\\/]?)|((?i)(&)[\\w\\-\\.]+;)/',
-            0 => '//',
-            1 => '/((?i)(?<=[\\<\\/?])[\\w\\-\\:]+)|((?i)[\\w\\-\\:]+)|((?i)")/',
-            2 => '/((?i)(&)[\\w\\-\\.]+;)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            2 => 
-            array (
-                0 => 1,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'comment',
-                1 => 'brackets',
-                2 => '',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => 'quotes',
-            ),
-            2 => 
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'comment',
-                1 => 'code',
-                2 => 'special',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 'reserved',
-                1 => 'var',
-                2 => 'string',
-            ),
-            2 => 
-            array (
-                0 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)--\\>/',
-            1 => '/(?i)[\\/\\?]?\\>/',
-            2 => '/(?i)"/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => -1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 2,
-            ),
-            2 => 
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => -1,
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/JAVA.php b/library/Text_Highlighter/Text/Highlighter/JAVA.php
deleted file mode 100644
index 46c0b8851..000000000
--- a/library/Text_Highlighter/Text/Highlighter/JAVA.php
+++ /dev/null
@@ -1,802 +0,0 @@
-<?php
-/**
- * Auto-generated class. JAVA syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : java.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. JAVA syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_JAVA extends Text_Highlighter
-{
-    var $_language = 'java';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_JAVA($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            3 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
-            4 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])/',
-            5 => '/((?i)\\\\.)/',
-            6 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0,
-                10 => 0,
-                11 => 2,
-                12 => 5,
-            ),
-            0 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0,
-                10 => 0,
-                11 => 2,
-                12 => 5,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0,
-                10 => 0,
-                11 => 2,
-                12 => 5,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0,
-                10 => 0,
-                11 => 2,
-                12 => 5,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 3,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-            ),
-            4 => 
-            array (
-                0 => 0,
-            ),
-            5 => 
-            array (
-                0 => 0,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 3,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'comment',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-            ),
-            0 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'comment',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-            ),
-            1 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'comment',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-            ),
-            2 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'comment',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-            ),
-            3 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-            ),
-            4 => 
-            array (
-                0 => '',
-            ),
-            5 => 
-            array (
-                0 => '',
-            ),
-            6 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'comment',
-                7 => 'identifier',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-            ),
-            0 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'comment',
-                7 => 'identifier',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-            ),
-            1 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'comment',
-                7 => 'identifier',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-            ),
-            2 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'comment',
-                7 => 'identifier',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-            ),
-            3 => 
-            array (
-                0 => 'inlinedoc',
-                1 => 'url',
-                2 => 'url',
-                3 => 'inlinedoc',
-                4 => 'inlinedoc',
-            ),
-            4 => 
-            array (
-                0 => 'special',
-            ),
-            5 => 
-            array (
-                0 => 'special',
-            ),
-            6 => 
-            array (
-                0 => 'inlinedoc',
-                1 => 'url',
-                2 => 'url',
-                3 => 'inlinedoc',
-                4 => 'inlinedoc',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\}/',
-            1 => '/(?i)\\)/',
-            2 => '/(?i)\\]/',
-            3 => '/(?i)\\*\\//',
-            4 => '/(?i)"/',
-            5 => '/(?i)\'/',
-            6 => '/(?mi)$/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => 6,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-            ),
-            0 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => 6,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => 6,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => 6,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-            ),
-            4 => 
-            array (
-                0 => -1,
-            ),
-            5 => 
-            array (
-                0 => -1,
-            ),
-            6 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                    'types' => '/^(boolean|byte|char|const|double|final|float|int|long|short|static|void)$/',
-                    'reserved' => '/^(import|package|abstract|break|case|catch|class|continue|default|do|else|extends|false|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|super|strictfp|switch|synchronized|this|throws|throw|transient|true|try|volatile|while)$/',
-                    'builtin' => '/^(AbstractAction|AbstractBorder|AbstractButton|AbstractCellEditor|AbstractCollection|AbstractColorChooserPanel|AbstractDocument|AbstractInterruptibleChannel|AbstractLayoutCache|AbstractList|AbstractListModel|AbstractMap|AbstractMethodError|AbstractPreferences|AbstractSelectableChannel|AbstractSelectionKey|AbstractSelector|AbstractSequentialList|AbstractSet|AbstractSpinnerModel|AbstractTableModel|AbstractUndoableEdit|AbstractWriter|AccessControlContext|AccessControlException|AccessController|AccessException|Accessible|AccessibleAction|AccessibleBundle|AccessibleComponent|AccessibleContext|AccessibleEditableText|AccessibleExtendedComponent|AccessibleExtendedTable|AccessibleHyperlink|AccessibleHypertext|AccessibleIcon|AccessibleKeyBinding|AccessibleObject|AccessibleRelation|AccessibleRelationSet|AccessibleResourceBundle|AccessibleRole|AccessibleSelection|AccessibleState|AccessibleStateSet|AccessibleTable|AccessibleTableModelChange|AccessibleText|AccessibleValue|AccountExpiredException|Acl|AclEntry|AclNotFoundException|Action|ActionEvent|ActionListener|ActionMap|ActionMapUIResource|Activatable|ActivateFailedException|ActivationDesc|ActivationException|ActivationGroup|ActivationGroup_Stub|ActivationGroupDesc|ActivationGroupID|ActivationID|ActivationInstantiator|ActivationMonitor|ActivationSystem|Activator|ActiveEvent|AdapterActivator|AdapterActivatorOperations|AdapterAlreadyExists|AdapterAlreadyExistsHelper|AdapterInactive|AdapterInactiveHelper|AdapterNonExistent|AdapterNonExistentHelper|AddressHelper|Adjustable|AdjustmentEvent|AdjustmentListener|Adler32|AffineTransform|AffineTransformOp|AlgorithmParameterGenerator|AlgorithmParameterGeneratorSpi|AlgorithmParameters|AlgorithmParameterSpec|AlgorithmParametersSpi|AllPermission|AlphaComposite|AlreadyBound|AlreadyBoundException|AlreadyBoundHelper|AlreadyBoundHolder|AlreadyConnectedException|AncestorEvent|AncestorListener|Annotation|Any|AnyHolder|AnySeqHelper|AnySeqHolder|AppConfigurationEntry|Applet|AppletContext|AppletInitializer|AppletStub|ApplicationException|Arc2D|Area|AreaAveragingScaleFilter|ARG_IN|ARG_INOUT|ARG_OUT|ArithmeticException|Array|ArrayIndexOutOfBoundsException|ArrayList|Arrays|ArrayStoreException|AssertionError|AsyncBoxView|AsynchronousCloseException|Attr|Attribute|AttributedCharacterIterator|AttributedString|AttributeException|AttributeInUseException|AttributeList|AttributeListImpl|AttributeModificationException|Attributes|AttributeSet|AttributeSetUtilities|AttributesImpl|AudioClip|AudioFileFormat|AudioFileReader|AudioFileWriter|AudioFormat|AudioInputStream|AudioPermission|AudioSystem|AuthenticationException|AuthenticationNotSupportedException|Authenticator|AuthPermission|Autoscroll|AWTError|AWTEvent|AWTEventListener|AWTEventListenerProxy|AWTEventMulticaster|AWTException|AWTKeyStroke|AWTPermission|BackingStoreException|BAD_CONTEXT|BAD_INV_ORDER|BAD_OPERATION|BAD_PARAM|BAD_POLICY|BAD_POLICY_TYPE|BAD_POLICY_VALUE|BAD_TYPECODE|BadKind|BadLocationException|BadPaddingException|BandCombineOp|BandedSampleModel|BasicArrowButton|BasicAttribute|BasicAttributes|BasicBorders|BasicButtonListener|BasicButtonUI|BasicCheckBoxMenuItemUI|BasicCheckBoxUI|BasicColorChooserUI|BasicComboBoxEditor|BasicComboBoxRenderer|BasicComboBoxUI|BasicComboPopup|BasicDesktopIconUI|BasicDesktopPaneUI|BasicDirectoryModel|BasicEditorPaneUI|BasicFileChooserUI|BasicFormattedTextFieldUI|BasicGraphicsUtils|BasicHTML|BasicIconFactory|BasicInternalFrameTitlePane|BasicInternalFrameUI|BasicLabelUI|BasicListUI|BasicLookAndFeel|BasicMenuBarUI|BasicMenuItemUI|BasicMenuUI|BasicOptionPaneUI|BasicPanelUI|BasicPasswordFieldUI|BasicPermission|BasicPopupMenuSeparatorUI|BasicPopupMenuUI|BasicProgressBarUI|BasicRadioButtonMenuItemUI|BasicRadioButtonUI|BasicRootPaneUI|BasicScrollBarUI|BasicScrollPaneUI|BasicSeparatorUI|BasicSliderUI|BasicSpinnerUI|BasicSplitPaneDivider|BasicSplitPaneUI|BasicStroke|BasicTabbedPaneUI|BasicTableHeaderUI|BasicTableUI|BasicTextAreaUI|BasicTextFieldUI|BasicTextPaneUI|BasicTextUI|BasicToggleButtonUI|BasicToolBarSeparatorUI|BasicToolBarUI|BasicToolTipUI|BasicTreeUI|BasicViewportUI|BatchUpdateException|BeanContext|BeanContextChild|BeanContextChildComponentProxy|BeanContextChildSupport|BeanContextContainerProxy|BeanContextEvent|BeanContextMembershipEvent|BeanContextMembershipListener|BeanContextProxy|BeanContextServiceAvailableEvent|BeanContextServiceProvider|BeanContextServiceProviderBeanInfo|BeanContextServiceRevokedEvent|BeanContextServiceRevokedListener|BeanContextServices|BeanContextServicesListener|BeanContextServicesSupport|BeanContextSupport|BeanDescriptor|BeanInfo|Beans|BevelBorder|Bidi|BigDecimal|BigInteger|BinaryRefAddr|BindException|Binding|BindingHelper|BindingHolder|BindingIterator|BindingIteratorHelper|BindingIteratorHolder|BindingIteratorOperations|BindingIteratorPOA|BindingListHelper|BindingListHolder|BindingType|BindingTypeHelper|BindingTypeHolder|BitSet|Blob|BlockView|Book|Boolean|BooleanControl|BooleanHolder|BooleanSeqHelper|BooleanSeqHolder|Border|BorderFactory|BorderLayout|BorderUIResource|BoundedRangeModel|Bounds|Box|BoxedValueHelper|BoxLayout|BoxView|BreakIterator|Buffer|BufferCapabilities|BufferedImage|BufferedImageFilter|BufferedImageOp|BufferedInputStream|BufferedOutputStream|BufferedReader|BufferedWriter|BufferOverflowException|BufferStrategy|BufferUnderflowException|Button|ButtonGroup|ButtonModel|ButtonUI|Byte|ByteArrayInputStream|ByteArrayOutputStream|ByteBuffer|ByteChannel|ByteHolder|ByteLookupTable|ByteOrder|Calendar|CallableStatement|Callback|CallbackHandler|CancelablePrintJob|CancelledKeyException|CannotProceed|CannotProceedException|CannotProceedHelper|CannotProceedHolder|CannotRedoException|CannotUndoException|Canvas|CardLayout|Caret|CaretEvent|CaretListener|CDATASection|CellEditor|CellEditorListener|CellRendererPane|Certificate|CertificateEncodingException|CertificateException|CertificateExpiredException|CertificateFactory|CertificateFactorySpi|CertificateNotYetValidException|CertificateParsingException|CertPath|CertPathBuilder|CertPathBuilderException|CertPathBuilderResult|CertPathBuilderSpi|CertPathParameters|CertPathValidator|CertPathValidatorException|CertPathValidatorResult|CertPathValidatorSpi|CertSelector|CertStore|CertStoreException|CertStoreParameters|CertStoreSpi|ChangedCharSetException|ChangeEvent|ChangeListener|Channel|ChannelBinding|Channels|Character|CharacterCodingException|CharacterData|CharacterIterator|CharArrayReader|CharArrayWriter|CharBuffer|CharConversionException|CharHolder|CharSeqHelper|CharSeqHolder|CharSequence|Charset|CharsetDecoder|CharsetEncoder|CharsetProvider|Checkbox|CheckboxGroup|CheckboxMenuItem|CheckedInputStream|CheckedOutputStream|Checksum|Choice|ChoiceCallback|ChoiceFormat|Chromaticity|Cipher|CipherInputStream|CipherOutputStream|CipherSpi|Class|ClassCastException|ClassCircularityError|ClassDesc|ClassFormatError|ClassLoader|ClassNotFoundException|ClientRequestInfo|ClientRequestInfoOperations|ClientRequestInterceptor|ClientRequestInterceptorOperations|Clip|Clipboard|ClipboardOwner|Clob|Cloneable|CloneNotSupportedException|ClosedByInterruptException|ClosedChannelException|ClosedSelectorException|CMMException|Codec|CodecFactory|CodecFactoryHelper|CodecFactoryOperations|CodecOperations|CoderMalfunctionError|CoderResult|CodeSets|CodeSource|CodingErrorAction|CollationElementIterator|CollationKey|Collator|Collection|CollectionCertStoreParameters|Collections|Color|ColorChooserComponentFactory|ColorChooserUI|ColorConvertOp|ColorModel|ColorSelectionModel|ColorSpace|ColorSupported|ColorUIResource|ComboBoxEditor|ComboBoxModel|ComboBoxUI|ComboPopup|COMM_FAILURE|Comment|CommunicationException|Comparable|Comparator|Compiler|CompletionStatus|CompletionStatusHelper|Component|ComponentAdapter|ComponentColorModel|ComponentEvent|ComponentIdHelper|ComponentInputMap|ComponentInputMapUIResource|ComponentListener|ComponentOrientation|ComponentSampleModel|ComponentUI|ComponentView|Composite|CompositeContext|CompositeName|CompositeView|CompoundBorder|CompoundControl|CompoundEdit|CompoundName|Compression|ConcurrentModificationException|Configuration|ConfigurationException|ConfirmationCallback|ConnectException|ConnectIOException|Connection|ConnectionEvent|ConnectionEventListener|ConnectionPendingException|ConnectionPoolDataSource|ConsoleHandler|Constructor|Container|ContainerAdapter|ContainerEvent|ContainerListener|ContainerOrderFocusTraversalPolicy|ContentHandler|ContentHandlerFactory|ContentModel|Context|ContextList|ContextNotEmptyException|ContextualRenderedImageFactory|Control|ControlFactory|ControllerEventListener|ConvolveOp|CookieHolder|Copies|CopiesSupported|CRC32|CredentialExpiredException|CRL|CRLException|CRLSelector|CropImageFilter|CSS|CTX_RESTRICT_SCOPE|CubicCurve2D|Currency|Current|CurrentHelper|CurrentHolder|CurrentOperations|Cursor|Customizer|CustomMarshal|CustomValue|DATA_CONVERSION|DatabaseMetaData|DataBuffer|DataBufferByte|DataBufferDouble|DataBufferFloat|DataBufferInt|DataBufferShort|DataBufferUShort|DataFlavor|DataFormatException|DatagramChannel|DatagramPacket|DatagramSocket|DatagramSocketImpl|DatagramSocketImplFactory|DataInput|DataInputStream|DataLine|DataOutput|DataOutputStream|DataSource|DataTruncation|Date|DateFormat|DateFormatSymbols|DateFormatter|DateTimeAtCompleted|DateTimeAtCreation|DateTimeAtProcessing|DateTimeSyntax|DebugGraphics|DecimalFormat|DecimalFormatSymbols|DeclHandler|DefaultBoundedRangeModel|DefaultButtonModel|DefaultCaret|DefaultCellEditor|DefaultColorSelectionModel|DefaultComboBoxModel|DefaultDesktopManager|DefaultEditorKit|DefaultFocusManager|DefaultFocusTraversalPolicy|DefaultFormatter|DefaultFormatterFactory|DefaultHandler|DefaultHighlighter|DefaultKeyboardFocusManager|DefaultListCellRenderer|DefaultListModel|DefaultListSelectionModel|DefaultMenuLayout|DefaultMetalTheme|DefaultMutableTreeNode|DefaultPersistenceDelegate|DefaultSingleSelectionModel|DefaultStyledDocument|DefaultTableCellRenderer|DefaultTableColumnModel|DefaultTableModel|DefaultTextUI|DefaultTreeCellEditor|DefaultTreeCellRenderer|DefaultTreeModel|DefaultTreeSelectionModel|DefinitionKind|DefinitionKindHelper|Deflater|DeflaterOutputStream|Delegate|DelegationPermission|DESedeKeySpec|DesignMode|DESKeySpec|DesktopIconUI|DesktopManager|DesktopPaneUI|Destination|Destroyable|DestroyFailedException|DGC|DHGenParameterSpec|DHKey|DHParameterSpec|DHPrivateKey|DHPrivateKeySpec|DHPublicKey|DHPublicKeySpec|Dialog|Dictionary|DigestException|DigestInputStream|DigestOutputStream|Dimension|Dimension2D|DimensionUIResource|DirContext|DirectColorModel|DirectoryManager|DirObjectFactory|DirStateFactory|DisplayMode|DnDConstants|Doc|DocAttribute|DocAttributeSet|DocFlavor|DocPrintJob|Document|DocumentBuilder|DocumentBuilderFactory|DocumentEvent|DocumentFilter|DocumentFragment|DocumentHandler|DocumentListener|DocumentName|DocumentParser|DocumentType|DomainCombiner|DomainManager|DomainManagerOperations|DOMException|DOMImplementation|DOMLocator|DOMResult|DOMSource|Double|DoubleBuffer|DoubleHolder|DoubleSeqHelper|DoubleSeqHolder|DragGestureEvent|DragGestureListener|DragGestureRecognizer|DragSource|DragSourceAdapter|DragSourceContext|DragSourceDragEvent|DragSourceDropEvent|DragSourceEvent|DragSourceListener|DragSourceMotionListener|Driver|DriverManager|DriverPropertyInfo|DropTarget|DropTargetAdapter|DropTargetContext|DropTargetDragEvent|DropTargetDropEvent|DropTargetEvent|DropTargetListener|DSAKey|DSAKeyPairGenerator|DSAParameterSpec|DSAParams|DSAPrivateKey|DSAPrivateKeySpec|DSAPublicKey|DSAPublicKeySpec|DTD|DTDConstants|DTDHandler|DuplicateName|DuplicateNameHelper|DynamicImplementation|DynAny|DynAnyFactory|DynAnyFactoryHelper|DynAnyFactoryOperations|DynAnyHelper|DynAnyOperations|DynAnySeqHelper|DynArray|DynArrayHelper|DynArrayOperations|DynEnum|DynEnumHelper|DynEnumOperations|DynFixed|DynFixedHelper|DynFixedOperations|DynSequence|DynSequenceHelper|DynSequenceOperations|DynStruct|DynStructHelper|DynStructOperations|DynUnion|DynUnionHelper|DynUnionOperations|DynValue|DynValueBox|DynValueBoxOperations|DynValueCommon|DynValueCommonOperations|DynValueHelper|DynValueOperations|EditorKit|Element|ElementIterator|Ellipse2D|EmptyBorder|EmptyStackException|EncodedKeySpec|Encoder|Encoding|ENCODING_CDR_ENCAPS|EncryptedPrivateKeyInfo|Entity|EntityReference|EntityResolver|EnumControl|Enumeration|EnumSyntax|Environment|EOFException|Error|ErrorHandler|ErrorListener|ErrorManager|EtchedBorder|Event|EventContext|EventDirContext|EventHandler|EventListener|EventListenerList|EventListenerProxy|EventObject|EventQueue|EventSetDescriptor|Exception|ExceptionInInitializerError|ExceptionList|ExceptionListener|ExemptionMechanism|ExemptionMechanismException|ExemptionMechanismSpi|ExpandVetoException|ExportException|Expression|ExtendedRequest|ExtendedResponse|Externalizable|FactoryConfigurationError|FailedLoginException|FeatureDescriptor|Fidelity|Field|FieldNameHelper|FieldPosition|FieldView|File|FileCacheImageInputStream|FileCacheImageOutputStream|FileChannel|FileChooserUI|FileDescriptor|FileDialog|FileFilter|FileHandler|FileImageInputStream|FileImageOutputStream|FileInputStream|FileLock|FileLockInterruptionException|FilenameFilter|FileNameMap|FileNotFoundException|FileOutputStream|FilePermission|FileReader|FileSystemView|FileView|FileWriter|Filter|FilteredImageSource|FilterInputStream|FilterOutputStream|FilterReader|FilterWriter|Finishings|FixedHeightLayoutCache|FixedHolder|FlatteningPathIterator|FlavorException|FlavorMap|FlavorTable|Float|FloatBuffer|FloatControl|FloatHolder|FloatSeqHelper|FloatSeqHolder|FlowLayout|FlowView|FocusAdapter|FocusEvent|FocusListener|FocusManager|FocusTraversalPolicy|Font|FontFormatException|FontMetrics|FontRenderContext|FontUIResource|Format|FormatConversionProvider|FormatMismatch|FormatMismatchHelper|Formatter|FormView|ForwardRequest|ForwardRequestHelper|Frame|FREE_MEM|GapContent|GatheringByteChannel|GeneralPath|GeneralSecurityException|GlyphJustificationInfo|GlyphMetrics|GlyphVector|GlyphView|GradientPaint|GraphicAttribute|Graphics|Graphics2D|GraphicsConfigTemplate|GraphicsConfiguration|GraphicsDevice|GraphicsEnvironment|GrayFilter|GregorianCalendar|GridBagConstraints|GridBagLayout|GridLayout|Group|GSSContext|GSSCredential|GSSException|GSSManager|GSSName|Guard|GuardedObject|GZIPInputStream|GZIPOutputStream|Handler|HandlerBase|HandshakeCompletedEvent|HandshakeCompletedListener|HasControls|HashAttributeSet|HashDocAttributeSet|HashMap|HashPrintJobAttributeSet|HashPrintRequestAttributeSet|HashPrintServiceAttributeSet|HashSet|Hashtable|HeadlessException|HierarchyBoundsAdapter|HierarchyBoundsListener|HierarchyEvent|HierarchyListener|Highlighter|HostnameVerifier|HTML|HTMLDocument|HTMLEditorKit|HTMLFrameHyperlinkEvent|HTMLWriter|HttpsURLConnection|HttpURLConnection|HyperlinkEvent|HyperlinkListener|ICC_ColorSpace|ICC_Profile|ICC_ProfileGray|ICC_ProfileRGB|Icon|IconUIResource|IconView|ID_ASSIGNMENT_POLICY_ID|ID_UNIQUENESS_POLICY_ID|IdAssignmentPolicy|IdAssignmentPolicyOperations|IdAssignmentPolicyValue|IdentifierHelper|Identity|IdentityHashMap|IdentityScope|IDLEntity|IDLType|IDLTypeHelper|IDLTypeOperations|IdUniquenessPolicy|IdUniquenessPolicyOperations|IdUniquenessPolicyValue|IIOByteBuffer|IIOException|IIOImage|IIOInvalidTreeException|IIOMetadata|IIOMetadataController|IIOMetadataFormat|IIOMetadataFormatImpl|IIOMetadataNode|IIOParam|IIOParamController|IIOReadProgressListener|IIOReadUpdateListener|IIOReadWarningListener|IIORegistry|IIOServiceProvider|IIOWriteProgressListener|IIOWriteWarningListener|IllegalAccessError|IllegalAccessException|IllegalArgumentException|IllegalBlockingModeException|IllegalBlockSizeException|IllegalCharsetNameException|IllegalComponentStateException|IllegalMonitorStateException|IllegalPathStateException|IllegalSelectorException|IllegalStateException|IllegalThreadStateException|Image|ImageCapabilities|ImageConsumer|ImageFilter|ImageGraphicAttribute|ImageIcon|ImageInputStream|ImageInputStreamImpl|ImageInputStreamSpi|ImageIO|ImageObserver|ImageOutputStream|ImageOutputStreamImpl|ImageOutputStreamSpi|ImageProducer|ImageReader|ImageReaderSpi|ImageReaderWriterSpi|ImageReadParam|ImageTranscoder|ImageTranscoderSpi|ImageTypeSpecifier|ImageView|ImageWriteParam|ImageWriter|ImageWriterSpi|ImagingOpException|IMP_LIMIT|IMPLICIT_ACTIVATION_POLICY_ID|ImplicitActivationPolicy|ImplicitActivationPolicyOperations|ImplicitActivationPolicyValue|IncompatibleClassChangeError|InconsistentTypeCode|InconsistentTypeCodeHelper|IndexColorModel|IndexedPropertyDescriptor|IndexOutOfBoundsException|IndirectionException|Inet4Address|Inet6Address|InetAddress|InetSocketAddress|Inflater|InflaterInputStream|InheritableThreadLocal|InitialContext|InitialContextFactory|InitialContextFactoryBuilder|InitialDirContext|INITIALIZE|InitialLdapContext|InlineView|InputContext|InputEvent|InputMap|InputMapUIResource|InputMethod|InputMethodContext|InputMethodDescriptor|InputMethodEvent|InputMethodHighlight|InputMethodListener|InputMethodRequests|InputSource|InputStream|InputStreamReader|InputSubset|InputVerifier|Insets|InsetsUIResource|InstantiationError|InstantiationException|Instrument|InsufficientResourcesException|IntBuffer|Integer|IntegerSyntax|Interceptor|InterceptorOperations|INTERNAL|InternalError|InternalFrameAdapter|InternalFrameEvent|InternalFrameFocusTraversalPolicy|InternalFrameListener|InternalFrameUI|InternationalFormatter|InterruptedException|InterruptedIOException|InterruptedNamingException|InterruptibleChannel|INTF_REPOS|IntHolder|IntrospectionException|Introspector|INV_FLAG|INV_IDENT|INV_OBJREF|INV_POLICY|Invalid|INVALID_TRANSACTION|InvalidAddress|InvalidAddressHelper|InvalidAddressHolder|InvalidAlgorithmParameterException|InvalidAttributeIdentifierException|InvalidAttributesException|InvalidAttributeValueException|InvalidClassException|InvalidDnDOperationException|InvalidKeyException|InvalidKeySpecException|InvalidMarkException|InvalidMidiDataException|InvalidName|InvalidNameException|InvalidNameHelper|InvalidNameHolder|InvalidObjectException|InvalidParameterException|InvalidParameterSpecException|InvalidPolicy|InvalidPolicyHelper|InvalidPreferencesFormatException|InvalidSearchControlsException|InvalidSearchFilterException|InvalidSeq|InvalidSlot|InvalidSlotHelper|InvalidTransactionException|InvalidTypeForEncoding|InvalidTypeForEncodingHelper|InvalidValue|InvalidValueHelper|InvocationEvent|InvocationHandler|InvocationTargetException|InvokeHandler|IOException|IOR|IORHelper|IORHolder|IORInfo|IORInfoOperations|IORInterceptor|IORInterceptorOperations|IRObject|IRObjectOperations|IstringHelper|ItemEvent|ItemListener|ItemSelectable|Iterator|IvParameterSpec|JApplet|JarEntry|JarException|JarFile|JarInputStream|JarOutputStream|JarURLConnection|JButton|JCheckBox|JCheckBoxMenuItem|JColorChooser|JComboBox|JComponent|JDesktopPane|JDialog|JEditorPane|JFileChooser|JFormattedTextField|JFrame|JInternalFrame|JLabel|JLayeredPane|JList|JMenu|JMenuBar|JMenuItem|JobAttributes|JobHoldUntil|JobImpressions|JobImpressionsCompleted|JobImpressionsSupported|JobKOctets|JobKOctetsProcessed|JobKOctetsSupported|JobMediaSheets|JobMediaSheetsCompleted|JobMediaSheetsSupported|JobMessageFromOperator|JobName|JobOriginatingUserName|JobPriority|JobPrioritySupported|JobSheets|JobState|JobStateReason|JobStateReasons|JOptionPane|JPanel|JPasswordField|JPEGHuffmanTable|JPEGImageReadParam|JPEGImageWriteParam|JPEGQTable|JPopupMenu|JProgressBar|JRadioButton|JRadioButtonMenuItem|JRootPane|JScrollBar|JScrollPane|JSeparator|JSlider|JSpinner|JSplitPane|JTabbedPane|JTable|JTableHeader|JTextArea|JTextComponent|JTextField|JTextPane|JToggleButton|JToolBar|JToolTip|JTree|JViewport|JWindow|KerberosKey|KerberosPrincipal|KerberosTicket|Kernel|Key|KeyAdapter|KeyAgreement|KeyAgreementSpi|KeyboardFocusManager|KeyEvent|KeyEventDispatcher|KeyEventPostProcessor|KeyException|KeyFactory|KeyFactorySpi|KeyGenerator|KeyGeneratorSpi|KeyListener|KeyManagementException|KeyManager|KeyManagerFactory|KeyManagerFactorySpi|Keymap|KeyPair|KeyPairGenerator|KeyPairGeneratorSpi|KeySpec|KeyStore|KeyStoreException|KeyStoreSpi|KeyStroke|Label|LabelUI|LabelView|LanguageCallback|LastOwnerException|LayeredHighlighter|LayoutFocusTraversalPolicy|LayoutManager|LayoutManager2|LayoutQueue|LDAPCertStoreParameters|LdapContext|LdapReferralException|Lease|Level|LexicalHandler|LIFESPAN_POLICY_ID|LifespanPolicy|LifespanPolicyOperations|LifespanPolicyValue|LimitExceededException|Line|Line2D|LineBorder|LineBreakMeasurer|LineEvent|LineListener|LineMetrics|LineNumberInputStream|LineNumberReader|LineUnavailableException|LinkageError|LinkedHashMap|LinkedHashSet|LinkedList|LinkException|LinkLoopException|LinkRef|List|ListCellRenderer|ListDataEvent|ListDataListener|ListIterator|ListModel|ListResourceBundle|ListSelectionEvent|ListSelectionListener|ListSelectionModel|ListUI|ListView|LoaderHandler|Locale|LocalObject|LocateRegistry|LOCATION_FORWARD|Locator|LocatorImpl|Logger|LoggingPermission|LoginContext|LoginException|LoginModule|LogManager|LogRecord|LogStream|Long|LongBuffer|LongHolder|LongLongSeqHelper|LongLongSeqHolder|LongSeqHelper|LongSeqHolder|LookAndFeel|LookupOp|LookupTable|Mac|MacSpi|MalformedInputException|MalformedLinkException|MalformedURLException|ManagerFactoryParameters|Manifest|Map|MappedByteBuffer|MARSHAL|MarshalException|MarshalledObject|MaskFormatter|Matcher|Math|MatteBorder|Media|MediaName|MediaPrintableArea|MediaSize|MediaSizeName|MediaTracker|MediaTray|Member|MemoryCacheImageInputStream|MemoryCacheImageOutputStream|MemoryHandler|MemoryImageSource|Menu|MenuBar|MenuBarUI|MenuComponent|MenuContainer|MenuDragMouseEvent|MenuDragMouseListener|MenuElement|MenuEvent|MenuItem|MenuItemUI|MenuKeyEvent|MenuKeyListener|MenuListener|MenuSelectionManager|MenuShortcut|MessageDigest|MessageDigestSpi|MessageFormat|MessageProp|MetaEventListener|MetalBorders|MetalButtonUI|MetalCheckBoxIcon|MetalCheckBoxUI|MetalComboBoxButton|MetalComboBoxEditor|MetalComboBoxIcon|MetalComboBoxUI|MetalDesktopIconUI|MetalFileChooserUI|MetalIconFactory|MetalInternalFrameTitlePane|MetalInternalFrameUI|MetalLabelUI|MetalLookAndFeel|MetalPopupMenuSeparatorUI|MetalProgressBarUI|MetalRadioButtonUI|MetalRootPaneUI|MetalScrollBarUI|MetalScrollButton|MetalScrollPaneUI|MetalSeparatorUI|MetalSliderUI|MetalSplitPaneUI|MetalTabbedPaneUI|MetalTextFieldUI|MetalTheme|MetalToggleButtonUI|MetalToolBarUI|MetalToolTipUI|MetalTreeUI|MetaMessage|Method|MethodDescriptor|MidiChannel|MidiDevice|MidiDeviceProvider|MidiEvent|MidiFileFormat|MidiFileReader|MidiFileWriter|MidiMessage|MidiSystem|MidiUnavailableException|MimeTypeParseException|MinimalHTMLWriter|MissingResourceException|Mixer|MixerProvider|ModificationItem|Modifier|MouseAdapter|MouseDragGestureRecognizer|MouseEvent|MouseInputAdapter|MouseInputListener|MouseListener|MouseMotionAdapter|MouseMotionListener|MouseWheelEvent|MouseWheelListener|MultiButtonUI|MulticastSocket|MultiColorChooserUI|MultiComboBoxUI|MultiDesktopIconUI|MultiDesktopPaneUI|MultiDoc|MultiDocPrintJob|MultiDocPrintService|MultiFileChooserUI|MultiInternalFrameUI|MultiLabelUI|MultiListUI|MultiLookAndFeel|MultiMenuBarUI|MultiMenuItemUI|MultiOptionPaneUI|MultiPanelUI|MultiPixelPackedSampleModel|MultipleComponentProfileHelper|MultipleComponentProfileHolder|MultipleDocumentHandling|MultipleMaster|MultiPopupMenuUI|MultiProgressBarUI|MultiRootPaneUI|MultiScrollBarUI|MultiScrollPaneUI|MultiSeparatorUI|MultiSliderUI|MultiSpinnerUI|MultiSplitPaneUI|MultiTabbedPaneUI|MultiTableHeaderUI|MultiTableUI|MultiTextUI|MultiToolBarUI|MultiToolTipUI|MultiTreeUI|MultiViewportUI|MutableAttributeSet|MutableComboBoxModel|MutableTreeNode|Name|NameAlreadyBoundException|NameCallback|NameClassPair|NameComponent|NameComponentHelper|NameComponentHolder|NamedNodeMap|NamedValue|NameDynAnyPair|NameDynAnyPairHelper|NameDynAnyPairSeqHelper|NameHelper|NameHolder|NameNotFoundException|NameParser|NamespaceChangeListener|NamespaceSupport|NameValuePair|NameValuePairHelper|NameValuePairSeqHelper|Naming|NamingContext|NamingContextExt|NamingContextExtHelper|NamingContextExtHolder|NamingContextExtOperations|NamingContextExtPOA|NamingContextHelper|NamingContextHolder|NamingContextOperations|NamingContextPOA|NamingEnumeration|NamingEvent|NamingException|NamingExceptionEvent|NamingListener|NamingManager|NamingSecurityException|NavigationFilter|NegativeArraySizeException|NetPermission|NetworkInterface|NO_IMPLEMENT|NO_MEMORY|NO_PERMISSION|NO_RESOURCES|NO_RESPONSE|NoClassDefFoundError|NoConnectionPendingException|NoContext|NoContextHelper|Node|NodeChangeEvent|NodeChangeListener|NodeList|NoInitialContextException|NoninvertibleTransformException|NonReadableChannelException|NonWritableChannelException|NoPermissionException|NoRouteToHostException|NoServant|NoServantHelper|NoSuchAlgorithmException|NoSuchAttributeException|NoSuchElementException|NoSuchFieldError|NoSuchFieldException|NoSuchMethodError|NoSuchMethodException|NoSuchObjectException|NoSuchPaddingException|NoSuchProviderException|NotActiveException|Notation|NotBoundException|NotContextException|NotEmpty|NotEmptyHelper|NotEmptyHolder|NotFound|NotFoundHelper|NotFoundHolder|NotFoundReason|NotFoundReasonHelper|NotFoundReasonHolder|NotOwnerException|NotSerializableException|NotYetBoundException|NotYetConnectedException|NullCipher|NullPointerException|Number|NumberFormat|NumberFormatException|NumberFormatter|NumberOfDocuments|NumberOfInterveningJobs|NumberUp|NumberUpSupported|NumericShaper|NVList|OBJ_ADAPTER|Object|OBJECT_NOT_EXIST|ObjectAlreadyActive|ObjectAlreadyActiveHelper|ObjectChangeListener|ObjectFactory|ObjectFactoryBuilder|ObjectHelper|ObjectHolder|ObjectIdHelper|ObjectImpl|ObjectInput|ObjectInputStream|ObjectInputValidation|ObjectNotActive|ObjectNotActiveHelper|ObjectOutput|ObjectOutputStream|ObjectStreamClass|ObjectStreamConstants|ObjectStreamException|ObjectStreamField|ObjectView|ObjID|Observable|Observer|OctetSeqHelper|OctetSeqHolder|Oid|OMGVMCID|OpenType|Operation|OperationNotSupportedException|Option|OptionalDataException|OptionPaneUI|ORB|ORBInitializer|ORBInitializerOperations|ORBInitInfo|ORBInitInfoOperations|OrientationRequested|OutOfMemoryError|OutputDeviceAssigned|OutputKeys|OutputStream|OutputStreamWriter|OverlappingFileLockException|OverlayLayout|Owner|Package|PackedColorModel|Pageable|PageAttributes|PageFormat|PageRanges|PagesPerMinute|PagesPerMinuteColor|Paint|PaintContext|PaintEvent|Panel|PanelUI|Paper|ParagraphView|Parameter|ParameterBlock|ParameterDescriptor|ParameterMetaData|ParameterMode|ParameterModeHelper|ParameterModeHolder|ParseException|ParsePosition|Parser|ParserAdapter|ParserConfigurationException|ParserDelegator|ParserFactory|PartialResultException|PasswordAuthentication|PasswordCallback|PasswordView|Patch|PathIterator|Pattern|PatternSyntaxException|PBEKey|PBEKeySpec|PBEParameterSpec|PDLOverrideSupported|Permission|PermissionCollection|Permissions|PERSIST_STORE|PersistenceDelegate|PhantomReference|Pipe|PipedInputStream|PipedOutputStream|PipedReader|PipedWriter|PixelGrabber|PixelInterleavedSampleModel|PKCS8EncodedKeySpec|PKIXBuilderParameters|PKIXCertPathBuilderResult|PKIXCertPathChecker|PKIXCertPathValidatorResult|PKIXParameters|PlainDocument|PlainView|POA|POAHelper|POAManager|POAManagerOperations|POAOperations|Point|Point2D|Policy|PolicyError|PolicyErrorCodeHelper|PolicyErrorHelper|PolicyErrorHolder|PolicyFactory|PolicyFactoryOperations|PolicyHelper|PolicyHolder|PolicyListHelper|PolicyListHolder|PolicyNode|PolicyOperations|PolicyQualifierInfo|PolicyTypeHelper|Polygon|PooledConnection|Popup|PopupFactory|PopupMenu|PopupMenuEvent|PopupMenuListener|PopupMenuUI|Port|PortableRemoteObject|PortableRemoteObjectDelegate|PortUnreachableException|Position|PreferenceChangeEvent|PreferenceChangeListener|Preferences|PreferencesFactory|PreparedStatement|PresentationDirection|Principal|PrincipalHolder|Printable|PrinterAbortException|PrinterException|PrinterGraphics|PrinterInfo|PrinterIOException|PrinterIsAcceptingJobs|PrinterJob|PrinterLocation|PrinterMakeAndModel|PrinterMessageFromOperator|PrinterMoreInfo|PrinterMoreInfoManufacturer|PrinterName|PrinterResolution|PrinterState|PrinterStateReason|PrinterStateReasons|PrinterURI|PrintEvent|PrintException|PrintGraphics|PrintJob|PrintJobAdapter|PrintJobAttribute|PrintJobAttributeEvent|PrintJobAttributeListener|PrintJobAttributeSet|PrintJobEvent|PrintJobListener|PrintQuality|PrintRequestAttribute|PrintRequestAttributeSet|PrintService|PrintServiceAttribute|PrintServiceAttributeEvent|PrintServiceAttributeListener|PrintServiceAttributeSet|PrintServiceLookup|PrintStream|PrintWriter|PRIVATE_MEMBER|PrivateCredentialPermission|PrivateKey|PrivilegedAction|PrivilegedActionException|PrivilegedExceptionAction|Process|ProcessingInstruction|ProfileDataException|ProfileIdHelper|ProgressBarUI|ProgressMonitor|ProgressMonitorInputStream|Properties|PropertyChangeEvent|PropertyChangeListener|PropertyChangeListenerProxy|PropertyChangeSupport|PropertyDescriptor|PropertyEditor|PropertyEditorManager|PropertyEditorSupport|PropertyPermission|PropertyResourceBundle|PropertyVetoException|ProtectionDomain|ProtocolException|Provider|ProviderException|Proxy|PSSParameterSpec|PUBLIC_MEMBER|PublicKey|PushbackInputStream|PushbackReader|QuadCurve2D|QueuedJobCount|Random|RandomAccess|RandomAccessFile|Raster|RasterFormatException|RasterOp|RC2ParameterSpec|RC5ParameterSpec|ReadableByteChannel|Reader|ReadOnlyBufferException|Receiver|Rectangle|Rectangle2D|RectangularShape|Ref|RefAddr|Reference|Referenceable|ReferenceQueue|ReferenceUriSchemesSupported|ReferralException|ReflectPermission|Refreshable|RefreshFailedException|RegisterableService|Registry|RegistryHandler|RemarshalException|Remote|RemoteCall|RemoteException|RemoteObject|RemoteRef|RemoteServer|RemoteStub|RenderableImage|RenderableImageOp|RenderableImageProducer|RenderContext|RenderedImage|RenderedImageFactory|Renderer|RenderingHints|RepaintManager|ReplicateScaleFilter|RepositoryIdHelper|Request|REQUEST_PROCESSING_POLICY_ID|RequestInfo|RequestInfoOperations|RequestingUserName|RequestProcessingPolicy|RequestProcessingPolicyOperations|RequestProcessingPolicyValue|RescaleOp|ResolutionSyntax|Resolver|ResolveResult|ResourceBundle|ResponseHandler|Result|ResultSet|ResultSetMetaData|ReverbType|RGBImageFilter|RMIClassLoader|RMIClassLoaderSpi|RMIClientSocketFactory|RMIFailureHandler|RMISecurityException|RMISecurityManager|RMIServerSocketFactory|RMISocketFactory|Robot|RootPaneContainer|RootPaneUI|RoundRectangle2D|RowMapper|RowSet|RowSetEvent|RowSetInternal|RowSetListener|RowSetMetaData|RowSetReader|RowSetWriter|RSAKey|RSAKeyGenParameterSpec|RSAMultiPrimePrivateCrtKey|RSAMultiPrimePrivateCrtKeySpec|RSAOtherPrimeInfo|RSAPrivateCrtKey|RSAPrivateCrtKeySpec|RSAPrivateKey|RSAPrivateKeySpec|RSAPublicKey|RSAPublicKeySpec|RTFEditorKit|RuleBasedCollator|Runnable|Runtime|RunTime|RuntimeException|RunTimeOperations|RuntimePermission|SampleModel|Savepoint|SAXException|SAXNotRecognizedException|SAXNotSupportedException|SAXParseException|SAXParser|SAXParserFactory|SAXResult|SAXSource|SAXTransformerFactory|ScatteringByteChannel|SchemaViolationException|Scrollable|Scrollbar|ScrollBarUI|ScrollPane|ScrollPaneAdjustable|ScrollPaneConstants|ScrollPaneLayout|ScrollPaneUI|SealedObject|SearchControls|SearchResult|SecretKey|SecretKeyFactory|SecretKeyFactorySpi|SecretKeySpec|SecureClassLoader|SecureRandom|SecureRandomSpi|Security|SecurityException|SecurityManager|SecurityPermission|Segment|SelectableChannel|SelectionKey|Selector|SelectorProvider|SeparatorUI|Sequence|SequenceInputStream|Sequencer|Serializable|SerializablePermission|Servant|SERVANT_RETENTION_POLICY_ID|ServantActivator|ServantActivatorHelper|ServantActivatorOperations|ServantActivatorPOA|ServantAlreadyActive|ServantAlreadyActiveHelper|ServantLocator|ServantLocatorHelper|ServantLocatorOperations|ServantLocatorPOA|ServantManager|ServantManagerOperations|ServantNotActive|ServantNotActiveHelper|ServantObject|ServantRetentionPolicy|ServantRetentionPolicyOperations|ServantRetentionPolicyValue|ServerCloneException|ServerError|ServerException|ServerNotActiveException|ServerRef|ServerRequest|ServerRequestInfo|ServerRequestInfoOperations|ServerRequestInterceptor|ServerRequestInterceptorOperations|ServerRuntimeException|ServerSocket|ServerSocketChannel|ServerSocketFactory|ServiceContext|ServiceContextHelper|ServiceContextHolder|ServiceContextListHelper|ServiceContextListHolder|ServiceDetail|ServiceDetailHelper|ServiceIdHelper|ServiceInformation|ServiceInformationHelper|ServiceInformationHolder|ServicePermission|ServiceRegistry|ServiceUI|ServiceUIFactory|ServiceUnavailableException|Set|SetOfIntegerSyntax|SetOverrideType|SetOverrideTypeHelper|Severity|Shape|ShapeGraphicAttribute|SheetCollate|Short|ShortBuffer|ShortBufferException|ShortHolder|ShortLookupTable|ShortMessage|ShortSeqHelper|ShortSeqHolder|Sides|Signature|SignatureException|SignatureSpi|SignedObject|Signer|SimpleAttributeSet|SimpleBeanInfo|SimpleDateFormat|SimpleDoc|SimpleFormatter|SimpleTimeZone|SinglePixelPackedSampleModel|SingleSelectionModel|Size2DSyntax|SizeLimitExceededException|SizeRequirements|SizeSequence|Skeleton|SkeletonMismatchException|SkeletonNotFoundException|SliderUI|Socket|SocketAddress|SocketChannel|SocketException|SocketFactory|SocketHandler|SocketImpl|SocketImplFactory|SocketOptions|SocketPermission|SocketSecurityException|SocketTimeoutException|SoftBevelBorder|SoftReference|SortedMap|SortedSet|SortingFocusTraversalPolicy|Soundbank|SoundbankReader|SoundbankResource|Source|SourceDataLine|SourceLocator|SpinnerDateModel|SpinnerListModel|SpinnerModel|SpinnerNumberModel|SpinnerUI|SplitPaneUI|Spring|SpringLayout|SQLData|SQLException|SQLInput|SQLOutput|SQLPermission|SQLWarning|SSLContext|SSLContextSpi|SSLException|SSLHandshakeException|SSLKeyException|SSLPeerUnverifiedException|SSLPermission|SSLProtocolException|SSLServerSocket|SSLServerSocketFactory|SSLSession|SSLSessionBindingEvent|SSLSessionBindingListener|SSLSessionContext|SSLSocket|SSLSocketFactory|Stack|StackOverflowError|StackTraceElement|StartTlsRequest|StartTlsResponse|State|StateEdit|StateEditable|StateFactory|Statement|Streamable|StreamableValue|StreamCorruptedException|StreamHandler|StreamPrintService|StreamPrintServiceFactory|StreamResult|StreamSource|StreamTokenizer|StrictMath|String|StringBuffer|StringBufferInputStream|StringCharacterIterator|StringContent|StringHolder|StringIndexOutOfBoundsException|StringNameHelper|StringReader|StringRefAddr|StringSelection|StringSeqHelper|StringSeqHolder|StringTokenizer|StringValueHelper|StringWriter|Stroke|Struct|StructMember|StructMemberHelper|Stub|StubDelegate|StubNotFoundException|Style|StyleConstants|StyleContext|StyledDocument|StyledEditorKit|StyleSheet|Subject|SubjectDomainCombiner|SUCCESSFUL|SupportedValuesAttribute|SwingConstants|SwingPropertyChangeSupport|SwingUtilities|SYNC_WITH_TRANSPORT|SyncFailedException|SyncScopeHelper|Synthesizer|SysexMessage|System|SYSTEM_EXCEPTION|SystemColor|SystemException|SystemFlavorMap|TabableView|TabbedPaneUI|TabExpander|TableCellEditor|TableCellRenderer|TableColumn|TableColumnModel|TableColumnModelEvent|TableColumnModelListener|TableHeaderUI|TableModel|TableModelEvent|TableModelListener|TableUI|TableView|TabSet|TabStop|TAG_ALTERNATE_IIOP_ADDRESS|TAG_CODE_SETS|TAG_INTERNET_IOP|TAG_JAVA_CODEBASE|TAG_MULTIPLE_COMPONENTS|TAG_ORB_TYPE|TAG_POLICIES|TagElement|TaggedComponent|TaggedComponentHelper|TaggedComponentHolder|TaggedProfile|TaggedProfileHelper|TaggedProfileHolder|TargetDataLine|TCKind|Templates|TemplatesHandler|Text|TextAction|TextArea|TextAttribute|TextComponent|TextEvent|TextField|TextHitInfo|TextInputCallback|TextLayout|TextListener|TextMeasurer|TextOutputCallback|TextSyntax|TextUI|TexturePaint|Thread|THREAD_POLICY_ID|ThreadDeath|ThreadGroup|ThreadLocal|ThreadPolicy|ThreadPolicyOperations|ThreadPolicyValue|Throwable|Tie|TileObserver|Time|TimeLimitExceededException|Timer|TimerTask|Timestamp|TimeZone|TitledBorder|ToolBarUI|Toolkit|ToolTipManager|ToolTipUI|TooManyListenersException|Track|TRANSACTION_REQUIRED|TRANSACTION_ROLLEDBACK|TransactionRequiredException|TransactionRolledbackException|TransactionService|Transferable|TransferHandler|TransformAttribute|Transformer|TransformerConfigurationException|TransformerException|TransformerFactory|TransformerFactoryConfigurationError|TransformerHandler|TRANSIENT|Transmitter|Transparency|TRANSPORT_RETRY|TreeCellEditor|TreeCellRenderer|TreeExpansionEvent|TreeExpansionListener|TreeMap|TreeModel|TreeModelEvent|TreeModelListener|TreeNode|TreePath|TreeSelectionEvent|TreeSelectionListener|TreeSelectionModel|TreeSet|TreeUI|TreeWillExpandListener|TrustAnchor|TrustManager|TrustManagerFactory|TrustManagerFactorySpi|TypeCode|TypeCodeHolder|TypeMismatch|TypeMismatchHelper|Types|UID|UIDefaults|UIManager|UIResource|ULongLongSeqHelper|ULongLongSeqHolder|ULongSeqHelper|ULongSeqHolder|UndeclaredThrowableException|UndoableEdit|UndoableEditEvent|UndoableEditListener|UndoableEditSupport|UndoManager|UnexpectedException|UnicastRemoteObject|UnionMember|UnionMemberHelper|UNKNOWN|UnknownEncoding|UnknownEncodingHelper|UnknownError|UnknownException|UnknownGroupException|UnknownHostException|UnknownObjectException|UnknownServiceException|UnknownUserException|UnknownUserExceptionHelper|UnknownUserExceptionHolder|UnmappableCharacterException|UnmarshalException|UnmodifiableSetException|UnrecoverableKeyException|Unreferenced|UnresolvedAddressException|UnresolvedPermission|UnsatisfiedLinkError|UnsolicitedNotification|UnsolicitedNotificationEvent|UnsolicitedNotificationListener|UNSUPPORTED_POLICY|UNSUPPORTED_POLICY_VALUE|UnsupportedAddressTypeException|UnsupportedAudioFileException|UnsupportedCallbackException|UnsupportedCharsetException|UnsupportedClassVersionError|UnsupportedEncodingException|UnsupportedFlavorException|UnsupportedLookAndFeelException|UnsupportedOperationException|URI|URIException|URIResolver|URISyntax|URISyntaxException|URL|URLClassLoader|URLConnection|URLDecoder|URLEncoder|URLStreamHandler|URLStreamHandlerFactory|URLStringHelper|USER_EXCEPTION|UserException|UShortSeqHelper|UShortSeqHolder|UTFDataFormatException|Util|UtilDelegate|Utilities|ValueBase|ValueBaseHelper|ValueBaseHolder|ValueFactory|ValueHandler|ValueMember|ValueMemberHelper|VariableHeightLayoutCache|Vector|VerifyError|VersionSpecHelper|VetoableChangeListener|VetoableChangeListenerProxy|VetoableChangeSupport|View|ViewFactory|ViewportLayout|ViewportUI|VirtualMachineError|Visibility|VisibilityHelper|VM_ABSTRACT|VM_CUSTOM|VM_NONE|VM_TRUNCATABLE|VMID|VoiceStatus|Void|VolatileImage|WCharSeqHelper|WCharSeqHolder|WeakHashMap|WeakReference|Window|WindowAdapter|WindowConstants|WindowEvent|WindowFocusListener|WindowListener|WindowStateListener|WrappedPlainView|WritableByteChannel|WritableRaster|WritableRenderedImage|WriteAbortedException|Writer|WrongAdapter|WrongAdapterHelper|WrongPolicy|WrongPolicyHelper|WrongTransaction|WrongTransactionHelper|WrongTransactionHolder|WStringSeqHelper|WStringSeqHolder|WStringValueHelper|X500Principal|X500PrivateCredential|X509Certificate|X509CertSelector|X509CRL|X509CRLEntry|X509CRLSelector|X509EncodedKeySpec|X509Extension|X509KeyManager|X509TrustManager|XAConnection|XADataSource|XAException|XAResource|Xid|XMLDecoder|XMLEncoder|XMLFilter|XMLFilterImpl|XMLFormatter|XMLReader|XMLReaderAdapter|XMLReaderFactory|ZipEntry|ZipException|ZipFile|ZipInputStream|ZipOutputStream|ZoneView|_BindingIteratorImplBase|_BindingIteratorStub|_DynAnyFactoryStub|_DynAnyStub|_DynArrayStub|_DynEnumStub|_DynFixedStub|_DynSequenceStub|_DynStructStub|_DynUnionStub|_DynValueStub|_IDLTypeStub|_NamingContextExtStub|_NamingContextImplBase|_NamingContextStub|_PolicyStub|_Remote_Stub|_ServantActivatorStub|_ServantLocatorStub)$/',
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                    'types' => '/^(boolean|byte|char|const|double|final|float|int|long|short|static|void)$/',
-                    'reserved' => '/^(import|package|abstract|break|case|catch|class|continue|default|do|else|extends|false|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|super|strictfp|switch|synchronized|this|throws|throw|transient|true|try|volatile|while)$/',
-                    'builtin' => '/^(AbstractAction|AbstractBorder|AbstractButton|AbstractCellEditor|AbstractCollection|AbstractColorChooserPanel|AbstractDocument|AbstractInterruptibleChannel|AbstractLayoutCache|AbstractList|AbstractListModel|AbstractMap|AbstractMethodError|AbstractPreferences|AbstractSelectableChannel|AbstractSelectionKey|AbstractSelector|AbstractSequentialList|AbstractSet|AbstractSpinnerModel|AbstractTableModel|AbstractUndoableEdit|AbstractWriter|AccessControlContext|AccessControlException|AccessController|AccessException|Accessible|AccessibleAction|AccessibleBundle|AccessibleComponent|AccessibleContext|AccessibleEditableText|AccessibleExtendedComponent|AccessibleExtendedTable|AccessibleHyperlink|AccessibleHypertext|AccessibleIcon|AccessibleKeyBinding|AccessibleObject|AccessibleRelation|AccessibleRelationSet|AccessibleResourceBundle|AccessibleRole|AccessibleSelection|AccessibleState|AccessibleStateSet|AccessibleTable|AccessibleTableModelChange|AccessibleText|AccessibleValue|AccountExpiredException|Acl|AclEntry|AclNotFoundException|Action|ActionEvent|ActionListener|ActionMap|ActionMapUIResource|Activatable|ActivateFailedException|ActivationDesc|ActivationException|ActivationGroup|ActivationGroup_Stub|ActivationGroupDesc|ActivationGroupID|ActivationID|ActivationInstantiator|ActivationMonitor|ActivationSystem|Activator|ActiveEvent|AdapterActivator|AdapterActivatorOperations|AdapterAlreadyExists|AdapterAlreadyExistsHelper|AdapterInactive|AdapterInactiveHelper|AdapterNonExistent|AdapterNonExistentHelper|AddressHelper|Adjustable|AdjustmentEvent|AdjustmentListener|Adler32|AffineTransform|AffineTransformOp|AlgorithmParameterGenerator|AlgorithmParameterGeneratorSpi|AlgorithmParameters|AlgorithmParameterSpec|AlgorithmParametersSpi|AllPermission|AlphaComposite|AlreadyBound|AlreadyBoundException|AlreadyBoundHelper|AlreadyBoundHolder|AlreadyConnectedException|AncestorEvent|AncestorListener|Annotation|Any|AnyHolder|AnySeqHelper|AnySeqHolder|AppConfigurationEntry|Applet|AppletContext|AppletInitializer|AppletStub|ApplicationException|Arc2D|Area|AreaAveragingScaleFilter|ARG_IN|ARG_INOUT|ARG_OUT|ArithmeticException|Array|ArrayIndexOutOfBoundsException|ArrayList|Arrays|ArrayStoreException|AssertionError|AsyncBoxView|AsynchronousCloseException|Attr|Attribute|AttributedCharacterIterator|AttributedString|AttributeException|AttributeInUseException|AttributeList|AttributeListImpl|AttributeModificationException|Attributes|AttributeSet|AttributeSetUtilities|AttributesImpl|AudioClip|AudioFileFormat|AudioFileReader|AudioFileWriter|AudioFormat|AudioInputStream|AudioPermission|AudioSystem|AuthenticationException|AuthenticationNotSupportedException|Authenticator|AuthPermission|Autoscroll|AWTError|AWTEvent|AWTEventListener|AWTEventListenerProxy|AWTEventMulticaster|AWTException|AWTKeyStroke|AWTPermission|BackingStoreException|BAD_CONTEXT|BAD_INV_ORDER|BAD_OPERATION|BAD_PARAM|BAD_POLICY|BAD_POLICY_TYPE|BAD_POLICY_VALUE|BAD_TYPECODE|BadKind|BadLocationException|BadPaddingException|BandCombineOp|BandedSampleModel|BasicArrowButton|BasicAttribute|BasicAttributes|BasicBorders|BasicButtonListener|BasicButtonUI|BasicCheckBoxMenuItemUI|BasicCheckBoxUI|BasicColorChooserUI|BasicComboBoxEditor|BasicComboBoxRenderer|BasicComboBoxUI|BasicComboPopup|BasicDesktopIconUI|BasicDesktopPaneUI|BasicDirectoryModel|BasicEditorPaneUI|BasicFileChooserUI|BasicFormattedTextFieldUI|BasicGraphicsUtils|BasicHTML|BasicIconFactory|BasicInternalFrameTitlePane|BasicInternalFrameUI|BasicLabelUI|BasicListUI|BasicLookAndFeel|BasicMenuBarUI|BasicMenuItemUI|BasicMenuUI|BasicOptionPaneUI|BasicPanelUI|BasicPasswordFieldUI|BasicPermission|BasicPopupMenuSeparatorUI|BasicPopupMenuUI|BasicProgressBarUI|BasicRadioButtonMenuItemUI|BasicRadioButtonUI|BasicRootPaneUI|BasicScrollBarUI|BasicScrollPaneUI|BasicSeparatorUI|BasicSliderUI|BasicSpinnerUI|BasicSplitPaneDivider|BasicSplitPaneUI|BasicStroke|BasicTabbedPaneUI|BasicTableHeaderUI|BasicTableUI|BasicTextAreaUI|BasicTextFieldUI|BasicTextPaneUI|BasicTextUI|BasicToggleButtonUI|BasicToolBarSeparatorUI|BasicToolBarUI|BasicToolTipUI|BasicTreeUI|BasicViewportUI|BatchUpdateException|BeanContext|BeanContextChild|BeanContextChildComponentProxy|BeanContextChildSupport|BeanContextContainerProxy|BeanContextEvent|BeanContextMembershipEvent|BeanContextMembershipListener|BeanContextProxy|BeanContextServiceAvailableEvent|BeanContextServiceProvider|BeanContextServiceProviderBeanInfo|BeanContextServiceRevokedEvent|BeanContextServiceRevokedListener|BeanContextServices|BeanContextServicesListener|BeanContextServicesSupport|BeanContextSupport|BeanDescriptor|BeanInfo|Beans|BevelBorder|Bidi|BigDecimal|BigInteger|BinaryRefAddr|BindException|Binding|BindingHelper|BindingHolder|BindingIterator|BindingIteratorHelper|BindingIteratorHolder|BindingIteratorOperations|BindingIteratorPOA|BindingListHelper|BindingListHolder|BindingType|BindingTypeHelper|BindingTypeHolder|BitSet|Blob|BlockView|Book|Boolean|BooleanControl|BooleanHolder|BooleanSeqHelper|BooleanSeqHolder|Border|BorderFactory|BorderLayout|BorderUIResource|BoundedRangeModel|Bounds|Box|BoxedValueHelper|BoxLayout|BoxView|BreakIterator|Buffer|BufferCapabilities|BufferedImage|BufferedImageFilter|BufferedImageOp|BufferedInputStream|BufferedOutputStream|BufferedReader|BufferedWriter|BufferOverflowException|BufferStrategy|BufferUnderflowException|Button|ButtonGroup|ButtonModel|ButtonUI|Byte|ByteArrayInputStream|ByteArrayOutputStream|ByteBuffer|ByteChannel|ByteHolder|ByteLookupTable|ByteOrder|Calendar|CallableStatement|Callback|CallbackHandler|CancelablePrintJob|CancelledKeyException|CannotProceed|CannotProceedException|CannotProceedHelper|CannotProceedHolder|CannotRedoException|CannotUndoException|Canvas|CardLayout|Caret|CaretEvent|CaretListener|CDATASection|CellEditor|CellEditorListener|CellRendererPane|Certificate|CertificateEncodingException|CertificateException|CertificateExpiredException|CertificateFactory|CertificateFactorySpi|CertificateNotYetValidException|CertificateParsingException|CertPath|CertPathBuilder|CertPathBuilderException|CertPathBuilderResult|CertPathBuilderSpi|CertPathParameters|CertPathValidator|CertPathValidatorException|CertPathValidatorResult|CertPathValidatorSpi|CertSelector|CertStore|CertStoreException|CertStoreParameters|CertStoreSpi|ChangedCharSetException|ChangeEvent|ChangeListener|Channel|ChannelBinding|Channels|Character|CharacterCodingException|CharacterData|CharacterIterator|CharArrayReader|CharArrayWriter|CharBuffer|CharConversionException|CharHolder|CharSeqHelper|CharSeqHolder|CharSequence|Charset|CharsetDecoder|CharsetEncoder|CharsetProvider|Checkbox|CheckboxGroup|CheckboxMenuItem|CheckedInputStream|CheckedOutputStream|Checksum|Choice|ChoiceCallback|ChoiceFormat|Chromaticity|Cipher|CipherInputStream|CipherOutputStream|CipherSpi|Class|ClassCastException|ClassCircularityError|ClassDesc|ClassFormatError|ClassLoader|ClassNotFoundException|ClientRequestInfo|ClientRequestInfoOperations|ClientRequestInterceptor|ClientRequestInterceptorOperations|Clip|Clipboard|ClipboardOwner|Clob|Cloneable|CloneNotSupportedException|ClosedByInterruptException|ClosedChannelException|ClosedSelectorException|CMMException|Codec|CodecFactory|CodecFactoryHelper|CodecFactoryOperations|CodecOperations|CoderMalfunctionError|CoderResult|CodeSets|CodeSource|CodingErrorAction|CollationElementIterator|CollationKey|Collator|Collection|CollectionCertStoreParameters|Collections|Color|ColorChooserComponentFactory|ColorChooserUI|ColorConvertOp|ColorModel|ColorSelectionModel|ColorSpace|ColorSupported|ColorUIResource|ComboBoxEditor|ComboBoxModel|ComboBoxUI|ComboPopup|COMM_FAILURE|Comment|CommunicationException|Comparable|Comparator|Compiler|CompletionStatus|CompletionStatusHelper|Component|ComponentAdapter|ComponentColorModel|ComponentEvent|ComponentIdHelper|ComponentInputMap|ComponentInputMapUIResource|ComponentListener|ComponentOrientation|ComponentSampleModel|ComponentUI|ComponentView|Composite|CompositeContext|CompositeName|CompositeView|CompoundBorder|CompoundControl|CompoundEdit|CompoundName|Compression|ConcurrentModificationException|Configuration|ConfigurationException|ConfirmationCallback|ConnectException|ConnectIOException|Connection|ConnectionEvent|ConnectionEventListener|ConnectionPendingException|ConnectionPoolDataSource|ConsoleHandler|Constructor|Container|ContainerAdapter|ContainerEvent|ContainerListener|ContainerOrderFocusTraversalPolicy|ContentHandler|ContentHandlerFactory|ContentModel|Context|ContextList|ContextNotEmptyException|ContextualRenderedImageFactory|Control|ControlFactory|ControllerEventListener|ConvolveOp|CookieHolder|Copies|CopiesSupported|CRC32|CredentialExpiredException|CRL|CRLException|CRLSelector|CropImageFilter|CSS|CTX_RESTRICT_SCOPE|CubicCurve2D|Currency|Current|CurrentHelper|CurrentHolder|CurrentOperations|Cursor|Customizer|CustomMarshal|CustomValue|DATA_CONVERSION|DatabaseMetaData|DataBuffer|DataBufferByte|DataBufferDouble|DataBufferFloat|DataBufferInt|DataBufferShort|DataBufferUShort|DataFlavor|DataFormatException|DatagramChannel|DatagramPacket|DatagramSocket|DatagramSocketImpl|DatagramSocketImplFactory|DataInput|DataInputStream|DataLine|DataOutput|DataOutputStream|DataSource|DataTruncation|Date|DateFormat|DateFormatSymbols|DateFormatter|DateTimeAtCompleted|DateTimeAtCreation|DateTimeAtProcessing|DateTimeSyntax|DebugGraphics|DecimalFormat|DecimalFormatSymbols|DeclHandler|DefaultBoundedRangeModel|DefaultButtonModel|DefaultCaret|DefaultCellEditor|DefaultColorSelectionModel|DefaultComboBoxModel|DefaultDesktopManager|DefaultEditorKit|DefaultFocusManager|DefaultFocusTraversalPolicy|DefaultFormatter|DefaultFormatterFactory|DefaultHandler|DefaultHighlighter|DefaultKeyboardFocusManager|DefaultListCellRenderer|DefaultListModel|DefaultListSelectionModel|DefaultMenuLayout|DefaultMetalTheme|DefaultMutableTreeNode|DefaultPersistenceDelegate|DefaultSingleSelectionModel|DefaultStyledDocument|DefaultTableCellRenderer|DefaultTableColumnModel|DefaultTableModel|DefaultTextUI|DefaultTreeCellEditor|DefaultTreeCellRenderer|DefaultTreeModel|DefaultTreeSelectionModel|DefinitionKind|DefinitionKindHelper|Deflater|DeflaterOutputStream|Delegate|DelegationPermission|DESedeKeySpec|DesignMode|DESKeySpec|DesktopIconUI|DesktopManager|DesktopPaneUI|Destination|Destroyable|DestroyFailedException|DGC|DHGenParameterSpec|DHKey|DHParameterSpec|DHPrivateKey|DHPrivateKeySpec|DHPublicKey|DHPublicKeySpec|Dialog|Dictionary|DigestException|DigestInputStream|DigestOutputStream|Dimension|Dimension2D|DimensionUIResource|DirContext|DirectColorModel|DirectoryManager|DirObjectFactory|DirStateFactory|DisplayMode|DnDConstants|Doc|DocAttribute|DocAttributeSet|DocFlavor|DocPrintJob|Document|DocumentBuilder|DocumentBuilderFactory|DocumentEvent|DocumentFilter|DocumentFragment|DocumentHandler|DocumentListener|DocumentName|DocumentParser|DocumentType|DomainCombiner|DomainManager|DomainManagerOperations|DOMException|DOMImplementation|DOMLocator|DOMResult|DOMSource|Double|DoubleBuffer|DoubleHolder|DoubleSeqHelper|DoubleSeqHolder|DragGestureEvent|DragGestureListener|DragGestureRecognizer|DragSource|DragSourceAdapter|DragSourceContext|DragSourceDragEvent|DragSourceDropEvent|DragSourceEvent|DragSourceListener|DragSourceMotionListener|Driver|DriverManager|DriverPropertyInfo|DropTarget|DropTargetAdapter|DropTargetContext|DropTargetDragEvent|DropTargetDropEvent|DropTargetEvent|DropTargetListener|DSAKey|DSAKeyPairGenerator|DSAParameterSpec|DSAParams|DSAPrivateKey|DSAPrivateKeySpec|DSAPublicKey|DSAPublicKeySpec|DTD|DTDConstants|DTDHandler|DuplicateName|DuplicateNameHelper|DynamicImplementation|DynAny|DynAnyFactory|DynAnyFactoryHelper|DynAnyFactoryOperations|DynAnyHelper|DynAnyOperations|DynAnySeqHelper|DynArray|DynArrayHelper|DynArrayOperations|DynEnum|DynEnumHelper|DynEnumOperations|DynFixed|DynFixedHelper|DynFixedOperations|DynSequence|DynSequenceHelper|DynSequenceOperations|DynStruct|DynStructHelper|DynStructOperations|DynUnion|DynUnionHelper|DynUnionOperations|DynValue|DynValueBox|DynValueBoxOperations|DynValueCommon|DynValueCommonOperations|DynValueHelper|DynValueOperations|EditorKit|Element|ElementIterator|Ellipse2D|EmptyBorder|EmptyStackException|EncodedKeySpec|Encoder|Encoding|ENCODING_CDR_ENCAPS|EncryptedPrivateKeyInfo|Entity|EntityReference|EntityResolver|EnumControl|Enumeration|EnumSyntax|Environment|EOFException|Error|ErrorHandler|ErrorListener|ErrorManager|EtchedBorder|Event|EventContext|EventDirContext|EventHandler|EventListener|EventListenerList|EventListenerProxy|EventObject|EventQueue|EventSetDescriptor|Exception|ExceptionInInitializerError|ExceptionList|ExceptionListener|ExemptionMechanism|ExemptionMechanismException|ExemptionMechanismSpi|ExpandVetoException|ExportException|Expression|ExtendedRequest|ExtendedResponse|Externalizable|FactoryConfigurationError|FailedLoginException|FeatureDescriptor|Fidelity|Field|FieldNameHelper|FieldPosition|FieldView|File|FileCacheImageInputStream|FileCacheImageOutputStream|FileChannel|FileChooserUI|FileDescriptor|FileDialog|FileFilter|FileHandler|FileImageInputStream|FileImageOutputStream|FileInputStream|FileLock|FileLockInterruptionException|FilenameFilter|FileNameMap|FileNotFoundException|FileOutputStream|FilePermission|FileReader|FileSystemView|FileView|FileWriter|Filter|FilteredImageSource|FilterInputStream|FilterOutputStream|FilterReader|FilterWriter|Finishings|FixedHeightLayoutCache|FixedHolder|FlatteningPathIterator|FlavorException|FlavorMap|FlavorTable|Float|FloatBuffer|FloatControl|FloatHolder|FloatSeqHelper|FloatSeqHolder|FlowLayout|FlowView|FocusAdapter|FocusEvent|FocusListener|FocusManager|FocusTraversalPolicy|Font|FontFormatException|FontMetrics|FontRenderContext|FontUIResource|Format|FormatConversionProvider|FormatMismatch|FormatMismatchHelper|Formatter|FormView|ForwardRequest|ForwardRequestHelper|Frame|FREE_MEM|GapContent|GatheringByteChannel|GeneralPath|GeneralSecurityException|GlyphJustificationInfo|GlyphMetrics|GlyphVector|GlyphView|GradientPaint|GraphicAttribute|Graphics|Graphics2D|GraphicsConfigTemplate|GraphicsConfiguration|GraphicsDevice|GraphicsEnvironment|GrayFilter|GregorianCalendar|GridBagConstraints|GridBagLayout|GridLayout|Group|GSSContext|GSSCredential|GSSException|GSSManager|GSSName|Guard|GuardedObject|GZIPInputStream|GZIPOutputStream|Handler|HandlerBase|HandshakeCompletedEvent|HandshakeCompletedListener|HasControls|HashAttributeSet|HashDocAttributeSet|HashMap|HashPrintJobAttributeSet|HashPrintRequestAttributeSet|HashPrintServiceAttributeSet|HashSet|Hashtable|HeadlessException|HierarchyBoundsAdapter|HierarchyBoundsListener|HierarchyEvent|HierarchyListener|Highlighter|HostnameVerifier|HTML|HTMLDocument|HTMLEditorKit|HTMLFrameHyperlinkEvent|HTMLWriter|HttpsURLConnection|HttpURLConnection|HyperlinkEvent|HyperlinkListener|ICC_ColorSpace|ICC_Profile|ICC_ProfileGray|ICC_ProfileRGB|Icon|IconUIResource|IconView|ID_ASSIGNMENT_POLICY_ID|ID_UNIQUENESS_POLICY_ID|IdAssignmentPolicy|IdAssignmentPolicyOperations|IdAssignmentPolicyValue|IdentifierHelper|Identity|IdentityHashMap|IdentityScope|IDLEntity|IDLType|IDLTypeHelper|IDLTypeOperations|IdUniquenessPolicy|IdUniquenessPolicyOperations|IdUniquenessPolicyValue|IIOByteBuffer|IIOException|IIOImage|IIOInvalidTreeException|IIOMetadata|IIOMetadataController|IIOMetadataFormat|IIOMetadataFormatImpl|IIOMetadataNode|IIOParam|IIOParamController|IIOReadProgressListener|IIOReadUpdateListener|IIOReadWarningListener|IIORegistry|IIOServiceProvider|IIOWriteProgressListener|IIOWriteWarningListener|IllegalAccessError|IllegalAccessException|IllegalArgumentException|IllegalBlockingModeException|IllegalBlockSizeException|IllegalCharsetNameException|IllegalComponentStateException|IllegalMonitorStateException|IllegalPathStateException|IllegalSelectorException|IllegalStateException|IllegalThreadStateException|Image|ImageCapabilities|ImageConsumer|ImageFilter|ImageGraphicAttribute|ImageIcon|ImageInputStream|ImageInputStreamImpl|ImageInputStreamSpi|ImageIO|ImageObserver|ImageOutputStream|ImageOutputStreamImpl|ImageOutputStreamSpi|ImageProducer|ImageReader|ImageReaderSpi|ImageReaderWriterSpi|ImageReadParam|ImageTranscoder|ImageTranscoderSpi|ImageTypeSpecifier|ImageView|ImageWriteParam|ImageWriter|ImageWriterSpi|ImagingOpException|IMP_LIMIT|IMPLICIT_ACTIVATION_POLICY_ID|ImplicitActivationPolicy|ImplicitActivationPolicyOperations|ImplicitActivationPolicyValue|IncompatibleClassChangeError|InconsistentTypeCode|InconsistentTypeCodeHelper|IndexColorModel|IndexedPropertyDescriptor|IndexOutOfBoundsException|IndirectionException|Inet4Address|Inet6Address|InetAddress|InetSocketAddress|Inflater|InflaterInputStream|InheritableThreadLocal|InitialContext|InitialContextFactory|InitialContextFactoryBuilder|InitialDirContext|INITIALIZE|InitialLdapContext|InlineView|InputContext|InputEvent|InputMap|InputMapUIResource|InputMethod|InputMethodContext|InputMethodDescriptor|InputMethodEvent|InputMethodHighlight|InputMethodListener|InputMethodRequests|InputSource|InputStream|InputStreamReader|InputSubset|InputVerifier|Insets|InsetsUIResource|InstantiationError|InstantiationException|Instrument|InsufficientResourcesException|IntBuffer|Integer|IntegerSyntax|Interceptor|InterceptorOperations|INTERNAL|InternalError|InternalFrameAdapter|InternalFrameEvent|InternalFrameFocusTraversalPolicy|InternalFrameListener|InternalFrameUI|InternationalFormatter|InterruptedException|InterruptedIOException|InterruptedNamingException|InterruptibleChannel|INTF_REPOS|IntHolder|IntrospectionException|Introspector|INV_FLAG|INV_IDENT|INV_OBJREF|INV_POLICY|Invalid|INVALID_TRANSACTION|InvalidAddress|InvalidAddressHelper|InvalidAddressHolder|InvalidAlgorithmParameterException|InvalidAttributeIdentifierException|InvalidAttributesException|InvalidAttributeValueException|InvalidClassException|InvalidDnDOperationException|InvalidKeyException|InvalidKeySpecException|InvalidMarkException|InvalidMidiDataException|InvalidName|InvalidNameException|InvalidNameHelper|InvalidNameHolder|InvalidObjectException|InvalidParameterException|InvalidParameterSpecException|InvalidPolicy|InvalidPolicyHelper|InvalidPreferencesFormatException|InvalidSearchControlsException|InvalidSearchFilterException|InvalidSeq|InvalidSlot|InvalidSlotHelper|InvalidTransactionException|InvalidTypeForEncoding|InvalidTypeForEncodingHelper|InvalidValue|InvalidValueHelper|InvocationEvent|InvocationHandler|InvocationTargetException|InvokeHandler|IOException|IOR|IORHelper|IORHolder|IORInfo|IORInfoOperations|IORInterceptor|IORInterceptorOperations|IRObject|IRObjectOperations|IstringHelper|ItemEvent|ItemListener|ItemSelectable|Iterator|IvParameterSpec|JApplet|JarEntry|JarException|JarFile|JarInputStream|JarOutputStream|JarURLConnection|JButton|JCheckBox|JCheckBoxMenuItem|JColorChooser|JComboBox|JComponent|JDesktopPane|JDialog|JEditorPane|JFileChooser|JFormattedTextField|JFrame|JInternalFrame|JLabel|JLayeredPane|JList|JMenu|JMenuBar|JMenuItem|JobAttributes|JobHoldUntil|JobImpressions|JobImpressionsCompleted|JobImpressionsSupported|JobKOctets|JobKOctetsProcessed|JobKOctetsSupported|JobMediaSheets|JobMediaSheetsCompleted|JobMediaSheetsSupported|JobMessageFromOperator|JobName|JobOriginatingUserName|JobPriority|JobPrioritySupported|JobSheets|JobState|JobStateReason|JobStateReasons|JOptionPane|JPanel|JPasswordField|JPEGHuffmanTable|JPEGImageReadParam|JPEGImageWriteParam|JPEGQTable|JPopupMenu|JProgressBar|JRadioButton|JRadioButtonMenuItem|JRootPane|JScrollBar|JScrollPane|JSeparator|JSlider|JSpinner|JSplitPane|JTabbedPane|JTable|JTableHeader|JTextArea|JTextComponent|JTextField|JTextPane|JToggleButton|JToolBar|JToolTip|JTree|JViewport|JWindow|KerberosKey|KerberosPrincipal|KerberosTicket|Kernel|Key|KeyAdapter|KeyAgreement|KeyAgreementSpi|KeyboardFocusManager|KeyEvent|KeyEventDispatcher|KeyEventPostProcessor|KeyException|KeyFactory|KeyFactorySpi|KeyGenerator|KeyGeneratorSpi|KeyListener|KeyManagementException|KeyManager|KeyManagerFactory|KeyManagerFactorySpi|Keymap|KeyPair|KeyPairGenerator|KeyPairGeneratorSpi|KeySpec|KeyStore|KeyStoreException|KeyStoreSpi|KeyStroke|Label|LabelUI|LabelView|LanguageCallback|LastOwnerException|LayeredHighlighter|LayoutFocusTraversalPolicy|LayoutManager|LayoutManager2|LayoutQueue|LDAPCertStoreParameters|LdapContext|LdapReferralException|Lease|Level|LexicalHandler|LIFESPAN_POLICY_ID|LifespanPolicy|LifespanPolicyOperations|LifespanPolicyValue|LimitExceededException|Line|Line2D|LineBorder|LineBreakMeasurer|LineEvent|LineListener|LineMetrics|LineNumberInputStream|LineNumberReader|LineUnavailableException|LinkageError|LinkedHashMap|LinkedHashSet|LinkedList|LinkException|LinkLoopException|LinkRef|List|ListCellRenderer|ListDataEvent|ListDataListener|ListIterator|ListModel|ListResourceBundle|ListSelectionEvent|ListSelectionListener|ListSelectionModel|ListUI|ListView|LoaderHandler|Locale|LocalObject|LocateRegistry|LOCATION_FORWARD|Locator|LocatorImpl|Logger|LoggingPermission|LoginContext|LoginException|LoginModule|LogManager|LogRecord|LogStream|Long|LongBuffer|LongHolder|LongLongSeqHelper|LongLongSeqHolder|LongSeqHelper|LongSeqHolder|LookAndFeel|LookupOp|LookupTable|Mac|MacSpi|MalformedInputException|MalformedLinkException|MalformedURLException|ManagerFactoryParameters|Manifest|Map|MappedByteBuffer|MARSHAL|MarshalException|MarshalledObject|MaskFormatter|Matcher|Math|MatteBorder|Media|MediaName|MediaPrintableArea|MediaSize|MediaSizeName|MediaTracker|MediaTray|Member|MemoryCacheImageInputStream|MemoryCacheImageOutputStream|MemoryHandler|MemoryImageSource|Menu|MenuBar|MenuBarUI|MenuComponent|MenuContainer|MenuDragMouseEvent|MenuDragMouseListener|MenuElement|MenuEvent|MenuItem|MenuItemUI|MenuKeyEvent|MenuKeyListener|MenuListener|MenuSelectionManager|MenuShortcut|MessageDigest|MessageDigestSpi|MessageFormat|MessageProp|MetaEventListener|MetalBorders|MetalButtonUI|MetalCheckBoxIcon|MetalCheckBoxUI|MetalComboBoxButton|MetalComboBoxEditor|MetalComboBoxIcon|MetalComboBoxUI|MetalDesktopIconUI|MetalFileChooserUI|MetalIconFactory|MetalInternalFrameTitlePane|MetalInternalFrameUI|MetalLabelUI|MetalLookAndFeel|MetalPopupMenuSeparatorUI|MetalProgressBarUI|MetalRadioButtonUI|MetalRootPaneUI|MetalScrollBarUI|MetalScrollButton|MetalScrollPaneUI|MetalSeparatorUI|MetalSliderUI|MetalSplitPaneUI|MetalTabbedPaneUI|MetalTextFieldUI|MetalTheme|MetalToggleButtonUI|MetalToolBarUI|MetalToolTipUI|MetalTreeUI|MetaMessage|Method|MethodDescriptor|MidiChannel|MidiDevice|MidiDeviceProvider|MidiEvent|MidiFileFormat|MidiFileReader|MidiFileWriter|MidiMessage|MidiSystem|MidiUnavailableException|MimeTypeParseException|MinimalHTMLWriter|MissingResourceException|Mixer|MixerProvider|ModificationItem|Modifier|MouseAdapter|MouseDragGestureRecognizer|MouseEvent|MouseInputAdapter|MouseInputListener|MouseListener|MouseMotionAdapter|MouseMotionListener|MouseWheelEvent|MouseWheelListener|MultiButtonUI|MulticastSocket|MultiColorChooserUI|MultiComboBoxUI|MultiDesktopIconUI|MultiDesktopPaneUI|MultiDoc|MultiDocPrintJob|MultiDocPrintService|MultiFileChooserUI|MultiInternalFrameUI|MultiLabelUI|MultiListUI|MultiLookAndFeel|MultiMenuBarUI|MultiMenuItemUI|MultiOptionPaneUI|MultiPanelUI|MultiPixelPackedSampleModel|MultipleComponentProfileHelper|MultipleComponentProfileHolder|MultipleDocumentHandling|MultipleMaster|MultiPopupMenuUI|MultiProgressBarUI|MultiRootPaneUI|MultiScrollBarUI|MultiScrollPaneUI|MultiSeparatorUI|MultiSliderUI|MultiSpinnerUI|MultiSplitPaneUI|MultiTabbedPaneUI|MultiTableHeaderUI|MultiTableUI|MultiTextUI|MultiToolBarUI|MultiToolTipUI|MultiTreeUI|MultiViewportUI|MutableAttributeSet|MutableComboBoxModel|MutableTreeNode|Name|NameAlreadyBoundException|NameCallback|NameClassPair|NameComponent|NameComponentHelper|NameComponentHolder|NamedNodeMap|NamedValue|NameDynAnyPair|NameDynAnyPairHelper|NameDynAnyPairSeqHelper|NameHelper|NameHolder|NameNotFoundException|NameParser|NamespaceChangeListener|NamespaceSupport|NameValuePair|NameValuePairHelper|NameValuePairSeqHelper|Naming|NamingContext|NamingContextExt|NamingContextExtHelper|NamingContextExtHolder|NamingContextExtOperations|NamingContextExtPOA|NamingContextHelper|NamingContextHolder|NamingContextOperations|NamingContextPOA|NamingEnumeration|NamingEvent|NamingException|NamingExceptionEvent|NamingListener|NamingManager|NamingSecurityException|NavigationFilter|NegativeArraySizeException|NetPermission|NetworkInterface|NO_IMPLEMENT|NO_MEMORY|NO_PERMISSION|NO_RESOURCES|NO_RESPONSE|NoClassDefFoundError|NoConnectionPendingException|NoContext|NoContextHelper|Node|NodeChangeEvent|NodeChangeListener|NodeList|NoInitialContextException|NoninvertibleTransformException|NonReadableChannelException|NonWritableChannelException|NoPermissionException|NoRouteToHostException|NoServant|NoServantHelper|NoSuchAlgorithmException|NoSuchAttributeException|NoSuchElementException|NoSuchFieldError|NoSuchFieldException|NoSuchMethodError|NoSuchMethodException|NoSuchObjectException|NoSuchPaddingException|NoSuchProviderException|NotActiveException|Notation|NotBoundException|NotContextException|NotEmpty|NotEmptyHelper|NotEmptyHolder|NotFound|NotFoundHelper|NotFoundHolder|NotFoundReason|NotFoundReasonHelper|NotFoundReasonHolder|NotOwnerException|NotSerializableException|NotYetBoundException|NotYetConnectedException|NullCipher|NullPointerException|Number|NumberFormat|NumberFormatException|NumberFormatter|NumberOfDocuments|NumberOfInterveningJobs|NumberUp|NumberUpSupported|NumericShaper|NVList|OBJ_ADAPTER|Object|OBJECT_NOT_EXIST|ObjectAlreadyActive|ObjectAlreadyActiveHelper|ObjectChangeListener|ObjectFactory|ObjectFactoryBuilder|ObjectHelper|ObjectHolder|ObjectIdHelper|ObjectImpl|ObjectInput|ObjectInputStream|ObjectInputValidation|ObjectNotActive|ObjectNotActiveHelper|ObjectOutput|ObjectOutputStream|ObjectStreamClass|ObjectStreamConstants|ObjectStreamException|ObjectStreamField|ObjectView|ObjID|Observable|Observer|OctetSeqHelper|OctetSeqHolder|Oid|OMGVMCID|OpenType|Operation|OperationNotSupportedException|Option|OptionalDataException|OptionPaneUI|ORB|ORBInitializer|ORBInitializerOperations|ORBInitInfo|ORBInitInfoOperations|OrientationRequested|OutOfMemoryError|OutputDeviceAssigned|OutputKeys|OutputStream|OutputStreamWriter|OverlappingFileLockException|OverlayLayout|Owner|Package|PackedColorModel|Pageable|PageAttributes|PageFormat|PageRanges|PagesPerMinute|PagesPerMinuteColor|Paint|PaintContext|PaintEvent|Panel|PanelUI|Paper|ParagraphView|Parameter|ParameterBlock|ParameterDescriptor|ParameterMetaData|ParameterMode|ParameterModeHelper|ParameterModeHolder|ParseException|ParsePosition|Parser|ParserAdapter|ParserConfigurationException|ParserDelegator|ParserFactory|PartialResultException|PasswordAuthentication|PasswordCallback|PasswordView|Patch|PathIterator|Pattern|PatternSyntaxException|PBEKey|PBEKeySpec|PBEParameterSpec|PDLOverrideSupported|Permission|PermissionCollection|Permissions|PERSIST_STORE|PersistenceDelegate|PhantomReference|Pipe|PipedInputStream|PipedOutputStream|PipedReader|PipedWriter|PixelGrabber|PixelInterleavedSampleModel|PKCS8EncodedKeySpec|PKIXBuilderParameters|PKIXCertPathBuilderResult|PKIXCertPathChecker|PKIXCertPathValidatorResult|PKIXParameters|PlainDocument|PlainView|POA|POAHelper|POAManager|POAManagerOperations|POAOperations|Point|Point2D|Policy|PolicyError|PolicyErrorCodeHelper|PolicyErrorHelper|PolicyErrorHolder|PolicyFactory|PolicyFactoryOperations|PolicyHelper|PolicyHolder|PolicyListHelper|PolicyListHolder|PolicyNode|PolicyOperations|PolicyQualifierInfo|PolicyTypeHelper|Polygon|PooledConnection|Popup|PopupFactory|PopupMenu|PopupMenuEvent|PopupMenuListener|PopupMenuUI|Port|PortableRemoteObject|PortableRemoteObjectDelegate|PortUnreachableException|Position|PreferenceChangeEvent|PreferenceChangeListener|Preferences|PreferencesFactory|PreparedStatement|PresentationDirection|Principal|PrincipalHolder|Printable|PrinterAbortException|PrinterException|PrinterGraphics|PrinterInfo|PrinterIOException|PrinterIsAcceptingJobs|PrinterJob|PrinterLocation|PrinterMakeAndModel|PrinterMessageFromOperator|PrinterMoreInfo|PrinterMoreInfoManufacturer|PrinterName|PrinterResolution|PrinterState|PrinterStateReason|PrinterStateReasons|PrinterURI|PrintEvent|PrintException|PrintGraphics|PrintJob|PrintJobAdapter|PrintJobAttribute|PrintJobAttributeEvent|PrintJobAttributeListener|PrintJobAttributeSet|PrintJobEvent|PrintJobListener|PrintQuality|PrintRequestAttribute|PrintRequestAttributeSet|PrintService|PrintServiceAttribute|PrintServiceAttributeEvent|PrintServiceAttributeListener|PrintServiceAttributeSet|PrintServiceLookup|PrintStream|PrintWriter|PRIVATE_MEMBER|PrivateCredentialPermission|PrivateKey|PrivilegedAction|PrivilegedActionException|PrivilegedExceptionAction|Process|ProcessingInstruction|ProfileDataException|ProfileIdHelper|ProgressBarUI|ProgressMonitor|ProgressMonitorInputStream|Properties|PropertyChangeEvent|PropertyChangeListener|PropertyChangeListenerProxy|PropertyChangeSupport|PropertyDescriptor|PropertyEditor|PropertyEditorManager|PropertyEditorSupport|PropertyPermission|PropertyResourceBundle|PropertyVetoException|ProtectionDomain|ProtocolException|Provider|ProviderException|Proxy|PSSParameterSpec|PUBLIC_MEMBER|PublicKey|PushbackInputStream|PushbackReader|QuadCurve2D|QueuedJobCount|Random|RandomAccess|RandomAccessFile|Raster|RasterFormatException|RasterOp|RC2ParameterSpec|RC5ParameterSpec|ReadableByteChannel|Reader|ReadOnlyBufferException|Receiver|Rectangle|Rectangle2D|RectangularShape|Ref|RefAddr|Reference|Referenceable|ReferenceQueue|ReferenceUriSchemesSupported|ReferralException|ReflectPermission|Refreshable|RefreshFailedException|RegisterableService|Registry|RegistryHandler|RemarshalException|Remote|RemoteCall|RemoteException|RemoteObject|RemoteRef|RemoteServer|RemoteStub|RenderableImage|RenderableImageOp|RenderableImageProducer|RenderContext|RenderedImage|RenderedImageFactory|Renderer|RenderingHints|RepaintManager|ReplicateScaleFilter|RepositoryIdHelper|Request|REQUEST_PROCESSING_POLICY_ID|RequestInfo|RequestInfoOperations|RequestingUserName|RequestProcessingPolicy|RequestProcessingPolicyOperations|RequestProcessingPolicyValue|RescaleOp|ResolutionSyntax|Resolver|ResolveResult|ResourceBundle|ResponseHandler|Result|ResultSet|ResultSetMetaData|ReverbType|RGBImageFilter|RMIClassLoader|RMIClassLoaderSpi|RMIClientSocketFactory|RMIFailureHandler|RMISecurityException|RMISecurityManager|RMIServerSocketFactory|RMISocketFactory|Robot|RootPaneContainer|RootPaneUI|RoundRectangle2D|RowMapper|RowSet|RowSetEvent|RowSetInternal|RowSetListener|RowSetMetaData|RowSetReader|RowSetWriter|RSAKey|RSAKeyGenParameterSpec|RSAMultiPrimePrivateCrtKey|RSAMultiPrimePrivateCrtKeySpec|RSAOtherPrimeInfo|RSAPrivateCrtKey|RSAPrivateCrtKeySpec|RSAPrivateKey|RSAPrivateKeySpec|RSAPublicKey|RSAPublicKeySpec|RTFEditorKit|RuleBasedCollator|Runnable|Runtime|RunTime|RuntimeException|RunTimeOperations|RuntimePermission|SampleModel|Savepoint|SAXException|SAXNotRecognizedException|SAXNotSupportedException|SAXParseException|SAXParser|SAXParserFactory|SAXResult|SAXSource|SAXTransformerFactory|ScatteringByteChannel|SchemaViolationException|Scrollable|Scrollbar|ScrollBarUI|ScrollPane|ScrollPaneAdjustable|ScrollPaneConstants|ScrollPaneLayout|ScrollPaneUI|SealedObject|SearchControls|SearchResult|SecretKey|SecretKeyFactory|SecretKeyFactorySpi|SecretKeySpec|SecureClassLoader|SecureRandom|SecureRandomSpi|Security|SecurityException|SecurityManager|SecurityPermission|Segment|SelectableChannel|SelectionKey|Selector|SelectorProvider|SeparatorUI|Sequence|SequenceInputStream|Sequencer|Serializable|SerializablePermission|Servant|SERVANT_RETENTION_POLICY_ID|ServantActivator|ServantActivatorHelper|ServantActivatorOperations|ServantActivatorPOA|ServantAlreadyActive|ServantAlreadyActiveHelper|ServantLocator|ServantLocatorHelper|ServantLocatorOperations|ServantLocatorPOA|ServantManager|ServantManagerOperations|ServantNotActive|ServantNotActiveHelper|ServantObject|ServantRetentionPolicy|ServantRetentionPolicyOperations|ServantRetentionPolicyValue|ServerCloneException|ServerError|ServerException|ServerNotActiveException|ServerRef|ServerRequest|ServerRequestInfo|ServerRequestInfoOperations|ServerRequestInterceptor|ServerRequestInterceptorOperations|ServerRuntimeException|ServerSocket|ServerSocketChannel|ServerSocketFactory|ServiceContext|ServiceContextHelper|ServiceContextHolder|ServiceContextListHelper|ServiceContextListHolder|ServiceDetail|ServiceDetailHelper|ServiceIdHelper|ServiceInformation|ServiceInformationHelper|ServiceInformationHolder|ServicePermission|ServiceRegistry|ServiceUI|ServiceUIFactory|ServiceUnavailableException|Set|SetOfIntegerSyntax|SetOverrideType|SetOverrideTypeHelper|Severity|Shape|ShapeGraphicAttribute|SheetCollate|Short|ShortBuffer|ShortBufferException|ShortHolder|ShortLookupTable|ShortMessage|ShortSeqHelper|ShortSeqHolder|Sides|Signature|SignatureException|SignatureSpi|SignedObject|Signer|SimpleAttributeSet|SimpleBeanInfo|SimpleDateFormat|SimpleDoc|SimpleFormatter|SimpleTimeZone|SinglePixelPackedSampleModel|SingleSelectionModel|Size2DSyntax|SizeLimitExceededException|SizeRequirements|SizeSequence|Skeleton|SkeletonMismatchException|SkeletonNotFoundException|SliderUI|Socket|SocketAddress|SocketChannel|SocketException|SocketFactory|SocketHandler|SocketImpl|SocketImplFactory|SocketOptions|SocketPermission|SocketSecurityException|SocketTimeoutException|SoftBevelBorder|SoftReference|SortedMap|SortedSet|SortingFocusTraversalPolicy|Soundbank|SoundbankReader|SoundbankResource|Source|SourceDataLine|SourceLocator|SpinnerDateModel|SpinnerListModel|SpinnerModel|SpinnerNumberModel|SpinnerUI|SplitPaneUI|Spring|SpringLayout|SQLData|SQLException|SQLInput|SQLOutput|SQLPermission|SQLWarning|SSLContext|SSLContextSpi|SSLException|SSLHandshakeException|SSLKeyException|SSLPeerUnverifiedException|SSLPermission|SSLProtocolException|SSLServerSocket|SSLServerSocketFactory|SSLSession|SSLSessionBindingEvent|SSLSessionBindingListener|SSLSessionContext|SSLSocket|SSLSocketFactory|Stack|StackOverflowError|StackTraceElement|StartTlsRequest|StartTlsResponse|State|StateEdit|StateEditable|StateFactory|Statement|Streamable|StreamableValue|StreamCorruptedException|StreamHandler|StreamPrintService|StreamPrintServiceFactory|StreamResult|StreamSource|StreamTokenizer|StrictMath|String|StringBuffer|StringBufferInputStream|StringCharacterIterator|StringContent|StringHolder|StringIndexOutOfBoundsException|StringNameHelper|StringReader|StringRefAddr|StringSelection|StringSeqHelper|StringSeqHolder|StringTokenizer|StringValueHelper|StringWriter|Stroke|Struct|StructMember|StructMemberHelper|Stub|StubDelegate|StubNotFoundException|Style|StyleConstants|StyleContext|StyledDocument|StyledEditorKit|StyleSheet|Subject|SubjectDomainCombiner|SUCCESSFUL|SupportedValuesAttribute|SwingConstants|SwingPropertyChangeSupport|SwingUtilities|SYNC_WITH_TRANSPORT|SyncFailedException|SyncScopeHelper|Synthesizer|SysexMessage|System|SYSTEM_EXCEPTION|SystemColor|SystemException|SystemFlavorMap|TabableView|TabbedPaneUI|TabExpander|TableCellEditor|TableCellRenderer|TableColumn|TableColumnModel|TableColumnModelEvent|TableColumnModelListener|TableHeaderUI|TableModel|TableModelEvent|TableModelListener|TableUI|TableView|TabSet|TabStop|TAG_ALTERNATE_IIOP_ADDRESS|TAG_CODE_SETS|TAG_INTERNET_IOP|TAG_JAVA_CODEBASE|TAG_MULTIPLE_COMPONENTS|TAG_ORB_TYPE|TAG_POLICIES|TagElement|TaggedComponent|TaggedComponentHelper|TaggedComponentHolder|TaggedProfile|TaggedProfileHelper|TaggedProfileHolder|TargetDataLine|TCKind|Templates|TemplatesHandler|Text|TextAction|TextArea|TextAttribute|TextComponent|TextEvent|TextField|TextHitInfo|TextInputCallback|TextLayout|TextListener|TextMeasurer|TextOutputCallback|TextSyntax|TextUI|TexturePaint|Thread|THREAD_POLICY_ID|ThreadDeath|ThreadGroup|ThreadLocal|ThreadPolicy|ThreadPolicyOperations|ThreadPolicyValue|Throwable|Tie|TileObserver|Time|TimeLimitExceededException|Timer|TimerTask|Timestamp|TimeZone|TitledBorder|ToolBarUI|Toolkit|ToolTipManager|ToolTipUI|TooManyListenersException|Track|TRANSACTION_REQUIRED|TRANSACTION_ROLLEDBACK|TransactionRequiredException|TransactionRolledbackException|TransactionService|Transferable|TransferHandler|TransformAttribute|Transformer|TransformerConfigurationException|TransformerException|TransformerFactory|TransformerFactoryConfigurationError|TransformerHandler|TRANSIENT|Transmitter|Transparency|TRANSPORT_RETRY|TreeCellEditor|TreeCellRenderer|TreeExpansionEvent|TreeExpansionListener|TreeMap|TreeModel|TreeModelEvent|TreeModelListener|TreeNode|TreePath|TreeSelectionEvent|TreeSelectionListener|TreeSelectionModel|TreeSet|TreeUI|TreeWillExpandListener|TrustAnchor|TrustManager|TrustManagerFactory|TrustManagerFactorySpi|TypeCode|TypeCodeHolder|TypeMismatch|TypeMismatchHelper|Types|UID|UIDefaults|UIManager|UIResource|ULongLongSeqHelper|ULongLongSeqHolder|ULongSeqHelper|ULongSeqHolder|UndeclaredThrowableException|UndoableEdit|UndoableEditEvent|UndoableEditListener|UndoableEditSupport|UndoManager|UnexpectedException|UnicastRemoteObject|UnionMember|UnionMemberHelper|UNKNOWN|UnknownEncoding|UnknownEncodingHelper|UnknownError|UnknownException|UnknownGroupException|UnknownHostException|UnknownObjectException|UnknownServiceException|UnknownUserException|UnknownUserExceptionHelper|UnknownUserExceptionHolder|UnmappableCharacterException|UnmarshalException|UnmodifiableSetException|UnrecoverableKeyException|Unreferenced|UnresolvedAddressException|UnresolvedPermission|UnsatisfiedLinkError|UnsolicitedNotification|UnsolicitedNotificationEvent|UnsolicitedNotificationListener|UNSUPPORTED_POLICY|UNSUPPORTED_POLICY_VALUE|UnsupportedAddressTypeException|UnsupportedAudioFileException|UnsupportedCallbackException|UnsupportedCharsetException|UnsupportedClassVersionError|UnsupportedEncodingException|UnsupportedFlavorException|UnsupportedLookAndFeelException|UnsupportedOperationException|URI|URIException|URIResolver|URISyntax|URISyntaxException|URL|URLClassLoader|URLConnection|URLDecoder|URLEncoder|URLStreamHandler|URLStreamHandlerFactory|URLStringHelper|USER_EXCEPTION|UserException|UShortSeqHelper|UShortSeqHolder|UTFDataFormatException|Util|UtilDelegate|Utilities|ValueBase|ValueBaseHelper|ValueBaseHolder|ValueFactory|ValueHandler|ValueMember|ValueMemberHelper|VariableHeightLayoutCache|Vector|VerifyError|VersionSpecHelper|VetoableChangeListener|VetoableChangeListenerProxy|VetoableChangeSupport|View|ViewFactory|ViewportLayout|ViewportUI|VirtualMachineError|Visibility|VisibilityHelper|VM_ABSTRACT|VM_CUSTOM|VM_NONE|VM_TRUNCATABLE|VMID|VoiceStatus|Void|VolatileImage|WCharSeqHelper|WCharSeqHolder|WeakHashMap|WeakReference|Window|WindowAdapter|WindowConstants|WindowEvent|WindowFocusListener|WindowListener|WindowStateListener|WrappedPlainView|WritableByteChannel|WritableRaster|WritableRenderedImage|WriteAbortedException|Writer|WrongAdapter|WrongAdapterHelper|WrongPolicy|WrongPolicyHelper|WrongTransaction|WrongTransactionHelper|WrongTransactionHolder|WStringSeqHelper|WStringSeqHolder|WStringValueHelper|X500Principal|X500PrivateCredential|X509Certificate|X509CertSelector|X509CRL|X509CRLEntry|X509CRLSelector|X509EncodedKeySpec|X509Extension|X509KeyManager|X509TrustManager|XAConnection|XADataSource|XAException|XAResource|Xid|XMLDecoder|XMLEncoder|XMLFilter|XMLFilterImpl|XMLFormatter|XMLReader|XMLReaderAdapter|XMLReaderFactory|ZipEntry|ZipException|ZipFile|ZipInputStream|ZipOutputStream|ZoneView|_BindingIteratorImplBase|_BindingIteratorStub|_DynAnyFactoryStub|_DynAnyStub|_DynArrayStub|_DynEnumStub|_DynFixedStub|_DynSequenceStub|_DynStructStub|_DynUnionStub|_DynValueStub|_IDLTypeStub|_NamingContextExtStub|_NamingContextImplBase|_NamingContextStub|_PolicyStub|_Remote_Stub|_ServantActivatorStub|_ServantLocatorStub)$/',
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                    'types' => '/^(boolean|byte|char|const|double|final|float|int|long|short|static|void)$/',
-                    'reserved' => '/^(import|package|abstract|break|case|catch|class|continue|default|do|else|extends|false|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|super|strictfp|switch|synchronized|this|throws|throw|transient|true|try|volatile|while)$/',
-                    'builtin' => '/^(AbstractAction|AbstractBorder|AbstractButton|AbstractCellEditor|AbstractCollection|AbstractColorChooserPanel|AbstractDocument|AbstractInterruptibleChannel|AbstractLayoutCache|AbstractList|AbstractListModel|AbstractMap|AbstractMethodError|AbstractPreferences|AbstractSelectableChannel|AbstractSelectionKey|AbstractSelector|AbstractSequentialList|AbstractSet|AbstractSpinnerModel|AbstractTableModel|AbstractUndoableEdit|AbstractWriter|AccessControlContext|AccessControlException|AccessController|AccessException|Accessible|AccessibleAction|AccessibleBundle|AccessibleComponent|AccessibleContext|AccessibleEditableText|AccessibleExtendedComponent|AccessibleExtendedTable|AccessibleHyperlink|AccessibleHypertext|AccessibleIcon|AccessibleKeyBinding|AccessibleObject|AccessibleRelation|AccessibleRelationSet|AccessibleResourceBundle|AccessibleRole|AccessibleSelection|AccessibleState|AccessibleStateSet|AccessibleTable|AccessibleTableModelChange|AccessibleText|AccessibleValue|AccountExpiredException|Acl|AclEntry|AclNotFoundException|Action|ActionEvent|ActionListener|ActionMap|ActionMapUIResource|Activatable|ActivateFailedException|ActivationDesc|ActivationException|ActivationGroup|ActivationGroup_Stub|ActivationGroupDesc|ActivationGroupID|ActivationID|ActivationInstantiator|ActivationMonitor|ActivationSystem|Activator|ActiveEvent|AdapterActivator|AdapterActivatorOperations|AdapterAlreadyExists|AdapterAlreadyExistsHelper|AdapterInactive|AdapterInactiveHelper|AdapterNonExistent|AdapterNonExistentHelper|AddressHelper|Adjustable|AdjustmentEvent|AdjustmentListener|Adler32|AffineTransform|AffineTransformOp|AlgorithmParameterGenerator|AlgorithmParameterGeneratorSpi|AlgorithmParameters|AlgorithmParameterSpec|AlgorithmParametersSpi|AllPermission|AlphaComposite|AlreadyBound|AlreadyBoundException|AlreadyBoundHelper|AlreadyBoundHolder|AlreadyConnectedException|AncestorEvent|AncestorListener|Annotation|Any|AnyHolder|AnySeqHelper|AnySeqHolder|AppConfigurationEntry|Applet|AppletContext|AppletInitializer|AppletStub|ApplicationException|Arc2D|Area|AreaAveragingScaleFilter|ARG_IN|ARG_INOUT|ARG_OUT|ArithmeticException|Array|ArrayIndexOutOfBoundsException|ArrayList|Arrays|ArrayStoreException|AssertionError|AsyncBoxView|AsynchronousCloseException|Attr|Attribute|AttributedCharacterIterator|AttributedString|AttributeException|AttributeInUseException|AttributeList|AttributeListImpl|AttributeModificationException|Attributes|AttributeSet|AttributeSetUtilities|AttributesImpl|AudioClip|AudioFileFormat|AudioFileReader|AudioFileWriter|AudioFormat|AudioInputStream|AudioPermission|AudioSystem|AuthenticationException|AuthenticationNotSupportedException|Authenticator|AuthPermission|Autoscroll|AWTError|AWTEvent|AWTEventListener|AWTEventListenerProxy|AWTEventMulticaster|AWTException|AWTKeyStroke|AWTPermission|BackingStoreException|BAD_CONTEXT|BAD_INV_ORDER|BAD_OPERATION|BAD_PARAM|BAD_POLICY|BAD_POLICY_TYPE|BAD_POLICY_VALUE|BAD_TYPECODE|BadKind|BadLocationException|BadPaddingException|BandCombineOp|BandedSampleModel|BasicArrowButton|BasicAttribute|BasicAttributes|BasicBorders|BasicButtonListener|BasicButtonUI|BasicCheckBoxMenuItemUI|BasicCheckBoxUI|BasicColorChooserUI|BasicComboBoxEditor|BasicComboBoxRenderer|BasicComboBoxUI|BasicComboPopup|BasicDesktopIconUI|BasicDesktopPaneUI|BasicDirectoryModel|BasicEditorPaneUI|BasicFileChooserUI|BasicFormattedTextFieldUI|BasicGraphicsUtils|BasicHTML|BasicIconFactory|BasicInternalFrameTitlePane|BasicInternalFrameUI|BasicLabelUI|BasicListUI|BasicLookAndFeel|BasicMenuBarUI|BasicMenuItemUI|BasicMenuUI|BasicOptionPaneUI|BasicPanelUI|BasicPasswordFieldUI|BasicPermission|BasicPopupMenuSeparatorUI|BasicPopupMenuUI|BasicProgressBarUI|BasicRadioButtonMenuItemUI|BasicRadioButtonUI|BasicRootPaneUI|BasicScrollBarUI|BasicScrollPaneUI|BasicSeparatorUI|BasicSliderUI|BasicSpinnerUI|BasicSplitPaneDivider|BasicSplitPaneUI|BasicStroke|BasicTabbedPaneUI|BasicTableHeaderUI|BasicTableUI|BasicTextAreaUI|BasicTextFieldUI|BasicTextPaneUI|BasicTextUI|BasicToggleButtonUI|BasicToolBarSeparatorUI|BasicToolBarUI|BasicToolTipUI|BasicTreeUI|BasicViewportUI|BatchUpdateException|BeanContext|BeanContextChild|BeanContextChildComponentProxy|BeanContextChildSupport|BeanContextContainerProxy|BeanContextEvent|BeanContextMembershipEvent|BeanContextMembershipListener|BeanContextProxy|BeanContextServiceAvailableEvent|BeanContextServiceProvider|BeanContextServiceProviderBeanInfo|BeanContextServiceRevokedEvent|BeanContextServiceRevokedListener|BeanContextServices|BeanContextServicesListener|BeanContextServicesSupport|BeanContextSupport|BeanDescriptor|BeanInfo|Beans|BevelBorder|Bidi|BigDecimal|BigInteger|BinaryRefAddr|BindException|Binding|BindingHelper|BindingHolder|BindingIterator|BindingIteratorHelper|BindingIteratorHolder|BindingIteratorOperations|BindingIteratorPOA|BindingListHelper|BindingListHolder|BindingType|BindingTypeHelper|BindingTypeHolder|BitSet|Blob|BlockView|Book|Boolean|BooleanControl|BooleanHolder|BooleanSeqHelper|BooleanSeqHolder|Border|BorderFactory|BorderLayout|BorderUIResource|BoundedRangeModel|Bounds|Box|BoxedValueHelper|BoxLayout|BoxView|BreakIterator|Buffer|BufferCapabilities|BufferedImage|BufferedImageFilter|BufferedImageOp|BufferedInputStream|BufferedOutputStream|BufferedReader|BufferedWriter|BufferOverflowException|BufferStrategy|BufferUnderflowException|Button|ButtonGroup|ButtonModel|ButtonUI|Byte|ByteArrayInputStream|ByteArrayOutputStream|ByteBuffer|ByteChannel|ByteHolder|ByteLookupTable|ByteOrder|Calendar|CallableStatement|Callback|CallbackHandler|CancelablePrintJob|CancelledKeyException|CannotProceed|CannotProceedException|CannotProceedHelper|CannotProceedHolder|CannotRedoException|CannotUndoException|Canvas|CardLayout|Caret|CaretEvent|CaretListener|CDATASection|CellEditor|CellEditorListener|CellRendererPane|Certificate|CertificateEncodingException|CertificateException|CertificateExpiredException|CertificateFactory|CertificateFactorySpi|CertificateNotYetValidException|CertificateParsingException|CertPath|CertPathBuilder|CertPathBuilderException|CertPathBuilderResult|CertPathBuilderSpi|CertPathParameters|CertPathValidator|CertPathValidatorException|CertPathValidatorResult|CertPathValidatorSpi|CertSelector|CertStore|CertStoreException|CertStoreParameters|CertStoreSpi|ChangedCharSetException|ChangeEvent|ChangeListener|Channel|ChannelBinding|Channels|Character|CharacterCodingException|CharacterData|CharacterIterator|CharArrayReader|CharArrayWriter|CharBuffer|CharConversionException|CharHolder|CharSeqHelper|CharSeqHolder|CharSequence|Charset|CharsetDecoder|CharsetEncoder|CharsetProvider|Checkbox|CheckboxGroup|CheckboxMenuItem|CheckedInputStream|CheckedOutputStream|Checksum|Choice|ChoiceCallback|ChoiceFormat|Chromaticity|Cipher|CipherInputStream|CipherOutputStream|CipherSpi|Class|ClassCastException|ClassCircularityError|ClassDesc|ClassFormatError|ClassLoader|ClassNotFoundException|ClientRequestInfo|ClientRequestInfoOperations|ClientRequestInterceptor|ClientRequestInterceptorOperations|Clip|Clipboard|ClipboardOwner|Clob|Cloneable|CloneNotSupportedException|ClosedByInterruptException|ClosedChannelException|ClosedSelectorException|CMMException|Codec|CodecFactory|CodecFactoryHelper|CodecFactoryOperations|CodecOperations|CoderMalfunctionError|CoderResult|CodeSets|CodeSource|CodingErrorAction|CollationElementIterator|CollationKey|Collator|Collection|CollectionCertStoreParameters|Collections|Color|ColorChooserComponentFactory|ColorChooserUI|ColorConvertOp|ColorModel|ColorSelectionModel|ColorSpace|ColorSupported|ColorUIResource|ComboBoxEditor|ComboBoxModel|ComboBoxUI|ComboPopup|COMM_FAILURE|Comment|CommunicationException|Comparable|Comparator|Compiler|CompletionStatus|CompletionStatusHelper|Component|ComponentAdapter|ComponentColorModel|ComponentEvent|ComponentIdHelper|ComponentInputMap|ComponentInputMapUIResource|ComponentListener|ComponentOrientation|ComponentSampleModel|ComponentUI|ComponentView|Composite|CompositeContext|CompositeName|CompositeView|CompoundBorder|CompoundControl|CompoundEdit|CompoundName|Compression|ConcurrentModificationException|Configuration|ConfigurationException|ConfirmationCallback|ConnectException|ConnectIOException|Connection|ConnectionEvent|ConnectionEventListener|ConnectionPendingException|ConnectionPoolDataSource|ConsoleHandler|Constructor|Container|ContainerAdapter|ContainerEvent|ContainerListener|ContainerOrderFocusTraversalPolicy|ContentHandler|ContentHandlerFactory|ContentModel|Context|ContextList|ContextNotEmptyException|ContextualRenderedImageFactory|Control|ControlFactory|ControllerEventListener|ConvolveOp|CookieHolder|Copies|CopiesSupported|CRC32|CredentialExpiredException|CRL|CRLException|CRLSelector|CropImageFilter|CSS|CTX_RESTRICT_SCOPE|CubicCurve2D|Currency|Current|CurrentHelper|CurrentHolder|CurrentOperations|Cursor|Customizer|CustomMarshal|CustomValue|DATA_CONVERSION|DatabaseMetaData|DataBuffer|DataBufferByte|DataBufferDouble|DataBufferFloat|DataBufferInt|DataBufferShort|DataBufferUShort|DataFlavor|DataFormatException|DatagramChannel|DatagramPacket|DatagramSocket|DatagramSocketImpl|DatagramSocketImplFactory|DataInput|DataInputStream|DataLine|DataOutput|DataOutputStream|DataSource|DataTruncation|Date|DateFormat|DateFormatSymbols|DateFormatter|DateTimeAtCompleted|DateTimeAtCreation|DateTimeAtProcessing|DateTimeSyntax|DebugGraphics|DecimalFormat|DecimalFormatSymbols|DeclHandler|DefaultBoundedRangeModel|DefaultButtonModel|DefaultCaret|DefaultCellEditor|DefaultColorSelectionModel|DefaultComboBoxModel|DefaultDesktopManager|DefaultEditorKit|DefaultFocusManager|DefaultFocusTraversalPolicy|DefaultFormatter|DefaultFormatterFactory|DefaultHandler|DefaultHighlighter|DefaultKeyboardFocusManager|DefaultListCellRenderer|DefaultListModel|DefaultListSelectionModel|DefaultMenuLayout|DefaultMetalTheme|DefaultMutableTreeNode|DefaultPersistenceDelegate|DefaultSingleSelectionModel|DefaultStyledDocument|DefaultTableCellRenderer|DefaultTableColumnModel|DefaultTableModel|DefaultTextUI|DefaultTreeCellEditor|DefaultTreeCellRenderer|DefaultTreeModel|DefaultTreeSelectionModel|DefinitionKind|DefinitionKindHelper|Deflater|DeflaterOutputStream|Delegate|DelegationPermission|DESedeKeySpec|DesignMode|DESKeySpec|DesktopIconUI|DesktopManager|DesktopPaneUI|Destination|Destroyable|DestroyFailedException|DGC|DHGenParameterSpec|DHKey|DHParameterSpec|DHPrivateKey|DHPrivateKeySpec|DHPublicKey|DHPublicKeySpec|Dialog|Dictionary|DigestException|DigestInputStream|DigestOutputStream|Dimension|Dimension2D|DimensionUIResource|DirContext|DirectColorModel|DirectoryManager|DirObjectFactory|DirStateFactory|DisplayMode|DnDConstants|Doc|DocAttribute|DocAttributeSet|DocFlavor|DocPrintJob|Document|DocumentBuilder|DocumentBuilderFactory|DocumentEvent|DocumentFilter|DocumentFragment|DocumentHandler|DocumentListener|DocumentName|DocumentParser|DocumentType|DomainCombiner|DomainManager|DomainManagerOperations|DOMException|DOMImplementation|DOMLocator|DOMResult|DOMSource|Double|DoubleBuffer|DoubleHolder|DoubleSeqHelper|DoubleSeqHolder|DragGestureEvent|DragGestureListener|DragGestureRecognizer|DragSource|DragSourceAdapter|DragSourceContext|DragSourceDragEvent|DragSourceDropEvent|DragSourceEvent|DragSourceListener|DragSourceMotionListener|Driver|DriverManager|DriverPropertyInfo|DropTarget|DropTargetAdapter|DropTargetContext|DropTargetDragEvent|DropTargetDropEvent|DropTargetEvent|DropTargetListener|DSAKey|DSAKeyPairGenerator|DSAParameterSpec|DSAParams|DSAPrivateKey|DSAPrivateKeySpec|DSAPublicKey|DSAPublicKeySpec|DTD|DTDConstants|DTDHandler|DuplicateName|DuplicateNameHelper|DynamicImplementation|DynAny|DynAnyFactory|DynAnyFactoryHelper|DynAnyFactoryOperations|DynAnyHelper|DynAnyOperations|DynAnySeqHelper|DynArray|DynArrayHelper|DynArrayOperations|DynEnum|DynEnumHelper|DynEnumOperations|DynFixed|DynFixedHelper|DynFixedOperations|DynSequence|DynSequenceHelper|DynSequenceOperations|DynStruct|DynStructHelper|DynStructOperations|DynUnion|DynUnionHelper|DynUnionOperations|DynValue|DynValueBox|DynValueBoxOperations|DynValueCommon|DynValueCommonOperations|DynValueHelper|DynValueOperations|EditorKit|Element|ElementIterator|Ellipse2D|EmptyBorder|EmptyStackException|EncodedKeySpec|Encoder|Encoding|ENCODING_CDR_ENCAPS|EncryptedPrivateKeyInfo|Entity|EntityReference|EntityResolver|EnumControl|Enumeration|EnumSyntax|Environment|EOFException|Error|ErrorHandler|ErrorListener|ErrorManager|EtchedBorder|Event|EventContext|EventDirContext|EventHandler|EventListener|EventListenerList|EventListenerProxy|EventObject|EventQueue|EventSetDescriptor|Exception|ExceptionInInitializerError|ExceptionList|ExceptionListener|ExemptionMechanism|ExemptionMechanismException|ExemptionMechanismSpi|ExpandVetoException|ExportException|Expression|ExtendedRequest|ExtendedResponse|Externalizable|FactoryConfigurationError|FailedLoginException|FeatureDescriptor|Fidelity|Field|FieldNameHelper|FieldPosition|FieldView|File|FileCacheImageInputStream|FileCacheImageOutputStream|FileChannel|FileChooserUI|FileDescriptor|FileDialog|FileFilter|FileHandler|FileImageInputStream|FileImageOutputStream|FileInputStream|FileLock|FileLockInterruptionException|FilenameFilter|FileNameMap|FileNotFoundException|FileOutputStream|FilePermission|FileReader|FileSystemView|FileView|FileWriter|Filter|FilteredImageSource|FilterInputStream|FilterOutputStream|FilterReader|FilterWriter|Finishings|FixedHeightLayoutCache|FixedHolder|FlatteningPathIterator|FlavorException|FlavorMap|FlavorTable|Float|FloatBuffer|FloatControl|FloatHolder|FloatSeqHelper|FloatSeqHolder|FlowLayout|FlowView|FocusAdapter|FocusEvent|FocusListener|FocusManager|FocusTraversalPolicy|Font|FontFormatException|FontMetrics|FontRenderContext|FontUIResource|Format|FormatConversionProvider|FormatMismatch|FormatMismatchHelper|Formatter|FormView|ForwardRequest|ForwardRequestHelper|Frame|FREE_MEM|GapContent|GatheringByteChannel|GeneralPath|GeneralSecurityException|GlyphJustificationInfo|GlyphMetrics|GlyphVector|GlyphView|GradientPaint|GraphicAttribute|Graphics|Graphics2D|GraphicsConfigTemplate|GraphicsConfiguration|GraphicsDevice|GraphicsEnvironment|GrayFilter|GregorianCalendar|GridBagConstraints|GridBagLayout|GridLayout|Group|GSSContext|GSSCredential|GSSException|GSSManager|GSSName|Guard|GuardedObject|GZIPInputStream|GZIPOutputStream|Handler|HandlerBase|HandshakeCompletedEvent|HandshakeCompletedListener|HasControls|HashAttributeSet|HashDocAttributeSet|HashMap|HashPrintJobAttributeSet|HashPrintRequestAttributeSet|HashPrintServiceAttributeSet|HashSet|Hashtable|HeadlessException|HierarchyBoundsAdapter|HierarchyBoundsListener|HierarchyEvent|HierarchyListener|Highlighter|HostnameVerifier|HTML|HTMLDocument|HTMLEditorKit|HTMLFrameHyperlinkEvent|HTMLWriter|HttpsURLConnection|HttpURLConnection|HyperlinkEvent|HyperlinkListener|ICC_ColorSpace|ICC_Profile|ICC_ProfileGray|ICC_ProfileRGB|Icon|IconUIResource|IconView|ID_ASSIGNMENT_POLICY_ID|ID_UNIQUENESS_POLICY_ID|IdAssignmentPolicy|IdAssignmentPolicyOperations|IdAssignmentPolicyValue|IdentifierHelper|Identity|IdentityHashMap|IdentityScope|IDLEntity|IDLType|IDLTypeHelper|IDLTypeOperations|IdUniquenessPolicy|IdUniquenessPolicyOperations|IdUniquenessPolicyValue|IIOByteBuffer|IIOException|IIOImage|IIOInvalidTreeException|IIOMetadata|IIOMetadataController|IIOMetadataFormat|IIOMetadataFormatImpl|IIOMetadataNode|IIOParam|IIOParamController|IIOReadProgressListener|IIOReadUpdateListener|IIOReadWarningListener|IIORegistry|IIOServiceProvider|IIOWriteProgressListener|IIOWriteWarningListener|IllegalAccessError|IllegalAccessException|IllegalArgumentException|IllegalBlockingModeException|IllegalBlockSizeException|IllegalCharsetNameException|IllegalComponentStateException|IllegalMonitorStateException|IllegalPathStateException|IllegalSelectorException|IllegalStateException|IllegalThreadStateException|Image|ImageCapabilities|ImageConsumer|ImageFilter|ImageGraphicAttribute|ImageIcon|ImageInputStream|ImageInputStreamImpl|ImageInputStreamSpi|ImageIO|ImageObserver|ImageOutputStream|ImageOutputStreamImpl|ImageOutputStreamSpi|ImageProducer|ImageReader|ImageReaderSpi|ImageReaderWriterSpi|ImageReadParam|ImageTranscoder|ImageTranscoderSpi|ImageTypeSpecifier|ImageView|ImageWriteParam|ImageWriter|ImageWriterSpi|ImagingOpException|IMP_LIMIT|IMPLICIT_ACTIVATION_POLICY_ID|ImplicitActivationPolicy|ImplicitActivationPolicyOperations|ImplicitActivationPolicyValue|IncompatibleClassChangeError|InconsistentTypeCode|InconsistentTypeCodeHelper|IndexColorModel|IndexedPropertyDescriptor|IndexOutOfBoundsException|IndirectionException|Inet4Address|Inet6Address|InetAddress|InetSocketAddress|Inflater|InflaterInputStream|InheritableThreadLocal|InitialContext|InitialContextFactory|InitialContextFactoryBuilder|InitialDirContext|INITIALIZE|InitialLdapContext|InlineView|InputContext|InputEvent|InputMap|InputMapUIResource|InputMethod|InputMethodContext|InputMethodDescriptor|InputMethodEvent|InputMethodHighlight|InputMethodListener|InputMethodRequests|InputSource|InputStream|InputStreamReader|InputSubset|InputVerifier|Insets|InsetsUIResource|InstantiationError|InstantiationException|Instrument|InsufficientResourcesException|IntBuffer|Integer|IntegerSyntax|Interceptor|InterceptorOperations|INTERNAL|InternalError|InternalFrameAdapter|InternalFrameEvent|InternalFrameFocusTraversalPolicy|InternalFrameListener|InternalFrameUI|InternationalFormatter|InterruptedException|InterruptedIOException|InterruptedNamingException|InterruptibleChannel|INTF_REPOS|IntHolder|IntrospectionException|Introspector|INV_FLAG|INV_IDENT|INV_OBJREF|INV_POLICY|Invalid|INVALID_TRANSACTION|InvalidAddress|InvalidAddressHelper|InvalidAddressHolder|InvalidAlgorithmParameterException|InvalidAttributeIdentifierException|InvalidAttributesException|InvalidAttributeValueException|InvalidClassException|InvalidDnDOperationException|InvalidKeyException|InvalidKeySpecException|InvalidMarkException|InvalidMidiDataException|InvalidName|InvalidNameException|InvalidNameHelper|InvalidNameHolder|InvalidObjectException|InvalidParameterException|InvalidParameterSpecException|InvalidPolicy|InvalidPolicyHelper|InvalidPreferencesFormatException|InvalidSearchControlsException|InvalidSearchFilterException|InvalidSeq|InvalidSlot|InvalidSlotHelper|InvalidTransactionException|InvalidTypeForEncoding|InvalidTypeForEncodingHelper|InvalidValue|InvalidValueHelper|InvocationEvent|InvocationHandler|InvocationTargetException|InvokeHandler|IOException|IOR|IORHelper|IORHolder|IORInfo|IORInfoOperations|IORInterceptor|IORInterceptorOperations|IRObject|IRObjectOperations|IstringHelper|ItemEvent|ItemListener|ItemSelectable|Iterator|IvParameterSpec|JApplet|JarEntry|JarException|JarFile|JarInputStream|JarOutputStream|JarURLConnection|JButton|JCheckBox|JCheckBoxMenuItem|JColorChooser|JComboBox|JComponent|JDesktopPane|JDialog|JEditorPane|JFileChooser|JFormattedTextField|JFrame|JInternalFrame|JLabel|JLayeredPane|JList|JMenu|JMenuBar|JMenuItem|JobAttributes|JobHoldUntil|JobImpressions|JobImpressionsCompleted|JobImpressionsSupported|JobKOctets|JobKOctetsProcessed|JobKOctetsSupported|JobMediaSheets|JobMediaSheetsCompleted|JobMediaSheetsSupported|JobMessageFromOperator|JobName|JobOriginatingUserName|JobPriority|JobPrioritySupported|JobSheets|JobState|JobStateReason|JobStateReasons|JOptionPane|JPanel|JPasswordField|JPEGHuffmanTable|JPEGImageReadParam|JPEGImageWriteParam|JPEGQTable|JPopupMenu|JProgressBar|JRadioButton|JRadioButtonMenuItem|JRootPane|JScrollBar|JScrollPane|JSeparator|JSlider|JSpinner|JSplitPane|JTabbedPane|JTable|JTableHeader|JTextArea|JTextComponent|JTextField|JTextPane|JToggleButton|JToolBar|JToolTip|JTree|JViewport|JWindow|KerberosKey|KerberosPrincipal|KerberosTicket|Kernel|Key|KeyAdapter|KeyAgreement|KeyAgreementSpi|KeyboardFocusManager|KeyEvent|KeyEventDispatcher|KeyEventPostProcessor|KeyException|KeyFactory|KeyFactorySpi|KeyGenerator|KeyGeneratorSpi|KeyListener|KeyManagementException|KeyManager|KeyManagerFactory|KeyManagerFactorySpi|Keymap|KeyPair|KeyPairGenerator|KeyPairGeneratorSpi|KeySpec|KeyStore|KeyStoreException|KeyStoreSpi|KeyStroke|Label|LabelUI|LabelView|LanguageCallback|LastOwnerException|LayeredHighlighter|LayoutFocusTraversalPolicy|LayoutManager|LayoutManager2|LayoutQueue|LDAPCertStoreParameters|LdapContext|LdapReferralException|Lease|Level|LexicalHandler|LIFESPAN_POLICY_ID|LifespanPolicy|LifespanPolicyOperations|LifespanPolicyValue|LimitExceededException|Line|Line2D|LineBorder|LineBreakMeasurer|LineEvent|LineListener|LineMetrics|LineNumberInputStream|LineNumberReader|LineUnavailableException|LinkageError|LinkedHashMap|LinkedHashSet|LinkedList|LinkException|LinkLoopException|LinkRef|List|ListCellRenderer|ListDataEvent|ListDataListener|ListIterator|ListModel|ListResourceBundle|ListSelectionEvent|ListSelectionListener|ListSelectionModel|ListUI|ListView|LoaderHandler|Locale|LocalObject|LocateRegistry|LOCATION_FORWARD|Locator|LocatorImpl|Logger|LoggingPermission|LoginContext|LoginException|LoginModule|LogManager|LogRecord|LogStream|Long|LongBuffer|LongHolder|LongLongSeqHelper|LongLongSeqHolder|LongSeqHelper|LongSeqHolder|LookAndFeel|LookupOp|LookupTable|Mac|MacSpi|MalformedInputException|MalformedLinkException|MalformedURLException|ManagerFactoryParameters|Manifest|Map|MappedByteBuffer|MARSHAL|MarshalException|MarshalledObject|MaskFormatter|Matcher|Math|MatteBorder|Media|MediaName|MediaPrintableArea|MediaSize|MediaSizeName|MediaTracker|MediaTray|Member|MemoryCacheImageInputStream|MemoryCacheImageOutputStream|MemoryHandler|MemoryImageSource|Menu|MenuBar|MenuBarUI|MenuComponent|MenuContainer|MenuDragMouseEvent|MenuDragMouseListener|MenuElement|MenuEvent|MenuItem|MenuItemUI|MenuKeyEvent|MenuKeyListener|MenuListener|MenuSelectionManager|MenuShortcut|MessageDigest|MessageDigestSpi|MessageFormat|MessageProp|MetaEventListener|MetalBorders|MetalButtonUI|MetalCheckBoxIcon|MetalCheckBoxUI|MetalComboBoxButton|MetalComboBoxEditor|MetalComboBoxIcon|MetalComboBoxUI|MetalDesktopIconUI|MetalFileChooserUI|MetalIconFactory|MetalInternalFrameTitlePane|MetalInternalFrameUI|MetalLabelUI|MetalLookAndFeel|MetalPopupMenuSeparatorUI|MetalProgressBarUI|MetalRadioButtonUI|MetalRootPaneUI|MetalScrollBarUI|MetalScrollButton|MetalScrollPaneUI|MetalSeparatorUI|MetalSliderUI|MetalSplitPaneUI|MetalTabbedPaneUI|MetalTextFieldUI|MetalTheme|MetalToggleButtonUI|MetalToolBarUI|MetalToolTipUI|MetalTreeUI|MetaMessage|Method|MethodDescriptor|MidiChannel|MidiDevice|MidiDeviceProvider|MidiEvent|MidiFileFormat|MidiFileReader|MidiFileWriter|MidiMessage|MidiSystem|MidiUnavailableException|MimeTypeParseException|MinimalHTMLWriter|MissingResourceException|Mixer|MixerProvider|ModificationItem|Modifier|MouseAdapter|MouseDragGestureRecognizer|MouseEvent|MouseInputAdapter|MouseInputListener|MouseListener|MouseMotionAdapter|MouseMotionListener|MouseWheelEvent|MouseWheelListener|MultiButtonUI|MulticastSocket|MultiColorChooserUI|MultiComboBoxUI|MultiDesktopIconUI|MultiDesktopPaneUI|MultiDoc|MultiDocPrintJob|MultiDocPrintService|MultiFileChooserUI|MultiInternalFrameUI|MultiLabelUI|MultiListUI|MultiLookAndFeel|MultiMenuBarUI|MultiMenuItemUI|MultiOptionPaneUI|MultiPanelUI|MultiPixelPackedSampleModel|MultipleComponentProfileHelper|MultipleComponentProfileHolder|MultipleDocumentHandling|MultipleMaster|MultiPopupMenuUI|MultiProgressBarUI|MultiRootPaneUI|MultiScrollBarUI|MultiScrollPaneUI|MultiSeparatorUI|MultiSliderUI|MultiSpinnerUI|MultiSplitPaneUI|MultiTabbedPaneUI|MultiTableHeaderUI|MultiTableUI|MultiTextUI|MultiToolBarUI|MultiToolTipUI|MultiTreeUI|MultiViewportUI|MutableAttributeSet|MutableComboBoxModel|MutableTreeNode|Name|NameAlreadyBoundException|NameCallback|NameClassPair|NameComponent|NameComponentHelper|NameComponentHolder|NamedNodeMap|NamedValue|NameDynAnyPair|NameDynAnyPairHelper|NameDynAnyPairSeqHelper|NameHelper|NameHolder|NameNotFoundException|NameParser|NamespaceChangeListener|NamespaceSupport|NameValuePair|NameValuePairHelper|NameValuePairSeqHelper|Naming|NamingContext|NamingContextExt|NamingContextExtHelper|NamingContextExtHolder|NamingContextExtOperations|NamingContextExtPOA|NamingContextHelper|NamingContextHolder|NamingContextOperations|NamingContextPOA|NamingEnumeration|NamingEvent|NamingException|NamingExceptionEvent|NamingListener|NamingManager|NamingSecurityException|NavigationFilter|NegativeArraySizeException|NetPermission|NetworkInterface|NO_IMPLEMENT|NO_MEMORY|NO_PERMISSION|NO_RESOURCES|NO_RESPONSE|NoClassDefFoundError|NoConnectionPendingException|NoContext|NoContextHelper|Node|NodeChangeEvent|NodeChangeListener|NodeList|NoInitialContextException|NoninvertibleTransformException|NonReadableChannelException|NonWritableChannelException|NoPermissionException|NoRouteToHostException|NoServant|NoServantHelper|NoSuchAlgorithmException|NoSuchAttributeException|NoSuchElementException|NoSuchFieldError|NoSuchFieldException|NoSuchMethodError|NoSuchMethodException|NoSuchObjectException|NoSuchPaddingException|NoSuchProviderException|NotActiveException|Notation|NotBoundException|NotContextException|NotEmpty|NotEmptyHelper|NotEmptyHolder|NotFound|NotFoundHelper|NotFoundHolder|NotFoundReason|NotFoundReasonHelper|NotFoundReasonHolder|NotOwnerException|NotSerializableException|NotYetBoundException|NotYetConnectedException|NullCipher|NullPointerException|Number|NumberFormat|NumberFormatException|NumberFormatter|NumberOfDocuments|NumberOfInterveningJobs|NumberUp|NumberUpSupported|NumericShaper|NVList|OBJ_ADAPTER|Object|OBJECT_NOT_EXIST|ObjectAlreadyActive|ObjectAlreadyActiveHelper|ObjectChangeListener|ObjectFactory|ObjectFactoryBuilder|ObjectHelper|ObjectHolder|ObjectIdHelper|ObjectImpl|ObjectInput|ObjectInputStream|ObjectInputValidation|ObjectNotActive|ObjectNotActiveHelper|ObjectOutput|ObjectOutputStream|ObjectStreamClass|ObjectStreamConstants|ObjectStreamException|ObjectStreamField|ObjectView|ObjID|Observable|Observer|OctetSeqHelper|OctetSeqHolder|Oid|OMGVMCID|OpenType|Operation|OperationNotSupportedException|Option|OptionalDataException|OptionPaneUI|ORB|ORBInitializer|ORBInitializerOperations|ORBInitInfo|ORBInitInfoOperations|OrientationRequested|OutOfMemoryError|OutputDeviceAssigned|OutputKeys|OutputStream|OutputStreamWriter|OverlappingFileLockException|OverlayLayout|Owner|Package|PackedColorModel|Pageable|PageAttributes|PageFormat|PageRanges|PagesPerMinute|PagesPerMinuteColor|Paint|PaintContext|PaintEvent|Panel|PanelUI|Paper|ParagraphView|Parameter|ParameterBlock|ParameterDescriptor|ParameterMetaData|ParameterMode|ParameterModeHelper|ParameterModeHolder|ParseException|ParsePosition|Parser|ParserAdapter|ParserConfigurationException|ParserDelegator|ParserFactory|PartialResultException|PasswordAuthentication|PasswordCallback|PasswordView|Patch|PathIterator|Pattern|PatternSyntaxException|PBEKey|PBEKeySpec|PBEParameterSpec|PDLOverrideSupported|Permission|PermissionCollection|Permissions|PERSIST_STORE|PersistenceDelegate|PhantomReference|Pipe|PipedInputStream|PipedOutputStream|PipedReader|PipedWriter|PixelGrabber|PixelInterleavedSampleModel|PKCS8EncodedKeySpec|PKIXBuilderParameters|PKIXCertPathBuilderResult|PKIXCertPathChecker|PKIXCertPathValidatorResult|PKIXParameters|PlainDocument|PlainView|POA|POAHelper|POAManager|POAManagerOperations|POAOperations|Point|Point2D|Policy|PolicyError|PolicyErrorCodeHelper|PolicyErrorHelper|PolicyErrorHolder|PolicyFactory|PolicyFactoryOperations|PolicyHelper|PolicyHolder|PolicyListHelper|PolicyListHolder|PolicyNode|PolicyOperations|PolicyQualifierInfo|PolicyTypeHelper|Polygon|PooledConnection|Popup|PopupFactory|PopupMenu|PopupMenuEvent|PopupMenuListener|PopupMenuUI|Port|PortableRemoteObject|PortableRemoteObjectDelegate|PortUnreachableException|Position|PreferenceChangeEvent|PreferenceChangeListener|Preferences|PreferencesFactory|PreparedStatement|PresentationDirection|Principal|PrincipalHolder|Printable|PrinterAbortException|PrinterException|PrinterGraphics|PrinterInfo|PrinterIOException|PrinterIsAcceptingJobs|PrinterJob|PrinterLocation|PrinterMakeAndModel|PrinterMessageFromOperator|PrinterMoreInfo|PrinterMoreInfoManufacturer|PrinterName|PrinterResolution|PrinterState|PrinterStateReason|PrinterStateReasons|PrinterURI|PrintEvent|PrintException|PrintGraphics|PrintJob|PrintJobAdapter|PrintJobAttribute|PrintJobAttributeEvent|PrintJobAttributeListener|PrintJobAttributeSet|PrintJobEvent|PrintJobListener|PrintQuality|PrintRequestAttribute|PrintRequestAttributeSet|PrintService|PrintServiceAttribute|PrintServiceAttributeEvent|PrintServiceAttributeListener|PrintServiceAttributeSet|PrintServiceLookup|PrintStream|PrintWriter|PRIVATE_MEMBER|PrivateCredentialPermission|PrivateKey|PrivilegedAction|PrivilegedActionException|PrivilegedExceptionAction|Process|ProcessingInstruction|ProfileDataException|ProfileIdHelper|ProgressBarUI|ProgressMonitor|ProgressMonitorInputStream|Properties|PropertyChangeEvent|PropertyChangeListener|PropertyChangeListenerProxy|PropertyChangeSupport|PropertyDescriptor|PropertyEditor|PropertyEditorManager|PropertyEditorSupport|PropertyPermission|PropertyResourceBundle|PropertyVetoException|ProtectionDomain|ProtocolException|Provider|ProviderException|Proxy|PSSParameterSpec|PUBLIC_MEMBER|PublicKey|PushbackInputStream|PushbackReader|QuadCurve2D|QueuedJobCount|Random|RandomAccess|RandomAccessFile|Raster|RasterFormatException|RasterOp|RC2ParameterSpec|RC5ParameterSpec|ReadableByteChannel|Reader|ReadOnlyBufferException|Receiver|Rectangle|Rectangle2D|RectangularShape|Ref|RefAddr|Reference|Referenceable|ReferenceQueue|ReferenceUriSchemesSupported|ReferralException|ReflectPermission|Refreshable|RefreshFailedException|RegisterableService|Registry|RegistryHandler|RemarshalException|Remote|RemoteCall|RemoteException|RemoteObject|RemoteRef|RemoteServer|RemoteStub|RenderableImage|RenderableImageOp|RenderableImageProducer|RenderContext|RenderedImage|RenderedImageFactory|Renderer|RenderingHints|RepaintManager|ReplicateScaleFilter|RepositoryIdHelper|Request|REQUEST_PROCESSING_POLICY_ID|RequestInfo|RequestInfoOperations|RequestingUserName|RequestProcessingPolicy|RequestProcessingPolicyOperations|RequestProcessingPolicyValue|RescaleOp|ResolutionSyntax|Resolver|ResolveResult|ResourceBundle|ResponseHandler|Result|ResultSet|ResultSetMetaData|ReverbType|RGBImageFilter|RMIClassLoader|RMIClassLoaderSpi|RMIClientSocketFactory|RMIFailureHandler|RMISecurityException|RMISecurityManager|RMIServerSocketFactory|RMISocketFactory|Robot|RootPaneContainer|RootPaneUI|RoundRectangle2D|RowMapper|RowSet|RowSetEvent|RowSetInternal|RowSetListener|RowSetMetaData|RowSetReader|RowSetWriter|RSAKey|RSAKeyGenParameterSpec|RSAMultiPrimePrivateCrtKey|RSAMultiPrimePrivateCrtKeySpec|RSAOtherPrimeInfo|RSAPrivateCrtKey|RSAPrivateCrtKeySpec|RSAPrivateKey|RSAPrivateKeySpec|RSAPublicKey|RSAPublicKeySpec|RTFEditorKit|RuleBasedCollator|Runnable|Runtime|RunTime|RuntimeException|RunTimeOperations|RuntimePermission|SampleModel|Savepoint|SAXException|SAXNotRecognizedException|SAXNotSupportedException|SAXParseException|SAXParser|SAXParserFactory|SAXResult|SAXSource|SAXTransformerFactory|ScatteringByteChannel|SchemaViolationException|Scrollable|Scrollbar|ScrollBarUI|ScrollPane|ScrollPaneAdjustable|ScrollPaneConstants|ScrollPaneLayout|ScrollPaneUI|SealedObject|SearchControls|SearchResult|SecretKey|SecretKeyFactory|SecretKeyFactorySpi|SecretKeySpec|SecureClassLoader|SecureRandom|SecureRandomSpi|Security|SecurityException|SecurityManager|SecurityPermission|Segment|SelectableChannel|SelectionKey|Selector|SelectorProvider|SeparatorUI|Sequence|SequenceInputStream|Sequencer|Serializable|SerializablePermission|Servant|SERVANT_RETENTION_POLICY_ID|ServantActivator|ServantActivatorHelper|ServantActivatorOperations|ServantActivatorPOA|ServantAlreadyActive|ServantAlreadyActiveHelper|ServantLocator|ServantLocatorHelper|ServantLocatorOperations|ServantLocatorPOA|ServantManager|ServantManagerOperations|ServantNotActive|ServantNotActiveHelper|ServantObject|ServantRetentionPolicy|ServantRetentionPolicyOperations|ServantRetentionPolicyValue|ServerCloneException|ServerError|ServerException|ServerNotActiveException|ServerRef|ServerRequest|ServerRequestInfo|ServerRequestInfoOperations|ServerRequestInterceptor|ServerRequestInterceptorOperations|ServerRuntimeException|ServerSocket|ServerSocketChannel|ServerSocketFactory|ServiceContext|ServiceContextHelper|ServiceContextHolder|ServiceContextListHelper|ServiceContextListHolder|ServiceDetail|ServiceDetailHelper|ServiceIdHelper|ServiceInformation|ServiceInformationHelper|ServiceInformationHolder|ServicePermission|ServiceRegistry|ServiceUI|ServiceUIFactory|ServiceUnavailableException|Set|SetOfIntegerSyntax|SetOverrideType|SetOverrideTypeHelper|Severity|Shape|ShapeGraphicAttribute|SheetCollate|Short|ShortBuffer|ShortBufferException|ShortHolder|ShortLookupTable|ShortMessage|ShortSeqHelper|ShortSeqHolder|Sides|Signature|SignatureException|SignatureSpi|SignedObject|Signer|SimpleAttributeSet|SimpleBeanInfo|SimpleDateFormat|SimpleDoc|SimpleFormatter|SimpleTimeZone|SinglePixelPackedSampleModel|SingleSelectionModel|Size2DSyntax|SizeLimitExceededException|SizeRequirements|SizeSequence|Skeleton|SkeletonMismatchException|SkeletonNotFoundException|SliderUI|Socket|SocketAddress|SocketChannel|SocketException|SocketFactory|SocketHandler|SocketImpl|SocketImplFactory|SocketOptions|SocketPermission|SocketSecurityException|SocketTimeoutException|SoftBevelBorder|SoftReference|SortedMap|SortedSet|SortingFocusTraversalPolicy|Soundbank|SoundbankReader|SoundbankResource|Source|SourceDataLine|SourceLocator|SpinnerDateModel|SpinnerListModel|SpinnerModel|SpinnerNumberModel|SpinnerUI|SplitPaneUI|Spring|SpringLayout|SQLData|SQLException|SQLInput|SQLOutput|SQLPermission|SQLWarning|SSLContext|SSLContextSpi|SSLException|SSLHandshakeException|SSLKeyException|SSLPeerUnverifiedException|SSLPermission|SSLProtocolException|SSLServerSocket|SSLServerSocketFactory|SSLSession|SSLSessionBindingEvent|SSLSessionBindingListener|SSLSessionContext|SSLSocket|SSLSocketFactory|Stack|StackOverflowError|StackTraceElement|StartTlsRequest|StartTlsResponse|State|StateEdit|StateEditable|StateFactory|Statement|Streamable|StreamableValue|StreamCorruptedException|StreamHandler|StreamPrintService|StreamPrintServiceFactory|StreamResult|StreamSource|StreamTokenizer|StrictMath|String|StringBuffer|StringBufferInputStream|StringCharacterIterator|StringContent|StringHolder|StringIndexOutOfBoundsException|StringNameHelper|StringReader|StringRefAddr|StringSelection|StringSeqHelper|StringSeqHolder|StringTokenizer|StringValueHelper|StringWriter|Stroke|Struct|StructMember|StructMemberHelper|Stub|StubDelegate|StubNotFoundException|Style|StyleConstants|StyleContext|StyledDocument|StyledEditorKit|StyleSheet|Subject|SubjectDomainCombiner|SUCCESSFUL|SupportedValuesAttribute|SwingConstants|SwingPropertyChangeSupport|SwingUtilities|SYNC_WITH_TRANSPORT|SyncFailedException|SyncScopeHelper|Synthesizer|SysexMessage|System|SYSTEM_EXCEPTION|SystemColor|SystemException|SystemFlavorMap|TabableView|TabbedPaneUI|TabExpander|TableCellEditor|TableCellRenderer|TableColumn|TableColumnModel|TableColumnModelEvent|TableColumnModelListener|TableHeaderUI|TableModel|TableModelEvent|TableModelListener|TableUI|TableView|TabSet|TabStop|TAG_ALTERNATE_IIOP_ADDRESS|TAG_CODE_SETS|TAG_INTERNET_IOP|TAG_JAVA_CODEBASE|TAG_MULTIPLE_COMPONENTS|TAG_ORB_TYPE|TAG_POLICIES|TagElement|TaggedComponent|TaggedComponentHelper|TaggedComponentHolder|TaggedProfile|TaggedProfileHelper|TaggedProfileHolder|TargetDataLine|TCKind|Templates|TemplatesHandler|Text|TextAction|TextArea|TextAttribute|TextComponent|TextEvent|TextField|TextHitInfo|TextInputCallback|TextLayout|TextListener|TextMeasurer|TextOutputCallback|TextSyntax|TextUI|TexturePaint|Thread|THREAD_POLICY_ID|ThreadDeath|ThreadGroup|ThreadLocal|ThreadPolicy|ThreadPolicyOperations|ThreadPolicyValue|Throwable|Tie|TileObserver|Time|TimeLimitExceededException|Timer|TimerTask|Timestamp|TimeZone|TitledBorder|ToolBarUI|Toolkit|ToolTipManager|ToolTipUI|TooManyListenersException|Track|TRANSACTION_REQUIRED|TRANSACTION_ROLLEDBACK|TransactionRequiredException|TransactionRolledbackException|TransactionService|Transferable|TransferHandler|TransformAttribute|Transformer|TransformerConfigurationException|TransformerException|TransformerFactory|TransformerFactoryConfigurationError|TransformerHandler|TRANSIENT|Transmitter|Transparency|TRANSPORT_RETRY|TreeCellEditor|TreeCellRenderer|TreeExpansionEvent|TreeExpansionListener|TreeMap|TreeModel|TreeModelEvent|TreeModelListener|TreeNode|TreePath|TreeSelectionEvent|TreeSelectionListener|TreeSelectionModel|TreeSet|TreeUI|TreeWillExpandListener|TrustAnchor|TrustManager|TrustManagerFactory|TrustManagerFactorySpi|TypeCode|TypeCodeHolder|TypeMismatch|TypeMismatchHelper|Types|UID|UIDefaults|UIManager|UIResource|ULongLongSeqHelper|ULongLongSeqHolder|ULongSeqHelper|ULongSeqHolder|UndeclaredThrowableException|UndoableEdit|UndoableEditEvent|UndoableEditListener|UndoableEditSupport|UndoManager|UnexpectedException|UnicastRemoteObject|UnionMember|UnionMemberHelper|UNKNOWN|UnknownEncoding|UnknownEncodingHelper|UnknownError|UnknownException|UnknownGroupException|UnknownHostException|UnknownObjectException|UnknownServiceException|UnknownUserException|UnknownUserExceptionHelper|UnknownUserExceptionHolder|UnmappableCharacterException|UnmarshalException|UnmodifiableSetException|UnrecoverableKeyException|Unreferenced|UnresolvedAddressException|UnresolvedPermission|UnsatisfiedLinkError|UnsolicitedNotification|UnsolicitedNotificationEvent|UnsolicitedNotificationListener|UNSUPPORTED_POLICY|UNSUPPORTED_POLICY_VALUE|UnsupportedAddressTypeException|UnsupportedAudioFileException|UnsupportedCallbackException|UnsupportedCharsetException|UnsupportedClassVersionError|UnsupportedEncodingException|UnsupportedFlavorException|UnsupportedLookAndFeelException|UnsupportedOperationException|URI|URIException|URIResolver|URISyntax|URISyntaxException|URL|URLClassLoader|URLConnection|URLDecoder|URLEncoder|URLStreamHandler|URLStreamHandlerFactory|URLStringHelper|USER_EXCEPTION|UserException|UShortSeqHelper|UShortSeqHolder|UTFDataFormatException|Util|UtilDelegate|Utilities|ValueBase|ValueBaseHelper|ValueBaseHolder|ValueFactory|ValueHandler|ValueMember|ValueMemberHelper|VariableHeightLayoutCache|Vector|VerifyError|VersionSpecHelper|VetoableChangeListener|VetoableChangeListenerProxy|VetoableChangeSupport|View|ViewFactory|ViewportLayout|ViewportUI|VirtualMachineError|Visibility|VisibilityHelper|VM_ABSTRACT|VM_CUSTOM|VM_NONE|VM_TRUNCATABLE|VMID|VoiceStatus|Void|VolatileImage|WCharSeqHelper|WCharSeqHolder|WeakHashMap|WeakReference|Window|WindowAdapter|WindowConstants|WindowEvent|WindowFocusListener|WindowListener|WindowStateListener|WrappedPlainView|WritableByteChannel|WritableRaster|WritableRenderedImage|WriteAbortedException|Writer|WrongAdapter|WrongAdapterHelper|WrongPolicy|WrongPolicyHelper|WrongTransaction|WrongTransactionHelper|WrongTransactionHolder|WStringSeqHelper|WStringSeqHolder|WStringValueHelper|X500Principal|X500PrivateCredential|X509Certificate|X509CertSelector|X509CRL|X509CRLEntry|X509CRLSelector|X509EncodedKeySpec|X509Extension|X509KeyManager|X509TrustManager|XAConnection|XADataSource|XAException|XAResource|Xid|XMLDecoder|XMLEncoder|XMLFilter|XMLFilterImpl|XMLFormatter|XMLReader|XMLReaderAdapter|XMLReaderFactory|ZipEntry|ZipException|ZipFile|ZipInputStream|ZipOutputStream|ZoneView|_BindingIteratorImplBase|_BindingIteratorStub|_DynAnyFactoryStub|_DynAnyStub|_DynArrayStub|_DynEnumStub|_DynFixedStub|_DynSequenceStub|_DynStructStub|_DynUnionStub|_DynValueStub|_IDLTypeStub|_NamingContextExtStub|_NamingContextImplBase|_NamingContextStub|_PolicyStub|_Remote_Stub|_ServantActivatorStub|_ServantLocatorStub)$/',
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                    'types' => '/^(boolean|byte|char|const|double|final|float|int|long|short|static|void)$/',
-                    'reserved' => '/^(import|package|abstract|break|case|catch|class|continue|default|do|else|extends|false|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|super|strictfp|switch|synchronized|this|throws|throw|transient|true|try|volatile|while)$/',
-                    'builtin' => '/^(AbstractAction|AbstractBorder|AbstractButton|AbstractCellEditor|AbstractCollection|AbstractColorChooserPanel|AbstractDocument|AbstractInterruptibleChannel|AbstractLayoutCache|AbstractList|AbstractListModel|AbstractMap|AbstractMethodError|AbstractPreferences|AbstractSelectableChannel|AbstractSelectionKey|AbstractSelector|AbstractSequentialList|AbstractSet|AbstractSpinnerModel|AbstractTableModel|AbstractUndoableEdit|AbstractWriter|AccessControlContext|AccessControlException|AccessController|AccessException|Accessible|AccessibleAction|AccessibleBundle|AccessibleComponent|AccessibleContext|AccessibleEditableText|AccessibleExtendedComponent|AccessibleExtendedTable|AccessibleHyperlink|AccessibleHypertext|AccessibleIcon|AccessibleKeyBinding|AccessibleObject|AccessibleRelation|AccessibleRelationSet|AccessibleResourceBundle|AccessibleRole|AccessibleSelection|AccessibleState|AccessibleStateSet|AccessibleTable|AccessibleTableModelChange|AccessibleText|AccessibleValue|AccountExpiredException|Acl|AclEntry|AclNotFoundException|Action|ActionEvent|ActionListener|ActionMap|ActionMapUIResource|Activatable|ActivateFailedException|ActivationDesc|ActivationException|ActivationGroup|ActivationGroup_Stub|ActivationGroupDesc|ActivationGroupID|ActivationID|ActivationInstantiator|ActivationMonitor|ActivationSystem|Activator|ActiveEvent|AdapterActivator|AdapterActivatorOperations|AdapterAlreadyExists|AdapterAlreadyExistsHelper|AdapterInactive|AdapterInactiveHelper|AdapterNonExistent|AdapterNonExistentHelper|AddressHelper|Adjustable|AdjustmentEvent|AdjustmentListener|Adler32|AffineTransform|AffineTransformOp|AlgorithmParameterGenerator|AlgorithmParameterGeneratorSpi|AlgorithmParameters|AlgorithmParameterSpec|AlgorithmParametersSpi|AllPermission|AlphaComposite|AlreadyBound|AlreadyBoundException|AlreadyBoundHelper|AlreadyBoundHolder|AlreadyConnectedException|AncestorEvent|AncestorListener|Annotation|Any|AnyHolder|AnySeqHelper|AnySeqHolder|AppConfigurationEntry|Applet|AppletContext|AppletInitializer|AppletStub|ApplicationException|Arc2D|Area|AreaAveragingScaleFilter|ARG_IN|ARG_INOUT|ARG_OUT|ArithmeticException|Array|ArrayIndexOutOfBoundsException|ArrayList|Arrays|ArrayStoreException|AssertionError|AsyncBoxView|AsynchronousCloseException|Attr|Attribute|AttributedCharacterIterator|AttributedString|AttributeException|AttributeInUseException|AttributeList|AttributeListImpl|AttributeModificationException|Attributes|AttributeSet|AttributeSetUtilities|AttributesImpl|AudioClip|AudioFileFormat|AudioFileReader|AudioFileWriter|AudioFormat|AudioInputStream|AudioPermission|AudioSystem|AuthenticationException|AuthenticationNotSupportedException|Authenticator|AuthPermission|Autoscroll|AWTError|AWTEvent|AWTEventListener|AWTEventListenerProxy|AWTEventMulticaster|AWTException|AWTKeyStroke|AWTPermission|BackingStoreException|BAD_CONTEXT|BAD_INV_ORDER|BAD_OPERATION|BAD_PARAM|BAD_POLICY|BAD_POLICY_TYPE|BAD_POLICY_VALUE|BAD_TYPECODE|BadKind|BadLocationException|BadPaddingException|BandCombineOp|BandedSampleModel|BasicArrowButton|BasicAttribute|BasicAttributes|BasicBorders|BasicButtonListener|BasicButtonUI|BasicCheckBoxMenuItemUI|BasicCheckBoxUI|BasicColorChooserUI|BasicComboBoxEditor|BasicComboBoxRenderer|BasicComboBoxUI|BasicComboPopup|BasicDesktopIconUI|BasicDesktopPaneUI|BasicDirectoryModel|BasicEditorPaneUI|BasicFileChooserUI|BasicFormattedTextFieldUI|BasicGraphicsUtils|BasicHTML|BasicIconFactory|BasicInternalFrameTitlePane|BasicInternalFrameUI|BasicLabelUI|BasicListUI|BasicLookAndFeel|BasicMenuBarUI|BasicMenuItemUI|BasicMenuUI|BasicOptionPaneUI|BasicPanelUI|BasicPasswordFieldUI|BasicPermission|BasicPopupMenuSeparatorUI|BasicPopupMenuUI|BasicProgressBarUI|BasicRadioButtonMenuItemUI|BasicRadioButtonUI|BasicRootPaneUI|BasicScrollBarUI|BasicScrollPaneUI|BasicSeparatorUI|BasicSliderUI|BasicSpinnerUI|BasicSplitPaneDivider|BasicSplitPaneUI|BasicStroke|BasicTabbedPaneUI|BasicTableHeaderUI|BasicTableUI|BasicTextAreaUI|BasicTextFieldUI|BasicTextPaneUI|BasicTextUI|BasicToggleButtonUI|BasicToolBarSeparatorUI|BasicToolBarUI|BasicToolTipUI|BasicTreeUI|BasicViewportUI|BatchUpdateException|BeanContext|BeanContextChild|BeanContextChildComponentProxy|BeanContextChildSupport|BeanContextContainerProxy|BeanContextEvent|BeanContextMembershipEvent|BeanContextMembershipListener|BeanContextProxy|BeanContextServiceAvailableEvent|BeanContextServiceProvider|BeanContextServiceProviderBeanInfo|BeanContextServiceRevokedEvent|BeanContextServiceRevokedListener|BeanContextServices|BeanContextServicesListener|BeanContextServicesSupport|BeanContextSupport|BeanDescriptor|BeanInfo|Beans|BevelBorder|Bidi|BigDecimal|BigInteger|BinaryRefAddr|BindException|Binding|BindingHelper|BindingHolder|BindingIterator|BindingIteratorHelper|BindingIteratorHolder|BindingIteratorOperations|BindingIteratorPOA|BindingListHelper|BindingListHolder|BindingType|BindingTypeHelper|BindingTypeHolder|BitSet|Blob|BlockView|Book|Boolean|BooleanControl|BooleanHolder|BooleanSeqHelper|BooleanSeqHolder|Border|BorderFactory|BorderLayout|BorderUIResource|BoundedRangeModel|Bounds|Box|BoxedValueHelper|BoxLayout|BoxView|BreakIterator|Buffer|BufferCapabilities|BufferedImage|BufferedImageFilter|BufferedImageOp|BufferedInputStream|BufferedOutputStream|BufferedReader|BufferedWriter|BufferOverflowException|BufferStrategy|BufferUnderflowException|Button|ButtonGroup|ButtonModel|ButtonUI|Byte|ByteArrayInputStream|ByteArrayOutputStream|ByteBuffer|ByteChannel|ByteHolder|ByteLookupTable|ByteOrder|Calendar|CallableStatement|Callback|CallbackHandler|CancelablePrintJob|CancelledKeyException|CannotProceed|CannotProceedException|CannotProceedHelper|CannotProceedHolder|CannotRedoException|CannotUndoException|Canvas|CardLayout|Caret|CaretEvent|CaretListener|CDATASection|CellEditor|CellEditorListener|CellRendererPane|Certificate|CertificateEncodingException|CertificateException|CertificateExpiredException|CertificateFactory|CertificateFactorySpi|CertificateNotYetValidException|CertificateParsingException|CertPath|CertPathBuilder|CertPathBuilderException|CertPathBuilderResult|CertPathBuilderSpi|CertPathParameters|CertPathValidator|CertPathValidatorException|CertPathValidatorResult|CertPathValidatorSpi|CertSelector|CertStore|CertStoreException|CertStoreParameters|CertStoreSpi|ChangedCharSetException|ChangeEvent|ChangeListener|Channel|ChannelBinding|Channels|Character|CharacterCodingException|CharacterData|CharacterIterator|CharArrayReader|CharArrayWriter|CharBuffer|CharConversionException|CharHolder|CharSeqHelper|CharSeqHolder|CharSequence|Charset|CharsetDecoder|CharsetEncoder|CharsetProvider|Checkbox|CheckboxGroup|CheckboxMenuItem|CheckedInputStream|CheckedOutputStream|Checksum|Choice|ChoiceCallback|ChoiceFormat|Chromaticity|Cipher|CipherInputStream|CipherOutputStream|CipherSpi|Class|ClassCastException|ClassCircularityError|ClassDesc|ClassFormatError|ClassLoader|ClassNotFoundException|ClientRequestInfo|ClientRequestInfoOperations|ClientRequestInterceptor|ClientRequestInterceptorOperations|Clip|Clipboard|ClipboardOwner|Clob|Cloneable|CloneNotSupportedException|ClosedByInterruptException|ClosedChannelException|ClosedSelectorException|CMMException|Codec|CodecFactory|CodecFactoryHelper|CodecFactoryOperations|CodecOperations|CoderMalfunctionError|CoderResult|CodeSets|CodeSource|CodingErrorAction|CollationElementIterator|CollationKey|Collator|Collection|CollectionCertStoreParameters|Collections|Color|ColorChooserComponentFactory|ColorChooserUI|ColorConvertOp|ColorModel|ColorSelectionModel|ColorSpace|ColorSupported|ColorUIResource|ComboBoxEditor|ComboBoxModel|ComboBoxUI|ComboPopup|COMM_FAILURE|Comment|CommunicationException|Comparable|Comparator|Compiler|CompletionStatus|CompletionStatusHelper|Component|ComponentAdapter|ComponentColorModel|ComponentEvent|ComponentIdHelper|ComponentInputMap|ComponentInputMapUIResource|ComponentListener|ComponentOrientation|ComponentSampleModel|ComponentUI|ComponentView|Composite|CompositeContext|CompositeName|CompositeView|CompoundBorder|CompoundControl|CompoundEdit|CompoundName|Compression|ConcurrentModificationException|Configuration|ConfigurationException|ConfirmationCallback|ConnectException|ConnectIOException|Connection|ConnectionEvent|ConnectionEventListener|ConnectionPendingException|ConnectionPoolDataSource|ConsoleHandler|Constructor|Container|ContainerAdapter|ContainerEvent|ContainerListener|ContainerOrderFocusTraversalPolicy|ContentHandler|ContentHandlerFactory|ContentModel|Context|ContextList|ContextNotEmptyException|ContextualRenderedImageFactory|Control|ControlFactory|ControllerEventListener|ConvolveOp|CookieHolder|Copies|CopiesSupported|CRC32|CredentialExpiredException|CRL|CRLException|CRLSelector|CropImageFilter|CSS|CTX_RESTRICT_SCOPE|CubicCurve2D|Currency|Current|CurrentHelper|CurrentHolder|CurrentOperations|Cursor|Customizer|CustomMarshal|CustomValue|DATA_CONVERSION|DatabaseMetaData|DataBuffer|DataBufferByte|DataBufferDouble|DataBufferFloat|DataBufferInt|DataBufferShort|DataBufferUShort|DataFlavor|DataFormatException|DatagramChannel|DatagramPacket|DatagramSocket|DatagramSocketImpl|DatagramSocketImplFactory|DataInput|DataInputStream|DataLine|DataOutput|DataOutputStream|DataSource|DataTruncation|Date|DateFormat|DateFormatSymbols|DateFormatter|DateTimeAtCompleted|DateTimeAtCreation|DateTimeAtProcessing|DateTimeSyntax|DebugGraphics|DecimalFormat|DecimalFormatSymbols|DeclHandler|DefaultBoundedRangeModel|DefaultButtonModel|DefaultCaret|DefaultCellEditor|DefaultColorSelectionModel|DefaultComboBoxModel|DefaultDesktopManager|DefaultEditorKit|DefaultFocusManager|DefaultFocusTraversalPolicy|DefaultFormatter|DefaultFormatterFactory|DefaultHandler|DefaultHighlighter|DefaultKeyboardFocusManager|DefaultListCellRenderer|DefaultListModel|DefaultListSelectionModel|DefaultMenuLayout|DefaultMetalTheme|DefaultMutableTreeNode|DefaultPersistenceDelegate|DefaultSingleSelectionModel|DefaultStyledDocument|DefaultTableCellRenderer|DefaultTableColumnModel|DefaultTableModel|DefaultTextUI|DefaultTreeCellEditor|DefaultTreeCellRenderer|DefaultTreeModel|DefaultTreeSelectionModel|DefinitionKind|DefinitionKindHelper|Deflater|DeflaterOutputStream|Delegate|DelegationPermission|DESedeKeySpec|DesignMode|DESKeySpec|DesktopIconUI|DesktopManager|DesktopPaneUI|Destination|Destroyable|DestroyFailedException|DGC|DHGenParameterSpec|DHKey|DHParameterSpec|DHPrivateKey|DHPrivateKeySpec|DHPublicKey|DHPublicKeySpec|Dialog|Dictionary|DigestException|DigestInputStream|DigestOutputStream|Dimension|Dimension2D|DimensionUIResource|DirContext|DirectColorModel|DirectoryManager|DirObjectFactory|DirStateFactory|DisplayMode|DnDConstants|Doc|DocAttribute|DocAttributeSet|DocFlavor|DocPrintJob|Document|DocumentBuilder|DocumentBuilderFactory|DocumentEvent|DocumentFilter|DocumentFragment|DocumentHandler|DocumentListener|DocumentName|DocumentParser|DocumentType|DomainCombiner|DomainManager|DomainManagerOperations|DOMException|DOMImplementation|DOMLocator|DOMResult|DOMSource|Double|DoubleBuffer|DoubleHolder|DoubleSeqHelper|DoubleSeqHolder|DragGestureEvent|DragGestureListener|DragGestureRecognizer|DragSource|DragSourceAdapter|DragSourceContext|DragSourceDragEvent|DragSourceDropEvent|DragSourceEvent|DragSourceListener|DragSourceMotionListener|Driver|DriverManager|DriverPropertyInfo|DropTarget|DropTargetAdapter|DropTargetContext|DropTargetDragEvent|DropTargetDropEvent|DropTargetEvent|DropTargetListener|DSAKey|DSAKeyPairGenerator|DSAParameterSpec|DSAParams|DSAPrivateKey|DSAPrivateKeySpec|DSAPublicKey|DSAPublicKeySpec|DTD|DTDConstants|DTDHandler|DuplicateName|DuplicateNameHelper|DynamicImplementation|DynAny|DynAnyFactory|DynAnyFactoryHelper|DynAnyFactoryOperations|DynAnyHelper|DynAnyOperations|DynAnySeqHelper|DynArray|DynArrayHelper|DynArrayOperations|DynEnum|DynEnumHelper|DynEnumOperations|DynFixed|DynFixedHelper|DynFixedOperations|DynSequence|DynSequenceHelper|DynSequenceOperations|DynStruct|DynStructHelper|DynStructOperations|DynUnion|DynUnionHelper|DynUnionOperations|DynValue|DynValueBox|DynValueBoxOperations|DynValueCommon|DynValueCommonOperations|DynValueHelper|DynValueOperations|EditorKit|Element|ElementIterator|Ellipse2D|EmptyBorder|EmptyStackException|EncodedKeySpec|Encoder|Encoding|ENCODING_CDR_ENCAPS|EncryptedPrivateKeyInfo|Entity|EntityReference|EntityResolver|EnumControl|Enumeration|EnumSyntax|Environment|EOFException|Error|ErrorHandler|ErrorListener|ErrorManager|EtchedBorder|Event|EventContext|EventDirContext|EventHandler|EventListener|EventListenerList|EventListenerProxy|EventObject|EventQueue|EventSetDescriptor|Exception|ExceptionInInitializerError|ExceptionList|ExceptionListener|ExemptionMechanism|ExemptionMechanismException|ExemptionMechanismSpi|ExpandVetoException|ExportException|Expression|ExtendedRequest|ExtendedResponse|Externalizable|FactoryConfigurationError|FailedLoginException|FeatureDescriptor|Fidelity|Field|FieldNameHelper|FieldPosition|FieldView|File|FileCacheImageInputStream|FileCacheImageOutputStream|FileChannel|FileChooserUI|FileDescriptor|FileDialog|FileFilter|FileHandler|FileImageInputStream|FileImageOutputStream|FileInputStream|FileLock|FileLockInterruptionException|FilenameFilter|FileNameMap|FileNotFoundException|FileOutputStream|FilePermission|FileReader|FileSystemView|FileView|FileWriter|Filter|FilteredImageSource|FilterInputStream|FilterOutputStream|FilterReader|FilterWriter|Finishings|FixedHeightLayoutCache|FixedHolder|FlatteningPathIterator|FlavorException|FlavorMap|FlavorTable|Float|FloatBuffer|FloatControl|FloatHolder|FloatSeqHelper|FloatSeqHolder|FlowLayout|FlowView|FocusAdapter|FocusEvent|FocusListener|FocusManager|FocusTraversalPolicy|Font|FontFormatException|FontMetrics|FontRenderContext|FontUIResource|Format|FormatConversionProvider|FormatMismatch|FormatMismatchHelper|Formatter|FormView|ForwardRequest|ForwardRequestHelper|Frame|FREE_MEM|GapContent|GatheringByteChannel|GeneralPath|GeneralSecurityException|GlyphJustificationInfo|GlyphMetrics|GlyphVector|GlyphView|GradientPaint|GraphicAttribute|Graphics|Graphics2D|GraphicsConfigTemplate|GraphicsConfiguration|GraphicsDevice|GraphicsEnvironment|GrayFilter|GregorianCalendar|GridBagConstraints|GridBagLayout|GridLayout|Group|GSSContext|GSSCredential|GSSException|GSSManager|GSSName|Guard|GuardedObject|GZIPInputStream|GZIPOutputStream|Handler|HandlerBase|HandshakeCompletedEvent|HandshakeCompletedListener|HasControls|HashAttributeSet|HashDocAttributeSet|HashMap|HashPrintJobAttributeSet|HashPrintRequestAttributeSet|HashPrintServiceAttributeSet|HashSet|Hashtable|HeadlessException|HierarchyBoundsAdapter|HierarchyBoundsListener|HierarchyEvent|HierarchyListener|Highlighter|HostnameVerifier|HTML|HTMLDocument|HTMLEditorKit|HTMLFrameHyperlinkEvent|HTMLWriter|HttpsURLConnection|HttpURLConnection|HyperlinkEvent|HyperlinkListener|ICC_ColorSpace|ICC_Profile|ICC_ProfileGray|ICC_ProfileRGB|Icon|IconUIResource|IconView|ID_ASSIGNMENT_POLICY_ID|ID_UNIQUENESS_POLICY_ID|IdAssignmentPolicy|IdAssignmentPolicyOperations|IdAssignmentPolicyValue|IdentifierHelper|Identity|IdentityHashMap|IdentityScope|IDLEntity|IDLType|IDLTypeHelper|IDLTypeOperations|IdUniquenessPolicy|IdUniquenessPolicyOperations|IdUniquenessPolicyValue|IIOByteBuffer|IIOException|IIOImage|IIOInvalidTreeException|IIOMetadata|IIOMetadataController|IIOMetadataFormat|IIOMetadataFormatImpl|IIOMetadataNode|IIOParam|IIOParamController|IIOReadProgressListener|IIOReadUpdateListener|IIOReadWarningListener|IIORegistry|IIOServiceProvider|IIOWriteProgressListener|IIOWriteWarningListener|IllegalAccessError|IllegalAccessException|IllegalArgumentException|IllegalBlockingModeException|IllegalBlockSizeException|IllegalCharsetNameException|IllegalComponentStateException|IllegalMonitorStateException|IllegalPathStateException|IllegalSelectorException|IllegalStateException|IllegalThreadStateException|Image|ImageCapabilities|ImageConsumer|ImageFilter|ImageGraphicAttribute|ImageIcon|ImageInputStream|ImageInputStreamImpl|ImageInputStreamSpi|ImageIO|ImageObserver|ImageOutputStream|ImageOutputStreamImpl|ImageOutputStreamSpi|ImageProducer|ImageReader|ImageReaderSpi|ImageReaderWriterSpi|ImageReadParam|ImageTranscoder|ImageTranscoderSpi|ImageTypeSpecifier|ImageView|ImageWriteParam|ImageWriter|ImageWriterSpi|ImagingOpException|IMP_LIMIT|IMPLICIT_ACTIVATION_POLICY_ID|ImplicitActivationPolicy|ImplicitActivationPolicyOperations|ImplicitActivationPolicyValue|IncompatibleClassChangeError|InconsistentTypeCode|InconsistentTypeCodeHelper|IndexColorModel|IndexedPropertyDescriptor|IndexOutOfBoundsException|IndirectionException|Inet4Address|Inet6Address|InetAddress|InetSocketAddress|Inflater|InflaterInputStream|InheritableThreadLocal|InitialContext|InitialContextFactory|InitialContextFactoryBuilder|InitialDirContext|INITIALIZE|InitialLdapContext|InlineView|InputContext|InputEvent|InputMap|InputMapUIResource|InputMethod|InputMethodContext|InputMethodDescriptor|InputMethodEvent|InputMethodHighlight|InputMethodListener|InputMethodRequests|InputSource|InputStream|InputStreamReader|InputSubset|InputVerifier|Insets|InsetsUIResource|InstantiationError|InstantiationException|Instrument|InsufficientResourcesException|IntBuffer|Integer|IntegerSyntax|Interceptor|InterceptorOperations|INTERNAL|InternalError|InternalFrameAdapter|InternalFrameEvent|InternalFrameFocusTraversalPolicy|InternalFrameListener|InternalFrameUI|InternationalFormatter|InterruptedException|InterruptedIOException|InterruptedNamingException|InterruptibleChannel|INTF_REPOS|IntHolder|IntrospectionException|Introspector|INV_FLAG|INV_IDENT|INV_OBJREF|INV_POLICY|Invalid|INVALID_TRANSACTION|InvalidAddress|InvalidAddressHelper|InvalidAddressHolder|InvalidAlgorithmParameterException|InvalidAttributeIdentifierException|InvalidAttributesException|InvalidAttributeValueException|InvalidClassException|InvalidDnDOperationException|InvalidKeyException|InvalidKeySpecException|InvalidMarkException|InvalidMidiDataException|InvalidName|InvalidNameException|InvalidNameHelper|InvalidNameHolder|InvalidObjectException|InvalidParameterException|InvalidParameterSpecException|InvalidPolicy|InvalidPolicyHelper|InvalidPreferencesFormatException|InvalidSearchControlsException|InvalidSearchFilterException|InvalidSeq|InvalidSlot|InvalidSlotHelper|InvalidTransactionException|InvalidTypeForEncoding|InvalidTypeForEncodingHelper|InvalidValue|InvalidValueHelper|InvocationEvent|InvocationHandler|InvocationTargetException|InvokeHandler|IOException|IOR|IORHelper|IORHolder|IORInfo|IORInfoOperations|IORInterceptor|IORInterceptorOperations|IRObject|IRObjectOperations|IstringHelper|ItemEvent|ItemListener|ItemSelectable|Iterator|IvParameterSpec|JApplet|JarEntry|JarException|JarFile|JarInputStream|JarOutputStream|JarURLConnection|JButton|JCheckBox|JCheckBoxMenuItem|JColorChooser|JComboBox|JComponent|JDesktopPane|JDialog|JEditorPane|JFileChooser|JFormattedTextField|JFrame|JInternalFrame|JLabel|JLayeredPane|JList|JMenu|JMenuBar|JMenuItem|JobAttributes|JobHoldUntil|JobImpressions|JobImpressionsCompleted|JobImpressionsSupported|JobKOctets|JobKOctetsProcessed|JobKOctetsSupported|JobMediaSheets|JobMediaSheetsCompleted|JobMediaSheetsSupported|JobMessageFromOperator|JobName|JobOriginatingUserName|JobPriority|JobPrioritySupported|JobSheets|JobState|JobStateReason|JobStateReasons|JOptionPane|JPanel|JPasswordField|JPEGHuffmanTable|JPEGImageReadParam|JPEGImageWriteParam|JPEGQTable|JPopupMenu|JProgressBar|JRadioButton|JRadioButtonMenuItem|JRootPane|JScrollBar|JScrollPane|JSeparator|JSlider|JSpinner|JSplitPane|JTabbedPane|JTable|JTableHeader|JTextArea|JTextComponent|JTextField|JTextPane|JToggleButton|JToolBar|JToolTip|JTree|JViewport|JWindow|KerberosKey|KerberosPrincipal|KerberosTicket|Kernel|Key|KeyAdapter|KeyAgreement|KeyAgreementSpi|KeyboardFocusManager|KeyEvent|KeyEventDispatcher|KeyEventPostProcessor|KeyException|KeyFactory|KeyFactorySpi|KeyGenerator|KeyGeneratorSpi|KeyListener|KeyManagementException|KeyManager|KeyManagerFactory|KeyManagerFactorySpi|Keymap|KeyPair|KeyPairGenerator|KeyPairGeneratorSpi|KeySpec|KeyStore|KeyStoreException|KeyStoreSpi|KeyStroke|Label|LabelUI|LabelView|LanguageCallback|LastOwnerException|LayeredHighlighter|LayoutFocusTraversalPolicy|LayoutManager|LayoutManager2|LayoutQueue|LDAPCertStoreParameters|LdapContext|LdapReferralException|Lease|Level|LexicalHandler|LIFESPAN_POLICY_ID|LifespanPolicy|LifespanPolicyOperations|LifespanPolicyValue|LimitExceededException|Line|Line2D|LineBorder|LineBreakMeasurer|LineEvent|LineListener|LineMetrics|LineNumberInputStream|LineNumberReader|LineUnavailableException|LinkageError|LinkedHashMap|LinkedHashSet|LinkedList|LinkException|LinkLoopException|LinkRef|List|ListCellRenderer|ListDataEvent|ListDataListener|ListIterator|ListModel|ListResourceBundle|ListSelectionEvent|ListSelectionListener|ListSelectionModel|ListUI|ListView|LoaderHandler|Locale|LocalObject|LocateRegistry|LOCATION_FORWARD|Locator|LocatorImpl|Logger|LoggingPermission|LoginContext|LoginException|LoginModule|LogManager|LogRecord|LogStream|Long|LongBuffer|LongHolder|LongLongSeqHelper|LongLongSeqHolder|LongSeqHelper|LongSeqHolder|LookAndFeel|LookupOp|LookupTable|Mac|MacSpi|MalformedInputException|MalformedLinkException|MalformedURLException|ManagerFactoryParameters|Manifest|Map|MappedByteBuffer|MARSHAL|MarshalException|MarshalledObject|MaskFormatter|Matcher|Math|MatteBorder|Media|MediaName|MediaPrintableArea|MediaSize|MediaSizeName|MediaTracker|MediaTray|Member|MemoryCacheImageInputStream|MemoryCacheImageOutputStream|MemoryHandler|MemoryImageSource|Menu|MenuBar|MenuBarUI|MenuComponent|MenuContainer|MenuDragMouseEvent|MenuDragMouseListener|MenuElement|MenuEvent|MenuItem|MenuItemUI|MenuKeyEvent|MenuKeyListener|MenuListener|MenuSelectionManager|MenuShortcut|MessageDigest|MessageDigestSpi|MessageFormat|MessageProp|MetaEventListener|MetalBorders|MetalButtonUI|MetalCheckBoxIcon|MetalCheckBoxUI|MetalComboBoxButton|MetalComboBoxEditor|MetalComboBoxIcon|MetalComboBoxUI|MetalDesktopIconUI|MetalFileChooserUI|MetalIconFactory|MetalInternalFrameTitlePane|MetalInternalFrameUI|MetalLabelUI|MetalLookAndFeel|MetalPopupMenuSeparatorUI|MetalProgressBarUI|MetalRadioButtonUI|MetalRootPaneUI|MetalScrollBarUI|MetalScrollButton|MetalScrollPaneUI|MetalSeparatorUI|MetalSliderUI|MetalSplitPaneUI|MetalTabbedPaneUI|MetalTextFieldUI|MetalTheme|MetalToggleButtonUI|MetalToolBarUI|MetalToolTipUI|MetalTreeUI|MetaMessage|Method|MethodDescriptor|MidiChannel|MidiDevice|MidiDeviceProvider|MidiEvent|MidiFileFormat|MidiFileReader|MidiFileWriter|MidiMessage|MidiSystem|MidiUnavailableException|MimeTypeParseException|MinimalHTMLWriter|MissingResourceException|Mixer|MixerProvider|ModificationItem|Modifier|MouseAdapter|MouseDragGestureRecognizer|MouseEvent|MouseInputAdapter|MouseInputListener|MouseListener|MouseMotionAdapter|MouseMotionListener|MouseWheelEvent|MouseWheelListener|MultiButtonUI|MulticastSocket|MultiColorChooserUI|MultiComboBoxUI|MultiDesktopIconUI|MultiDesktopPaneUI|MultiDoc|MultiDocPrintJob|MultiDocPrintService|MultiFileChooserUI|MultiInternalFrameUI|MultiLabelUI|MultiListUI|MultiLookAndFeel|MultiMenuBarUI|MultiMenuItemUI|MultiOptionPaneUI|MultiPanelUI|MultiPixelPackedSampleModel|MultipleComponentProfileHelper|MultipleComponentProfileHolder|MultipleDocumentHandling|MultipleMaster|MultiPopupMenuUI|MultiProgressBarUI|MultiRootPaneUI|MultiScrollBarUI|MultiScrollPaneUI|MultiSeparatorUI|MultiSliderUI|MultiSpinnerUI|MultiSplitPaneUI|MultiTabbedPaneUI|MultiTableHeaderUI|MultiTableUI|MultiTextUI|MultiToolBarUI|MultiToolTipUI|MultiTreeUI|MultiViewportUI|MutableAttributeSet|MutableComboBoxModel|MutableTreeNode|Name|NameAlreadyBoundException|NameCallback|NameClassPair|NameComponent|NameComponentHelper|NameComponentHolder|NamedNodeMap|NamedValue|NameDynAnyPair|NameDynAnyPairHelper|NameDynAnyPairSeqHelper|NameHelper|NameHolder|NameNotFoundException|NameParser|NamespaceChangeListener|NamespaceSupport|NameValuePair|NameValuePairHelper|NameValuePairSeqHelper|Naming|NamingContext|NamingContextExt|NamingContextExtHelper|NamingContextExtHolder|NamingContextExtOperations|NamingContextExtPOA|NamingContextHelper|NamingContextHolder|NamingContextOperations|NamingContextPOA|NamingEnumeration|NamingEvent|NamingException|NamingExceptionEvent|NamingListener|NamingManager|NamingSecurityException|NavigationFilter|NegativeArraySizeException|NetPermission|NetworkInterface|NO_IMPLEMENT|NO_MEMORY|NO_PERMISSION|NO_RESOURCES|NO_RESPONSE|NoClassDefFoundError|NoConnectionPendingException|NoContext|NoContextHelper|Node|NodeChangeEvent|NodeChangeListener|NodeList|NoInitialContextException|NoninvertibleTransformException|NonReadableChannelException|NonWritableChannelException|NoPermissionException|NoRouteToHostException|NoServant|NoServantHelper|NoSuchAlgorithmException|NoSuchAttributeException|NoSuchElementException|NoSuchFieldError|NoSuchFieldException|NoSuchMethodError|NoSuchMethodException|NoSuchObjectException|NoSuchPaddingException|NoSuchProviderException|NotActiveException|Notation|NotBoundException|NotContextException|NotEmpty|NotEmptyHelper|NotEmptyHolder|NotFound|NotFoundHelper|NotFoundHolder|NotFoundReason|NotFoundReasonHelper|NotFoundReasonHolder|NotOwnerException|NotSerializableException|NotYetBoundException|NotYetConnectedException|NullCipher|NullPointerException|Number|NumberFormat|NumberFormatException|NumberFormatter|NumberOfDocuments|NumberOfInterveningJobs|NumberUp|NumberUpSupported|NumericShaper|NVList|OBJ_ADAPTER|Object|OBJECT_NOT_EXIST|ObjectAlreadyActive|ObjectAlreadyActiveHelper|ObjectChangeListener|ObjectFactory|ObjectFactoryBuilder|ObjectHelper|ObjectHolder|ObjectIdHelper|ObjectImpl|ObjectInput|ObjectInputStream|ObjectInputValidation|ObjectNotActive|ObjectNotActiveHelper|ObjectOutput|ObjectOutputStream|ObjectStreamClass|ObjectStreamConstants|ObjectStreamException|ObjectStreamField|ObjectView|ObjID|Observable|Observer|OctetSeqHelper|OctetSeqHolder|Oid|OMGVMCID|OpenType|Operation|OperationNotSupportedException|Option|OptionalDataException|OptionPaneUI|ORB|ORBInitializer|ORBInitializerOperations|ORBInitInfo|ORBInitInfoOperations|OrientationRequested|OutOfMemoryError|OutputDeviceAssigned|OutputKeys|OutputStream|OutputStreamWriter|OverlappingFileLockException|OverlayLayout|Owner|Package|PackedColorModel|Pageable|PageAttributes|PageFormat|PageRanges|PagesPerMinute|PagesPerMinuteColor|Paint|PaintContext|PaintEvent|Panel|PanelUI|Paper|ParagraphView|Parameter|ParameterBlock|ParameterDescriptor|ParameterMetaData|ParameterMode|ParameterModeHelper|ParameterModeHolder|ParseException|ParsePosition|Parser|ParserAdapter|ParserConfigurationException|ParserDelegator|ParserFactory|PartialResultException|PasswordAuthentication|PasswordCallback|PasswordView|Patch|PathIterator|Pattern|PatternSyntaxException|PBEKey|PBEKeySpec|PBEParameterSpec|PDLOverrideSupported|Permission|PermissionCollection|Permissions|PERSIST_STORE|PersistenceDelegate|PhantomReference|Pipe|PipedInputStream|PipedOutputStream|PipedReader|PipedWriter|PixelGrabber|PixelInterleavedSampleModel|PKCS8EncodedKeySpec|PKIXBuilderParameters|PKIXCertPathBuilderResult|PKIXCertPathChecker|PKIXCertPathValidatorResult|PKIXParameters|PlainDocument|PlainView|POA|POAHelper|POAManager|POAManagerOperations|POAOperations|Point|Point2D|Policy|PolicyError|PolicyErrorCodeHelper|PolicyErrorHelper|PolicyErrorHolder|PolicyFactory|PolicyFactoryOperations|PolicyHelper|PolicyHolder|PolicyListHelper|PolicyListHolder|PolicyNode|PolicyOperations|PolicyQualifierInfo|PolicyTypeHelper|Polygon|PooledConnection|Popup|PopupFactory|PopupMenu|PopupMenuEvent|PopupMenuListener|PopupMenuUI|Port|PortableRemoteObject|PortableRemoteObjectDelegate|PortUnreachableException|Position|PreferenceChangeEvent|PreferenceChangeListener|Preferences|PreferencesFactory|PreparedStatement|PresentationDirection|Principal|PrincipalHolder|Printable|PrinterAbortException|PrinterException|PrinterGraphics|PrinterInfo|PrinterIOException|PrinterIsAcceptingJobs|PrinterJob|PrinterLocation|PrinterMakeAndModel|PrinterMessageFromOperator|PrinterMoreInfo|PrinterMoreInfoManufacturer|PrinterName|PrinterResolution|PrinterState|PrinterStateReason|PrinterStateReasons|PrinterURI|PrintEvent|PrintException|PrintGraphics|PrintJob|PrintJobAdapter|PrintJobAttribute|PrintJobAttributeEvent|PrintJobAttributeListener|PrintJobAttributeSet|PrintJobEvent|PrintJobListener|PrintQuality|PrintRequestAttribute|PrintRequestAttributeSet|PrintService|PrintServiceAttribute|PrintServiceAttributeEvent|PrintServiceAttributeListener|PrintServiceAttributeSet|PrintServiceLookup|PrintStream|PrintWriter|PRIVATE_MEMBER|PrivateCredentialPermission|PrivateKey|PrivilegedAction|PrivilegedActionException|PrivilegedExceptionAction|Process|ProcessingInstruction|ProfileDataException|ProfileIdHelper|ProgressBarUI|ProgressMonitor|ProgressMonitorInputStream|Properties|PropertyChangeEvent|PropertyChangeListener|PropertyChangeListenerProxy|PropertyChangeSupport|PropertyDescriptor|PropertyEditor|PropertyEditorManager|PropertyEditorSupport|PropertyPermission|PropertyResourceBundle|PropertyVetoException|ProtectionDomain|ProtocolException|Provider|ProviderException|Proxy|PSSParameterSpec|PUBLIC_MEMBER|PublicKey|PushbackInputStream|PushbackReader|QuadCurve2D|QueuedJobCount|Random|RandomAccess|RandomAccessFile|Raster|RasterFormatException|RasterOp|RC2ParameterSpec|RC5ParameterSpec|ReadableByteChannel|Reader|ReadOnlyBufferException|Receiver|Rectangle|Rectangle2D|RectangularShape|Ref|RefAddr|Reference|Referenceable|ReferenceQueue|ReferenceUriSchemesSupported|ReferralException|ReflectPermission|Refreshable|RefreshFailedException|RegisterableService|Registry|RegistryHandler|RemarshalException|Remote|RemoteCall|RemoteException|RemoteObject|RemoteRef|RemoteServer|RemoteStub|RenderableImage|RenderableImageOp|RenderableImageProducer|RenderContext|RenderedImage|RenderedImageFactory|Renderer|RenderingHints|RepaintManager|ReplicateScaleFilter|RepositoryIdHelper|Request|REQUEST_PROCESSING_POLICY_ID|RequestInfo|RequestInfoOperations|RequestingUserName|RequestProcessingPolicy|RequestProcessingPolicyOperations|RequestProcessingPolicyValue|RescaleOp|ResolutionSyntax|Resolver|ResolveResult|ResourceBundle|ResponseHandler|Result|ResultSet|ResultSetMetaData|ReverbType|RGBImageFilter|RMIClassLoader|RMIClassLoaderSpi|RMIClientSocketFactory|RMIFailureHandler|RMISecurityException|RMISecurityManager|RMIServerSocketFactory|RMISocketFactory|Robot|RootPaneContainer|RootPaneUI|RoundRectangle2D|RowMapper|RowSet|RowSetEvent|RowSetInternal|RowSetListener|RowSetMetaData|RowSetReader|RowSetWriter|RSAKey|RSAKeyGenParameterSpec|RSAMultiPrimePrivateCrtKey|RSAMultiPrimePrivateCrtKeySpec|RSAOtherPrimeInfo|RSAPrivateCrtKey|RSAPrivateCrtKeySpec|RSAPrivateKey|RSAPrivateKeySpec|RSAPublicKey|RSAPublicKeySpec|RTFEditorKit|RuleBasedCollator|Runnable|Runtime|RunTime|RuntimeException|RunTimeOperations|RuntimePermission|SampleModel|Savepoint|SAXException|SAXNotRecognizedException|SAXNotSupportedException|SAXParseException|SAXParser|SAXParserFactory|SAXResult|SAXSource|SAXTransformerFactory|ScatteringByteChannel|SchemaViolationException|Scrollable|Scrollbar|ScrollBarUI|ScrollPane|ScrollPaneAdjustable|ScrollPaneConstants|ScrollPaneLayout|ScrollPaneUI|SealedObject|SearchControls|SearchResult|SecretKey|SecretKeyFactory|SecretKeyFactorySpi|SecretKeySpec|SecureClassLoader|SecureRandom|SecureRandomSpi|Security|SecurityException|SecurityManager|SecurityPermission|Segment|SelectableChannel|SelectionKey|Selector|SelectorProvider|SeparatorUI|Sequence|SequenceInputStream|Sequencer|Serializable|SerializablePermission|Servant|SERVANT_RETENTION_POLICY_ID|ServantActivator|ServantActivatorHelper|ServantActivatorOperations|ServantActivatorPOA|ServantAlreadyActive|ServantAlreadyActiveHelper|ServantLocator|ServantLocatorHelper|ServantLocatorOperations|ServantLocatorPOA|ServantManager|ServantManagerOperations|ServantNotActive|ServantNotActiveHelper|ServantObject|ServantRetentionPolicy|ServantRetentionPolicyOperations|ServantRetentionPolicyValue|ServerCloneException|ServerError|ServerException|ServerNotActiveException|ServerRef|ServerRequest|ServerRequestInfo|ServerRequestInfoOperations|ServerRequestInterceptor|ServerRequestInterceptorOperations|ServerRuntimeException|ServerSocket|ServerSocketChannel|ServerSocketFactory|ServiceContext|ServiceContextHelper|ServiceContextHolder|ServiceContextListHelper|ServiceContextListHolder|ServiceDetail|ServiceDetailHelper|ServiceIdHelper|ServiceInformation|ServiceInformationHelper|ServiceInformationHolder|ServicePermission|ServiceRegistry|ServiceUI|ServiceUIFactory|ServiceUnavailableException|Set|SetOfIntegerSyntax|SetOverrideType|SetOverrideTypeHelper|Severity|Shape|ShapeGraphicAttribute|SheetCollate|Short|ShortBuffer|ShortBufferException|ShortHolder|ShortLookupTable|ShortMessage|ShortSeqHelper|ShortSeqHolder|Sides|Signature|SignatureException|SignatureSpi|SignedObject|Signer|SimpleAttributeSet|SimpleBeanInfo|SimpleDateFormat|SimpleDoc|SimpleFormatter|SimpleTimeZone|SinglePixelPackedSampleModel|SingleSelectionModel|Size2DSyntax|SizeLimitExceededException|SizeRequirements|SizeSequence|Skeleton|SkeletonMismatchException|SkeletonNotFoundException|SliderUI|Socket|SocketAddress|SocketChannel|SocketException|SocketFactory|SocketHandler|SocketImpl|SocketImplFactory|SocketOptions|SocketPermission|SocketSecurityException|SocketTimeoutException|SoftBevelBorder|SoftReference|SortedMap|SortedSet|SortingFocusTraversalPolicy|Soundbank|SoundbankReader|SoundbankResource|Source|SourceDataLine|SourceLocator|SpinnerDateModel|SpinnerListModel|SpinnerModel|SpinnerNumberModel|SpinnerUI|SplitPaneUI|Spring|SpringLayout|SQLData|SQLException|SQLInput|SQLOutput|SQLPermission|SQLWarning|SSLContext|SSLContextSpi|SSLException|SSLHandshakeException|SSLKeyException|SSLPeerUnverifiedException|SSLPermission|SSLProtocolException|SSLServerSocket|SSLServerSocketFactory|SSLSession|SSLSessionBindingEvent|SSLSessionBindingListener|SSLSessionContext|SSLSocket|SSLSocketFactory|Stack|StackOverflowError|StackTraceElement|StartTlsRequest|StartTlsResponse|State|StateEdit|StateEditable|StateFactory|Statement|Streamable|StreamableValue|StreamCorruptedException|StreamHandler|StreamPrintService|StreamPrintServiceFactory|StreamResult|StreamSource|StreamTokenizer|StrictMath|String|StringBuffer|StringBufferInputStream|StringCharacterIterator|StringContent|StringHolder|StringIndexOutOfBoundsException|StringNameHelper|StringReader|StringRefAddr|StringSelection|StringSeqHelper|StringSeqHolder|StringTokenizer|StringValueHelper|StringWriter|Stroke|Struct|StructMember|StructMemberHelper|Stub|StubDelegate|StubNotFoundException|Style|StyleConstants|StyleContext|StyledDocument|StyledEditorKit|StyleSheet|Subject|SubjectDomainCombiner|SUCCESSFUL|SupportedValuesAttribute|SwingConstants|SwingPropertyChangeSupport|SwingUtilities|SYNC_WITH_TRANSPORT|SyncFailedException|SyncScopeHelper|Synthesizer|SysexMessage|System|SYSTEM_EXCEPTION|SystemColor|SystemException|SystemFlavorMap|TabableView|TabbedPaneUI|TabExpander|TableCellEditor|TableCellRenderer|TableColumn|TableColumnModel|TableColumnModelEvent|TableColumnModelListener|TableHeaderUI|TableModel|TableModelEvent|TableModelListener|TableUI|TableView|TabSet|TabStop|TAG_ALTERNATE_IIOP_ADDRESS|TAG_CODE_SETS|TAG_INTERNET_IOP|TAG_JAVA_CODEBASE|TAG_MULTIPLE_COMPONENTS|TAG_ORB_TYPE|TAG_POLICIES|TagElement|TaggedComponent|TaggedComponentHelper|TaggedComponentHolder|TaggedProfile|TaggedProfileHelper|TaggedProfileHolder|TargetDataLine|TCKind|Templates|TemplatesHandler|Text|TextAction|TextArea|TextAttribute|TextComponent|TextEvent|TextField|TextHitInfo|TextInputCallback|TextLayout|TextListener|TextMeasurer|TextOutputCallback|TextSyntax|TextUI|TexturePaint|Thread|THREAD_POLICY_ID|ThreadDeath|ThreadGroup|ThreadLocal|ThreadPolicy|ThreadPolicyOperations|ThreadPolicyValue|Throwable|Tie|TileObserver|Time|TimeLimitExceededException|Timer|TimerTask|Timestamp|TimeZone|TitledBorder|ToolBarUI|Toolkit|ToolTipManager|ToolTipUI|TooManyListenersException|Track|TRANSACTION_REQUIRED|TRANSACTION_ROLLEDBACK|TransactionRequiredException|TransactionRolledbackException|TransactionService|Transferable|TransferHandler|TransformAttribute|Transformer|TransformerConfigurationException|TransformerException|TransformerFactory|TransformerFactoryConfigurationError|TransformerHandler|TRANSIENT|Transmitter|Transparency|TRANSPORT_RETRY|TreeCellEditor|TreeCellRenderer|TreeExpansionEvent|TreeExpansionListener|TreeMap|TreeModel|TreeModelEvent|TreeModelListener|TreeNode|TreePath|TreeSelectionEvent|TreeSelectionListener|TreeSelectionModel|TreeSet|TreeUI|TreeWillExpandListener|TrustAnchor|TrustManager|TrustManagerFactory|TrustManagerFactorySpi|TypeCode|TypeCodeHolder|TypeMismatch|TypeMismatchHelper|Types|UID|UIDefaults|UIManager|UIResource|ULongLongSeqHelper|ULongLongSeqHolder|ULongSeqHelper|ULongSeqHolder|UndeclaredThrowableException|UndoableEdit|UndoableEditEvent|UndoableEditListener|UndoableEditSupport|UndoManager|UnexpectedException|UnicastRemoteObject|UnionMember|UnionMemberHelper|UNKNOWN|UnknownEncoding|UnknownEncodingHelper|UnknownError|UnknownException|UnknownGroupException|UnknownHostException|UnknownObjectException|UnknownServiceException|UnknownUserException|UnknownUserExceptionHelper|UnknownUserExceptionHolder|UnmappableCharacterException|UnmarshalException|UnmodifiableSetException|UnrecoverableKeyException|Unreferenced|UnresolvedAddressException|UnresolvedPermission|UnsatisfiedLinkError|UnsolicitedNotification|UnsolicitedNotificationEvent|UnsolicitedNotificationListener|UNSUPPORTED_POLICY|UNSUPPORTED_POLICY_VALUE|UnsupportedAddressTypeException|UnsupportedAudioFileException|UnsupportedCallbackException|UnsupportedCharsetException|UnsupportedClassVersionError|UnsupportedEncodingException|UnsupportedFlavorException|UnsupportedLookAndFeelException|UnsupportedOperationException|URI|URIException|URIResolver|URISyntax|URISyntaxException|URL|URLClassLoader|URLConnection|URLDecoder|URLEncoder|URLStreamHandler|URLStreamHandlerFactory|URLStringHelper|USER_EXCEPTION|UserException|UShortSeqHelper|UShortSeqHolder|UTFDataFormatException|Util|UtilDelegate|Utilities|ValueBase|ValueBaseHelper|ValueBaseHolder|ValueFactory|ValueHandler|ValueMember|ValueMemberHelper|VariableHeightLayoutCache|Vector|VerifyError|VersionSpecHelper|VetoableChangeListener|VetoableChangeListenerProxy|VetoableChangeSupport|View|ViewFactory|ViewportLayout|ViewportUI|VirtualMachineError|Visibility|VisibilityHelper|VM_ABSTRACT|VM_CUSTOM|VM_NONE|VM_TRUNCATABLE|VMID|VoiceStatus|Void|VolatileImage|WCharSeqHelper|WCharSeqHolder|WeakHashMap|WeakReference|Window|WindowAdapter|WindowConstants|WindowEvent|WindowFocusListener|WindowListener|WindowStateListener|WrappedPlainView|WritableByteChannel|WritableRaster|WritableRenderedImage|WriteAbortedException|Writer|WrongAdapter|WrongAdapterHelper|WrongPolicy|WrongPolicyHelper|WrongTransaction|WrongTransactionHelper|WrongTransactionHolder|WStringSeqHelper|WStringSeqHolder|WStringValueHelper|X500Principal|X500PrivateCredential|X509Certificate|X509CertSelector|X509CRL|X509CRLEntry|X509CRLSelector|X509EncodedKeySpec|X509Extension|X509KeyManager|X509TrustManager|XAConnection|XADataSource|XAException|XAResource|Xid|XMLDecoder|XMLEncoder|XMLFilter|XMLFilterImpl|XMLFormatter|XMLReader|XMLReaderAdapter|XMLReaderFactory|ZipEntry|ZipException|ZipFile|ZipInputStream|ZipOutputStream|ZoneView|_BindingIteratorImplBase|_BindingIteratorStub|_DynAnyFactoryStub|_DynAnyStub|_DynArrayStub|_DynEnumStub|_DynFixedStub|_DynSequenceStub|_DynStructStub|_DynUnionStub|_DynValueStub|_IDLTypeStub|_NamingContextExtStub|_NamingContextImplBase|_NamingContextStub|_PolicyStub|_Remote_Stub|_ServantActivatorStub|_ServantLocatorStub)$/',
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-                4 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            5 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            6 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-                4 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-            ),
-            1 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-            ),
-            5 => 
-            array (
-                0 => NULL,
-            ),
-            6 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-            ),
-            0 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-            ),
-            5 => 
-            array (
-                0 => false,
-            ),
-            6 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-            ),
-        );
-        $this->_conditions = array (
-            'java.builtins' => 
-            array (
-                0 => 
-                array (
-                    0 => 'builtin',
-                    1 => true,
-                ),
-            ),
-        );
-        $this->_kwmap = array (
-            'types' => 'types',
-            'reserved' => 'reserved',
-            'builtin' => 'builtin',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/JAVASCRIPT.php b/library/Text_Highlighter/Text/Highlighter/JAVASCRIPT.php
deleted file mode 100644
index 51eae8f62..000000000
--- a/library/Text_Highlighter/Text/Highlighter/JAVASCRIPT.php
+++ /dev/null
@@ -1,631 +0,0 @@
-<?php
-/**
- * Auto-generated class. JAVASCRIPT syntax highlighting
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: javascript.xml
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. JAVASCRIPT syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_JAVASCRIPT extends Text_Highlighter
-{
-    var $_language = 'javascript';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_JAVASCRIPT($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0x\\d*|\\d*\\.?\\d+)/',
-            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0x\\d*|\\d*\\.?\\d+)/',
-            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0x\\d*|\\d*\\.?\\d+)/',
-            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0x\\d*|\\d*\\.?\\d+)/',
-            3 => '/((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\b(note|fixme):)|((?i)\\$\\w+:.+\\$)/',
-            4 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`|\\\\t|\\\\n|\\\\r)/',
-            5 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            6 => '/((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\b(note|fixme):)|((?i)\\$\\w+:.+\\$)/',
-        );
-        $this->_counts = array (
-            -1 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-            ),
-            0 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-            ),
-            1 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-            ),
-            2 =>
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-            ),
-            3 =>
-            array (
-                0 => 3,
-                1 => 1,
-                2 => 1,
-                3 => 0,
-            ),
-            4 =>
-            array (
-                0 => 0,
-            ),
-            5 =>
-            array (
-                0 => 0,
-            ),
-            6 =>
-            array (
-                0 => 3,
-                1 => 1,
-                2 => 1,
-                3 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 =>
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'comment',
-                7 => '',
-                8 => '',
-            ),
-            0 =>
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'comment',
-                7 => '',
-                8 => '',
-            ),
-            1 =>
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'comment',
-                7 => '',
-                8 => '',
-            ),
-            2 =>
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'comment',
-                7 => '',
-                8 => '',
-            ),
-            3 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-            4 =>
-            array (
-                0 => '',
-            ),
-            5 =>
-            array (
-                0 => '',
-            ),
-            6 =>
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 =>
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'comment',
-                7 => 'identifier',
-                8 => 'number',
-            ),
-            0 =>
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'comment',
-                7 => 'identifier',
-                8 => 'number',
-            ),
-            1 =>
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'comment',
-                7 => 'identifier',
-                8 => 'number',
-            ),
-            2 =>
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'comment',
-                7 => 'identifier',
-                8 => 'number',
-            ),
-            3 =>
-            array (
-                0 => 'url',
-                1 => 'url',
-                2 => 'inlinedoc',
-                3 => 'inlinedoc',
-            ),
-            4 =>
-            array (
-                0 => 'special',
-            ),
-            5 =>
-            array (
-                0 => 'special',
-            ),
-            6 =>
-            array (
-                0 => 'url',
-                1 => 'url',
-                2 => 'inlinedoc',
-                3 => 'inlinedoc',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\}/',
-            1 => '/(?i)\\)/',
-            2 => '/(?i)\\]/',
-            3 => '/(?i)\\*\\//',
-            4 => '/(?i)"/',
-            5 => '/(?i)\'/',
-            6 => '/(?mi)$/',
-        );
-        $this->_states = array (
-            -1 =>
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => 6,
-                7 => -1,
-                8 => -1,
-            ),
-            0 =>
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => 6,
-                7 => -1,
-                8 => -1,
-            ),
-            1 =>
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => 6,
-                7 => -1,
-                8 => -1,
-            ),
-            2 =>
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => 6,
-                7 => -1,
-                8 => -1,
-            ),
-            3 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-            4 =>
-            array (
-                0 => -1,
-            ),
-            5 =>
-            array (
-                0 => -1,
-            ),
-            6 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 =>
-                array (
-                    'builtin' => '/^(String|Array|RegExp|Function|Math|Number|Date|Image|window|document|navigator|onAbort|onBlur|onChange|onClick|onDblClick|onDragDrop|onError|onFocus|onKeyDown|onKeyPress|onKeyUp|onLoad|onMouseDown|onMouseOver|onMouseOut|onMouseMove|onMouseUp|onMove|onReset|onResize|onSelect|onSubmit|onUnload)$/',
-                    'reserved' => '/^(break|continue|do|while|export|for|in|if|else|import|return|label|switch|case|var|with|delete|new|this|typeof|void|abstract|boolean|byte|catch|char|class|const|debugger|default|double|enum|extends|false|final|finally|float|function|implements|goto|instanceof|int|interface|long|native|null|package|private|protected|public|short|static|super|synchronized|throw|throws|transient|true|try|volatile)$/',
-                ),
-                8 =>
-                array (
-                ),
-            ),
-            0 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 =>
-                array (
-                    'builtin' => '/^(String|Array|RegExp|Function|Math|Number|Date|Image|window|document|navigator|onAbort|onBlur|onChange|onClick|onDblClick|onDragDrop|onError|onFocus|onKeyDown|onKeyPress|onKeyUp|onLoad|onMouseDown|onMouseOver|onMouseOut|onMouseMove|onMouseUp|onMove|onReset|onResize|onSelect|onSubmit|onUnload)$/',
-                    'reserved' => '/^(break|continue|do|while|export|for|in|if|else|import|return|label|switch|case|var|with|delete|new|this|typeof|void|abstract|boolean|byte|catch|char|class|const|debugger|default|double|enum|extends|false|final|finally|float|function|implements|goto|instanceof|int|interface|long|native|null|package|private|protected|public|short|static|super|synchronized|throw|throws|transient|true|try|volatile)$/',
-                ),
-                8 =>
-                array (
-                ),
-            ),
-            1 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 =>
-                array (
-                    'builtin' => '/^(String|Array|RegExp|Function|Math|Number|Date|Image|window|document|navigator|onAbort|onBlur|onChange|onClick|onDblClick|onDragDrop|onError|onFocus|onKeyDown|onKeyPress|onKeyUp|onLoad|onMouseDown|onMouseOver|onMouseOut|onMouseMove|onMouseUp|onMove|onReset|onResize|onSelect|onSubmit|onUnload)$/',
-                    'reserved' => '/^(break|continue|do|while|export|for|in|if|else|import|return|label|switch|case|var|with|delete|new|this|typeof|void|abstract|boolean|byte|catch|char|class|const|debugger|default|double|enum|extends|false|final|finally|float|function|implements|goto|instanceof|int|interface|long|native|null|package|private|protected|public|short|static|super|synchronized|throw|throws|transient|true|try|volatile)$/',
-                ),
-                8 =>
-                array (
-                ),
-            ),
-            2 =>
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 =>
-                array (
-                    'builtin' => '/^(String|Array|RegExp|Function|Math|Number|Date|Image|window|document|navigator|onAbort|onBlur|onChange|onClick|onDblClick|onDragDrop|onError|onFocus|onKeyDown|onKeyPress|onKeyUp|onLoad|onMouseDown|onMouseOver|onMouseOut|onMouseMove|onMouseUp|onMove|onReset|onResize|onSelect|onSubmit|onUnload)$/',
-                    'reserved' => '/^(break|continue|do|while|export|for|in|if|else|import|return|label|switch|case|var|with|delete|new|this|typeof|void|abstract|boolean|byte|catch|char|class|const|debugger|default|double|enum|extends|false|final|finally|float|function|implements|goto|instanceof|int|interface|long|native|null|package|private|protected|public|short|static|super|synchronized|throw|throws|transient|true|try|volatile)$/',
-                ),
-                8 =>
-                array (
-                ),
-            ),
-            3 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-                3 =>
-                array (
-                ),
-            ),
-            4 =>
-            array (
-                0 =>
-                array (
-                ),
-            ),
-            5 =>
-            array (
-                0 =>
-                array (
-                ),
-            ),
-            6 =>
-            array (
-                0 =>
-                array (
-                ),
-                1 =>
-                array (
-                ),
-                2 =>
-                array (
-                ),
-                3 =>
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-            ),
-            1 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-            ),
-            2 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-            ),
-            3 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-            4 =>
-            array (
-                0 => NULL,
-            ),
-            5 =>
-            array (
-                0 => NULL,
-            ),
-            6 =>
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-            ),
-            0 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-            ),
-            1 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-            ),
-            2 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-            ),
-            3 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            4 =>
-            array (
-                0 => false,
-            ),
-            5 =>
-            array (
-                0 => false,
-            ),
-            6 =>
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'builtin' => 'builtin',
-            'reserved' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-
-}
diff --git a/library/Text_Highlighter/Text/Highlighter/MYSQL.php b/library/Text_Highlighter/Text/Highlighter/MYSQL.php
deleted file mode 100644
index bdd74cc8b..000000000
--- a/library/Text_Highlighter/Text/Highlighter/MYSQL.php
+++ /dev/null
@@ -1,434 +0,0 @@
-<?php
-/**
- * Auto-generated class. MYSQL syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : mysql.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. MYSQL syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_MYSQL extends Text_Highlighter
-{
-    var $_language = 'mysql';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_MYSQL($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
-            0 => '//',
-            1 => '//',
-            2 => '/((?i)\\\\.)/',
-            3 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
-            4 => '/((?i)\\\\.)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 5,
-                9 => 2,
-                10 => 0,
-                11 => 0,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 0,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 5,
-                9 => 2,
-                10 => 0,
-                11 => 0,
-            ),
-            4 => 
-            array (
-                0 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'quotes',
-                1 => 'comment',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => 'quotes',
-                6 => 'brackets',
-                7 => 'quotes',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => '',
-            ),
-            3 => 
-            array (
-                0 => 'quotes',
-                1 => 'comment',
-                2 => '',
-                3 => '',
-                4 => '',
-                5 => 'quotes',
-                6 => 'brackets',
-                7 => 'quotes',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-            ),
-            4 => 
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'identifier',
-                1 => 'comment',
-                2 => 'comment',
-                3 => 'identifier',
-                4 => 'identifier',
-                5 => 'string',
-                6 => 'code',
-                7 => 'string',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 'special',
-            ),
-            3 => 
-            array (
-                0 => 'identifier',
-                1 => 'comment',
-                2 => 'comment',
-                3 => 'identifier',
-                4 => 'identifier',
-                5 => 'string',
-                6 => 'code',
-                7 => 'string',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-            ),
-            4 => 
-            array (
-                0 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)`/',
-            1 => '/(?i)\\*\\//',
-            2 => '/(?i)"/',
-            3 => '/(?i)\\)/',
-            4 => '/(?i)\'/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 2,
-                6 => 3,
-                7 => 4,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => -1,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 2,
-                6 => 3,
-                7 => 4,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-            ),
-            4 => 
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                    'function' => '/^((?i)abs|acos|adddate|ascii|asin|atan|atan2|avg|benchmark|bin|ceiling|char|coalesce|concat|conv|cos|cot|count|curdate|curtime|database|dayname|dayofmonth|dayofweek|dayofyear|decode|degrees|elt|encode|encrypt|exp|extract|field|floor|format|greatest|hex|hour|if|ifnull|insert|instr|interval|isnull|lcase|least|left|length|locate|log|log10|lower|lpad|ltrim|max|md5|mid|min|minute|mod|month|monthname|now|nullif|oct|ord|password|pi|position|pow|power|prepare|quarter|radians|rand|repeat|replace|reverse|right|round|rpad|rtrim|second|sign|sin|soundex|space|sqrt|std|stddev|strcmp|subdate|substring|sum|sysdate|tan|trim|truncate|ucase|upper|user|version|week|weekday|year)$/',
-                ),
-                4 => 
-                array (
-                    'reserved' => '/^((?i)action|add|aggregate|all|alter|after|and|as|asc|avg|avg_row_length|auto_increment|between|bigint|bit|binary|blob|bool|both|by|cascade|case|char|character|change|check|checksum|column|columns|comment|constraint|create|cross|current_date|current_time|current_timestamp|data|database|databases|date|datetime|day|day_hour|day_minute|day_second|dayofmonth|dayofweek|dayofyear|dec|decimal|default|delayed|delay_key_write|delete|desc|describe|distinct|distinctrow|double|drop|end|else|escape|escaped|enclosed|enum|explain|exists|fields|file|first|float|float4|float8|flush|foreign|from|for|full|function|global|grant|grants|group|having|heap|high_priority|hour|hour_minute|hour_second|hosts|identified|ignore|in|index|infile|inner|insert|insert_id|int|integer|interval|int1|int2|int3|int4|int8|into|if|is|isam|join|key|keys|kill|last_insert_id|leading|left|length|like|lines|limit|load|local|lock|logs|long|longblob|longtext|low_priority|max|max_rows|match|mediumblob|mediumtext|mediumint|middleint|min_rows|minute|minute_second|modify|month|monthname|myisam|natural|numeric|no|not|null|on|optimize|option|optionally|or|order|outer|outfile|pack_keys|partial|password|precision|primary|procedure|process|processlist|privileges|read|real|references|reload|regexp|rename|replace|restrict|returns|revoke|rlike|row|rows|second|select|set|show|shutdown|smallint|soname|sql_big_tables|sql_big_selects|sql_low_priority_updates|sql_log_off|sql_log_update|sql_select_limit|sql_small_result|sql_big_result|sql_warnings|straight_join|starting|status|string|table|tables|temporary|terminated|text|then|time|timestamp|tinyblob|tinytext|tinyint|trailing|to|type|use|using|unique|unlock|unsigned|update|usage|values|varchar|variables|varying|varbinary|with|write|when|where|year|year_month|zerofill)$/',
-                ),
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                    'function' => '/^((?i)abs|acos|adddate|ascii|asin|atan|atan2|avg|benchmark|bin|ceiling|char|coalesce|concat|conv|cos|cot|count|curdate|curtime|database|dayname|dayofmonth|dayofweek|dayofyear|decode|degrees|elt|encode|encrypt|exp|extract|field|floor|format|greatest|hex|hour|if|ifnull|insert|instr|interval|isnull|lcase|least|left|length|locate|log|log10|lower|lpad|ltrim|max|md5|mid|min|minute|mod|month|monthname|now|nullif|oct|ord|password|pi|position|pow|power|prepare|quarter|radians|rand|repeat|replace|reverse|right|round|rpad|rtrim|second|sign|sin|soundex|space|sqrt|std|stddev|strcmp|subdate|substring|sum|sysdate|tan|trim|truncate|ucase|upper|user|version|week|weekday|year)$/',
-                ),
-                4 => 
-                array (
-                    'reserved' => '/^((?i)action|add|aggregate|all|alter|after|and|as|asc|avg|avg_row_length|auto_increment|between|bigint|bit|binary|blob|bool|both|by|cascade|case|char|character|change|check|checksum|column|columns|comment|constraint|create|cross|current_date|current_time|current_timestamp|data|database|databases|date|datetime|day|day_hour|day_minute|day_second|dayofmonth|dayofweek|dayofyear|dec|decimal|default|delayed|delay_key_write|delete|desc|describe|distinct|distinctrow|double|drop|end|else|escape|escaped|enclosed|enum|explain|exists|fields|file|first|float|float4|float8|flush|foreign|from|for|full|function|global|grant|grants|group|having|heap|high_priority|hour|hour_minute|hour_second|hosts|identified|ignore|in|index|infile|inner|insert|insert_id|int|integer|interval|int1|int2|int3|int4|int8|into|if|is|isam|join|key|keys|kill|last_insert_id|leading|left|length|like|lines|limit|load|local|lock|logs|long|longblob|longtext|low_priority|max|max_rows|match|mediumblob|mediumtext|mediumint|middleint|min_rows|minute|minute_second|modify|month|monthname|myisam|natural|numeric|no|not|null|on|optimize|option|optionally|or|order|outer|outfile|pack_keys|partial|password|precision|primary|procedure|process|processlist|privileges|read|real|references|reload|regexp|rename|replace|restrict|returns|revoke|rlike|row|rows|second|select|set|show|shutdown|smallint|soname|sql_big_tables|sql_big_selects|sql_low_priority_updates|sql_log_off|sql_log_update|sql_select_limit|sql_small_result|sql_big_result|sql_warnings|straight_join|starting|status|string|table|tables|temporary|terminated|text|then|time|timestamp|tinyblob|tinytext|tinyint|trailing|to|type|use|using|unique|unlock|unsigned|update|usage|values|varchar|variables|varying|varbinary|with|write|when|where|year|year_month|zerofill)$/',
-                ),
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'function' => 'reserved',
-            'reserved' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/PERL.php b/library/Text_Highlighter/Text/Highlighter/PERL.php
deleted file mode 100644
index 277a5ba45..000000000
--- a/library/Text_Highlighter/Text/Highlighter/PERL.php
+++ /dev/null
@@ -1,1352 +0,0 @@
-<?php
-/**
- * Auto-generated class. PERL syntax highlighting
- * 
- * This highlighter is EXPERIMENTAL, so that it may work incorrectly. 
- * Most rules were created by Mariusz Jakubowski, and extended by me.
- * My  knowledge  of  Perl  is  poor,  and  Perl  syntax  seems  too
- * complicated to me. 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : perl.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Mariusz 'kg' Jakubowski <kg@alternatywa.info>
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. PERL syntax highlighting
- *
- * @author Mariusz 'kg' Jakubowski <kg@alternatywa.info>
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_PERL extends Text_Highlighter
-{
-    var $_language = 'perl';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_PERL($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
-            0 => '//',
-            1 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
-            2 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|((?i)([a-z1-9_]+)(\\s*=>))|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
-            3 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
-            4 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\[\\\\"\'`tnr\\$\\{@])/',
-            5 => '/(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            6 => '/(\\\\\\/)/',
-            7 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            8 => '/(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            9 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\[\\\\"\'`tnr\\$\\{@])/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 2,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 2,
-                6 => 1,
-                7 => 9,
-                8 => 9,
-                9 => 0,
-                10 => 8,
-                11 => 5,
-                12 => 0,
-                13 => 0,
-                14 => 3,
-                15 => 1,
-                16 => 1,
-                17 => 3,
-                18 => 0,
-                19 => 0,
-                20 => 0,
-                21 => 0,
-                22 => 0,
-                23 => 0,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 2,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 2,
-                6 => 1,
-                7 => 9,
-                8 => 9,
-                9 => 0,
-                10 => 8,
-                11 => 5,
-                12 => 0,
-                13 => 0,
-                14 => 3,
-                15 => 1,
-                16 => 1,
-                17 => 3,
-                18 => 0,
-                19 => 0,
-                20 => 0,
-                21 => 0,
-                22 => 0,
-                23 => 0,
-            ),
-            2 => 
-            array (
-                0 => 2,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 2,
-                6 => 1,
-                7 => 9,
-                8 => 9,
-                9 => 0,
-                10 => 8,
-                11 => 5,
-                12 => 0,
-                13 => 2,
-                14 => 0,
-                15 => 3,
-                16 => 1,
-                17 => 1,
-                18 => 3,
-                19 => 0,
-                20 => 0,
-                21 => 0,
-                22 => 0,
-                23 => 0,
-                24 => 0,
-            ),
-            3 => 
-            array (
-                0 => 2,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 2,
-                6 => 1,
-                7 => 9,
-                8 => 9,
-                9 => 0,
-                10 => 8,
-                11 => 5,
-                12 => 0,
-                13 => 0,
-                14 => 3,
-                15 => 1,
-                16 => 1,
-                17 => 3,
-                18 => 0,
-                19 => 0,
-                20 => 0,
-                21 => 0,
-                22 => 0,
-                23 => 0,
-            ),
-            4 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 0,
-                3 => 0,
-            ),
-            5 => 
-            array (
-                0 => 0,
-            ),
-            6 => 
-            array (
-                0 => 0,
-            ),
-            7 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 0,
-                3 => 0,
-            ),
-            8 => 
-            array (
-                0 => 0,
-            ),
-            9 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 0,
-                3 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => '',
-                1 => 'comment',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => 'brackets',
-                5 => '',
-                6 => '',
-                7 => 'quotes',
-                8 => 'quotes',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => 'quotes',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-                17 => '',
-                18 => '',
-                19 => 'quotes',
-                20 => 'quotes',
-                21 => 'quotes',
-                22 => '',
-                23 => '',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => '',
-                1 => 'comment',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => 'brackets',
-                5 => '',
-                6 => '',
-                7 => 'quotes',
-                8 => 'quotes',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => 'quotes',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-                17 => '',
-                18 => '',
-                19 => 'quotes',
-                20 => 'quotes',
-                21 => 'quotes',
-                22 => '',
-                23 => '',
-            ),
-            2 => 
-            array (
-                0 => '',
-                1 => 'comment',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => 'brackets',
-                5 => '',
-                6 => '',
-                7 => 'quotes',
-                8 => 'quotes',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => 'quotes',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-                17 => '',
-                18 => '',
-                19 => '',
-                20 => 'quotes',
-                21 => 'quotes',
-                22 => 'quotes',
-                23 => '',
-                24 => '',
-            ),
-            3 => 
-            array (
-                0 => '',
-                1 => 'comment',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => 'brackets',
-                5 => '',
-                6 => '',
-                7 => 'quotes',
-                8 => 'quotes',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => 'quotes',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-                17 => '',
-                18 => '',
-                19 => 'quotes',
-                20 => 'quotes',
-                21 => 'quotes',
-                22 => '',
-                23 => '',
-            ),
-            4 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-            5 => 
-            array (
-                0 => '',
-            ),
-            6 => 
-            array (
-                0 => '',
-            ),
-            7 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-            8 => 
-            array (
-                0 => '',
-            ),
-            9 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'special',
-                1 => 'comment',
-                2 => 'code',
-                3 => 'code',
-                4 => 'code',
-                5 => 'special',
-                6 => 'special',
-                7 => 'string',
-                8 => 'string',
-                9 => 'comment',
-                10 => 'string',
-                11 => 'string',
-                12 => 'string',
-                13 => 'var',
-                14 => 'var',
-                15 => 'var',
-                16 => 'var',
-                17 => 'var',
-                18 => 'var',
-                19 => 'string',
-                20 => 'string',
-                21 => 'string',
-                22 => 'identifier',
-                23 => 'number',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 'special',
-                1 => 'comment',
-                2 => 'code',
-                3 => 'code',
-                4 => 'code',
-                5 => 'special',
-                6 => 'special',
-                7 => 'string',
-                8 => 'string',
-                9 => 'comment',
-                10 => 'string',
-                11 => 'string',
-                12 => 'string',
-                13 => 'var',
-                14 => 'var',
-                15 => 'var',
-                16 => 'var',
-                17 => 'var',
-                18 => 'var',
-                19 => 'string',
-                20 => 'string',
-                21 => 'string',
-                22 => 'identifier',
-                23 => 'number',
-            ),
-            2 => 
-            array (
-                0 => 'special',
-                1 => 'comment',
-                2 => 'code',
-                3 => 'code',
-                4 => 'code',
-                5 => 'special',
-                6 => 'special',
-                7 => 'string',
-                8 => 'string',
-                9 => 'comment',
-                10 => 'string',
-                11 => 'string',
-                12 => 'string',
-                13 => 'string',
-                14 => 'var',
-                15 => 'var',
-                16 => 'var',
-                17 => 'var',
-                18 => 'var',
-                19 => 'var',
-                20 => 'string',
-                21 => 'string',
-                22 => 'string',
-                23 => 'identifier',
-                24 => 'number',
-            ),
-            3 => 
-            array (
-                0 => 'special',
-                1 => 'comment',
-                2 => 'code',
-                3 => 'code',
-                4 => 'code',
-                5 => 'special',
-                6 => 'special',
-                7 => 'string',
-                8 => 'string',
-                9 => 'comment',
-                10 => 'string',
-                11 => 'string',
-                12 => 'string',
-                13 => 'var',
-                14 => 'var',
-                15 => 'var',
-                16 => 'var',
-                17 => 'var',
-                18 => 'var',
-                19 => 'string',
-                20 => 'string',
-                21 => 'string',
-                22 => 'identifier',
-                23 => 'number',
-            ),
-            4 => 
-            array (
-                0 => 'var',
-                1 => 'var',
-                2 => 'var',
-                3 => 'special',
-            ),
-            5 => 
-            array (
-                0 => 'special',
-            ),
-            6 => 
-            array (
-                0 => 'string',
-            ),
-            7 => 
-            array (
-                0 => 'var',
-                1 => 'var',
-                2 => 'var',
-                3 => 'special',
-            ),
-            8 => 
-            array (
-                0 => 'special',
-            ),
-            9 => 
-            array (
-                0 => 'var',
-                1 => 'var',
-                2 => 'var',
-                3 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?m)^=cut[^\\n]*/',
-            1 => '/\\}/',
-            2 => '/\\)/',
-            3 => '/\\]/',
-            4 => '/%b2%/',
-            5 => '/%b2%/',
-            6 => '/\\/[cgimosx]*/',
-            7 => '/`/',
-            8 => '/\'/',
-            9 => '/"/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => 0,
-                2 => 1,
-                3 => 2,
-                4 => 3,
-                5 => -1,
-                6 => -1,
-                7 => 4,
-                8 => 5,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => 6,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-                17 => -1,
-                18 => -1,
-                19 => 7,
-                20 => 8,
-                21 => 9,
-                22 => -1,
-                23 => -1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => 0,
-                2 => 1,
-                3 => 2,
-                4 => 3,
-                5 => -1,
-                6 => -1,
-                7 => 4,
-                8 => 5,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => 6,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-                17 => -1,
-                18 => -1,
-                19 => 7,
-                20 => 8,
-                21 => 9,
-                22 => -1,
-                23 => -1,
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => 0,
-                2 => 1,
-                3 => 2,
-                4 => 3,
-                5 => -1,
-                6 => -1,
-                7 => 4,
-                8 => 5,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => 6,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-                17 => -1,
-                18 => -1,
-                19 => -1,
-                20 => 7,
-                21 => 8,
-                22 => 9,
-                23 => -1,
-                24 => -1,
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => 0,
-                2 => 1,
-                3 => 2,
-                4 => 3,
-                5 => -1,
-                6 => -1,
-                7 => 4,
-                8 => 5,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => 6,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-                17 => -1,
-                18 => -1,
-                19 => 7,
-                20 => 8,
-                21 => 9,
-                22 => -1,
-                23 => -1,
-            ),
-            4 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-            5 => 
-            array (
-                0 => -1,
-            ),
-            6 => 
-            array (
-                0 => -1,
-            ),
-            7 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-            8 => 
-            array (
-                0 => -1,
-            ),
-            9 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-                17 => 
-                array (
-                ),
-                18 => 
-                array (
-                ),
-                19 => -1,
-                20 => -1,
-                21 => -1,
-                22 => 
-                array (
-                    'reserved' => '/^(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|quotemeta|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)$/',
-                    'missingreserved' => '/^(new)$/',
-                    'flowcontrol' => '/^(if|else|elsif|while|unless|for|foreach|until|do|continue|not|or|and|eq|ne|gt|lt)$/',
-                ),
-                23 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-                17 => 
-                array (
-                ),
-                18 => 
-                array (
-                ),
-                19 => -1,
-                20 => -1,
-                21 => -1,
-                22 => 
-                array (
-                    'reserved' => '/^(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|quotemeta|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)$/',
-                    'missingreserved' => '/^(new)$/',
-                    'flowcontrol' => '/^(if|else|elsif|while|unless|for|foreach|until|do|continue|not|or|and|eq|ne|gt|lt)$/',
-                ),
-                23 => 
-                array (
-                ),
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-                17 => 
-                array (
-                ),
-                18 => 
-                array (
-                ),
-                19 => 
-                array (
-                ),
-                20 => -1,
-                21 => -1,
-                22 => -1,
-                23 => 
-                array (
-                    'reserved' => '/^(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|quotemeta|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)$/',
-                    'missingreserved' => '/^(new)$/',
-                    'flowcontrol' => '/^(if|else|elsif|while|unless|for|foreach|until|do|continue|not|or|and|eq|ne|gt|lt)$/',
-                ),
-                24 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => -1,
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-                17 => 
-                array (
-                ),
-                18 => 
-                array (
-                ),
-                19 => -1,
-                20 => -1,
-                21 => -1,
-                22 => 
-                array (
-                    'reserved' => '/^(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|quotemeta|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)$/',
-                    'missingreserved' => '/^(new)$/',
-                    'flowcontrol' => '/^(if|else|elsif|while|unless|for|foreach|until|do|continue|not|or|and|eq|ne|gt|lt)$/',
-                ),
-                23 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-            ),
-            5 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            6 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            7 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-            ),
-            8 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            9 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 
-                array (
-                    1 => 'special',
-                    2 => 'string',
-                ),
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => 
-                array (
-                    1 => 'reserved',
-                    2 => 'special',
-                ),
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                    6 => 'string',
-                    8 => 'quotes',
-                ),
-                11 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                ),
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-                17 => 
-                array (
-                    1 => 'brackets',
-                    2 => 'var',
-                    3 => 'brackets',
-                ),
-                18 => NULL,
-                19 => NULL,
-                20 => NULL,
-                21 => NULL,
-                22 => NULL,
-                23 => NULL,
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                    1 => 'special',
-                    2 => 'string',
-                ),
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => 
-                array (
-                    1 => 'reserved',
-                    2 => 'special',
-                ),
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                    6 => 'string',
-                    8 => 'quotes',
-                ),
-                11 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                ),
-                12 => NULL,
-                13 => 
-                array (
-                    1 => 'string',
-                    2 => 'code',
-                ),
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-                17 => NULL,
-                18 => 
-                array (
-                    1 => 'brackets',
-                    2 => 'var',
-                    3 => 'brackets',
-                ),
-                19 => NULL,
-                20 => NULL,
-                21 => NULL,
-                22 => NULL,
-                23 => NULL,
-                24 => NULL,
-            ),
-            3 => 
-            array (
-                0 => 
-                array (
-                    1 => 'special',
-                    2 => 'string',
-                ),
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => 
-                array (
-                    1 => 'reserved',
-                    2 => 'special',
-                ),
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                    6 => 'string',
-                    8 => 'quotes',
-                ),
-                11 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                ),
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-                17 => 
-                array (
-                    1 => 'brackets',
-                    2 => 'var',
-                    3 => 'brackets',
-                ),
-                18 => NULL,
-                19 => NULL,
-                20 => NULL,
-                21 => NULL,
-                22 => NULL,
-                23 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-            5 => 
-            array (
-                0 => NULL,
-            ),
-            6 => 
-            array (
-                0 => NULL,
-            ),
-            7 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-            8 => 
-            array (
-                0 => NULL,
-            ),
-            9 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => true,
-                8 => true,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-                21 => false,
-                22 => false,
-                23 => false,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => true,
-                8 => true,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-                21 => false,
-                22 => false,
-                23 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => true,
-                8 => true,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-                21 => false,
-                22 => false,
-                23 => false,
-                24 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => true,
-                8 => true,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-                21 => false,
-                22 => false,
-                23 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            5 => 
-            array (
-                0 => false,
-            ),
-            6 => 
-            array (
-                0 => false,
-            ),
-            7 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            8 => 
-            array (
-                0 => false,
-            ),
-            9 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'reserved' => 'reserved',
-            'missingreserved' => 'reserved',
-            'flowcontrol' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/PHP.php b/library/Text_Highlighter/Text/Highlighter/PHP.php
deleted file mode 100644
index 1ee2e6b90..000000000
--- a/library/Text_Highlighter/Text/Highlighter/PHP.php
+++ /dev/null
@@ -1,1107 +0,0 @@
-<?php
-/**
- * Auto-generated class. PHP syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : php.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. PHP syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_PHP extends Text_Highlighter
-{
-    var $_language = 'php';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_PHP($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\<\\?(php|=)?)/',
-            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)\\?\\>)|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            3 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
-            4 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
-            5 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
-            6 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
-            7 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
-            8 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            9 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
-            10 => '//',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 1,
-            ),
-            0 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 1,
-                7 => 0,
-                8 => 1,
-                9 => 0,
-                10 => 1,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 2,
-                16 => 5,
-            ),
-            1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 1,
-                7 => 0,
-                8 => 1,
-                9 => 0,
-                10 => 1,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 0,
-                16 => 2,
-                17 => 5,
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 1,
-                7 => 0,
-                8 => 1,
-                9 => 0,
-                10 => 1,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 2,
-                16 => 5,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 1,
-                7 => 0,
-                8 => 1,
-                9 => 0,
-                10 => 1,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 2,
-                16 => 5,
-            ),
-            4 => 
-            array (
-                0 => 0,
-                1 => 3,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            7 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            8 => 
-            array (
-                0 => 0,
-            ),
-            9 => 
-            array (
-                0 => 0,
-                1 => 3,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-            ),
-            10 => 
-            array (
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'inlinetags',
-            ),
-            0 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => 'quotes',
-                8 => 'comment',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-            ),
-            1 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => 'quotes',
-                8 => 'comment',
-                9 => '',
-                10 => '',
-                11 => 'inlinetags',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-                17 => '',
-            ),
-            2 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => 'quotes',
-                8 => 'comment',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-            ),
-            3 => 
-            array (
-                0 => 'brackets',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'comment',
-                4 => 'quotes',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => 'quotes',
-                8 => 'comment',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-            ),
-            4 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-            ),
-            5 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-            ),
-            6 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-            ),
-            7 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-            ),
-            8 => 
-            array (
-                0 => '',
-            ),
-            9 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-                4 => '',
-            ),
-            10 => 
-            array (
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'code',
-            ),
-            0 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'string',
-                7 => 'string',
-                8 => 'comment',
-                9 => 'identifier',
-                10 => 'reserved',
-                11 => 'number',
-                12 => 'var',
-                13 => 'number',
-                14 => 'number',
-                15 => 'number',
-                16 => 'number',
-            ),
-            1 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'string',
-                7 => 'string',
-                8 => 'comment',
-                9 => 'identifier',
-                10 => 'reserved',
-                11 => 'default',
-                12 => 'number',
-                13 => 'var',
-                14 => 'number',
-                15 => 'number',
-                16 => 'number',
-                17 => 'number',
-            ),
-            2 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'string',
-                7 => 'string',
-                8 => 'comment',
-                9 => 'identifier',
-                10 => 'reserved',
-                11 => 'number',
-                12 => 'var',
-                13 => 'number',
-                14 => 'number',
-                15 => 'number',
-                16 => 'number',
-            ),
-            3 => 
-            array (
-                0 => 'code',
-                1 => 'code',
-                2 => 'code',
-                3 => 'comment',
-                4 => 'string',
-                5 => 'string',
-                6 => 'string',
-                7 => 'string',
-                8 => 'comment',
-                9 => 'identifier',
-                10 => 'reserved',
-                11 => 'number',
-                12 => 'var',
-                13 => 'number',
-                14 => 'number',
-                15 => 'number',
-                16 => 'number',
-            ),
-            4 => 
-            array (
-                0 => 'inlinedoc',
-                1 => 'url',
-                2 => 'url',
-                3 => 'inlinedoc',
-                4 => 'inlinedoc',
-            ),
-            5 => 
-            array (
-                0 => 'special',
-                1 => 'var',
-                2 => 'var',
-            ),
-            6 => 
-            array (
-                0 => 'special',
-                1 => 'var',
-                2 => 'var',
-            ),
-            7 => 
-            array (
-                0 => 'special',
-                1 => 'var',
-                2 => 'var',
-            ),
-            8 => 
-            array (
-                0 => 'special',
-            ),
-            9 => 
-            array (
-                0 => 'inlinedoc',
-                1 => 'url',
-                2 => 'url',
-                3 => 'inlinedoc',
-                4 => 'inlinedoc',
-            ),
-            10 => 
-            array (
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\?\\>/',
-            1 => '/(?i)\\}/',
-            2 => '/(?i)\\)/',
-            3 => '/(?i)\\]/',
-            4 => '/(?i)\\*\\//',
-            5 => '/(?i)"/',
-            6 => '/(?i)`/',
-            7 => '/(?mi)^%1%;?$/',
-            8 => '/(?i)\'/',
-            9 => '/(?mi)$|(?=\\?\\>)/',
-            10 => '/(?i)\\<\\?(php|=)?/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-            ),
-            0 => 
-            array (
-                0 => 1,
-                1 => 2,
-                2 => 3,
-                3 => 4,
-                4 => 5,
-                5 => 6,
-                6 => 7,
-                7 => 8,
-                8 => 9,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-            ),
-            1 => 
-            array (
-                0 => 1,
-                1 => 2,
-                2 => 3,
-                3 => 4,
-                4 => 5,
-                5 => 6,
-                6 => 7,
-                7 => 8,
-                8 => 9,
-                9 => -1,
-                10 => -1,
-                11 => 10,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-                17 => -1,
-            ),
-            2 => 
-            array (
-                0 => 1,
-                1 => 2,
-                2 => 3,
-                3 => 4,
-                4 => 5,
-                5 => 6,
-                6 => 7,
-                7 => 8,
-                8 => 9,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-            ),
-            3 => 
-            array (
-                0 => 1,
-                1 => 2,
-                2 => 3,
-                3 => 4,
-                4 => 5,
-                5 => 6,
-                6 => 7,
-                7 => 8,
-                8 => 9,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-            ),
-            4 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-            ),
-            5 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-            ),
-            6 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-            ),
-            7 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-            ),
-            8 => 
-            array (
-                0 => -1,
-            ),
-            9 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-            ),
-            10 => 
-            array (
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-            ),
-            0 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
-                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
-                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
-                ),
-                10 => 
-                array (
-                ),
-                11 => -1,
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-                17 => 
-                array (
-                ),
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
-                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
-                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-                4 => 
-                array (
-                ),
-            ),
-            5 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-            ),
-            6 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-            ),
-            7 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-            ),
-            8 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            9 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-                4 => 
-                array (
-                ),
-            ),
-            10 => 
-            array (
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-            ),
-            1 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-                17 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-            ),
-            5 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            6 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            7 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            8 => 
-            array (
-                0 => NULL,
-            ),
-            9 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-            ),
-            10 => 
-            array (
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-            ),
-            0 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-            ),
-            5 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            6 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            7 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            8 => 
-            array (
-                0 => false,
-            ),
-            9 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-            ),
-            10 => 
-            array (
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'constants' => 'reserved',
-            'reserved' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/PYTHON.php b/library/Text_Highlighter/Text/Highlighter/PYTHON.php
deleted file mode 100644
index ed4f59dde..000000000
--- a/library/Text_Highlighter/Text/Highlighter/PYTHON.php
+++ /dev/null
@@ -1,647 +0,0 @@
-<?php
-/**
- * Auto-generated class. PYTHON syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : python.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. PYTHON syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_PYTHON extends Text_Highlighter
-{
-    var $_language = 'python';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_PYTHON($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\'\'\')|((?i)""")|((?i)")|((?i)\')|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)((\\d*\\.\\d+)|(\\d+\\.\\d*)|(\\d+))j)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)|((?i)0[0-7]+l?)|((?i)#.+)/',
-            0 => '/((?i)\\\\.)/',
-            1 => '/((?i)\\\\.)/',
-            2 => '/((?i)\\\\.)/',
-            3 => '/((?i)\\\\.)/',
-            4 => '/((?i)\'\'\')|((?i)""")|((?i)")|((?i)\')|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)((\\d*\\.\\d+)|(\\d+\\.\\d*)|(\\d+))j)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)|((?i)0[0-7]+l?)|((?i)#.+)/',
-            5 => '/((?i)\'\'\')|((?i)""")|((?i)")|((?i)\')|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)((\\d*\\.\\d+)|(\\d+\\.\\d*)|(\\d+))j)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)|((?i)0[0-7]+l?)|((?i)#.+)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 5,
-                9 => 4,
-                10 => 2,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-            ),
-            0 => 
-            array (
-                0 => 0,
-            ),
-            1 => 
-            array (
-                0 => 0,
-            ),
-            2 => 
-            array (
-                0 => 0,
-            ),
-            3 => 
-            array (
-                0 => 0,
-            ),
-            4 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 5,
-                9 => 4,
-                10 => 2,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 0,
-                8 => 5,
-                9 => 4,
-                10 => 2,
-                11 => 0,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'quotes',
-                1 => 'quotes',
-                2 => 'quotes',
-                3 => 'quotes',
-                4 => 'brackets',
-                5 => 'brackets',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-            ),
-            0 => 
-            array (
-                0 => '',
-            ),
-            1 => 
-            array (
-                0 => '',
-            ),
-            2 => 
-            array (
-                0 => '',
-            ),
-            3 => 
-            array (
-                0 => '',
-            ),
-            4 => 
-            array (
-                0 => 'quotes',
-                1 => 'quotes',
-                2 => 'quotes',
-                3 => 'quotes',
-                4 => 'brackets',
-                5 => 'brackets',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-            ),
-            5 => 
-            array (
-                0 => 'quotes',
-                1 => 'quotes',
-                2 => 'quotes',
-                3 => 'quotes',
-                4 => 'brackets',
-                5 => 'brackets',
-                6 => '',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'string',
-                1 => 'string',
-                2 => 'string',
-                3 => 'string',
-                4 => 'code',
-                5 => 'code',
-                6 => 'identifier',
-                7 => 'identifier',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-                13 => 'number',
-                14 => 'comment',
-            ),
-            0 => 
-            array (
-                0 => 'special',
-            ),
-            1 => 
-            array (
-                0 => 'special',
-            ),
-            2 => 
-            array (
-                0 => 'special',
-            ),
-            3 => 
-            array (
-                0 => 'special',
-            ),
-            4 => 
-            array (
-                0 => 'string',
-                1 => 'string',
-                2 => 'string',
-                3 => 'string',
-                4 => 'code',
-                5 => 'code',
-                6 => 'identifier',
-                7 => 'identifier',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-                13 => 'number',
-                14 => 'comment',
-            ),
-            5 => 
-            array (
-                0 => 'string',
-                1 => 'string',
-                2 => 'string',
-                3 => 'string',
-                4 => 'code',
-                5 => 'code',
-                6 => 'identifier',
-                7 => 'identifier',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-                13 => 'number',
-                14 => 'comment',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\'\'\'/',
-            1 => '/(?i)"""/',
-            2 => '/(?i)"/',
-            3 => '/(?i)\'/',
-            4 => '/(?i)\\)/',
-            5 => '/(?i)\\]/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-            ),
-            0 => 
-            array (
-                0 => -1,
-            ),
-            1 => 
-            array (
-                0 => -1,
-            ),
-            2 => 
-            array (
-                0 => -1,
-            ),
-            3 => 
-            array (
-                0 => -1,
-            ),
-            4 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => 5,
-                6 => -1,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => 
-                array (
-                    'builtin' => '/^(__import__|abs|apply|basestring|bool|buffer|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|min|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|round|setattr|slice|staticmethod|sum|super|str|tuple|type|unichr|unicode|vars|xrange|zip)$/',
-                ),
-                7 => 
-                array (
-                    'reserved' => '/^(and|del|for|is|raise|assert|elif|from|lambda|return|break|else|global|not|try|class|except|if|or|while|continue|exec|import|pass|yield|def|finally|in|print|False|True|None|NotImplemented|Ellipsis|Exception|SystemExit|StopIteration|StandardError|KeyboardInterrupt|ImportError|EnvironmentError|IOError|OSError|WindowsError|EOFError|RuntimeError|NotImplementedError|NameError|UnboundLocalError|AttributeError|SyntaxError|IndentationError|TabError|TypeError|AssertionError|LookupError|IndexError|KeyError|ArithmeticError|OverflowError|ZeroDivisionError|FloatingPointError|ValueError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|ReferenceError|SystemError|MemoryError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|OverflowWarning|RuntimeWarning|FutureWarning)$/',
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            1 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => 
-                array (
-                    'builtin' => '/^(__import__|abs|apply|basestring|bool|buffer|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|min|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|round|setattr|slice|staticmethod|sum|super|str|tuple|type|unichr|unicode|vars|xrange|zip)$/',
-                ),
-                7 => 
-                array (
-                    'reserved' => '/^(and|del|for|is|raise|assert|elif|from|lambda|return|break|else|global|not|try|class|except|if|or|while|continue|exec|import|pass|yield|def|finally|in|print|False|True|None|NotImplemented|Ellipsis|Exception|SystemExit|StopIteration|StandardError|KeyboardInterrupt|ImportError|EnvironmentError|IOError|OSError|WindowsError|EOFError|RuntimeError|NotImplementedError|NameError|UnboundLocalError|AttributeError|SyntaxError|IndentationError|TabError|TypeError|AssertionError|LookupError|IndexError|KeyError|ArithmeticError|OverflowError|ZeroDivisionError|FloatingPointError|ValueError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|ReferenceError|SystemError|MemoryError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|OverflowWarning|RuntimeWarning|FutureWarning)$/',
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-            ),
-            5 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-                6 => 
-                array (
-                    'builtin' => '/^(__import__|abs|apply|basestring|bool|buffer|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|min|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|round|setattr|slice|staticmethod|sum|super|str|tuple|type|unichr|unicode|vars|xrange|zip)$/',
-                ),
-                7 => 
-                array (
-                    'reserved' => '/^(and|del|for|is|raise|assert|elif|from|lambda|return|break|else|global|not|try|class|except|if|or|while|continue|exec|import|pass|yield|def|finally|in|print|False|True|None|NotImplemented|Ellipsis|Exception|SystemExit|StopIteration|StandardError|KeyboardInterrupt|ImportError|EnvironmentError|IOError|OSError|WindowsError|EOFError|RuntimeError|NotImplementedError|NameError|UnboundLocalError|AttributeError|SyntaxError|IndentationError|TabError|TypeError|AssertionError|LookupError|IndexError|KeyError|ArithmeticError|OverflowError|ZeroDivisionError|FloatingPointError|ValueError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|ReferenceError|SystemError|MemoryError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|OverflowWarning|RuntimeWarning|FutureWarning)$/',
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-                0 => NULL,
-            ),
-            1 => 
-            array (
-                0 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-            ),
-            5 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-            ),
-            0 => 
-            array (
-                0 => false,
-            ),
-            1 => 
-            array (
-                0 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-            ),
-            5 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'builtin' => 'builtin',
-            'reserved' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/RUBY.php b/library/Text_Highlighter/Text/Highlighter/RUBY.php
deleted file mode 100644
index ce20e9f2e..000000000
--- a/library/Text_Highlighter/Text/Highlighter/RUBY.php
+++ /dev/null
@@ -1,825 +0,0 @@
-<?php
-/**
- * Auto-generated class. RUBY syntax highlighting
- * 
- * 
- * FIXME:  While this construction : s.split /z/i 
- * is valid, regular expression is not recognized as such
- * (/ folowing an identifier or number is not recognized as
- * start of RE), making highlighting improper
- * 
- * %q(a (nested) string) does not get highlighted correctly
- *    
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : ruby.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. RUBY syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_RUBY extends Text_Highlighter
-{
-    var $_language = 'ruby';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_RUBY($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?mi)^__END__$)|((?i)")|((?i)%[Qx]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\')|((?i)%[wq]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\\$(\\W|\\w+))|((?ii)@@?[_a-z][\\d_a-z]*)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)0[xX][\\da-f]+l?)|((?i)\\d+l?|\\b0l?\\b)|((?i)0[0-7]+l?)|((?mi)^=begin$)|((?i)#)|((?i)\\s*\\/)/',
-            0 => '//',
-            1 => '/((?i)\\\\.)/',
-            2 => '/((?i)\\\\.)/',
-            3 => '/((?i)\\\\.)/',
-            4 => '/((?i)\\\\.)/',
-            5 => '/((?mi)^__END__$)|((?i)")|((?i)%[Qx]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\')|((?i)%[wq]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\\$(\\W|\\w+))|((?ii)@@?[_a-z][\\d_a-z]*)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)0[xX][\\da-f]+l?)|((?i)\\d+l?|\\b0l?\\b)|((?i)0[0-7]+l?)|((?mi)^=begin$)|((?i)#)|((?i)\\s*\\/)/',
-            6 => '/((?mi)^__END__$)|((?i)")|((?i)%[Qx]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\')|((?i)%[wq]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\\$(\\W|\\w+))|((?ii)@@?[_a-z][\\d_a-z]*)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)0[xX][\\da-f]+l?)|((?i)\\d+l?|\\b0l?\\b)|((?i)0[0-7]+l?)|((?mi)^=begin$)|((?i)#)|((?i)\\s*\\/)/',
-            7 => '/((?i)\\$\\w+\\s*:.+\\$)/',
-            8 => '/((?i)\\$\\w+\\s*:.+\\$)/',
-            9 => '/((?i)\\\\.)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-                3 => 0,
-                4 => 1,
-                5 => 1,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0,
-                10 => 5,
-                11 => 2,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 0,
-                16 => 0,
-                17 => 0,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 0,
-            ),
-            2 => 
-            array (
-                0 => 0,
-            ),
-            3 => 
-            array (
-                0 => 0,
-            ),
-            4 => 
-            array (
-                0 => 0,
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-                3 => 0,
-                4 => 1,
-                5 => 1,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0,
-                10 => 5,
-                11 => 2,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 0,
-                16 => 0,
-                17 => 0,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-                3 => 0,
-                4 => 1,
-                5 => 1,
-                6 => 0,
-                7 => 0,
-                8 => 0,
-                9 => 0,
-                10 => 5,
-                11 => 2,
-                12 => 0,
-                13 => 0,
-                14 => 0,
-                15 => 0,
-                16 => 0,
-                17 => 0,
-            ),
-            7 => 
-            array (
-                0 => 0,
-            ),
-            8 => 
-            array (
-                0 => 0,
-            ),
-            9 => 
-            array (
-                0 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'reserved',
-                1 => 'quotes',
-                2 => 'quotes',
-                3 => 'quotes',
-                4 => 'quotes',
-                5 => '',
-                6 => '',
-                7 => 'brackets',
-                8 => 'brackets',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => 'comment',
-                16 => 'comment',
-                17 => 'quotes',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => '',
-            ),
-            2 => 
-            array (
-                0 => '',
-            ),
-            3 => 
-            array (
-                0 => '',
-            ),
-            4 => 
-            array (
-                0 => '',
-            ),
-            5 => 
-            array (
-                0 => 'reserved',
-                1 => 'quotes',
-                2 => 'quotes',
-                3 => 'quotes',
-                4 => 'quotes',
-                5 => '',
-                6 => '',
-                7 => 'brackets',
-                8 => 'brackets',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => 'comment',
-                16 => 'comment',
-                17 => 'quotes',
-            ),
-            6 => 
-            array (
-                0 => 'reserved',
-                1 => 'quotes',
-                2 => 'quotes',
-                3 => 'quotes',
-                4 => 'quotes',
-                5 => '',
-                6 => '',
-                7 => 'brackets',
-                8 => 'brackets',
-                9 => '',
-                10 => '',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => 'comment',
-                16 => 'comment',
-                17 => 'quotes',
-            ),
-            7 => 
-            array (
-                0 => '',
-            ),
-            8 => 
-            array (
-                0 => '',
-            ),
-            9 => 
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'comment',
-                1 => 'string',
-                2 => 'string',
-                3 => 'string',
-                4 => 'string',
-                5 => 'var',
-                6 => 'var',
-                7 => 'code',
-                8 => 'code',
-                9 => 'identifier',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-                13 => 'number',
-                14 => 'number',
-                15 => 'comment',
-                16 => 'comment',
-                17 => 'string',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 'special',
-            ),
-            2 => 
-            array (
-                0 => 'special',
-            ),
-            3 => 
-            array (
-                0 => 'special',
-            ),
-            4 => 
-            array (
-                0 => 'special',
-            ),
-            5 => 
-            array (
-                0 => 'comment',
-                1 => 'string',
-                2 => 'string',
-                3 => 'string',
-                4 => 'string',
-                5 => 'var',
-                6 => 'var',
-                7 => 'code',
-                8 => 'code',
-                9 => 'identifier',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-                13 => 'number',
-                14 => 'number',
-                15 => 'comment',
-                16 => 'comment',
-                17 => 'string',
-            ),
-            6 => 
-            array (
-                0 => 'comment',
-                1 => 'string',
-                2 => 'string',
-                3 => 'string',
-                4 => 'string',
-                5 => 'var',
-                6 => 'var',
-                7 => 'code',
-                8 => 'code',
-                9 => 'identifier',
-                10 => 'number',
-                11 => 'number',
-                12 => 'number',
-                13 => 'number',
-                14 => 'number',
-                15 => 'comment',
-                16 => 'comment',
-                17 => 'string',
-            ),
-            7 => 
-            array (
-                0 => 'inlinedoc',
-            ),
-            8 => 
-            array (
-                0 => 'inlinedoc',
-            ),
-            9 => 
-            array (
-                0 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)$/',
-            1 => '/(?i)"/',
-            2 => '/(?i)%b1%/',
-            3 => '/(?i)\'/',
-            4 => '/(?i)%b1%/',
-            5 => '/(?i)\\)/',
-            6 => '/(?i)\\]/',
-            7 => '/(?mi)^=end$/',
-            8 => '/(?mi)$/',
-            9 => '/(?i)\\/[iomx]*/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => -1,
-                6 => -1,
-                7 => 5,
-                8 => 6,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => 7,
-                16 => 8,
-                17 => 9,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => -1,
-            ),
-            2 => 
-            array (
-                0 => -1,
-            ),
-            3 => 
-            array (
-                0 => -1,
-            ),
-            4 => 
-            array (
-                0 => -1,
-            ),
-            5 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => -1,
-                6 => -1,
-                7 => 5,
-                8 => 6,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => 7,
-                16 => 8,
-                17 => 9,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => 3,
-                4 => 4,
-                5 => -1,
-                6 => -1,
-                7 => 5,
-                8 => 6,
-                9 => -1,
-                10 => -1,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => 7,
-                16 => 8,
-                17 => 9,
-            ),
-            7 => 
-            array (
-                0 => -1,
-            ),
-            8 => 
-            array (
-                0 => -1,
-            ),
-            9 => 
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                    'reserved' => '/^(__FILE__|require|and|def|end|in|or|self|unless|__LINE__|begin|defined?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|module_function|private|public|protected|attr_reader|attr_writer|attr_accessor|class|elsif|if|not|return|undef|yield)$/',
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => -1,
-                16 => -1,
-                17 => -1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            5 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                    'reserved' => '/^(__FILE__|require|and|def|end|in|or|self|unless|__LINE__|begin|defined?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|module_function|private|public|protected|attr_reader|attr_writer|attr_accessor|class|elsif|if|not|return|undef|yield)$/',
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => -1,
-                16 => -1,
-                17 => -1,
-            ),
-            6 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => -1,
-                5 => 
-                array (
-                ),
-                6 => 
-                array (
-                ),
-                7 => -1,
-                8 => -1,
-                9 => 
-                array (
-                    'reserved' => '/^(__FILE__|require|and|def|end|in|or|self|unless|__LINE__|begin|defined?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|module_function|private|public|protected|attr_reader|attr_writer|attr_accessor|class|elsif|if|not|return|undef|yield)$/',
-                ),
-                10 => 
-                array (
-                ),
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => -1,
-                16 => -1,
-                17 => -1,
-            ),
-            7 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            8 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            9 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => NULL,
-            ),
-            2 => 
-            array (
-                0 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-            ),
-            5 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-                17 => NULL,
-            ),
-            6 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => NULL,
-                16 => NULL,
-                17 => NULL,
-            ),
-            7 => 
-            array (
-                0 => NULL,
-            ),
-            8 => 
-            array (
-                0 => NULL,
-            ),
-            9 => 
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => true,
-                3 => false,
-                4 => true,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-                0 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-            ),
-            5 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => true,
-                3 => false,
-                4 => true,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-            ),
-            6 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => true,
-                3 => false,
-                4 => true,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-            ),
-            7 => 
-            array (
-                0 => false,
-            ),
-            8 => 
-            array (
-                0 => false,
-            ),
-            9 => 
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'reserved' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer.php b/library/Text_Highlighter/Text/Highlighter/Renderer.php
deleted file mode 100644
index cb8993ff8..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Renderer.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * Abstract base class for Highlighter renderers
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * Abstract base class for Highlighter renderers
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- * @abstract
- */
-
-class Text_Highlighter_Renderer
-{
-    /**
-     * Renderer options
-     *
-     * @var array
-     * @access protected
-     */
-    var $_options = array();
-
-    /**
-     * Current language
-     *
-     * @var string
-     * @access protected
-     */
-    var $_language = '';
-
-    /**
-     * Constructor
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function __construct($options = array())
-    {
-        $this->_options = $options;
-    }
-
-    /**
-     * PHP4 compatable constructor
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function Text_Highlighter_Renderer($options = array())
-    {
-        $this->__construct($options);
-    }
-
-    /**
-     * Resets renderer state
-     *
-     * @access public
-     *
-     * @param  array $options  Rendering options. Renderer-specific.
-     */
-    function reset()
-    {
-        return;
-    }
-
-    /**
-     * Preprocesses code
-     *
-     * @access public
-     *
-     * @param  string $str Code to preprocess
-     * @return string Preprocessed code
-     */
-    function preprocess($str)
-    {
-        return $str;
-    }
-
-    /**
-     * Accepts next token
-     *
-     * @abstract
-     * @access public
-     *
-     * @param  string $class   Token class
-     * @param  string $content Token content
-     */
-    function acceptToken($class, $content)
-    {
-        return;
-    }
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @access public
-     *
-     */
-    function finalize()
-    {
-        return;
-    }
-
-    /**
-     * Get generated output
-     *
-     * @abstract
-     * @return mixed Renderer-specific
-     * @access public
-     *
-     */
-    function getOutput()
-    {
-        return;
-    }
-
-    /**
-     * Set current language
-     *
-     * @abstract
-     * @return void
-     * @access public
-     *
-     */
-    function setCurrentLanguage($lang)
-    {
-        $this->_language = $lang;
-    }
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/Array.php b/library/Text_Highlighter/Text/Highlighter/Renderer/Array.php
deleted file mode 100644
index edf6290f8..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Renderer/Array.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * Array renderer.
- *
- * Produces an array that contains class names and content pairs.
- * The array can be enumerated or associative. Associative means
- * <code>class =&gt; content</code> pairs.
- * Based on the HTML renderer by Andrey Demenev.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter/Renderer.php';
-
-/**
- * Array renderer, based on Andrey Demenev's HTML renderer.
- *
- * In addition to the options supported by the HTML renderer,
- * the following options were also introduced:
- * <ul><li>htmlspecialchars - whether or not htmlspecialchars() will
- *                            be called on the content, default TRUE</li>
- *     <li>enumerated - type of array produced, default FALSE,
- *                            meaning associative array</li>
- * </ul>
- *
- *
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_Array extends Text_Highlighter_Renderer
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * Tab size
-     *
-     * @var integer
-     */
-    var $_tabsize = 4;
-
-    /**
-     * Should htmlentities() will be called
-     *
-     * @var boolean
-     */
-    var $_htmlspecialchars = true;
-
-    /**
-     * Enumerated or associative array
-     *
-     * @var integer
-     */
-    var $_enumerated = false;
-
-    /**
-     * Array containing highlighting rules
-     *
-     * @var array
-     */
-    var $_output = array();
-
-    /**#@-*/
-
-    /**
-     * Preprocesses code
-     *
-     * @access public
-     *
-     * @param  string $str Code to preprocess
-     * @return string Preprocessed code
-     */
-    function preprocess($str)
-    {
-        // normalize whitespace and tabs
-        $str = str_replace("\r\n","\n", $str);
-        $str = str_replace("\r","\n", $str);
-        // some browsers refuse to display empty lines
-        $str = preg_replace('~^$~m'," ", $str);
-        $str = str_replace("\t",str_repeat(' ', $this->_tabsize), $str);
-        return rtrim($str);
-    }
-
-
-    /**
-     * Resets renderer state
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     *
-     * @access protected
-     */
-    function reset()
-    {
-        $this->_output = array();
-        $this->_lastClass = 'default';
-        if (isset($this->_options['tabsize'])) {
-            $this->_tabsize = $this->_options['tabsize'];
-        }
-        if (isset($this->_options['htmlspecialchars'])) {
-            $this->_htmlspecialchars = $this->_options['htmlspecialchars'];
-        }
-        if (isset($this->_options['enumerated'])) {
-            $this->_enumerated = $this->_options['enumerated'];
-        }
-    }
-
-
-
-    /**
-     * Accepts next token
-     *
-     * @abstract
-     * @access public
-     * @param  string $class   Token class
-     * @param  string $content Token content
-     */
-    function acceptToken($class, $content)
-    {
-
-        if(! is_array($this->_output)) {
-            $this->_output = array();
-        }
-        $theClass = $this->_getFullClassName($class);
-        if ($this->_htmlspecialchars) {
-            $content = htmlspecialchars($content);
-        }
-        if ($this->_enumerated) {
-            $this->_output[] = array($class, $content);
-        } else {
-            $this->_output[][$class] = $content;
-        }
-        $this->_lastClass = $class;
-
-    }
-
-
-    /**
-     * Given a CSS class name, returns the class name
-     * with language name prepended, if necessary
-     *
-     * @access private
-     *
-     * @param  string $class   Token class
-     */
-    function _getFullClassName($class)
-    {
-        if (!empty($this->_options['use_language'])) {
-            $theClass = $this->_language . '-' . $class;
-        } else {
-            $theClass = $class;
-        }
-        return $theClass;
-    }
-
-    /**
-     * Get generated output
-     *
-     * @abstract
-     * @return array Highlighted code as an array
-     * @access public
-     */
-    function getOutput()
-    {
-        return $this->_output;
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/BB.php b/library/Text_Highlighter/Text/Highlighter/Renderer/BB.php
deleted file mode 100644
index abd77cfd8..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Renderer/BB.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * BB code renderer.
- *
- * This BB renderer produces BB code, ready to be pasted in bulletin boards and
- * other applications that accept BB code. Based on the HTML renderer by Andrey Demenev.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2005 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter/Renderer.php';
-
-/**
- * BB code renderer, based on Andrey Demenev's HTML renderer.
- *
- * Elements of $options argument of constructor (each being optional):
- *
- * - 'numbers' - Line numbering TRUE or FALSE
- * - 'tabsize' - Tab size, default is 4
- * - 'bb_tags' - An array containing three BB tags, see below
- * - 'tag_brackets' - An array that conains opening and closing tags, [ and ]
- * - 'colors' - An array with all the colors to be used for highlighting
- *
- * The default BB tags are:
- * - 'color' => 'color'
- * - 'list'  => 'list'
- * - 'list_item' => '*'
- *
- * The default colors for the highlighter are:
- * - 'default'    => 'Black',
- * - 'code'       => 'Gray',
- * - 'brackets'   => 'Olive',
- * - 'comment'    => 'Orange',
- * - 'mlcomment'  => 'Orange',
- * - 'quotes'     => 'Darkred',
- * - 'string'     => 'Red',
- * - 'identifier' => 'Blue',
- * - 'builtin'    => 'Teal',
- * - 'reserved'   => 'Green',
- * - 'inlinedoc'  => 'Blue',
- * - 'var'        => 'Darkblue',
- * - 'url'        => 'Blue',
- * - 'special'    => 'Navy',
- * - 'number'     => 'Maroon',
- * - 'inlinetags' => 'Blue',
- *
- *
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  20045 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_BB extends Text_Highlighter_Renderer_Array
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * Line numbering - will use the specified BB tag for listings
-     *
-     * @var boolean
-     */
-    var $_numbers = false;
-
-    /**
-     * BB tags to be used
-     *
-     * @var array
-     */
-    var $_bb_tags = array (
-        'color'     => 'color',
-        'list'      => 'list',
-        'list_item' => '*',
-        'code'      => 'code',
-    );
-
-    /**
-     * BB brackets - [ and ]
-     *
-     * @var array
-     */
-    var $_tag_brackets = array ('start' => '[', 'end' => ']');
-
-    /**
-     * Colors map
-     *
-     * @var boolean
-     */
-    var $_colors = array(
-        'default'    => 'Black',
-        'code'       => 'Gray',
-        'brackets'   => 'Olive',
-        'comment'    => 'Orange',
-        'mlcomment'  => 'Orange',
-        'quotes'     => 'Darkred',
-        'string'     => 'Red',
-        'identifier' => 'Blue',
-        'builtin'    => 'Teal',
-        'reserved'   => 'Green',
-        'inlinedoc'  => 'Blue',
-        'var'        => 'Darkblue',
-        'url'        => 'Blue',
-        'special'    => 'Navy',
-        'number'     => 'Maroon',
-        'inlinetags' => 'Blue',
-    );
-
-    /**#@-*/
-
-    /**
-     * Resets renderer state
-     *
-     * @access protected
-     *
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     */
-    function reset()
-    {
-        parent::reset();
-        if (isset($this->_options['numbers'])) {
-            $this->_numbers = $this->_options['numbers'];
-        }
-        if (isset($this->_options['bb_tags'])) {
-            $this->_bb_tags = array_merge($this->_bb_tags, $this->_options['bb_tags']);
-        }
-        if (isset($this->_options['tag_brackets'])) {
-            $this->_tag_brackets = array_merge($this->_tag_brackets, $this->_options['tag_brackets']);
-        }
-        if (isset($this->_options['colors'])) {
-            $this->_colors = array_merge($this->_colors, $this->_options['colors']);
-        }
-    }
-
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @abstract
-     * @access public
-     *
-     */
-    function finalize()
-    {
-
-        // get parent's output
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $bb_output = '';
-
-        $color_start = $this->_tag_brackets['start'] . $this->_bb_tags['color'] . '=%s'  . $this->_tag_brackets['end'];
-        $color_end   = $this->_tag_brackets['start'] . '/' . $this->_bb_tags['color'] . $this->_tag_brackets['end'];
-
-        // loop through each class=>content pair
-        foreach ($output AS $token) {
-
-            if ($this->_enumerated) {
-                $class = $token[0];
-                $content = $token[1];
-            } else {
-                $key = key($token);
-                $class = $key;
-                $content = $token[$key];
-            }
-
-            $iswhitespace = ctype_space($content);
-            if (!$iswhitespace && !empty($this->_colors[$class])) {
-                $bb_output .= sprintf($color_start, $this->_colors[$class]);
-                $bb_output .= $content;
-                $bb_output .= $color_end;
-            } else {
-                $bb_output .= $content;
-            }
-        }
-
-        if ($this->_numbers) {
-
-            $item_tag = $this->_tag_brackets['start'] .
-                        $this->_bb_tags['list_item'] .
-                        $this->_tag_brackets['end'];
-            $this->_output = $item_tag . str_replace("\n", "\n". $item_tag .' ', $bb_output);
-            $this->_output = $this->_tag_brackets['start'] .
-                             $this->_bb_tags['list'] .
-                             $this->_tag_brackets['end'] .
-                             $this->_output .
-                             $this->_tag_brackets['start'] .
-                             '/'.
-                             $this->_bb_tags['list'] .
-                             $this->_tag_brackets['end']
-                             ;
-        } else {
-            $this->_output = $this->_tag_brackets['start'] .
-                             $this->_bb_tags['code'] .
-                             $this->_tag_brackets['end'] .
-                             $bb_output .
-                             $this->_tag_brackets['start'] .
-                             '/' .
-                             $this->_bb_tags['code'] .
-                             $this->_tag_brackets['end'];
-        }
-    }
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/Console.php b/library/Text_Highlighter/Text/Highlighter/Renderer/Console.php
deleted file mode 100644
index d7b1fba88..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Renderer/Console.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * Console renderer
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter/Renderer.php';
-
-define ('HL_CONSOLE_DEFCOLOR', "\033[0m");
-
-/**
- * Console renderer
- *
- * Suitable for displaying text on color-capable terminals, directly
- * or trough less -r
- *
- * Elements of $options argument of constructor (each being optional):
- *
- * - 'numbers' - whether to add line numbers
- * - 'tabsize' - Tab size
- * - 'colors'  - additional colors
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_Console extends Text_Highlighter_Renderer
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * class of last outputted text chunk
-     *
-     * @var string
-     */
-    var $_lastClass;
-
-    /**
-     * Line numbering
-     *
-     * @var boolean
-     */
-    var $_numbers = false;
-
-    /**
-     * Tab size
-     *
-     * @var integer
-     */
-    var $_tabsize = 4;
-
-    /**
-     * Highlighted code
-     *
-     * @var string
-     */
-    var $_output = '';
-
-    /**#@-*/
-
-    var $_colors = array();
-
-    var $_defColors = array(
-        'default' => "\033[0m",
-        'inlinetags' => "\033[31m",
-        'brackets' => "\033[36m",
-        'quotes' => "\033[34m",
-        'inlinedoc' => "\033[34m",
-        'var' => "\033[1m",
-        'types' => "\033[32m",
-        'number' => "\033[32m",
-        'string' => "\033[31m",
-        'reserved' => "\033[35m",
-        'comment' => "\033[33m",
-        'mlcomment' => "\033[33m",
-    );
-
-    function preprocess($str)
-    {
-        // normalize whitespace and tabs
-        $str = str_replace("\r\n","\n", $str);
-        $str = str_replace("\t",str_repeat(' ', $this->_tabsize), $str);
-        return rtrim($str);
-    }
-
-
-    /**
-     * Resets renderer state
-     *
-     * @access protected
-     *
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     */
-    function reset()
-    {
-        $this->_lastClass = '';
-        if (isset($this->_options['numbers'])) {
-            $this->_numbers = (bool)$this->_options['numbers'];
-        } else {
-            $this->_numbers = false;
-        }
-        if (isset($this->_options['tabsize'])) {
-            $this->_tabsize = $this->_options['tabsize'];
-        } else {
-            $this->_tabsize = 4;
-        }
-        if (isset($this->_options['colors'])) {
-            $this->_colors = array_merge($this->_defColors, $this->_options['colors']);
-        } else {
-            $this->_colors = $this->_defColors;
-        }
-        $this->_output = '';
-    }
-
-
-
-    /**
-     * Accepts next token
-     *
-     * @access public
-     *
-     * @param  string $class   Token class
-     * @param  string $content Token content
-     */
-    function acceptToken($class, $content)
-    {
-        if (isset($this->_colors[$class])) {
-            $color = $this->_colors[$class];
-        } else {
-            $color = $this->_colors['default'];
-        }
-        if ($this->_lastClass != $class) {
-            $this->_output .= $color;
-        }
-        $content = str_replace("\n", $this->_colors['default'] . "\n" . $color, $content);
-        $content .= $this->_colors['default'];
-        $this->_output .= $content;
-    }
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @access public
-     *
-     */
-    function finalize()
-    {
-        if ($this->_numbers) {
-            $nlines = substr_count($this->_output, "\n") + 1;
-            $len = strlen($nlines);
-            $i = 1;
-            $this->_output = preg_replace('~^~em', '" " . str_pad($i++, $len, " ", STR_PAD_LEFT) . ": "', $this->_output);
-        }
-        $this->_output .= HL_CONSOLE_DEFCOLOR . "\n";
-    }
-
-    /**
-     * Get generated output
-     *
-     * @return string Highlighted code
-     * @access public
-     *
-     */
-    function getOutput()
-    {
-        return $this->_output;
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/Html.php b/library/Text_Highlighter/Text/Highlighter/Renderer/Html.php
deleted file mode 100644
index 5d6e56ae1..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Renderer/Html.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * HTML renderer
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter/Renderer.php';
-require_once 'Text/Highlighter/Renderer/Array.php';
-
-// BC trick : only define constants if Text/Highlighter.php
-// is not yet included
-if (!defined('HL_NUMBERS_LI')) {
-    /**#@+
-     * Constant for use with $options['numbers']
-     */
-    /**
-     * use numbered list, deprecated, use HL_NUMBERS_OL instaed
-     * @deprecated
-     */
-    define ('HL_NUMBERS_LI'    ,    1);
-    /**
-     * Use 2-column table with line numbers in left column and code in  right column.
-     */
-    define ('HL_NUMBERS_TABLE'    , 2);
-    /**#@-*/
-}
-
-
-/**#@+
- * Constant for use with $options['numbers']
- */
-/**
- * Use numbered list
- */
-define ('HL_NUMBERS_OL',    1);
-/**
- * Use non-numbered list
- */
-define ('HL_NUMBERS_UL',    3);
-/**#@-*/
-
-
-/**
- * HTML renderer
- *
- * Elements of $options argument of constructor (each being optional):
- *
- * - 'numbers' - Line numbering style 0 or {@link HL_NUMBERS_TABLE}
- *               or {@link HL_NUMBERS_UL} or {@link HL_NUMBERS_OL}
- * - 'numbers_start' - starting number for numbered lines
- * - 'tabsize' - Tab size
- * - 'style_map' - Mapping of keywords to formatting rules using inline styles
- * - 'class_map' - Mapping of keywords to formatting rules using class names
- * - 'doclinks' - array that has keys "url", "target" and "elements", used for
- *                generating links to online documentation
- * - 'use_language' - class names will be prefixed with language, like "php-reserved" or "css-code"
- *
- * Example of setting documentation links:
- * $options['doclinks'] = array(
- *   'url' => 'http://php.net/%s',
- *   'target' => '_blank',
- *   'elements' => array('reserved', 'identifier')
- * );
- *
- * Example of setting class names map:
- * $options['class_map'] = array(
- *       'main'       => 'my-main',
- *       'table'      => 'my-table',
- *       'gutter'     => 'my-gutter',
- *       'brackets'   => 'my-brackets',
- *       'builtin'    => 'my-builtin',
- *       'code'       => 'my-code',
- *       'comment'    => 'my-comment',
- *       'default'    => 'my-default',
- *       'identifier' => 'my-identifier',
- *       'inlinedoc'  => 'my-inlinedoc',
- *       'inlinetags' => 'my-inlinetags',
- *       'mlcomment'  => 'my-mlcomment',
- *       'number'     => 'my-number',
- *       'quotes'     => 'my-quotes',
- *       'reserved'   => 'my-reserved',
- *       'special'    => 'my-special',
- *       'string'     => 'my-string',
- *       'url'        => 'my-url',
- *       'var'        => 'my-var',
- * );
- *
- * Example of setting styles mapping:
- * $options['style_map'] = array(
- *       'main'       => 'color: black',
- *       'table'      => 'border: 1px solid black',
- *       'gutter'     => 'background-color: yellow',
- *       'brackets'   => 'color: blue',
- *       'builtin'    => 'color: red',
- *       'code'       => 'color: green',
- *       'comment'    => 'color: orange',
- *       // ....
- * );
- *
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_Html extends Text_Highlighter_Renderer_Array
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * Line numbering style
-     *
-     * @var integer
-     */
-    var $_numbers = 0;
-
-    /**
-     * For numberered lines - where to start
-     *
-     * @var integer
-     */
-    var $_numbers_start = 0;
-
-    /**
-     * Tab size
-     *
-     * @var integer
-     */
-    var $_tabsize = 4;
-
-    /**
-     * Highlighted code
-     *
-     * @var string
-     */
-    var $_output = '';
-
-    /**
-     * Mapping of keywords to formatting rules using inline styles
-     *
-     * @var array
-     */
-    var $_style_map = array();
-
-    /**
-     * Mapping of keywords to formatting rules using class names
-     *
-     * @var array
-     */
-    var $_class_map = array(
-        'main'       => 'hl-main',
-        'table'      => 'hl-table',
-        'gutter'     => 'hl-gutter',
-        'brackets'   => 'hl-brackets',
-        'builtin'    => 'hl-builtin',
-        'code'       => 'hl-code',
-        'comment'    => 'hl-comment',
-        'default'    => 'hl-default',
-        'identifier' => 'hl-identifier',
-        'inlinedoc'  => 'hl-inlinedoc',
-        'inlinetags' => 'hl-inlinetags',
-        'mlcomment'  => 'hl-mlcomment',
-        'number'     => 'hl-number',
-        'prepro'     => 'hl-prepro',
-        'quotes'     => 'hl-quotes',
-        'reserved'   => 'hl-reserved',
-        'special'    => 'hl-special',
-        'string'     => 'hl-string',
-        'types'      => 'hl-types',
-        'url'        => 'hl-url',
-        'var'        => 'hl-var',
-    );
-
-    /**
-     * Setup for links to online documentation
-     *
-     * This is an array with keys:
-     * - url, ex. http://php.net/%s
-     * - target, ex. _blank, default - no target
-     * - elements, default is <code>array('reserved', 'identifier')</code>
-     *
-     * @var array
-     */
-    var $_doclinks = array();
-
-    /**#@-*/
-
-
-    /**
-     * Resets renderer state
-     *
-     * @access protected
-     *
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     */
-    function reset()
-    {
-        $this->_output = '';
-        if (isset($this->_options['numbers'])) {
-            $this->_numbers = (int)$this->_options['numbers'];
-            if ($this->_numbers != HL_NUMBERS_LI
-             && $this->_numbers != HL_NUMBERS_UL
-             && $this->_numbers != HL_NUMBERS_OL
-             && $this->_numbers != HL_NUMBERS_TABLE
-             ) {
-                $this->_numbers = 0;
-            }
-        }
-        if (isset($this->_options['tabsize'])) {
-            $this->_tabsize = $this->_options['tabsize'];
-        }
-        if (isset($this->_options['numbers_start'])) {
-            $this->_numbers_start = intval($this->_options['numbers_start']);
-        }
-        if (isset($this->_options['doclinks']) &&
-            is_array($this->_options['doclinks']) &&
-            !empty($this->_options['doclinks']['url'])
-        ) {
-
-            $this->_doclinks = $this->_options['doclinks']; // keys: url, target, elements array
-
-            if (empty($this->_options['doclinks']['elements'])) {
-                $this->_doclinks['elements'] = array('reserved', 'identifier');
-            }
-        }
-        if (isset($this->_options['style_map'])) {
-            $this->_style_map = $this->_options['style_map'];
-        }
-        if (isset($this->_options['class_map'])) {
-            $this->_class_map = array_merge($this->_class_map, $this->_options['class_map']);
-        }
-        $this->_htmlspecialchars = true;
-
-    }
-
-
-    /**
-     * Given a CSS class name, returns the class name
-     * with language name prepended, if necessary
-     *
-     * @access private
-     *
-     * @param  string $class   Token class
-     */
-    function _getFullClassName($class)
-    {
-        if (!empty($this->_options['use_language'])) {
-            $the_class = $this->_language . '-' . $class;
-        } else {
-            $the_class = $class;
-        }
-        return $the_class;
-    }
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @access public
-     */
-    function finalize()
-    {
-
-        // get parent's output
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $html_output = '';
-
-        $numbers_li = false;
-
-        if (
-            $this->_numbers == HL_NUMBERS_LI ||
-            $this->_numbers == HL_NUMBERS_UL ||
-            $this->_numbers == HL_NUMBERS_OL
-           )
-        {
-            $numbers_li = true;
-        }
-
-        // loop through each class=>content pair
-        foreach ($output AS $token) {
-
-            if ($this->_enumerated) {
-                $key = false;
-                $the_class = $token[0];
-                $content = $token[1];
-            } else {
-                $key = key($token);
-                $the_class = $key;
-                $content = $token[$key];
-            }
-
-            $span = $this->_getStyling($the_class);
-            $decorated_output = $this->_decorate($content, $key);
-
-
-            if ($numbers_li == true) {
-                // end span tags before end of li, and re-open on next line
-                $lastSpanTag = str_replace("%s</span>", "", $span);
-                $span = sprintf($span, $decorated_output);
-                $span = str_replace("\n", "</span></li>\n<li>$lastSpanTag&nbsp;", $span);
-                $html_output .= $span;
-            } else {
-                $html_output .= sprintf($span, $decorated_output);
-            }
-
-
-        }
-
-        // format lists
-        if (!empty($this->_numbers) && $numbers_li == true) {
-
-
-            // additional whitespace for browsers that do not display
-            // empty list items correctly
-            $this->_output = '<li>&nbsp;' . $html_output . '</li>';
-
-            $start = '';
-            if ($this->_numbers == HL_NUMBERS_OL && intval($this->_numbers_start) > 0)  {
-                $start = ' start="' . $this->_numbers_start . '"';
-            }
-
-            $list_tag = 'ol';
-            if ($this->_numbers == HL_NUMBERS_UL)  {
-                $list_tag = 'ul';
-            }
-
-
-            $this->_output = '<' . $list_tag . $start
-                             . ' ' . $this->_getStyling('main', false) . '>'
-                             . $this->_output . '</'. $list_tag .'>';
-
-        // render a table
-        } else if ($this->_numbers == HL_NUMBERS_TABLE) {
-
-
-            $start_number = 0;
-            if (intval($this->_numbers_start)) {
-                $start_number = $this->_numbers_start - 1;
-            }
-
-            $numbers = '';
-
-            $nlines = substr_count($html_output,"\n")+1;
-            for ($i=1; $i <= $nlines; $i++) {
-                $numbers .= ($start_number + $i) . "\n";
-            }
-            $this->_output = '<table ' . $this->_getStyling('table', false) . ' width="100%"><tr>' .
-                             '<td '. $this->_getStyling('gutter', false) .' align="right" valign="top">' .
-                             '<pre>' . $numbers . '</pre></td><td '. $this->_getStyling('main', false) .
-                             ' valign="top"><pre>' .
-                             $html_output . '</pre></td></tr></table>';
-        }
-        if (!$this->_numbers) {
-            $this->_output = '<pre>' . $html_output . '</pre>';
-        }
-        $this->_output = '<div ' . $this->_getStyling('main', false) . '>' . $this->_output . '</div>';
-    }
-
-
-    /**
-     * Provides additional formatting to a keyword
-     *
-     * @param string $content Keyword
-     * @return string Keyword with additional formatting
-     * @access public
-     *
-     */
-    function _decorate($content, $key = false)
-    {
-        // links to online documentation
-        if (!empty($this->_doclinks) &&
-            !empty($this->_doclinks['url']) &&
-            in_array($key, $this->_doclinks['elements'])
-        ) {
-
-            $link = '<a href="'. sprintf($this->_doclinks['url'], $content) . '"';
-            if (!empty($this->_doclinks['target'])) {
-                $link.= ' target="' . $this->_doclinks['target'] . '"';
-            }
-            $link .= '>';
-            $link.= $content;
-            $link.= '</a>';
-
-            $content = $link;
-
-        }
-
-        return $content;
-    }
-
-    /**
-     * Returns <code>class</code> and/or <code>style</code> attribute,
-     * optionally enclosed in a <code>span</code> tag
-     *
-     * @param string $class Class name
-     * @paran boolean $span_tag Whether or not to return styling attributes in a <code>&gt;span&lt;</code> tag
-     * @return string <code>span</code> tag or just a <code>class</code> and/or <code>style</code> attributes
-     * @access private
-     */
-    function _getStyling($class, $span_tag = true)
-    {
-        $attrib = '';
-        if (!empty($this->_style_map) &&
-            !empty($this->_style_map[$class])
-        ) {
-            $attrib = 'style="'. $this->_style_map[$class] .'"';
-        }
-        if (!empty($this->_class_map) &&
-            !empty($this->_class_map[$class])
-        ) {
-            if ($attrib) {
-                $attrib .= ' ';
-            }
-            $attrib .= 'class="'. $this->_getFullClassName($this->_class_map[$class]) .'"';
-        }
-
-        if ($span_tag) {
-            $span = '<span ' . $attrib . '>%s</span>';
-            return $span;
-        } else {
-            return $attrib;
-        }
-
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/HtmlTags.php b/library/Text_Highlighter/Text/Highlighter/Renderer/HtmlTags.php
deleted file mode 100644
index 68e01d3e0..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Renderer/HtmlTags.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * HTML renderer that uses only basic html tags
- *
- * PHP versions 4 and 5. Based on the "normal" HTML renderer by Andrey Demenev.
- * It's designed to work with user agents that support only a limited number of
- * HTML tags. Like the iPod which supports only b, i, u and a.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2005 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter/Renderer.php';
-require_once 'Text/Highlighter/Renderer/Array.php';
-
-/**
- * HTML basic tags renderer, based on Andrey Demenev's HTML renderer.
- *
- * Elements of $options argument of constructor (each being optional):
- *
- * - 'numbers' - Line numbering TRUE or FALSE. Default is FALSE.
- * - 'tabsize' - Tab size, default is 4.
- * - 'tags'    - Array, containing the tags to be used for highlighting
- *
- * Here's the listing of the default tags:
- * - 'default'    => '',
- * - 'code'       => '',
- * - 'brackets'   => 'b',
- * - 'comment'    => 'i',
- * - 'mlcomment'  => 'i',
- * - 'quotes'     => '',
- * - 'string'     => 'i',
- * - 'identifier' => 'b',
- * - 'builtin'    => 'b',
- * - 'reserved'   => 'u',
- * - 'inlinedoc'  => 'i',
- * - 'var'        => 'b',
- * - 'url'        => 'i',
- * - 'special'    => '',
- * - 'number'     => '',
- * - 'inlinetags' => ''
- *
- * @author Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2005 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_HtmlTags extends Text_Highlighter_Renderer_Array
-{
-
-    /**#@+
-     * @access private
-     */
-
-    /**
-     * Line numbering - will use 'ol' tag
-     *
-     * @var boolean
-     */
-    var $_numbers = false;
-
-    /**
-     * HTML tags map
-     *
-     * @var array
-     */
-    var $_hilite_tags = array(
-        'default'    => '',
-        'code'       => '',
-        'brackets'   => 'b',
-        'comment'    => 'i',
-        'mlcomment'  => 'i',
-        'quotes'     => '',
-        'string'     => 'i',
-        'identifier' => 'b',
-        'builtin'    => 'b',
-        'reserved'   => 'u',
-        'inlinedoc'  => 'i',
-        'var'        => 'b',
-        'url'        => 'i',
-        'special'    => '',
-        'number'     => '',
-        'inlinetags' => '',
-    );
-
-    /**#@-*/
-
-    /**
-     * Resets renderer state
-     *
-     * @access protected
-     *
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     */
-    function reset()
-    {
-        parent::reset();
-        if (isset($this->_options['numbers'])) {
-            $this->_numbers = $this->_options['numbers'];
-        }
-        if (isset($this->_options['tags'])) {
-            $this->_hilite_tags = array_merge($this->_tags, $this->_options['tags']);
-        }
-    }
-
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @abstract
-     * @access public
-     *
-     */
-    function finalize()
-    {
-
-        // get parent's output
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $html_output = '';
-
-        // loop through each class=>content pair
-        foreach ($output AS $token) {
-
-            if ($this->_enumerated) {
-                $class = $token[0];
-                $content = $token[1];
-            } else {
-                $key = key($token);
-                $class = $key;
-                $content = $token[$key];
-            }
-
-            $iswhitespace = ctype_space($content);
-            if (!$iswhitespace && !empty($this->_hilite_tags[$class])) {
-                $html_output .= '<'. $this->_hilite_tags[$class] . '>' . $content . '</'. $this->_hilite_tags[$class] . '>';
-            } else {
-                $html_output .= $content;
-            }
-        }
-
-
-        if ($this->_numbers) {
-            /* additional whitespace for browsers that do not display
-            empty list items correctly */
-            $html_output = '<li>&nbsp;' . str_replace("\n", "</li>\n<li>&nbsp;", $html_output) . '</li>';
-            $this->_output = '<ol>' . str_replace(' ', '&nbsp;', $html_output) . '</ol>';
-        } else {
-            $this->_output = '<pre>' . $html_output . '</pre>';
-        }
-    }
-
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/JSON.php b/library/Text_Highlighter/Text/Highlighter/Renderer/JSON.php
deleted file mode 100644
index d4c926161..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Renderer/JSON.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * JSON renderer.
- *
- * Based on the HTML renderer by Andrey Demenev.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter/Renderer.php';
-require_once 'Text/Highlighter/Renderer/Array.php';
-
-/**
- * JSON renderer, based on Andrey Demenev's HTML renderer.
- *
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_JSON extends Text_Highlighter_Renderer_Array
-{
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @abstract
-     * @access public
-     */
-    function finalize()
-    {
-
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $json_array = array();
-
-        foreach ($output AS $token) {
-
-            if ($this->_enumerated) {
-                $json_array[] = '["' . $token[0] . '","' . $token[1] . '"]';
-            } else {
-                $key = key($token);
-                $json_array[] = '{"class": "' . $key . '","content":"' . $token[$key] . '"}';
-            }
-
-        }
-
-        $this->_output  = '['. implode(',', $json_array) .']';
-        $this->_output = str_replace("\n", '\n', $this->_output);
-
-    }
-
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/XML.php b/library/Text_Highlighter/Text/Highlighter/Renderer/XML.php
deleted file mode 100644
index 7b6fb2106..000000000
--- a/library/Text_Highlighter/Text/Highlighter/Renderer/XML.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * XML renderer.
- *
- * Based on the HTML renderer by Andrey Demenev.
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter/Renderer.php';
-require_once 'Text/Highlighter/Renderer/Array.php';
-require_once 'XML/Serializer.php';
-
-/**
- * XML renderer, based on Andrey Demenev's HTML renderer.
- *
- * @author     Stoyan Stefanov <ssttoo@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2006 Stoyan Stefanov
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.5.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-class Text_Highlighter_Renderer_XML extends Text_Highlighter_Renderer_Array
-{
-
-
-    /**
-     * Options for XML_Serializer
-     *
-     * @access private
-     * @var array
-     */
-    var $_serializer_options = array();
-
-
-    /**
-     * Resets renderer state
-     *
-     * Descendents of Text_Highlighter call this method from the constructor,
-     * passing $options they get as parameter.
-     *
-     * @access protected
-     */
-    function reset()
-    {
-        parent::reset();
-        if (isset($this->_options['xml_serializer'])) {
-            $this->_serializer_options = $this->_options['xml_serializer'];
-        }
-    }
-
-
-    /**
-     * Signals that no more tokens are available
-     *
-     * @abstract
-     * @access public
-     */
-    function finalize()
-    {
-
-        // call parent's finalize(), then serialize array into XML
-        parent::finalize();
-        $output = parent::getOutput();
-
-        $serializer = new XML_Serializer($this->_serializer_options);
-        $result = $serializer->serialize($output);
-        if ($result === true) {
-            $this->_output = $serializer->getSerializedData();
-        }
-    }
-
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-
-?>
diff --git a/library/Text_Highlighter/Text/Highlighter/SH.php b/library/Text_Highlighter/Text/Highlighter/SH.php
deleted file mode 100644
index ff779868f..000000000
--- a/library/Text_Highlighter/Text/Highlighter/SH.php
+++ /dev/null
@@ -1,1225 +0,0 @@
-<?php
-/**
- * Auto-generated class. SH syntax highlighting
- * 
- * This highlighter is EXPERIMENTAL. It may work incorrectly.
- *       It is a crude hack of the perl syntax, which itself wasn't so good.
- *       But this seems to work OK.
- *    
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : sh.xml,v 1.2 2007/06/14 00:15:50 ssttoo Exp 
- * @author Noah Spurrier <noah@noah.org>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. SH syntax highlighting
- *
- * @author Noah Spurrier <noah@noah.org>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_SH extends Text_Highlighter
-{
-    var $_language = 'sh';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_SH($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?m)^(#!)(.*))|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
-            0 => '/((?m)^(#!)(.*))|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
-            1 => '/((?m)^(#!)(.*))|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|((?i)([a-z1-9_]+)(\\s*=>))|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
-            2 => '/((?m)^(#!)(.*))|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
-            3 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\[\\\\"\'`tnr\\$\\{@])/',
-            4 => '/(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            5 => '/(\\\\\\/)/',
-            6 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            7 => '/(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
-            8 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\[\\\\"\'`tnr\\$\\{@])/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 2,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 2,
-                5 => 9,
-                6 => 9,
-                7 => 0,
-                8 => 8,
-                9 => 5,
-                10 => 0,
-                11 => 0,
-                12 => 3,
-                13 => 1,
-                14 => 3,
-                15 => 0,
-                16 => 0,
-                17 => 0,
-                18 => 0,
-                19 => 0,
-                20 => 0,
-            ),
-            0 => 
-            array (
-                0 => 2,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 2,
-                5 => 9,
-                6 => 9,
-                7 => 0,
-                8 => 8,
-                9 => 5,
-                10 => 0,
-                11 => 0,
-                12 => 3,
-                13 => 1,
-                14 => 3,
-                15 => 0,
-                16 => 0,
-                17 => 0,
-                18 => 0,
-                19 => 0,
-                20 => 0,
-            ),
-            1 => 
-            array (
-                0 => 2,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 2,
-                5 => 9,
-                6 => 9,
-                7 => 0,
-                8 => 8,
-                9 => 5,
-                10 => 0,
-                11 => 2,
-                12 => 0,
-                13 => 3,
-                14 => 1,
-                15 => 3,
-                16 => 0,
-                17 => 0,
-                18 => 0,
-                19 => 0,
-                20 => 0,
-                21 => 0,
-            ),
-            2 => 
-            array (
-                0 => 2,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 2,
-                5 => 9,
-                6 => 9,
-                7 => 0,
-                8 => 8,
-                9 => 5,
-                10 => 0,
-                11 => 0,
-                12 => 3,
-                13 => 1,
-                14 => 3,
-                15 => 0,
-                16 => 0,
-                17 => 0,
-                18 => 0,
-                19 => 0,
-                20 => 0,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 0,
-                3 => 0,
-            ),
-            4 => 
-            array (
-                0 => 0,
-            ),
-            5 => 
-            array (
-                0 => 0,
-            ),
-            6 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 0,
-                3 => 0,
-            ),
-            7 => 
-            array (
-                0 => 0,
-            ),
-            8 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 0,
-                3 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => '',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => 'quotes',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => 'quotes',
-                17 => 'quotes',
-                18 => 'quotes',
-                19 => '',
-                20 => '',
-            ),
-            0 => 
-            array (
-                0 => '',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => 'quotes',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => 'quotes',
-                17 => 'quotes',
-                18 => 'quotes',
-                19 => '',
-                20 => '',
-            ),
-            1 => 
-            array (
-                0 => '',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => 'quotes',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => '',
-                17 => 'quotes',
-                18 => 'quotes',
-                19 => 'quotes',
-                20 => '',
-                21 => '',
-            ),
-            2 => 
-            array (
-                0 => '',
-                1 => 'brackets',
-                2 => 'brackets',
-                3 => 'brackets',
-                4 => '',
-                5 => 'quotes',
-                6 => 'quotes',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => 'quotes',
-                11 => '',
-                12 => '',
-                13 => '',
-                14 => '',
-                15 => '',
-                16 => 'quotes',
-                17 => 'quotes',
-                18 => 'quotes',
-                19 => '',
-                20 => '',
-            ),
-            3 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-            4 => 
-            array (
-                0 => '',
-            ),
-            5 => 
-            array (
-                0 => '',
-            ),
-            6 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-            7 => 
-            array (
-                0 => '',
-            ),
-            8 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'special',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'special',
-                5 => 'string',
-                6 => 'string',
-                7 => 'comment',
-                8 => 'string',
-                9 => 'string',
-                10 => 'string',
-                11 => 'var',
-                12 => 'var',
-                13 => 'var',
-                14 => 'var',
-                15 => 'var',
-                16 => 'string',
-                17 => 'string',
-                18 => 'string',
-                19 => 'identifier',
-                20 => 'number',
-            ),
-            0 => 
-            array (
-                0 => 'special',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'special',
-                5 => 'string',
-                6 => 'string',
-                7 => 'comment',
-                8 => 'string',
-                9 => 'string',
-                10 => 'string',
-                11 => 'var',
-                12 => 'var',
-                13 => 'var',
-                14 => 'var',
-                15 => 'var',
-                16 => 'string',
-                17 => 'string',
-                18 => 'string',
-                19 => 'identifier',
-                20 => 'number',
-            ),
-            1 => 
-            array (
-                0 => 'special',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'special',
-                5 => 'string',
-                6 => 'string',
-                7 => 'comment',
-                8 => 'string',
-                9 => 'string',
-                10 => 'string',
-                11 => 'string',
-                12 => 'var',
-                13 => 'var',
-                14 => 'var',
-                15 => 'var',
-                16 => 'var',
-                17 => 'string',
-                18 => 'string',
-                19 => 'string',
-                20 => 'identifier',
-                21 => 'number',
-            ),
-            2 => 
-            array (
-                0 => 'special',
-                1 => 'code',
-                2 => 'code',
-                3 => 'code',
-                4 => 'special',
-                5 => 'string',
-                6 => 'string',
-                7 => 'comment',
-                8 => 'string',
-                9 => 'string',
-                10 => 'string',
-                11 => 'var',
-                12 => 'var',
-                13 => 'var',
-                14 => 'var',
-                15 => 'var',
-                16 => 'string',
-                17 => 'string',
-                18 => 'string',
-                19 => 'identifier',
-                20 => 'number',
-            ),
-            3 => 
-            array (
-                0 => 'var',
-                1 => 'var',
-                2 => 'var',
-                3 => 'special',
-            ),
-            4 => 
-            array (
-                0 => 'special',
-            ),
-            5 => 
-            array (
-                0 => 'string',
-            ),
-            6 => 
-            array (
-                0 => 'var',
-                1 => 'var',
-                2 => 'var',
-                3 => 'special',
-            ),
-            7 => 
-            array (
-                0 => 'special',
-            ),
-            8 => 
-            array (
-                0 => 'var',
-                1 => 'var',
-                2 => 'var',
-                3 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/\\}/',
-            1 => '/\\)/',
-            2 => '/\\]/',
-            3 => '/%b2%/',
-            4 => '/%b2%/',
-            5 => '/\\/[cgimosx]*/',
-            6 => '/`/',
-            7 => '/\'/',
-            8 => '/"/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => 0,
-                2 => 1,
-                3 => 2,
-                4 => -1,
-                5 => 3,
-                6 => 4,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => 5,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => 6,
-                17 => 7,
-                18 => 8,
-                19 => -1,
-                20 => -1,
-            ),
-            0 => 
-            array (
-                0 => -1,
-                1 => 0,
-                2 => 1,
-                3 => 2,
-                4 => -1,
-                5 => 3,
-                6 => 4,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => 5,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => 6,
-                17 => 7,
-                18 => 8,
-                19 => -1,
-                20 => -1,
-            ),
-            1 => 
-            array (
-                0 => -1,
-                1 => 0,
-                2 => 1,
-                3 => 2,
-                4 => -1,
-                5 => 3,
-                6 => 4,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => 5,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => -1,
-                17 => 6,
-                18 => 7,
-                19 => 8,
-                20 => -1,
-                21 => -1,
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => 0,
-                2 => 1,
-                3 => 2,
-                4 => -1,
-                5 => 3,
-                6 => 4,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => 5,
-                11 => -1,
-                12 => -1,
-                13 => -1,
-                14 => -1,
-                15 => -1,
-                16 => 6,
-                17 => 7,
-                18 => 8,
-                19 => -1,
-                20 => -1,
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-            4 => 
-            array (
-                0 => -1,
-            ),
-            5 => 
-            array (
-                0 => -1,
-            ),
-            6 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-            7 => 
-            array (
-                0 => -1,
-            ),
-            8 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                ),
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => -1,
-                17 => -1,
-                18 => -1,
-                19 => 
-                array (
-                    'reserved' => '/^(cd|cp|rm|echo|printf|exit|cut|join|comm|fmt|grep|egrep|fgrep|sed|awk|yes|false|true|test|expr|tee|basename|dirname|pathchk|pwd|stty|tty|env|printenv|id|logname|whoami|groups|users|who|date|uname|hostname|chroot|nice|nohup|sleep|factor|seq|getopt|getopts|options|shift)$/',
-                    'flowcontrol' => '/^(if|fi|then|else|elif|case|esac|while|done|for|in|function|until|do|select|time|read|set)$/',
-                ),
-                20 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                ),
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => -1,
-                17 => -1,
-                18 => -1,
-                19 => 
-                array (
-                    'reserved' => '/^(cd|cp|rm|echo|printf|exit|cut|join|comm|fmt|grep|egrep|fgrep|sed|awk|yes|false|true|test|expr|tee|basename|dirname|pathchk|pwd|stty|tty|env|printenv|id|logname|whoami|groups|users|who|date|uname|hostname|chroot|nice|nohup|sleep|factor|seq|getopt|getopts|options|shift)$/',
-                    'flowcontrol' => '/^(if|fi|then|else|elif|case|esac|while|done|for|in|function|until|do|select|time|read|set)$/',
-                ),
-                20 => 
-                array (
-                ),
-            ),
-            1 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                ),
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => 
-                array (
-                ),
-                17 => -1,
-                18 => -1,
-                19 => -1,
-                20 => 
-                array (
-                    'reserved' => '/^(cd|cp|rm|echo|printf|exit|cut|join|comm|fmt|grep|egrep|fgrep|sed|awk|yes|false|true|test|expr|tee|basename|dirname|pathchk|pwd|stty|tty|env|printenv|id|logname|whoami|groups|users|who|date|uname|hostname|chroot|nice|nohup|sleep|factor|seq|getopt|getopts|options|shift)$/',
-                    'flowcontrol' => '/^(if|fi|then|else|elif|case|esac|while|done|for|in|function|until|do|select|time|read|set)$/',
-                ),
-                21 => 
-                array (
-                ),
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => -1,
-                2 => -1,
-                3 => -1,
-                4 => 
-                array (
-                ),
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => -1,
-                11 => 
-                array (
-                ),
-                12 => 
-                array (
-                ),
-                13 => 
-                array (
-                ),
-                14 => 
-                array (
-                ),
-                15 => 
-                array (
-                ),
-                16 => -1,
-                17 => -1,
-                18 => -1,
-                19 => 
-                array (
-                    'reserved' => '/^(cd|cp|rm|echo|printf|exit|cut|join|comm|fmt|grep|egrep|fgrep|sed|awk|yes|false|true|test|expr|tee|basename|dirname|pathchk|pwd|stty|tty|env|printenv|id|logname|whoami|groups|users|who|date|uname|hostname|chroot|nice|nohup|sleep|factor|seq|getopt|getopts|options|shift)$/',
-                    'flowcontrol' => '/^(if|fi|then|else|elif|case|esac|while|done|for|in|function|until|do|select|time|read|set)$/',
-                ),
-                20 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            5 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            6 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-            ),
-            7 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            8 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-                0 => 
-                array (
-                    1 => 'special',
-                    2 => 'string',
-                ),
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => 
-                array (
-                    1 => 'reserved',
-                    2 => 'special',
-                ),
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                    6 => 'string',
-                    8 => 'quotes',
-                ),
-                9 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                ),
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => 
-                array (
-                    1 => 'brackets',
-                    2 => 'var',
-                    3 => 'brackets',
-                ),
-                15 => NULL,
-                16 => NULL,
-                17 => NULL,
-                18 => NULL,
-                19 => NULL,
-                20 => NULL,
-            ),
-            1 => 
-            array (
-                0 => 
-                array (
-                    1 => 'special',
-                    2 => 'string',
-                ),
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => 
-                array (
-                    1 => 'reserved',
-                    2 => 'special',
-                ),
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                    6 => 'string',
-                    8 => 'quotes',
-                ),
-                9 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                ),
-                10 => NULL,
-                11 => 
-                array (
-                    1 => 'string',
-                    2 => 'code',
-                ),
-                12 => NULL,
-                13 => NULL,
-                14 => NULL,
-                15 => 
-                array (
-                    1 => 'brackets',
-                    2 => 'var',
-                    3 => 'brackets',
-                ),
-                16 => NULL,
-                17 => NULL,
-                18 => NULL,
-                19 => NULL,
-                20 => NULL,
-                21 => NULL,
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                    1 => 'special',
-                    2 => 'string',
-                ),
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => 
-                array (
-                    1 => 'reserved',
-                    2 => 'special',
-                ),
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                    6 => 'string',
-                    8 => 'quotes',
-                ),
-                9 => 
-                array (
-                    1 => 'quotes',
-                    2 => 'quotes',
-                    3 => 'string',
-                    5 => 'quotes',
-                ),
-                10 => NULL,
-                11 => NULL,
-                12 => NULL,
-                13 => NULL,
-                14 => 
-                array (
-                    1 => 'brackets',
-                    2 => 'var',
-                    3 => 'brackets',
-                ),
-                15 => NULL,
-                16 => NULL,
-                17 => NULL,
-                18 => NULL,
-                19 => NULL,
-                20 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-            ),
-            5 => 
-            array (
-                0 => NULL,
-            ),
-            6 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-            7 => 
-            array (
-                0 => NULL,
-            ),
-            8 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => true,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-            ),
-            0 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => true,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-            ),
-            1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => true,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-                21 => false,
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => true,
-                6 => true,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-                11 => false,
-                12 => false,
-                13 => false,
-                14 => false,
-                15 => false,
-                16 => false,
-                17 => false,
-                18 => false,
-                19 => false,
-                20 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-            ),
-            5 => 
-            array (
-                0 => false,
-            ),
-            6 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            7 => 
-            array (
-                0 => false,
-            ),
-            8 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'reserved' => 'reserved',
-            'flowcontrol' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/SQL.php b/library/Text_Highlighter/Text/Highlighter/SQL.php
deleted file mode 100644
index 824864033..000000000
--- a/library/Text_Highlighter/Text/Highlighter/SQL.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-/**
- * Auto-generated class. SQL syntax highlighting
- * 
- * Based on SQL-99 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : sql.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. SQL syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_SQL extends Text_Highlighter
-{
-    var $_language = 'sql';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_SQL($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
-            0 => '//',
-            1 => '//',
-            2 => '/((?i)\\\\.)/',
-            3 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
-            4 => '/((?i)\\\\.)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 5,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 0,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 1,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-                6 => 0,
-                7 => 5,
-                8 => 2,
-                9 => 0,
-                10 => 0,
-            ),
-            4 => 
-            array (
-                0 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'quotes',
-                1 => 'comment',
-                2 => '',
-                3 => '',
-                4 => 'quotes',
-                5 => 'brackets',
-                6 => 'quotes',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => '',
-            ),
-            3 => 
-            array (
-                0 => 'quotes',
-                1 => 'comment',
-                2 => '',
-                3 => '',
-                4 => 'quotes',
-                5 => 'brackets',
-                6 => 'quotes',
-                7 => '',
-                8 => '',
-                9 => '',
-                10 => '',
-            ),
-            4 => 
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'identifier',
-                1 => 'comment',
-                2 => 'comment',
-                3 => 'identifier',
-                4 => 'string',
-                5 => 'code',
-                6 => 'string',
-                7 => 'number',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 'special',
-            ),
-            3 => 
-            array (
-                0 => 'identifier',
-                1 => 'comment',
-                2 => 'comment',
-                3 => 'identifier',
-                4 => 'string',
-                5 => 'code',
-                6 => 'string',
-                7 => 'number',
-                8 => 'number',
-                9 => 'number',
-                10 => 'number',
-            ),
-            4 => 
-            array (
-                0 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)`/',
-            1 => '/(?i)\\*\\//',
-            2 => '/(?i)"/',
-            3 => '/(?i)\\)/',
-            4 => '/(?i)\'/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => -1,
-                3 => -1,
-                4 => 2,
-                5 => 3,
-                6 => 4,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => -1,
-            ),
-            3 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => -1,
-                3 => -1,
-                4 => 2,
-                5 => 3,
-                6 => 4,
-                7 => -1,
-                8 => -1,
-                9 => -1,
-                10 => -1,
-            ),
-            4 => 
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                    'reserved' => '/^((?i)absolute|action|add|admin|after|aggregate|alias|all|allocate|alter|and|any|are|array|as|asc|assertion|at|authorization|before|begin|binary|bit|blob|boolean|both|breadth|by|call|cascade|cascaded|case|cast|catalog|char|character|check|class|clob|close|collate|collation|column|commit|completion|connect|connection|constraint|constraints|constructor|continue|corresponding|create|cross|cube|current|current_date|current_path|current_role|current_time|current_timestamp|current_user|cursor|cycle|data|date|day|deallocate|dec|decimal|declare|default|deferrable|deferred|delete|depth|deref|desc|describe|descriptor|destroy|destructor|deterministic|diagnostics|dictionary|disconnect|distinct|domain|double|drop|dynamic|each|else|end|end-exec|equals|escape|every|except|exception|exec|execute|external|false|fetch|first|float|for|foreign|found|free|from|full|function|general|get|global|go|goto|grant|group|grouping|having|host|hour|identity|ignore|immediate|in|indicator|initialize|initially|inner|inout|input|insert|int|integer|intersect|interval|into|is|isolation|iterate|join|key|language|large|last|lateral|leading|left|less|level|like|limit|local|localtime|localtimestamp|locator|map|match|minute|modifies|modify|module|month|names|national|natural|nchar|nclob|new|next|no|none|not|null|numeric|object|of|off|old|on|only|open|operation|option|or|order|ordinality|out|outer|output|pad|parameter|parameters|partial|path|postfix|precision|prefix|preorder|prepare|preserve|primary|prior|privileges|procedure|public|read|reads|real|recursive|ref|references|referencing|relative|restrict|result|return|returns|revoke|right|role|rollback|rollup|routine|row|rows|savepoint|schema|scope|scroll|search|second|section|select|sequence|session|session_user|set|sets|size|smallint|some|space|specific|specifictype|sql|sqlexception|sqlstate|sqlwarning|start|state|statement|static|structure|system_user|table|temporary|terminate|than|then|time|timestamp|timezone_hour|timezone_minute|to|trailing|transaction|translation|treat|trigger|true|under|union|unique|unknown|unnest|update|usage|user|using|value|values|varchar|variable|varying|view|when|whenever|where|with|without|work|write|year|zone)$/',
-                    'keyword' => '/^((?i)abs|ada|asensitive|assignment|asymmetric|atomic|avg|between|bitvar|bit_length|c|called|cardinality|catalog_name|chain|character_length|character_set_catalog|character_set_name|character_set_schema|char_length|checked|class_origin|coalesce|cobol|collation_catalog|collation_name|collation_schema|column_name|command_function|command_function_code|committed|condition_number|connection_name|constraint_catalog|constraint_name|constraint_schema|contains|convert|count|cursor_name|datetime_interval_code|datetime_interval_precision|defined|definer|dispatch|dynamic_function|dynamic_function_code|existing|exists|extract|final|fortran|g|generated|granted|hierarchy|hold|implementation|infix|insensitive|instance|instantiable|invoker|k|key_member|key_type|length|lower|m|max|message_length|message_octet_length|message_text|method|min|mod|more|mumps|name|nullable|nullif|number|octet_length|options|overlaps|overlay|overriding|parameter_mode|parameter_name|parameter_ordinal_position|parameter_specific_catalog|parameter_specific_name|parameter_specific_schema|pascal|pli|position|repeatable|returned_length|returned_octet_length|returned_sqlstate|routine_catalog|routine_name|routine_schema|row_count|scale|schema_name|security|self|sensitive|serializable|server_name|similar|simple|source|specific_name|style|subclass_origin|sublist|substring|sum|symmetric|system|table_name|transactions_committed|transactions_rolled_back|transaction_active|transform|transforms|translate|trigger_catalog|trigger_name|trigger_schema|trim|type|uncommitted|unnamed|upper|user_defined_type_catalog|user_defined_type_name|user_defined_type_schema)$/',
-                ),
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-            3 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                    'reserved' => '/^((?i)absolute|action|add|admin|after|aggregate|alias|all|allocate|alter|and|any|are|array|as|asc|assertion|at|authorization|before|begin|binary|bit|blob|boolean|both|breadth|by|call|cascade|cascaded|case|cast|catalog|char|character|check|class|clob|close|collate|collation|column|commit|completion|connect|connection|constraint|constraints|constructor|continue|corresponding|create|cross|cube|current|current_date|current_path|current_role|current_time|current_timestamp|current_user|cursor|cycle|data|date|day|deallocate|dec|decimal|declare|default|deferrable|deferred|delete|depth|deref|desc|describe|descriptor|destroy|destructor|deterministic|diagnostics|dictionary|disconnect|distinct|domain|double|drop|dynamic|each|else|end|end-exec|equals|escape|every|except|exception|exec|execute|external|false|fetch|first|float|for|foreign|found|free|from|full|function|general|get|global|go|goto|grant|group|grouping|having|host|hour|identity|ignore|immediate|in|indicator|initialize|initially|inner|inout|input|insert|int|integer|intersect|interval|into|is|isolation|iterate|join|key|language|large|last|lateral|leading|left|less|level|like|limit|local|localtime|localtimestamp|locator|map|match|minute|modifies|modify|module|month|names|national|natural|nchar|nclob|new|next|no|none|not|null|numeric|object|of|off|old|on|only|open|operation|option|or|order|ordinality|out|outer|output|pad|parameter|parameters|partial|path|postfix|precision|prefix|preorder|prepare|preserve|primary|prior|privileges|procedure|public|read|reads|real|recursive|ref|references|referencing|relative|restrict|result|return|returns|revoke|right|role|rollback|rollup|routine|row|rows|savepoint|schema|scope|scroll|search|second|section|select|sequence|session|session_user|set|sets|size|smallint|some|space|specific|specifictype|sql|sqlexception|sqlstate|sqlwarning|start|state|statement|static|structure|system_user|table|temporary|terminate|than|then|time|timestamp|timezone_hour|timezone_minute|to|trailing|transaction|translation|treat|trigger|true|under|union|unique|unknown|unnest|update|usage|user|using|value|values|varchar|variable|varying|view|when|whenever|where|with|without|work|write|year|zone)$/',
-                    'keyword' => '/^((?i)abs|ada|asensitive|assignment|asymmetric|atomic|avg|between|bitvar|bit_length|c|called|cardinality|catalog_name|chain|character_length|character_set_catalog|character_set_name|character_set_schema|char_length|checked|class_origin|coalesce|cobol|collation_catalog|collation_name|collation_schema|column_name|command_function|command_function_code|committed|condition_number|connection_name|constraint_catalog|constraint_name|constraint_schema|contains|convert|count|cursor_name|datetime_interval_code|datetime_interval_precision|defined|definer|dispatch|dynamic_function|dynamic_function_code|existing|exists|extract|final|fortran|g|generated|granted|hierarchy|hold|implementation|infix|insensitive|instance|instantiable|invoker|k|key_member|key_type|length|lower|m|max|message_length|message_octet_length|message_text|method|min|mod|more|mumps|name|nullable|nullif|number|octet_length|options|overlaps|overlay|overriding|parameter_mode|parameter_name|parameter_ordinal_position|parameter_specific_catalog|parameter_specific_name|parameter_specific_schema|pascal|pli|position|repeatable|returned_length|returned_octet_length|returned_sqlstate|routine_catalog|routine_name|routine_schema|row_count|scale|schema_name|security|self|sensitive|serializable|server_name|similar|simple|source|specific_name|style|subclass_origin|sublist|substring|sum|symmetric|system|table_name|transactions_committed|transactions_rolled_back|transaction_active|transform|transforms|translate|trigger_catalog|trigger_name|trigger_schema|trim|type|uncommitted|unnamed|upper|user_defined_type_catalog|user_defined_type_name|user_defined_type_schema)$/',
-                ),
-                4 => -1,
-                5 => -1,
-                6 => -1,
-                7 => 
-                array (
-                ),
-                8 => 
-                array (
-                ),
-                9 => 
-                array (
-                ),
-                10 => 
-                array (
-                ),
-            ),
-            4 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-                6 => NULL,
-                7 => NULL,
-                8 => NULL,
-                9 => NULL,
-                10 => NULL,
-            ),
-            4 => 
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-                6 => false,
-                7 => false,
-                8 => false,
-                9 => false,
-                10 => false,
-            ),
-            4 => 
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'reserved' => 'reserved',
-            'keyword' => 'var',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/VBSCRIPT.php b/library/Text_Highlighter/Text/Highlighter/VBSCRIPT.php
deleted file mode 100644
index 31a7c7c9e..000000000
--- a/library/Text_Highlighter/Text/Highlighter/VBSCRIPT.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-/**
- * Auto-generated class. VBSCRIPT syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: vbscript.xml
- * @author Daniel Fruzynski <daniel-AT-poradnik-webmastera.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. VBSCRIPT syntax highlighting
- *
- * @author Daniel Fruzynski <daniel-AT-poradnik-webmastera.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: 0.7.0
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_VBSCRIPT extends Text_Highlighter
-{
-    var $_language = 'vbscript';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_VBSCRIPT($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\()|((?i)")|((?i)\'|[Rr][Ee][Mm]\\b)|((?i)\\d*\\.?\\d+)|((?i)&H[0-9a-fA-F]+)|((?i)[a-z_]\\w*)/',
-            0 => '/((?i)\\()|((?i)")|((?i)\'|[Rr][Ee][Mm]\\b)|((?i)\\d*\\.?\\d+)|((?i)&H[0-9a-fA-F]+)|((?i)[a-z_]\\w*)/',
-            1 => '//',
-            2 => '/((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\b(note|fixme):)|((?i)\\$\\w+:.+\\$)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-            ),
-            0 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 0,
-                4 => 0,
-                5 => 0,
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 3,
-                1 => 1,
-                2 => 1,
-                3 => 0,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'brackets',
-                1 => 'quotes',
-                2 => 'comment',
-                3 => '',
-                4 => '',
-                5 => '',
-            ),
-            0 => 
-            array (
-                0 => 'brackets',
-                1 => 'quotes',
-                2 => 'comment',
-                3 => '',
-                4 => '',
-                5 => '',
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => '',
-                3 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'code',
-                1 => 'string',
-                2 => 'comment',
-                3 => 'number',
-                4 => 'number',
-                5 => 'identifier',
-            ),
-            0 => 
-            array (
-                0 => 'code',
-                1 => 'string',
-                2 => 'comment',
-                3 => 'number',
-                4 => 'number',
-                5 => 'identifier',
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 'url',
-                1 => 'url',
-                2 => 'inlinedoc',
-                3 => 'inlinedoc',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\)/',
-            1 => '/(?i)"/',
-            2 => '/(?mi)$/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-            ),
-            0 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => -1,
-                4 => -1,
-                5 => -1,
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => 
-                array (
-                ),
-                4 => 
-                array (
-                ),
-                5 => 
-                array (
-                    'constants' => '/^((?i)vbblack|vbred|vbgreen|vbyellow|vbblue|vbmagenta|vbcyan|vbwhite|vbbinarycompare|vbtextcompare|vbsunday|vbmonday|vbtuesday|vbwednesday|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbokonly|vbokcancel|vbabortretryignore|vbyesnocancel|vbyesno|vbretrycancel|vbcritical|vbquestion|vbexclamation|vbinformation|vbdefaultbutton1|vbdefaultbutton2|vbdefaultbutton3|vbdefaultbutton4|vbapplicationmodal|vbsystemmodal|vbok|vbcancel|vbabort|vbretry|vbignore|vbyes|vbno|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|vbtab|vbverticaltab|vbusedefault|vbtrue|vbfalse|vbempty|vbnull|vbinteger|vblong|vbsingle|vbdouble|vbcurrency|vbdate|vbstring|vbobject|vberror|vbboolean|vbvariant|vbdataobject|vbdecimal|vbbyte|vbarray)$/',
-                    'functions' => '/^((?i)abs|array|asc|atn|cbool|cbyte|ccur|cdate|cdbl|chr|cint|clng|cos|createobject|csng|cstr|date|dateadd|datediff|datepart|dateserial|datevalue|day|escape|eval|exp|filter|formatcurrency|formatdatetime|formatnumber|formatpercent|getlocale|getobject|getref|hex|hour|inputbox|instr|instrrev|int|fix|isarray|isdate|isempty|isnull|isnumeric|isobject|join|lbound|lcase|left|len|loadpicture|log|ltrim|rtrim|trim|mid|minute|month|monthname|msgbox|now|oct|replace|rgb|right|rnd|round|scriptengine|scriptenginebuildversion|scriptenginemajorversion|scriptengineminorversion|second|setlocale|sgn|sin|space|split|sqr|strcomp|string|strreverse|tan|time|timer|timeserial|timevalue|typename|ubound|ucase|unescape|vartype|weekday|weekdayname|year)$/',
-                    'builtin' => '/^((?i)debug|err|match|regexp)$/',
-                    'reserved' => '/^((?i)empty|false|nothing|null|true|and|eqv|imp|is|mod|not|or|xor|call|class|end|const|public|private|dim|do|while|until|exit|loop|erase|execute|executeglobal|for|each|in|to|step|next|function|default|if|then|else|elseif|on|error|resume|goto|option|explicit|property|get|let|set|randomize|redim|preserve|select|case|stop|sub|wend|with)$/',
-                ),
-            ),
-            0 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => 
-                array (
-                ),
-                4 => 
-                array (
-                ),
-                5 => 
-                array (
-                    'constants' => '/^((?i)vbblack|vbred|vbgreen|vbyellow|vbblue|vbmagenta|vbcyan|vbwhite|vbbinarycompare|vbtextcompare|vbsunday|vbmonday|vbtuesday|vbwednesday|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbokonly|vbokcancel|vbabortretryignore|vbyesnocancel|vbyesno|vbretrycancel|vbcritical|vbquestion|vbexclamation|vbinformation|vbdefaultbutton1|vbdefaultbutton2|vbdefaultbutton3|vbdefaultbutton4|vbapplicationmodal|vbsystemmodal|vbok|vbcancel|vbabort|vbretry|vbignore|vbyes|vbno|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|vbtab|vbverticaltab|vbusedefault|vbtrue|vbfalse|vbempty|vbnull|vbinteger|vblong|vbsingle|vbdouble|vbcurrency|vbdate|vbstring|vbobject|vberror|vbboolean|vbvariant|vbdataobject|vbdecimal|vbbyte|vbarray)$/',
-                    'functions' => '/^((?i)abs|array|asc|atn|cbool|cbyte|ccur|cdate|cdbl|chr|cint|clng|cos|createobject|csng|cstr|date|dateadd|datediff|datepart|dateserial|datevalue|day|escape|eval|exp|filter|formatcurrency|formatdatetime|formatnumber|formatpercent|getlocale|getobject|getref|hex|hour|inputbox|instr|instrrev|int|fix|isarray|isdate|isempty|isnull|isnumeric|isobject|join|lbound|lcase|left|len|loadpicture|log|ltrim|rtrim|trim|mid|minute|month|monthname|msgbox|now|oct|replace|rgb|right|rnd|round|scriptengine|scriptenginebuildversion|scriptenginemajorversion|scriptengineminorversion|second|setlocale|sgn|sin|space|split|sqr|strcomp|string|strreverse|tan|time|timer|timeserial|timevalue|typename|ubound|ucase|unescape|vartype|weekday|weekdayname|year)$/',
-                    'builtin' => '/^((?i)debug|err|match|regexp)$/',
-                    'reserved' => '/^((?i)empty|false|nothing|null|true|and|eqv|imp|is|mod|not|or|xor|call|class|end|const|public|private|dim|do|while|until|exit|loop|erase|execute|executeglobal|for|each|in|to|step|next|function|default|if|then|else|elseif|on|error|resume|goto|option|explicit|property|get|let|set|randomize|redim|preserve|select|case|stop|sub|wend|with)$/',
-                ),
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => 
-                array (
-                ),
-                3 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-                4 => NULL,
-                5 => NULL,
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-                3 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-            ),
-            0 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-                4 => false,
-                5 => false,
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-            'constants' => 'builtin',
-            'functions' => 'builtin',
-            'builtin' => 'builtin',
-            'reserved' => 'reserved',
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
diff --git a/library/Text_Highlighter/Text/Highlighter/XML.php b/library/Text_Highlighter/Text/Highlighter/XML.php
deleted file mode 100644
index 2d85db5fd..000000000
--- a/library/Text_Highlighter/Text/Highlighter/XML.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-/**
- * Auto-generated class. XML syntax highlighting 
- *
- * PHP version 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @link       http://pear.php.net/package/Text_Highlighter
- * @category   Text
- * @package    Text_Highlighter
- * @version    generated from: : xml.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
- * @author Andrey Demenev <demenev@gmail.com>
- *
- */
-
-/**
- * @ignore
- */
-
-require_once 'Text/Highlighter.php';
-
-/**
- * Auto-generated class. XML syntax highlighting
- *
- * @author Andrey Demenev <demenev@gmail.com>
- * @category   Text
- * @package    Text_Highlighter
- * @copyright  2004-2006 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-class  Text_Highlighter_XML extends Text_Highlighter
-{
-    var $_language = 'xml';
-
-    /**
-     * PHP4 Compatible Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function Text_Highlighter_XML($options=array())
-    {
-        $this->__construct($options);
-    }
-
-
-    /**
-     *  Constructor
-     *
-     * @param array  $options
-     * @access public
-     */
-    function __construct($options=array())
-    {
-
-        $this->_options = $options;
-        $this->_regs = array (
-            -1 => '/((?i)\\<\\!\\[CDATA\\[)|((?i)\\<!--)|((?i)\\<[\\?\\/]?)|((?i)(&|%)[\\w\\-\\.]+;)/',
-            0 => '//',
-            1 => '//',
-            2 => '/((?i)(?<=[\\<\\/?])[\\w\\-\\:]+)|((?i)[\\w\\-\\:]+)|((?i)")/',
-            3 => '/((?i)(&|%)[\\w\\-\\.]+;)/',
-        );
-        $this->_counts = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-                3 => 1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 0,
-                1 => 0,
-                2 => 0,
-            ),
-            3 => 
-            array (
-                0 => 1,
-            ),
-        );
-        $this->_delim = array (
-            -1 => 
-            array (
-                0 => 'comment',
-                1 => 'comment',
-                2 => 'brackets',
-                3 => '',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => '',
-                1 => '',
-                2 => 'quotes',
-            ),
-            3 => 
-            array (
-                0 => '',
-            ),
-        );
-        $this->_inner = array (
-            -1 => 
-            array (
-                0 => 'comment',
-                1 => 'comment',
-                2 => 'code',
-                3 => 'special',
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 'reserved',
-                1 => 'var',
-                2 => 'string',
-            ),
-            3 => 
-            array (
-                0 => 'special',
-            ),
-        );
-        $this->_end = array (
-            0 => '/(?i)\\]\\]\\>/',
-            1 => '/(?i)--\\>/',
-            2 => '/(?i)[\\/\\?]?\\>/',
-            3 => '/(?i)"/',
-        );
-        $this->_states = array (
-            -1 => 
-            array (
-                0 => 0,
-                1 => 1,
-                2 => 2,
-                3 => -1,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => 3,
-            ),
-            3 => 
-            array (
-                0 => -1,
-            ),
-        );
-        $this->_keywords = array (
-            -1 => 
-            array (
-                0 => -1,
-                1 => -1,
-                2 => -1,
-                3 => 
-                array (
-                ),
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => 
-                array (
-                ),
-                1 => 
-                array (
-                ),
-                2 => -1,
-            ),
-            3 => 
-            array (
-                0 => 
-                array (
-                ),
-            ),
-        );
-        $this->_parts = array (
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => NULL,
-                1 => NULL,
-                2 => NULL,
-            ),
-            3 => 
-            array (
-                0 => NULL,
-            ),
-        );
-        $this->_subst = array (
-            -1 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-                3 => false,
-            ),
-            0 => 
-            array (
-            ),
-            1 => 
-            array (
-            ),
-            2 => 
-            array (
-                0 => false,
-                1 => false,
-                2 => false,
-            ),
-            3 => 
-            array (
-                0 => false,
-            ),
-        );
-        $this->_conditions = array (
-        );
-        $this->_kwmap = array (
-        );
-        $this->_defClass = 'code';
-        $this->_checkDefines();
-    }
-    
-}
\ No newline at end of file
diff --git a/library/Text_Highlighter/abap.xml b/library/Text_Highlighter/abap.xml
deleted file mode 100644
index 06d26e507..000000000
--- a/library/Text_Highlighter/abap.xml
+++ /dev/null
@@ -1,802 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: abap.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="abap" case = "no">
-
-  <authors>
-    <author name="Stoyan Stefanov" email ="ssttoo@gmail.com"/>
-  </authors>
-
-
-  <default innerClass="code" />
-
-
-  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
-    <contains all="yes"/>
-  </region>
-
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
-    <contains all="yes"/>
-  </region>
-
-  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
-    <contains all="yes"/>
-  </region>
-  
-  <region name="comment" start="^\*|&quot;" end="/$/m" innerClass="comment">
-    <contains all="no"/>
-  </region>
-  
-  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'" />
-
-  <block name="identifier" match="[a-zA-Z_]\w*" innerClass="identifier" contained="yes"/>
-
-  <block name="hexinteger" match="0[xX][\da-f]+" innerClass="number" contained="yes"/>
-
-  <block name="integer" match="\d\d*|\b0\b" innerClass="number" contained="yes"/>
-
-  <block name="octinteger" match="0[0-7]+" innerClass="number" contained="yes"/>
-
-  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number" contained="yes"/>
-
-  
-  <block name="identifier" match="[a-z_\-]\w*" innerClass="identifier" case="no"/>
-
-  <keywords name="sy" inherits="identifier" innerClass="reserved">
-    <keyword match="SCREEN-NAME"/>
-    <keyword match="SCREEN-GROUP1"/>
-    <keyword match="SCREEN-GROUP2"/>
-    <keyword match="SCREEN-GROUP3"/>
-    <keyword match="SCREEN-GROUP4"/>
-    <keyword match="SCREEN-REQUIRED"/>
-    <keyword match="SCREEN-INPUT"/>
-    <keyword match="SCREEN-OUTPUT"/>
-    <keyword match="SCREEN-INTENSIFIED"/>
-    <keyword match="SCREEN-INVISIBLE"/>
-    <keyword match="SCREEN-LENGTH"/>
-    <keyword match="SCREEN-ACTIVE"/>
-    <keyword match="SY-INDEX"/>
-    <keyword match="SY-PAGNO"/>
-    <keyword match="SY-TABIX"/>
-    <keyword match="SY-TFILL"/>
-    <keyword match="SY-TLOPC"/>
-    <keyword match="SY-TMAXL"/>
-    <keyword match="SY-TOCCU"/>
-    <keyword match="SY-TTABC"/>
-    <keyword match="SY-TSTIS"/>
-    <keyword match="SY-TTABI"/>
-    <keyword match="SY-DBCNT"/>
-    <keyword match="SY-FDPOS"/>
-    <keyword match="SY-COLNO"/>
-    <keyword match="SY-LINCT"/>
-    <keyword match="SY-LINNO"/>
-    <keyword match="SY-LINSZ"/>
-    <keyword match="SY-PAGCT"/>
-    <keyword match="SY-MACOL"/>
-    <keyword match="SY-MAROW"/>
-    <keyword match="SY-TLENG"/>
-    <keyword match="SY-SFOFF"/>
-    <keyword match="SY-WILLI"/>
-    <keyword match="SY-LILLI"/>
-    <keyword match="SY-SUBRC"/>
-    <keyword match="SY-FLENG"/>
-    <keyword match="SY-CUCOL"/>
-    <keyword match="SY-CUROW"/>
-    <keyword match="SY-LSIND"/>
-    <keyword match="SY-LISTI"/>
-    <keyword match="SY-STEPL"/>
-    <keyword match="SY-TPAGI"/>
-    <keyword match="SY-WINX1"/>
-    <keyword match="SY-WINY1"/>
-    <keyword match="SY-WINX2"/>
-    <keyword match="SY-WINY2"/>
-    <keyword match="SY-WINCO"/>
-    <keyword match="SY-WINRO"/>
-    <keyword match="SY-WINDI"/>
-    <keyword match="SY-SROWS"/>
-    <keyword match="SY-SCOLS"/>
-    <keyword match="SY-LOOPC"/>
-    <keyword match="SY-FOLEN"/>
-    <keyword match="SY-FODEC"/>
-    <keyword match="SY-TZONE"/>
-    <keyword match="SY-DAYST"/>
-    <keyword match="SY-FTYPE"/>
-    <keyword match="SY-APPLI"/>
-    <keyword match="SY-FDAYW"/>
-    <keyword match="SY-CCURS"/>
-    <keyword match="SY-CCURT"/>
-    <keyword match="SY-DEBUG"/>
-    <keyword match="SY-CTYPE"/>
-    <keyword match="SY-INPUT"/>
-    <keyword match="SY-LANGU"/>
-    <keyword match="SY-MODNO"/>
-    <keyword match="SY-BATCH"/>
-    <keyword match="SY-BINPT"/>
-    <keyword match="SY-CALLD"/>
-    <keyword match="SY-DYNNR"/>
-    <keyword match="SY-DYNGR"/>
-    <keyword match="SY-NEWPA"/>
-    <keyword match="SY-PRI40"/>
-    <keyword match="SY-RSTRT"/>
-    <keyword match="SY-WTITL"/>
-    <keyword match="SY-CPAGE"/>
-    <keyword match="SY-DBNAM"/>
-    <keyword match="SY-MANDT"/>
-    <keyword match="SY-PREFX"/>
-    <keyword match="SY-FMKEY"/>
-    <keyword match="SY-PEXPI"/>
-    <keyword match="SY-PRINI"/>
-    <keyword match="SY-PRIMM"/>
-    <keyword match="SY-PRREL"/>
-    <keyword match="SY-PLAYO"/>
-    <keyword match="SY-PRBIG"/>
-    <keyword match="SY-PLAYP"/>
-    <keyword match="SY-PRNEW"/>
-    <keyword match="SY-PRLOG"/>
-    <keyword match="SY-PDEST"/>
-    <keyword match="SY-PLIST"/>
-    <keyword match="SY-PAUTH"/>
-    <keyword match="SY-PRDSN"/>
-    <keyword match="SY-PNWPA"/>
-    <keyword match="SY-CALLR"/>
-    <keyword match="SY-REPI2"/>
-    <keyword match="SY-RTITL"/>
-    <keyword match="SY-PRREC"/>
-    <keyword match="SY-PRTXT"/>
-    <keyword match="SY-PRABT"/>
-    <keyword match="SY-LPASS"/>
-    <keyword match="SY-NRPAG"/>
-    <keyword match="SY-PAART"/>
-    <keyword match="SY-PRCOP"/>
-    <keyword match="SY-BATZS"/>
-    <keyword match="SY-BSPLD"/>
-    <keyword match="SY-BREP4"/>
-    <keyword match="SY-BATZO"/>
-    <keyword match="SY-BATZD"/>
-    <keyword match="SY-BATZW"/>
-    <keyword match="SY-BATZM"/>
-    <keyword match="SY-CTABL"/>
-    <keyword match="SY-DBSYS"/>
-    <keyword match="SY-DCSYS"/>
-    <keyword match="SY-MACDB"/>
-    <keyword match="SY-SYSID"/>
-    <keyword match="SY-OPSYS"/>
-    <keyword match="SY-PFKEY"/>
-    <keyword match="SY-SAPRL"/>
-    <keyword match="SY-TCODE"/>
-    <keyword match="SY-UCOMM"/>
-    <keyword match="SY-CFWAE"/>
-    <keyword match="SY-CHWAE"/>
-    <keyword match="SY-SPONO"/>
-    <keyword match="SY-SPONR"/>
-    <keyword match="SY-WAERS"/>
-    <keyword match="SY-CDATE"/>
-    <keyword match="SY-DATUM"/>
-    <keyword match="SY-SLSET"/>
-    <keyword match="SY-SUBTY"/>
-    <keyword match="SY-SUBCS"/>
-    <keyword match="SY-GROUP"/>
-    <keyword match="SY-FFILE"/>
-    <keyword match="SY-UZEIT"/>
-    <keyword match="SY-DSNAM"/>
-    <keyword match="SY-REPID"/>
-    <keyword match="SY-TABID"/>
-    <keyword match="SY-TFDSN"/>
-    <keyword match="SY-UNAME"/>
-    <keyword match="SY-LSTAT"/>
-    <keyword match="SY-ABCDE"/>
-    <keyword match="SY-MARKY"/>
-    <keyword match="SY-SFNAM"/>
-    <keyword match="SY-TNAME"/>
-    <keyword match="SY-MSGLI"/>
-    <keyword match="SY-TITLE"/>
-    <keyword match="SY-ENTRY"/>
-    <keyword match="SY-LISEL"/>
-    <keyword match="SY-ULINE"/>
-    <keyword match="SY-XCODE"/>
-    <keyword match="SY-CPROG"/>
-    <keyword match="SY-XPROG"/>
-    <keyword match="SY-XFORM"/>
-    <keyword match="SY-LDBPG"/>
-    <keyword match="SY-TVAR0"/>
-    <keyword match="SY-TVAR1"/>
-    <keyword match="SY-TVAR2"/>
-    <keyword match="SY-TVAR3"/>
-    <keyword match="SY-TVAR4"/>
-    <keyword match="SY-TVAR5"/>
-    <keyword match="SY-TVAR6"/>
-    <keyword match="SY-TVAR7"/>
-    <keyword match="SY-TVAR8"/>
-    <keyword match="SY-TVAR9"/>
-    <keyword match="SY-MSGID"/>
-    <keyword match="SY-MSGTY"/>
-    <keyword match="SY-MSGNO"/>
-    <keyword match="SY-MSGV1"/>
-    <keyword match="SY-MSGV2"/>
-    <keyword match="SY-MSGV3"/>
-    <keyword match="SY-MSGV4"/>
-    <keyword match="SY-ONCOM"/>
-    <keyword match="SY-VLINE"/>
-    <keyword match="SY-WINSL"/>
-    <keyword match="SY-STACO"/>
-    <keyword match="SY-STARO"/>
-    <keyword match="SY-DATAR"/>
-    <keyword match="SY-HOST"/>
-    <keyword match="SY-LOCDB"/>
-    <keyword match="SY-LOCOP"/>
-    <keyword match="SY-DATLO"/>
-    <keyword match="SY-TIMLO"/>
-    <keyword match="SY-ZONLO"/>
-    <keyword match="SYST-INDEX"/>
-    <keyword match="SYST-PAGNO"/>
-    <keyword match="SYST-TABIX"/>
-    <keyword match="SYST-TFILL"/>
-    <keyword match="SYST-TLOPC"/>
-    <keyword match="SYST-TMAXL"/>
-    <keyword match="SYST-TOCCU"/>
-    <keyword match="SYST-TTABC"/>
-    <keyword match="SYST-TSTIS"/>
-    <keyword match="SYST-TTABI"/>
-    <keyword match="SYST-DBCNT"/>
-    <keyword match="SYST-FDPOS"/>
-    <keyword match="SYST-COLNO"/>
-    <keyword match="SYST-LINCT"/>
-    <keyword match="SYST-LINNO"/>
-    <keyword match="SYST-LINSZ"/>
-    <keyword match="SYST-PAGCT"/>
-    <keyword match="SYST-MACOL"/>
-    <keyword match="SYST-MAROW"/>
-    <keyword match="SYST-TLENG"/>
-    <keyword match="SYST-SFOFF"/>
-    <keyword match="SYST-WILLI"/>
-    <keyword match="SYST-LILLI"/>
-    <keyword match="SYST-SUBRC"/>
-    <keyword match="SYST-FLENG"/>
-    <keyword match="SYST-CUCOL"/>
-    <keyword match="SYST-CUROW"/>
-    <keyword match="SYST-LSIND"/>
-    <keyword match="SYST-LISTI"/>
-    <keyword match="SYST-STEPL"/>
-    <keyword match="SYST-TPAGI"/>
-    <keyword match="SYST-WINX1"/>
-    <keyword match="SYST-WINY1"/>
-    <keyword match="SYST-WINX2"/>
-    <keyword match="SYST-WINY2"/>
-    <keyword match="SYST-WINCO"/>
-    <keyword match="SYST-WINRO"/>
-    <keyword match="SYST-WINDI"/>
-    <keyword match="SYST-SROWS"/>
-    <keyword match="SYST-SCOLS"/>
-    <keyword match="SYST-LOOPC"/>
-    <keyword match="SYST-FOLEN"/>
-    <keyword match="SYST-FODEC"/>
-    <keyword match="SYST-TZONE"/>
-    <keyword match="SYST-DAYST"/>
-    <keyword match="SYST-FTYPE"/>
-    <keyword match="SYST-APPLI"/>
-    <keyword match="SYST-FDAYW"/>
-    <keyword match="SYST-CCURS"/>
-    <keyword match="SYST-CCURT"/>
-    <keyword match="SYST-DEBUG"/>
-    <keyword match="SYST-CTYPE"/>
-    <keyword match="SYST-INPUT"/>
-    <keyword match="SYST-LANGU"/>
-    <keyword match="SYST-MODNO"/>
-    <keyword match="SYST-BATCH"/>
-    <keyword match="SYST-BINPT"/>
-    <keyword match="SYST-CALLD"/>
-    <keyword match="SYST-DYNNR"/>
-    <keyword match="SYST-DYNGR"/>
-    <keyword match="SYST-NEWPA"/>
-    <keyword match="SYST-PRI40"/>
-    <keyword match="SYST-RSTRT"/>
-    <keyword match="SYST-WTITL"/>
-    <keyword match="SYST-CPAGE"/>
-    <keyword match="SYST-DBNAM"/>
-    <keyword match="SYST-MANDT"/>
-    <keyword match="SYST-PREFX"/>
-    <keyword match="SYST-FMKEY"/>
-    <keyword match="SYST-PEXPI"/>
-    <keyword match="SYST-PRINI"/>
-    <keyword match="SYST-PRIMM"/>
-    <keyword match="SYST-PRREL"/>
-    <keyword match="SYST-PLAYO"/>
-    <keyword match="SYST-PRBIG"/>
-    <keyword match="SYST-PLAYP"/>
-    <keyword match="SYST-PRNEW"/>
-    <keyword match="SYST-PRLOG"/>
-    <keyword match="SYST-PDEST"/>
-    <keyword match="SYST-PLIST"/>
-    <keyword match="SYST-PAUTH"/>
-    <keyword match="SYST-PRDSN"/>
-    <keyword match="SYST-PNWPA"/>
-    <keyword match="SYST-CALLR"/>
-    <keyword match="SYST-REPI2"/>
-    <keyword match="SYST-RTITL"/>
-    <keyword match="SYST-PRREC"/>
-    <keyword match="SYST-PRTXT"/>
-    <keyword match="SYST-PRABT"/>
-    <keyword match="SYST-LPASS"/>
-    <keyword match="SYST-NRPAG"/>
-    <keyword match="SYST-PAART"/>
-    <keyword match="SYST-PRCOP"/>
-    <keyword match="SYST-BATZS"/>
-    <keyword match="SYST-BSPLD"/>
-    <keyword match="SYST-BREP4"/>
-    <keyword match="SYST-BATZO"/>
-    <keyword match="SYST-BATZD"/>
-    <keyword match="SYST-BATZW"/>
-    <keyword match="SYST-BATZM"/>
-    <keyword match="SYST-CTABL"/>
-    <keyword match="SYST-DBSYS"/>
-    <keyword match="SYST-DCSYS"/>
-    <keyword match="SYST-MACDB"/>
-    <keyword match="SYST-SYSID"/>
-    <keyword match="SYST-OPSYS"/>
-    <keyword match="SYST-PFKEY"/>
-    <keyword match="SYST-SAPRL"/>
-    <keyword match="SYST-TCODE"/>
-    <keyword match="SYST-UCOMM"/>
-    <keyword match="SYST-CFWAE"/>
-    <keyword match="SYST-CHWAE"/>
-    <keyword match="SYST-SPONO"/>
-    <keyword match="SYST-SPONR"/>
-    <keyword match="SYST-WAERS"/>
-    <keyword match="SYST-CDATE"/>
-    <keyword match="SYST-DATUM"/>
-    <keyword match="SYST-SLSET"/>
-    <keyword match="SYST-SUBTY"/>
-    <keyword match="SYST-SUBCS"/>
-    <keyword match="SYST-GROUP"/>
-    <keyword match="SYST-FFILE"/>
-    <keyword match="SYST-UZEIT"/>
-    <keyword match="SYST-DSNAM"/>
-    <keyword match="SYST-REPID"/>
-    <keyword match="SYST-TABID"/>
-    <keyword match="SYST-TFDSN"/>
-    <keyword match="SYST-UNAME"/>
-    <keyword match="SYST-LSTAT"/>
-    <keyword match="SYST-ABCDE"/>
-    <keyword match="SYST-MARKY"/>
-    <keyword match="SYST-SFNAM"/>
-    <keyword match="SYST-TNAME"/>
-    <keyword match="SYST-MSGLI"/>
-    <keyword match="SYST-TITLE"/>
-    <keyword match="SYST-ENTRY"/>
-    <keyword match="SYST-LISEL"/>
-    <keyword match="SYST-ULINE"/>
-    <keyword match="SYST-XCODE"/>
-    <keyword match="SYST-CPROG"/>
-    <keyword match="SYST-XPROG"/>
-    <keyword match="SYST-XFORM"/>
-    <keyword match="SYST-LDBPG"/>
-    <keyword match="SYST-TVAR0"/>
-    <keyword match="SYST-TVAR1"/>
-    <keyword match="SYST-TVAR2"/>
-    <keyword match="SYST-TVAR3"/>
-    <keyword match="SYST-TVAR4"/>
-    <keyword match="SYST-TVAR5"/>
-    <keyword match="SYST-TVAR6"/>
-    <keyword match="SYST-TVAR7"/>
-    <keyword match="SYST-TVAR8"/>
-    <keyword match="SYST-TVAR9"/>
-    <keyword match="SYST-MSGID"/>
-    <keyword match="SYST-MSGTY"/>
-    <keyword match="SYST-MSGNO"/>
-    <keyword match="SYST-MSGV1"/>
-    <keyword match="SYST-MSGV2"/>
-    <keyword match="SYST-MSGV3"/>
-    <keyword match="SYST-MSGV4"/>
-    <keyword match="SYST-ONCOM"/>
-    <keyword match="SYST-VLINE"/>
-    <keyword match="SYST-WINSL"/>
-    <keyword match="SYST-STACO"/>
-    <keyword match="SYST-STARO"/>
-    <keyword match="SYST-DATAR"/>
-    <keyword match="SYST-HOST"/>
-    <keyword match="SYST-LOCDB"/>
-    <keyword match="SYST-LOCOP"/>
-    <keyword match="SYST-DATLO"/>
-    <keyword match="SYST-TIMLO"/>
-    <keyword match="SYST-ZONLO"/>
-  </keywords> 
-
-
-  <keywords name="reserved" inherits="identifier" innerClass="reserved">
-    <keyword match="ABS"/>
-    <keyword match="ACOS"/>
-    <keyword match="ADD"/>
-    <keyword match="ADD-CORRESPONDING"/>
-    <keyword match="ADJACENT"/>
-    <keyword match="AFTER"/>
-    <keyword match="ALIASES"/>
-    <keyword match="ALL"/>
-    <keyword match="ANALYZER"/>
-    <keyword match="AND"/>
-    <keyword match="ANY"/>
-    <keyword match="APPEND"/>
-    <keyword match="AS"/>
-    <keyword match="ASCENDING"/>
-    <keyword match="ASIN"/>
-    <keyword match="ASSIGN"/>
-    <keyword match="ASSIGNED"/>
-    <keyword match="ASSIGNING"/>
-    <keyword match="AT"/>
-    <keyword match="ATAN"/>
-    <keyword match="AUTHORITY-CHECK"/>
-    <keyword match="AVG"/>
-    <keyword match="BACK"/>
-    <keyword match="BEFORE"/>
-    <keyword match="BEGIN"/>
-    <keyword match="BINARY"/>
-    <keyword match="BIT"/>
-    <keyword match="BIT-AND"/>
-    <keyword match="BIT-NOT"/>
-    <keyword match="BIT-OR"/>
-    <keyword match="BIT-XOR"/>
-    <keyword match="BLANK"/>
-    <keyword match="BLOCK"/>
-    <keyword match="BREAK-POINT"/>
-    <keyword match="BUFFER"/>
-    <keyword match="BY"/>
-    <keyword match="C"/>
-    <keyword match="CALL"/>
-    <keyword match="CASE"/>
-    <keyword match="CATCH"/>
-    <keyword match="CEIL"/>
-    <keyword match="CENTERED"/>
-    <keyword match="CHAIN"/>
-    <keyword match="CHANGE"/>
-    <keyword match="CHANGING"/>
-    <keyword match="CHECK"/>
-    <keyword match="CHECKBOX"/>
-    <keyword match="CLASS"/>
-    <keyword match="CLASS-DATA"/>
-    <keyword match="CLASS-EVENTS"/>
-    <keyword match="CLASS-METHODS"/>
-    <keyword match="CLASS-POOL"/>
-    <keyword match="CLEAR"/>
-    <keyword match="CLIENT"/>
-    <keyword match="CLOSE"/>
-    <keyword match="CNT"/>
-    <keyword match="CODE"/>
-    <keyword match="COLLECT"/>
-    <keyword match="COLOR"/>
-    <keyword match="COMMENT"/>
-    <keyword match="COMMIT"/>
-    <keyword match="COMMUNICATION"/>
-    <keyword match="COMPUTE"/>
-    <keyword match="CONCATENATE"/>
-    <keyword match="CONDENSE"/>
-    <keyword match="CONSTANTS"/>
-    <keyword match="CONTEXT"/>
-    <keyword match="CONTEXTS"/>
-    <keyword match="CONTINUE"/>
-    <keyword match="CONTROL"/>
-    <keyword match="CONTROLS"/>
-    <keyword match="CONVERT"/>
-    <keyword match="COPY"/>
-    <keyword match="CORRESPONDING"/>
-    <keyword match="COS"/>
-    <keyword match="COSH"/>
-    <keyword match="COUNT"/>
-    <keyword match="COUNTRY"/>
-    <keyword match="CREATE"/>
-    <keyword match="CURRENCY"/>
-    <keyword match="CURSOR"/>
-    <keyword match="CUSTOMER-FUNCTION"/>
-    <keyword match="DATA"/>
-    <keyword match="DATABASE"/>
-    <keyword match="DATASET"/>
-    <keyword match="DELETE"/>
-    <keyword match="DECIMALS"/>
-    <keyword match="DEFAULT"/>
-    <keyword match="DEFINE"/>
-    <keyword match="DELETE"/>
-    <keyword match="DEMAND"/>
-    <keyword match="DESCENDING"/>
-    <keyword match="DESCRIBE"/>
-    <keyword match="DIALOG"/>
-    <keyword match="DISTINCT"/>
-    <keyword match="DIV"/>
-    <keyword match="DIVIDE"/>
-    <keyword match="DIVIDE-CORRESPONDING"/>
-    <keyword match="DO"/>
-    <keyword match="DUPLICATES"/>
-    <keyword match="DYNPRO"/>
-    <keyword match="EDIT"/>
-    <keyword match="EDITOR-CALL"/>
-    <keyword match="ELSE"/>
-    <keyword match="ELSEIF"/>
-    <keyword match="END"/>
-    <keyword match="END-OF-DEFINITION"/>
-    <keyword match="END-OF-PAGE"/>
-    <keyword match="END-OF-SELECTION"/>
-    <keyword match="ENDAT"/>
-    <keyword match="ENDCASE"/>
-    <keyword match="ENDCATCH"/>
-    <keyword match="ENDCHAIN"/>
-    <keyword match="ENDCLASS"/>
-    <keyword match="ENDDO"/>
-    <keyword match="ENDEXEC"/>
-    <keyword match="ENDFORM"/>
-    <keyword match="ENDFUNCTION"/>
-    <keyword match="ENDIF"/>
-    <keyword match="ENDINTERFACE"/>
-    <keyword match="ENDLOOP"/>
-    <keyword match="ENDMETHOD"/>
-    <keyword match="ENDMODULE"/>
-    <keyword match="ENDON"/>
-    <keyword match="ENDPROVIDE"/>
-    <keyword match="ENDSELECT"/>
-    <keyword match="ENDWHILE"/>
-    <keyword match="ENTRIES"/>
-    <keyword match="EVENTS"/>
-    <keyword match="EXEC"/>
-    <keyword match="EXIT"/>
-    <keyword match="EXIT-COMMAND"/>
-    <keyword match="EXP"/>
-    <keyword match="EXPONENT"/>
-    <keyword match="EXPORT"/>
-    <keyword match="EXPORTING"/>
-    <keyword match="EXCEPTIONS"/>
-    <keyword match="EXTENDED"/>
-    <keyword match="EXTRACT"/>
-    <keyword match="FETCH"/>
-    <keyword match="FIELD"/>
-    <keyword match="FIELD-GROUPS"/>
-    <keyword match="FIELD-SYMBOLS"/>
-    <keyword match="FIELDS"/>
-    <keyword match="FLOOR"/>
-    <keyword match="FOR"/>
-    <keyword match="FORM"/>
-    <keyword match="FORMAT"/>
-    <keyword match="FRAC"/>
-    <keyword match="FRAME"/>
-    <keyword match="FREE"/>
-    <keyword match="FROM"/>
-    <keyword match="FUNCTION"/>
-    <keyword match="FUNCTION-POOL"/>
-    <keyword match="GENERATE"/>
-    <keyword match="GET"/>
-    <keyword match="GROUP"/>
-    <keyword match="HASHED"/>
-    <keyword match="HEADER"/>
-    <keyword match="HELP-ID"/>
-    <keyword match="HELP-REQUEST"/>
-    <keyword match="HIDE"/>
-    <keyword match="HOTSPOT"/>
-    <keyword match="ICON"/>
-    <keyword match="ID"/>
-    <keyword match="IF"/>
-    <keyword match="IMPORT"/>
-    <keyword match="IMPORTING"/>
-    <keyword match="INCLUDE"/>
-    <keyword match="INDEX"/>
-    <keyword match="INFOTYPES"/>
-    <keyword match="INITIALIZATION"/>
-    <keyword match="INNER"/>
-    <keyword match="INPUT"/>
-    <keyword match="INSERT"/>
-    <keyword match="INTENSIFIED"/>
-    <keyword match="INTERFACE"/>
-    <keyword match="INTERFACE-POOL"/>
-    <keyword match="INTERFACES"/>
-    <keyword match="INTO"/>
-    <keyword match="INVERSE"/>
-    <keyword match="JOIN"/>
-    <keyword match="KEY"/>
-    <keyword match="LANGUAGE"/>
-    <keyword match="LAST"/>
-    <keyword match="LEAVE"/>
-    <keyword match="LEFT"/>
-    <keyword match="LEFT-JUSTIFIED"/>
-    <keyword match="LIKE"/>
-    <keyword match="LINE"/>
-    <keyword match="LINE-COUNT"/>
-    <keyword match="LINE-SELECTION"/>
-    <keyword match="LINE-SIZE"/>
-    <keyword match="LINES"/>
-    <keyword match="LIST-PROCESSING"/>
-    <keyword match="LOAD"/>
-    <keyword match="LOAD-OF-PROGRAM"/>
-    <keyword match="LOCAL"/>
-    <keyword match="LOCALE"/>
-    <keyword match="LOG"/>
-    <keyword match="LOG10"/>
-    <keyword match="LOOP"/>
-    <keyword match="M"/>
-    <keyword match="MARGIN"/>
-    <keyword match="MASK"/>
-    <keyword match="MATCHCODE"/>
-    <keyword match="MAX"/>
-    <keyword match="MEMORY"/>
-    <keyword match="MESSAGE"/>
-    <keyword match="MESSAGE-ID"/>
-    <keyword match="MESSAGES"/>
-    <keyword match="METHOD"/>
-    <keyword match="METHODS"/>
-    <keyword match="MIN"/>
-    <keyword match="MOD"/>
-    <keyword match="MODE"/>
-    <keyword match="MODIF"/>
-    <keyword match="MODIFY"/>
-    <keyword match="MODULE"/>
-    <keyword match="MOVE"/>
-    <keyword match="MOVE-CORRESPONDING"/>
-    <keyword match="MULTIPLY"/>
-    <keyword match="MULTIPLY-CORRESPONDING"/>
-    <keyword match="NEW"/>
-    <keyword match="NEW-LINE"/>
-    <keyword match="NEW-PAGE"/>
-    <keyword match="NEXT"/>
-    <keyword match="NO"/>
-    <keyword match="NO-GAP"/>
-    <keyword match="NO-GAPS"/>
-    <keyword match="NO-HEADING"/>
-    <keyword match="NO-SCROLLING"/>
-    <keyword match="NO-SIGN"/>
-    <keyword match="NO-TITLE"/>
-    <keyword match="NO-ZERO"/>
-    <keyword match="NODES"/>
-    <keyword match="NON-UNIQUE"/>
-    <keyword match="O"/>
-    <keyword match="OBJECT"/>
-    <keyword match="OBLIGATORY"/>
-    <keyword match="OCCURS"/>
-    <keyword match="OF"/>
-    <keyword match="OFF"/>
-    <keyword match="ON"/>
-    <keyword match="OPEN"/>
-    <keyword match="OR"/>
-    <keyword match="ORDER"/>
-    <keyword match="OTHERS"/>
-    <keyword match="OUTER"/>
-    <keyword match="OUTPUT"/>
-    <keyword match="OVERLAY"/>
-    <keyword match="PACK"/>
-    <keyword match="PAGE"/>
-    <keyword match="PARAMETER"/>
-    <keyword match="PARAMETERS"/>
-    <keyword match="PERFORM"/>
-    <keyword match="PF-STATUS"/>
-    <keyword match="POSITION"/>
-    <keyword match="PRINT"/>
-    <keyword match="PRINT-CONTROL"/>
-    <keyword match="PRIVATE"/>
-    <keyword match="PROCESS"/>
-    <keyword match="PROGRAM"/>
-    <keyword match="PROPERTY"/>
-    <keyword match="PROTECTED"/>
-    <keyword match="PROVIDE"/>
-    <keyword match="PUBLIC"/>
-    <keyword match="PUT"/>
-    <keyword match="RADIOBUTTON"/>
-    <keyword match="RAISE"/>
-    <keyword match="RAISING"/>
-    <keyword match="RANGE"/>
-    <keyword match="RANGES"/>
-    <keyword match="READ"/>
-    <keyword match="RECEIVE"/>
-    <keyword match="REFRESH"/>
-    <keyword match="REJECT"/>
-    <keyword match="REPLACE"/>
-    <keyword match="REPORT"/>
-    <keyword match="REQUESTED"/>
-    <keyword match="RESERVE"/>
-    <keyword match="RESET"/>
-    <keyword match="RIGHT-JUSTIFIED"/>
-    <keyword match="ROLLBACK"/>
-    <keyword match="ROUND"/>
-    <keyword match="ROWS"/>
-    <keyword match="RTTI"/>
-    <keyword match="RUN"/>
-    <keyword match="SCAN"/>
-    <keyword match="SCREEN"/>
-    <keyword match="SEARCH"/>
-    <keyword match="SEPARATED"/>
-    <keyword match="SCROLL"/>
-    <keyword match="SCROLL-BOUNDARY"/>
-    <keyword match="SEARCH"/>
-    <keyword match="SELECT"/>
-    <keyword match="SELECT-OPTIONS"/>
-    <keyword match="SELECTION-SCREEN"/>
-    <keyword match="SELECTION-TABLE"/>
-    <keyword match="SET"/>
-    <keyword match="SHARED"/>
-    <keyword match="SHIFT"/>
-    <keyword match="SIGN"/>
-    <keyword match="SIN"/>
-    <keyword match="SINGLE"/>
-    <keyword match="SINH"/>
-    <keyword match="SIZE"/>
-    <keyword match="SKIP"/>
-    <keyword match="SORT"/>
-    <keyword match="SORTED"/>
-    <keyword match="SPLIT"/>
-    <keyword match="SQL"/>
-    <keyword match="SQRT"/>
-    <keyword match="STAMP"/>
-    <keyword match="STANDARD"/>
-    <keyword match="START-OF-SELECTION"/>
-    <keyword match="STATICS"/>
-    <keyword match="STOP"/>
-    <keyword match="STRING"/>
-    <keyword match="STRLEN"/>
-    <keyword match="STRUCTURE"/>
-    <keyword match="SUBMIT"/>
-    <keyword match="SUBTRACT"/>
-    <keyword match="SUBTRACT-CORRESPONDING"/>
-    <keyword match="SUM"/>
-    <keyword match="SUPPLY"/>
-    <keyword match="SUPPRESS"/>
-    <keyword match="SYMBOL"/>
-    <keyword match="SYNTAX-CHECK"/>
-    <keyword match="SYNTAX-TRACE"/>
-    <keyword match="SYSTEM-CALL"/>
-    <keyword match="SYSTEM-EXCEPTIONS"/>
-    <keyword match="TABLE"/>
-    <keyword match="TABLE_LINE"/>
-    <keyword match="TABLES"/>
-    <keyword match="TAN"/>
-    <keyword match="TANH"/>
-    <keyword match="TEXT"/>
-    <keyword match="TEXTPOOL"/>
-    <keyword match="TIME"/>
-    <keyword match="TIMES"/>
-    <keyword match="TITLE"/>
-    <keyword match="TITLEBAR"/>
-    <keyword match="TO"/>
-    <keyword match="TOP-OF-PAGE"/>
-    <keyword match="TRANSACTION"/>
-    <keyword match="TRANSFER"/>
-    <keyword match="TRANSLATE"/>
-    <keyword match="TRANSPORTING"/>
-    <keyword match="TRUNC"/>
-    <keyword match="TYPE"/>
-    <keyword match="TYPE-POOL"/>
-    <keyword match="TYPE-POOLS"/>
-    <keyword match="TYPES"/>
-    <keyword match="ULINE"/>
-    <keyword match="UNDER"/>
-    <keyword match="UNIQUE"/>
-    <keyword match="UNIT"/>
-    <keyword match="UNPACK"/>
-    <keyword match="UP"/>
-    <keyword match="UPDATE"/>
-    <keyword match="USER-COMMAND"/>
-    <keyword match="USING"/>
-    <keyword match="VALUE"/>
-    <keyword match="VALUE-REQUEST"/>
-    <keyword match="VALUES"/>
-    <keyword match="VARY"/>
-    <keyword match="WHEN"/>
-    <keyword match="WHERE"/>
-    <keyword match="WHILE"/>
-    <keyword match="WINDOW"/>
-    <keyword match="WITH"/>
-    <keyword match="WITH-TITLE"/>
-    <keyword match="WORK"/>
-    <keyword match="WRITE"/>
-    <keyword match="X"/>
-    <keyword match="XSTRING"/>
-    <keyword match="Z"/>
-    <keyword match="ZONE"/>
-  </keywords> 
-  
-  
-  <keywords name="constants" inherits="identifier" innerClass="reserved">
-    <keyword match="INITIAL"/>
-    <keyword match="NULL"/>
-    <keyword match="SPACE"/>
-    <keyword match="COL_BACKGROUND"/>
-    <keyword match="COL_HEADING"/>
-    <keyword match="COL_NORMAL"/>
-    <keyword match="COL_TOTAL"/>
-    <keyword match="COL_KEY"/>
-    <keyword match="COL_POSITIVE"/>
-    <keyword match="COL_NEGATIVE"/>
-    <keyword match="COL_GROUP"/>
-  </keywords>
-  
-</highlight>
diff --git a/library/Text_Highlighter/avrc.xml b/library/Text_Highlighter/avrc.xml
deleted file mode 100644
index dec571e13..000000000
--- a/library/Text_Highlighter/avrc.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: avrc.xml,v 1.1 2008-07-31 23:05:38 ssttoo Exp $ -->
-
-<highlight lang="AVRC" case="no">
-
-	<authors>
-        <author name="Andrey Demenev" email="demenev@gmail.com"/>
-	</authors>
-
-	<comment>
-		C/C++ highlighter specific to Atmel AVR microcontrollers
-    </comment>
-
-	<default innerClass="code" />
-
-	<block name="escaped" match="\\" innerClass="special" contained="yes">
-		<onlyin region="strdouble"/>
-	</block>
-
-    <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;"/>
-
-	<region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
-		<contains all="yes"/>
-	</region>
-
-	<region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
-		<contains all="yes"/>
-	</region>
-
-	<region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
-		<contains all="yes"/>
-	</region>
-
-	<block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
-
-  <block name="hexinteger" match="\b0[xX][\da-f]+" innerClass="number"/>
-  <block name="integer" match="\b\d\d*|\b0\b" innerClass="number"/>
-  <block name="octinteger" match="\b0[0-7]+" innerClass="number"/>
-  <block name="float" match="\b(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
-
-
-  <region name="strincl" delimClass="quotes" innerClass="string" start="&lt;" end="&gt;">
-      <onlyin region="include" />
-  </region>
-
-  <!-- <block name="preprocessor" match="^#[azAZ_]\w*" innerClass="prepro"/> -->
-    <region name="include" innerClass="prepro" start="/^[ \t]*#include/m" end="/(?&lt;!\\)$/m">
-		<contains region="strdouble"/>
-		<contains region="strincl"/>
-	</region>
-
-    <region name="preprocessor" delimClass="prepro"  innerClass="code" start="/^[ \t]*#[ \t]*[a-z]+/mi" end="/(?&lt;!\\)$/m">
-        <contains region="comment"/>
-        <contains region="mlcomment"/>
-		<contains region="strdouble"/>
-        <contains region="brackets"/>
-        <contains region="block"/>
-        <contains block="identifier"/>
-        <contains block="integer"/>
-        <contains block="hexinteger"/>
-        <contains block="octinteger"/>
-        <contains block="float"/>
-
-	</region>
-
-	<block name="number" match="\d*\.?\d+" innerClass="number"/>
-
-
-	<region name="mlcomment" innerClass="mlcomment" start="\/\*" end="\*\/" >
-		<contains block="cvstag"/>
-	</region>
-
-	<block name="cvstag" match="\$\w+\s*:.+\$" innerClass="inlinedoc">
-
-		<onlyin region="mlcomment"/>
-		<onlyin region="comment"/>
-	</block>
-
-	<region name="comment" start="\/\/.+" end="/$/m" innerClass="comment" delimClass="comment">
-		<contains block="cvstag"/>
-    </region>
-
-    <keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
-		<keyword match="and" />
-		<keyword match="and_eq" />
-		<keyword match="asm" />
-
-		<keyword match="bitand" />
-		<keyword match="bitor" />
-		<keyword match="break" />
-		<keyword match="case" />
-		<keyword match="catch" />
-		<keyword match="compl" />
-
-		<keyword match="const_cast" />
-		<keyword match="continue" />
-		<keyword match="default" />
-		<keyword match="delete" />
-		<keyword match="do" />
-		<keyword match="dynamic_cast" />
-
-		<keyword match="else" />
-		<keyword match="for" />
-		<keyword match="fortran" />
-		<keyword match="friend" />
-		<keyword match="goto" />
-		<keyword match="if" />
-
-		<keyword match="new" />
-		<keyword match="not" />
-		<keyword match="not_eq" />
-		<keyword match="operator" />
-		<keyword match="or" />
-		<keyword match="or_eq" />
-
-		<keyword match="private" />
-		<keyword match="protected" />
-		<keyword match="public" />
-		<keyword match="reinterpret_cast" />
-		<keyword match="return" />
-		<keyword match="sizeof" />
-
-		<keyword match="static_cast" />
-		<keyword match="switch" />
-		<keyword match="this" />
-		<keyword match="throw" />
-		<keyword match="try" />
-		<keyword match="typeid" />
-
-		<keyword match="using" />
-		<keyword match="while" />
-		<keyword match="xor" />
-		<keyword match="xor_eq" />
-
-        <keyword match="false" />
-		<keyword match="true" />
-	</keywords>
-
-	<keywords name="registers" inherits="identifier" innerClass="reserved" case="yes">
-		<keyword match="ACSR" />
-		<keyword match="ADCH" />
-		<keyword match="ADCL" />
-		<keyword match="ADCSRA" />
-		<keyword match="ADMUX" />
-		<keyword match="ASSR" />
-		<keyword match="DDRA" />
-		<keyword match="DDRB" />
-		<keyword match="DDRC" />
-		<keyword match="DDRD" />
-		<keyword match="DDRE" />
-		<keyword match="DDRF" />
-		<keyword match="DDRG" />
-		<keyword match="EEARH" />
-		<keyword match="EEARL" />
-		<keyword match="EECR" />
-		<keyword match="EEDR" />
-		<keyword match="EICRA" />
-		<keyword match="EICRB" />
-		<keyword match="EIFR" />
-		<keyword match="EIMSK" />
-		<keyword match="ETIFR" />
-		<keyword match="ETIMSK" />
-		<keyword match="GICR" />
-		<keyword match="GIFR" />
-		<keyword match="ICR1H" />
-		<keyword match="ICR1L" />
-		<keyword match="ICR3H" />
-		<keyword match="ICR3L" />
-		<keyword match="MCUCR" />
-		<keyword match="MCUCSR" />
-		<keyword match="OCDR" />
-		<keyword match="OCR0" />
-		<keyword match="OCR1AH" />
-		<keyword match="OCR1AL" />
-		<keyword match="OCR1BH" />
-		<keyword match="OCR1BL" />
-		<keyword match="OCR1CH" />
-		<keyword match="OCR1CL" />
-		<keyword match="OCR2" />
-		<keyword match="OCR3AH" />
-		<keyword match="OCR3AL" />
-		<keyword match="OCR3BH" />
-		<keyword match="OCR3BL" />
-		<keyword match="OCR3CH" />
-		<keyword match="OCR3CL" />
-		<keyword match="OSCCAL" />
-		<keyword match="PINA" />
-		<keyword match="PINB" />
-		<keyword match="PINC" />
-		<keyword match="PIND" />
-		<keyword match="PINE" />
-		<keyword match="PINF" />
-		<keyword match="PING" />
-		<keyword match="PORTA" />
-		<keyword match="PORTB" />
-		<keyword match="PORTC" />
-		<keyword match="PORTD" />
-		<keyword match="PORTE" />
-		<keyword match="PORTF" />
-		<keyword match="PORTG" />
-		<keyword match="RAMPZ" />
-		<keyword match="SFIOR" />
-		<keyword match="SPCR" />
-		<keyword match="SPDR" />
-		<keyword match="SPH" />
-		<keyword match="SPL" />
-		<keyword match="SPMCR" />
-		<keyword match="SPMCSR" />
-		<keyword match="SPSR" />
-		<keyword match="SREG" />
-		<keyword match="TCCR0" />
-		<keyword match="TCCR1A" />
-		<keyword match="TCCR1B" />
-		<keyword match="TCCR1C" />
-		<keyword match="TCCR2" />
-		<keyword match="TCCR3A" />
-		<keyword match="TCCR3B" />
-		<keyword match="TCCR3C" />
-		<keyword match="TCNT0" />
-		<keyword match="TCNT1H" />
-		<keyword match="TCNT1L" />
-		<keyword match="TCNT2" />
-		<keyword match="TCNT3H" />
-		<keyword match="TCNT3L" />
-		<keyword match="TIFR" />
-		<keyword match="TIMSK" />
-		<keyword match="TWAR" />
-		<keyword match="TWBR" />
-		<keyword match="TWCR" />
-		<keyword match="TWDR" />
-		<keyword match="TWSR" />
-		<keyword match="UBRR0H" />
-		<keyword match="UBRR0L" />
-		<keyword match="UBRR1H" />
-		<keyword match="UBRR1L" />
-		<keyword match="UBRRH" />
-		<keyword match="UBRRL" />
-		<keyword match="UCSR0A" />
-		<keyword match="UCSR0B" />
-		<keyword match="UCSR0C" />
-		<keyword match="UCSR1A" />
-		<keyword match="UCSR1B" />
-		<keyword match="UCSR1C" />
-		<keyword match="UCSRA" />
-		<keyword match="UCSRB" />
-		<keyword match="UCSRC" />
-		<keyword match="UDR" />
-		<keyword match="UDR0" />
-		<keyword match="UDR1" />
-		<keyword match="WDTCR" />
-		<keyword match="XDIV" />
-		<keyword match="XMCRA" />
-		<keyword match="XMCRB" />
-	</keywords>
-
-	<keywords name="types" inherits="identifier" innerClass="types" case="yes">
-
-		<keyword match="auto" />
-		<keyword match="bool" />
-		<keyword match="char" />
-		<keyword match="class" />
-		<keyword match="const" />
-		<keyword match="double" />
-
-		<keyword match="enum" />
-		<keyword match="explicit" />
-		<keyword match="export" />
-		<keyword match="extern" />
-		<keyword match="float" />
-		<keyword match="inline" />
-
-		<keyword match="int" />
-		<keyword match="long" />
-		<keyword match="mutable" />
-		<keyword match="namespace" />
-		<keyword match="register" />
-		<keyword match="short" />
-
-		<keyword match="signed" />
-		<keyword match="static" />
-		<keyword match="struct" />
-		<keyword match="template" />
-		<keyword match="typedef" />
-		<keyword match="typename" />
-
-		<keyword match="union" />
-		<keyword match="unsigned" />
-		<keyword match="virtual" />
-		<keyword match="void" />
-		<keyword match="volatile" />
-		<keyword match="wchar_t" />
-
-	</keywords>
-
-	<keywords name="Common Macros" inherits="identifier" innerClass="prepro" case="yes">
-		<keyword match="NULL" />
-		<keyword match="TRUE" />
-		<keyword match="FALSE" />
-		<keyword match="MAX" />
-
-		<keyword match="MIN" />
-		<keyword match="__LINE__" />
-		<keyword match="__DATA__" />
-		<keyword match="__FILE__" />
-		<keyword match="__TIME__" />
-		<keyword match="__STDC__" />
-
-	</keywords>
-
-
-	<!--
-	<keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
-	-->
-
-</highlight>
-
diff --git a/library/Text_Highlighter/cpp.xml b/library/Text_Highlighter/cpp.xml
deleted file mode 100644
index 2cbaa930f..000000000
--- a/library/Text_Highlighter/cpp.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: cpp.xml,v 1.2 2008-07-31 23:06:30 ssttoo Exp $ -->
-
-<highlight lang="CPP" case="no">
-
-	<authors>
-		<author name="Aaron Kalin"/>
-        <author name="Andrey Demenev" email="demenev@gmail.com"/>
-	</authors>
-
-    <comment>
-Thanks to Aaron Kalin for initial
-implementation of this highlighter
-    </comment>
-
-	<default innerClass="code" />
-
-	<block name="escaped" match="\\" innerClass="special" contained="yes">
-		<onlyin region="strdouble"/>
-	</block>
-
-    <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;"/>
-
-	<region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
-		<contains all="yes"/>
-	</region>
-
-	<region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
-		<contains all="yes"/>
-	</region>
-
-	<region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
-		<contains all="yes"/>
-	</region>
-
-	<block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
-
-  <block name="hexinteger" match="\b0[xX][\da-f]+" innerClass="number"/>
-  <block name="integer" match="\b\d\d*|\b0\b" innerClass="number"/>
-  <block name="octinteger" match="\b0[0-7]+" innerClass="number"/>
-  <block name="float" match="\b(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
-
-
-  <region name="strincl" delimClass="quotes" innerClass="string" start="&lt;" end="&gt;">
-      <onlyin region="include" />
-  </region>
-
-  <!-- <block name="preprocessor" match="^#[azAZ_]\w*" innerClass="prepro"/> -->
-    <region name="include" innerClass="prepro" start="/^[ \t]*#include/m" end="/(?&lt;!\\)$/m">
-		<contains region="strdouble"/>
-		<contains region="strincl"/>
-	</region>
-
-    <region name="preprocessor" delimClass="prepro"  innerClass="code" start="/^[ \t]*#[ \t]*[a-z]+/mi" end="/(?&lt;!\\)$/m">
-        <contains region="comment"/>
-        <contains region="mlcomment"/>
-		<contains region="strdouble"/>
-        <contains region="brackets"/>
-        <contains region="block"/>
-        <contains block="identifier"/>
-        <contains block="integer"/>
-        <contains block="hexinteger"/>
-        <contains block="octinteger"/>
-        <contains block="float"/>
-
-	</region>
-
-	<block name="number" match="\d*\.?\d+" innerClass="number"/>
-
-
-	<region name="mlcomment" innerClass="mlcomment" start="\/\*" end="\*\/" >
-		<contains block="cvstag"/>
-	</region>
-
-	<block name="cvstag" match="\$\w+\s*:.+\$" innerClass="inlinedoc">
-
-		<onlyin region="mlcomment"/>
-		<onlyin region="comment"/>
-	</block>
-
-	<region name="comment" start="\/\/.+" end="/$/m" innerClass="comment" delimClass="comment">
-		<contains block="cvstag"/>
-    </region>
-
-    <keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
-		<keyword match="and" />
-		<keyword match="and_eq" />
-		<keyword match="asm" />
-
-		<keyword match="bitand" />
-		<keyword match="bitor" />
-		<keyword match="break" />
-		<keyword match="case" />
-		<keyword match="catch" />
-		<keyword match="compl" />
-
-		<keyword match="const_cast" />
-		<keyword match="continue" />
-		<keyword match="default" />
-		<keyword match="delete" />
-		<keyword match="do" />
-		<keyword match="dynamic_cast" />
-
-		<keyword match="else" />
-		<keyword match="for" />
-		<keyword match="fortran" />
-		<keyword match="friend" />
-		<keyword match="goto" />
-		<keyword match="if" />
-
-		<keyword match="new" />
-		<keyword match="not" />
-		<keyword match="not_eq" />
-		<keyword match="operator" />
-		<keyword match="or" />
-		<keyword match="or_eq" />
-
-		<keyword match="private" />
-		<keyword match="protected" />
-		<keyword match="public" />
-		<keyword match="reinterpret_cast" />
-		<keyword match="return" />
-		<keyword match="sizeof" />
-
-		<keyword match="static_cast" />
-		<keyword match="switch" />
-		<keyword match="this" />
-		<keyword match="throw" />
-		<keyword match="try" />
-		<keyword match="typeid" />
-
-		<keyword match="using" />
-		<keyword match="while" />
-		<keyword match="xor" />
-		<keyword match="xor_eq" />
-
-        <keyword match="false" />
-		<keyword match="true" />
-	</keywords>
-
-	<keywords name="types" inherits="identifier" innerClass="types" case="yes">
-
-		<keyword match="auto" />
-		<keyword match="bool" />
-		<keyword match="char" />
-		<keyword match="class" />
-		<keyword match="const" />
-		<keyword match="double" />
-
-		<keyword match="enum" />
-		<keyword match="explicit" />
-		<keyword match="export" />
-		<keyword match="extern" />
-		<keyword match="float" />
-		<keyword match="inline" />
-
-		<keyword match="int" />
-		<keyword match="long" />
-		<keyword match="mutable" />
-		<keyword match="namespace" />
-		<keyword match="register" />
-		<keyword match="short" />
-
-		<keyword match="signed" />
-		<keyword match="static" />
-		<keyword match="struct" />
-		<keyword match="template" />
-		<keyword match="typedef" />
-		<keyword match="typename" />
-
-		<keyword match="union" />
-		<keyword match="unsigned" />
-		<keyword match="virtual" />
-		<keyword match="void" />
-		<keyword match="volatile" />
-		<keyword match="wchar_t" />
-
-	</keywords>
-
-	<keywords name="Common Macros" inherits="identifier" innerClass="prepro" case="yes">
-		<keyword match="NULL" />
-		<keyword match="TRUE" />
-		<keyword match="FALSE" />
-		<keyword match="MAX" />
-
-		<keyword match="MIN" />
-		<keyword match="__LINE__" />
-		<keyword match="__DATA__" />
-		<keyword match="__FILE__" />
-		<keyword match="__TIME__" />
-		<keyword match="__STDC__" />
-
-	</keywords>
-
-
-	<!--
-	<keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
-	-->
-
-</highlight>
-
diff --git a/library/Text_Highlighter/css.xml b/library/Text_Highlighter/css.xml
deleted file mode 100644
index 2473bcfb7..000000000
--- a/library/Text_Highlighter/css.xml
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: css.xml,v 1.2 2008-01-01 23:45:07 ssttoo Exp $ -->
-
-<highlight lang="css" case="no">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-
-  <default innerClass="code" />
-
-
-  <region name="mlcomment" innerClass="comment" start="\/\*" end="\*\/" >
-
-  </region>
-
-
-  <block name="atrule" match="(@[a-z\d]+)"
-         innerClass="var" never-contained="yes"/>
-
-  <region name="property" start="[a-z][a-z\d\-]*\s*:" end="(?=;|\})"
-         innerClass="code" delimClass="reserved" contained="yes"/>
-
-  <block name="selector" match="(((\.|#)?[a-z]+[a-z\d\-]*(?![a-z\d\-]))|(\*))(?!\s*:\s*[\s\{])"
-         innerClass="identifier" >
-  </block>
-
-  <block name="pseudo" match=":[a-z][a-z\d\-]*"
-         innerClass="special" />
-
-  <block name="bescaped" match="\\[\\(\\)\\]"
-         innerClass="string" contained="yes"/>
-
-
-  <region name="paramselector" start="\[" end="\]" innerClass="code"
-          delimClass="brackets" >
-    <contains block="paramname" />
-    <not-contains block="identifier" />
-    <contains region="strdouble" />
-    <contains region="strsingle" />
-  </region>
-
-  <region name="block" start="\{" end="\}" innerClass="code"
-          delimClass="brackets" >
-    <contains region="block" />
-    <contains region="property" />
-    <contains block="selector" />
-    <contains region="mlcomment" />
-  </region>
-
-  <region name="brackets" start="\(" end="\)" innerClass="string"
-          delimClass="brackets" contained="yes">
-    <contains block="bescaped"/>
-  </region>
-
-  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'" contained="yes"/>
-
-  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
-    <onlyin region="strsingle"/>
-  </block>
-
-  <block name="descaped" match="\\\\|\\&quot;|\\'|\\`|\\t|\\n|\\r" innerClass="special" contained="yes">
-    <onlyin region="strdouble"/>
-  </block>
-
-  <region name="strdouble" delimClass="quotes" innerClass="string"
-          start="&quot;" end="&quot;" contained="yes" />
-
-  <block name="measure" match="\d*\.?\d+(\%|em|ex|pc|pt|px|in|mm|cm)"
-         innerClass="number" contained="yes">
-    <onlyin region="property"/>
-    <partClass index="1" innerClass="string" />
-  </block>
-
-  <block name="number" match="\d*\.?\d+" innerClass="number" contained="yes" >
-    <onlyin region="property"/>
-  </block>
-
-  <block name="identifier" match="[a-z][a-z\d\-]*"
-         innerClass="code" contained="yes">
-    <onlyin region="property"/>
-  </block>
-
-  <block name="hexcolor" match="#([\da-f]{6}|[\da-f]{3})\b" innerClass="var" contained="yes">
-    <onlyin region="property"/>
-  </block>
-
-  <block name="paramname" match="[\w\-\:]+" innerClass="var" contained="yes">
-    <onlyin region="paramselector"/>
-  </block>
-
-  <keywords name="propertyValue" inherits="identifier" innerClass="string" case = "no">
-        <word name="left-side"/>
-        <keyword match="far-left"/>
-        <keyword match="left"/>
-        <keyword match="center-left"/>
-        <keyword match="center-right"/>
-        <keyword match="center"/>
-        <keyword match="far-right"/>
-        <keyword match="right-side"/>
-        <keyword match="right"/>
-        <keyword match="behind"/>
-        <keyword match="leftwards"/>
-        <keyword match="rightwards"/>
-        <keyword match="inherit"/>
-        <keyword match="scroll"/>
-        <keyword match="fixed"/>
-        <keyword match="transparent"/>
-        <keyword match="none"/>
-        <keyword match="repeat-x"/>
-        <keyword match="repeat-y"/>
-        <keyword match="repeat"/>
-        <keyword match="no-repeat"/>
-        <keyword match="collapse"/>
-        <keyword match="separate"/>
-        <keyword match="auto"/>
-        <keyword match="top"/>
-        <keyword match="bottom"/>
-        <keyword match="both"/>
-        <keyword match="open-quote"/>
-        <keyword match="close-quote"/>
-        <keyword match="no-open-quote"/>
-        <keyword match="no-close-quote"/>
-        <keyword match="crosshair"/>
-        <keyword match="default"/>
-        <keyword match="pointer"/>
-        <keyword match="move"/>
-        <keyword match="e-resize"/>
-        <keyword match="ne-resize"/>
-        <keyword match="nw-resize"/>
-        <keyword match="n-resize"/>
-        <keyword match="se-resize"/>
-        <keyword match="sw-resize"/>
-        <keyword match="s-resize"/>
-        <keyword match="text"/>
-        <keyword match="wait"/>
-        <keyword match="help"/>
-        <keyword match="ltr"/>
-        <keyword match="rtl"/>
-        <keyword match="inline"/>
-        <keyword match="block"/>
-        <keyword match="list-item"/>
-        <keyword match="run-in"/>
-        <keyword match="compact"/>
-        <keyword match="marker"/>
-        <keyword match="table"/>
-        <keyword match="inline-table"/>
-        <keyword match="table-row-group"/>
-        <keyword match="table-header-group"/>
-        <keyword match="table-footer-group"/>
-        <keyword match="table-row"/>
-        <keyword match="table-column-group"/>
-        <keyword match="table-column"/>
-        <keyword match="table-cell"/>
-        <keyword match="table-caption"/>
-        <keyword match="below"/>
-        <keyword match="level"/>
-        <keyword match="above"/>
-        <keyword match="higher"/>
-        <keyword match="lower"/>
-        <keyword match="show"/>
-        <keyword match="hide"/>
-        <keyword match="caption"/>
-        <keyword match="icon"/>
-        <keyword match="menu"/>
-        <keyword match="message-box"/>
-        <keyword match="small-caption"/>
-        <keyword match="status-bar"/>
-        <keyword match="normal"/>
-        <keyword match="wider"/>
-        <keyword match="narrower"/>
-        <keyword match="ultra-condensed"/>
-        <keyword match="extra-condensed"/>
-        <keyword match="condensed"/>
-        <keyword match="semi-condensed"/>
-        <keyword match="semi-expanded"/>
-        <keyword match="expanded"/>
-        <keyword match="extra-expanded"/>
-        <keyword match="ultra-expanded"/>
-        <keyword match="italic"/>
-        <keyword match="oblique"/>
-        <keyword match="small-caps"/>
-        <keyword match="bold"/>
-        <keyword match="bolder"/>
-        <keyword match="lighter"/>
-        <keyword match="inside"/>
-        <keyword match="outside"/>
-        <keyword match="disc"/>
-        <keyword match="circle"/>
-        <keyword match="square"/>
-        <keyword match="decimal"/>
-        <keyword match="decimal-leading-zero"/>
-        <keyword match="lower-roman"/>
-        <keyword match="upper-roman"/>
-        <keyword match="lower-greek"/>
-        <keyword match="lower-alpha"/>
-        <keyword match="lower-latin"/>
-        <keyword match="upper-alpha"/>
-        <keyword match="upper-latin"/>
-        <keyword match="hebrew"/>
-        <keyword match="armenian"/>
-        <keyword match="georgian"/>
-        <keyword match="cjk-ideographic"/>
-        <keyword match="hiragana"/>
-        <keyword match="katakana"/>
-        <keyword match="hiragana-iroha"/>
-        <keyword match="katakana-iroha"/>
-        <keyword match="crop"/>
-        <keyword match="cross"/>
-        <keyword match="invert"/>
-        <keyword match="visible"/>
-        <keyword match="hidden"/>
-        <keyword match="always"/>
-        <keyword match="avoid"/>
-        <keyword match="x-low"/>
-        <keyword match="low"/>
-        <keyword match="medium"/>
-        <keyword match="high"/>
-        <keyword match="x-high"/>
-        <keyword match="mix?"/>
-        <keyword match="repeat?"/>
-        <keyword match="static"/>
-        <keyword match="relative"/>
-        <keyword match="absolute"/>
-        <keyword match="portrait"/>
-        <keyword match="landscape"/>
-        <keyword match="spell-out"/>
-        <keyword match="once"/>
-        <keyword match="digits"/>
-        <keyword match="continuous"/>
-        <keyword match="code"/>
-        <keyword match="x-slow"/>
-        <keyword match="slow"/>
-        <keyword match="fast"/>
-        <keyword match="x-fast"/>
-        <keyword match="faster"/>
-        <keyword match="slower"/>
-        <keyword match="justify"/>
-        <keyword match="underline"/>
-        <keyword match="overline"/>
-        <keyword match="line-through"/>
-        <keyword match="blink"/>
-        <keyword match="capitalize"/>
-        <keyword match="uppercase"/>
-        <keyword match="lowercase"/>
-        <keyword match="embed"/>
-        <keyword match="bidi-override"/>
-        <keyword match="baseline"/>
-        <keyword match="sub"/>
-        <keyword match="super"/>
-        <keyword match="text-top"/>
-        <keyword match="middle"/>
-        <keyword match="text-bottom"/>
-        <keyword match="silent"/>
-        <keyword match="x-soft"/>
-        <keyword match="soft"/>
-        <keyword match="loud"/>
-        <keyword match="x-loud"/>
-        <keyword match="pre"/>
-        <keyword match="nowrap"/>
-        <keyword match="serif"/>
-        <keyword match="sans-serif"/>
-        <keyword match="cursive"/>
-        <keyword match="fantasy"/>
-        <keyword match="monospace"/>
-        <keyword match="empty"/>
-        <keyword match="string"/>
-        <keyword match="strict"/>
-        <keyword match="loose"/>
-        <keyword match="char"/>
-        <keyword match="true"/>
-        <keyword match="false"/>
-        <keyword match="dotted"/>
-        <keyword match="dashed"/>
-        <keyword match="solid"/>
-        <keyword match="double"/>
-        <keyword match="groove"/>
-        <keyword match="ridge"/>
-        <keyword match="inset"/>
-        <keyword match="outset"/>
-        <keyword match="larger"/>
-        <keyword match="smaller"/>
-        <keyword match="xx-small"/>
-        <keyword match="x-small"/>
-        <keyword match="small"/>
-        <keyword match="large"/>
-        <keyword match="x-large"/>
-        <keyword match="xx-large"/>
-        <keyword match="all"/>
-        <keyword match="newspaper"/>
-        <keyword match="distribute"/>
-        <keyword match="distribute-all-lines"/>
-        <keyword match="distribute-center-last"/>
-        <keyword match="inter-word"/>
-        <keyword match="inter-ideograph"/>
-        <keyword match="inter-cluster"/>
-        <keyword match="kashida"/>
-        <keyword match="ideograph-alpha"/>
-        <keyword match="ideograph-numeric"/>
-        <keyword match="ideograph-parenthesis"/>
-        <keyword match="ideograph-space"/>
-        <keyword match="keep-all"/>
-        <keyword match="break-all"/>
-        <keyword match="break-word"/>
-        <keyword match="lr-tb"/>
-        <keyword match="tb-rl"/>
-        <keyword match="thin"/>
-        <keyword match="thick"/>
-        <keyword match="inline-block"/>
-        <keyword match="w-resize"/>
-        <keyword match="hand"/>
-        <keyword match="distribute-letter"/>
-        <keyword match="distribute-space"/>
-        <keyword match="whitespace"/>
-        <keyword match="male"/>
-        <keyword match="female"/>
-        <keyword match="child"/>
-  </keywords>
-
-
-  <keywords name="namedcolor" inherits="identifier" innerClass="var" case = "no">
-    <keyword match="aqua"/>
-    <keyword match="black"/>
-    <keyword match="blue"/>
-    <keyword match="fuchsia"/>
-    <keyword match="gray"/>
-    <keyword match="green"/>
-    <keyword match="lime"/>
-    <keyword match="maroon"/>
-    <keyword match="navy"/>
-    <keyword match="olive"/>
-    <keyword match="purple"/>
-    <keyword match="red"/>
-    <keyword match="silver"/>
-    <keyword match="teal"/>
-    <keyword match="white"/>
-    <keyword match="yellow"/>
-    <keyword match="ActiveBorder"/>
-    <keyword match="ActiveCaption"/>
-    <keyword match="AppWorkspace"/>
-    <keyword match="Background"/>
-    <keyword match="ButtonFace"/>
-    <keyword match="ButtonHighlight"/>
-    <keyword match="ButtonShadow"/>
-    <keyword match="ButtonText"/>
-    <keyword match="CaptionText"/>
-    <keyword match="GrayText"/>
-    <keyword match="Highlight"/>
-    <keyword match="HighlightText"/>
-    <keyword match="InactiveBorder"/>
-    <keyword match="InactiveCaption"/>
-    <keyword match="InactiveCaptionText"/>
-    <keyword match="InfoBackground"/>
-    <keyword match="InfoText"/>
-    <keyword match="Menu"/>
-    <keyword match="MenuText"/>
-    <keyword match="Scrollbar"/>
-    <keyword match="ThreeDDarkShadow"/>
-    <keyword match="ThreeDFace"/>
-    <keyword match="ThreeDHighlight"/>
-    <keyword match="ThreeDLightShadow"/>
-    <keyword match="ThreeDShadow"/>
-    <keyword match="Window"/>
-    <keyword match="WindowFrame"/>
-    <keyword match="WindowText"/>
-  </keywords>
-</highlight>
diff --git a/library/Text_Highlighter/diff.xml b/library/Text_Highlighter/diff.xml
deleted file mode 100644
index d088f9257..000000000
--- a/library/Text_Highlighter/diff.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: diff.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="diff" case="yes">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-
-  <default innerClass="default" />
-
-         <block name="noNewLine" match="/^\\\sNo\snewline.+$/m" innerClass="special"/>
-
-         <block name="diffSeparator" match="/^\-\-\-$/m" innerClass="code"/>
-
-         <block name="diffCmdLine" match="/^(diff\s+\-|Only\s+|Index).*$/m" innerClass="var"/>
-         <block name="diffFiles" match="/^(\-\-\-|\+\+\+)\s.+$/m" innerClass="reserved"/>
-
-         <block name="contextOrg" match="/^\*.*$/m" innerClass="quotes"/>
-         <block name="contextNew" match="/^\+.*$/m" innerClass="string"/>
-         <block name="contextChg" match="/^!.*$/m" innerClass="inlinedoc"/>
-
-         <block name="defOrg" match="/^\&lt;\s.*$/m" innerClass="quotes"/>
-         <block name="defNew" match="/^\&gt;\s.*$/m" innerClass="string"/>
-         <block name="defChg" match="/^\d+(\,\d+)?[acd]\d+(,\d+)?$/m" innerClass="code"/>
-
-         <block name="uniOrg" match="/^\-.*$/m" innerClass="quotes"/>
-         <block name="uniNew" match="/^\+.*$/m" innerClass="string"/>
-         <block name="uniChg" match="/^@@.+@@$/m" innerClass="code"/>
-
-         <block name="normOrg" match="/^d\d+\s\d+$/m" innerClass="code"/>
-         <region name="normNew" start="/^a\d+\s\d+$/m" end="/(?=^[ad]\d+\s\d+)/m" innerClass="var" delimClass="code"/>
-
-         <region name="edNew" start="/^(\d+)(,\d+)?(a)$/m" end="/^(\.)$/m" innerClass="string" delimClass="code"/>
-         <region name="edChg" start="/^(\d+)(,\d+)?(c)$/m" end="/^(\.)$/m" innerClass="inlinedoc" delimClass="code"/>
-         <block name="edDel" match="/^(\d+)(,\d+)?(d)$/m" innerClass="code"/>
-
-         <region name="fedNew" start="/^a(\d+)(\s\d+)?$/m" end="/^(\.)$/m" innerClass="string" delimClass="code"/>
-         <region name="fedChg" start="/^c(\d+)(\s\d+)?$/m" end="/^(\.)$/m" innerClass="inlinedoc" delimClass="code"/>
-         <block name="fedDel" match="/^d(\d+)(\s\d+)?$/m" 
-                innerClass="code"/>
-
-
-</highlight>
diff --git a/library/Text_Highlighter/dtd.xml b/library/Text_Highlighter/dtd.xml
deleted file mode 100644
index 18fa07db7..000000000
--- a/library/Text_Highlighter/dtd.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: dtd.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="dtd" case="yes">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-
-  <default innerClass="code" />
-
-  <region name="comment" delimClass="comment" innerClass="comment"
-          start="\&lt;!--" end="--\&gt;">
-  </region>
-
-  <region name="redecl" start="\&lt;\!\[" end="\]\]\&gt;" delimClass="brackets" 
-          innerClass="code" never-contained="yes">
-    <contains all="yes" />
-  </region>
-
-  <region name="tag" start="\&lt;" end="\&gt;" delimClass="brackets" 
-          innerClass="code" >
-    <contains all="yes" />
-    <onlyin region="redecl"/>
-  </region>
-
-  <region name="brackets" start="\(" end="\)" delimClass="brackets" 
-          innerClass="code" contained="yes">
-    <onlyin region="tag"/>
-    <onlyin region="brackets"/>
-    <contains block="entity" />
-    <contains block="identifier" />
-  </region>
-
-  <region name="strsingle" start="'" end="'" delimClass="quotes" 
-          innerClass="string" contained="yes">
-    <onlyin region="tag"/>
-    <contains block="entity" />
-  </region>
-
-  <region name="strdouble" start="&quot;" end="&quot;" delimClass="quotes" 
-          innerClass="string" contained="yes">
-    <onlyin region="tag"/>
-    <contains block="entity" />
-  </region>
-
-  <block name="tagname" match="(?&lt;=\&lt;)!(ENTITY|ATTLIST|ELEMENT|NOTATION)\b" 
-         innerClass="var" contained="yes">
-    <onlyin region="tag"/>
-  </block>
-
-  <block name="reserved" match="\s(#(IMPLIED|REQUIRED|FIXED))|CDATA|ENTITY|NOTATION|NMTOKENS?|PUBLIC|SYSTEM\b" 
-         innerClass="reserved" contained="yes">
-    <onlyin region="tag"/>
-  </block>
-
-  <block name="pcdata" match="#PCDATA\b" 
-         innerClass="reserved" contained="yes" />
-
-  <block name="entity" match="(\&amp;|\%)[\w\-\.]+;" innerClass="special" />
-
-  <block name="identifier" match="[a-z][a-z\d\-\,:]+" 
-         innerClass="identifier" contained="yes" case="no"/>
-
-</highlight>
diff --git a/library/Text_Highlighter/generate b/library/Text_Highlighter/generate
deleted file mode 100644
index 4e22e82fd..000000000
--- a/library/Text_Highlighter/generate
+++ /dev/null
@@ -1,171 +0,0 @@
-#!@php_bin@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-/**
- * Console highlighter class generator
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Text
- * @package    Text_Highlighter
- * @author     Andrey Demenev <demenev@gmail.com>
- * @copyright  2004 Andrey Demenev
- * @license    http://www.php.net/license/3_0.txt  PHP License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Text_Highlighter
- */
-
-require_once 'Text/Highlighter/Generator.php';
-require_once 'Console/Getopt.php';
-
-$options = Console_Getopt::getopt($argv, 'x:p:d:h', array('xml=', 'php=','dir=', 'help'));
-
-if (PEAR::isError($options)) {
-    $message = str_replace('Console_Getopt: ','',$options->message);
-    usage($message);
-}
-
-$source = array();
-$dest   = array();
-$dir    = '';
-
-$expectp = false;
-$expectx = false;
-$unexpectedx = false;
-$unexpectedp = false;
-$si = $di = 0;
-
-foreach ($options[0] as $option) {
-    switch ($option[0]) {
-        case 'x':
-        case '--xml':
-            $source[$si] = $option[1];
-            if ($si) {
-                $di++;
-            }
-            $si++;
-            if ($expectp) {
-                $unexpectedx = true;
-            }
-            $expectp = true;
-            $expectx = false;
-            break;
-
-        case 'p':
-        case '--php':
-            if ($expectx) {
-                $unexpectedp = true;
-            }
-            $dest[$di] = $option[1];
-            $expectp = false;
-            $expectx = true;
-            break;
-
-        case 'd':
-        case '--dir':
-            $dir = $option[1];
-            break;
-
-        case 'h':
-        case '--help':
-            usage();
-            break;
-    }
-}
-
-
-if ($unexpectedx && !$dir) {
-    usage('Unexpected -x or --xml', STDERR);
-}
-
-if ($unexpectedp) {
-    usage('Unexpected -p or --php', STDERR);
-}
-
-$nsource = count($source);
-$ndest = count($dest);
-
-if (!$nsource && !$ndest) {
-    $source[]='php://stdin';
-    if (!$dir) {
-        $dest[]='php://stdout';
-    } else {
-      $dest[] = null;
-    }
-} elseif ($expectp && !$dir && $nsource > 1) {
-    usage('-x or --xml without following -p or --php', STDERR);
-} elseif ($nsource == 1 && !$ndest && !$dir) {
-    $dest[]='php://stdout';
-}
-
-if ($dir && substr($dir,-1)!='/' && substr($dir,-1)!=='\\' ) {
-    $dir .= DIRECTORY_SEPARATOR;
-}
-
-
-foreach ($source as $i => $xmlfile)
-{
-    $gen = new Text_Highlighter_Generator;
-    $gen->setInputFile($xmlfile);
-    if ($gen->hasErrors()) {
-        break;
-    }
-    $gen->generate();
-    if ($gen->hasErrors()) {
-        break;
-    }
-    if (isset($dest[$i])) {
-        $phpfile = $dest[$i];
-    } else {
-        $phpfile = $dir . $gen->language . '.php';
-    }
-    $gen->saveCode($phpfile);
-    if ($gen->hasErrors()) {
-        break;
-    }
-}
-if ($gen->hasErrors()) {
-    $errors = $gen->getErrors();
-    foreach ($errors as $error) {
-        fwrite (STDERR, $error . "\n");
-    }
-    exit(1);
-}
-
-function usage($message='', $file=STDOUT)
-{
-    $code = 0;
-    if ($message) {
-        $message .= "\n\n";
-        $code = 1;
-    }
-    $message .= <<<MSG
-Generates a highlighter class from XML source
-Usage:
-generate options
-
-Options:
-  -x filename, --xml=filename
-        source XML file. Multiple input files can be specified, in which
-        case each -x option must be followed by -p unless -d is specified
-        Defaults to stdin
-  -p filename, --php=filename
-        destination PHP file. Defaults to stdout. If specied multiple times,
-        each -p must follow -x
-  -d dirname, --dir=dirname
-        Default destination directory. File names will be taken from XML input
-        ("lang" attribute of <highlight> tag)
-  -h, --help
-        This help
-MSG;
-    fwrite ($file, $message);
-    exit($code);
-}
-?>
-
diff --git a/library/Text_Highlighter/generate.bat b/library/Text_Highlighter/generate.bat
deleted file mode 100644
index 3960486c1..000000000
--- a/library/Text_Highlighter/generate.bat
+++ /dev/null
@@ -1,188 +0,0 @@
-@echo off
-rem vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4:
-
-rem Console highlighter class generator
-
-rem PHP versions 4 and 5
-
-rem LICENSE: This source file is subject to version 3.0 of the PHP license
-rem that is available through the world-wide-web at the following URI:
-rem http://www.php.net/license/3_0.txt.  If you did not receive a copy of
-rem the PHP License and are unable to obtain it through the web, please
-rem send a note to license@php.net so we can mail you a copy immediately.
-
-rem @category   Text
-rem @package    Text_Highlighter
-rem @author     Andrey Demenev <demenev@gmail.com>
-rem @copyright  2004 Andrey Demenev
-rem @license    http://www.php.net/license/3_0.txt  PHP License
-rem @version    CVS: $Id: generate.bat,v 1.1 2007-06-03 02:35:28 ssttoo Exp $
-rem @link       http://pear.php.net/package/Text_Highlighter
-
-set "MHL_PARAMS="
-:doshift
-set "MHL_PARAMS=%MHL_PARAMS% %1"
-shift 
-if -%1- == -- GOTO noshift
-GOTO doshift
-:noshift
-@php_bin@ -q -d output_buffering=1 -d include_path="@php_dir@" @bin_dir@/Text/Highlighter/generate.bat %MHL_PARAMS%
-
-GOTO finish
-<?php
-ob_end_clean();
-
-if (!defined('STDOUT')) {
-    define('STDOUT', fopen('php://stdout', 'wb'));
-    define('STDERR', fopen('php://stderr', 'wb'));
-}
-require_once 'Text/Highlighter/Generator.php';
-require_once 'Console/Getopt.php';
-
-$options = Console_Getopt::getopt($argv, 'x:p:d:h', array('xml=', 'php=','dir=', 'help'));
-
-if (PEAR::isError($options)) {
-    $message = str_replace('Console_Getopt: ','',$options->message);
-    usage($message);
-}
-
-$source = array();
-$dest   = array();
-$dir    = '';
-
-$expectp = false;
-$expectx = false;
-$unexpectedx = false;
-$unexpectedp = false;
-$si = $di = 0;
-
-foreach ($options[0] as $option) {
-    switch ($option[0]) {
-        case 'x':
-        case '--xml':
-            $source[$si] = $option[1];
-            if ($si) {
-                $di++;
-            }
-            $si++;
-            if ($expectp) {
-                $unexpectedx = true;
-            }
-            $expectp = true;
-            $expectx = false;
-            break;
-
-        case 'p':
-        case '--php':
-            if ($expectx) {
-                $unexpectedp = true;
-            }
-            $dest[$di] = $option[1];
-            $expectp = false;
-            $expectx = true;
-            break;
-
-        case 'd':
-        case '--dir':
-            $dir = $option[1];
-            break;
-
-        case 'h':
-        case '--help':
-            usage();
-            break;
-    }
-}
-
-
-if ($unexpectedx && !$dir) {
-    usage('Unexpected -x or --xml', STDERR);
-}
-
-if ($unexpectedp) {
-    usage('Unexpected -p or --php', STDERR);
-}
-
-$nsource = count($source);
-$ndest = count($dest);
-
-if (!$nsource && !$ndest) {
-    $source[]='php://stdin';
-    if (!$dir) {
-        $dest[]='php://stdout';
-    } else {
-      $dest[] = null;
-    }
-} elseif ($expectp && !$dir && $nsource > 1) {
-    usage('-x or --xml without following -p or --php', STDERR);
-} elseif ($nsource == 1 && !$ndest && !$dir) {
-    $dest[]='php://stdout';
-}
-
-if ($dir && substr($dir,-1)!='/' && substr($dir,-1)!=='\\' ) {
-    $dir .= DIRECTORY_SEPARATOR;
-}
-
-
-foreach ($source as $i => $xmlfile)
-{
-    $gen = new Text_Highlighter_Generator;
-    $gen->setInputFile($xmlfile);
-    if ($gen->hasErrors()) {
-        break;
-    }
-    $gen->generate();
-    if ($gen->hasErrors()) {
-        break;
-    }
-    if (isset($dest[$i])) {
-        $phpfile = $dest[$i];
-    } else {
-        $phpfile = $dir . $gen->language . '.php';
-    }
-    $gen->saveCode($phpfile);
-    if ($gen->hasErrors()) {
-        break;
-    }
-}
-if ($gen->hasErrors()) {
-    $errors = $gen->getErrors();
-    foreach ($errors as $error) {
-        fwrite (STDERR, $error . "\n");
-    }
-    exit(1);
-}
-
-exit(0);
-
-function usage($message='', $file=STDOUT)
-{
-    $code = 0;
-    if ($message) {
-        $message .= "\n\n";
-        $code = 1;
-    }
-    $message .= <<<MSG
-Generates a highlighter class from XML source
-Usage:
-generate options
-
-Options:
-  -x filename, --xml=filename
-        source XML file. Multiple input files can be specified, in which
-        case each -x option must be followed by -p unless -d is specified
-        Defaults to stdin
-  -p filename, --php=filename
-        destination PHP file. Defaults to stdout. If specied multiple times,
-        each -p must follow -x
-  -d dirname, --dir=dirname
-        Default destination directory. File names will be taken from XML input
-        ("lang" attribute of <highlight> tag)
-  -h, --help
-        This help
-MSG;
-    fwrite ($file, $message);
-    exit($code);
-}
-?>
-:finish
diff --git a/library/Text_Highlighter/html.xml b/library/Text_Highlighter/html.xml
deleted file mode 100644
index 58d51fc5b..000000000
--- a/library/Text_Highlighter/html.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: html.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="html" case="no">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-
-  <default innerClass="code" />
-
-  <region name="comment" delimClass="comment" innerClass="comment"
-          start="\&lt;!--" end="--\&gt;">
-  </region>
-
-  <region name="tag" delimClass="brackets" innerClass="code" start="\&lt;[\?\/]?" end="[\/\?]?\&gt;">
-    <contains block="tagname"/>
-    <contains region="param"/>
-    <contains block="paramname"/>
-  </region>
-
-  <block name="tagname" match="(?&lt;=[\&lt;\/?])[\w\-\:]+" innerClass="reserved" contained="yes"/>
-
-  <block name="paramname" match="[\w\-\:]+" innerClass="var" contained="yes"/>
-
-  <block name="entity" match="(&amp;)[\w\-\.]+;" innerClass="special" />
-
-  <region name="param" start="&quot;" end="&quot;" delimClass="quotes" innerClass="string" contained="yes">
-    <contains block="entity"/>
-  </region>
-
-</highlight>
diff --git a/library/Text_Highlighter/java.xml b/library/Text_Highlighter/java.xml
deleted file mode 100644
index 12052b5db..000000000
--- a/library/Text_Highlighter/java.xml
+++ /dev/null
@@ -1,2824 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: java.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="java">
-
-  <authors>
-    <author name="Andrey Demenev" email ="demenev@gmail.com"/>
-  </authors>
-
-  <default innerClass="code" />
-
-  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
-    <contains all="yes"/>
-  </region>
-
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)" >
-    <contains all="yes"/>
-  </region>
-
-  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
-    <contains all="yes"/>
-  </region>
-
-
-  <region name="mlcomment" innerClass="comment" start="\/\*" end="\*\/">
-    <contains block="javadoc"/>
-    <contains block="cvstag"/>
-  </region>
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;" />
-
-  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'"/>
-
-  <block name="escaped" match="\\." innerClass="special" contained="yes">
-    <onlyin region="strsingle"/>
-  </block>
-
-  <block name="descaped" match="\\[\\&quot;'`tnr\$\{]" innerClass="special" contained="yes">
-    <onlyin region="strdouble"/>
-  </block>
-
-
-  <region name="comment" start="\/\/" end="/$/m" innerClass="comment">
-    <contains block="cvstag"/>
-  </region>
-
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
-
-  <block name="hexinteger" match="0[xX][\da-f]+" innerClass="number" />
-  <block name="integer" match="\d\d*|\b0\b" innerClass="number" />
-  <block name="octinteger" match="0[0-7]+" innerClass="number" />
-  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number" />
-  <block name="exponent" 
-         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
-         innerClass="number" />
-
-  <block name="javadoc" match="\s@\w+\s" innerClass="inlinedoc" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-
-  <block name="url" match="((https?|ftp):\/\/[\w\?\.\-\&amp;=\/%+]+)|(^|[\s,!?])www\.\w+\.\w+[\w\?\.\&amp;=\/%+]*" innerClass="url" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-  
-  <block name="email" match="\w+[\.\w\-]+@(\w+[\.\w\-])+" innerClass="url" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-  
-  <block name="note" match="\bnote:" innerClass="inlinedoc" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-  
-
-  <block name="cvstag" match="\$\w+\s*:.*\$" innerClass="inlinedoc" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-
-  <keywords name="types" inherits="identifier" innerClass="types" case = "yes">
-	<keyword match="boolean" />
-	<keyword match="byte" />
-	<keyword match="char" />
-	<keyword match="const" />
-	<keyword match="double" />
-	<keyword match="final" />
-	<keyword match="float" />
-	<keyword match="int" />
-	<keyword match="long" />
-	<keyword match="short" />
-	<keyword match="static" />
-	<keyword match="void" />
-  </keywords> 
-
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
-    <keyword match="import"/>
-	<keyword match="package"/>
-	<keyword match="abstract" />
-	<keyword match="break" />
-	<keyword match="case" />
-	<keyword match="catch" />
-	<keyword match="class" />
-	<keyword match="continue" />
-	<keyword match="default" />
-	<keyword match="do" />
-	<keyword match="else" />
-	<keyword match="extends" />
-	<keyword match="false" />
-	<keyword match="finally" />
-	<keyword match="for" />
-	<keyword match="goto" />
-	<keyword match="if" />
-	<keyword match="implements" />
-	<keyword match="instanceof" />
-	<keyword match="interface" />
-	<keyword match="native" />
-	<keyword match="new" />
-	<keyword match="null" />
-	<keyword match="private" />
-	<keyword match="protected" />
-	<keyword match="public" />
-	<keyword match="return" />
-	<keyword match="super" />
-	<keyword match="strictfp" />
-	<keyword match="switch" />
-	<keyword match="synchronized" />
-	<keyword match="this" />
-	<keyword match="throws" />
-	<keyword match="throw" />
-	<keyword match="transient" />
-	<keyword match="true" />
-	<keyword match="try" />
-	<keyword match="volatile" />
-	<keyword match="while" />
-  </keywords> 
-
-  <keywords name="builtin" inherits="identifier" innerClass="builtin" case = "yes" ifdef="java.builtins">
-	<keyword match="AbstractAction" />
-	<keyword match="AbstractBorder" />
-	<keyword match="AbstractButton" />
-	<keyword match="AbstractCellEditor" />
-	<keyword match="AbstractCollection" />
-	<keyword match="AbstractColorChooserPanel" />
-	<keyword match="AbstractDocument" />
-	<keyword match="AbstractInterruptibleChannel" />
-	<keyword match="AbstractLayoutCache" />
-	<keyword match="AbstractList" />
-	<keyword match="AbstractListModel" />
-	<keyword match="AbstractMap" />
-	<keyword match="AbstractMethodError" />
-	<keyword match="AbstractPreferences" />
-	<keyword match="AbstractSelectableChannel" />
-	<keyword match="AbstractSelectionKey" />
-	<keyword match="AbstractSelector" />
-	<keyword match="AbstractSequentialList" />
-	<keyword match="AbstractSet" />
-	<keyword match="AbstractSpinnerModel" />
-	<keyword match="AbstractTableModel" />
-	<keyword match="AbstractUndoableEdit" />
-	<keyword match="AbstractWriter" />
-	<keyword match="AccessControlContext" />
-	<keyword match="AccessControlException" />
-	<keyword match="AccessController" />
-	<keyword match="AccessException" />
-	<keyword match="Accessible" />
-	<keyword match="AccessibleAction" />
-	<keyword match="AccessibleBundle" />
-	<keyword match="AccessibleComponent" />
-	<keyword match="AccessibleContext" />
-	<keyword match="AccessibleEditableText" />
-	<keyword match="AccessibleExtendedComponent" />
-	<keyword match="AccessibleExtendedTable" />
-	<keyword match="AccessibleHyperlink" />
-	<keyword match="AccessibleHypertext" />
-	<keyword match="AccessibleIcon" />
-	<keyword match="AccessibleKeyBinding" />
-	<keyword match="AccessibleObject" />
-	<keyword match="AccessibleRelation" />
-	<keyword match="AccessibleRelationSet" />
-	<keyword match="AccessibleResourceBundle" />
-	<keyword match="AccessibleRole" />
-	<keyword match="AccessibleSelection" />
-	<keyword match="AccessibleState" />
-	<keyword match="AccessibleStateSet" />
-	<keyword match="AccessibleTable" />
-	<keyword match="AccessibleTableModelChange" />
-	<keyword match="AccessibleText" />
-	<keyword match="AccessibleValue" />
-	<keyword match="AccountExpiredException" />
-	<keyword match="Acl" />
-	<keyword match="AclEntry" />
-	<keyword match="AclNotFoundException" />
-	<keyword match="Action" />
-	<keyword match="ActionEvent" />
-	<keyword match="ActionListener" />
-	<keyword match="ActionMap" />
-	<keyword match="ActionMapUIResource" />
-	<keyword match="Activatable" />
-	<keyword match="ActivateFailedException" />
-	<keyword match="ActivationDesc" />
-	<keyword match="ActivationException" />
-	<keyword match="ActivationGroup" />
-	<keyword match="ActivationGroup_Stub" />
-	<keyword match="ActivationGroupDesc" />
-	<keyword match="ActivationGroupID" />
-	<keyword match="ActivationID" />
-	<keyword match="ActivationInstantiator" />
-	<keyword match="ActivationMonitor" />
-	<keyword match="ActivationSystem" />
-	<keyword match="Activator" />
-	<keyword match="ActiveEvent" />
-	<keyword match="AdapterActivator" />
-	<keyword match="AdapterActivatorOperations" />
-	<keyword match="AdapterAlreadyExists" />
-	<keyword match="AdapterAlreadyExistsHelper" />
-	<keyword match="AdapterInactive" />
-	<keyword match="AdapterInactiveHelper" />
-	<keyword match="AdapterNonExistent" />
-	<keyword match="AdapterNonExistentHelper" />
-	<keyword match="AddressHelper" />
-	<keyword match="Adjustable" />
-	<keyword match="AdjustmentEvent" />
-	<keyword match="AdjustmentListener" />
-	<keyword match="Adler32" />
-	<keyword match="AffineTransform" />
-	<keyword match="AffineTransformOp" />
-	<keyword match="AlgorithmParameterGenerator" />
-	<keyword match="AlgorithmParameterGeneratorSpi" />
-	<keyword match="AlgorithmParameters" />
-	<keyword match="AlgorithmParameterSpec" />
-	<keyword match="AlgorithmParametersSpi" />
-	<keyword match="AllPermission" />
-	<keyword match="AlphaComposite" />
-	<keyword match="AlreadyBound" />
-	<keyword match="AlreadyBoundException" />
-	<keyword match="AlreadyBoundHelper" />
-	<keyword match="AlreadyBoundHolder" />
-	<keyword match="AlreadyConnectedException" />
-	<keyword match="AncestorEvent" />
-	<keyword match="AncestorListener" />
-	<keyword match="Annotation" />
-	<keyword match="Any" />
-	<keyword match="AnyHolder" />
-	<keyword match="AnySeqHelper" />
-	<keyword match="AnySeqHelper" />
-	<keyword match="AnySeqHolder" />
-	<keyword match="AppConfigurationEntry" />
-	<keyword match="Applet" />
-	<keyword match="AppletContext" />
-	<keyword match="AppletInitializer" />
-	<keyword match="AppletStub" />
-	<keyword match="ApplicationException" />
-	<keyword match="Arc2D" />
-	<keyword match="Area" />
-	<keyword match="AreaAveragingScaleFilter" />
-	<keyword match="ARG_IN" />
-	<keyword match="ARG_INOUT" />
-	<keyword match="ARG_OUT" />
-	<keyword match="ArithmeticException" />
-	<keyword match="Array" />
-	<keyword match="Array" />
-	<keyword match="ArrayIndexOutOfBoundsException" />
-	<keyword match="ArrayList" />
-	<keyword match="Arrays" />
-	<keyword match="ArrayStoreException" />
-	<keyword match="AssertionError" />
-	<keyword match="AsyncBoxView" />
-	<keyword match="AsynchronousCloseException" />
-	<keyword match="Attr" />
-	<keyword match="Attribute" />
-	<keyword match="Attribute" />
-	<keyword match="AttributedCharacterIterator" />
-	<keyword match="AttributedString" />
-	<keyword match="AttributeException" />
-	<keyword match="AttributeInUseException" />
-	<keyword match="AttributeList" />
-	<keyword match="AttributeList" />
-	<keyword match="AttributeListImpl" />
-	<keyword match="AttributeModificationException" />
-	<keyword match="Attributes" />
-	<keyword match="Attributes" />
-	<keyword match="Attributes" />
-	<keyword match="AttributeSet" />
-	<keyword match="AttributeSet" />
-	<keyword match="AttributeSetUtilities" />
-	<keyword match="AttributesImpl" />
-	<keyword match="AudioClip" />
-	<keyword match="AudioFileFormat" />
-	<keyword match="AudioFileReader" />
-	<keyword match="AudioFileWriter" />
-	<keyword match="AudioFormat" />
-	<keyword match="AudioInputStream" />
-	<keyword match="AudioPermission" />
-	<keyword match="AudioSystem" />
-	<keyword match="AuthenticationException" />
-	<keyword match="AuthenticationNotSupportedException" />
-	<keyword match="Authenticator" />
-	<keyword match="AuthPermission" />
-	<keyword match="Autoscroll" />
-	<keyword match="AWTError" />
-	<keyword match="AWTEvent" />
-	<keyword match="AWTEventListener" />
-	<keyword match="AWTEventListenerProxy" />
-	<keyword match="AWTEventMulticaster" />
-	<keyword match="AWTException" />
-	<keyword match="AWTKeyStroke" />
-	<keyword match="AWTPermission" />
-	<keyword match="BackingStoreException" />
-	<keyword match="BAD_CONTEXT" />
-	<keyword match="BAD_INV_ORDER" />
-	<keyword match="BAD_OPERATION" />
-	<keyword match="BAD_PARAM" />
-	<keyword match="BAD_POLICY" />
-	<keyword match="BAD_POLICY_TYPE" />
-	<keyword match="BAD_POLICY_VALUE" />
-	<keyword match="BAD_TYPECODE" />
-	<keyword match="BadKind" />
-	<keyword match="BadLocationException" />
-	<keyword match="BadPaddingException" />
-	<keyword match="BandCombineOp" />
-	<keyword match="BandedSampleModel" />
-	<keyword match="BasicArrowButton" />
-	<keyword match="BasicAttribute" />
-	<keyword match="BasicAttributes" />
-	<keyword match="BasicBorders" />
-	<keyword match="BasicButtonListener" />
-	<keyword match="BasicButtonUI" />
-	<keyword match="BasicCheckBoxMenuItemUI" />
-	<keyword match="BasicCheckBoxUI" />
-	<keyword match="BasicColorChooserUI" />
-	<keyword match="BasicComboBoxEditor" />
-	<keyword match="BasicComboBoxRenderer" />
-	<keyword match="BasicComboBoxUI" />
-	<keyword match="BasicComboPopup" />
-	<keyword match="BasicDesktopIconUI" />
-	<keyword match="BasicDesktopPaneUI" />
-	<keyword match="BasicDirectoryModel" />
-	<keyword match="BasicEditorPaneUI" />
-	<keyword match="BasicFileChooserUI" />
-	<keyword match="BasicFormattedTextFieldUI" />
-	<keyword match="BasicGraphicsUtils" />
-	<keyword match="BasicHTML" />
-	<keyword match="BasicIconFactory" />
-	<keyword match="BasicInternalFrameTitlePane" />
-	<keyword match="BasicInternalFrameUI" />
-	<keyword match="BasicLabelUI" />
-	<keyword match="BasicListUI" />
-	<keyword match="BasicLookAndFeel" />
-	<keyword match="BasicMenuBarUI" />
-	<keyword match="BasicMenuItemUI" />
-	<keyword match="BasicMenuUI" />
-	<keyword match="BasicOptionPaneUI" />
-	<keyword match="BasicPanelUI" />
-	<keyword match="BasicPasswordFieldUI" />
-	<keyword match="BasicPermission" />
-	<keyword match="BasicPopupMenuSeparatorUI" />
-	<keyword match="BasicPopupMenuUI" />
-	<keyword match="BasicProgressBarUI" />
-	<keyword match="BasicRadioButtonMenuItemUI" />
-	<keyword match="BasicRadioButtonUI" />
-	<keyword match="BasicRootPaneUI" />
-	<keyword match="BasicScrollBarUI" />
-	<keyword match="BasicScrollPaneUI" />
-	<keyword match="BasicSeparatorUI" />
-	<keyword match="BasicSliderUI" />
-	<keyword match="BasicSpinnerUI" />
-	<keyword match="BasicSplitPaneDivider" />
-	<keyword match="BasicSplitPaneUI" />
-	<keyword match="BasicStroke" />
-	<keyword match="BasicTabbedPaneUI" />
-	<keyword match="BasicTableHeaderUI" />
-	<keyword match="BasicTableUI" />
-	<keyword match="BasicTextAreaUI" />
-	<keyword match="BasicTextFieldUI" />
-	<keyword match="BasicTextPaneUI" />
-	<keyword match="BasicTextUI" />
-	<keyword match="BasicToggleButtonUI" />
-	<keyword match="BasicToolBarSeparatorUI" />
-	<keyword match="BasicToolBarUI" />
-	<keyword match="BasicToolTipUI" />
-	<keyword match="BasicTreeUI" />
-	<keyword match="BasicViewportUI" />
-	<keyword match="BatchUpdateException" />
-	<keyword match="BeanContext" />
-	<keyword match="BeanContextChild" />
-	<keyword match="BeanContextChildComponentProxy" />
-	<keyword match="BeanContextChildSupport" />
-	<keyword match="BeanContextContainerProxy" />
-	<keyword match="BeanContextEvent" />
-	<keyword match="BeanContextMembershipEvent" />
-	<keyword match="BeanContextMembershipListener" />
-	<keyword match="BeanContextProxy" />
-	<keyword match="BeanContextServiceAvailableEvent" />
-	<keyword match="BeanContextServiceProvider" />
-	<keyword match="BeanContextServiceProviderBeanInfo" />
-	<keyword match="BeanContextServiceRevokedEvent" />
-	<keyword match="BeanContextServiceRevokedListener" />
-	<keyword match="BeanContextServices" />
-	<keyword match="BeanContextServicesListener" />
-	<keyword match="BeanContextServicesSupport" />
-	<keyword match="BeanContextSupport" />
-	<keyword match="BeanDescriptor" />
-	<keyword match="BeanInfo" />
-	<keyword match="Beans" />
-	<keyword match="BevelBorder" />
-	<keyword match="Bidi" />
-	<keyword match="BigDecimal" />
-	<keyword match="BigInteger" />
-	<keyword match="BinaryRefAddr" />
-	<keyword match="BindException" />
-	<keyword match="Binding" />
-	<keyword match="Binding" />
-	<keyword match="BindingHelper" />
-	<keyword match="BindingHolder" />
-	<keyword match="BindingIterator" />
-	<keyword match="BindingIteratorHelper" />
-	<keyword match="BindingIteratorHolder" />
-	<keyword match="BindingIteratorOperations" />
-	<keyword match="BindingIteratorPOA" />
-	<keyword match="BindingListHelper" />
-	<keyword match="BindingListHolder" />
-	<keyword match="BindingType" />
-	<keyword match="BindingTypeHelper" />
-	<keyword match="BindingTypeHolder" />
-	<keyword match="BitSet" />
-	<keyword match="Blob" />
-	<keyword match="BlockView" />
-	<keyword match="Book" />
-	<keyword match="Boolean" />
-	<keyword match="BooleanControl" />
-	<keyword match="BooleanHolder" />
-	<keyword match="BooleanSeqHelper" />
-	<keyword match="BooleanSeqHolder" />
-	<keyword match="Border" />
-	<keyword match="BorderFactory" />
-	<keyword match="BorderLayout" />
-	<keyword match="BorderUIResource" />
-	<keyword match="BoundedRangeModel" />
-	<keyword match="Bounds" />
-	<keyword match="Bounds" />
-	<keyword match="Box" />
-	<keyword match="BoxedValueHelper" />
-	<keyword match="BoxLayout" />
-	<keyword match="BoxView" />
-	<keyword match="BreakIterator" />
-	<keyword match="Buffer" />
-	<keyword match="BufferCapabilities" />
-	<keyword match="BufferedImage" />
-	<keyword match="BufferedImageFilter" />
-	<keyword match="BufferedImageOp" />
-	<keyword match="BufferedInputStream" />
-	<keyword match="BufferedOutputStream" />
-	<keyword match="BufferedReader" />
-	<keyword match="BufferedWriter" />
-	<keyword match="BufferOverflowException" />
-	<keyword match="BufferStrategy" />
-	<keyword match="BufferUnderflowException" />
-	<keyword match="Button" />
-	<keyword match="ButtonGroup" />
-	<keyword match="ButtonModel" />
-	<keyword match="ButtonUI" />
-	<keyword match="Byte" />
-	<keyword match="ByteArrayInputStream" />
-	<keyword match="ByteArrayOutputStream" />
-	<keyword match="ByteBuffer" />
-	<keyword match="ByteChannel" />
-	<keyword match="ByteHolder" />
-	<keyword match="ByteLookupTable" />
-	<keyword match="ByteOrder" />
-	<keyword match="Calendar" />
-	<keyword match="CallableStatement" />
-	<keyword match="Callback" />
-	<keyword match="CallbackHandler" />
-	<keyword match="CancelablePrintJob" />
-	<keyword match="CancelledKeyException" />
-	<keyword match="CannotProceed" />
-	<keyword match="CannotProceedException" />
-	<keyword match="CannotProceedHelper" />
-	<keyword match="CannotProceedHolder" />
-	<keyword match="CannotRedoException" />
-	<keyword match="CannotUndoException" />
-	<keyword match="Canvas" />
-	<keyword match="CardLayout" />
-	<keyword match="Caret" />
-	<keyword match="CaretEvent" />
-	<keyword match="CaretListener" />
-	<keyword match="CDATASection" />
-	<keyword match="CellEditor" />
-	<keyword match="CellEditorListener" />
-	<keyword match="CellRendererPane" />
-	<keyword match="Certificate" />
-	<keyword match="Certificate" />
-	<keyword match="Certificate" />
-	
-	<keyword match="CertificateEncodingException" />
-	<keyword match="CertificateEncodingException" />
-	<keyword match="CertificateException" />
-	<keyword match="CertificateException" />
-	<keyword match="CertificateExpiredException" />
-	<keyword match="CertificateExpiredException" />
-	<keyword match="CertificateFactory" />
-	<keyword match="CertificateFactorySpi" />
-	<keyword match="CertificateNotYetValidException" />
-	<keyword match="CertificateNotYetValidException" />
-	<keyword match="CertificateParsingException" />
-	<keyword match="CertificateParsingException" />
-	<keyword match="CertPath" />
-	
-	<keyword match="CertPathBuilder" />
-	<keyword match="CertPathBuilderException" />
-	<keyword match="CertPathBuilderResult" />
-	<keyword match="CertPathBuilderSpi" />
-	<keyword match="CertPathParameters" />
-	<keyword match="CertPathValidator" />
-	<keyword match="CertPathValidatorException" />
-	<keyword match="CertPathValidatorResult" />
-	<keyword match="CertPathValidatorSpi" />
-	<keyword match="CertSelector" />
-	<keyword match="CertStore" />
-	<keyword match="CertStoreException" />
-	<keyword match="CertStoreParameters" />
-	<keyword match="CertStoreSpi" />
-	<keyword match="ChangedCharSetException" />
-	<keyword match="ChangeEvent" />
-	<keyword match="ChangeListener" />
-	<keyword match="Channel" />
-	<keyword match="ChannelBinding" />
-	<keyword match="Channels" />
-	<keyword match="Character" />
-	
-	
-	<keyword match="CharacterCodingException" />
-	<keyword match="CharacterData" />
-	<keyword match="CharacterIterator" />
-	<keyword match="CharArrayReader" />
-	<keyword match="CharArrayWriter" />
-	<keyword match="CharBuffer" />
-	<keyword match="CharConversionException" />
-	<keyword match="CharHolder" />
-	<keyword match="CharSeqHelper" />
-	<keyword match="CharSeqHolder" />
-	<keyword match="CharSequence" />
-	<keyword match="Charset" />
-	<keyword match="CharsetDecoder" />
-	<keyword match="CharsetEncoder" />
-	<keyword match="CharsetProvider" />
-	<keyword match="Checkbox" />
-	<keyword match="CheckboxGroup" />
-	<keyword match="CheckboxMenuItem" />
-	<keyword match="CheckedInputStream" />
-	<keyword match="CheckedOutputStream" />
-	<keyword match="Checksum" />
-	<keyword match="Choice" />
-	<keyword match="ChoiceCallback" />
-	<keyword match="ChoiceFormat" />
-	<keyword match="Chromaticity" />
-	<keyword match="Cipher" />
-	<keyword match="CipherInputStream" />
-	<keyword match="CipherOutputStream" />
-	<keyword match="CipherSpi" />
-	<keyword match="Class" />
-	<keyword match="ClassCastException" />
-	<keyword match="ClassCircularityError" />
-	<keyword match="ClassDesc" />
-	<keyword match="ClassFormatError" />
-	<keyword match="ClassLoader" />
-	<keyword match="ClassNotFoundException" />
-	<keyword match="ClientRequestInfo" />
-	<keyword match="ClientRequestInfoOperations" />
-	<keyword match="ClientRequestInterceptor" />
-	<keyword match="ClientRequestInterceptorOperations" />
-	<keyword match="Clip" />
-	<keyword match="Clipboard" />
-	<keyword match="ClipboardOwner" />
-	<keyword match="Clob" />
-	<keyword match="Cloneable" />
-	<keyword match="CloneNotSupportedException" />
-	<keyword match="ClosedByInterruptException" />
-	<keyword match="ClosedChannelException" />
-	<keyword match="ClosedSelectorException" />
-	<keyword match="CMMException" />
-	<keyword match="Codec" />
-	<keyword match="CodecFactory" />
-	<keyword match="CodecFactoryHelper" />
-	<keyword match="CodecFactoryOperations" />
-	<keyword match="CodecOperations" />
-	<keyword match="CoderMalfunctionError" />
-	<keyword match="CoderResult" />
-	<keyword match="CodeSets" />
-	<keyword match="CodeSource" />
-	<keyword match="CodingErrorAction" />
-	<keyword match="CollationElementIterator" />
-	<keyword match="CollationKey" />
-	<keyword match="Collator" />
-	<keyword match="Collection" />
-	<keyword match="CollectionCertStoreParameters" />
-	<keyword match="Collections" />
-	<keyword match="Color" />
-	<keyword match="ColorChooserComponentFactory" />
-	<keyword match="ColorChooserUI" />
-	<keyword match="ColorConvertOp" />
-	<keyword match="ColorModel" />
-	<keyword match="ColorSelectionModel" />
-	<keyword match="ColorSpace" />
-	<keyword match="ColorSupported" />
-	<keyword match="ColorUIResource" />
-	<keyword match="ComboBoxEditor" />
-	<keyword match="ComboBoxModel" />
-	<keyword match="ComboBoxUI" />
-	<keyword match="ComboPopup" />
-	<keyword match="COMM_FAILURE" />
-	<keyword match="Comment" />
-	<keyword match="CommunicationException" />
-	<keyword match="Comparable" />
-	<keyword match="Comparator" />
-	<keyword match="Compiler" />
-	<keyword match="CompletionStatus" />
-	<keyword match="CompletionStatusHelper" />
-	<keyword match="Component" />
-	<keyword match="ComponentAdapter" />
-	<keyword match="ComponentColorModel" />
-	<keyword match="ComponentEvent" />
-	<keyword match="ComponentIdHelper" />
-	<keyword match="ComponentInputMap" />
-	<keyword match="ComponentInputMapUIResource" />
-	<keyword match="ComponentListener" />
-	<keyword match="ComponentOrientation" />
-	<keyword match="ComponentSampleModel" />
-	<keyword match="ComponentUI" />
-	<keyword match="ComponentView" />
-	<keyword match="Composite" />
-	<keyword match="CompositeContext" />
-	<keyword match="CompositeName" />
-	<keyword match="CompositeView" />
-	<keyword match="CompoundBorder" />
-	<keyword match="CompoundControl" />
-	
-	<keyword match="CompoundEdit" />
-	<keyword match="CompoundName" />
-	<keyword match="Compression" />
-	<keyword match="ConcurrentModificationException" />
-	<keyword match="Configuration" />
-	<keyword match="ConfigurationException" />
-	<keyword match="ConfirmationCallback" />
-	<keyword match="ConnectException" />
-	<keyword match="ConnectException" />
-	<keyword match="ConnectIOException" />
-	<keyword match="Connection" />
-	<keyword match="ConnectionEvent" />
-	<keyword match="ConnectionEventListener" />
-	<keyword match="ConnectionPendingException" />
-	<keyword match="ConnectionPoolDataSource" />
-	<keyword match="ConsoleHandler" />
-	<keyword match="Constructor" />
-	<keyword match="Container" />
-	<keyword match="ContainerAdapter" />
-	<keyword match="ContainerEvent" />
-	<keyword match="ContainerListener" />
-	<keyword match="ContainerOrderFocusTraversalPolicy" />
-	<keyword match="ContentHandler" />
-	<keyword match="ContentHandler" />
-	<keyword match="ContentHandlerFactory" />
-	<keyword match="ContentModel" />
-	<keyword match="Context" />
-	<keyword match="Context" />
-	<keyword match="ContextList" />
-	<keyword match="ContextNotEmptyException" />
-	<keyword match="ContextualRenderedImageFactory" />
-	<keyword match="Control" />
-	<keyword match="Control" />
-	
-	<keyword match="ControlFactory" />
-	<keyword match="ControllerEventListener" />
-	<keyword match="ConvolveOp" />
-	<keyword match="CookieHolder" />
-	<keyword match="Copies" />
-	<keyword match="CopiesSupported" />
-	<keyword match="CRC32" />
-	<keyword match="CredentialExpiredException" />
-	<keyword match="CRL" />
-	<keyword match="CRLException" />
-	<keyword match="CRLSelector" />
-	<keyword match="CropImageFilter" />
-	<keyword match="CSS" />
-	
-	<keyword match="CTX_RESTRICT_SCOPE" />
-	<keyword match="CubicCurve2D" />
-	
-	
-	<keyword match="Currency" />
-	<keyword match="Current" />
-	<keyword match="Current" />
-	<keyword match="Current" />
-	<keyword match="CurrentHelper" />
-	<keyword match="CurrentHelper" />
-	<keyword match="CurrentHelper" />
-	<keyword match="CurrentHolder" />
-	<keyword match="CurrentOperations" />
-	<keyword match="CurrentOperations" />
-	<keyword match="CurrentOperations" />
-	<keyword match="Cursor" />
-	<keyword match="Customizer" />
-	<keyword match="CustomMarshal" />
-	<keyword match="CustomValue" />
-	<keyword match="DATA_CONVERSION" />
-	<keyword match="DatabaseMetaData" />
-	<keyword match="DataBuffer" />
-	<keyword match="DataBufferByte" />
-	<keyword match="DataBufferDouble" />
-	<keyword match="DataBufferFloat" />
-	<keyword match="DataBufferInt" />
-	<keyword match="DataBufferShort" />
-	<keyword match="DataBufferUShort" />
-	<keyword match="DataFlavor" />
-	<keyword match="DataFormatException" />
-	<keyword match="DatagramChannel" />
-	<keyword match="DatagramPacket" />
-	<keyword match="DatagramSocket" />
-	<keyword match="DatagramSocketImpl" />
-	<keyword match="DatagramSocketImplFactory" />
-	<keyword match="DataInput" />
-	<keyword match="DataInputStream" />
-	<keyword match="DataInputStream" />
-	<keyword match="DataLine" />
-	
-	<keyword match="DataOutput" />
-	<keyword match="DataOutputStream" />
-	<keyword match="DataOutputStream" />
-	<keyword match="DataSource" />
-	<keyword match="DataTruncation" />
-	<keyword match="Date" />
-	<keyword match="Date" />
-	<keyword match="DateFormat" />
-	
-	<keyword match="DateFormatSymbols" />
-	<keyword match="DateFormatter" />
-	<keyword match="DateTimeAtCompleted" />
-	<keyword match="DateTimeAtCreation" />
-	<keyword match="DateTimeAtProcessing" />
-	<keyword match="DateTimeSyntax" />
-	<keyword match="DebugGraphics" />
-	<keyword match="DecimalFormat" />
-	<keyword match="DecimalFormatSymbols" />
-	<keyword match="DeclHandler" />
-	<keyword match="DefaultBoundedRangeModel" />
-	<keyword match="DefaultButtonModel" />
-	<keyword match="DefaultCaret" />
-	<keyword match="DefaultCellEditor" />
-	<keyword match="DefaultColorSelectionModel" />
-	<keyword match="DefaultComboBoxModel" />
-	<keyword match="DefaultDesktopManager" />
-	<keyword match="DefaultEditorKit" />
-	
-	
-	
-	
-	
-	
-	
-	
-	<keyword match="DefaultFocusManager" />
-	<keyword match="DefaultFocusTraversalPolicy" />
-	<keyword match="DefaultFormatter" />
-	<keyword match="DefaultFormatterFactory" />
-	<keyword match="DefaultHandler" />
-	<keyword match="DefaultHighlighter" />
-	
-	<keyword match="DefaultKeyboardFocusManager" />
-	<keyword match="DefaultListCellRenderer" />
-	
-	<keyword match="DefaultListModel" />
-	<keyword match="DefaultListSelectionModel" />
-	<keyword match="DefaultMenuLayout" />
-	<keyword match="DefaultMetalTheme" />
-	<keyword match="DefaultMutableTreeNode" />
-	<keyword match="DefaultPersistenceDelegate" />
-	<keyword match="DefaultSingleSelectionModel" />
-	<keyword match="DefaultStyledDocument" />
-	
-	
-	<keyword match="DefaultTableCellRenderer" />
-	
-	<keyword match="DefaultTableColumnModel" />
-	<keyword match="DefaultTableModel" />
-	<keyword match="DefaultTextUI" />
-	<keyword match="DefaultTreeCellEditor" />
-	<keyword match="DefaultTreeCellRenderer" />
-	<keyword match="DefaultTreeModel" />
-	<keyword match="DefaultTreeSelectionModel" />
-	<keyword match="DefinitionKind" />
-	<keyword match="DefinitionKindHelper" />
-	<keyword match="Deflater" />
-	<keyword match="DeflaterOutputStream" />
-	<keyword match="Delegate" />
-	<keyword match="Delegate" />
-	<keyword match="Delegate" />
-	<keyword match="DelegationPermission" />
-	<keyword match="DESedeKeySpec" />
-	<keyword match="DesignMode" />
-	<keyword match="DESKeySpec" />
-	<keyword match="DesktopIconUI" />
-	<keyword match="DesktopManager" />
-	<keyword match="DesktopPaneUI" />
-	<keyword match="Destination" />
-	<keyword match="Destroyable" />
-	<keyword match="DestroyFailedException" />
-	<keyword match="DGC" />
-	<keyword match="DHGenParameterSpec" />
-	<keyword match="DHKey" />
-	<keyword match="DHParameterSpec" />
-	<keyword match="DHPrivateKey" />
-	<keyword match="DHPrivateKeySpec" />
-	<keyword match="DHPublicKey" />
-	<keyword match="DHPublicKeySpec" />
-	<keyword match="Dialog" />
-	<keyword match="Dictionary" />
-	<keyword match="DigestException" />
-	<keyword match="DigestInputStream" />
-	<keyword match="DigestOutputStream" />
-	<keyword match="Dimension" />
-	<keyword match="Dimension2D" />
-	<keyword match="DimensionUIResource" />
-	<keyword match="DirContext" />
-	<keyword match="DirectColorModel" />
-	<keyword match="DirectoryManager" />
-	<keyword match="DirObjectFactory" />
-	<keyword match="DirStateFactory" />
-	
-	<keyword match="DisplayMode" />
-	<keyword match="DnDConstants" />
-	<keyword match="Doc" />
-	<keyword match="DocAttribute" />
-	<keyword match="DocAttributeSet" />
-	<keyword match="DocFlavor" />
-	
-	
-	
-	
-	
-	
-	
-	<keyword match="DocPrintJob" />
-	<keyword match="Document" />
-	<keyword match="Document" />
-	<keyword match="DocumentBuilder" />
-	<keyword match="DocumentBuilderFactory" />
-	<keyword match="DocumentEvent" />
-	
-	
-	<keyword match="DocumentFilter" />
-	
-	<keyword match="DocumentFragment" />
-	<keyword match="DocumentHandler" />
-	<keyword match="DocumentListener" />
-	<keyword match="DocumentName" />
-	<keyword match="DocumentParser" />
-	<keyword match="DocumentType" />
-	<keyword match="DomainCombiner" />
-	<keyword match="DomainManager" />
-	<keyword match="DomainManagerOperations" />
-	<keyword match="DOMException" />
-	<keyword match="DOMImplementation" />
-	<keyword match="DOMLocator" />
-	<keyword match="DOMResult" />
-	<keyword match="DOMSource" />
-	<keyword match="Double" />
-	<keyword match="DoubleBuffer" />
-	<keyword match="DoubleHolder" />
-	<keyword match="DoubleSeqHelper" />
-	<keyword match="DoubleSeqHolder" />
-	<keyword match="DragGestureEvent" />
-	<keyword match="DragGestureListener" />
-	<keyword match="DragGestureRecognizer" />
-	<keyword match="DragSource" />
-	<keyword match="DragSourceAdapter" />
-	<keyword match="DragSourceContext" />
-	<keyword match="DragSourceDragEvent" />
-	<keyword match="DragSourceDropEvent" />
-	<keyword match="DragSourceEvent" />
-	<keyword match="DragSourceListener" />
-	<keyword match="DragSourceMotionListener" />
-	<keyword match="Driver" />
-	<keyword match="DriverManager" />
-	<keyword match="DriverPropertyInfo" />
-	<keyword match="DropTarget" />
-	
-	<keyword match="DropTargetAdapter" />
-	<keyword match="DropTargetContext" />
-	<keyword match="DropTargetDragEvent" />
-	<keyword match="DropTargetDropEvent" />
-	<keyword match="DropTargetEvent" />
-	<keyword match="DropTargetListener" />
-	<keyword match="DSAKey" />
-	<keyword match="DSAKeyPairGenerator" />
-	<keyword match="DSAParameterSpec" />
-	<keyword match="DSAParams" />
-	<keyword match="DSAPrivateKey" />
-	<keyword match="DSAPrivateKeySpec" />
-	<keyword match="DSAPublicKey" />
-	<keyword match="DSAPublicKeySpec" />
-	<keyword match="DTD" />
-	<keyword match="DTDConstants" />
-	<keyword match="DTDHandler" />
-	<keyword match="DuplicateName" />
-	<keyword match="DuplicateNameHelper" />
-	<keyword match="DynamicImplementation" />
-	<keyword match="DynamicImplementation" />
-	<keyword match="DynAny" />
-	<keyword match="DynAny" />
-	<keyword match="DynAnyFactory" />
-	<keyword match="DynAnyFactoryHelper" />
-	<keyword match="DynAnyFactoryOperations" />
-	<keyword match="DynAnyHelper" />
-	<keyword match="DynAnyOperations" />
-	<keyword match="DynAnySeqHelper" />
-	<keyword match="DynArray" />
-	<keyword match="DynArray" />
-	<keyword match="DynArrayHelper" />
-	<keyword match="DynArrayOperations" />
-	<keyword match="DynEnum" />
-	<keyword match="DynEnum" />
-	<keyword match="DynEnumHelper" />
-	<keyword match="DynEnumOperations" />
-	<keyword match="DynFixed" />
-	<keyword match="DynFixed" />
-	<keyword match="DynFixedHelper" />
-	<keyword match="DynFixedOperations" />
-	<keyword match="DynSequence" />
-	<keyword match="DynSequence" />
-	<keyword match="DynSequenceHelper" />
-	<keyword match="DynSequenceOperations" />
-	<keyword match="DynStruct" />
-	<keyword match="DynStruct" />
-	<keyword match="DynStructHelper" />
-	<keyword match="DynStructOperations" />
-	<keyword match="DynUnion" />
-	<keyword match="DynUnion" />
-	<keyword match="DynUnionHelper" />
-	<keyword match="DynUnionOperations" />
-	<keyword match="DynValue" />
-	<keyword match="DynValue" />
-	<keyword match="DynValueBox" />
-	<keyword match="DynValueBoxOperations" />
-	<keyword match="DynValueCommon" />
-	<keyword match="DynValueCommonOperations" />
-	<keyword match="DynValueHelper" />
-	<keyword match="DynValueOperations" />
-	<keyword match="EditorKit" />
-	<keyword match="Element" />
-	<keyword match="Element" />
-	<keyword match="Element" />
-	<keyword match="ElementIterator" />
-	<keyword match="Ellipse2D" />
-	
-	
-	<keyword match="EmptyBorder" />
-	<keyword match="EmptyStackException" />
-	<keyword match="EncodedKeySpec" />
-	<keyword match="Encoder" />
-	<keyword match="Encoding" />
-	<keyword match="ENCODING_CDR_ENCAPS" />
-	<keyword match="EncryptedPrivateKeyInfo" />
-	<keyword match="Entity" />
-	<keyword match="Entity" />
-	<keyword match="EntityReference" />
-	<keyword match="EntityResolver" />
-	<keyword match="EnumControl" />
-	
-	<keyword match="Enumeration" />
-	<keyword match="EnumSyntax" />
-	<keyword match="Environment" />
-	<keyword match="EOFException" />
-	<keyword match="Error" />
-	<keyword match="ErrorHandler" />
-	<keyword match="ErrorListener" />
-	<keyword match="ErrorManager" />
-	<keyword match="EtchedBorder" />
-	<keyword match="Event" />
-	<keyword match="EventContext" />
-	<keyword match="EventDirContext" />
-	<keyword match="EventHandler" />
-	<keyword match="EventListener" />
-	<keyword match="EventListenerList" />
-	<keyword match="EventListenerProxy" />
-	<keyword match="EventObject" />
-	<keyword match="EventQueue" />
-	<keyword match="EventSetDescriptor" />
-	<keyword match="Exception" />
-	<keyword match="ExceptionInInitializerError" />
-	<keyword match="ExceptionList" />
-	<keyword match="ExceptionListener" />
-	<keyword match="ExemptionMechanism" />
-	<keyword match="ExemptionMechanismException" />
-	<keyword match="ExemptionMechanismSpi" />
-	<keyword match="ExpandVetoException" />
-	<keyword match="ExportException" />
-	<keyword match="Expression" />
-	<keyword match="ExtendedRequest" />
-	<keyword match="ExtendedResponse" />
-	<keyword match="Externalizable" />
-	<keyword match="FactoryConfigurationError" />
-	<keyword match="FailedLoginException" />
-	<keyword match="FeatureDescriptor" />
-	<keyword match="Fidelity" />
-	<keyword match="Field" />
-	<keyword match="FieldNameHelper" />
-	<keyword match="FieldNameHelper" />
-	<keyword match="FieldPosition" />
-	<keyword match="FieldView" />
-	<keyword match="File" />
-	<keyword match="FileCacheImageInputStream" />
-	<keyword match="FileCacheImageOutputStream" />
-	<keyword match="FileChannel" />
-	
-	<keyword match="FileChooserUI" />
-	<keyword match="FileDescriptor" />
-	<keyword match="FileDialog" />
-	<keyword match="FileFilter" />
-	<keyword match="FileFilter" />
-	<keyword match="FileHandler" />
-	<keyword match="FileImageInputStream" />
-	<keyword match="FileImageOutputStream" />
-	<keyword match="FileInputStream" />
-	<keyword match="FileLock" />
-	<keyword match="FileLockInterruptionException" />
-	<keyword match="FilenameFilter" />
-	<keyword match="FileNameMap" />
-	<keyword match="FileNotFoundException" />
-	<keyword match="FileOutputStream" />
-	<keyword match="FilePermission" />
-	<keyword match="FileReader" />
-	<keyword match="FileSystemView" />
-	<keyword match="FileView" />
-	<keyword match="FileWriter" />
-	<keyword match="Filter" />
-	<keyword match="FilteredImageSource" />
-	<keyword match="FilterInputStream" />
-	<keyword match="FilterOutputStream" />
-	<keyword match="FilterReader" />
-	<keyword match="FilterWriter" />
-	<keyword match="Finishings" />
-	<keyword match="FixedHeightLayoutCache" />
-	<keyword match="FixedHolder" />
-	<keyword match="FlatteningPathIterator" />
-	<keyword match="FlavorException" />
-	<keyword match="FlavorMap" />
-	<keyword match="FlavorTable" />
-	<keyword match="Float" />
-	<keyword match="FloatBuffer" />
-	<keyword match="FloatControl" />
-	
-	<keyword match="FloatHolder" />
-	<keyword match="FloatSeqHelper" />
-	<keyword match="FloatSeqHolder" />
-	<keyword match="FlowLayout" />
-	<keyword match="FlowView" />
-	
-	<keyword match="FocusAdapter" />
-	<keyword match="FocusEvent" />
-	<keyword match="FocusListener" />
-	<keyword match="FocusManager" />
-	<keyword match="FocusTraversalPolicy" />
-	<keyword match="Font" />
-	<keyword match="FontFormatException" />
-	<keyword match="FontMetrics" />
-	<keyword match="FontRenderContext" />
-	<keyword match="FontUIResource" />
-	<keyword match="Format" />
-	
-	<keyword match="FormatConversionProvider" />
-	<keyword match="FormatMismatch" />
-	<keyword match="FormatMismatchHelper" />
-	<keyword match="Formatter" />
-	<keyword match="FormView" />
-	<keyword match="ForwardRequest" />
-	<keyword match="ForwardRequest" />
-	<keyword match="ForwardRequestHelper" />
-	<keyword match="ForwardRequestHelper" />
-	<keyword match="Frame" />
-	<keyword match="FREE_MEM" />
-	<keyword match="GapContent" />
-	<keyword match="GatheringByteChannel" />
-	<keyword match="GeneralPath" />
-	<keyword match="GeneralSecurityException" />
-	<keyword match="GlyphJustificationInfo" />
-	<keyword match="GlyphMetrics" />
-	<keyword match="GlyphVector" />
-	<keyword match="GlyphView" />
-	
-	<keyword match="GradientPaint" />
-	<keyword match="GraphicAttribute" />
-	<keyword match="Graphics" />
-	<keyword match="Graphics2D" />
-	<keyword match="GraphicsConfigTemplate" />
-	<keyword match="GraphicsConfiguration" />
-	<keyword match="GraphicsDevice" />
-	<keyword match="GraphicsEnvironment" />
-	<keyword match="GrayFilter" />
-	<keyword match="GregorianCalendar" />
-	<keyword match="GridBagConstraints" />
-	<keyword match="GridBagLayout" />
-	<keyword match="GridLayout" />
-	<keyword match="Group" />
-	<keyword match="GSSContext" />
-	<keyword match="GSSCredential" />
-	<keyword match="GSSException" />
-	<keyword match="GSSManager" />
-	<keyword match="GSSName" />
-	<keyword match="Guard" />
-	<keyword match="GuardedObject" />
-	<keyword match="GZIPInputStream" />
-	<keyword match="GZIPOutputStream" />
-	<keyword match="Handler" />
-	<keyword match="HandlerBase" />
-	<keyword match="HandshakeCompletedEvent" />
-	<keyword match="HandshakeCompletedListener" />
-	<keyword match="HasControls" />
-	<keyword match="HashAttributeSet" />
-	<keyword match="HashDocAttributeSet" />
-	<keyword match="HashMap" />
-	<keyword match="HashPrintJobAttributeSet" />
-	<keyword match="HashPrintRequestAttributeSet" />
-	<keyword match="HashPrintServiceAttributeSet" />
-	<keyword match="HashSet" />
-	<keyword match="Hashtable" />
-	<keyword match="HeadlessException" />
-	<keyword match="HierarchyBoundsAdapter" />
-	<keyword match="HierarchyBoundsListener" />
-	<keyword match="HierarchyEvent" />
-	<keyword match="HierarchyListener" />
-	<keyword match="Highlighter" />
-	
-	
-	<keyword match="HostnameVerifier" />
-	<keyword match="HTML" />
-	
-	
-	
-	<keyword match="HTMLDocument" />
-	
-	<keyword match="HTMLEditorKit" />
-	
-	
-	
-	
-	
-	
-	<keyword match="HTMLFrameHyperlinkEvent" />
-	<keyword match="HTMLWriter" />
-	<keyword match="HttpsURLConnection" />
-	<keyword match="HttpURLConnection" />
-	<keyword match="HyperlinkEvent" />
-	
-	<keyword match="HyperlinkListener" />
-	<keyword match="ICC_ColorSpace" />
-	<keyword match="ICC_Profile" />
-	<keyword match="ICC_ProfileGray" />
-	<keyword match="ICC_ProfileRGB" />
-	<keyword match="Icon" />
-	<keyword match="IconUIResource" />
-	<keyword match="IconView" />
-	<keyword match="ID_ASSIGNMENT_POLICY_ID" />
-	<keyword match="ID_UNIQUENESS_POLICY_ID" />
-	<keyword match="IdAssignmentPolicy" />
-	<keyword match="IdAssignmentPolicyOperations" />
-	<keyword match="IdAssignmentPolicyValue" />
-	<keyword match="IdentifierHelper" />
-	<keyword match="Identity" />
-	<keyword match="IdentityHashMap" />
-	<keyword match="IdentityScope" />
-	<keyword match="IDLEntity" />
-	<keyword match="IDLType" />
-	<keyword match="IDLTypeHelper" />
-	<keyword match="IDLTypeOperations" />
-	<keyword match="IdUniquenessPolicy" />
-	<keyword match="IdUniquenessPolicyOperations" />
-	<keyword match="IdUniquenessPolicyValue" />
-	<keyword match="IIOByteBuffer" />
-	<keyword match="IIOException" />
-	<keyword match="IIOImage" />
-	<keyword match="IIOInvalidTreeException" />
-	<keyword match="IIOMetadata" />
-	<keyword match="IIOMetadataController" />
-	<keyword match="IIOMetadataFormat" />
-	<keyword match="IIOMetadataFormatImpl" />
-	<keyword match="IIOMetadataNode" />
-	<keyword match="IIOParam" />
-	<keyword match="IIOParamController" />
-	<keyword match="IIOReadProgressListener" />
-	<keyword match="IIOReadUpdateListener" />
-	<keyword match="IIOReadWarningListener" />
-	<keyword match="IIORegistry" />
-	<keyword match="IIOServiceProvider" />
-	<keyword match="IIOWriteProgressListener" />
-	<keyword match="IIOWriteWarningListener" />
-	<keyword match="IllegalAccessError" />
-	<keyword match="IllegalAccessException" />
-	<keyword match="IllegalArgumentException" />
-	<keyword match="IllegalBlockingModeException" />
-	<keyword match="IllegalBlockSizeException" />
-	<keyword match="IllegalCharsetNameException" />
-	<keyword match="IllegalComponentStateException" />
-	<keyword match="IllegalMonitorStateException" />
-	<keyword match="IllegalPathStateException" />
-	<keyword match="IllegalSelectorException" />
-	<keyword match="IllegalStateException" />
-	<keyword match="IllegalThreadStateException" />
-	<keyword match="Image" />
-	<keyword match="ImageCapabilities" />
-	<keyword match="ImageConsumer" />
-	<keyword match="ImageFilter" />
-	<keyword match="ImageGraphicAttribute" />
-	<keyword match="ImageIcon" />
-	<keyword match="ImageInputStream" />
-	<keyword match="ImageInputStreamImpl" />
-	<keyword match="ImageInputStreamSpi" />
-	<keyword match="ImageIO" />
-	<keyword match="ImageObserver" />
-	<keyword match="ImageOutputStream" />
-	<keyword match="ImageOutputStreamImpl" />
-	<keyword match="ImageOutputStreamSpi" />
-	<keyword match="ImageProducer" />
-	<keyword match="ImageReader" />
-	<keyword match="ImageReaderSpi" />
-	<keyword match="ImageReaderWriterSpi" />
-	<keyword match="ImageReadParam" />
-	<keyword match="ImageTranscoder" />
-	<keyword match="ImageTranscoderSpi" />
-	<keyword match="ImageTypeSpecifier" />
-	<keyword match="ImageView" />
-	<keyword match="ImageWriteParam" />
-	<keyword match="ImageWriter" />
-	<keyword match="ImageWriterSpi" />
-	<keyword match="ImagingOpException" />
-	<keyword match="IMP_LIMIT" />
-	<keyword match="IMPLICIT_ACTIVATION_POLICY_ID" />
-	<keyword match="ImplicitActivationPolicy" />
-	<keyword match="ImplicitActivationPolicyOperations" />
-	<keyword match="ImplicitActivationPolicyValue" />
-	<keyword match="IncompatibleClassChangeError" />
-	<keyword match="InconsistentTypeCode" />
-	<keyword match="InconsistentTypeCode" />
-	<keyword match="InconsistentTypeCodeHelper" />
-	<keyword match="IndexColorModel" />
-	<keyword match="IndexedPropertyDescriptor" />
-	<keyword match="IndexOutOfBoundsException" />
-	<keyword match="IndirectionException" />
-	<keyword match="Inet4Address" />
-	<keyword match="Inet6Address" />
-	<keyword match="InetAddress" />
-	<keyword match="InetSocketAddress" />
-	<keyword match="Inflater" />
-	<keyword match="InflaterInputStream" />
-	<keyword match="InheritableThreadLocal" />
-	<keyword match="InitialContext" />
-	<keyword match="InitialContextFactory" />
-	<keyword match="InitialContextFactoryBuilder" />
-	<keyword match="InitialDirContext" />
-	<keyword match="INITIALIZE" />
-	<keyword match="InitialLdapContext" />
-	<keyword match="InlineView" />
-	<keyword match="InputContext" />
-	<keyword match="InputEvent" />
-	<keyword match="InputMap" />
-	<keyword match="InputMapUIResource" />
-	<keyword match="InputMethod" />
-	<keyword match="InputMethodContext" />
-	<keyword match="InputMethodDescriptor" />
-	<keyword match="InputMethodEvent" />
-	<keyword match="InputMethodHighlight" />
-	<keyword match="InputMethodListener" />
-	<keyword match="InputMethodRequests" />
-	<keyword match="InputSource" />
-	<keyword match="InputStream" />
-	<keyword match="InputStream" />
-	<keyword match="InputStream" />
-	<keyword match="InputStreamReader" />
-	<keyword match="InputSubset" />
-	<keyword match="InputVerifier" />
-	<keyword match="Insets" />
-	<keyword match="InsetsUIResource" />
-	<keyword match="InstantiationError" />
-	<keyword match="InstantiationException" />
-	<keyword match="Instrument" />
-	<keyword match="InsufficientResourcesException" />
-	<keyword match="IntBuffer" />
-	<keyword match="Integer" />
-	<keyword match="IntegerSyntax" />
-	<keyword match="Interceptor" />
-	<keyword match="InterceptorOperations" />
-	<keyword match="INTERNAL" />
-	<keyword match="InternalError" />
-	<keyword match="InternalFrameAdapter" />
-	<keyword match="InternalFrameEvent" />
-	<keyword match="InternalFrameFocusTraversalPolicy" />
-	<keyword match="InternalFrameListener" />
-	<keyword match="InternalFrameUI" />
-	<keyword match="InternationalFormatter" />
-	<keyword match="InterruptedException" />
-	<keyword match="InterruptedIOException" />
-	<keyword match="InterruptedNamingException" />
-	<keyword match="InterruptibleChannel" />
-	<keyword match="INTF_REPOS" />
-	<keyword match="IntHolder" />
-	<keyword match="IntrospectionException" />
-	<keyword match="Introspector" />
-	<keyword match="INV_FLAG" />
-	<keyword match="INV_IDENT" />
-	<keyword match="INV_OBJREF" />
-	<keyword match="INV_POLICY" />
-	<keyword match="Invalid" />
-	<keyword match="INVALID_TRANSACTION" />
-	<keyword match="InvalidAddress" />
-	<keyword match="InvalidAddressHelper" />
-	<keyword match="InvalidAddressHolder" />
-	<keyword match="InvalidAlgorithmParameterException" />
-	<keyword match="InvalidAttributeIdentifierException" />
-	<keyword match="InvalidAttributesException" />
-	<keyword match="InvalidAttributeValueException" />
-	<keyword match="InvalidClassException" />
-	<keyword match="InvalidDnDOperationException" />
-	<keyword match="InvalidKeyException" />
-	<keyword match="InvalidKeySpecException" />
-	<keyword match="InvalidMarkException" />
-	<keyword match="InvalidMidiDataException" />
-	<keyword match="InvalidName" />
-	<keyword match="InvalidName" />
-	<keyword match="InvalidName" />
-	<keyword match="InvalidNameException" />
-	<keyword match="InvalidNameHelper" />
-	<keyword match="InvalidNameHelper" />
-	<keyword match="InvalidNameHolder" />
-	<keyword match="InvalidObjectException" />
-	<keyword match="InvalidParameterException" />
-	<keyword match="InvalidParameterSpecException" />
-	<keyword match="InvalidPolicy" />
-	<keyword match="InvalidPolicyHelper" />
-	<keyword match="InvalidPreferencesFormatException" />
-	<keyword match="InvalidSearchControlsException" />
-	<keyword match="InvalidSearchFilterException" />
-	<keyword match="InvalidSeq" />
-	<keyword match="InvalidSlot" />
-	<keyword match="InvalidSlotHelper" />
-	<keyword match="InvalidTransactionException" />
-	<keyword match="InvalidTypeForEncoding" />
-	<keyword match="InvalidTypeForEncodingHelper" />
-	<keyword match="InvalidValue" />
-	<keyword match="InvalidValue" />
-	<keyword match="InvalidValueHelper" />
-	<keyword match="InvocationEvent" />
-	<keyword match="InvocationHandler" />
-	<keyword match="InvocationTargetException" />
-	<keyword match="InvokeHandler" />
-	<keyword match="IOException" />
-	<keyword match="IOR" />
-	<keyword match="IORHelper" />
-	<keyword match="IORHolder" />
-	<keyword match="IORInfo" />
-	<keyword match="IORInfoOperations" />
-	<keyword match="IORInterceptor" />
-	<keyword match="IORInterceptorOperations" />
-	<keyword match="IRObject" />
-	<keyword match="IRObjectOperations" />
-	<keyword match="IstringHelper" />
-	<keyword match="ItemEvent" />
-	<keyword match="ItemListener" />
-	<keyword match="ItemSelectable" />
-	<keyword match="Iterator" />
-	<keyword match="IvParameterSpec" />
-	<keyword match="JApplet" />
-	<keyword match="JarEntry" />
-	<keyword match="JarException" />
-	<keyword match="JarFile" />
-	<keyword match="JarInputStream" />
-	<keyword match="JarOutputStream" />
-	<keyword match="JarURLConnection" />
-	<keyword match="JButton" />
-	<keyword match="JCheckBox" />
-	<keyword match="JCheckBoxMenuItem" />
-	<keyword match="JColorChooser" />
-	<keyword match="JComboBox" />
-	
-	<keyword match="JComponent" />
-	<keyword match="JDesktopPane" />
-	<keyword match="JDialog" />
-	<keyword match="JEditorPane" />
-	<keyword match="JFileChooser" />
-	<keyword match="JFormattedTextField" />
-	
-	
-	<keyword match="JFrame" />
-	<keyword match="JInternalFrame" />
-	
-	<keyword match="JLabel" />
-	<keyword match="JLayeredPane" />
-	<keyword match="JList" />
-	<keyword match="JMenu" />
-	<keyword match="JMenuBar" />
-	<keyword match="JMenuItem" />
-	<keyword match="JobAttributes" />
-	
-	
-	
-	
-	
-	<keyword match="JobHoldUntil" />
-	<keyword match="JobImpressions" />
-	<keyword match="JobImpressionsCompleted" />
-	<keyword match="JobImpressionsSupported" />
-	<keyword match="JobKOctets" />
-	<keyword match="JobKOctetsProcessed" />
-	<keyword match="JobKOctetsSupported" />
-	<keyword match="JobMediaSheets" />
-	<keyword match="JobMediaSheetsCompleted" />
-	<keyword match="JobMediaSheetsSupported" />
-	<keyword match="JobMessageFromOperator" />
-	<keyword match="JobName" />
-	<keyword match="JobOriginatingUserName" />
-	<keyword match="JobPriority" />
-	<keyword match="JobPrioritySupported" />
-	<keyword match="JobSheets" />
-	<keyword match="JobState" />
-	<keyword match="JobStateReason" />
-	<keyword match="JobStateReasons" />
-	<keyword match="JOptionPane" />
-	<keyword match="JPanel" />
-	<keyword match="JPasswordField" />
-	<keyword match="JPEGHuffmanTable" />
-	<keyword match="JPEGImageReadParam" />
-	<keyword match="JPEGImageWriteParam" />
-	<keyword match="JPEGQTable" />
-	<keyword match="JPopupMenu" />
-	
-	<keyword match="JProgressBar" />
-	<keyword match="JRadioButton" />
-	<keyword match="JRadioButtonMenuItem" />
-	<keyword match="JRootPane" />
-	<keyword match="JScrollBar" />
-	<keyword match="JScrollPane" />
-	<keyword match="JSeparator" />
-	<keyword match="JSlider" />
-	<keyword match="JSpinner" />
-	
-	
-	
-	
-	<keyword match="JSplitPane" />
-	<keyword match="JTabbedPane" />
-	<keyword match="JTable" />
-	<keyword match="JTableHeader" />
-	<keyword match="JTextArea" />
-	<keyword match="JTextComponent" />
-	
-	<keyword match="JTextField" />
-	<keyword match="JTextPane" />
-	<keyword match="JToggleButton" />
-	
-	<keyword match="JToolBar" />
-	
-	<keyword match="JToolTip" />
-	<keyword match="JTree" />
-	
-	
-	<keyword match="JViewport" />
-	<keyword match="JWindow" />
-	<keyword match="KerberosKey" />
-	<keyword match="KerberosPrincipal" />
-	<keyword match="KerberosTicket" />
-	<keyword match="Kernel" />
-	<keyword match="Key" />
-	<keyword match="KeyAdapter" />
-	<keyword match="KeyAgreement" />
-	<keyword match="KeyAgreementSpi" />
-	<keyword match="KeyboardFocusManager" />
-	<keyword match="KeyEvent" />
-	<keyword match="KeyEventDispatcher" />
-	<keyword match="KeyEventPostProcessor" />
-	<keyword match="KeyException" />
-	<keyword match="KeyFactory" />
-	<keyword match="KeyFactorySpi" />
-	<keyword match="KeyGenerator" />
-	<keyword match="KeyGeneratorSpi" />
-	<keyword match="KeyListener" />
-	<keyword match="KeyManagementException" />
-	<keyword match="KeyManager" />
-	<keyword match="KeyManagerFactory" />
-	<keyword match="KeyManagerFactorySpi" />
-	<keyword match="Keymap" />
-	<keyword match="KeyPair" />
-	<keyword match="KeyPairGenerator" />
-	<keyword match="KeyPairGeneratorSpi" />
-	<keyword match="KeySpec" />
-	<keyword match="KeyStore" />
-	<keyword match="KeyStoreException" />
-	<keyword match="KeyStoreSpi" />
-	<keyword match="KeyStroke" />
-	<keyword match="Label" />
-	<keyword match="LabelUI" />
-	<keyword match="LabelView" />
-	<keyword match="LanguageCallback" />
-	<keyword match="LastOwnerException" />
-	<keyword match="LayeredHighlighter" />
-	
-	<keyword match="LayoutFocusTraversalPolicy" />
-	<keyword match="LayoutManager" />
-	<keyword match="LayoutManager2" />
-	<keyword match="LayoutQueue" />
-	<keyword match="LDAPCertStoreParameters" />
-	<keyword match="LdapContext" />
-	<keyword match="LdapReferralException" />
-	<keyword match="Lease" />
-	<keyword match="Level" />
-	<keyword match="LexicalHandler" />
-	<keyword match="LIFESPAN_POLICY_ID" />
-	<keyword match="LifespanPolicy" />
-	<keyword match="LifespanPolicyOperations" />
-	<keyword match="LifespanPolicyValue" />
-	<keyword match="LimitExceededException" />
-	<keyword match="Line" />
-	
-	<keyword match="Line2D" />
-	
-	
-	<keyword match="LineBorder" />
-	<keyword match="LineBreakMeasurer" />
-	<keyword match="LineEvent" />
-	
-	<keyword match="LineListener" />
-	<keyword match="LineMetrics" />
-	<keyword match="LineNumberInputStream" />
-	<keyword match="LineNumberReader" />
-	<keyword match="LineUnavailableException" />
-	<keyword match="LinkageError" />
-	<keyword match="LinkedHashMap" />
-	<keyword match="LinkedHashSet" />
-	<keyword match="LinkedList" />
-	<keyword match="LinkException" />
-	<keyword match="LinkLoopException" />
-	<keyword match="LinkRef" />
-	<keyword match="List" />
-	<keyword match="List" />
-	<keyword match="ListCellRenderer" />
-	<keyword match="ListDataEvent" />
-	<keyword match="ListDataListener" />
-	<keyword match="ListIterator" />
-	<keyword match="ListModel" />
-	<keyword match="ListResourceBundle" />
-	<keyword match="ListSelectionEvent" />
-	<keyword match="ListSelectionListener" />
-	<keyword match="ListSelectionModel" />
-	<keyword match="ListUI" />
-	<keyword match="ListView" />
-	<keyword match="LoaderHandler" />
-	<keyword match="Locale" />
-	<keyword match="LocalObject" />
-	<keyword match="LocateRegistry" />
-	<keyword match="LOCATION_FORWARD" />
-	<keyword match="Locator" />
-	<keyword match="LocatorImpl" />
-	<keyword match="Logger" />
-	<keyword match="LoggingPermission" />
-	<keyword match="LoginContext" />
-	<keyword match="LoginException" />
-	<keyword match="LoginModule" />
-	<keyword match="LogManager" />
-	<keyword match="LogRecord" />
-	<keyword match="LogStream" />
-	<keyword match="Long" />
-	<keyword match="LongBuffer" />
-	<keyword match="LongHolder" />
-	<keyword match="LongLongSeqHelper" />
-	<keyword match="LongLongSeqHolder" />
-	<keyword match="LongSeqHelper" />
-	<keyword match="LongSeqHolder" />
-	<keyword match="LookAndFeel" />
-	<keyword match="LookupOp" />
-	<keyword match="LookupTable" />
-	<keyword match="Mac" />
-	<keyword match="MacSpi" />
-	<keyword match="MalformedInputException" />
-	<keyword match="MalformedLinkException" />
-	<keyword match="MalformedURLException" />
-	<keyword match="ManagerFactoryParameters" />
-	<keyword match="Manifest" />
-	<keyword match="Map" />
-	
-	<keyword match="MappedByteBuffer" />
-	<keyword match="MARSHAL" />
-	<keyword match="MarshalException" />
-	<keyword match="MarshalledObject" />
-	<keyword match="MaskFormatter" />
-	<keyword match="Matcher" />
-	<keyword match="Math" />
-	<keyword match="MatteBorder" />
-	<keyword match="Media" />
-	<keyword match="MediaName" />
-	<keyword match="MediaPrintableArea" />
-	<keyword match="MediaSize" />
-	
-	
-	
-	
-	
-	<keyword match="MediaSizeName" />
-	<keyword match="MediaTracker" />
-	<keyword match="MediaTray" />
-	<keyword match="Member" />
-	<keyword match="MemoryCacheImageInputStream" />
-	<keyword match="MemoryCacheImageOutputStream" />
-	<keyword match="MemoryHandler" />
-	<keyword match="MemoryImageSource" />
-	<keyword match="Menu" />
-	<keyword match="MenuBar" />
-	<keyword match="MenuBarUI" />
-	<keyword match="MenuComponent" />
-	<keyword match="MenuContainer" />
-	<keyword match="MenuDragMouseEvent" />
-	<keyword match="MenuDragMouseListener" />
-	<keyword match="MenuElement" />
-	<keyword match="MenuEvent" />
-	<keyword match="MenuItem" />
-	<keyword match="MenuItemUI" />
-	<keyword match="MenuKeyEvent" />
-	<keyword match="MenuKeyListener" />
-	<keyword match="MenuListener" />
-	<keyword match="MenuSelectionManager" />
-	<keyword match="MenuShortcut" />
-	<keyword match="MessageDigest" />
-	<keyword match="MessageDigestSpi" />
-	<keyword match="MessageFormat" />
-	
-	<keyword match="MessageProp" />
-	<keyword match="MetaEventListener" />
-	<keyword match="MetalBorders" />
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<keyword match="MetalButtonUI" />
-	<keyword match="MetalCheckBoxIcon" />
-	<keyword match="MetalCheckBoxUI" />
-	<keyword match="MetalComboBoxButton" />
-	<keyword match="MetalComboBoxEditor" />
-	
-	<keyword match="MetalComboBoxIcon" />
-	<keyword match="MetalComboBoxUI" />
-	<keyword match="MetalDesktopIconUI" />
-	<keyword match="MetalFileChooserUI" />
-	<keyword match="MetalIconFactory" />
-	
-	
-	
-	
-	
-	
-	<keyword match="MetalInternalFrameTitlePane" />
-	<keyword match="MetalInternalFrameUI" />
-	<keyword match="MetalLabelUI" />
-	<keyword match="MetalLookAndFeel" />
-	<keyword match="MetalPopupMenuSeparatorUI" />
-	<keyword match="MetalProgressBarUI" />
-	<keyword match="MetalRadioButtonUI" />
-	<keyword match="MetalRootPaneUI" />
-	<keyword match="MetalScrollBarUI" />
-	<keyword match="MetalScrollButton" />
-	<keyword match="MetalScrollPaneUI" />
-	<keyword match="MetalSeparatorUI" />
-	<keyword match="MetalSliderUI" />
-	<keyword match="MetalSplitPaneUI" />
-	<keyword match="MetalTabbedPaneUI" />
-	<keyword match="MetalTextFieldUI" />
-	<keyword match="MetalTheme" />
-	<keyword match="MetalToggleButtonUI" />
-	<keyword match="MetalToolBarUI" />
-	<keyword match="MetalToolTipUI" />
-	<keyword match="MetalTreeUI" />
-	<keyword match="MetaMessage" />
-	<keyword match="Method" />
-	<keyword match="MethodDescriptor" />
-	<keyword match="MidiChannel" />
-	<keyword match="MidiDevice" />
-	
-	<keyword match="MidiDeviceProvider" />
-	<keyword match="MidiEvent" />
-	<keyword match="MidiFileFormat" />
-	<keyword match="MidiFileReader" />
-	<keyword match="MidiFileWriter" />
-	<keyword match="MidiMessage" />
-	<keyword match="MidiSystem" />
-	<keyword match="MidiUnavailableException" />
-	<keyword match="MimeTypeParseException" />
-	<keyword match="MinimalHTMLWriter" />
-	<keyword match="MissingResourceException" />
-	<keyword match="Mixer" />
-	
-	<keyword match="MixerProvider" />
-	<keyword match="ModificationItem" />
-	<keyword match="Modifier" />
-	<keyword match="MouseAdapter" />
-	<keyword match="MouseDragGestureRecognizer" />
-	<keyword match="MouseEvent" />
-	<keyword match="MouseInputAdapter" />
-	<keyword match="MouseInputListener" />
-	<keyword match="MouseListener" />
-	<keyword match="MouseMotionAdapter" />
-	<keyword match="MouseMotionListener" />
-	<keyword match="MouseWheelEvent" />
-	<keyword match="MouseWheelListener" />
-	<keyword match="MultiButtonUI" />
-	<keyword match="MulticastSocket" />
-	<keyword match="MultiColorChooserUI" />
-	<keyword match="MultiComboBoxUI" />
-	<keyword match="MultiDesktopIconUI" />
-	<keyword match="MultiDesktopPaneUI" />
-	<keyword match="MultiDoc" />
-	<keyword match="MultiDocPrintJob" />
-	<keyword match="MultiDocPrintService" />
-	<keyword match="MultiFileChooserUI" />
-	<keyword match="MultiInternalFrameUI" />
-	<keyword match="MultiLabelUI" />
-	<keyword match="MultiListUI" />
-	<keyword match="MultiLookAndFeel" />
-	<keyword match="MultiMenuBarUI" />
-	<keyword match="MultiMenuItemUI" />
-	<keyword match="MultiOptionPaneUI" />
-	<keyword match="MultiPanelUI" />
-	<keyword match="MultiPixelPackedSampleModel" />
-	<keyword match="MultipleComponentProfileHelper" />
-	<keyword match="MultipleComponentProfileHolder" />
-	<keyword match="MultipleDocumentHandling" />
-	<keyword match="MultipleMaster" />
-	<keyword match="MultiPopupMenuUI" />
-	<keyword match="MultiProgressBarUI" />
-	<keyword match="MultiRootPaneUI" />
-	<keyword match="MultiScrollBarUI" />
-	<keyword match="MultiScrollPaneUI" />
-	<keyword match="MultiSeparatorUI" />
-	<keyword match="MultiSliderUI" />
-	<keyword match="MultiSpinnerUI" />
-	<keyword match="MultiSplitPaneUI" />
-	<keyword match="MultiTabbedPaneUI" />
-	<keyword match="MultiTableHeaderUI" />
-	<keyword match="MultiTableUI" />
-	<keyword match="MultiTextUI" />
-	<keyword match="MultiToolBarUI" />
-	<keyword match="MultiToolTipUI" />
-	<keyword match="MultiTreeUI" />
-	<keyword match="MultiViewportUI" />
-	<keyword match="MutableAttributeSet" />
-	<keyword match="MutableComboBoxModel" />
-	<keyword match="MutableTreeNode" />
-	<keyword match="Name" />
-	<keyword match="NameAlreadyBoundException" />
-	<keyword match="NameCallback" />
-	<keyword match="NameClassPair" />
-	<keyword match="NameComponent" />
-	<keyword match="NameComponentHelper" />
-	<keyword match="NameComponentHolder" />
-	<keyword match="NamedNodeMap" />
-	<keyword match="NamedValue" />
-	<keyword match="NameDynAnyPair" />
-	<keyword match="NameDynAnyPairHelper" />
-	<keyword match="NameDynAnyPairSeqHelper" />
-	<keyword match="NameHelper" />
-	<keyword match="NameHolder" />
-	<keyword match="NameNotFoundException" />
-	<keyword match="NameParser" />
-	<keyword match="NamespaceChangeListener" />
-	<keyword match="NamespaceSupport" />
-	<keyword match="NameValuePair" />
-	<keyword match="NameValuePair" />
-	<keyword match="NameValuePairHelper" />
-	<keyword match="NameValuePairHelper" />
-	<keyword match="NameValuePairSeqHelper" />
-	<keyword match="Naming" />
-	<keyword match="NamingContext" />
-	<keyword match="NamingContextExt" />
-	<keyword match="NamingContextExtHelper" />
-	<keyword match="NamingContextExtHolder" />
-	<keyword match="NamingContextExtOperations" />
-	<keyword match="NamingContextExtPOA" />
-	<keyword match="NamingContextHelper" />
-	<keyword match="NamingContextHolder" />
-	<keyword match="NamingContextOperations" />
-	<keyword match="NamingContextPOA" />
-	<keyword match="NamingEnumeration" />
-	<keyword match="NamingEvent" />
-	<keyword match="NamingException" />
-	<keyword match="NamingExceptionEvent" />
-	<keyword match="NamingListener" />
-	<keyword match="NamingManager" />
-	<keyword match="NamingSecurityException" />
-	<keyword match="NavigationFilter" />
-	
-	<keyword match="NegativeArraySizeException" />
-	<keyword match="NetPermission" />
-	<keyword match="NetworkInterface" />
-	<keyword match="NO_IMPLEMENT" />
-	<keyword match="NO_MEMORY" />
-	<keyword match="NO_PERMISSION" />
-	<keyword match="NO_RESOURCES" />
-	<keyword match="NO_RESPONSE" />
-	<keyword match="NoClassDefFoundError" />
-	<keyword match="NoConnectionPendingException" />
-	<keyword match="NoContext" />
-	<keyword match="NoContextHelper" />
-	<keyword match="Node" />
-	<keyword match="NodeChangeEvent" />
-	<keyword match="NodeChangeListener" />
-	<keyword match="NodeList" />
-	<keyword match="NoInitialContextException" />
-	<keyword match="NoninvertibleTransformException" />
-	<keyword match="NonReadableChannelException" />
-	<keyword match="NonWritableChannelException" />
-	<keyword match="NoPermissionException" />
-	<keyword match="NoRouteToHostException" />
-	<keyword match="NoServant" />
-	<keyword match="NoServantHelper" />
-	<keyword match="NoSuchAlgorithmException" />
-	<keyword match="NoSuchAttributeException" />
-	<keyword match="NoSuchElementException" />
-	<keyword match="NoSuchFieldError" />
-	<keyword match="NoSuchFieldException" />
-	<keyword match="NoSuchMethodError" />
-	<keyword match="NoSuchMethodException" />
-	<keyword match="NoSuchObjectException" />
-	<keyword match="NoSuchPaddingException" />
-	<keyword match="NoSuchProviderException" />
-	<keyword match="NotActiveException" />
-	<keyword match="Notation" />
-	<keyword match="NotBoundException" />
-	<keyword match="NotContextException" />
-	<keyword match="NotEmpty" />
-	<keyword match="NotEmptyHelper" />
-	<keyword match="NotEmptyHolder" />
-	<keyword match="NotFound" />
-	<keyword match="NotFoundHelper" />
-	<keyword match="NotFoundHolder" />
-	<keyword match="NotFoundReason" />
-	<keyword match="NotFoundReasonHelper" />
-	<keyword match="NotFoundReasonHolder" />
-	<keyword match="NotOwnerException" />
-	<keyword match="NotSerializableException" />
-	<keyword match="NotYetBoundException" />
-	<keyword match="NotYetConnectedException" />
-	<keyword match="NullCipher" />
-	<keyword match="NullPointerException" />
-	<keyword match="Number" />
-	<keyword match="NumberFormat" />
-	
-	<keyword match="NumberFormatException" />
-	<keyword match="NumberFormatter" />
-	<keyword match="NumberOfDocuments" />
-	<keyword match="NumberOfInterveningJobs" />
-	<keyword match="NumberUp" />
-	<keyword match="NumberUpSupported" />
-	<keyword match="NumericShaper" />
-	<keyword match="NVList" />
-	<keyword match="OBJ_ADAPTER" />
-	<keyword match="Object" />
-	<keyword match="OBJECT_NOT_EXIST" />
-	<keyword match="ObjectAlreadyActive" />
-	<keyword match="ObjectAlreadyActiveHelper" />
-	<keyword match="ObjectChangeListener" />
-	<keyword match="ObjectFactory" />
-	<keyword match="ObjectFactoryBuilder" />
-	<keyword match="ObjectHelper" />
-	<keyword match="ObjectHolder" />
-	<keyword match="ObjectIdHelper" />
-	<keyword match="ObjectImpl" />
-	<keyword match="ObjectImpl" />
-	<keyword match="ObjectInput" />
-	<keyword match="ObjectInputStream" />
-	
-	<keyword match="ObjectInputValidation" />
-	<keyword match="ObjectNotActive" />
-	<keyword match="ObjectNotActiveHelper" />
-	<keyword match="ObjectOutput" />
-	<keyword match="ObjectOutputStream" />
-	
-	<keyword match="ObjectStreamClass" />
-	<keyword match="ObjectStreamConstants" />
-	<keyword match="ObjectStreamException" />
-	<keyword match="ObjectStreamField" />
-	<keyword match="ObjectView" />
-	<keyword match="ObjID" />
-	<keyword match="Observable" />
-	<keyword match="Observer" />
-	<keyword match="OctetSeqHelper" />
-	<keyword match="OctetSeqHolder" />
-	<keyword match="Oid" />
-	<keyword match="OMGVMCID" />
-	<keyword match="OpenType" />
-	<keyword match="Operation" />
-	<keyword match="OperationNotSupportedException" />
-	<keyword match="Option" />
-	<keyword match="OptionalDataException" />
-	<keyword match="OptionPaneUI" />
-	<keyword match="ORB" />
-	<keyword match="ORB" />
-	<keyword match="ORBInitializer" />
-	<keyword match="ORBInitializerOperations" />
-	<keyword match="ORBInitInfo" />
-	<keyword match="ORBInitInfoOperations" />
-	<keyword match="OrientationRequested" />
-	<keyword match="OutOfMemoryError" />
-	<keyword match="OutputDeviceAssigned" />
-	<keyword match="OutputKeys" />
-	<keyword match="OutputStream" />
-	<keyword match="OutputStream" />
-	<keyword match="OutputStream" />
-	<keyword match="OutputStreamWriter" />
-	<keyword match="OverlappingFileLockException" />
-	<keyword match="OverlayLayout" />
-	<keyword match="Owner" />
-	<keyword match="Package" />
-	<keyword match="PackedColorModel" />
-	<keyword match="Pageable" />
-	<keyword match="PageAttributes" />
-	
-	
-	
-	
-	
-	<keyword match="PageFormat" />
-	<keyword match="PageRanges" />
-	<keyword match="PagesPerMinute" />
-	<keyword match="PagesPerMinuteColor" />
-	<keyword match="Paint" />
-	<keyword match="PaintContext" />
-	<keyword match="PaintEvent" />
-	<keyword match="Panel" />
-	<keyword match="PanelUI" />
-	<keyword match="Paper" />
-	<keyword match="ParagraphView" />
-	<keyword match="ParagraphView" />
-	<keyword match="Parameter" />
-	<keyword match="ParameterBlock" />
-	<keyword match="ParameterDescriptor" />
-	<keyword match="ParameterMetaData" />
-	<keyword match="ParameterMode" />
-	<keyword match="ParameterModeHelper" />
-	<keyword match="ParameterModeHolder" />
-	<keyword match="ParseException" />
-	<keyword match="ParsePosition" />
-	<keyword match="Parser" />
-	<keyword match="Parser" />
-	<keyword match="ParserAdapter" />
-	<keyword match="ParserConfigurationException" />
-	<keyword match="ParserDelegator" />
-	<keyword match="ParserFactory" />
-	<keyword match="PartialResultException" />
-	<keyword match="PasswordAuthentication" />
-	<keyword match="PasswordCallback" />
-	<keyword match="PasswordView" />
-	<keyword match="Patch" />
-	<keyword match="PathIterator" />
-	<keyword match="Pattern" />
-	<keyword match="PatternSyntaxException" />
-	<keyword match="PBEKey" />
-	<keyword match="PBEKeySpec" />
-	<keyword match="PBEParameterSpec" />
-	<keyword match="PDLOverrideSupported" />
-	<keyword match="Permission" />
-	<keyword match="Permission" />
-	<keyword match="PermissionCollection" />
-	<keyword match="Permissions" />
-	<keyword match="PERSIST_STORE" />
-	<keyword match="PersistenceDelegate" />
-	<keyword match="PhantomReference" />
-	<keyword match="Pipe" />
-	
-	
-	<keyword match="PipedInputStream" />
-	<keyword match="PipedOutputStream" />
-	<keyword match="PipedReader" />
-	<keyword match="PipedWriter" />
-	<keyword match="PixelGrabber" />
-	<keyword match="PixelInterleavedSampleModel" />
-	<keyword match="PKCS8EncodedKeySpec" />
-	<keyword match="PKIXBuilderParameters" />
-	<keyword match="PKIXCertPathBuilderResult" />
-	<keyword match="PKIXCertPathChecker" />
-	<keyword match="PKIXCertPathValidatorResult" />
-	<keyword match="PKIXParameters" />
-	<keyword match="PlainDocument" />
-	<keyword match="PlainView" />
-	<keyword match="POA" />
-	<keyword match="POAHelper" />
-	<keyword match="POAManager" />
-	<keyword match="POAManagerOperations" />
-	<keyword match="POAOperations" />
-	<keyword match="Point" />
-	<keyword match="Point2D" />
-	
-	
-	<keyword match="Policy" />
-	<keyword match="Policy" />
-	<keyword match="Policy" />
-	<keyword match="PolicyError" />
-	<keyword match="PolicyErrorCodeHelper" />
-	<keyword match="PolicyErrorHelper" />
-	<keyword match="PolicyErrorHolder" />
-	<keyword match="PolicyFactory" />
-	<keyword match="PolicyFactoryOperations" />
-	<keyword match="PolicyHelper" />
-	<keyword match="PolicyHolder" />
-	<keyword match="PolicyListHelper" />
-	<keyword match="PolicyListHolder" />
-	<keyword match="PolicyNode" />
-	<keyword match="PolicyOperations" />
-	<keyword match="PolicyQualifierInfo" />
-	<keyword match="PolicyTypeHelper" />
-	<keyword match="Polygon" />
-	<keyword match="PooledConnection" />
-	<keyword match="Popup" />
-	<keyword match="PopupFactory" />
-	<keyword match="PopupMenu" />
-	<keyword match="PopupMenuEvent" />
-	<keyword match="PopupMenuListener" />
-	<keyword match="PopupMenuUI" />
-	<keyword match="Port" />
-	
-	<keyword match="PortableRemoteObject" />
-	<keyword match="PortableRemoteObjectDelegate" />
-	<keyword match="PortUnreachableException" />
-	<keyword match="Position" />
-	
-	<keyword match="PreferenceChangeEvent" />
-	<keyword match="PreferenceChangeListener" />
-	<keyword match="Preferences" />
-	<keyword match="PreferencesFactory" />
-	<keyword match="PreparedStatement" />
-	<keyword match="PresentationDirection" />
-	<keyword match="Principal" />
-	<keyword match="Principal" />
-	<keyword match="PrincipalHolder" />
-	<keyword match="Printable" />
-	<keyword match="PrinterAbortException" />
-	<keyword match="PrinterException" />
-	<keyword match="PrinterGraphics" />
-	<keyword match="PrinterInfo" />
-	<keyword match="PrinterIOException" />
-	<keyword match="PrinterIsAcceptingJobs" />
-	<keyword match="PrinterJob" />
-	<keyword match="PrinterLocation" />
-	<keyword match="PrinterMakeAndModel" />
-	<keyword match="PrinterMessageFromOperator" />
-	<keyword match="PrinterMoreInfo" />
-	<keyword match="PrinterMoreInfoManufacturer" />
-	<keyword match="PrinterName" />
-	<keyword match="PrinterResolution" />
-	<keyword match="PrinterState" />
-	<keyword match="PrinterStateReason" />
-	<keyword match="PrinterStateReasons" />
-	<keyword match="PrinterURI" />
-	<keyword match="PrintEvent" />
-	<keyword match="PrintException" />
-	<keyword match="PrintGraphics" />
-	<keyword match="PrintJob" />
-	<keyword match="PrintJobAdapter" />
-	<keyword match="PrintJobAttribute" />
-	<keyword match="PrintJobAttributeEvent" />
-	<keyword match="PrintJobAttributeListener" />
-	<keyword match="PrintJobAttributeSet" />
-	<keyword match="PrintJobEvent" />
-	<keyword match="PrintJobListener" />
-	<keyword match="PrintQuality" />
-	<keyword match="PrintRequestAttribute" />
-	<keyword match="PrintRequestAttributeSet" />
-	<keyword match="PrintService" />
-	<keyword match="PrintServiceAttribute" />
-	<keyword match="PrintServiceAttributeEvent" />
-	<keyword match="PrintServiceAttributeListener" />
-	<keyword match="PrintServiceAttributeSet" />
-	<keyword match="PrintServiceLookup" />
-	<keyword match="PrintStream" />
-	<keyword match="PrintWriter" />
-	<keyword match="PRIVATE_MEMBER" />
-	<keyword match="PrivateCredentialPermission" />
-	<keyword match="PrivateKey" />
-	<keyword match="PrivilegedAction" />
-	<keyword match="PrivilegedActionException" />
-	<keyword match="PrivilegedExceptionAction" />
-	<keyword match="Process" />
-	<keyword match="ProcessingInstruction" />
-	<keyword match="ProfileDataException" />
-	<keyword match="ProfileIdHelper" />
-	<keyword match="ProgressBarUI" />
-	<keyword match="ProgressMonitor" />
-	<keyword match="ProgressMonitorInputStream" />
-	<keyword match="Properties" />
-	<keyword match="PropertyChangeEvent" />
-	<keyword match="PropertyChangeListener" />
-	<keyword match="PropertyChangeListenerProxy" />
-	<keyword match="PropertyChangeSupport" />
-	<keyword match="PropertyDescriptor" />
-	<keyword match="PropertyEditor" />
-	<keyword match="PropertyEditorManager" />
-	<keyword match="PropertyEditorSupport" />
-	<keyword match="PropertyPermission" />
-	<keyword match="PropertyResourceBundle" />
-	<keyword match="PropertyVetoException" />
-	<keyword match="ProtectionDomain" />
-	<keyword match="ProtocolException" />
-	<keyword match="Provider" />
-	<keyword match="ProviderException" />
-	<keyword match="Proxy" />
-	<keyword match="PSSParameterSpec" />
-	<keyword match="PUBLIC_MEMBER" />
-	<keyword match="PublicKey" />
-	<keyword match="PushbackInputStream" />
-	<keyword match="PushbackReader" />
-	<keyword match="QuadCurve2D" />
-	
-	
-	<keyword match="QueuedJobCount" />
-	<keyword match="Random" />
-	<keyword match="RandomAccess" />
-	<keyword match="RandomAccessFile" />
-	<keyword match="Raster" />
-	<keyword match="RasterFormatException" />
-	<keyword match="RasterOp" />
-	<keyword match="RC2ParameterSpec" />
-	<keyword match="RC5ParameterSpec" />
-	<keyword match="ReadableByteChannel" />
-	<keyword match="Reader" />
-	<keyword match="ReadOnlyBufferException" />
-	<keyword match="Receiver" />
-	<keyword match="Rectangle" />
-	<keyword match="Rectangle2D" />
-	
-	
-	<keyword match="RectangularShape" />
-	<keyword match="Ref" />
-	<keyword match="RefAddr" />
-	<keyword match="Reference" />
-	<keyword match="Reference" />
-	<keyword match="Referenceable" />
-	<keyword match="ReferenceQueue" />
-	<keyword match="ReferenceUriSchemesSupported" />
-	<keyword match="ReferralException" />
-	<keyword match="ReflectPermission" />
-	<keyword match="Refreshable" />
-	<keyword match="RefreshFailedException" />
-	<keyword match="RegisterableService" />
-	<keyword match="Registry" />
-	<keyword match="RegistryHandler" />
-	<keyword match="RemarshalException" />
-	<keyword match="Remote" />
-	<keyword match="RemoteCall" />
-	<keyword match="RemoteException" />
-	<keyword match="RemoteObject" />
-	<keyword match="RemoteRef" />
-	<keyword match="RemoteServer" />
-	<keyword match="RemoteStub" />
-	<keyword match="RenderableImage" />
-	<keyword match="RenderableImageOp" />
-	<keyword match="RenderableImageProducer" />
-	<keyword match="RenderContext" />
-	<keyword match="RenderedImage" />
-	<keyword match="RenderedImageFactory" />
-	<keyword match="Renderer" />
-	<keyword match="RenderingHints" />
-	
-	<keyword match="RepaintManager" />
-	<keyword match="ReplicateScaleFilter" />
-	<keyword match="RepositoryIdHelper" />
-	<keyword match="Request" />
-	<keyword match="REQUEST_PROCESSING_POLICY_ID" />
-	<keyword match="RequestInfo" />
-	<keyword match="RequestInfoOperations" />
-	<keyword match="RequestingUserName" />
-	<keyword match="RequestProcessingPolicy" />
-	<keyword match="RequestProcessingPolicyOperations" />
-	<keyword match="RequestProcessingPolicyValue" />
-	<keyword match="RescaleOp" />
-	<keyword match="ResolutionSyntax" />
-	<keyword match="Resolver" />
-	<keyword match="ResolveResult" />
-	<keyword match="ResourceBundle" />
-	<keyword match="ResponseHandler" />
-	<keyword match="Result" />
-	<keyword match="ResultSet" />
-	<keyword match="ResultSetMetaData" />
-	<keyword match="ReverbType" />
-	<keyword match="RGBImageFilter" />
-	<keyword match="RMIClassLoader" />
-	<keyword match="RMIClassLoaderSpi" />
-	<keyword match="RMIClientSocketFactory" />
-	<keyword match="RMIFailureHandler" />
-	<keyword match="RMISecurityException" />
-	<keyword match="RMISecurityManager" />
-	<keyword match="RMIServerSocketFactory" />
-	<keyword match="RMISocketFactory" />
-	<keyword match="Robot" />
-	<keyword match="RootPaneContainer" />
-	<keyword match="RootPaneUI" />
-	<keyword match="RoundRectangle2D" />
-	
-	
-	<keyword match="RowMapper" />
-	<keyword match="RowSet" />
-	<keyword match="RowSetEvent" />
-	<keyword match="RowSetInternal" />
-	<keyword match="RowSetListener" />
-	<keyword match="RowSetMetaData" />
-	<keyword match="RowSetReader" />
-	<keyword match="RowSetWriter" />
-	<keyword match="RSAKey" />
-	<keyword match="RSAKeyGenParameterSpec" />
-	<keyword match="RSAMultiPrimePrivateCrtKey" />
-	<keyword match="RSAMultiPrimePrivateCrtKeySpec" />
-	<keyword match="RSAOtherPrimeInfo" />
-	<keyword match="RSAPrivateCrtKey" />
-	<keyword match="RSAPrivateCrtKeySpec" />
-	<keyword match="RSAPrivateKey" />
-	<keyword match="RSAPrivateKeySpec" />
-	<keyword match="RSAPublicKey" />
-	<keyword match="RSAPublicKeySpec" />
-	<keyword match="RTFEditorKit" />
-	<keyword match="RuleBasedCollator" />
-	<keyword match="Runnable" />
-	<keyword match="Runtime" />
-	<keyword match="RunTime" />
-	<keyword match="RuntimeException" />
-	<keyword match="RunTimeOperations" />
-	<keyword match="RuntimePermission" />
-	<keyword match="SampleModel" />
-	<keyword match="Savepoint" />
-	<keyword match="SAXException" />
-	<keyword match="SAXNotRecognizedException" />
-	<keyword match="SAXNotSupportedException" />
-	<keyword match="SAXParseException" />
-	<keyword match="SAXParser" />
-	<keyword match="SAXParserFactory" />
-	<keyword match="SAXResult" />
-	<keyword match="SAXSource" />
-	<keyword match="SAXTransformerFactory" />
-	<keyword match="ScatteringByteChannel" />
-	<keyword match="SchemaViolationException" />
-	<keyword match="Scrollable" />
-	<keyword match="Scrollbar" />
-	<keyword match="ScrollBarUI" />
-	<keyword match="ScrollPane" />
-	<keyword match="ScrollPaneAdjustable" />
-	<keyword match="ScrollPaneConstants" />
-	<keyword match="ScrollPaneLayout" />
-	
-	<keyword match="ScrollPaneUI" />
-	<keyword match="SealedObject" />
-	<keyword match="SearchControls" />
-	<keyword match="SearchResult" />
-	<keyword match="SecretKey" />
-	<keyword match="SecretKeyFactory" />
-	<keyword match="SecretKeyFactorySpi" />
-	<keyword match="SecretKeySpec" />
-	<keyword match="SecureClassLoader" />
-	<keyword match="SecureRandom" />
-	<keyword match="SecureRandomSpi" />
-	<keyword match="Security" />
-	<keyword match="SecurityException" />
-	<keyword match="SecurityManager" />
-	<keyword match="SecurityPermission" />
-	<keyword match="Segment" />
-	<keyword match="SelectableChannel" />
-	<keyword match="SelectionKey" />
-	<keyword match="Selector" />
-	<keyword match="SelectorProvider" />
-	<keyword match="SeparatorUI" />
-	<keyword match="Sequence" />
-	<keyword match="SequenceInputStream" />
-	<keyword match="Sequencer" />
-	
-	<keyword match="Serializable" />
-	<keyword match="SerializablePermission" />
-	<keyword match="Servant" />
-	<keyword match="SERVANT_RETENTION_POLICY_ID" />
-	<keyword match="ServantActivator" />
-	<keyword match="ServantActivatorHelper" />
-	<keyword match="ServantActivatorOperations" />
-	<keyword match="ServantActivatorPOA" />
-	<keyword match="ServantAlreadyActive" />
-	<keyword match="ServantAlreadyActiveHelper" />
-	<keyword match="ServantLocator" />
-	<keyword match="ServantLocatorHelper" />
-	<keyword match="ServantLocatorOperations" />
-	<keyword match="ServantLocatorPOA" />
-	<keyword match="ServantManager" />
-	<keyword match="ServantManagerOperations" />
-	<keyword match="ServantNotActive" />
-	<keyword match="ServantNotActiveHelper" />
-	<keyword match="ServantObject" />
-	<keyword match="ServantRetentionPolicy" />
-	<keyword match="ServantRetentionPolicyOperations" />
-	<keyword match="ServantRetentionPolicyValue" />
-	<keyword match="ServerCloneException" />
-	<keyword match="ServerError" />
-	<keyword match="ServerException" />
-	<keyword match="ServerNotActiveException" />
-	<keyword match="ServerRef" />
-	<keyword match="ServerRequest" />
-	<keyword match="ServerRequestInfo" />
-	<keyword match="ServerRequestInfoOperations" />
-	<keyword match="ServerRequestInterceptor" />
-	<keyword match="ServerRequestInterceptorOperations" />
-	<keyword match="ServerRuntimeException" />
-	<keyword match="ServerSocket" />
-	<keyword match="ServerSocketChannel" />
-	<keyword match="ServerSocketFactory" />
-	<keyword match="ServiceContext" />
-	<keyword match="ServiceContextHelper" />
-	<keyword match="ServiceContextHolder" />
-	<keyword match="ServiceContextListHelper" />
-	<keyword match="ServiceContextListHolder" />
-	<keyword match="ServiceDetail" />
-	<keyword match="ServiceDetailHelper" />
-	<keyword match="ServiceIdHelper" />
-	<keyword match="ServiceInformation" />
-	<keyword match="ServiceInformationHelper" />
-	<keyword match="ServiceInformationHolder" />
-	<keyword match="ServicePermission" />
-	<keyword match="ServiceRegistry" />
-	
-	<keyword match="ServiceUI" />
-	<keyword match="ServiceUIFactory" />
-	<keyword match="ServiceUnavailableException" />
-	<keyword match="Set" />
-	<keyword match="SetOfIntegerSyntax" />
-	<keyword match="SetOverrideType" />
-	<keyword match="SetOverrideTypeHelper" />
-	<keyword match="Severity" />
-	<keyword match="Shape" />
-	<keyword match="ShapeGraphicAttribute" />
-	<keyword match="SheetCollate" />
-	<keyword match="Short" />
-	<keyword match="ShortBuffer" />
-	<keyword match="ShortBufferException" />
-	<keyword match="ShortHolder" />
-	<keyword match="ShortLookupTable" />
-	<keyword match="ShortMessage" />
-	<keyword match="ShortSeqHelper" />
-	<keyword match="ShortSeqHolder" />
-	<keyword match="Sides" />
-	<keyword match="Signature" />
-	<keyword match="SignatureException" />
-	<keyword match="SignatureSpi" />
-	<keyword match="SignedObject" />
-	<keyword match="Signer" />
-	<keyword match="SimpleAttributeSet" />
-	<keyword match="SimpleBeanInfo" />
-	<keyword match="SimpleDateFormat" />
-	<keyword match="SimpleDoc" />
-	<keyword match="SimpleFormatter" />
-	<keyword match="SimpleTimeZone" />
-	<keyword match="SinglePixelPackedSampleModel" />
-	<keyword match="SingleSelectionModel" />
-	<keyword match="Size2DSyntax" />
-	<keyword match="SizeLimitExceededException" />
-	<keyword match="SizeRequirements" />
-	<keyword match="SizeSequence" />
-	<keyword match="Skeleton" />
-	<keyword match="SkeletonMismatchException" />
-	<keyword match="SkeletonNotFoundException" />
-	<keyword match="SliderUI" />
-	<keyword match="Socket" />
-	<keyword match="SocketAddress" />
-	<keyword match="SocketChannel" />
-	<keyword match="SocketException" />
-	<keyword match="SocketFactory" />
-	<keyword match="SocketHandler" />
-	<keyword match="SocketImpl" />
-	<keyword match="SocketImplFactory" />
-	<keyword match="SocketOptions" />
-	<keyword match="SocketPermission" />
-	<keyword match="SocketSecurityException" />
-	<keyword match="SocketTimeoutException" />
-	<keyword match="SoftBevelBorder" />
-	<keyword match="SoftReference" />
-	<keyword match="SortedMap" />
-	<keyword match="SortedSet" />
-	<keyword match="SortingFocusTraversalPolicy" />
-	<keyword match="Soundbank" />
-	<keyword match="SoundbankReader" />
-	<keyword match="SoundbankResource" />
-	<keyword match="Source" />
-	<keyword match="SourceDataLine" />
-	<keyword match="SourceLocator" />
-	<keyword match="SpinnerDateModel" />
-	<keyword match="SpinnerListModel" />
-	<keyword match="SpinnerModel" />
-	<keyword match="SpinnerNumberModel" />
-	<keyword match="SpinnerUI" />
-	<keyword match="SplitPaneUI" />
-	<keyword match="Spring" />
-	<keyword match="SpringLayout" />
-	
-	<keyword match="SQLData" />
-	<keyword match="SQLException" />
-	<keyword match="SQLInput" />
-	<keyword match="SQLOutput" />
-	<keyword match="SQLPermission" />
-	<keyword match="SQLWarning" />
-	<keyword match="SSLContext" />
-	<keyword match="SSLContextSpi" />
-	<keyword match="SSLException" />
-	<keyword match="SSLHandshakeException" />
-	<keyword match="SSLKeyException" />
-	<keyword match="SSLPeerUnverifiedException" />
-	<keyword match="SSLPermission" />
-	<keyword match="SSLProtocolException" />
-	<keyword match="SSLServerSocket" />
-	<keyword match="SSLServerSocketFactory" />
-	<keyword match="SSLSession" />
-	<keyword match="SSLSessionBindingEvent" />
-	<keyword match="SSLSessionBindingListener" />
-	<keyword match="SSLSessionContext" />
-	<keyword match="SSLSocket" />
-	<keyword match="SSLSocketFactory" />
-	<keyword match="Stack" />
-	<keyword match="StackOverflowError" />
-	<keyword match="StackTraceElement" />
-	<keyword match="StartTlsRequest" />
-	<keyword match="StartTlsResponse" />
-	<keyword match="State" />
-	<keyword match="StateEdit" />
-	<keyword match="StateEditable" />
-	<keyword match="StateFactory" />
-	<keyword match="Statement" />
-	<keyword match="Statement" />
-	<keyword match="Streamable" />
-	<keyword match="StreamableValue" />
-	<keyword match="StreamCorruptedException" />
-	<keyword match="StreamHandler" />
-	<keyword match="StreamPrintService" />
-	<keyword match="StreamPrintServiceFactory" />
-	<keyword match="StreamResult" />
-	<keyword match="StreamSource" />
-	<keyword match="StreamTokenizer" />
-	<keyword match="StrictMath" />
-	<keyword match="String" />
-	<keyword match="StringBuffer" />
-	<keyword match="StringBufferInputStream" />
-	<keyword match="StringCharacterIterator" />
-	<keyword match="StringContent" />
-	<keyword match="StringHolder" />
-	<keyword match="StringIndexOutOfBoundsException" />
-	<keyword match="StringNameHelper" />
-	<keyword match="StringReader" />
-	<keyword match="StringRefAddr" />
-	<keyword match="StringSelection" />
-	<keyword match="StringSeqHelper" />
-	<keyword match="StringSeqHolder" />
-	<keyword match="StringTokenizer" />
-	<keyword match="StringValueHelper" />
-	<keyword match="StringWriter" />
-	<keyword match="Stroke" />
-	<keyword match="Struct" />
-	<keyword match="StructMember" />
-	<keyword match="StructMemberHelper" />
-	<keyword match="Stub" />
-	<keyword match="StubDelegate" />
-	<keyword match="StubNotFoundException" />
-	<keyword match="Style" />
-	<keyword match="StyleConstants" />
-	
-	
-	
-	
-	<keyword match="StyleContext" />
-	<keyword match="StyledDocument" />
-	<keyword match="StyledEditorKit" />
-	
-	
-	
-	
-	
-	
-	
-	
-	<keyword match="StyleSheet" />
-	
-	
-	<keyword match="Subject" />
-	<keyword match="SubjectDomainCombiner" />
-	<keyword match="SUCCESSFUL" />
-	<keyword match="SupportedValuesAttribute" />
-	<keyword match="SwingConstants" />
-	<keyword match="SwingPropertyChangeSupport" />
-	<keyword match="SwingUtilities" />
-	<keyword match="SYNC_WITH_TRANSPORT" />
-	<keyword match="SyncFailedException" />
-	<keyword match="SyncScopeHelper" />
-	<keyword match="Synthesizer" />
-	<keyword match="SysexMessage" />
-	<keyword match="System" />
-	<keyword match="SYSTEM_EXCEPTION" />
-	<keyword match="SystemColor" />
-	<keyword match="SystemException" />
-	<keyword match="SystemFlavorMap" />
-	<keyword match="TabableView" />
-	<keyword match="TabbedPaneUI" />
-	<keyword match="TabExpander" />
-	<keyword match="TableCellEditor" />
-	<keyword match="TableCellRenderer" />
-	<keyword match="TableColumn" />
-	<keyword match="TableColumnModel" />
-	<keyword match="TableColumnModelEvent" />
-	<keyword match="TableColumnModelListener" />
-	<keyword match="TableHeaderUI" />
-	<keyword match="TableModel" />
-	<keyword match="TableModelEvent" />
-	<keyword match="TableModelListener" />
-	<keyword match="TableUI" />
-	<keyword match="TableView" />
-	<keyword match="TabSet" />
-	<keyword match="TabStop" />
-	<keyword match="TAG_ALTERNATE_IIOP_ADDRESS" />
-	<keyword match="TAG_CODE_SETS" />
-	<keyword match="TAG_INTERNET_IOP" />
-	<keyword match="TAG_JAVA_CODEBASE" />
-	<keyword match="TAG_MULTIPLE_COMPONENTS" />
-	<keyword match="TAG_ORB_TYPE" />
-	<keyword match="TAG_POLICIES" />
-	<keyword match="TagElement" />
-	<keyword match="TaggedComponent" />
-	<keyword match="TaggedComponentHelper" />
-	<keyword match="TaggedComponentHolder" />
-	<keyword match="TaggedProfile" />
-	<keyword match="TaggedProfileHelper" />
-	<keyword match="TaggedProfileHolder" />
-	<keyword match="TargetDataLine" />
-	<keyword match="TCKind" />
-	<keyword match="Templates" />
-	<keyword match="TemplatesHandler" />
-	<keyword match="Text" />
-	<keyword match="TextAction" />
-	<keyword match="TextArea" />
-	<keyword match="TextAttribute" />
-	<keyword match="TextComponent" />
-	<keyword match="TextEvent" />
-	<keyword match="TextField" />
-	<keyword match="TextHitInfo" />
-	<keyword match="TextInputCallback" />
-	<keyword match="TextLayout" />
-	
-	<keyword match="TextListener" />
-	<keyword match="TextMeasurer" />
-	<keyword match="TextOutputCallback" />
-	<keyword match="TextSyntax" />
-	<keyword match="TextUI" />
-	<keyword match="TexturePaint" />
-	<keyword match="Thread" />
-	<keyword match="THREAD_POLICY_ID" />
-	<keyword match="ThreadDeath" />
-	<keyword match="ThreadGroup" />
-	<keyword match="ThreadLocal" />
-	<keyword match="ThreadPolicy" />
-	<keyword match="ThreadPolicyOperations" />
-	<keyword match="ThreadPolicyValue" />
-	<keyword match="Throwable" />
-	<keyword match="Tie" />
-	<keyword match="TileObserver" />
-	<keyword match="Time" />
-	<keyword match="TimeLimitExceededException" />
-	<keyword match="Timer" />
-	<keyword match="Timer" />
-	<keyword match="TimerTask" />
-	<keyword match="Timestamp" />
-	<keyword match="TimeZone" />
-	<keyword match="TitledBorder" />
-	<keyword match="ToolBarUI" />
-	<keyword match="Toolkit" />
-	<keyword match="ToolTipManager" />
-	<keyword match="ToolTipUI" />
-	<keyword match="TooManyListenersException" />
-	<keyword match="Track" />
-	<keyword match="TRANSACTION_REQUIRED" />
-	<keyword match="TRANSACTION_ROLLEDBACK" />
-	<keyword match="TransactionRequiredException" />
-	<keyword match="TransactionRolledbackException" />
-	<keyword match="TransactionService" />
-	<keyword match="Transferable" />
-	<keyword match="TransferHandler" />
-	<keyword match="TransformAttribute" />
-	<keyword match="Transformer" />
-	<keyword match="TransformerConfigurationException" />
-	<keyword match="TransformerException" />
-	<keyword match="TransformerFactory" />
-	<keyword match="TransformerFactoryConfigurationError" />
-	<keyword match="TransformerHandler" />
-	<keyword match="TRANSIENT" />
-	<keyword match="Transmitter" />
-	<keyword match="Transparency" />
-	<keyword match="TRANSPORT_RETRY" />
-	<keyword match="TreeCellEditor" />
-	<keyword match="TreeCellRenderer" />
-	<keyword match="TreeExpansionEvent" />
-	<keyword match="TreeExpansionListener" />
-	<keyword match="TreeMap" />
-	<keyword match="TreeModel" />
-	<keyword match="TreeModelEvent" />
-	<keyword match="TreeModelListener" />
-	<keyword match="TreeNode" />
-	<keyword match="TreePath" />
-	<keyword match="TreeSelectionEvent" />
-	<keyword match="TreeSelectionListener" />
-	<keyword match="TreeSelectionModel" />
-	<keyword match="TreeSet" />
-	<keyword match="TreeUI" />
-	<keyword match="TreeWillExpandListener" />
-	<keyword match="TrustAnchor" />
-	<keyword match="TrustManager" />
-	<keyword match="TrustManagerFactory" />
-	<keyword match="TrustManagerFactorySpi" />
-	<keyword match="TypeCode" />
-	<keyword match="TypeCodeHolder" />
-	<keyword match="TypeMismatch" />
-	<keyword match="TypeMismatch" />
-	<keyword match="TypeMismatch" />
-	<keyword match="TypeMismatchHelper" />
-	<keyword match="TypeMismatchHelper" />
-	<keyword match="Types" />
-	<keyword match="UID" />
-	<keyword match="UIDefaults" />
-	
-	
-	
-	
-	<keyword match="UIManager" />
-	
-	<keyword match="UIResource" />
-	<keyword match="ULongLongSeqHelper" />
-	<keyword match="ULongLongSeqHolder" />
-	<keyword match="ULongSeqHelper" />
-	<keyword match="ULongSeqHolder" />
-	<keyword match="UndeclaredThrowableException" />
-	<keyword match="UndoableEdit" />
-	<keyword match="UndoableEditEvent" />
-	<keyword match="UndoableEditListener" />
-	<keyword match="UndoableEditSupport" />
-	<keyword match="UndoManager" />
-	<keyword match="UnexpectedException" />
-	<keyword match="UnicastRemoteObject" />
-	<keyword match="UnionMember" />
-	<keyword match="UnionMemberHelper" />
-	<keyword match="UNKNOWN" />
-	<keyword match="UnknownEncoding" />
-	<keyword match="UnknownEncodingHelper" />
-	<keyword match="UnknownError" />
-	<keyword match="UnknownException" />
-	<keyword match="UnknownGroupException" />
-	<keyword match="UnknownHostException" />
-	<keyword match="UnknownHostException" />
-	<keyword match="UnknownObjectException" />
-	<keyword match="UnknownServiceException" />
-	<keyword match="UnknownUserException" />
-	<keyword match="UnknownUserExceptionHelper" />
-	<keyword match="UnknownUserExceptionHolder" />
-	<keyword match="UnmappableCharacterException" />
-	<keyword match="UnmarshalException" />
-	<keyword match="UnmodifiableSetException" />
-	<keyword match="UnrecoverableKeyException" />
-	<keyword match="Unreferenced" />
-	<keyword match="UnresolvedAddressException" />
-	<keyword match="UnresolvedPermission" />
-	<keyword match="UnsatisfiedLinkError" />
-	<keyword match="UnsolicitedNotification" />
-	<keyword match="UnsolicitedNotificationEvent" />
-	<keyword match="UnsolicitedNotificationListener" />
-	<keyword match="UNSUPPORTED_POLICY" />
-	<keyword match="UNSUPPORTED_POLICY_VALUE" />
-	<keyword match="UnsupportedAddressTypeException" />
-	<keyword match="UnsupportedAudioFileException" />
-	<keyword match="UnsupportedCallbackException" />
-	<keyword match="UnsupportedCharsetException" />
-	<keyword match="UnsupportedClassVersionError" />
-	<keyword match="UnsupportedEncodingException" />
-	<keyword match="UnsupportedFlavorException" />
-	<keyword match="UnsupportedLookAndFeelException" />
-	<keyword match="UnsupportedOperationException" />
-	<keyword match="URI" />
-	<keyword match="URIException" />
-	<keyword match="URIResolver" />
-	<keyword match="URISyntax" />
-	<keyword match="URISyntaxException" />
-	<keyword match="URL" />
-	<keyword match="URLClassLoader" />
-	<keyword match="URLConnection" />
-	<keyword match="URLDecoder" />
-	<keyword match="URLEncoder" />
-	<keyword match="URLStreamHandler" />
-	<keyword match="URLStreamHandlerFactory" />
-	<keyword match="URLStringHelper" />
-	<keyword match="USER_EXCEPTION" />
-	<keyword match="UserException" />
-	<keyword match="UShortSeqHelper" />
-	<keyword match="UShortSeqHolder" />
-	<keyword match="UTFDataFormatException" />
-	<keyword match="Util" />
-	<keyword match="UtilDelegate" />
-	<keyword match="Utilities" />
-	<keyword match="ValueBase" />
-	<keyword match="ValueBaseHelper" />
-	<keyword match="ValueBaseHolder" />
-	<keyword match="ValueFactory" />
-	<keyword match="ValueHandler" />
-	<keyword match="ValueMember" />
-	<keyword match="ValueMemberHelper" />
-	<keyword match="VariableHeightLayoutCache" />
-	<keyword match="Vector" />
-	<keyword match="VerifyError" />
-	<keyword match="VersionSpecHelper" />
-	<keyword match="VetoableChangeListener" />
-	<keyword match="VetoableChangeListenerProxy" />
-	<keyword match="VetoableChangeSupport" />
-	<keyword match="View" />
-	<keyword match="ViewFactory" />
-	<keyword match="ViewportLayout" />
-	<keyword match="ViewportUI" />
-	<keyword match="VirtualMachineError" />
-	<keyword match="Visibility" />
-	<keyword match="VisibilityHelper" />
-	<keyword match="VM_ABSTRACT" />
-	<keyword match="VM_CUSTOM" />
-	<keyword match="VM_NONE" />
-	<keyword match="VM_TRUNCATABLE" />
-	<keyword match="VMID" />
-	<keyword match="VoiceStatus" />
-	<keyword match="Void" />
-	<keyword match="VolatileImage" />
-	<keyword match="WCharSeqHelper" />
-	<keyword match="WCharSeqHolder" />
-	<keyword match="WeakHashMap" />
-	<keyword match="WeakReference" />
-	<keyword match="Window" />
-	<keyword match="WindowAdapter" />
-	<keyword match="WindowConstants" />
-	<keyword match="WindowEvent" />
-	<keyword match="WindowFocusListener" />
-	<keyword match="WindowListener" />
-	<keyword match="WindowStateListener" />
-	<keyword match="WrappedPlainView" />
-	<keyword match="WritableByteChannel" />
-	<keyword match="WritableRaster" />
-	<keyword match="WritableRenderedImage" />
-	<keyword match="WriteAbortedException" />
-	<keyword match="Writer" />
-	<keyword match="WrongAdapter" />
-	<keyword match="WrongAdapterHelper" />
-	<keyword match="WrongPolicy" />
-	<keyword match="WrongPolicyHelper" />
-	<keyword match="WrongTransaction" />
-	<keyword match="WrongTransactionHelper" />
-	<keyword match="WrongTransactionHolder" />
-	<keyword match="WStringSeqHelper" />
-	<keyword match="WStringSeqHolder" />
-	<keyword match="WStringValueHelper" />
-	<keyword match="X500Principal" />
-	<keyword match="X500PrivateCredential" />
-	<keyword match="X509Certificate" />
-	<keyword match="X509Certificate" />
-	<keyword match="X509CertSelector" />
-	<keyword match="X509CRL" />
-	<keyword match="X509CRLEntry" />
-	<keyword match="X509CRLSelector" />
-	<keyword match="X509EncodedKeySpec" />
-	<keyword match="X509Extension" />
-	<keyword match="X509KeyManager" />
-	<keyword match="X509TrustManager" />
-	<keyword match="XAConnection" />
-	<keyword match="XADataSource" />
-	<keyword match="XAException" />
-	<keyword match="XAResource" />
-	<keyword match="Xid" />
-	<keyword match="XMLDecoder" />
-	<keyword match="XMLEncoder" />
-	<keyword match="XMLFilter" />
-	<keyword match="XMLFilterImpl" />
-	<keyword match="XMLFormatter" />
-	<keyword match="XMLReader" />
-	<keyword match="XMLReaderAdapter" />
-	<keyword match="XMLReaderFactory" />
-	<keyword match="ZipEntry" />
-	<keyword match="ZipException" />
-	<keyword match="ZipFile" />
-	<keyword match="ZipInputStream" />
-	<keyword match="ZipOutputStream" />
-	<keyword match="ZoneView" />
-	<keyword match="_BindingIteratorImplBase" />
-	<keyword match="_BindingIteratorStub" />
-	<keyword match="_DynAnyFactoryStub" />
-	<keyword match="_DynAnyStub" />
-	<keyword match="_DynArrayStub" />
-	<keyword match="_DynEnumStub" />
-	<keyword match="_DynFixedStub" />
-	<keyword match="_DynSequenceStub" />
-	<keyword match="_DynStructStub" />
-	<keyword match="_DynUnionStub" />
-	<keyword match="_DynValueStub" />
-	<keyword match="_IDLTypeStub" />
-	<keyword match="_NamingContextExtStub" />
-	<keyword match="_NamingContextImplBase" />
-	<keyword match="_NamingContextStub" />
-	<keyword match="_PolicyStub" />
-	<keyword match="_Remote_Stub" />
-	<keyword match="_ServantActivatorStub" />
-	<keyword match="_ServantLocatorStub" />
-  </keywords>
-
-</highlight>
diff --git a/library/Text_Highlighter/javascript.xml b/library/Text_Highlighter/javascript.xml
deleted file mode 100644
index e478515a7..000000000
--- a/library/Text_Highlighter/javascript.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: javascript.xml,v 1.3 2008-01-01 23:43:36 ssttoo Exp $ -->
-
-<highlight lang="javascript" case = "no">
-
-  <authors>
-    <author name="Andrey Demenev" email ="demenev@gmail.com"/>
-  </authors>
-
-  <default innerClass="code" />
-
-  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
-    <contains all="yes"/>
-  </region>
-
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
-    <contains all="yes"/>
-  </region>
-
-  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
-    <contains all="yes"/>
-  </region>
-
-
-  <region name="mlcomment" innerClass="comment" start="\/\*" end="\*\/" >
-    <contains block="cvstag"/>
-  </region>
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;"/>
-
-  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'" />
-
-  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
-    <onlyin region="strsingle"/>
-  </block>
-
-  <block name="descaped" match="\\\\|\\&quot;|\\'|\\`|\\t|\\n|\\r" innerClass="special" contained="yes">
-    <onlyin region="strdouble"/>
-  </block>
-
-  <region name="comment" start="\/\/" end="/$/m" innerClass="comment">
-    <contains block="cvstag"/>
-  </region>
-
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
-
-  <block name="number" match="0x\d*|\d*\.?\d+" innerClass="number"/>
-
-
-  <block name="url" match="((https?|ftp):\/\/[\w\?\.\-\&amp;=\/%+]+)|(^|[\s,!?])www\.\w+\.\w+[\w\?\.\&amp;=\/%+]*" innerClass="url" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-
-  <block name="email" match="\w+[\.\w\-]+@(\w+[\.\w\-])+" innerClass="url" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-
-  <block name="note" match="\b(note|fixme):" innerClass="inlinedoc" contained="yes" case="no">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-
-
-  <block name="cvstag" match="\$\w+:.+\$" innerClass="inlinedoc" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-
-  <keywords name="builtin" inherits="identifier" innerClass="builtin" case = "yes">
-    <keyword match="String"/>
-    <keyword match="Array"/>
-    <keyword match="RegExp"/>
-    <keyword match="Function"/>
-    <keyword match="Math"/>
-    <keyword match="Number"/>
-    <keyword match="Date"/>
-    <keyword match="Image"/>
-    <keyword match="window"/>
-    <keyword match="document"/>
-    <keyword match="navigator"/>
-    <keyword match="onAbort"/>
-    <keyword match="onBlur"/>
-    <keyword match="onChange"/>
-    <keyword match="onClick"/>
-    <keyword match="onDblClick"/>
-    <keyword match="onDragDrop"/>
-    <keyword match="onError"/>
-    <keyword match="onFocus"/>
-    <keyword match="onKeyDown"/>
-    <keyword match="onKeyPress"/>
-    <keyword match="onKeyUp"/>
-    <keyword match="onLoad"/>
-    <keyword match="onMouseDown"/>
-    <keyword match="onMouseOver"/>
-    <keyword match="onMouseOut"/>
-    <keyword match="onMouseMove"/>
-    <keyword match="onMouseUp"/>
-    <keyword match="onMove"/>
-    <keyword match="onReset"/>
-    <keyword match="onResize"/>
-    <keyword match="onSelect"/>
-    <keyword match="onSubmit"/>
-    <keyword match="onUnload"/>
-  </keywords>
-
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
-    <keyword match="break"/>
-    <keyword match="continue"/>
-    <keyword match="do"/>
-    <keyword match="while"/>
-    <keyword match="do"/>
-    <keyword match="export"/>
-    <keyword match="for"/>
-    <keyword match="in"/>
-    <keyword match="if"/>
-    <keyword match="else"/>
-    <keyword match="import"/>
-    <keyword match="return"/>
-    <keyword match="label"/>
-    <keyword match="switch"/>
-    <keyword match="case"/>
-    <keyword match="var"/>
-    <keyword match="with"/>
-    <keyword match="delete"/>
-    <keyword match="new"/>
-    <keyword match="this"/>
-    <keyword match="typeof"/>
-    <keyword match="void"/>
-    <keyword match="abstract"/>
-    <keyword match="boolean"/>
-    <keyword match="byte"/>
-    <keyword match="catch"/>
-    <keyword match="char"/>
-    <keyword match="class"/>
-    <keyword match="const"/>
-    <keyword match="continue"/>
-    <keyword match="debugger"/>
-    <keyword match="default"/>
-    <keyword match="double"/>
-    <keyword match="enum"/>
-    <keyword match="extends"/>
-    <keyword match="false"/>
-    <keyword match="final"/>
-    <keyword match="finally"/>
-    <keyword match="float"/>
-    <keyword match="function"/>
-    <keyword match="implements"/>
-    <keyword match="goto"/>
-    <keyword match="in"/>
-    <keyword match="instanceof"/>
-    <keyword match="int"/>
-    <keyword match="interface"/>
-    <keyword match="long"/>
-    <keyword match="native"/>
-    <keyword match="null"/>
-    <keyword match="package"/>
-    <keyword match="private"/>
-    <keyword match="protected"/>
-    <keyword match="public"/>
-    <keyword match="short"/>
-    <keyword match="static"/>
-    <keyword match="super"/>
-    <keyword match="synchronized"/>
-    <keyword match="throw"/>
-    <keyword match="throws"/>
-    <keyword match="transient"/>
-    <keyword match="true"/>
-    <keyword match="try"/>
-    <keyword match="volatile"/>
-  </keywords>
-
-</highlight>
diff --git a/library/Text_Highlighter/mysql.xml b/library/Text_Highlighter/mysql.xml
deleted file mode 100644
index 082b62795..000000000
--- a/library/Text_Highlighter/mysql.xml
+++ /dev/null
@@ -1,424 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: mysql.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="mysql" case="no">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-
-  <default innerClass="code" />
-
-  <region name="qidentifier" delimClass="quotes" innerClass="identifier" 
-          start="`" end="`" />
-
-  <region name="mlcomment" delimClass="comment" innerClass="comment" 
-          start="\/\*" end="\*\/" />
-
-  <block name="comment" match="(#|--\s).*" innerClass="comment" />
-
-  <block name="possiblefunction" match="[a-z_]\w*(?=\s*\()" innerClass="identifier" />
-
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" 
-          start="&quot;" end="&quot;" >
-  </region>
-  
-  <region name="brackets" delimClass="brackets" innerClass="code" 
-          start="\(" end="\)" >
-    <contains all="yes"/>
-  </region>
-
-  <region name="strsingle" delimClass="quotes" innerClass="string" 
-          start="'" end="'" />
-
-  <block name="escaped" match="\\." innerClass="special" contained="yes">
-    <onlyin region="strsingle"/>
-    <onlyin region="strdouble"/>
-  </block>
-
-  <block name="exponent" 
-         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
-         innerClass="number" />
-
-  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
-
-  <block name="integer" match="\d+l?|\b0l?\b" innerClass="number" />
-
-  <block name="hexinteger" match="0[xX][\da-f]+l?" innerClass="number" />
-
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" 
-            case="no">
-    <keyword match="action" />
-    <keyword match="add" />
-    <keyword match="aggregate" />
-    <keyword match="all" />
-    <keyword match="alter" />
-    <keyword match="after" />
-    <keyword match="and" />
-    <keyword match="as" />
-    <keyword match="asc" />
-    <keyword match="avg" />
-    <keyword match="avg_row_length" />
-    <keyword match="auto_increment" />
-    <keyword match="between" />
-    <keyword match="bigint" />
-    <keyword match="bit" />
-
-    <keyword match="binary" />
-    <keyword match="blob" />
-    <keyword match="bool" />
-    <keyword match="both" />
-    <keyword match="by" />
-    <keyword match="cascade" />
-    <keyword match="case" />
-    <keyword match="char" />
-    <keyword match="character" />
-    <keyword match="change" />
-    <keyword match="check" />
-    <keyword match="checksum" />
-    <keyword match="column" />
-    <keyword match="columns" />
-    <keyword match="comment" />
-    <keyword match="constraint" />
-    <keyword match="create" />
-
-    <keyword match="cross" />
-    <keyword match="current_date" />
-    <keyword match="current_time" />
-    <keyword match="current_timestamp" />
-    <keyword match="data" />
-    <keyword match="database" />
-    <keyword match="databases" />
-    <keyword match="date" />
-    <keyword match="datetime" />
-    <keyword match="day" />
-    <keyword match="day_hour" />
-    <keyword match="day_minute" />
-    <keyword match="day_second" />
-    <keyword match="dayofmonth" />
-    <keyword match="dayofweek" />
-    <keyword match="dayofyear" />
-    <keyword match="dec" />
-
-    <keyword match="decimal" />
-    <keyword match="default" />
-    <keyword match="delayed" />
-    <keyword match="delay_key_write" />
-    <keyword match="delete" />
-    <keyword match="desc" />
-    <keyword match="describe" />
-    <keyword match="distinct" />
-    <keyword match="distinctrow" />
-    <keyword match="double" />
-    <keyword match="drop" />
-    <keyword match="end" />
-    <keyword match="else" />
-    <keyword match="escape" />
-    <keyword match="escaped" />
-    <keyword match="enclosed" />
-    <keyword match="enum" />
-
-    <keyword match="explain" />
-    <keyword match="exists" />
-    <keyword match="fields" />
-    <keyword match="file" />
-    <keyword match="first" />
-    <keyword match="float" />
-    <keyword match="float4" />
-    <keyword match="float8" />
-    <keyword match="flush" />
-    <keyword match="foreign" />
-    <keyword match="from" />
-    <keyword match="for" />
-    <keyword match="full" />
-    <keyword match="function" />
-    <keyword match="global" />
-    <keyword match="grant" />
-    <keyword match="grants" />
-
-    <keyword match="group" />
-    <keyword match="having" />
-    <keyword match="heap" />
-    <keyword match="high_priority" />
-    <keyword match="hour" />
-    <keyword match="hour_minute" />
-    <keyword match="hour_second" />
-    <keyword match="hosts" />
-    <keyword match="identified" />
-    <keyword match="ignore" />
-    <keyword match="in" />
-    <keyword match="index" />
-    <keyword match="infile" />
-    <keyword match="inner" />
-    <keyword match="insert" />
-    <keyword match="insert_id" />
-    <keyword match="int" />
-
-    <keyword match="integer" />
-    <keyword match="interval" />
-    <keyword match="int1" />
-    <keyword match="int2" />
-    <keyword match="int3" />
-    <keyword match="int4" />
-    <keyword match="int8" />
-    <keyword match="into" />
-    <keyword match="if" />
-    <keyword match="is" />
-    <keyword match="isam" />
-    <keyword match="join" />
-    <keyword match="key" />
-    <keyword match="keys" />
-    <keyword match="kill" />
-    <keyword match="last_insert_id" />
-    <keyword match="leading" />
-
-    <keyword match="left" />
-    <keyword match="length" />
-    <keyword match="like" />
-    <keyword match="lines" />
-    <keyword match="limit" />
-    <keyword match="load" />
-    <keyword match="local" />
-    <keyword match="lock" />
-    <keyword match="logs" />
-    <keyword match="long" />
-    <keyword match="longblob" />
-    <keyword match="longtext" />
-    <keyword match="low_priority" />
-    <keyword match="max" />
-    <keyword match="max_rows" />
-    <keyword match="match" />
-    <keyword match="mediumblob" />
-
-    <keyword match="mediumtext" />
-    <keyword match="mediumint" />
-    <keyword match="middleint" />
-    <keyword match="min_rows" />
-    <keyword match="minute" />
-    <keyword match="minute_second" />
-    <keyword match="modify" />
-    <keyword match="month" />
-    <keyword match="monthname" />
-    <keyword match="myisam" />
-    <keyword match="natural" />
-    <keyword match="numeric" />
-    <keyword match="no" />
-    <keyword match="not" />
-    <keyword match="null" />
-    <keyword match="on" />
-    <keyword match="optimize" />
-
-    <keyword match="option" />
-    <keyword match="optionally" />
-    <keyword match="or" />
-    <keyword match="order" />
-    <keyword match="outer" />
-    <keyword match="outfile" />
-    <keyword match="pack_keys" />
-    <keyword match="partial" />
-    <keyword match="password" />
-    <keyword match="precision" />
-    <keyword match="primary" />
-    <keyword match="procedure" />
-    <keyword match="process" />
-    <keyword match="processlist" />
-    <keyword match="privileges" />
-    <keyword match="read" />
-    <keyword match="real" />
-
-    <keyword match="references" />
-    <keyword match="reload" />
-    <keyword match="regexp" />
-    <keyword match="rename" />
-    <keyword match="replace" />
-    <keyword match="restrict" />
-    <keyword match="returns" />
-    <keyword match="revoke" />
-    <keyword match="rlike" />
-    <keyword match="row" />
-    <keyword match="rows" />
-    <keyword match="second" />
-    <keyword match="select" />
-    <keyword match="set" />
-    <keyword match="show" />
-    <keyword match="shutdown" />
-    <keyword match="smallint" />
-
-    <keyword match="soname" />
-    <keyword match="sql_big_tables" />
-    <keyword match="sql_big_selects" />
-    <keyword match="sql_low_priority_updates" />
-    <keyword match="sql_log_off" />
-    <keyword match="sql_log_update" />
-    <keyword match="sql_select_limit" />
-    <keyword match="sql_small_result" />
-    <keyword match="sql_big_result" />
-    <keyword match="sql_warnings" />
-    <keyword match="straight_join" />
-    <keyword match="starting" />
-    <keyword match="status" />
-    <keyword match="string" />
-    <keyword match="table" />
-    <keyword match="tables" />
-    <keyword match="temporary" />
-
-    <keyword match="terminated" />
-    <keyword match="text" />
-    <keyword match="then" />
-    <keyword match="time" />
-    <keyword match="timestamp" />
-    <keyword match="tinyblob" />
-    <keyword match="tinytext" />
-    <keyword match="tinyint" />
-    <keyword match="trailing" />
-    <keyword match="to" />
-    <keyword match="type" />
-    <keyword match="use" />
-    <keyword match="using" />
-    <keyword match="unique" />
-    <keyword match="unlock" />
-    <keyword match="unsigned" />
-    <keyword match="update" />
-
-    <keyword match="usage" />
-    <keyword match="values" />
-    <keyword match="varchar" />
-    <keyword match="variables" />
-    <keyword match="varying" />
-    <keyword match="varbinary" />
-    <keyword match="with" />
-    <keyword match="write" />
-    <keyword match="when" />
-    <keyword match="where" />
-    <keyword match="year" />
-    <keyword match="year_month" />
-    <keyword match="zerofill" />
-  </keywords> 
-
-  <keywords name="function" inherits="possiblefunction" innerClass="reserved"
-            case="no" otherwise="identifier">
-    <keyword match="ABS" />
-    <keyword match="ACOS" />
-    <keyword match="ADDDATE" />
-    <keyword match="ASCII" />
-    <keyword match="ASIN" />
-    <keyword match="ATAN" />
-    <keyword match="ATAN2" />
-    <keyword match="AVG" />
-    <keyword match="BENCHMARK" />
-    <keyword match="BIN" />
-    <keyword match="CEILING" />
-    <keyword match="CHAR" />
-    <keyword match="COALESCE" />
-    <keyword match="CONCAT" />
-    <keyword match="CONV" />
-    <keyword match="COS" />
-    <keyword match="COT" />
-    <keyword match="COUNT" />
-    <keyword match="CURDATE" />
-    <keyword match="CURTIME" />
-    <keyword match="DATABASE" />
-    <keyword match="DAYNAME" />
-    <keyword match="DAYOFMONTH" />
-    <keyword match="DAYOFWEEK" />
-    <keyword match="DAYOFYEAR" />
-    <keyword match="DECODE" />
-    <keyword match="DEGREES" />
-    <keyword match="ELT" />
-
-    <keyword match="ENCODE" />
-    <keyword match="ENCRYPT" />
-    <keyword match="EXP" />
-    <keyword match="EXTRACT" />
-
-    <keyword match="EXTRACT" />
-    <keyword match="FIELD" />
-    <keyword match="FLOOR" />
-    <keyword match="FORMAT" />
-    <keyword match="GREATEST" />
-    <keyword match="HEX" />
-    <keyword match="HOUR" />
-    <keyword match="IF" />
-    <keyword match="IFNULL" />
-    <keyword match="INSERT" />
-    <keyword match="INSTR" />
-    <keyword match="INTERVAL" />
-
-    <keyword match="ISNULL" />
-    <keyword match="LCASE" />
-    <keyword match="LEAST" />
-    <keyword match="LEFT" />
-    <keyword match="LENGTH" />
-    <keyword match="LOCATE" />
-
-    <keyword match="LOCATE" />
-    <keyword match="LOG" />
-    <keyword match="LOG10" />
-    <keyword match="LOWER" />
-    <keyword match="LPAD" />
-    <keyword match="LTRIM" />
-    <keyword match="MAX" />
-    <keyword match="MD5" />
-    <keyword match="MID" />
-    <keyword match="MIN" />
-
-    <keyword match="MINUTE" />
-    <keyword match="MOD" />
-    <keyword match="MONTH" />
-    <keyword match="MONTHNAME" />
-    <keyword match="NOW" />
-    <keyword match="NULLIF" />
-    <keyword match="OCT" />
-    <keyword match="ORD" />
-    <keyword match="PASSWORD" />
-    <keyword match="PI" />
-    <keyword match="POSITION" />
-
-    <keyword match="POW" />
-    <keyword match="POWER" />
-    <keyword match="prepare" />
-    <keyword match="QUARTER" />
-    <keyword match="RADIANS" />
-    <keyword match="RAND" />
-    <keyword match="REPEAT" />
-    <keyword match="REPLACE" />
-    <keyword match="REVERSE" />
-    <keyword match="RIGHT" />
-    <keyword match="ROUND" />
-
-    <keyword match="ROUND" />
-    <keyword match="RPAD" />
-
-    <keyword match="RTRIM" />
-    <keyword match="SECOND" />
-    <keyword match="SIGN" />
-    <keyword match="SIN" />
-    <keyword match="SOUNDEX" />
-    <keyword match="SPACE" />
-    <keyword match="SQRT" />
-    <keyword match="STD" />
-    <keyword match="STDDEV" />
-    <keyword match="STRCMP" />
-    <keyword match="SUBDATE" />
-    <keyword match="SUBSTRING" />
-
-    <keyword match="SUBSTRING" />
-    <keyword match="SUM" />
-    <keyword match="SYSDATE" />
-    <keyword match="TAN" />
-
-    <keyword match="TRIM" />
-    <keyword match="TRUNCATE" />
-    <keyword match="UCASE" />
-    <keyword match="UPPER" />
-    <keyword match="USER" />
-    <keyword match="VERSION" />
-    <keyword match="WEEK" />
-    <keyword match="WEEKDAY" />
-    <keyword match="YEAR" />
-  </keywords> 
-
-</highlight>
diff --git a/library/Text_Highlighter/perl.xml b/library/Text_Highlighter/perl.xml
deleted file mode 100644
index 54f8835ea..000000000
--- a/library/Text_Highlighter/perl.xml
+++ /dev/null
@@ -1,439 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: perl.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="perl" case = "yes">
-
-  <authors>
-    <author name="Mariusz 'kg' Jakubowski" email="kg@alternatywa.info" jid="kg@chrome.pl"/>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-  <comment>This highlighter is EXPERIMENTAL, so that it may work incorrectly. 
-Most rules were created by Mariusz Jakubowski, and extended by me.
-My  knowledge  of  Perl  is  poor,  and  Perl  syntax  seems  too
-complicated to me.</comment>
-
-  <default innerClass="code"/>
-
-  <block name="interpreter" match="/^(#!)(.*)/m" innerClass="special">
-   <partClass index="1" innerClass="special" />
-   <partClass index="2" innerClass="string" />
-  </block>
-
-  <region name="pod" innerClass="comment" start="/^=\w+/m" end="/^=cut[^\n]*/m" startBOL="yes" endBOL="yes"/>
-
-  <!-- 
-  brackets 
-  -->
-  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
-    <contains all="yes"/>
-  </region>
-
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
-    <contains all="yes"/>
-  </region>
-
-  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
-    <contains all="yes"/>
-  </region>
-
-  <!-- 
-  use smth 
-  -->
-  <block name="usestatement" match="(use)\s+([\w:]*)" innerClass="special">
-   <partClass index="1" innerClass="reserved" />
-   <partClass index="2" innerClass="special" />
-  </block>
-  
-  <block name="packagereference" match="[&amp; ](\w{2,}::)+\w{2,}" innerClass="special"/>
-
-  <region name="q-w-q-statement" 
-    start="/\b(q[wq]\s*((\{)|(\()|(\[)|(\&lt;)|([\W\S])))(?=(.*)((?(3)\})(?(4)\))(?(5)\])(?(6)\&gt;)(?(7)\7)))/Us"
-    end="%b2%"
-    innerClass="string" delimClass="quotes" remember="yes">
-
-    <contains block="containedvar"/>
-    <contains block="specialvar"/>
-    <contains block="curlyvar"/>
-
-  </region>
-
-  <region name="qstatement" 
-    start="/\b(q\s*((\{)|(\()|(\[)|(\&lt;)|([\W\S])))(?=(.*)((?(3)\})(?(4)\))(?(5)\])(?(6)\&gt;)(?(7)\7)))/Us"
-    end="%b2%"
-    innerClass="string" delimClass="quotes" remember="yes">
-
-  </region>
-
-  <!-- 
-  comments 
-  -->
-  <block name="comment" match="#.*" innerClass="comment" />
-  
-  
-  <!-- 
-  regexpr
-  FIXME: this should be rewrited
-  -->
-  <block name="dblregexprver1" match="/(s|tr) ([|#~`!@$%^&amp;*-+=\\;:'&quot;,.\/?])  ((\\.|[^\\])*?) (\2)((\\.|[^\\])*?)(\2[ecgimosx]*)/x" innerClass="string">
-   <partClass index="1" innerClass="quotes" />
-   <partClass index="2" innerClass="quotes" />
-   <partClass index="3" innerClass="string" />
-   <partClass index="5" innerClass="quotes" />
-   <partClass index="6" innerClass="string" />
-   <partClass index="8" innerClass="quotes" />
-  </block>
-  
-  <block name="dblregexprver2" match="/(m) ([|#~`!@$%^&amp;*-+=\\;:'&quot;,.\/?])  ((\\.|[^\\])*?) (\2[ecgimosx]*)/x" innerClass="string">
-   <partClass index="1" innerClass="quotes" />
-   <partClass index="2" innerClass="quotes" />
-   <partClass index="3" innerClass="string" />
-   <partClass index="5" innerClass="quotes" />
-  </block>
-  
-
-  <region name="regexp" start=" \/" end="\/[cgimosx]*" innerClass="string" delimClass="quotes" case="yes">
-    <contains block="reescaped"/>
-  </region> 
-  
-  <block name="reescaped" match="\\\/" innerClass="string" contained="yes">
-    <onlyin region="regexp"/>
-  </block> 
-  
-  <!-- 
-  variables 
-  FIXME: @{...} 
-  -->
-  <block name="bracketsvars" match="([a-z1-9_]+)(\s*=>)" innerClass="string" contained="yes" case="no">
-    <partClass index="1" innerClass="string" />
-    <partClass index="2" innerClass="code" />
-    <onlyin region="brackets"/>
-  </block>
-
-  <block name="specialvar" match="\$#?[1-9'`@!]" innerClass="var"/>
-  
-  <block name="var" match="(\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\^(?-i)[A-Z]?(?i))" innerClass="var" case="no"/>
-  <block name="containedvar" match="\$([a-z1-9_]+|\^(?-i)[A-Z]?(?i))" innerClass="var" case="no"/>
-
-  <!-- not shure what is this, but the Perlers do it :) -->
-  <block name="var2" match="(&amp;|\w+)'[\w_']+\b" innerClass="var" case="no"/>
-
-  <block name="classvar" match="(\{)([a-z1-9]+)(\})" innerClass="var" case="no">
-   <partClass index="1" innerClass="brackets" />
-   <partClass index="2" innerClass="var" />
-   <partClass index="3" innerClass="brackets" />
-  </block>
-
-  <block name="curlyvar" match="[\$@%]#?\{[a-z1-9]+\}" innerClass="var" case="no"/>
-
-  <!-- 
-  quotes
-  -->
-  <region name="exec" delimClass="quotes" innerClass="string" start="`" end="`">
-    <contains block="containedvar"/>
-    <contains block="specialvar"/>
-    <contains block="curlyvar"/>
-  </region>
-
-  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'"/>
-
-  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
-    <onlyin region="qstatement"/>
-    <onlyin region="strsingle"/>
-    <onlyin region="exec"/>
-  </block>
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;">
-    <contains block="containedvar"/>
-    <contains block="specialvar"/>
-    <contains block="curlyvar"/>
-  </region>
-
-  <block name="descaped" match="\\[\\&quot;'`tnr\$\{@]" innerClass="special" contained="yes">
-    <onlyin region="strdouble"/>
-    <onlyin region="q-w-q-statement"/>
-  </block>
- 
-  <!-- logical op. 
-  <block name="logic" match="\|\||&amp;&amp;" innerClass="reserved" contained="yes"/>-->
- 
-  <!-- 
-  identifiers 
-  -->
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
-
-  <!-- 
-  numbers 
-  -->
-  <block name="number" match="\d*\.?\d+" innerClass="number"/>
-
-  <!-- 
-  http://www.perldoc.com/perl5.6/pod/perlfunc.html 
-  Alphabetical Listing of Perl Functions 
-  -->
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
-      <keyword match="abs"/>
-      <keyword match="accept"/>
-      <keyword match="alarm"/>
-      <keyword match="atan2"/>
-      
-      <keyword match="bind"/>
-      <keyword match="binmode"/>
-      <keyword match="bless"/>
-      
-      <keyword match="caller"/>
-      <keyword match="chdir"/>
-      <keyword match="chmod"/>
-      <keyword match="chomp"/>
-      <keyword match="chop"/>
-      <keyword match="chown"/>
-      <keyword match="chr"/>
-      <keyword match="chroot"/>
-      <keyword match="close"/>
-      <keyword match="closedir"/>
-      <keyword match="connect"/>
-      <keyword match="continue"/>
-      <keyword match="cos"/>
-      <keyword match="crypt"/>
-
-      <keyword match="dbmclose"/>
-      <keyword match="dbmopen"/>
-      <keyword match="defined"/>
-      <keyword match="delete"/>
-      <keyword match="die"/>
-      <keyword match="do"/>
-      <keyword match="dump"/>
-      
-      <keyword match="each"/>
-      <keyword match="endgrent"/>
-      <keyword match="endhostent"/>
-      <keyword match="endnetent"/>
-      <keyword match="endprotoent"/>
-      <keyword match="endpwent"/>
-      <keyword match="endservent"/>
-      <keyword match="eof"/>
-      <keyword match="eval"/>
-      <keyword match="exec"/>
-      <keyword match="exists"/>
-      <keyword match="exit"/>
-      <keyword match="exp"/>
-      
-      <keyword match="fcntl"/>
-      <keyword match="fileno"/>
-      <keyword match="flock"/>
-      <keyword match="fork"/>
-      <keyword match="format"/>
-      <keyword match="formline"/>
-      
-      <keyword match="getc"/>
-      <keyword match="getgrent"/>
-      <keyword match="getgrgid"/>
-      <keyword match="getgrnam"/>
-      <keyword match="gethostbyaddr"/>
-      <keyword match="gethostbyname"/>
-      <keyword match="gethostent"/>
-      <keyword match="getlogin"/>
-      <keyword match="getnetbyaddr"/>
-      <keyword match="getnetbyname"/>
-      <keyword match="getnetent"/>
-      <keyword match="getpeername"/>
-      <keyword match="getpgrp"/>
-      <keyword match="getppid"/>
-      <keyword match="getpriority"/>
-      <keyword match="getprotobyname"/>
-      <keyword match="getprotobynumber"/>
-      <keyword match="getprotoent"/>
-      <keyword match="getpwent"/>
-      <keyword match="getpwnam"/>
-      <keyword match="getpwuid"/>
-      <keyword match="getservbyname"/>
-      <keyword match="getservbyport"/>
-      <keyword match="getservent"/>
-      <keyword match="getsockname"/>
-      <keyword match="getsockopt"/>
-      <keyword match="glob"/>
-      <keyword match="gmtime"/>
-      <keyword match="goto"/>
-      <keyword match="grep"/>
-      
-      <keyword match="hex"/>
-      
-      <keyword match="import"/>
-      <keyword match="index"/>
-      <keyword match="int"/>
-      <keyword match="ioctl"/>
-      
-      <keyword match="join"/>
-      
-      <keyword match="keys"/>
-      <keyword match="kill"/>
-      
-      <keyword match="last"/>
-      <keyword match="lc"/>
-      <keyword match="lcfirst"/>
-      <keyword match="length"/>
-      <keyword match="link"/>
-      <keyword match="listen"/>
-      <keyword match="local"/>
-      <keyword match="localtime"/>
-      <keyword match="lock"/>
-      <keyword match="log"/>
-      <keyword match="lstat"/>
-      
-      <!--<keyword match="m"/>-->
-      <keyword match="map"/>
-      <keyword match="mkdir"/>
-      <keyword match="msgctl"/>
-      <keyword match="msgget"/>
-      <keyword match="msgrcv"/>
-      <keyword match="msgsnd"/>
-      <keyword match="my"/>
-      
-      <keyword match="next"/>
-      <keyword match="no"/>
-      
-      <keyword match="oct"/>
-      <keyword match="open"/>
-      <keyword match="opendir"/>
-      <keyword match="ord"/>
-      <keyword match="our"/>
-      
-      <keyword match="pack"/>
-      <keyword match="package"/>
-      <keyword match="pipe"/>
-      <keyword match="pop"/>
-      <keyword match="pos"/>
-      <keyword match="print"/>
-      <keyword match="printf"/>
-      <keyword match="prototype"/>
-      <keyword match="push"/>
-      
-      <!--<keyword match="q"/>
-      <keyword match="qq"/>
-      <keyword match="qr"/>-->
-      <keyword match="quotemeta"/>
-      <!--<keyword match="qw"/>
-      <keyword match="qx"/>-->
-      
-      <keyword match="rand"/>
-      <keyword match="read"/>
-      <keyword match="readdir"/>
-      <keyword match="readline"/>
-      <keyword match="readlink"/>
-      <keyword match="readpipe"/>
-      <keyword match="recv"/>
-      <keyword match="redo"/>
-      <keyword match="ref"/>
-      <keyword match="rename"/>
-      <keyword match="require"/>
-      <keyword match="reset"/>
-      <keyword match="return"/>
-      <keyword match="reverse"/>
-      <keyword match="rewinddir"/>
-      <keyword match="rindex"/>
-      <keyword match="rmdir"/>
-      
-      <!--<keyword match="s"/>-->
-      <keyword match="scalar"/>
-      <keyword match="seek"/>
-      <keyword match="seekdir"/>
-      <keyword match="select"/>
-      <keyword match="semctl"/>
-      <keyword match="semget"/>
-      <keyword match="semop"/>
-      <keyword match="send"/>
-      <keyword match="setgrent"/>
-      <keyword match="sethostent"/>
-      <keyword match="setnetent"/>
-      <keyword match="setpgrp"/>
-      <keyword match="setpriority"/>
-      <keyword match="setprotoent"/>
-      <keyword match="setpwent"/>
-      <keyword match="setservent"/>
-      <keyword match="setsockopt"/>
-      <keyword match="shift"/>
-      <keyword match="shmctl"/>
-      <keyword match="shmget"/>
-      <keyword match="shmread"/>
-      <keyword match="shmwrite"/>
-      <keyword match="shutdown"/>
-      <keyword match="sin"/>
-      <keyword match="sleep"/>
-      <keyword match="socket"/>
-      <keyword match="socketpair"/>
-      <keyword match="sort"/>
-      <keyword match="splice"/>
-      <keyword match="split"/>
-      <keyword match="sprintf"/>
-      <keyword match="sqrt"/>
-      <keyword match="srand"/>
-      <keyword match="stat"/>
-      <keyword match="study"/>
-      <keyword match="sub"/>
-      <keyword match="substr"/>
-      <keyword match="symlink"/>
-      <keyword match="syscall"/>
-      <keyword match="sysopen"/>
-      <keyword match="sysread"/>
-      <keyword match="sysseek"/>
-      <keyword match="system"/>
-      <keyword match="syswrite"/>
-      
-      <keyword match="tell"/>
-      <keyword match="telldir"/>
-      <keyword match="tie"/>
-      <keyword match="tied"/>
-      <keyword match="time"/>
-      <keyword match="times"/>
-      <!--<keyword match="tr"/>-->
-      <keyword match="truncate"/>
-      
-      <keyword match="uc"/>
-      <keyword match="ucfirst"/>
-      <keyword match="umask"/>
-      <keyword match="undef"/>
-      <keyword match="unlink"/>
-      <keyword match="unpack"/>
-      <keyword match="unshift"/>
-      <keyword match="untie"/>
-      <keyword match="use"/>
-      <keyword match="utime"/>
-      
-      <keyword match="values"/>
-      <keyword match="vec"/>
-      
-      <keyword match="wait"/>
-      <keyword match="waitpid"/>
-      <keyword match="wantarray"/>
-      <keyword match="warn"/>
-      <keyword match="write"/>
-      
-      <keyword match="y"/> 
-  </keywords> 
-
-  <keywords name="missingreserved" inherits="identifier" innerClass="reserved" case = "yes">
-      <keyword match="new"/> 
-  </keywords> 
-
-
-  <keywords name="flowcontrol" inherits="identifier" innerClass="reserved" case = "yes">
-      <keyword match="if"/> 
-      <keyword match="else"/> 
-      <keyword match="elsif"/> 
-      <keyword match="while"/> 
-      <keyword match="unless"/> 
-      <keyword match="for"/> 
-      <keyword match="foreach"/> 
-      <keyword match="until"/> 
-      <keyword match="do"/> 
-      <keyword match="continue"/> 
-      <keyword match="not"/> 
-      <keyword match="or"/> 
-      <keyword match="and"/> 
-      <keyword match="eq"/> 
-      <keyword match="ne"/> 
-      <keyword match="gt"/> 
-      <keyword match="lt"/> 
-  </keywords> 
-
-</highlight>
diff --git a/library/Text_Highlighter/php.xml b/library/Text_Highlighter/php.xml
deleted file mode 100644
index 1b08ea203..000000000
--- a/library/Text_Highlighter/php.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: php.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="php">
-
-  <authors>
-    <author name="Andrey Demenev" email ="demenev@gmail.com"/>
-  </authors>
-
-
-  <default innerClass="code" />
-
-  <region name="phpCode" delimClass="inlinetags" innerClass="code"
-          start="\&lt;\?(php|=)?" end="\?\>" never-contained="yes">
-    <contains all="yes"/>
-  </region>
-
-  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}" contained="yes">
-    <contains all="yes"/>
-  </region>
-
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)" contained="yes" >
-    <contains all="yes"/>
-  </region>
-
-  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]" contained="yes">
-    <contains all="yes"/>
-  </region>
-
-
-  <region name="mlcomment" innerClass="comment" start="\/\*" end="\*\/" contained="yes">
-    <contains block="phpdoc"/>
-    <contains block="cvstag"/>
-  </region>
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;" contained="yes">
-    <contains block="var"/>
-  </region>
-
-  <region name="exec" delimClass="quotes" innerClass="string" start="`" end="`" contained="yes">
-    <contains block="var"/>
-  </region>
-
-  <region name="heredoc" delimClass="quotes" innerClass="string" start="/\&lt;\&lt;\&lt;[\x20\x09]*(\w+)$/m" end="/^%1%;?$/m" contained="yes" remember="yes">
-    <contains block="var"/>
-  </region>
-
-  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'" contained="yes"/>
-
-  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
-    <onlyin region="strsingle"/>
-    <onlyin region="exec"/>
-  </block>
-
-  <block name="descaped" match="\\[\\&quot;'`tnr\$\{]" innerClass="special" contained="yes">
-    <onlyin region="strdouble"/>
-    <onlyin region="heredoc"/>
-  </block>
-
-
-  <region name="comment" start="(#|\/\/)" end="/$|(?=\?\>)/m" innerClass="comment" contained="yes">
-    <contains block="cvstag"/>
-  </region>
-
-
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" contained="yes"/>
-
-  <block name="typecast" match="\((array|int|integer|string|bool|boolean|object|float|double)\)" innerClass="reserved" contained="yes"/>
-
-  <block name="curlyvar" match="\{\$[a-z_].*\}" innerClass="var" contained="yes">
-    <onlyin region="strdouble"/>
-    <onlyin region="heredoc"/>
-    <onlyin region="exec"/>
-  </block>
-
-  <region name="codeescape" delimClass="inlinetags" innerClass="default" end="\&lt;\?(php|=)?" start="\?\>" contained="yes">
-    <onlyin region="block"/>
-  </region>
-
-  <block name="hexinteger" match="0[xX][\da-f]+" innerClass="number" contained="yes"/>
-  <block name="var" match="\$[a-z_]\w*" innerClass="var" contained="yes"/>
-
-  <block name="integer" match="\d\d*|\b0\b" innerClass="number" contained="yes"/>
-
-
-  <block name="octinteger" match="0[0-7]+" innerClass="number" contained="yes"/>
-
-  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number" contained="yes"/>
-
-  <block name="exponent" 
-         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
-         innerClass="number" contained="yes"/>
-
-  <block name="phpdoc" match="\s@\w+\s" innerClass="inlinedoc" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-
-  <block name="url" match="((https?|ftp):\/\/[\w\?\.\-\&amp;=\/%+]+)|(^|[\s,!?])www\.\w+\.\w+[\w\?\.\&amp;=\/%+]*" innerClass="url" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-  
-  <block name="email" match="\w+[\.\w\-]+@(\w+[\.\w\-])+" innerClass="url" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-  
-  <block name="note" match="\bnote:" innerClass="inlinedoc" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-  
-
-  <block name="cvstag" match="\$\w+\s*:.*\$" innerClass="inlinedoc" contained="yes">
-    <onlyin region="mlcomment"/>
-    <onlyin region="comment"/>
-  </block>
-
-  <keywords name="constants" inherits="identifier" innerClass="reserved" case = "yes">
-    <keyword match="DIRECTORY_SEPARATOR"/>
-    <keyword match="PATH_SEPARATOR"/>
-  </keywords> 
-
-  <keywords name="reserved" inherits="identifier" innerClass="reserved">
-    <keyword match="echo"/>
-    <keyword match="foreach"/>
-    <keyword match="else"/>
-    <keyword match="if"/>
-    <keyword match="elseif"/>
-    <keyword match="for"/>
-    <keyword match="as"/>
-    <keyword match="while"/>
-    <keyword match="foreach"/>
-    <keyword match="break"/>
-    <keyword match="continue"/>
-    <keyword match="class"/>
-    <keyword match="const"/>
-    <keyword match="declare"/>
-    <keyword match="switch"/>
-    <keyword match="case"/>
-    <keyword match="endfor"/>
-    <keyword match="endswitch"/>
-    <keyword match="endforeach"/>
-    <keyword match="endswitch"/>
-    <keyword match="endif"/>
-    <keyword match="array"/>
-    <keyword match="default"/>
-    <keyword match="do"/>
-    <keyword match="enddeclare"/>
-    <keyword match="eval"/>
-    <keyword match="exit"/>
-    <keyword match="die"/>
-    <keyword match="extends"/>
-    <keyword match="function"/>
-    <keyword match="global"/>
-    <keyword match="include"/>
-    <keyword match="include_once"/>
-    <keyword match="require"/>
-    <keyword match="require_once"/>
-    <keyword match="isset"/>
-    <keyword match="empty"/>
-    <keyword match="list"/>
-    <keyword match="new"/>
-    <keyword match="static"/>
-    <keyword match="unset"/>
-    <keyword match="var"/>
-    <keyword match="return"/>
-    <keyword match="try"/>
-    <keyword match="catch"/>
-    <keyword match="final"/>
-    <keyword match="throw"/>
-    <keyword match="public"/>
-    <keyword match="private"/>
-    <keyword match="protected"/>
-    <keyword match="abstract"/>
-    <keyword match="interface"/>
-    <keyword match="implements"/>
-    <keyword match="const"/>
-    <keyword match="define"/>
-    <keyword match="__FILE__"/>
-    <keyword match="__LINE__"/>
-    <keyword match="__CLASS__"/>
-    <keyword match="__METHOD__"/>
-    <keyword match="__FUNCTION__"/>
-    <keyword match="NULL"/>
-    <keyword match="true"/>
-    <keyword match="false"/>
-    <keyword match="and"/>
-    <keyword match="or"/>
-    <keyword match="xor"/>
-  </keywords> 
-
-</highlight>
diff --git a/library/Text_Highlighter/python.xml b/library/Text_Highlighter/python.xml
deleted file mode 100644
index 29e77203c..000000000
--- a/library/Text_Highlighter/python.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: python.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="python" case="no">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-  <default innerClass="code" />
-
-  <region name="strsingle3" delimClass="quotes" innerClass="string" 
-          start="'''" end="'''" />
-
-  <region name="strdouble3" delimClass="quotes" innerClass="string" 
-          start="&quot;&quot;&quot;" end="&quot;&quot;&quot;">
-  </region>
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" 
-          start="&quot;" end="&quot;" >
-  </region>
-  
-  <region name="strsingle" delimClass="quotes" innerClass="string" 
-          start="'" end="'" />
-  
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)" >
-    <contains all="yes"/>
-  </region>
-
-  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]" >
-    <contains all="yes"/>
-  </region>
-
-  <block name="escaped" match="\\." innerClass="special" contained="yes">
-    <onlyin region="strsingle"/>
-    <onlyin region="strsingle3"/>
-    <onlyin region="strdouble"/>
-    <onlyin region="strdouble3"/>
-  </block>
-
-  <block name="possiblefunction" match="[a-z_]\w*(?=\s*\()" innerClass="identifier" />
-
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
-
-  <block name="exponent" 
-         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
-         innerClass="number" />
-
-  <block name="imaginary" match="((\d*\.\d+)|(\d+\.\d*)|(\d+))j" innerClass="number"/>
-
-  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
-
-  <block name="integer" match="\d+l?|\b0l?\b" innerClass="number" />
-
-  <block name="hexinteger" match="0[xX][\da-f]+l?" innerClass="number" />
-
-  <block name="octinteger" match="0[0-7]+l?" innerClass="number" />
-
-  <block name="comment" innerClass="comment" 
-          match="#.+" />
-
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
-    <keyword match="and"/>
-    <keyword match="del"/>
-    <keyword match="for"/>
-    <keyword match="is"/>
-    <keyword match="raise"/>
-    <keyword match="assert"/>
-    <keyword match="elif"/>
-    <keyword match="from"/>
-    <keyword match="lambda"/>
-    <keyword match="return"/>
-    <keyword match="break"/>
-    <keyword match="else"/>
-    <keyword match="global"/>
-    <keyword match="not"/>
-    <keyword match="try"/>
-    <keyword match="class"/>
-    <keyword match="except"/>
-    <keyword match="if"/>
-    <keyword match="or"/>
-    <keyword match="while"/>
-    <keyword match="continue"/>
-    <keyword match="exec"/>
-    <keyword match="import"/>
-    <keyword match="pass"/>
-    <keyword match="yield"/>
-    <keyword match="def"/>
-    <keyword match="finally"/>
-    <keyword match="in"/>
-    <keyword match="print"/>
-    <keyword match="False"/>
-    <keyword match="True"/>
-    <keyword match="None"/>
-    <keyword match="NotImplemented"/>
-    <keyword match="Ellipsis"/>
-
-    <keyword match="Exception" />
-    <keyword match="SystemExit" />
-    <keyword match="StopIteration" />
-    <keyword match="StandardError" />
-    <keyword match="KeyboardInterrupt" />
-    <keyword match="ImportError" />
-    <keyword match="EnvironmentError" />
-    <keyword match="IOError" />
-    <keyword match="OSError" />
-    <keyword match="WindowsError" />
-    <keyword match="EOFError" />
-    <keyword match="RuntimeError" />
-    <keyword match="NotImplementedError" />
-    <keyword match="NameError" />
-    <keyword match="UnboundLocalError" />
-
-    <keyword match="AttributeError" />
-    <keyword match="SyntaxError" />
-    <keyword match="IndentationError" />
-    <keyword match="TabError" />
-    <keyword match="TypeError" />
-    <keyword match="AssertionError" />
-    <keyword match="LookupError" />
-    <keyword match="IndexError" />
-    <keyword match="KeyError" />
-    <keyword match="ArithmeticError" />
-    <keyword match="OverflowError" />
-    <keyword match="ZeroDivisionError" />
-    <keyword match="FloatingPointError" />
-    <keyword match="ValueError" />
-    <keyword match="UnicodeError" />
-    <keyword match="UnicodeEncodeError" />
-    <keyword match="UnicodeDecodeError" />
-
-    <keyword match="UnicodeTranslateError" />
-    <keyword match="ReferenceError" />
-    <keyword match="SystemError" />
-    <keyword match="MemoryError" />
-    <keyword match="Warning" />
-    <keyword match="UserWarning" />
-    <keyword match="DeprecationWarning" />
-    <keyword match="PendingDeprecationWarning" />
-    <keyword match="SyntaxWarning" />
-    <keyword match="OverflowWarning" />
-    <keyword match="RuntimeWarning" />
-    <keyword match="FutureWarning" />
-
-  </keywords>
-
-  <keywords name="builtin" inherits="possiblefunction" 
-            innerClass="builtin" otherwise="identifier" case = "yes"> 
-    <keyword match="__import__"/>
-
-    <keyword match="abs"/>
-    <keyword match="apply"/>
-    <keyword match="basestring"/>
-    <keyword match="bool"/>
-    <keyword match="buffer"/>
-    <keyword match="callable"/>
-    <keyword match="chr"/>
-    <keyword match="classmethod"/>
-    <keyword match="cmp"/>
-
-    <keyword match="coerce"/>
-    <keyword match="compile"/>
-    <keyword match="complex"/>
-    <keyword match="delattr"/>
-    <keyword match="dict"/>
-    <keyword match="dir"/>
-    <keyword match="divmod"/>
-    <keyword match="enumerate"/>
-    <keyword match="eval"/>
-
-    <keyword match="execfile"/>
-    <keyword match="file"/>
-    <keyword match="filter"/>
-    <keyword match="float"/>
-    <keyword match="getattr"/>
-    <keyword match="globals"/>
-    <keyword match="hasattr"/>
-    <keyword match="hash"/>
-    <keyword match="help"/>
-
-    <keyword match="hex"/>
-    <keyword match="id"/>
-    <keyword match="input"/>
-    <keyword match="int"/>
-    <keyword match="intern"/>
-    <keyword match="isinstance"/>
-    <keyword match="issubclass"/>
-    <keyword match="iter"/>
-    <keyword match="len"/>
-
-    <keyword match="list"/>
-    <keyword match="locals"/>
-    <keyword match="long"/>
-    <keyword match="map"/>
-    <keyword match="max"/>
-    <keyword match="min"/>
-    <keyword match="object"/>
-    <keyword match="oct"/>
-    <keyword match="open"/>
-
-    <keyword match="ord"/>
-    <keyword match="pow"/>
-    <keyword match="property"/>
-    <keyword match="range"/>
-    <keyword match="raw_input"/>
-    <keyword match="reduce"/>
-    <keyword match="reload"/>
-    <keyword match="repr"/>
-    <keyword match="round"/>
-
-    <keyword match="setattr"/>
-    <keyword match="slice"/>
-    <keyword match="staticmethod"/>
-    <keyword match="sum"/>
-    <keyword match="super"/>
-    <keyword match="str"/>
-    <keyword match="tuple"/>
-    <keyword match="type"/>
-    <keyword match="unichr"/>
-
-    <keyword match="unicode"/>
-    <keyword match="vars"/>
-    <keyword match="xrange"/>
-    <keyword match="zip"/>
-    
-  </keywords>
-
-</highlight>
-
diff --git a/library/Text_Highlighter/release b/library/Text_Highlighter/release
deleted file mode 100644
index 66f1fa603..000000000
--- a/library/Text_Highlighter/release
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-/usr/local/bin/php package.php make
-/usr/local/bin/pear package
diff --git a/library/Text_Highlighter/ruby.xml b/library/Text_Highlighter/ruby.xml
deleted file mode 100644
index 599f5af17..000000000
--- a/library/Text_Highlighter/ruby.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: ruby.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="ruby" case="no">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-  <comment>
-FIXME:  While this construction : s.split /z/i 
-is valid, regular expression is not recognized as such
-(/ folowing an identifier or number is not recognized as
-start of RE), making highlighting improper
-
-%q(a (nested) string) does not get highlighted correctly
-  </comment>
-
-  <default innerClass="code" />
-
-  <region name="data" start="/^__END__$/m" end="$" delimClass="reserved" innerClass="comment" never-conteined="yes" />
-  
-  <region name="strdouble" delimClass="quotes" innerClass="string" 
-          start="&quot;" end="&quot;" >
-  </region>
-
-  <region name="qstrdouble" delimClass="quotes" innerClass="string" 
-      start="%[Qx]([!&quot;#\$%&amp;'+\-*.\/:;=?@^`|~{&lt;\[(])" end="%b1%"  remember="yes" />
-  
-  <region name="strsingle" delimClass="quotes" innerClass="string" 
-          start="'" end="'" />
-
-  <region name="qstrsingle" delimClass="quotes" innerClass="string" 
-      start="%[wq]([!&quot;#\$%&amp;'+\-*.\/:;=?@^`|~{&lt;\[(])" end="%b1%"  remember="yes" />
-
-  <block name="global" match="\$(\W|\w+)" innerClass="var" />
-
-  <block name="classvar" match="/@@?[_a-z][\d_a-z]*/i" innerClass="var" />
-  
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)" >
-    <contains all="yes"/>
-  </region>
-
-  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]" >
-    <contains all="yes"/>
-  </region>
-
-  <block name="escaped" match="\\." innerClass="special" contained="yes">
-    <onlyin region="qstrsingle"/>
-    <onlyin region="strsingle"/>
-    <onlyin region="qstrdouble"/>
-    <onlyin region="strdouble"/>
-    <onlyin region="regexp"/>
-  </block>
-
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
-
-  <block name="exponent" 
-         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
-         innerClass="number" />
-
-  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
-
-  <block name="hexinteger" match="0[xX][\da-f]+l?" innerClass="number" />
-  
-  <block name="integer" match="\d+l?|\b0l?\b" innerClass="number" />
-
-  <block name="octinteger" match="0[0-7]+l?" innerClass="number" />
-
-
-  <region name="rubydoc" start="/^=begin$/m" end="/^=end$/m" delimClass="comment" innerClass="comment">
-      <contains block="cvstag" />
-  </region>
-  
-  <block name="cvstag" match="\$\w+\s*:.+\$" innerClass="inlinedoc" contained="yes">
-    <onlyin region="comment"/>
-    <onlyin region="rubydoc"/>
-  </block>
-
-  <region name="comment" innerClass="comment" start="#" end="/$/m" delimClass="comment" >
-      <contains block="cvstag" />
-  </region>
-
-  <region name="regexp" delimClass="quotes" innerClass="string" start="\s*\/" end="\/[iomx]*" 
-   neverAfter="(?&lt;!\band|\bor|\bwhile|\buntil|\bunless|\bif|\belsif|\bwhen|[~=!|&amp;(,\[])$">
-  </region>
-  
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
-      <keyword match="__FILE__" />
-      <keyword match="require" />
-      <keyword match="and" />
-      <keyword match="def" />
-      <keyword match="end" />
-      <keyword match="in" />
-      <keyword match="or" />
-      <keyword match="self" />
-      <keyword match="unless" />
-      <keyword match="__LINE__" />
-      <keyword match="begin" />
-      <keyword match="defined?" />
-      <keyword match="ensure" />
-      <keyword match="module" />
-      <keyword match="redo" />
-      <keyword match="super" />
-      <keyword match="until" />
-      <keyword match="BEGIN" />
-      <keyword match="break" />
-      <keyword match="do" />
-      <keyword match="false" />
-      <keyword match="next" />
-      <keyword match="rescue" />
-      <keyword match="then" />
-      <keyword match="when" />
-      <keyword match="END" />
-      <keyword match="case" />
-      <keyword match="else" />
-      <keyword match="for" />
-      <keyword match="nil" />
-      <keyword match="retry" />
-      <keyword match="true" />
-      <keyword match="while" />
-      <keyword match="alias" />
-      <keyword match="module_function" />
-      <keyword match="private" />
-      <keyword match="public" />
-      <keyword match="protected" />
-      <keyword match="attr_reader" />
-      <keyword match="attr_writer" />
-      <keyword match="attr_accessor" />
-      <keyword match="class" />
-      <keyword match="elsif" />
-      <keyword match="if" />
-      <keyword match="not" />
-      <keyword match="return" />
-      <keyword match="undef" />
-      <keyword match="yield" />
-  </keywords>
-
-
-</highlight>
-
diff --git a/library/Text_Highlighter/sample.css b/library/Text_Highlighter/sample.css
deleted file mode 100644
index b4b38c5fc..000000000
--- a/library/Text_Highlighter/sample.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.hl-main ol {
-	line-height: 1.0;
-}
-.hl-default {
-    color: Black;
-}
-.hl-code {
-    color: Black;
-}
-.hl-brackets {
-    color: Olive;
-}
-.hl-comment {
-    color: Purple;
-}
-.hl-quotes {
-    color: Darkred;
-}
-.hl-string {
-    color: Red;
-}
-.hl-identifier {
-    color: Blue;
-}
-.hl-builtin {
-    color: Teal;
-}
-.hl-reserved {
-    color: Green;
-}
-.hl-inlinedoc {
-    color: Blue;
-}
-.hl-var {
-    color: Darkblue;
-}
-.hl-url {
-    color: Blue;
-}
-.hl-special {
-    color: Navy;
-}
-.hl-number {
-    color: Maroon;
-}
-.hl-inlinetags {
-    color: Blue;
-}
-.hl-main {
-	background: #ccc none repeat scroll 0 0;
-    color: #000;
-/*    background-color: White; */
-}
-.hl-gutter {
-    background-color: #999999;
-    color: White
-}
-.hl-table {
-    font-family: courier;
-    font-size: 12px;
-    border: solid 1px Lightgrey;
-}
diff --git a/library/Text_Highlighter/sh.xml b/library/Text_Highlighter/sh.xml
deleted file mode 100644
index 1250de3bc..000000000
--- a/library/Text_Highlighter/sh.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: sh.xml,v 1.2 2007-06-14 00:15:50 ssttoo Exp $ -->
-
-<highlight lang="sh" case = "yes">
-
-  <authors>
-    <author name="Noah Spurrier" email="noah@noah.org" />
-  </authors>
-
-  <comment>This highlighter is EXPERIMENTAL. It may work incorrectly.
-      It is a crude hack of the perl syntax, which itself wasn't so good.
-      But this seems to work OK.
-  </comment>
-
-  <default innerClass="code"/>
-
-  <block name="interpreter" match="/^(#!)(.*)/m" innerClass="special">
-   <partClass index="1" innerClass="special" />
-   <partClass index="2" innerClass="string" />
-  </block>
-
-  <!--
-  brackets
-  -->
-  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
-    <contains all="yes"/>
-  </region>
-
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
-    <contains all="yes"/>
-  </region>
-
-  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
-    <contains all="yes"/>
-  </region>
-
-  <!--
-  use smth
-  -->
-  <block name="usestatement" match="(use)\s+([\w:]*)" innerClass="special">
-   <partClass index="1" innerClass="reserved" />
-   <partClass index="2" innerClass="special" />
-  </block>
-
-
-  <region name="q-w-q-statement"
-    start="/\b(q[wq]\s*((\{)|(\()|(\[)|(\&lt;)|([\W\S])))(?=(.*)((?(3)\})(?(4)\))(?(5)\])(?(6)\&gt;)(?(7)\7)))/Us"
-    end="%b2%"
-    innerClass="string" delimClass="quotes" remember="yes">
-
-    <contains block="containedvar"/>
-    <contains block="specialvar"/>
-    <contains block="curlyvar"/>
-
-  </region>
-
-  <region name="qstatement"
-    start="/\b(q\s*((\{)|(\()|(\[)|(\&lt;)|([\W\S])))(?=(.*)((?(3)\})(?(4)\))(?(5)\])(?(6)\&gt;)(?(7)\7)))/Us"
-    end="%b2%"
-    innerClass="string" delimClass="quotes" remember="yes">
-
-  </region>
-
-  <!--
-  comments
-  -->
-  <block name="comment" match="#.*" innerClass="comment" />
-
-
-  <!--
-  regexpr
-  FIXME: this should be rewritten
-  -->
-  <block name="dblregexprver1" match="/(s|tr) ([|#~`!@$%^&amp;*-+=\\;:'&quot;,.\/?])  ((\\.|[^\\])*?) (\2)((\\.|[^\\])*?)(\2[ecgimosx]*)/x" innerClass="string">
-   <partClass index="1" innerClass="quotes" />
-   <partClass index="2" innerClass="quotes" />
-   <partClass index="3" innerClass="string" />
-   <partClass index="5" innerClass="quotes" />
-   <partClass index="6" innerClass="string" />
-   <partClass index="8" innerClass="quotes" />
-  </block>
-
-  <block name="dblregexprver2" match="/(m) ([|#~`!@$%^&amp;*-+=\\;:'&quot;,.\/?])  ((\\.|[^\\])*?) (\2[ecgimosx]*)/x" innerClass="string">
-   <partClass index="1" innerClass="quotes" />
-   <partClass index="2" innerClass="quotes" />
-   <partClass index="3" innerClass="string" />
-   <partClass index="5" innerClass="quotes" />
-  </block>
-
-
-  <region name="regexp" start=" \/" end="\/[cgimosx]*" innerClass="string" delimClass="quotes" case="yes">
-    <contains block="reescaped"/>
-  </region>
-
-  <block name="reescaped" match="\\\/" innerClass="string" contained="yes">
-    <onlyin region="regexp"/>
-  </block>
-
-  <!--
-  variables
-  FIXME: @{...}
-  -->
-  <block name="bracketsvars" match="([a-z1-9_]+)(\s*=>)" innerClass="string" contained="yes" case="no">
-    <partClass index="1" innerClass="string" />
-    <partClass index="2" innerClass="code" />
-    <onlyin region="brackets"/>
-  </block>
-
-  <block name="specialvar" match="\$#?[1-9'`@!]" innerClass="var"/>
-
-  <block name="var" match="(\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\^(?-i)[A-Z]?(?i))" innerClass="var" case="no"/>
-  <block name="containedvar" match="\$([a-z1-9_]+|\^(?-i)[A-Z]?(?i))" innerClass="var" case="no"/>
-
-  <block name="classvar" match="(\{)([a-z1-9]+)(\})" innerClass="var" case="no">
-   <partClass index="1" innerClass="brackets" />
-   <partClass index="2" innerClass="var" />
-   <partClass index="3" innerClass="brackets" />
-  </block>
-
-  <block name="curlyvar" match="[\$@%]#?\{[a-z1-9]+\}" innerClass="var" case="no"/>
-
-  <!--
-  quotes
-  -->
-  <region name="exec" delimClass="quotes" innerClass="string" start="`" end="`">
-    <contains block="containedvar"/>
-    <contains block="specialvar"/>
-    <contains block="curlyvar"/>
-  </region>
-
-  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'"/>
-
-  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
-    <onlyin region="qstatement"/>
-    <onlyin region="strsingle"/>
-    <onlyin region="exec"/>
-  </block>
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;">
-    <contains block="containedvar"/>
-    <contains block="specialvar"/>
-    <contains block="curlyvar"/>
-  </region>
-
-  <block name="descaped" match="\\[\\&quot;'`tnr\$\{@]" innerClass="special" contained="yes">
-    <onlyin region="strdouble"/>
-    <onlyin region="q-w-q-statement"/>
-  </block>
-
-  <!-- logical op.
-  <block name="logic" match="\|\||&amp;&amp;" innerClass="reserved" contained="yes"/>-->
-
-  <!--
-  identifiers
-  -->
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
-
-  <!--
-  numbers
-  -->
-  <block name="number" match="\d*\.?\d+" innerClass="number"/>
-
-  <!--
-  GNU and posix standard shell utilities here.
-  -->
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
-      <keyword match="cd"/>
-      <keyword match="cp"/>
-      <keyword match="rm"/>
-      <keyword match="echo"/>
-      <keyword match="printf"/>
-      <keyword match="exit"/>
-      <keyword match="cut"/>
-      <keyword match="join"/>
-      <keyword match="comm"/>
-      <keyword match="fmt"/>
-      <keyword match="grep"/>
-      <keyword match="egrep"/>
-      <keyword match="fgrep"/>
-      <keyword match="sed"/>
-      <keyword match="awk"/>
-      <keyword match="yes"/>
-      <keyword match="false"/>
-      <keyword match="true"/>
-      <keyword match="test"/>
-      <keyword match="expr"/>
-      <keyword match="tee"/>
-      <keyword match="basename"/>
-      <keyword match="dirname"/>
-      <keyword match="pathchk"/>
-      <keyword match="pwd"/>
-      <keyword match="stty"/>
-      <keyword match="tty"/>
-      <keyword match="env"/>
-      <keyword match="printenv"/>
-      <keyword match="id"/>
-      <keyword match="logname"/>
-      <keyword match="whoami"/>
-      <keyword match="groups"/>
-      <keyword match="users"/>
-      <keyword match="who"/>
-      <keyword match="date"/>
-      <keyword match="uname"/>
-      <keyword match="hostname"/>
-      <keyword match="chroot"/>
-      <keyword match="nice"/>
-      <keyword match="nohup"/>
-      <keyword match="sleep"/>
-      <keyword match="factor"/>
-      <keyword match="seq"/>
-      <keyword match="getopt"/>
-      <keyword match="getopts"/>
-      <keyword match="options"/>
-      <keyword match="shift"/>
-  </keywords>
-
-  <keywords name="flowcontrol" inherits="identifier" innerClass="reserved" case = "yes">
-      <keyword match="if"/>
-      <keyword match="fi"/>
-      <keyword match="then"/>
-      <keyword match="else"/>
-      <keyword match="elif"/>
-      <keyword match="case"/>
-      <keyword match="esac"/>
-      <keyword match="while"/>
-      <keyword match="done"/>
-      <keyword match="for"/>
-      <keyword match="in"/>
-      <keyword match="function"/>
-      <keyword match="until"/>
-      <keyword match="do"/>
-      <keyword match="select"/>
-      <keyword match="time"/>
-      <!--
-      <keyword match="[["/>
-      <keyword match="]]"/>
-      -->
-      <keyword match="read"/>
-      <keyword match="set"/>
-  </keywords>
-
-</highlight>
diff --git a/library/Text_Highlighter/sql.xml b/library/Text_Highlighter/sql.xml
deleted file mode 100644
index 19cae49a0..000000000
--- a/library/Text_Highlighter/sql.xml
+++ /dev/null
@@ -1,496 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: sql.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="sql" case="no">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-
-  <comment>Based on SQL-99</comment>
-
-  <default innerClass="code" />
-
-  <region name="qidentifier" delimClass="quotes" innerClass="identifier" 
-          start="`" end="`" />
-
-  <region name="mlcomment" delimClass="comment" innerClass="comment" 
-          start="\/\*" end="\*\/" />
-
-  <block name="comment" match="(#|--\s).*" innerClass="comment" />
-
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" 
-          start="&quot;" end="&quot;" >
-  </region>
-  
-  <region name="brackets" delimClass="brackets" innerClass="code" 
-          start="\(" end="\)" >
-    <contains all="yes"/>
-  </region>
-
-  <region name="strsingle" delimClass="quotes" innerClass="string" 
-          start="'" end="'" />
-
-  <block name="escaped" match="\\." innerClass="special" contained="yes">
-    <onlyin region="strsingle"/>
-    <onlyin region="strdouble"/>
-  </block>
-
-  <block name="exponent" 
-         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
-         innerClass="number" />
-
-  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
-
-  <block name="integer" match="\d+l?|\b0l?\b" innerClass="number" />
-
-  <block name="hexinteger" match="0[xX][\da-f]+l?" innerClass="number" />
-
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "no">
-    <keyword match="ABSOLUTE" />
-    <keyword match="ACTION" />
-    <keyword match="ADD" />
-    <keyword match="ADMIN" />
-    <keyword match="AFTER" />
-    <keyword match="AGGREGATE" />
-    <keyword match="ALIAS" />
-    <keyword match="ALL" />
-    <keyword match="ALLOCATE" />
-    <keyword match="ALTER" />
-    <keyword match="AND" />
-    <keyword match="ANY" />
-    <keyword match="ARE" />
-    <keyword match="ARRAY" />
-    <keyword match="AS" />
-    <keyword match="ASC" />
-    <keyword match="ASSERTION" />
-    <keyword match="AT" />
-    <keyword match="AUTHORIZATION" />
-    <keyword match="BEFORE" />
-    <keyword match="BEGIN" />
-    <keyword match="BINARY" />
-    <keyword match="BIT" />
-    <keyword match="BLOB" />
-    <keyword match="BOOLEAN" />
-    <keyword match="BOTH" />
-    <keyword match="BREADTH" />
-    <keyword match="BY" />
-    <keyword match="CALL" />
-    <keyword match="CASCADE" />
-    <keyword match="CASCADED" />
-    <keyword match="CASE" />
-    <keyword match="CAST" />
-    <keyword match="CATALOG" />
-    <keyword match="CHAR" />
-    <keyword match="CHARACTER" />
-    <keyword match="CHECK" />
-    <keyword match="CLASS" />
-    <keyword match="CLOB" />
-    <keyword match="CLOSE" />
-    <keyword match="COLLATE" />
-    <keyword match="COLLATION" />
-    <keyword match="COLUMN" />
-    <keyword match="COMMIT" />
-    <keyword match="COMPLETION" />
-    <keyword match="CONNECT" />
-    <keyword match="CONNECTION" />
-    <keyword match="CONSTRAINT" />
-    <keyword match="CONSTRAINTS" />
-    <keyword match="CONSTRUCTOR" />
-    <keyword match="CONTINUE" />
-    <keyword match="CORRESPONDING" />
-    <keyword match="CREATE" />
-    <keyword match="CROSS" />
-    <keyword match="CUBE" />
-    <keyword match="CURRENT" />
-    <keyword match="CURRENT_DATE" />
-    <keyword match="CURRENT_PATH" />
-    <keyword match="CURRENT_ROLE" />
-    <keyword match="CURRENT_TIME" />
-    <keyword match="CURRENT_TIMESTAMP" />
-    <keyword match="CURRENT_USER" />
-    <keyword match="CURSOR" />
-    <keyword match="CYCLE" />
-    <keyword match="DATA" />
-    <keyword match="DATE" />
-    <keyword match="DAY" />
-    <keyword match="DEALLOCATE" />
-    <keyword match="DEC" />
-    <keyword match="DECIMAL" />
-    <keyword match="DECLARE" />
-    <keyword match="DEFAULT" />
-    <keyword match="DEFERRABLE" />
-    <keyword match="DEFERRED" />
-    <keyword match="DELETE" />
-    <keyword match="DEPTH" />
-    <keyword match="DEREF" />
-    <keyword match="DESC" />
-    <keyword match="DESCRIBE" />
-    <keyword match="DESCRIPTOR" />
-    <keyword match="DESTROY" />
-    <keyword match="DESTRUCTOR" />
-    <keyword match="DETERMINISTIC" />
-    <keyword match="DIAGNOSTICS" />
-    <keyword match="DICTIONARY" />
-    <keyword match="DISCONNECT" />
-    <keyword match="DISTINCT" />
-    <keyword match="DOMAIN" />
-    <keyword match="DOUBLE" />
-    <keyword match="DROP" />
-    <keyword match="DYNAMIC" />
-    <keyword match="EACH" />
-    <keyword match="ELSE" />
-    <keyword match="END" />
-    <keyword match="END-EXEC" />
-    <keyword match="EQUALS" />
-    <keyword match="ESCAPE" />
-    <keyword match="EVERY" />
-    <keyword match="EXCEPT" />
-    <keyword match="EXCEPTION" />
-    <keyword match="EXEC" />
-    <keyword match="EXECUTE" />
-    <keyword match="EXTERNAL" />
-    <keyword match="FALSE" />
-    <keyword match="FETCH" />
-    <keyword match="FIRST" />
-    <keyword match="FLOAT" />
-    <keyword match="FOR" />
-    <keyword match="FOREIGN" />
-    <keyword match="FOUND" />
-    <keyword match="FREE" />
-    <keyword match="FROM" />
-    <keyword match="FULL" />
-    <keyword match="FUNCTION" />
-    <keyword match="GENERAL" />
-    <keyword match="GET" />
-    <keyword match="GLOBAL" />
-    <keyword match="GO" />
-    <keyword match="GOTO" />
-    <keyword match="GRANT" />
-    <keyword match="GROUP" />
-    <keyword match="GROUPING" />
-    <keyword match="HAVING" />
-    <keyword match="HOST" />
-    <keyword match="HOUR" />
-    <keyword match="IDENTITY" />
-    <keyword match="IGNORE" />
-    <keyword match="IMMEDIATE" />
-    <keyword match="IN" />
-    <keyword match="INDICATOR" />
-    <keyword match="INITIALIZE" />
-    <keyword match="INITIALLY" />
-    <keyword match="INNER" />
-    <keyword match="INOUT" />
-    <keyword match="INPUT" />
-    <keyword match="INSERT" />
-    <keyword match="INT" />
-    <keyword match="INTEGER" />
-    <keyword match="INTERSECT" />
-    <keyword match="INTERVAL" />
-    <keyword match="INTO" />
-    <keyword match="IS" />
-    <keyword match="ISOLATION" />
-    <keyword match="ITERATE" />
-    <keyword match="JOIN" />
-    <keyword match="KEY" />
-    <keyword match="LANGUAGE" />
-    <keyword match="LARGE" />
-    <keyword match="LAST" />
-    <keyword match="LATERAL" />
-    <keyword match="LEADING" />
-    <keyword match="LEFT" />
-    <keyword match="LESS" />
-    <keyword match="LEVEL" />
-    <keyword match="LIKE" />
-    <keyword match="LIMIT" />
-    <keyword match="LOCAL" />
-    <keyword match="LOCALTIME" />
-    <keyword match="LOCALTIMESTAMP" />
-    <keyword match="LOCATOR" />
-    <keyword match="MAP" />
-    <keyword match="MATCH" />
-    <keyword match="MINUTE" />
-    <keyword match="MODIFIES" />
-    <keyword match="MODIFY" />
-    <keyword match="MODULE" />
-    <keyword match="MONTH" />
-    <keyword match="NAMES" />
-    <keyword match="NATIONAL" />
-    <keyword match="NATURAL" />
-    <keyword match="NCHAR" />
-    <keyword match="NCLOB" />
-    <keyword match="NEW" />
-    <keyword match="NEXT" />
-    <keyword match="NO" />
-    <keyword match="NONE" />
-    <keyword match="NOT" />
-    <keyword match="NULL" />
-    <keyword match="NUMERIC" />
-    <keyword match="OBJECT" />
-    <keyword match="OF" />
-    <keyword match="OFF" />
-    <keyword match="OLD" />
-    <keyword match="ON" />
-    <keyword match="ONLY" />
-    <keyword match="OPEN" />
-    <keyword match="OPERATION" />
-    <keyword match="OPTION" />
-    <keyword match="OR" />
-    <keyword match="ORDER" />
-    <keyword match="ORDINALITY" />
-    <keyword match="OUT" />
-    <keyword match="OUTER" />
-    <keyword match="OUTPUT" />
-    <keyword match="PAD" />
-    <keyword match="PARAMETER" />
-    <keyword match="PARAMETERS" />
-    <keyword match="PARTIAL" />
-    <keyword match="PATH" />
-    <keyword match="POSTFIX" />
-    <keyword match="PRECISION" />
-    <keyword match="PREFIX" />
-    <keyword match="PREORDER" />
-    <keyword match="PREPARE" />
-    <keyword match="PRESERVE" />
-    <keyword match="PRIMARY" />
-    <keyword match="PRIOR" />
-    <keyword match="PRIVILEGES" />
-    <keyword match="PROCEDURE" />
-    <keyword match="PUBLIC" />
-    <keyword match="READ" />
-    <keyword match="READS" />
-    <keyword match="REAL" />
-    <keyword match="RECURSIVE" />
-    <keyword match="REF" />
-    <keyword match="REFERENCES" />
-    <keyword match="REFERENCING" />
-    <keyword match="RELATIVE" />
-    <keyword match="RESTRICT" />
-    <keyword match="RESULT" />
-    <keyword match="RETURN" />
-    <keyword match="RETURNS" />
-    <keyword match="REVOKE" />
-    <keyword match="RIGHT" />
-    <keyword match="ROLE" />
-    <keyword match="ROLLBACK" />
-    <keyword match="ROLLUP" />
-    <keyword match="ROUTINE" />
-    <keyword match="ROW" />
-    <keyword match="ROWS" />
-    <keyword match="SAVEPOINT" />
-    <keyword match="SCHEMA" />
-    <keyword match="SCOPE" />
-    <keyword match="SCROLL" />
-    <keyword match="SEARCH" />
-    <keyword match="SECOND" />
-    <keyword match="SECTION" />
-    <keyword match="SELECT" />
-    <keyword match="SEQUENCE" />
-    <keyword match="SESSION" />
-    <keyword match="SESSION_USER" />
-    <keyword match="SET" />
-    <keyword match="SETS" />
-    <keyword match="SIZE" />
-    <keyword match="SMALLINT" />
-    <keyword match="SOME" />
-    <keyword match="SPACE" />
-    <keyword match="SPECIFIC" />
-    <keyword match="SPECIFICTYPE" />
-    <keyword match="SQL" />
-    <keyword match="SQLEXCEPTION" />
-    <keyword match="SQLSTATE" />
-    <keyword match="SQLWARNING" />
-    <keyword match="START" />
-    <keyword match="STATE" />
-    <keyword match="STATEMENT" />
-    <keyword match="STATIC" />
-    <keyword match="STRUCTURE" />
-    <keyword match="SYSTEM_USER" />
-    <keyword match="TABLE" />
-    <keyword match="TEMPORARY" />
-    <keyword match="TERMINATE" />
-    <keyword match="THAN" />
-    <keyword match="THEN" />
-    <keyword match="TIME" />
-    <keyword match="TIMESTAMP" />
-    <keyword match="TIMEZONE_HOUR" />
-    <keyword match="TIMEZONE_MINUTE" />
-    <keyword match="TO" />
-    <keyword match="TRAILING" />
-    <keyword match="TRANSACTION" />
-    <keyword match="TRANSLATION" />
-    <keyword match="TREAT" />
-    <keyword match="TRIGGER" />
-    <keyword match="TRUE" />
-    <keyword match="UNDER" />
-    <keyword match="UNION" />
-    <keyword match="UNIQUE" />
-    <keyword match="UNKNOWN" />
-    <keyword match="UNNEST" />
-    <keyword match="UPDATE" />
-    <keyword match="USAGE" />
-    <keyword match="USER" />
-    <keyword match="USING" />
-    <keyword match="VALUE" />
-    <keyword match="VALUES" />
-    <keyword match="VARCHAR" />
-    <keyword match="VARIABLE" />
-    <keyword match="VARYING" />
-    <keyword match="VIEW" />
-    <keyword match="WHEN" />
-    <keyword match="WHENEVER" />
-    <keyword match="WHERE" />
-    <keyword match="WITH" />
-    <keyword match="WITHOUT" />
-    <keyword match="WORK" />
-    <keyword match="WRITE" />
-    <keyword match="YEAR" />
-    <keyword match="ZONE" />
-  </keywords>
-  <keywords name="keyword" inherits="identifier" innerClass="var" case = "no">
-    <keyword match="ABS" />
-    <keyword match="ADA" />
-    <keyword match="ASENSITIVE" />
-    <keyword match="ASSIGNMENT" />
-    <keyword match="ASYMMETRIC" />
-    <keyword match="ATOMIC" />
-    <keyword match="AVG" />
-    <keyword match="BETWEEN" />
-    <keyword match="BITVAR" />
-    <keyword match="BIT_LENGTH" />
-    <keyword match="C" />
-    <keyword match="CALLED" />
-    <keyword match="CARDINALITY" />
-    <keyword match="CATALOG_NAME" />
-    <keyword match="CHAIN" />
-    <keyword match="CHARACTER_LENGTH" />
-    <keyword match="CHARACTER_SET_CATALOG" />
-    <keyword match="CHARACTER_SET_NAME" />
-    <keyword match="CHARACTER_SET_SCHEMA" />
-    <keyword match="CHAR_LENGTH" />
-    <keyword match="CHECKED" />
-    <keyword match="CLASS_ORIGIN" />
-    <keyword match="COALESCE" />
-    <keyword match="COBOL" />
-    <keyword match="COLLATION_CATALOG" />
-    <keyword match="COLLATION_NAME" />
-    <keyword match="COLLATION_SCHEMA" />
-    <keyword match="COLUMN_NAME" />
-    <keyword match="COMMAND_FUNCTION" />
-    <keyword match="COMMAND_FUNCTION_CODE" />
-    <keyword match="COMMITTED" />
-    <keyword match="CONDITION_NUMBER" />
-    <keyword match="CONNECTION_NAME" />
-    <keyword match="CONSTRAINT_CATALOG" />
-    <keyword match="CONSTRAINT_NAME" />
-    <keyword match="CONSTRAINT_SCHEMA" />
-    <keyword match="CONTAINS" />
-    <keyword match="CONVERT" />
-    <keyword match="COUNT" />
-    <keyword match="CURSOR_NAME" />
-    <keyword match="DATETIME_INTERVAL_CODE" />
-    <keyword match="DATETIME_INTERVAL_PRECISION" />
-    <keyword match="DEFINED" />
-    <keyword match="DEFINER" />
-    <keyword match="DISPATCH" />
-    <keyword match="DYNAMIC_FUNCTION" />
-    <keyword match="DYNAMIC_FUNCTION_CODE" />
-    <keyword match="EXISTING" />
-    <keyword match="EXISTS" />
-    <keyword match="EXTRACT" />
-    <keyword match="FINAL" />
-    <keyword match="FORTRAN" />
-    <keyword match="G" />
-    <keyword match="GENERATED" />
-    <keyword match="GRANTED" />
-    <keyword match="HIERARCHY" />
-    <keyword match="HOLD" />
-    <keyword match="IMPLEMENTATION" />
-    <keyword match="INFIX" />
-    <keyword match="INSENSITIVE" />
-    <keyword match="INSTANCE" />
-    <keyword match="INSTANTIABLE" />
-    <keyword match="INVOKER" />
-    <keyword match="K" />
-    <keyword match="KEY_MEMBER" />
-    <keyword match="KEY_TYPE" />
-    <keyword match="LENGTH" />
-    <keyword match="LOWER" />
-    <keyword match="M" />
-    <keyword match="MAX" />
-    <keyword match="MESSAGE_LENGTH" />
-    <keyword match="MESSAGE_OCTET_LENGTH" />
-    <keyword match="MESSAGE_TEXT" />
-    <keyword match="METHOD" />
-    <keyword match="MIN" />
-    <keyword match="MOD" />
-    <keyword match="MORE" />
-    <keyword match="MUMPS" />
-    <keyword match="NAME" />
-    <keyword match="NULLABLE" />
-    <keyword match="NULLIF" />
-    <keyword match="NUMBER" />
-    <keyword match="OCTET_LENGTH" />
-    <keyword match="OPTIONS" />
-    <keyword match="OVERLAPS" />
-    <keyword match="OVERLAY" />
-    <keyword match="OVERRIDING" />
-    <keyword match="PARAMETER_MODE" />
-    <keyword match="PARAMETER_NAME" />
-    <keyword match="PARAMETER_ORDINAL_POSITION" />
-    <keyword match="PARAMETER_SPECIFIC_CATALOG" />
-    <keyword match="PARAMETER_SPECIFIC_NAME" />
-    <keyword match="PARAMETER_SPECIFIC_SCHEMA" />
-    <keyword match="PASCAL" />
-    <keyword match="PLI" />
-    <keyword match="POSITION" />
-    <keyword match="REPEATABLE" />
-    <keyword match="RETURNED_LENGTH" />
-    <keyword match="RETURNED_OCTET_LENGTH" />
-    <keyword match="RETURNED_SQLSTATE" />
-    <keyword match="ROUTINE_CATALOG" />
-    <keyword match="ROUTINE_NAME" />
-    <keyword match="ROUTINE_SCHEMA" />
-    <keyword match="ROW_COUNT" />
-    <keyword match="SCALE" />
-    <keyword match="SCHEMA_NAME" />
-    <keyword match="SECURITY" />
-    <keyword match="SELF" />
-    <keyword match="SENSITIVE" />
-    <keyword match="SERIALIZABLE" />
-    <keyword match="SERVER_NAME" />
-    <keyword match="SIMILAR" />
-    <keyword match="SIMPLE" />
-    <keyword match="SOURCE" />
-    <keyword match="SPECIFIC_NAME" />
-    <keyword match="STYLE" />
-    <keyword match="SUBCLASS_ORIGIN" />
-    <keyword match="SUBLIST" />
-    <keyword match="SUBSTRING" />
-    <keyword match="SUM" />
-    <keyword match="SYMMETRIC" />
-    <keyword match="SYSTEM" />
-    <keyword match="TABLE_NAME" />
-    <keyword match="TRANSACTIONS_COMMITTED" />
-    <keyword match="TRANSACTIONS_ROLLED_BACK" />
-    <keyword match="TRANSACTION_ACTIVE" />
-    <keyword match="TRANSFORM" />
-    <keyword match="TRANSFORMS" />
-    <keyword match="TRANSLATE" />
-    <keyword match="TRIGGER_CATALOG" />
-    <keyword match="TRIGGER_NAME" />
-    <keyword match="TRIGGER_SCHEMA" />
-    <keyword match="TRIM" />
-    <keyword match="TYPE" />
-    <keyword match="UNCOMMITTED" />
-    <keyword match="UNNAMED" />
-    <keyword match="UPPER" />
-    <keyword match="USER_DEFINED_TYPE_CATALOG" />
-    <keyword match="USER_DEFINED_TYPE_NAME" />
-    <keyword match="USER_DEFINED_TYPE_SCHEMA" />
-  </keywords>
-
-</highlight>
diff --git a/library/Text_Highlighter/vbscript.xml b/library/Text_Highlighter/vbscript.xml
deleted file mode 100644
index 09c37ffde..000000000
--- a/library/Text_Highlighter/vbscript.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: vbscript.xml,v 1.2 2008-01-02 00:05:52 ssttoo Exp $ -->
-
-<highlight lang="vbscript" case="no">
-
-  <authors>
-    <author name="Daniel Fruzynski" email="daniel-AT-poradnik-webmastera.com" />
-  </authors>
-
-  <default innerClass="code" />
-
-  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
-    <contains all="yes"/>
-  </region>
-
-
-  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;"/>
-
-  <region name="comment" start="'|[Rr][Ee][Mm]\b" end="/$/m" innerClass="comment">
-    <contains block="cvstag"/>
-  </region>
-
-  <block name="number" match="\d*\.?\d+" innerClass="number"/>
-  <block name="hexnumber" match="&amp;H[0-9a-fA-F]+" innerClass="number"/>
-
-  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
-
-  <block name="url" match="((https?|ftp):\/\/[\w\?\.\-\&amp;=\/%+]+)|(^|[\s,!?])www\.\w+\.\w+[\w\?\.\&amp;=\/%+]*" innerClass="url" contained="yes">
-    <onlyin region="comment"/>
-  </block>
-
-  <block name="email" match="\w+[\.\w\-]+@(\w+[\.\w\-])+" innerClass="url" contained="yes">
-    <onlyin region="comment"/>
-  </block>
-
-  <block name="note" match="\b(note|fixme):" innerClass="inlinedoc" contained="yes" case="no">
-    <onlyin region="comment"/>
-  </block>
-
-
-  <block name="cvstag" match="\$\w+:.+\$" innerClass="inlinedoc" contained="yes">
-    <onlyin region="comment"/>
-  </block>
-
-  <keywords name="constants" inherits="identifier" innerClass="builtin" case="no">
-    <!-- Color Constants -->
-    <keyword match="vbBlack" />
-    <keyword match="vbRed" />
-    <keyword match="vbGreen" />
-    <keyword match="vbYellow" />
-    <keyword match="vbBlue" />
-    <keyword match="vbMagenta" />
-    <keyword match="vbCyan" />
-    <keyword match="vbWhite" />
-    <!-- Comparison Constants -->
-    <keyword match="vbBinaryCompare" />
-    <keyword match="vbTextCompare" />
-    <!-- Date and Time Constants -->
-    <keyword match="vbSunday" />
-    <keyword match="vbMonday" />
-    <keyword match="vbTuesday" />
-    <keyword match="vbWednesday" />
-    <keyword match="vbThursday" />
-    <keyword match="vbFriday" />
-    <keyword match="vbSaturday" />
-    <keyword match="vbUseSystemDayOfWeek" />
-    <keyword match="vbFirstJan1" />
-    <keyword match="vbFirstFourDays" />
-    <keyword match="vbFirstFullWeek" />
-    <!-- Date Format Constants -->
-    <keyword match="vbGeneralDate" />
-    <keyword match="vbLongDate" />
-    <keyword match="vbShortDate" />
-    <keyword match="vbLongTime" />
-    <keyword match="vbShortTime" />
-    <!-- Miscellaneous Constants -->
-    <keyword match="vbObjectError" />
-    <!-- MsgBox Constants -->
-    <keyword match="vbOKOnly" />
-    <keyword match="vbOKCancel" />
-    <keyword match="vbAbortRetryIgnore" />
-    <keyword match="vbYesNoCancel" />
-    <keyword match="vbYesNo" />
-    <keyword match="vbRetryCancel" />
-    <keyword match="vbCritical" />
-    <keyword match="vbQuestion" />
-    <keyword match="vbExclamation" />
-    <keyword match="vbInformation" />
-    <keyword match="vbDefaultButton1" />
-    <keyword match="vbDefaultButton2" />
-    <keyword match="vbDefaultButton3" />
-    <keyword match="vbDefaultButton4" />
-    <keyword match="vbApplicationModal" />
-    <keyword match="vbSystemModal" />
-    <keyword match="vbOK" />
-    <keyword match="vbCancel" />
-    <keyword match="vbAbort" />
-    <keyword match="vbRetry" />
-    <keyword match="vbIgnore" />
-    <keyword match="vbYes" />
-    <keyword match="vbNo" />
-    <!-- String Constants -->
-    <keyword match="vbCr" />
-    <keyword match="VbCrLf" />
-    <keyword match="vbFormFeed" />
-    <keyword match="vbLf" />
-    <keyword match="vbNewLine" />
-    <keyword match="vbNullChar" />
-    <keyword match="vbNullString" />
-    <keyword match="vbTab" />
-    <keyword match="vbVerticalTab" />
-    <!-- Tristate Constants -->
-    <keyword match="vbUseDefault" />
-    <keyword match="vbTrue" />
-    <keyword match="vbFalse" />
-    <!-- VarType Constants -->
-    <keyword match="vbEmpty" />
-    <keyword match="vbNull" />
-    <keyword match="vbInteger" />
-    <keyword match="vbLong" />
-    <keyword match="vbSingle" />
-    <keyword match="vbDouble" />
-    <keyword match="vbCurrency" />
-    <keyword match="vbDate" />
-    <keyword match="vbString" />
-    <keyword match="vbObject" />
-    <keyword match="vbError" />
-    <keyword match="vbBoolean" />
-    <keyword match="vbVariant" />
-    <keyword match="vbDataObject" />
-    <keyword match="vbDecimal" />
-    <keyword match="vbByte" />
-    <keyword match="vbArray" />
-  </keywords>
-
-  <keywords name="functions" inherits="identifier" innerClass="builtin" case="no">
-    <keyword match="Abs" />
-    <keyword match="Array" />
-    <keyword match="Asc" />
-    <keyword match="Atn" />
-    <keyword match="CBool" />
-    <keyword match="CByte" />
-    <keyword match="CCur" />
-    <keyword match="CDate" />
-    <keyword match="CDbl" />
-    <keyword match="Chr" />
-    <keyword match="CInt" />
-    <keyword match="CLng" />
-    <keyword match="Cos" />
-    <keyword match="CreateObject" />
-    <keyword match="CSng" />
-    <keyword match="CStr" />
-    <keyword match="Date" />
-    <keyword match="DateAdd" />
-    <keyword match="DateDiff" />
-    <keyword match="DatePart" />
-    <keyword match="DateSerial" />
-    <keyword match="DateValue" />
-    <keyword match="Day" />
-    <keyword match="Escape" />
-    <keyword match="Eval" />
-    <keyword match="Exp" />
-    <keyword match="Filter" />
-    <keyword match="FormatCurrency" />
-    <keyword match="FormatDateTime" />
-    <keyword match="FormatNumber" />
-    <keyword match="FormatPercent" />
-    <keyword match="GetLocale" />
-    <keyword match="GetObject" />
-    <keyword match="GetRef" />
-    <keyword match="Hex" />
-    <keyword match="Hour" />
-    <keyword match="InputBox" />
-    <keyword match="InStr" />
-    <keyword match="InStrRev" />
-    <keyword match="Int" />
-    <keyword match="Fix" />
-    <keyword match="IsArray" />
-    <keyword match="IsDate" />
-    <keyword match="IsEmpty" />
-    <keyword match="IsNull" />
-    <keyword match="IsNumeric" />
-    <keyword match="IsObject" />
-    <keyword match="Join" />
-    <keyword match="LBound" />
-    <keyword match="LCase" />
-    <keyword match="Left" />
-    <keyword match="Len" />
-    <keyword match="LoadPicture" />
-    <keyword match="Log" />
-    <keyword match="LTrim" />
-    <keyword match="RTrim" />
-    <keyword match="Trim" />
-    <keyword match="Mid" />
-    <keyword match="Minute" />
-    <keyword match="Month" />
-    <keyword match="MonthName" />
-    <keyword match="MsgBox" />
-    <keyword match="Now" />
-    <keyword match="Oct" />
-    <keyword match="Replace" />
-    <keyword match="RGB" />
-    <keyword match="Right" />
-    <keyword match="Rnd" />
-    <keyword match="Round" />
-    <keyword match="ScriptEngine" />
-    <keyword match="ScriptEngineBuildVersion" />
-    <keyword match="ScriptEngineMajorVersion" />
-    <keyword match="ScriptEngineMinorVersion" />
-    <keyword match="Second" />
-    <keyword match="SetLocale" />
-    <keyword match="Sgn" />
-    <keyword match="Sin" />
-    <keyword match="Space" />
-    <keyword match="Split" />
-    <keyword match="Sqr" />
-    <keyword match="StrComp" />
-    <keyword match="String" />
-    <keyword match="StrReverse" />
-    <keyword match="Tan" />
-    <keyword match="Time" />
-    <keyword match="Timer" />
-    <keyword match="TimeSerial" />
-    <keyword match="TimeValue" />
-    <keyword match="TypeName" />
-    <keyword match="UBound" />
-    <keyword match="UCase" />
-    <keyword match="Unescape" />
-    <keyword match="VarType" />
-    <keyword match="Weekday" />
-    <keyword match="WeekdayName" />
-    <keyword match="Year" />
-  </keywords>
-
-  <keywords name="builtin" inherits="identifier" innerClass="builtin" case="no">
-    <!--<keyword match="Class" />-->
-    <keyword match="Debug" />
-    <keyword match="Err" />
-    <keyword match="Match" />
-    <keyword match="RegExp" />
-  </keywords>
-
-  <keywords name="reserved" inherits="identifier" innerClass="reserved" case="no">
-    <keyword match="Empty" />
-    <keyword match="False" />
-    <keyword match="Nothing" />
-    <keyword match="Null" />
-    <keyword match="True" />
-    <keyword match="And" />
-    <keyword match="Eqv" />
-    <keyword match="Imp" />
-    <keyword match="Is" />
-    <keyword match="Mod" />
-    <keyword match="Not" />
-    <keyword match="Or" />
-    <keyword match="Xor" />
-    <keyword match="Call" />
-    <keyword match="Class" />
-    <keyword match="End" />
-    <keyword match="Const" />
-    <keyword match="Public" />
-    <keyword match="Private" />
-    <keyword match="Dim" />
-    <keyword match="Do" />
-    <keyword match="While" />
-    <keyword match="Until" />
-    <keyword match="Exit" />
-    <keyword match="Loop" />
-    <keyword match="Erase" />
-    <keyword match="Execute" />
-    <keyword match="ExecuteGlobal" />
-    <keyword match="For" />
-    <keyword match="Each" />
-    <keyword match="In" />
-    <keyword match="To" />
-    <keyword match="Step" />
-    <keyword match="Next" />
-    <keyword match="Function" />
-    <keyword match="Default" />
-    <keyword match="If" />
-    <keyword match="Then" />
-    <keyword match="Else" />
-    <keyword match="ElseIf" />
-    <keyword match="On" />
-    <keyword match="Error" />
-    <keyword match="Resume" />
-    <keyword match="Goto" />
-    <keyword match="Option" />
-    <keyword match="Explicit" />
-    <keyword match="Property" />
-    <keyword match="Get" />
-    <keyword match="Let" />
-    <keyword match="Set" />
-    <keyword match="Randomize" />
-    <keyword match="ReDim" />
-    <keyword match="Preserve" />
-    <keyword match="Select" />
-    <keyword match="Case" />
-    <keyword match="Stop" />
-    <keyword match="Sub" />
-    <keyword match="Wend" />
-    <keyword match="With" />
-  </keywords>
-
-</highlight>
diff --git a/library/Text_Highlighter/xml.xml b/library/Text_Highlighter/xml.xml
deleted file mode 100644
index 2271ff3ae..000000000
--- a/library/Text_Highlighter/xml.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!-- $Id: xml.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
-
-<highlight lang="xml" case="no">
-
-  <authors>
-    <author name="Andrey Demenev" email="demenev@gmail.com"/>
-  </authors>
-
-
-  <default innerClass="code" />
-
-  <region name="cdata" delimClass="comment" innerClass="comment"
-          start="\&lt;\!\[CDATA\[" end="\]\]\&gt;">
-  </region>
-
-  <region name="comment" delimClass="comment" innerClass="comment"
-          start="\&lt;!--" end="--\&gt;">
-  </region>
-
-  <region name="tag" delimClass="brackets" innerClass="code" start="\&lt;[\?\/]?" end="[\/\?]?\&gt;">
-    <contains block="tagname"/>
-    <contains region="param"/>
-    <contains block="paramname"/>
-  </region>
-
-  <block name="tagname" match="(?&lt;=[\&lt;\/?])[\w\-\:]+" innerClass="reserved" contained="yes"/>
-
-  <block name="paramname" match="[\w\-\:]+" innerClass="var" contained="yes"/>
-
-  <block name="entity" match="(&amp;|%)[\w\-\.]+;" innerClass="special" />
-
-  <region name="param" start="&quot;" end="&quot;" delimClass="quotes" innerClass="string" contained="yes">
-    <contains block="entity"/>
-  </region>
-
-</highlight>

From 8ae97b556e50981f3989d42faa42f21cffa4fc4b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 20:13:01 -0700
Subject: [PATCH 205/299] correct the bbcode documentation for syntax
 highlighted code blocks now that this is provided by a plugin.

---
 doc/member/bbcode.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/member/bbcode.html b/doc/member/bbcode.html
index a4bc813d8..098f34768 100644
--- a/doc/member/bbcode.html
+++ b/doc/member/bbcode.html
@@ -61,8 +61,10 @@ text</code></td><td>
 </table>
 
 <h3>Code blocks</h3>
-Code can be rendered generically in a block or inline format (depending on if there are new line characters in the text), or you can specify a supported language for enhanced syntax highlighting. Supported languages include <strong>php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh </strong>.
+Code can be rendered generically in a block or inline format (depending on if there are new line characters in the text), or you can specify a supported language for enhanced syntax highlighting. Syntax highlighting requires a suitable rendering plugin such as <strong>hilite</strong>. Supported languages with the hilite plugin include <strong>php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh </strong>. 
 <br><br>
+If a rendering plugin is not installed or an unsupported language is specified, the output for syntax highlighted code blocks is the same as the block format code tag.
+<br><br> 
 <table class="table table-responsive table-bordered">
 	<tbody>
 		<tr>

From c492573429818383000eef86c57cfcb3b1bbf846 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 20:26:57 -0700
Subject: [PATCH 206/299] add the hl tag to the bbcode ref

---
 doc/member/bbcode.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/member/bbcode.html b/doc/member/bbcode.html
index 098f34768..9b7080a32 100644
--- a/doc/member/bbcode.html
+++ b/doc/member/bbcode.html
@@ -25,6 +25,9 @@
 		<tr>
 			<td><code>[color=red]red[/color]</code></td><td><span style="color:  red;">red</span></td>
 		</tr>
+		<tr>
+			<td><code>[hl]highlighted[/hl]</code></td><td><span style="background-color: yellow;">highlighted</span></td>
+		</tr>
 		<tr>
 			<td><code>[font=courier]some text[/font] </code></td><td><span style="font-family: courier;">some text</span></td>
 		</tr>

From 909e618f6ce5638e8205873aeb9a214a52cb379d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 21:28:59 -0700
Subject: [PATCH 207/299] remove text_highlight css load from core

---
 view/php/theme_init.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 869b97473..ff37023cf 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -10,7 +10,6 @@ head_add_css('/view/css/conversation.css');
 head_add_css('/view/css/widgets.css');
 head_add_css('/view/css/colorbox.css');
 head_add_css('/library/justifiedGallery/justifiedGallery.min.css');
-head_add_css('/library/Text_Highlighter/sample.css');	
 
 head_add_js('jquery.js');
 head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js');

From 5376b478b85bfa453dbb7ef5014be310297d07a8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 30 May 2017 22:22:31 -0700
Subject: [PATCH 208/299] only provide 'connected apps' on the settings menu if
 techlevel > 0.

---
 Zotlabs/Widget/Settings_menu.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
index 753390c23..c15ad0980 100644
--- a/Zotlabs/Widget/Settings_menu.php
+++ b/Zotlabs/Widget/Settings_menu.php
@@ -79,11 +79,13 @@ class Settings_menu {
 			'selected' => ''
 		);
 
-		$tabs[] =	array(
-			'label' => t('Connected apps'),
-			'url' => z_root() . '/settings/oauth',
-			'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
-		);
+		if(get_account_techlevel() > 0) {
+			$tabs[] =	array(
+				'label' => t('Connected apps'),
+				'url' => z_root() . '/settings/oauth',
+				'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
+			);
+		}
 
 		if(get_account_techlevel() > 2) {
 			$tabs[] =	array(

From 98c18f416a4c809059f4cdf27a833bb9b1134280 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 31 May 2017 16:00:33 -0700
Subject: [PATCH 209/299] remove default for text/mediumtext sql fields

---
 include/connections.php  |  2 +-
 install/schema_mysql.sql | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/connections.php b/include/connections.php
index 0e9f25c8f..a2bc11773 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -629,7 +629,7 @@ function get_vcard_array($vc,$id) {
 				'address' => $adr->getParts()
 			];
 			$last_entry = end($adrs);
-			if($last_entry && $adrs[$last_entry]['address'])
+			if($last_entry && is_array($adrs[$last_entry]['address']))
 				array_walk($adrs[$last_entry]['address'],'array_escape_tags');
 		}
 	}
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 27ee4dda3..4de9c0917 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -36,9 +36,9 @@ CREATE TABLE IF NOT EXISTS `abook` (
   `abook_feed` tinyint(4) NOT NULL DEFAULT '0',
   `abook_not_here` tinyint(4) NOT NULL DEFAULT '0',
   `abook_profile` char(191) NOT NULL DEFAULT '',
-  `abook_incl` TEXT NOT NULL DEFAULT '',
-  `abook_excl` TEXT NOT NULL DEFAULT '',
-  `abook_instance` TEXT NOT NULL DEFAULT '',
+  `abook_incl` TEXT NOT NULL,
+  `abook_excl` TEXT NOT NULL,
+  `abook_instance` TEXT NOT NULL,
   PRIMARY KEY (`abook_id`),
   KEY `abook_account` (`abook_account`),
   KEY `abook_channel` (`abook_channel`),
@@ -114,7 +114,7 @@ CREATE TABLE IF NOT EXISTS `app` (
   `app_sig` char(191) NOT NULL DEFAULT '',
   `app_author` char(191) NOT NULL DEFAULT '',
   `app_name` char(191) NOT NULL DEFAULT '',
-  `app_desc` text NOT NULL DEFAULT '',
+  `app_desc` text NOT NULL,
   `app_url` char(191) NOT NULL DEFAULT '',
   `app_photo` char(191) NOT NULL DEFAULT '',
   `app_version` char(191) NOT NULL DEFAULT '',
@@ -1041,7 +1041,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
   `photo` char(191) NOT NULL DEFAULT '',
   `thumb` char(191) NOT NULL DEFAULT '',
   `publish` tinyint(1) NOT NULL DEFAULT '0',
-  `profile_vcard` text NOT NULL DEFAULT '',
+  `profile_vcard` text NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `guid` (`profile_guid`,`uid`),
   KEY `uid` (`uid`),
@@ -1137,7 +1137,7 @@ CREATE TABLE IF NOT EXISTS `site` (
   `site_type` smallint NOT NULL DEFAULT '0',
   `site_project` char(191) NOT NULL DEFAULT '',
   `site_version` varchar(32) NOT NULL DEFAULT '',
-  `site_crypto` text NOT NULL DEFAULT '',
+  `site_crypto` text NOT NULL,
   PRIMARY KEY (`site_url`),
   KEY `site_flags` (`site_flags`),
   KEY `site_update` (`site_update`),

From 35debe46bc0a10f3bad21303e127cb29526c94a2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 31 May 2017 18:14:12 -0700
Subject: [PATCH 210/299] a slight tweak to author_is_pmable hook to make it
 useful

---
 doc/hook/author_is_pmable.bb |  2 +-
 include/conversation.php     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/hook/author_is_pmable.bb b/doc/hook/author_is_pmable.bb
index 708350673..11d1185f3 100644
--- a/doc/hook/author_is_pmable.bb
+++ b/doc/hook/author_is_pmable.bb
@@ -6,7 +6,7 @@ By default author_is_pmable() returns true for 'zot' xchans, and false for all o
 
 The plugin is passed an array
 
-  [ 'xchan' => $author_xchan, 'result' => 'unset' ]
+  [ 'xchan' => $author_xchan, 'abook' => abook record, 'result' => 'unset' ]
 
 A plugin which sets the 'result' to something besides 'unset' will over-ride the default behaviour. A value of true will enable the 'send mail' link and the private mail recipient will be set to the author's xchan_hash.  A value of false will disable the 'send mail' link. 
 
diff --git a/include/conversation.php b/include/conversation.php
index b6832e22c..3f9ee5cfa 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -909,9 +909,9 @@ function thread_action_menu($item,$mode = '') {
 
 }
 
-function author_is_pmable($xchan) {
+function author_is_pmable($xchan, $abook) {
 
-	$x = [ 'xchan' => $xchan, 'result' => 'unset' ];
+	$x = [ 'xchan' => $xchan, 'abook' => $abook, 'result' => 'unset' ];
 	call_hooks('author_is_pmable',$x);
 	if($x['result'] !== 'unset')
 		return $x['result'];
@@ -941,7 +941,7 @@ function thread_author_menu($item, $mode = '') {
 	}
 
 	$profile_link = chanlink_hash($item['author_xchan']);
-
+	$contact = false;
 
 	if(App::$contacts && array_key_exists($item['author_xchan'],App::$contacts))
 		$contact = App::$contacts[$item['author_xchan']];
@@ -950,9 +950,9 @@ function thread_author_menu($item, $mode = '') {
 			$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
 
 	
-	if($item['uid'] > 0 && author_is_pmable($item['author']))
+	if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
 		$pm_url = z_root() . '/mail/new/?f=&hash=' . urlencode($item['author_xchan']);
-
+	}
 
 
 	if($contact) {

From 7ccf47f4c69e6deecf33f982ae3ea7497ac10ee6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 31 May 2017 20:08:35 -0700
Subject: [PATCH 211/299] don't allow negative age in directory listings

---
 Zotlabs/Module/Directory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index edcf43cd6..92c1e0245 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -233,7 +233,7 @@ class Directory extends \Zotlabs\Web\Controller {
 	
 							$age = '';
 							if(strlen($rr['birthday'])) {
-								if(($years = age($rr['birthday'],'UTC','')) != 0)
+								if(($years = age($rr['birthday'],'UTC','')) > 0)
 									$age = $years;
 							}
 	

From fc98bd1563ee71974d5d5c40d6ed8ed0c50f3c37 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 31 May 2017 20:59:36 -0700
Subject: [PATCH 212/299] minor export issue with mail

---
 include/channel.php |  4 ++--
 include/message.php | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/channel.php b/include/channel.php
index 77a4ba60f..b06c1994f 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -737,14 +737,14 @@ function identity_basic_export($channel_id, $sections = null) {
 			$ret['conv'] = $r;
 		}
 
-		$r = q("select * from mail where mail.uid = %d",
+		$r = q("select * from mail where channel_id = %d",
 			intval($channel_id)
 		);
 		if($r) {
 			$m = array();
 			foreach($r as $rr) {
 				xchan_mail_query($rr);
-				$m[] = mail_encode($rr,true);
+				$m[] = encode_mail($rr,true);
 			}
 			$ret['mail'] = $m;
 		}
diff --git a/include/message.php b/include/message.php
index a394a411d..5458eeb0e 100644
--- a/include/message.php
+++ b/include/message.php
@@ -452,10 +452,12 @@ function private_messages_drop($channel_id, $messageitem_id, $drop_conversation
 			intval($channel_id)
 		);
 		if($z) {
-			q("delete from conv where guid = '%s' and uid = %d",
-				dbesc($x[0]['conv_guid']),
-				intval($channel_id)
-			);		
+			if($x[0]['conv_guid']) {
+				q("delete from conv where guid = '%s' and uid = %d",
+					dbesc($x[0]['conv_guid']),
+					intval($channel_id)
+				);
+			}		
 			$m['mail'] = array();
 			foreach($z as $zz) {
 				xchan_mail_query($zz);

From e6581aa09c582e32f5b4e5b06243265abd1ff45e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 31 May 2017 21:57:01 -0700
Subject: [PATCH 213/299] active nav-link was white on white

---
 view/theme/redbasic/schema/dark.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index ebef68a52..756c583ff 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -139,6 +139,10 @@ option {
     background-color: #111;
 }
 
+.nav-link.active {
+	color:#000 !important;
+}
+
 a.btn, aside a {
 	font-weight: 400 !important;
 }

From cdfcb1ed24d950efa2a2054bec5267ecdae3fb68 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 31 May 2017 22:59:07 -0700
Subject: [PATCH 214/299] cleanup only

---
 include/photo/photo_driver.php |  5 ++---
 include/photos.php             | 14 +++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index cc1f3b5d0..0bf09e4d8 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -252,11 +252,10 @@ abstract class photo_driver {
 		 */
 
 		if(! $this->is_valid())
-			return FALSE;
-
+			return false;
 
 		if((! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg'))
-			return;
+			return false;
 
 		$exif = @exif_read_data($filename,null,true);
 
diff --git a/include/photos.php b/include/photos.php
index 896f3e1f2..c3260d18c 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -492,15 +492,15 @@ function photos_albums_list($channel, $observer, $sort_key = 'display_path', $di
 		$ret['success'] = true;
 		$ret['albums'] = array();
 		foreach($albums as $k => $album) {
-			$entry = array(
-				'text' => (($album['album']) ? $album['album'] : '/'),
+			$entry = [
+				'text'      => (($album['album']) ? $album['album'] : '/'),
 				'shorttext' => (($album['album']) ? ellipsify($album['album'],28) : '/'),
-				'jstext' => (($album['album']) ? addslashes($album['album']) : '/'),
-				'total' => $album['total'],
-				'url' => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'],
+				'jstext'    => (($album['album']) ? addslashes($album['album']) : '/'),
+				'total'     => $album['total'],
+				'url'       => z_root() . '/photos/' . $channel['channel_address'] . '/album/' . $album['folder'],
 				'urlencode' => urlencode($album['album']),
-				'bin2hex' => $album['folder']
-			);
+				'bin2hex'   => $album['folder']
+			];
 			$ret['albums'][] = $entry;
 		}
 	}

From 0b740826c5cfac8b2feddcf9e482731ebc78c553 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 1 Jun 2017 21:21:38 -0700
Subject: [PATCH 215/299] include/socgraph - remove a few obsolete and
 long-deprecated functions

---
 include/socgraph.php | 71 --------------------------------------------
 1 file changed, 71 deletions(-)

diff --git a/include/socgraph.php b/include/socgraph.php
index d28531c43..a5b5d1378 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -237,77 +237,6 @@ function common_friends($uid,$xchan,$start = 0,$limit=100000000,$shuffle = false
 }
 
 
-function count_common_friends_zcid($uid,$zcid) {
-
-	$r = q("SELECT count(*) as total 
-		FROM glink left join gcontact on glink.gcid = gcontact.id
-		where glink.zcid = %d
-		and gcontact.nurl in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) ",
-		intval($zcid),
-		intval($uid)
-	);
-
-	if(count($r))
-		return $r[0]['total'];
-
-	return 0;
-}
-
-function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = false) {
-
-	if($shuffle)
-		$sql_extra = " order by rand() ";
-	else
-		$sql_extra = " order by gcontact.name asc "; 
-
-	$r = q("SELECT gcontact.* 
-		FROM glink left join gcontact on glink.gcid = gcontact.id
-		where glink.zcid = %d
-		and gcontact.nurl in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) 
-		$sql_extra limit %d offset %d",
-		intval($zcid),
-		intval($uid),
-		intval($limit),
-		intval($start)
-	);
-
-	return $r;
-}
-
-
-function count_all_friends($uid,$cid) {
-
-	$r = q("SELECT count(*) as total
-		FROM glink left join gcontact on glink.gcid = gcontact.id
-		where glink.cid = %d and glink.uid = %d ",
-		intval($cid),
-		intval($uid)
-	);
-
-	if(count($r))
-		return $r[0]['total'];
-
-	return 0;
-}
-
-
-function all_friends($uid,$cid,$start = 0, $limit = 80) {
-
-	$r = q("SELECT gcontact.* 
-		FROM glink left join gcontact on glink.gcid = gcontact.id
-		where glink.cid = %d and glink.uid = %d 
-		order by gcontact.name asc LIMIT %d OFFSET %d ",
-		intval($cid),
-		intval($uid),
-		intval($limit),
-		intval($start)
-	);
-
-	return $r;
-}
-
-
-
 function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) {
 
 	if((! $uid) || (! $myxchan))

From c7f097ec849b05065f12246d2e647ead03f9592f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 3 Jun 2017 16:00:14 -0700
Subject: [PATCH 216/299] make authenticated oembeds optional, default to
 false.

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

diff --git a/include/oembed.php b/include/oembed.php
index 5865c95d5..e35a77fa3 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -134,7 +134,7 @@ function oembed_fetch_url($embedurl){
 	$txt = null;
 
 	// we should try to cache this and avoid a lookup on each render
-	$zrl = is_matrix_url($embedurl);
+	$zrl = ((get_config('system','oembed_zrl')) ? is_matrix_url($embedurl) : false);
 
 	$furl = ((local_channel() && $zrl) ? zid($embedurl) : $embedurl);
 

From 43914852e5214421a0c5c2256e61344617c4fd22 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 3 Jun 2017 16:08:08 -0700
Subject: [PATCH 217/299] oembed: ensure that width and height are returned as
 type int and not float

---
 Zotlabs/Module/Oep.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Oep.php b/Zotlabs/Module/Oep.php
index dc0547a42..9c05f5e3f 100644
--- a/Zotlabs/Module/Oep.php
+++ b/Zotlabs/Module/Oep.php
@@ -108,7 +108,7 @@ class Oep extends \Zotlabs\Web\Controller {
 		$ret['type'] = 'rich';
 	
 		$w = (($maxwidth) ? $maxwidth : 640);
-		$h = (($maxheight) ? $maxheight : $w * 2 / 3);
+		$h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
 	
 		$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>';
 		
@@ -167,7 +167,7 @@ class Oep extends \Zotlabs\Web\Controller {
 		$ret['type'] = 'rich';
 	
 		$w = (($maxwidth) ? $maxwidth : 640);
-		$h = (($maxheight) ? $maxheight : $w * 2 / 3);
+		$h = (($maxheight) ? $maxheight : intval($w * 2 / 3));
 	
 		$ret['html'] = '<div style="width: ' . $w . '; height: ' . $h . '; font-family: sans-serif,arial,freesans;" >' . $o . '</div>';
 		

From a94a42d60959bb3ff2dc1edcffa7237ac31bcc67 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 4 Jun 2017 19:09:05 -0700
Subject: [PATCH 218/299] ostatus feeds: extract photo information from posts
 and convert to enclosures as otherwise OStatus servers will strip them from
 the HTML in the feed and refuse to render them

---
 include/feedutils.php | 45 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index fe417f548..b658f6b0f 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -136,7 +136,7 @@ function get_feed_for($channel, $observer_hash, $params) {
 				continue;
 
 			/** @BUG $owner is undefined in this call */
-			$atom .= atom_entry($item, $type, null, $owner, true);
+			$atom .= atom_entry($item, $type, null, $owner, true, '', $params['compat']);
 		}
 	}
 
@@ -1306,6 +1306,28 @@ function atom_render_author($tag,$xchan) {
 
 }
 
+function compat_photos_list($s) {
+
+	$ret = [];
+
+	$found = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism',$s,$matches,PREG_SET_ORDER);
+
+	if($found) {
+		foreach($matches as $match) {
+			$ret[] = [
+				'href' => $match[2],
+				'length' => 0,
+				'type' => guess_image_type($match[2])
+			];
+
+		}
+	}
+
+	return $ret;
+}
+
+
+
 /**
  * @brief Create an item for the Atom feed.
  *
@@ -1319,7 +1341,8 @@ function atom_render_author($tag,$xchan) {
  * @param number $cid default 0
  * @return void|string
  */
-function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0) {
+function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $compat = false) {
+
 
 	if(! $item['parent'])
 		return;
@@ -1334,6 +1357,13 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0) {
 	else
 		$body = $item['body'];
 
+	if($compat) {
+		$compat_photos = compat_photos_list($body);
+	}
+	else {
+		$compat_photos = null;
+	}
+
 	$o = "\r\n\r\n<entry>\r\n";
 
 	if(is_array($author)) {
@@ -1403,10 +1433,19 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0) {
 				. (($enc['href']) ? 'href="' . $enc['href'] . '" ' : '')
 				. (($enc['length']) ? 'length="' . $enc['length'] . '" ' : '')
 				. (($enc['type']) ? 'type="' . $enc['type'] . '" ' : '')
-				. ' />';
+				. ' />' . "\r\n";
 			}
 		}
 	}
+	if($compat_photos) {
+		foreach($compat_photos as $enc) {
+			$o .= '<link rel="enclosure" '
+			. (($enc['href']) ? 'href="' . $enc['href'] . '" ' : '')
+			. (($enc['length']) ? 'length="' . $enc['length'] . '" ' : '')
+			. (($enc['type']) ? 'type="' . $enc['type'] . '" ' : '')
+			. ' />' . "\r\n";
+		}
+	}
 
 	if($item['term']) {
 		foreach($item['term'] as $term) {

From 2fea5ff8894c3f1f274a3ce67b2c023e39fdab6c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 4 Jun 2017 20:07:08 -0700
Subject: [PATCH 219/299] always add a length to ostatus compat enclosures -
 even if unknown (0)

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

diff --git a/include/feedutils.php b/include/feedutils.php
index b658f6b0f..70222c124 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1441,7 +1441,7 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $
 		foreach($compat_photos as $enc) {
 			$o .= '<link rel="enclosure" '
 			. (($enc['href']) ? 'href="' . $enc['href'] . '" ' : '')
-			. (($enc['length']) ? 'length="' . $enc['length'] . '" ' : '')
+			. ((array_key_exists('length',$enc)) ? 'length="' . $enc['length'] . '" ' : '')
 			. (($enc['type']) ? 'type="' . $enc['type'] . '" ' : '')
 			. ' />' . "\r\n";
 		}

From 83f8f8ebb8bc7e6cbbc3b71f664706e30dfe6c1c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 5 Jun 2017 15:57:43 -0700
Subject: [PATCH 220/299] whitespace

---
 include/photo/photo_driver.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 0bf09e4d8..eb61578e1 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -488,8 +488,10 @@ function guess_image_type($filename, $headers = '') {
 			$ext = pathinfo($filename, PATHINFO_EXTENSION);
 			$ph = photo_factory('');
 			$types = $ph->supportedTypes();
-			foreach ($types as $m=>$e){
-				if ($ext==$e) $type = $m;
+			foreach($types as $m => $e) {
+				if($ext === $e) {
+					$type = $m;
+				}
 			}
 		}
 
@@ -501,7 +503,7 @@ function guess_image_type($filename, $headers = '') {
 		}
 
 	}
-	logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
+	logger('Photo: guess_image_type: type = ' . $type, LOGGER_DEBUG);
 	return $type;
 
 }

From e917b949292fc83edb22d955251f8887544b772a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 6 Jun 2017 17:38:34 -0700
Subject: [PATCH 221/299] hubzilla issue #810

---
 Zotlabs/Module/Channel.php |  4 ++--
 include/taxonomy.php       | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 61df35a60..98a1e6c88 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -217,10 +217,10 @@ class Channel extends \Zotlabs\Web\Controller {
 		else {
 
 			if(x($category)) {
-				$sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY));
+				$sql_extra2 .= protect_sprintf(term_item_parent_query(\App::$profile['profile_uid'],'item', $category, TERM_CATEGORY));
 			}
 			if(x($hashtags)) {
-				$sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
+				$sql_extra2 .= protect_sprintf(term_item_parent_query(\App::$profile['profile_uid'],'item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG));
 			}
 
 			if($datequery) {
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 0b4b2aa9a..dc0e439e2 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -44,6 +44,36 @@ function term_query($table,$s,$type = TERM_UNKNOWN, $type2 = '') {
 }
 
 
+function term_item_parent_query($uid,$table,$s,$type = TERM_UNKNOWN, $type2 = '') {
+
+	if($type2) {
+		$r = q("select parent from item left join term on term.oid = item.id where term.ttype in (%d, %d) and term.term = '%s' and term.uid = %d and term.otype = 1",
+			intval($type),
+			intval($type2),
+			dbesc($s),
+			intval($uid)
+		);
+	}
+	else {
+		$r = q("select parent from item left join term on term.oid = item.id where term.ttype = %d and term.term = '%s' and term.uid = %d and term.otype = 1",
+			intval($type),
+			dbesc($s),
+			intval($uid)
+		);
+	}
+	if($r) {
+		$str = '';
+		foreach($r as $rv) {
+			if($str)
+				$str .= ',';
+			$str .= intval($rv['parent']);
+		}
+		return " AND " . (($table) ? dbesc($table) . '.' : '') . "id in ( $str ) ";
+	}
+	return " AND false ";
+}
+
+
 function store_item_tag($uid,$iid,$otype,$type,$term,$url = '') {
 	if(! $term) 
 		return false;

From f49ce500a1aad627de4d1558b0d018735a1a6e31 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 6 Jun 2017 18:12:44 -0700
Subject: [PATCH 222/299] fix a merge mixup on install/schema_msyql.php

---
 install/schema_mysql.sql | 460 +++++++++++++++++++--------------------
 1 file changed, 230 insertions(+), 230 deletions(-)

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 4de9c0917..0d3ca2e71 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -15,26 +15,26 @@ CREATE TABLE IF NOT EXISTS `abconfig` (
 
 CREATE TABLE IF NOT EXISTS `abook` (
   `abook_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `abook_account` int(10) unsigned NOT NULL DEFAULT '0',
-  `abook_channel` int(10) unsigned NOT NULL DEFAULT '0',
+  `abook_account` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `abook_channel` int(10) unsigned NOT NULL DEFAULT 0 ,
   `abook_xchan` char(191) NOT NULL DEFAULT '',
-  `abook_my_perms` int(11) NOT NULL DEFAULT '0',
-  `abook_their_perms` int(11) NOT NULL DEFAULT '0',
-  `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT '99',
+  `abook_my_perms` int(11) NOT NULL DEFAULT 0 ,
+  `abook_their_perms` int(11) NOT NULL DEFAULT 0 ,
+  `abook_closeness` tinyint(3) unsigned NOT NULL DEFAULT 99,
   `abook_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `abook_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `abook_connected` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `abook_dob` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `abook_flags` int(11) NOT NULL DEFAULT '0',
-  `abook_blocked` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_ignored` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_hidden` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_archived` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_pending` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_unconnected` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_self` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_feed` tinyint(4) NOT NULL DEFAULT '0',
-  `abook_not_here` tinyint(4) NOT NULL DEFAULT '0',
+  `abook_flags` int(11) NOT NULL DEFAULT 0 ,
+  `abook_blocked` tinyint(4) NOT NULL DEFAULT 0 ,
+  `abook_ignored` tinyint(4) NOT NULL DEFAULT 0 ,
+  `abook_hidden` tinyint(4) NOT NULL DEFAULT 0 ,
+  `abook_archived` tinyint(4) NOT NULL DEFAULT 0 ,
+  `abook_pending` tinyint(4) NOT NULL DEFAULT 0 ,
+  `abook_unconnected` tinyint(4) NOT NULL DEFAULT 0 ,
+  `abook_self` tinyint(4) NOT NULL DEFAULT 0 ,
+  `abook_feed` tinyint(4) NOT NULL DEFAULT 0 ,
+  `abook_not_here` tinyint(4) NOT NULL DEFAULT 0 ,
   `abook_profile` char(191) NOT NULL DEFAULT '',
   `abook_incl` TEXT NOT NULL,
   `abook_excl` TEXT NOT NULL,
@@ -63,8 +63,8 @@ CREATE TABLE IF NOT EXISTS `abook` (
 
 CREATE TABLE IF NOT EXISTS `account` (
   `account_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `account_parent` int(10) unsigned NOT NULL DEFAULT '0',
-  `account_default_channel` int(10) unsigned NOT NULL DEFAULT '0',
+  `account_parent` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `account_default_channel` int(10) unsigned NOT NULL DEFAULT 0 ,
   `account_salt` char(32) NOT NULL DEFAULT '',
   `account_password` char(191) NOT NULL DEFAULT '',
   `account_email` char(191) NOT NULL DEFAULT '',
@@ -72,13 +72,13 @@ CREATE TABLE IF NOT EXISTS `account` (
   `account_language` char(16) NOT NULL DEFAULT 'en',
   `account_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `account_lastlog` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `account_flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `account_roles` int(10) unsigned NOT NULL DEFAULT '0',
+  `account_flags` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `account_roles` int(10) unsigned NOT NULL DEFAULT 0 ,
   `account_reset` char(191) NOT NULL DEFAULT '',
   `account_expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `account_expire_notified` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `account_service_class` char(32) NOT NULL DEFAULT '',
-  `account_level` int(10) unsigned NOT NULL DEFAULT '0',
+  `account_level` int(10) unsigned NOT NULL DEFAULT 0 ,
   `account_password_changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`account_id`),
   KEY `account_email` (`account_email`),
@@ -98,10 +98,10 @@ CREATE TABLE IF NOT EXISTS `addon` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `aname` char(191) NOT NULL DEFAULT '',
   `version` char(191) NOT NULL DEFAULT '',
-  `installed` tinyint(1) NOT NULL DEFAULT '0',
-  `hidden` tinyint(1) NOT NULL DEFAULT '0',
-  `tstamp` bigint(20) NOT NULL DEFAULT '0',
-  `plugin_admin` tinyint(1) NOT NULL DEFAULT '0',
+  `installed` tinyint(1) NOT NULL DEFAULT 0 ,
+  `hidden` tinyint(1) NOT NULL DEFAULT 0 ,
+  `tstamp` bigint(20) NOT NULL DEFAULT 0 ,
+  `plugin_admin` tinyint(1) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
   KEY `hidden` (`hidden`),
   KEY `aname` (`aname`),
@@ -118,13 +118,13 @@ CREATE TABLE IF NOT EXISTS `app` (
   `app_url` char(191) NOT NULL DEFAULT '',
   `app_photo` char(191) NOT NULL DEFAULT '',
   `app_version` char(191) NOT NULL DEFAULT '',
-  `app_channel` int(11) NOT NULL DEFAULT '0',
+  `app_channel` int(11) NOT NULL DEFAULT 0 ,
   `app_addr` char(191) NOT NULL DEFAULT '',
   `app_price` char(191) NOT NULL DEFAULT '',
   `app_page` char(191) NOT NULL DEFAULT '',
   `app_requires` char(191) NOT NULL DEFAULT '',
-  `app_deleted` int(11) NOT NULL DEFAULT '0',
-  `app_system` int(11) NOT NULL DEFAULT '0',
+  `app_deleted` int(11) NOT NULL DEFAULT 0 ,
+  `app_system` int(11) NOT NULL DEFAULT 0 ,
   `app_plugin` char(191) NOT NULL DEFAULT '',
   `app_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `app_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -145,8 +145,8 @@ CREATE TABLE IF NOT EXISTS `app` (
 
 CREATE TABLE IF NOT EXISTS `atoken` (
   `atoken_id` int(11) NOT NULL AUTO_INCREMENT,
-  `atoken_aid` int(11) NOT NULL DEFAULT 0,
-  `atoken_uid` int(11) NOT NULL DEFAULT 0,
+  `atoken_aid` int(11) NOT NULL DEFAULT 0 ,
+  `atoken_uid` int(11) NOT NULL DEFAULT 0 ,
   `atoken_name` char(191) NOT NULL DEFAULT '',
   `atoken_token` char(191) NOT NULL DEFAULT '',
   `atoken_expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -161,19 +161,19 @@ CREATE TABLE IF NOT EXISTS `atoken` (
 
 CREATE TABLE IF NOT EXISTS `attach` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `aid` int(10) unsigned NOT NULL DEFAULT '0',
-  `uid` int(10) unsigned NOT NULL DEFAULT '0',
+  `aid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `hash` char(191) NOT NULL DEFAULT '',
   `creator` char(191) NOT NULL DEFAULT '',
   `filename` char(191) NOT NULL DEFAULT '',
   `filetype` char(191) NOT NULL DEFAULT '',
-  `filesize` int(10) unsigned NOT NULL DEFAULT '0',
-  `revision` int(10) unsigned NOT NULL DEFAULT '0',
+  `filesize` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `revision` int(10) unsigned NOT NULL DEFAULT 0 ,
   `folder` char(191) NOT NULL DEFAULT '',
-  `flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `is_dir` tinyint(1) NOT NULL DEFAULT '0',
-  `is_photo` tinyint(1) NOT NULL DEFAULT '0',
-  `os_storage` tinyint(1) NOT NULL DEFAULT '0',
+  `flags` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `is_dir` tinyint(1) NOT NULL DEFAULT 0 ,
+  `is_photo` tinyint(1) NOT NULL DEFAULT 0 ,
+  `os_storage` tinyint(1) NOT NULL DEFAULT 0 ,
   `os_path` mediumtext NOT NULL,
   `display_path` mediumtext NOT NULL,
   `content` longblob NOT NULL,
@@ -205,7 +205,7 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
   `id` varchar(40) NOT NULL DEFAULT '',
   `client_id` varchar(20) NOT NULL DEFAULT '',
   `redirect_uri` varchar(200) NOT NULL DEFAULT '',
-  `expires` int(11) NOT NULL DEFAULT '0',
+  `expires` int(11) NOT NULL DEFAULT 0 ,
   `auth_scope` varchar(512) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -219,8 +219,8 @@ CREATE TABLE IF NOT EXISTS `cache` (
 
 CREATE TABLE IF NOT EXISTS `cal` (
   `cal_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `cal_aid` int(10) unsigned NOT NULL DEFAULT '0',
-  `cal_uid` int(10) unsigned NOT NULL DEFAULT '0',
+  `cal_aid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `cal_uid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `cal_hash` varchar(191) NOT NULL DEFAULT '',
   `cal_name` varchar(191) NOT NULL DEFAULT '',
   `uri` varchar(191) NOT NULL DEFAULT '',
@@ -239,8 +239,8 @@ CREATE TABLE IF NOT EXISTS `cal` (
 
 CREATE TABLE IF NOT EXISTS `channel` (
   `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_primary` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `channel_account_id` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_primary` tinyint(1) unsigned NOT NULL DEFAULT 0 ,
   `channel_name` char(191) NOT NULL DEFAULT '',
   `channel_address` char(191) NOT NULL DEFAULT '',
   `channel_guid` char(191) NOT NULL DEFAULT '',
@@ -252,40 +252,40 @@ CREATE TABLE IF NOT EXISTS `channel` (
   `channel_startpage` char(191) NOT NULL DEFAULT '',
   `channel_pubkey` text NOT NULL,
   `channel_prvkey` text NOT NULL,
-  `channel_notifyflags` int(10) unsigned NOT NULL DEFAULT '65535',
-  `channel_pageflags` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_notifyflags` int(10) unsigned NOT NULL DEFAULT 65535,
+  `channel_pageflags` int(10) unsigned NOT NULL DEFAULT 0 ,
   `channel_dirdate` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `channel_lastpost` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `channel_deleted` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `channel_max_anon_mail` int(10) unsigned NOT NULL DEFAULT '10',
-  `channel_max_friend_req` int(10) unsigned NOT NULL DEFAULT '10',
-  `channel_expire_days` int(11) NOT NULL DEFAULT '0',
+  `channel_max_anon_mail` int(10) unsigned NOT NULL DEFAULT 10,
+  `channel_max_friend_req` int(10) unsigned NOT NULL DEFAULT 10,
+  `channel_expire_days` int(11) NOT NULL DEFAULT 0 ,
   `channel_passwd_reset` char(191) NOT NULL DEFAULT '',
   `channel_default_group` char(191) NOT NULL DEFAULT '',
   `channel_allow_cid` mediumtext NOT NULL,
   `channel_allow_gid` mediumtext NOT NULL,
   `channel_deny_cid` mediumtext NOT NULL,
   `channel_deny_gid` mediumtext NOT NULL,
-  `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_storage` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_storage` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_r_pages` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_pages` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_a_republish` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_w_like` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_removed` tinyint(1) NOT NULL DEFAULT '0',
-  `channel_system` tinyint(1) NOT NULL DEFAULT '0',
+  `channel_r_stream` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_r_profile` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_r_photos` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_r_abook` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_stream` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_wall` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_comment` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_mail` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_photos` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_chat` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_r_storage` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_storage` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_r_pages` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_pages` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_a_republish` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_w_like` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_removed` tinyint(1) NOT NULL DEFAULT 0 ,
+  `channel_system` tinyint(1) NOT NULL DEFAULT 0 ,
   `channel_moved` char(191) NOT NULL DEFAULT '',
   `channel_password` varchar(191) NOT NULL,
   `channel_salt` varchar(191) NOT NULL,
@@ -315,7 +315,7 @@ CREATE TABLE IF NOT EXISTS `channel` (
 
 CREATE TABLE IF NOT EXISTS `chat` (
   `chat_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `chat_room` int(10) unsigned NOT NULL DEFAULT '0',
+  `chat_room` int(10) unsigned NOT NULL DEFAULT 0 ,
   `chat_xchan` char(191) NOT NULL DEFAULT '',
   `chat_text` mediumtext NOT NULL,
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -327,7 +327,7 @@ CREATE TABLE IF NOT EXISTS `chat` (
 
 CREATE TABLE IF NOT EXISTS `chatpresence` (
   `cp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `cp_room` int(10) unsigned NOT NULL DEFAULT '0',
+  `cp_room` int(10) unsigned NOT NULL DEFAULT 0 ,
   `cp_xchan` char(191) NOT NULL DEFAULT '',
   `cp_last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `cp_status` char(191) NOT NULL DEFAULT '',
@@ -341,12 +341,12 @@ CREATE TABLE IF NOT EXISTS `chatpresence` (
 
 CREATE TABLE IF NOT EXISTS `chatroom` (
   `cr_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `cr_aid` int(10) unsigned NOT NULL DEFAULT '0',
-  `cr_uid` int(10) unsigned NOT NULL DEFAULT '0',
+  `cr_aid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `cr_uid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `cr_name` char(191) NOT NULL DEFAULT '',
   `cr_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `cr_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `cr_expire` int(10) unsigned NOT NULL DEFAULT '0',
+  `cr_expire` int(10) unsigned NOT NULL DEFAULT 0 ,
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -366,7 +366,7 @@ CREATE TABLE IF NOT EXISTS `clients` (
   `redirect_uri` varchar(200) NOT NULL DEFAULT '',
   `clname` text,
   `icon` text,
-  `uid` int(11) NOT NULL DEFAULT '0',
+  `uid` int(11) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`client_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
@@ -383,7 +383,7 @@ CREATE TABLE IF NOT EXISTS `conv` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `guid` char(191) NOT NULL DEFAULT '',
   `recips` mediumtext NOT NULL,
-  `uid` int(11) NOT NULL DEFAULT '0',
+  `uid` int(11) NOT NULL DEFAULT 0 ,
   `creator` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -395,7 +395,7 @@ CREATE TABLE IF NOT EXISTS `conv` (
 
 CREATE TABLE IF NOT EXISTS `dreport` (
   `dreport_id` int(11) NOT NULL AUTO_INCREMENT,
-  `dreport_channel` int(11) NOT NULL DEFAULT '0',
+  `dreport_channel` int(11) NOT NULL DEFAULT 0 ,
   `dreport_mid` char(191) NOT NULL DEFAULT '',
   `dreport_site` char(191) NOT NULL DEFAULT '',
   `dreport_recip` char(191) NOT NULL DEFAULT '',
@@ -414,9 +414,9 @@ CREATE TABLE IF NOT EXISTS `dreport` (
 
 CREATE TABLE IF NOT EXISTS `event` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `aid` int(10) unsigned NOT NULL DEFAULT '0',
-  `uid` int(11) NOT NULL DEFAULT '0',
-  `cal_id` int(11) unsigned NOT NULL DEFAULT '0',
+  `aid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `uid` int(11) NOT NULL DEFAULT 0 ,
+  `cal_id` int(11) unsigned NOT NULL DEFAULT 0 ,
   `event_xchan` char(191) NOT NULL DEFAULT '',
   `event_hash` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -427,19 +427,19 @@ CREATE TABLE IF NOT EXISTS `event` (
   `description` text NOT NULL,
   `location` text NOT NULL,
   `etype` char(191) NOT NULL DEFAULT '',
-  `nofinish` tinyint(1) NOT NULL DEFAULT '0',
-  `adjust` tinyint(1) NOT NULL DEFAULT '1',
-  `dismissed` tinyint(1) NOT NULL DEFAULT '0',
+  `nofinish` tinyint(1) NOT NULL DEFAULT 0 ,
+  `adjust` tinyint(1) NOT NULL DEFAULT 1,
+  `dismissed` tinyint(1) NOT NULL DEFAULT 0 ,
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
   `deny_gid` mediumtext NOT NULL,
   `event_status` char(191) NOT NULL DEFAULT '',
   `event_status_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `event_percent` smallint(6) NOT NULL DEFAULT '0',
+  `event_percent` smallint(6) NOT NULL DEFAULT 0 ,
   `event_repeat` text NOT NULL,
-  `event_sequence` smallint(6) NOT NULL DEFAULT '0',
-  `event_priority` smallint(6) NOT NULL DEFAULT '0',
+  `event_sequence` smallint(6) NOT NULL DEFAULT 0 ,
+  `event_priority` smallint(6) NOT NULL DEFAULT 0 ,
   `event_vdata` text NOT NULL,
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
@@ -461,9 +461,9 @@ CREATE TABLE IF NOT EXISTS `event` (
 CREATE TABLE IF NOT EXISTS `groups` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `hash` char(191) NOT NULL DEFAULT '',
-  `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `visible` tinyint(1) NOT NULL DEFAULT '0',
-  `deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `visible` tinyint(1) NOT NULL DEFAULT 0 ,
+  `deleted` tinyint(1) NOT NULL DEFAULT 0 ,
   `gname` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
@@ -475,8 +475,8 @@ CREATE TABLE IF NOT EXISTS `groups` (
 
 CREATE TABLE IF NOT EXISTS `group_member` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `gid` int(10) unsigned NOT NULL DEFAULT '0',
+  `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `gid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `xchan` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
@@ -489,8 +489,8 @@ CREATE TABLE IF NOT EXISTS `hook` (
   `hook` char(191) NOT NULL DEFAULT '',
   `file` char(191) NOT NULL DEFAULT '',
   `fn` char(191) NOT NULL DEFAULT '',
-  `priority` smallint NOT NULL DEFAULT '0',
-  `hook_version` int(11) NOT NULL DEFAULT '0',
+  `priority` smallint NOT NULL DEFAULT 0 ,
+  `hook_version` int(11) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
   KEY `hook` (`hook`),
   KEY `priority` (`priority`),
@@ -504,8 +504,8 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
   `hubloc_hash` char(191) NOT NULL DEFAULT '',
   `hubloc_addr` char(191) NOT NULL DEFAULT '',
   `hubloc_network` char(32) NOT NULL DEFAULT '',
-  `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `hubloc_status` int(10) unsigned NOT NULL DEFAULT '0',
+  `hubloc_flags` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `hubloc_status` int(10) unsigned NOT NULL DEFAULT 0 ,
   `hubloc_url` char(191) NOT NULL DEFAULT '',
   `hubloc_url_sig` text NOT NULL,
   `hubloc_host` char(191) NOT NULL DEFAULT '',
@@ -514,10 +514,10 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
   `hubloc_sitekey` text NOT NULL,
   `hubloc_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `hubloc_connected` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `hubloc_primary` tinyint(1) NOT NULL DEFAULT '0',
-  `hubloc_orphancheck` tinyint(1) NOT NULL DEFAULT '0',
-  `hubloc_error` tinyint(1) NOT NULL DEFAULT '0',
-  `hubloc_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `hubloc_primary` tinyint(1) NOT NULL DEFAULT 0 ,
+  `hubloc_orphancheck` tinyint(1) NOT NULL DEFAULT 0 ,
+  `hubloc_error` tinyint(1) NOT NULL DEFAULT 0 ,
+  `hubloc_deleted` tinyint(1) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`hubloc_id`),
   KEY `hubloc_url` (`hubloc_url`),
   KEY `hubloc_guid` (`hubloc_guid`),
@@ -539,11 +539,11 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
 
 CREATE TABLE IF NOT EXISTS `iconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `iid` int(11) NOT NULL DEFAULT '0',
+  `iid` int(11) NOT NULL DEFAULT 0 ,
   `cat` char(191) NOT NULL DEFAULT '',
   `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
-  `sharing` int(11) NOT NULL DEFAULT '0',
+  `sharing` int(11) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
   KEY `iid` (`iid`),
   KEY `cat` (`cat`),
@@ -556,8 +556,8 @@ CREATE TABLE IF NOT EXISTS `issue` (
   `issue_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `issue_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `issue_assigned` char(191) NOT NULL DEFAULT '',
-  `issue_priority` int(11) NOT NULL DEFAULT '0',
-  `issue_status` int(11) NOT NULL DEFAULT '0',
+  `issue_priority` int(11) NOT NULL DEFAULT 0 ,
+  `issue_status` int(11) NOT NULL DEFAULT 0 ,
   `issue_component` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`issue_id`),
   KEY `issue_created` (`issue_created`),
@@ -571,9 +571,9 @@ CREATE TABLE IF NOT EXISTS `issue` (
 CREATE TABLE IF NOT EXISTS `item` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `mid` char(191) NOT NULL DEFAULT '',
-  `aid` int(10) unsigned NOT NULL DEFAULT '0',
-  `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `parent` int(10) unsigned NOT NULL DEFAULT '0',
+  `aid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `parent` int(10) unsigned NOT NULL DEFAULT 0 ,
   `parent_mid` char(191) NOT NULL DEFAULT '',
   `thr_parent` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -592,7 +592,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   `html` mediumtext NOT NULL,
   `app` char(191) NOT NULL DEFAULT '',
   `lang` char(64) NOT NULL DEFAULT '',
-  `revision` int(10) unsigned NOT NULL DEFAULT '0',
+  `revision` int(10) unsigned NOT NULL DEFAULT 0 ,
   `verb` char(191) NOT NULL DEFAULT '',
   `obj_type` char(191) NOT NULL DEFAULT '',
   `obj` text NOT NULL,
@@ -615,32 +615,32 @@ CREATE TABLE IF NOT EXISTS `item` (
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
   `deny_gid` mediumtext NOT NULL,
-  `item_restrict` int(11) NOT NULL DEFAULT '0',
-  `item_flags` int(11) NOT NULL DEFAULT '0',
-  `item_private` tinyint(1) NOT NULL DEFAULT '0',
-  `item_origin` tinyint(1) NOT NULL DEFAULT '0',
-  `item_unseen` tinyint(1) NOT NULL DEFAULT '0',
-  `item_starred` tinyint(1) NOT NULL DEFAULT '0',
-  `item_uplink` tinyint(1) NOT NULL DEFAULT '0',
-  `item_consensus` tinyint(1) NOT NULL DEFAULT '0',
-  `item_wall` tinyint(1) NOT NULL DEFAULT '0',
-  `item_thread_top` tinyint(1) NOT NULL DEFAULT '0',
-  `item_notshown` tinyint(1) NOT NULL DEFAULT '0',
-  `item_nsfw` tinyint(1) NOT NULL DEFAULT '0',
-  `item_relay` tinyint(1) NOT NULL DEFAULT '0',
-  `item_mentionsme` tinyint(1) NOT NULL DEFAULT '0',
-  `item_nocomment` tinyint(1) NOT NULL DEFAULT '0',
-  `item_obscured` tinyint(1) NOT NULL DEFAULT '0',
-  `item_verified` tinyint(1) NOT NULL DEFAULT '0',
-  `item_retained` tinyint(1) NOT NULL DEFAULT '0',
-  `item_rss` tinyint(1) NOT NULL DEFAULT '0',
-  `item_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `item_type` int(11) NOT NULL DEFAULT '0',
-  `item_hidden` tinyint(1) NOT NULL DEFAULT '0',
-  `item_unpublished` tinyint(1) NOT NULL DEFAULT '0',
-  `item_delayed` tinyint(1) NOT NULL DEFAULT '0',
-  `item_pending_remove` tinyint(1) NOT NULL DEFAULT '0',
-  `item_blocked` tinyint(1) NOT NULL DEFAULT '0',
+  `item_restrict` int(11) NOT NULL DEFAULT 0 ,
+  `item_flags` int(11) NOT NULL DEFAULT 0 ,
+  `item_private` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_origin` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_unseen` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_starred` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_uplink` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_consensus` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_wall` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_thread_top` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_notshown` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_nsfw` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_relay` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_mentionsme` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_nocomment` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_obscured` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_verified` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_retained` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_rss` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_deleted` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_type` int(11) NOT NULL DEFAULT 0 ,
+  `item_hidden` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_unpublished` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_delayed` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_pending_remove` tinyint(1) NOT NULL DEFAULT 0 ,
+  `item_blocked` tinyint(1) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `parent` (`parent`),
@@ -697,8 +697,8 @@ CREATE TABLE IF NOT EXISTS `item` (
 
 CREATE TABLE IF NOT EXISTS `item_id` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `iid` int(11) NOT NULL DEFAULT '0',
-  `uid` int(11) NOT NULL DEFAULT '0',
+  `iid` int(11) NOT NULL DEFAULT 0 ,
+  `uid` int(11) NOT NULL DEFAULT 0 ,
   `sid` char(191) NOT NULL DEFAULT '',
   `service` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
@@ -710,10 +710,10 @@ CREATE TABLE IF NOT EXISTS `item_id` (
 
 CREATE TABLE IF NOT EXISTS `likes` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `channel_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_id` int(10) unsigned NOT NULL DEFAULT 0 ,
   `liker` char(191) NOT NULL DEFAULT '',
   `likee` char(191) NOT NULL DEFAULT '',
-  `iid` int(11) unsigned NOT NULL DEFAULT '0',
+  `iid` int(11) unsigned NOT NULL DEFAULT 0 ,
   `i_mid` char(191) NOT NULL DEFAULT '',
   `verb` char(191) NOT NULL DEFAULT '',
   `target_type` char(191) NOT NULL DEFAULT '',
@@ -732,13 +732,13 @@ CREATE TABLE IF NOT EXISTS `likes` (
 
 CREATE TABLE IF NOT EXISTS `mail` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `convid` int(10) unsigned NOT NULL DEFAULT '0',
+  `convid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `conv_guid` char(191) NOT NULL DEFAULT '',
-  `mail_flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `mail_flags` int(10) unsigned NOT NULL DEFAULT 0 ,
   `from_xchan` char(191) NOT NULL DEFAULT '',
   `to_xchan` char(191) NOT NULL DEFAULT '',
-  `account_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `channel_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `account_id` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `channel_id` int(10) unsigned NOT NULL DEFAULT 0 ,
   `mail_mimetype` char(64) NOT NULL DEFAULT 'text/bbcode',
   `title` text NOT NULL,
   `body` mediumtext NOT NULL,
@@ -746,13 +746,13 @@ CREATE TABLE IF NOT EXISTS `mail` (
   `attach` mediumtext NOT NULL,
   `mid` char(191) NOT NULL DEFAULT '',
   `parent_mid` char(191) NOT NULL DEFAULT '',
-  `mail_deleted` tinyint(4) NOT NULL DEFAULT '0',
-  `mail_replied` tinyint(4) NOT NULL DEFAULT '0',
-  `mail_isreply` tinyint(4) NOT NULL DEFAULT '0',
-  `mail_seen` tinyint(4) NOT NULL DEFAULT '0',
-  `mail_recalled` tinyint(4) NOT NULL DEFAULT '0',
-  `mail_obscured` smallint(6) NOT NULL DEFAULT '0',
-  `mail_raw` tinyint(4) NOT NULL DEFAULT '0',
+  `mail_deleted` tinyint(4) NOT NULL DEFAULT 0 ,
+  `mail_replied` tinyint(4) NOT NULL DEFAULT 0 ,
+  `mail_isreply` tinyint(4) NOT NULL DEFAULT 0 ,
+  `mail_seen` tinyint(4) NOT NULL DEFAULT 0 ,
+  `mail_recalled` tinyint(4) NOT NULL DEFAULT 0 ,
+  `mail_obscured` smallint(6) NOT NULL DEFAULT 0 ,
+  `mail_raw` tinyint(4) NOT NULL DEFAULT 0 ,
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`id`),
@@ -777,10 +777,10 @@ CREATE TABLE IF NOT EXISTS `mail` (
 
 CREATE TABLE IF NOT EXISTS `menu` (
   `menu_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `menu_channel_id` int(10) unsigned NOT NULL DEFAULT 0 ,
   `menu_name` char(191) NOT NULL DEFAULT '',
   `menu_desc` char(191) NOT NULL DEFAULT '',
-  `menu_flags` int(11) NOT NULL DEFAULT '0',
+  `menu_flags` int(11) NOT NULL DEFAULT 0 ,
   `menu_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `menu_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`menu_id`),
@@ -795,14 +795,14 @@ CREATE TABLE IF NOT EXISTS `menu_item` (
   `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `mitem_link` char(191) NOT NULL DEFAULT '',
   `mitem_desc` char(191) NOT NULL DEFAULT '',
-  `mitem_flags` int(11) NOT NULL DEFAULT '0',
+  `mitem_flags` int(11) NOT NULL DEFAULT 0 ,
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
   `deny_gid` mediumtext NOT NULL,
-  `mitem_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `mitem_menu_id` int(10) unsigned NOT NULL DEFAULT '0',
-  `mitem_order` int(11) NOT NULL DEFAULT '0',
+  `mitem_channel_id` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `mitem_menu_id` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `mitem_order` int(11) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`mitem_id`),
   KEY `mitem_channel_id` (`mitem_channel_id`),
   KEY `mitem_menu_id` (`mitem_menu_id`),
@@ -817,12 +817,12 @@ CREATE TABLE IF NOT EXISTS `notify` (
   `photo` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `msg` mediumtext NOT NULL,
-  `aid` int(11) NOT NULL DEFAULT '0',
-  `uid` int(11) NOT NULL DEFAULT '0',
+  `aid` int(11) NOT NULL DEFAULT 0 ,
+  `uid` int(11) NOT NULL DEFAULT 0 ,
   `link` char(191) NOT NULL DEFAULT '',
   `parent` char(191) NOT NULL DEFAULT '',
-  `seen` tinyint(1) NOT NULL DEFAULT '0',
-  `ntype` int(11) NOT NULL DEFAULT '0',
+  `seen` tinyint(1) NOT NULL DEFAULT 0 ,
+  `ntype` int(11) NOT NULL DEFAULT 0 ,
   `verb` char(191) NOT NULL DEFAULT '',
   `otype` char(16) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
@@ -841,15 +841,15 @@ CREATE TABLE IF NOT EXISTS `obj` (
   `obj_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `obj_page` char(64) NOT NULL DEFAULT '',
   `obj_verb` char(191) NOT NULL DEFAULT '',
-  `obj_type` int(10) unsigned NOT NULL DEFAULT '0',
+  `obj_type` int(10) unsigned NOT NULL DEFAULT 0 ,
   `obj_obj` char(191) NOT NULL DEFAULT '',
-  `obj_channel` int(10) unsigned NOT NULL DEFAULT '0',
+  `obj_channel` int(10) unsigned NOT NULL DEFAULT 0 ,
   `obj_term` char(191) NOT NULL DEFAULT '',
   `obj_url` char(191) NOT NULL DEFAULT '',
   `obj_imgurl` char(191) NOT NULL DEFAULT '',
   `obj_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `obj_edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `obj_quantity` int(11) NOT NULL DEFAULT '0',
+  `obj_quantity` int(11) NOT NULL DEFAULT 0 ,
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -870,18 +870,18 @@ CREATE TABLE IF NOT EXISTS `obj` (
 
 CREATE TABLE IF NOT EXISTS `outq` (
   `outq_hash` char(191) NOT NULL,
-  `outq_account` int(10) unsigned NOT NULL DEFAULT '0',
-  `outq_channel` int(10) unsigned NOT NULL DEFAULT '0',
+  `outq_account` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `outq_channel` int(10) unsigned NOT NULL DEFAULT 0 ,
   `outq_driver` char(32) NOT NULL DEFAULT '',
   `outq_posturl` char(191) NOT NULL DEFAULT '',
-  `outq_async` tinyint(1) NOT NULL DEFAULT '0',
-  `outq_delivered` tinyint(1) NOT NULL DEFAULT '0',
+  `outq_async` tinyint(1) NOT NULL DEFAULT 0 ,
+  `outq_delivered` tinyint(1) NOT NULL DEFAULT 0 ,
   `outq_created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `outq_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `outq_scheduled` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `outq_notify` mediumtext NOT NULL,
   `outq_msg` mediumtext NOT NULL,
-  `outq_priority` smallint(6) NOT NULL DEFAULT '0',
+  `outq_priority` smallint(6) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`outq_hash`),
   KEY `outq_account` (`outq_account`),
   KEY `outq_channel` (`outq_channel`),
@@ -896,7 +896,7 @@ CREATE TABLE IF NOT EXISTS `outq` (
 
 CREATE TABLE IF NOT EXISTS `pconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `uid` int(11) NOT NULL DEFAULT '0',
+  `uid` int(11) NOT NULL DEFAULT 0 ,
   `cat` char(100) NOT NULL DEFAULT '',
   `k` char(100) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
@@ -907,8 +907,8 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
 
 CREATE TABLE IF NOT EXISTS `photo` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `aid` int(10) unsigned NOT NULL DEFAULT '0',
-  `uid` int(10) unsigned NOT NULL DEFAULT '0',
+  `aid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `xchan` char(191) NOT NULL DEFAULT '',
   `resource_id` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -918,18 +918,18 @@ CREATE TABLE IF NOT EXISTS `photo` (
   `album` char(191) NOT NULL DEFAULT '',
   `filename` char(191) NOT NULL DEFAULT '',
   `mimetype` char(128) NOT NULL DEFAULT 'image/jpeg',
-  `height` smallint(6) NOT NULL DEFAULT '0',
-  `width` smallint(6) NOT NULL DEFAULT '0',
-  `filesize` int(10) unsigned NOT NULL DEFAULT '0',
+  `height` smallint(6) NOT NULL DEFAULT 0 ,
+  `width` smallint(6) NOT NULL DEFAULT 0 ,
+  `filesize` int(10) unsigned NOT NULL DEFAULT 0 ,
   `content` mediumblob NOT NULL,
-  `imgscale` tinyint(3) NOT NULL DEFAULT '0',
-  `photo_usage` smallint(6) NOT NULL DEFAULT '0',
-  `profile` tinyint(1) NOT NULL DEFAULT '0',
-  `is_nsfw` tinyint(1) NOT NULL DEFAULT '0',
-  `os_storage` tinyint(1) NOT NULL DEFAULT '0',
+  `imgscale` tinyint(3) NOT NULL DEFAULT 0 ,
+  `photo_usage` smallint(6) NOT NULL DEFAULT 0 ,
+  `profile` tinyint(1) NOT NULL DEFAULT 0 ,
+  `is_nsfw` tinyint(1) NOT NULL DEFAULT 0 ,
+  `os_storage` tinyint(1) NOT NULL DEFAULT 0 ,
   `os_path` mediumtext NOT NULL,
   `display_path` mediumtext NOT NULL,
-  `photo_flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `photo_flags` int(10) unsigned NOT NULL DEFAULT 0 ,
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -952,10 +952,10 @@ CREATE TABLE IF NOT EXISTS `photo` (
 
 CREATE TABLE IF NOT EXISTS `poll` (
   `poll_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `poll_channel` int(10) unsigned NOT NULL DEFAULT '0',
+  `poll_channel` int(10) unsigned NOT NULL DEFAULT 0 ,
   `poll_desc` text NOT NULL,
-  `poll_flags` int(11) NOT NULL DEFAULT '0',
-  `poll_votes` int(11) NOT NULL DEFAULT '0',
+  `poll_flags` int(11) NOT NULL DEFAULT 0 ,
+  `poll_votes` int(11) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`poll_id`),
   KEY `poll_channel` (`poll_channel`),
   KEY `poll_flags` (`poll_flags`),
@@ -964,10 +964,10 @@ CREATE TABLE IF NOT EXISTS `poll` (
 
 CREATE TABLE IF NOT EXISTS `poll_elm` (
   `pelm_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `pelm_poll` int(10) unsigned NOT NULL DEFAULT '0',
+  `pelm_poll` int(10) unsigned NOT NULL DEFAULT 0 ,
   `pelm_desc` text NOT NULL,
-  `pelm_flags` int(11) NOT NULL DEFAULT '0',
-  `pelm_result` float NOT NULL DEFAULT '0',
+  `pelm_flags` int(11) NOT NULL DEFAULT 0 ,
+  `pelm_result` float NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`pelm_id`),
   KEY `pelm_poll` (`pelm_poll`),
   KEY `pelm_result` (`pelm_result`)
@@ -986,7 +986,7 @@ CREATE TABLE IF NOT EXISTS `profdef` (
 
 CREATE TABLE IF NOT EXISTS `profext` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `channel_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel_id` int(10) unsigned NOT NULL DEFAULT 0 ,
   `hash` char(191) NOT NULL DEFAULT '',
   `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
@@ -999,11 +999,11 @@ CREATE TABLE IF NOT EXISTS `profext` (
 CREATE TABLE IF NOT EXISTS `profile` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `profile_guid` char(64) NOT NULL DEFAULT '',
-  `aid` int(10) unsigned NOT NULL DEFAULT '0',
-  `uid` int(11) NOT NULL DEFAULT '0',
+  `aid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `uid` int(11) NOT NULL DEFAULT 0 ,
   `profile_name` char(191) NOT NULL DEFAULT '',
-  `is_default` tinyint(1) NOT NULL DEFAULT '0',
-  `hide_friends` tinyint(1) NOT NULL DEFAULT '0',
+  `is_default` tinyint(1) NOT NULL DEFAULT 0 ,
+  `hide_friends` tinyint(1) NOT NULL DEFAULT 0 ,
   `fullname` char(191) NOT NULL DEFAULT '',
   `pdesc` char(191) NOT NULL DEFAULT '',
   `chandesc` text NOT NULL,
@@ -1040,7 +1040,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
   `homepage` char(191) NOT NULL DEFAULT '',
   `photo` char(191) NOT NULL DEFAULT '',
   `thumb` char(191) NOT NULL DEFAULT '',
-  `publish` tinyint(1) NOT NULL DEFAULT '0',
+  `publish` tinyint(1) NOT NULL DEFAULT 0 ,
   `profile_vcard` text NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `guid` (`profile_guid`,`uid`),
@@ -1061,11 +1061,11 @@ CREATE TABLE IF NOT EXISTS `profile` (
 
 CREATE TABLE IF NOT EXISTS `profile_check` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `cid` int(10) unsigned NOT NULL DEFAULT '0',
+  `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `cid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `dfrn_id` char(191) NOT NULL DEFAULT '',
   `sec` char(191) NOT NULL DEFAULT '',
-  `expire` int(11) NOT NULL DEFAULT '0',
+  `expire` int(11) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `cid` (`cid`),
@@ -1078,7 +1078,7 @@ CREATE TABLE IF NOT EXISTS `register` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `hash` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `uid` int(10) unsigned NOT NULL DEFAULT '0',
+  `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `password` char(191) NOT NULL DEFAULT '',
   `lang` char(16) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
@@ -1091,7 +1091,7 @@ CREATE TABLE IF NOT EXISTS `session` (
   `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   `sid` char(191) NOT NULL DEFAULT '',
   `sess_data` text NOT NULL,
-  `expire` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `expire` bigint(20) unsigned NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
   KEY `sid` (`sid`),
   KEY `expire` (`expire`)
@@ -1099,8 +1099,8 @@ CREATE TABLE IF NOT EXISTS `session` (
 
 CREATE TABLE IF NOT EXISTS `shares` (
   `share_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `share_type` int(11) NOT NULL DEFAULT '0',
-  `share_target` int(10) unsigned NOT NULL DEFAULT '0',
+  `share_type` int(11) NOT NULL DEFAULT 0 ,
+  `share_target` int(10) unsigned NOT NULL DEFAULT 0 ,
   `share_xchan` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`share_id`),
   KEY `share_type` (`share_type`),
@@ -1110,8 +1110,8 @@ CREATE TABLE IF NOT EXISTS `shares` (
 
 CREATE TABLE IF NOT EXISTS `sign` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `iid` int(10) unsigned NOT NULL DEFAULT '0',
-  `retract_iid` int(10) unsigned NOT NULL DEFAULT '0',
+  `iid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `retract_iid` int(10) unsigned NOT NULL DEFAULT 0 ,
   `signed_text` mediumtext NOT NULL,
   `signature` text NOT NULL,
   `signer` char(191) NOT NULL DEFAULT '',
@@ -1122,19 +1122,19 @@ CREATE TABLE IF NOT EXISTS `sign` (
 
 CREATE TABLE IF NOT EXISTS `site` (
   `site_url` char(191) NOT NULL,
-  `site_access` int(11) NOT NULL DEFAULT '0',
-  `site_flags` int(11) NOT NULL DEFAULT '0',
+  `site_access` int(11) NOT NULL DEFAULT 0 ,
+  `site_flags` int(11) NOT NULL DEFAULT 0 ,
   `site_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `site_pull` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `site_sync` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `site_directory` char(191) NOT NULL DEFAULT '',
-  `site_register` int(11) NOT NULL DEFAULT '0',
+  `site_register` int(11) NOT NULL DEFAULT 0 ,
   `site_sellpage` char(191) NOT NULL DEFAULT '',
   `site_location` char(191) NOT NULL DEFAULT '',
   `site_realm` char(191) NOT NULL DEFAULT '',
-  `site_valid` smallint NOT NULL DEFAULT '0',
-  `site_dead` smallint NOT NULL DEFAULT '0',
-  `site_type` smallint NOT NULL DEFAULT '0',
+  `site_valid` smallint NOT NULL DEFAULT 0 ,
+  `site_dead` smallint NOT NULL DEFAULT 0 ,
+  `site_type` smallint NOT NULL DEFAULT 0 ,
   `site_project` char(191) NOT NULL DEFAULT '',
   `site_version` varchar(32) NOT NULL DEFAULT '',
   `site_crypto` text NOT NULL,
@@ -1155,7 +1155,7 @@ CREATE TABLE IF NOT EXISTS `site` (
 
 CREATE TABLE IF NOT EXISTS `source` (
   `src_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `src_channel_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `src_channel_id` int(10) unsigned NOT NULL DEFAULT 0 ,
   `src_channel_xchan` char(191) NOT NULL DEFAULT '',
   `src_xchan` char(191) NOT NULL DEFAULT '',
   `src_patt` mediumtext NOT NULL,
@@ -1171,17 +1171,17 @@ CREATE TABLE IF NOT EXISTS `sys_perms` (
   `cat` char(191) NOT NULL DEFAULT '',
   `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
-  `public_perm` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `public_perm` tinyint(1) unsigned NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `term` (
   `tid` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `aid` int(10) unsigned NOT NULL DEFAULT '0',
-  `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `oid` int(10) unsigned NOT NULL DEFAULT '0',
-  `otype` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ttype` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `aid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `uid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `oid` int(10) unsigned NOT NULL DEFAULT 0 ,
+  `otype` tinyint(3) unsigned NOT NULL DEFAULT 0 ,
+  `ttype` tinyint(3) unsigned NOT NULL DEFAULT 0 ,
   `term` char(191) NOT NULL DEFAULT '',
   `url` char(191) NOT NULL DEFAULT '',
   `imgurl` char(191) NOT NULL DEFAULT '',
@@ -1203,9 +1203,9 @@ CREATE TABLE IF NOT EXISTS `tokens` (
   `id` varchar(191) NOT NULL DEFAULT '',
   `secret` text NOT NULL,
   `client_id` varchar(191) NOT NULL DEFAULT '',
-  `expires` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `expires` bigint(20) unsigned NOT NULL DEFAULT 0 ,
   `auth_scope` varchar(512) NOT NULL DEFAULT '',
-  `uid` int(11) NOT NULL DEFAULT '0',
+  `uid` int(11) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`id`),
   KEY `client_id` (`client_id`),
   KEY `expires` (`expires`),
@@ -1218,7 +1218,7 @@ CREATE TABLE IF NOT EXISTS `updates` (
   `ud_guid` char(191) NOT NULL DEFAULT '',
   `ud_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `ud_last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `ud_flags` int(11) NOT NULL DEFAULT '0',
+  `ud_flags` int(11) NOT NULL DEFAULT 0 ,
   `ud_addr` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`ud_id`),
   KEY `ud_date` (`ud_date`),
@@ -1231,7 +1231,7 @@ CREATE TABLE IF NOT EXISTS `updates` (
 
 CREATE TABLE IF NOT EXISTS `verify` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `channel` int(10) unsigned NOT NULL DEFAULT '0',
+  `channel` int(10) unsigned NOT NULL DEFAULT 0 ,
   `vtype` char(32) NOT NULL DEFAULT '',
   `token` char(191) NOT NULL DEFAULT '',
   `meta` char(191) NOT NULL DEFAULT '',
@@ -1246,8 +1246,8 @@ CREATE TABLE IF NOT EXISTS `verify` (
 
 CREATE TABLE IF NOT EXISTS `vote` (
   `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `vote_poll` int(11) NOT NULL DEFAULT '0',
-  `vote_element` int(11) NOT NULL DEFAULT '0',
+  `vote_poll` int(11) NOT NULL DEFAULT 0 ,
+  `vote_element` int(11) NOT NULL DEFAULT 0 ,
   `vote_result` text NOT NULL,
   `vote_xchan` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`vote_id`),
@@ -1273,16 +1273,16 @@ CREATE TABLE IF NOT EXISTS `xchan` (
   `xchan_name` char(191) NOT NULL DEFAULT '',
   `xchan_network` char(191) NOT NULL DEFAULT '',
   `xchan_instance_url` char(191) NOT NULL DEFAULT '',
-  `xchan_flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `xchan_flags` int(10) unsigned NOT NULL DEFAULT 0 ,
   `xchan_photo_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `xchan_name_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `xchan_hidden` tinyint(1) NOT NULL DEFAULT '0',
-  `xchan_orphan` tinyint(1) NOT NULL DEFAULT '0',
-  `xchan_censored` tinyint(1) NOT NULL DEFAULT '0',
-  `xchan_selfcensored` tinyint(1) NOT NULL DEFAULT '0',
-  `xchan_system` tinyint(1) NOT NULL DEFAULT '0',
-  `xchan_pubforum` tinyint(1) NOT NULL DEFAULT '0',
-  `xchan_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `xchan_hidden` tinyint(1) NOT NULL DEFAULT 0 ,
+  `xchan_orphan` tinyint(1) NOT NULL DEFAULT 0 ,
+  `xchan_censored` tinyint(1) NOT NULL DEFAULT 0 ,
+  `xchan_selfcensored` tinyint(1) NOT NULL DEFAULT 0 ,
+  `xchan_system` tinyint(1) NOT NULL DEFAULT 0 ,
+  `xchan_pubforum` tinyint(1) NOT NULL DEFAULT 0 ,
+  `xchan_deleted` tinyint(1) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`xchan_hash`),
   KEY `xchan_guid` (`xchan_guid`),
   KEY `xchan_addr` (`xchan_addr`),
@@ -1329,7 +1329,7 @@ CREATE TABLE IF NOT EXISTS `xconfig` (
 
 CREATE TABLE IF NOT EXISTS `xign` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `uid` int(11) NOT NULL DEFAULT '0',
+  `uid` int(11) NOT NULL DEFAULT 0 ,
   `xchan` char(191) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
@@ -1340,10 +1340,10 @@ CREATE TABLE IF NOT EXISTS `xlink` (
   `xlink_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `xlink_xchan` char(191) NOT NULL DEFAULT '',
   `xlink_link` char(191) NOT NULL DEFAULT '',
-  `xlink_rating` int(11) NOT NULL DEFAULT '0',
+  `xlink_rating` int(11) NOT NULL DEFAULT 0 ,
   `xlink_rating_text` text NOT NULL,
   `xlink_updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
-  `xlink_static` tinyint(1) NOT NULL DEFAULT '0',
+  `xlink_static` tinyint(1) NOT NULL DEFAULT 0 ,
   `xlink_sig` text NOT NULL,
   PRIMARY KEY (`xlink_id`),
   KEY `xlink_xchan` (`xlink_xchan`),
@@ -1356,7 +1356,7 @@ CREATE TABLE IF NOT EXISTS `xlink` (
 CREATE TABLE IF NOT EXISTS `xperm` (
   `xp_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `xp_client` varchar(20) NOT NULL DEFAULT '',
-  `xp_channel` int(10) unsigned NOT NULL DEFAULT '0',
+  `xp_channel` int(10) unsigned NOT NULL DEFAULT 0 ,
   `xp_perm` varchar(64) NOT NULL DEFAULT '',
   PRIMARY KEY (`xp_id`),
   KEY `xp_client` (`xp_client`),
@@ -1366,7 +1366,7 @@ CREATE TABLE IF NOT EXISTS `xperm` (
 
 CREATE TABLE IF NOT EXISTS `xprof` (
   `xprof_hash` char(191) NOT NULL,
-  `xprof_age` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `xprof_age` tinyint(3) unsigned NOT NULL DEFAULT 0 ,
   `xprof_desc` char(191) NOT NULL DEFAULT '',
   `xprof_dob` char(12) NOT NULL DEFAULT '',
   `xprof_gender` char(191) NOT NULL DEFAULT '',
@@ -1398,7 +1398,7 @@ CREATE TABLE IF NOT EXISTS `xtag` (
   `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `xtag_hash` char(191) NOT NULL DEFAULT '',
   `xtag_term` char(191) NOT NULL DEFAULT '',
-  `xtag_flags` int(11) NOT NULL DEFAULT '0',
+  `xtag_flags` int(11) NOT NULL DEFAULT 0 ,
   PRIMARY KEY (`xtag_id`),
   KEY `xtag_term` (`xtag_term`),
   KEY `xtag_hash` (`xtag_hash`),

From 59002cb87389159002ab8c426d475edb6d7883be Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 6 Jun 2017 22:49:45 -0700
Subject: [PATCH 223/299] Looks like we need the mastodon feed check in core -
 grrr. Will do that for now until it can be put back into plugins.

---
 include/feedutils.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/feedutils.php b/include/feedutils.php
index 70222c124..10eb5bcc7 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -397,6 +397,9 @@ function get_atom_elements($feed, $item, &$author) {
 	}
 
 	$ostatus_protocol = (($item->get_item_tags(NAMESPACE_OSTATUS, 'conversation')) ? true : false);
+	$mastodon = (($item->get_item_tags('http://mastodon.social/schema/1.0','scope')) ? true : false);
+	if($mastodon)
+		$ostatus_protocol = true;
 
 	$apps = $item->get_item_tags(NAMESPACE_STATUSNET, 'notice_info');
 	if($apps && $apps[0]['attribs']['']['source']) {

From 2e35dc648fd61ae2d39e8c46c14dbf19d31942fb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 7 Jun 2017 16:26:24 -0700
Subject: [PATCH 224/299] provide hook when deleting a connection - we need
 this to clean up dangling PuSH subscriptions

---
 doc/hooklist.bb         | 3 +++
 include/connections.php | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index 0b74a4df2..ab9c0529d 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -118,6 +118,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/connect_premium]connect_premium[/zrl]
 	Called when connecting to a premium channel
 
+[zrl=[baseurl]/help/hook/connection_remove]connection_remove[/zrl]
+	Called when deleting/removing a connection
+
 [zrl=[baseurl]/help/hook/connector_settings]connector_settings[/zrl]
 	Called when posting to the features/addon settings page
 
diff --git a/include/connections.php b/include/connections.php
index a2bc11773..c4c719ab8 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -341,6 +341,11 @@ function contact_remove($channel_id, $abook_id) {
 
 	logger('removing contact ' . $abook_id . ' for channel ' . $channel_id,LOGGER_DEBUG);
 
+
+	$x = [ 'channel_id' => $channel_id, 'abook_id' => $abook_id ];
+	call_hooks('connection_remove',$x);
+
+
 	$archive = get_pconfig($channel_id, 'system','archive_removed_contacts');
 	if($archive) {
 		q("update abook set abook_archived = 1 where abook_id = %d and abook_channel = %d",

From 2e692fca93158748f99eab651bd0782b27044b8d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 7 Jun 2017 20:28:59 -0700
Subject: [PATCH 225/299] partial fix for failure to sync photos - appears to
 be memory exhaustion and dependent on filesize although an unrelated issue
 was found with directory creation during file sync (we didn't check ownership
 when looking for duplicates).

This checkin provides the means for a sync process to fetch the contents for various photo scales from the original server just as is done for the attach data now. It is still missing the bit for the sync process to spawn a mob of children to fetch these suckers and update the photo table with the results.
---
 Zotlabs/Module/Getfile.php | 35 +++++++++++++++++++++++++++++++++++
 include/import.php         |  5 +++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Getfile.php b/Zotlabs/Module/Getfile.php
index 3d859d94b..0b05d78a4 100644
--- a/Zotlabs/Module/Getfile.php
+++ b/Zotlabs/Module/Getfile.php
@@ -35,6 +35,7 @@ class Getfile extends \Zotlabs\Web\Controller {
 		$sig      = $_POST['signature'];
 		$resource = $_POST['resource'];
 		$revision = intval($_POST['revision']);
+		$resolution = (-1);
 	
 		if(! $hash)
 			killme();
@@ -46,6 +47,11 @@ class Getfile extends \Zotlabs\Web\Controller {
 			killme();
 		}
 	
+		if(substr($resource,-2,1) == '-') {
+			$resolution = intval(substr($resource,-1,1));
+			$resource = substr($resource,0,-2);
+		}			
+
 		$slop = intval(get_pconfig($channel['channel_id'],'system','getfile_time_slop'));
 		if($slop < 1)
 			$slop = 3;
@@ -63,6 +69,35 @@ class Getfile extends \Zotlabs\Web\Controller {
 			killme();
 		}
 		
+
+		if($resolution > 0) {
+			$r = q("select * from photo where resource_id = '%s' and uid = %d limit 1",
+				dbesc($resource),
+				intval($channel['channel_id'])
+			);
+			if($r) {
+				header('Content-type: ' . $r[0]['mimetype']);
+
+				if(intval($r[0]['os_storage'])) {
+					$fname = dbunescbin($r[0]['content']);
+					if(strpos($fname,'store') !== false)
+						$istream = fopen($fname,'rb');
+					else
+						$istream = fopen('store/' . $channel['channel_address'] . '/' . $fname,'rb');
+					$ostream = fopen('php://output','wb');
+					if($istream && $ostream) {
+						pipe_streams($istream,$ostream);
+						fclose($istream);
+						fclose($ostream);
+					}
+				}
+				else {
+					echo dbunescbin($r[0]['content']);
+				}
+			}			
+			killme();
+		}
+
 		$r = attach_by_hash($resource,$channel['channel_hash'],$revision);
 	
 		if(! $r['success']) {
diff --git a/include/import.php b/include/import.php
index f219bc780..a8a70a5f2 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1084,11 +1084,12 @@ function sync_files($channel, $files) {
 						$ext = '';
 					}
 
-					$r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' and hash != '%s' ",
+					$r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' and hash != '%s' and uid = %d ",
 						dbesc($basename . $ext),
 						dbesc($basename . '(%)' . $ext),
 						dbesc($att['folder']),
-						dbesc($att['hash'])
+						dbesc($att['hash']),
+						intval($channel['channel_id'])
 					);
 
 					if($r) {

From 4f3b1edf9d05830a6851f4b6570b8a0ec836b6ab Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 7 Jun 2017 20:44:44 -0700
Subject: [PATCH 226/299] it appears to also work a bit better if you don't use
 imaginary function names

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

diff --git a/include/import.php b/include/import.php
index a8a70a5f2..277d6618c 100644
--- a/include/import.php
+++ b/include/import.php
@@ -1255,7 +1255,7 @@ function sync_files($channel, $files) {
 						$r = dbq("update photo set " . $str . " where id = " . intval($exists[0]['id']) );
 					}
 					else {
-						create_attach_from_array('photo',$p);
+						create_table_from_array('photo',$p);
 					}
 				}
 			}

From 005baea319585299b8d12eb0b4707f44711c5210 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 7 Jun 2017 21:49:50 -0700
Subject: [PATCH 227/299] fall back on feed logo if an author avatar cannot be
 found

---
 include/feedutils.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/feedutils.php b/include/feedutils.php
index 10eb5bcc7..c530b7be7 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1185,6 +1185,10 @@ function feed_meta($xml) {
 		}
 	}
 
+	if(! $author['author_photo'])
+		$author['author_photo'] = $feed->get_image_url();
+
+
 	if(substr($author['author_link'],-1,1) == '/')
 		$author['author_link'] = substr($author['author_link'],0,-1);
 

From 236b5285521cb4dbe207a11c0adb005b2ef05c87 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 8 Jun 2017 16:38:07 -0700
Subject: [PATCH 228/299] indicate on connections page if a federated
 connection from another network is unavailable from the current location

---
 Zotlabs/Module/Connections.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index b079ae860..bb223fb01 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -243,7 +243,8 @@ class Connections extends \Zotlabs\Web\Controller {
 						((intval($rr['abook_archived'])) ? t('Archived') : ''),
 						((intval($rr['abook_hidden'])) ? t('Hidden') : ''),
 						((intval($rr['abook_ignored'])) ? t('Ignored') : ''),
-						((intval($rr['abook_blocked'])) ? t('Blocked') : '')
+						((intval($rr['abook_blocked'])) ? t('Blocked') : ''),
+						((intval($rr['abook_not_here'])) ? t('Not connected at this location') : '')
 					);
 	
 					foreach($status as $str) {
@@ -261,7 +262,7 @@ class Connections extends \Zotlabs\Web\Controller {
 						'id' => $rr['abook_id'],
 						'thumb' => $rr['xchan_photo_m'], 
 						'name' => $rr['xchan_name'],
-						'classes' => (intval($rr['abook_archived']) ? 'archived' : ''),
+						'classes' => ((intval($rr['abook_archived']) || intval($rr['abook_not_here'])) ? 'archived' : ''),
 						'link' => z_root() . '/connedit/' . $rr['abook_id'],
 						'deletelink' => z_root() . '/connedit/' . intval($rr['abook_id']) . '/drop',
 						'delete' => t('Delete'),

From cf583168dd1b3ea461e07918eda404546d8136f4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 8 Jun 2017 19:15:55 -0700
Subject: [PATCH 229/299] put unreachable federated connections in the archived
 tab of the connections list page

---
 Zotlabs/Module/Connections.php | 8 ++++----
 Zotlabs/Module/Connedit.php    | 1 +
 view/tpl/abook_edit.tpl        | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index bb223fb01..a880fc643 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -19,7 +19,7 @@ class Connections extends \Zotlabs\Web\Controller {
 	
 	}
 	
-		function get() {
+	function get() {
 	
 		$sort_type = 0;
 		$o = '';
@@ -63,8 +63,8 @@ class Connections extends \Zotlabs\Web\Controller {
 					$hidden = true;
 					break;
 				case 'archived':
-					$search_flags = " and abook_archived = 1 ";
-					$head = t('Archived');
+					$search_flags = " and ( abook_archived = 1 OR abook_not_here = 1) ";
+					$head = t('Archived/Unreachable');
 					$archived = true;
 					break;
 				case 'pending':
@@ -171,7 +171,7 @@ class Connections extends \Zotlabs\Web\Controller {
 				'label' => t('Archived'),
 				'url'   => z_root() . '/connections/archived',
 				'sel'   => ($archived) ? 'active' : '',
-				'title' => t('Only show archived connections'),
+				'title' => t('Only show archived/unreachable connections'),
 			),
 	
 			'hidden' => array(
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 484e69b52..a42987fcf 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -856,6 +856,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 				'$addr_text'      => t('This connection\'s primary address is'),
 				'$loc_text'       => t('Available locations:'),
 				'$locstr'         => $locstr,
+				'$not_here'       => ((intval($contact['abook_not_here'])) ? t('Not connected at this location') : ''),
 				'$notself'        => (($self) ? '' : '1'),
 				'$self'           => (($self) ? '1' : ''),
 				'$autolbl'        => t('The permissions indicated on this page will be applied to all new connections.'),
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 9fb5c4b18..8d44e8b16 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -59,6 +59,11 @@
 				{{$loc_text}} {{$locstr}}
 			</div>
 			{{/if}}
+			{{if $not_here}}
+			<div>
+				<strong>{{$not_here}}</strong>
+			</div>
+			{{/if}}
 			{{if $last_update}}
 			<div>
 				{{$lastupdtext}} {{$last_update}}

From 42c9f853a7d878fef7f545b58a744c134baabc02 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 9 Jun 2017 15:24:37 -0700
Subject: [PATCH 230/299] auto inline embed ostatus image attachments

---
 Zotlabs/Module/Connections.php | 2 +-
 include/feedutils.php          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index a880fc643..60b798c13 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -168,7 +168,7 @@ class Connections extends \Zotlabs\Web\Controller {
 			),
 	
 			'archived' => array(
-				'label' => t('Archived'),
+				'label' => t('Archived/Unreachable'),
 				'url'   => z_root() . '/connections/archived',
 				'sel'   => ($archived) ? 'active' : '',
 				'title' => t('Only show archived/unreachable connections'),
diff --git a/include/feedutils.php b/include/feedutils.php
index c530b7be7..1b7c22407 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -613,6 +613,10 @@ function get_atom_elements($feed, $item, &$author) {
 			if(! $type)
 				$type = 'application/octet-stream';
 
+			if(($ostatus_protocol) && (strpos($type,'image') === 0) && (strpos($res['body'],$link) === false) && (strpos($link,'http') === 0)) {
+				$res['body'] .= "\n\n" . '[img]' . $link . '[/img]';
+			}
+
 			$res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title );
 		}
 	}

From 2a4032d71aaa8934ce948f549e55e53d14cdfc93 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 9 Jun 2017 16:26:30 -0700
Subject: [PATCH 231/299] clean up the warnings about connections on unclonable
 networks

---
 Zotlabs/Module/Connedit.php | 18 +++++++++++++++++-
 view/tpl/abook_edit.tpl     |  5 +++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index a42987fcf..d301c2d45 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -842,6 +842,22 @@ class Connedit extends \Zotlabs\Web\Controller {
 			}
 			else
 				$locstr = t('none');
+
+			$clone_warn = '';
+			$clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false);
+			if(! $clonable) {
+				$clone_warn = '<strong>';
+				$clone_warn .= ((intval($contact['abook_not_here'])) 
+					? t('This connection is unreachable from this location.')
+					: t('This connection may be unreachable from other channel locations.')
+				);
+				$clone_warn .= '</strong><br>' . t('Location independence is not supported by their network.');
+			}
+					
+
+
+			if(intval($contact['abook_not_here']) && $unclonable)
+				$not_here = t('This connection is unreachable from this location. Location independence is not supported by their network.');
 	
 			$o .= replace_macros($tpl, [
 				'$header'         => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),
@@ -856,7 +872,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 				'$addr_text'      => t('This connection\'s primary address is'),
 				'$loc_text'       => t('Available locations:'),
 				'$locstr'         => $locstr,
-				'$not_here'       => ((intval($contact['abook_not_here'])) ? t('Not connected at this location') : ''),
+				'$unclonable'     => $clone_warn,
 				'$notself'        => (($self) ? '' : '1'),
 				'$self'           => (($self) ? '1' : ''),
 				'$autolbl'        => t('The permissions indicated on this page will be applied to all new connections.'),
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 8d44e8b16..146030494 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -59,10 +59,11 @@
 				{{$loc_text}} {{$locstr}}
 			</div>
 			{{/if}}
-			{{if $not_here}}
+			{{if $unclonable}}
 			<div>
-				<strong>{{$not_here}}</strong>
+				<br>{{$unclonable}}
 			</div>
+			<br>
 			{{/if}}
 			{{if $last_update}}
 			<div>

From f27047dd2ede7c1f47415237712346cd01aab788 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 10 Jun 2017 15:59:03 -0700
Subject: [PATCH 232/299] Documentation - add a section of addons and
 especially federation addons, and remove the section on server_roles.

---
 doc/addons.bb                    |  2 +-
 doc/admin/administrator_guide.md | 73 +++++++++++---------------------
 2 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/doc/addons.bb b/doc/addons.bb
index 6fa9510f5..d49694030 100644
--- a/doc/addons.bb
+++ b/doc/addons.bb
@@ -23,7 +23,7 @@
 [*] friendica - Friendica (DFRN) protocol. Under development.
 [*] frphotos - import photo albums from Friendica
 [*] gnusoc - GNU-Social (OStatus) protocol. Under development. 
-[*] hexit - headecimal conversion tool
+[*] hexit - hexadecimal conversion tool
 [*] hubwall - send an admin email to all hub accounts
 [*] ijpost - crosspost to Insanejournal
 [*] irc - connect to IRC chatrooms
diff --git a/doc/admin/administrator_guide.md b/doc/admin/administrator_guide.md
index c233d8564..de64d5e8b 100644
--- a/doc/admin/administrator_guide.md
+++ b/doc/admin/administrator_guide.md
@@ -150,7 +150,7 @@ web-based administrative tools to function:
 
 #### Official addons
 ##### Installation
-Navigate to your webThen you should clone the addon repository (separately). We'll give this repository a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by giving them different nicknames::
+Navigate to your website. Then you should clone the addon repository (separately). We'll give this repository a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by giving them different nicknames::
 
     cd mywebsite
     util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git hzaddons
@@ -162,7 +162,7 @@ For keeping the addon tree updated, you should be on your top level website dire
     util/update_addon_repo hzaddons
 
 Create searchable representations of the online documentation. You may do this 
-    any time that the documentation is updated :  
+any time that the documentation is updated :  
     
     cd mywebsite
     util/importdoc
@@ -196,59 +196,35 @@ The installation script was originally designed for a small hardware server behi
 1. `service apache2 reload`
 1. Open your domain with a browser and step throught the initial configuration of $Projectname.
 
-### Server Roles
+### Recommended Addons
 
-$Projectname can be configured in many different ways. One of the configurations available at installation is to select a 'server role'. There are currently three server roles. We highly recommend that you use 'standard' unless you have special needs. 
+We recommend the following addons be installed on all public sites:
+
+	nsfw - hide inappropriate posts/comments
+	superblock - block content from offensive channels
+
+### Federation Addons
+
+Several web communities have begun to converge using common protocols. The protocols involved are somewhat limited in their abilities. The GNU-Social protocol for instance offers no privacy modes, and the Diaspora protocol is somewhat restrictive in what kinds of communications are allowed. All comments must be signed in a very unique manner by the original author. The ActivityPub protocol is also being considered and may be supported at a future date. No other existing protocol supports nomadic location as used by this project. This presents some support challenges as some features work with some networks and don't work with others. Nevertheless the federation protocols allow connections to be made to a much larger community of people worldwide. They are provided as addons.
+
+> diaspora - The Diaspora Protocol used by Diaspora and Friendica. You should enable 'Diaspora Statistics' (statistics_json) first to enable all the available features. 
+
+> gnusoc - The GNU-Social Protocol, used by GNU-Social, Mastodon and several other communities. This addon requires you first install the 'pubsubhubbub' service (also an addon). 
+
+Each member of your site must choose whether or not to allow these protocols individually as they may conflict with several desirable core features and abilities of this software (such as channel migration and cloning). They do this from their 'Settings -> Feature/Addon Settings' page. The administrator may also set the following:
+
+	util/config system.diaspora_allowed 1
+	util/config system.gnusoc_allowed 1
+
+and enable these protocols automatically for all newly created channels. 
 
 
-#### Basic
 
-The 'basic' server role is designed to be relatively simple, and it doesn't present options 
-or complicated features. The hub admin may configure additional features at a site level. 
-This role is designed for simple social networking and social network federation. Many features 
-which do not federate easily have been removed, including (and this is somewhat important) 
-"nomadic identity". You may move a channel to or from a basic server, but you may not clone 
-it. Once moved, it becomes read-only on the origination site. No updates of any kind will be 
-provided. It is recommended that after the move, the original channel be deleted - as it is 
-no longer useable. The data remains only in case there are issues making a copy of the data. 
+  
 
-This role is supported by the hubzilla community.
-
-#### Standard
-
-
-The 'standard' server role is recommended for most sites. All features of the software are 
-available to everybody unless locked by the hub administrator. Some features will not federate 
-easily with other networks, so there is often an increased support burden explaining why 
-sharing events with Diaspora (for instance) presents a different experience on that network. 
-Additionally any member can enable "advanced" or "expert" features, and these may be beyond 
-their technical skill level. This may also result in an increased support burden.
-
-This role is supported by the hubzilla community.
-
-#### Pro
-
-The 'pro' server role is primarily designed for communities which want to present a uniform 
-experience and be relieved of many federation support issues. In this role there is 
-**no federation with other networks**. Additional features **may** be provided, such 
-as channel ratings, premium channels, and e-commerce. 
-
-By default a channel may set a "techlevel" appropriate to their technical skill. Higher 
-levels provide more features. Everybody starts with techlevel 0 (similar to the 'basic' 
-role) where all complicated features are hidden from view. Increasing the techlevel provides 
-more advanced or complex features.
-
-The hub admin may also lock individual channels or their entire site at a defined techlevel 
-which provides an installation with a selection of advanced features consistent with the 
-perceived technical skills of the members. For instance, a community for horse racing might 
-have a different techlevel than a community for Linux kernel developers. 
-
-This role is not supported by the hubzilla community. 
 
 ### Techlevels
 
-Techlevels is a unique feature of Hubzilla 'pro'. It is not available in other server_roles, although it expands on the concepts introduced in $Projectname 'basic'.
-
 We've implemented several different mechanisms in order to reduce the apparent complexity and learning curve presented to new members. At the same time, we do not wish to limit any functionality for people who are able to grasp some slightly advanced technical technical features. The first mechanism was to move several features to an optional 'Features' page where they could be enabled at will; with the default interface kept somewhat lean. 
 
 The problem we had now is that the number of features began to grow dramatically, and the Feature page is daunting in possibilities. There are also features present which probably should not be available to all members, but may be extremely useful to those with technical backgrounds.
@@ -257,8 +233,7 @@ The techlevels seeeks to remedy this by grouping features within different level
 
 When a new member registers, their account is provided a techlevel setting of 0. On the account settings page they may change this to any available level. A higher level opens more advanced features and possible interactions.
 
-The account administrator may also lock a particular level, lock a maximum level, or change/re-arrange the features available to any level. Those with the minimum level are typically not very exploratory and are unlikely to discover the advanced modes. This is by design. Those that look around and desire more interactions will find them. In the absence of administrator defaults they may choose any level. As they look at the features available to the level in question, it is generally expected that they will discover some features are beyond their comprehension and it is hoped they will back off to a level where the interface and features are comfortable to their skill level. This is somewhat experimental at present and for that reason is not part of the 'standard' server role. The standard server role is preset to level '5', and the basic server role is preset to level '0', with no possibility of change. Members in these roles may find themselves overwhelmed or underwhelmed by the feature set and complexity.        
-
+The account administrator may also lock a particular level, lock a maximum level, or change/re-arrange the features available to any level. Those with the minimum level are typically not very exploratory and are unlikely to discover the advanced modes. This is by design. Those that look around and desire more interactions will find them. In the absence of administrator defaults they may choose any level. As they look at the features available to the level in question, it is generally expected that they will discover some features are beyond their comprehension and it is hoped they will back off to a level where the interface and features are comfortable to their skill level. 
 
 ### Service Classes
 

From 9c26ee122e0867fcd00b62fa475501b5d5e1c781 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 10 Jun 2017 16:00:21 -0700
Subject: [PATCH 233/299] missed this hook page when the hook was added

---
 doc/hook/connection_remove.bb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/hook/connection_remove.bb

diff --git a/doc/hook/connection_remove.bb b/doc/hook/connection_remove.bb
new file mode 100644
index 000000000..bd13ae5f2
--- /dev/null
+++ b/doc/hook/connection_remove.bb
@@ -0,0 +1,9 @@
+[h3]connection_remove[/h3]
+
+Called when deleting a connection.
+
+
+Passed parameter array:
+
+	'channel_id' => channel_id of the channel removing the connection
+	'abook_id'   => abook_id of the connection being removed

From b84818a33490f31eae41547cd7af2698d0dfec6d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 00:01:23 -0700
Subject: [PATCH 234/299] api docs 'categories' -> 'category'

---
 doc/developer/api_zot.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/developer/api_zot.bb b/doc/developer/api_zot.bb
index ddca65b4d..a114c7c44 100644
--- a/doc/developer/api_zot.bb
+++ b/doc/developer/api_zot.bb
@@ -608,7 +608,7 @@ Optional:
 
 	application or network name to display with item
 
-- categories
+- category
 
 	comma separated categories for this item
 

From d82cfdf58141e7d1036e80556e06305af5d6bf11 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 15:30:56 -0700
Subject: [PATCH 235/299] Add a section on connecting to other networks and
 activating additional protocols in the member guide - where it is needed the
 most.

---
 doc/member/member_guide.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index f81bd0741..5f5156762 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -186,7 +186,15 @@ Visit their profile by clicking their photograph in the directory, matrix, or co
 
 You may also connect with any channel by visiting the &quot;Connections&quot; page of your site or the Directory and typing their &quot;webbie&quot; into the &quot;Add New Connection&quot; field. Use this method if somebody tells you their webbie and you wish to connect with them. A webbie looks like an email address; for example &quot;bob@example.com&quot;. The process is the same as connecting via the &quot;Connect&quot; button - you will then be taken to the connection editor to set permissions.
 
-[h4] Block/Ignore/Archive/Hide channels [/h4]
+To connect with channels on other networks:
+
+The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their &quot;webbie&quot; into the &quot;Add New Connections&quot; box on the &quot;Connections&quot; page. Before you do this however, please visit your Settings page (Feature/Addon Settings) and ensure that the relevant protocol (Diaspora or GNU-Social) is provided on your hub and [b][i]activated[/i] for your channel[/b]. These networks/protocols do not support account migration and location independence so if you move location or clone your channel elsewhere, communications with these connections may fail. For this reason these protocols are not activated by default, but only through your consent. Activating these protocols involves an important decision between communicating with friends on these networks or providing fail-safe account resilience if your server fails.    
+
+To connect with RSS feeds:
+
+Your hub admin may allow connecting to RSS feeds. The process for connecting to an RSS feed is the same, exept type (or paste) the URL of the feed into the &quot;Add New Connection&quot; box. Feeds are only processed once or twice per day and your hub admin may impose limits on how many feeds you may add.  
+
+[h4]Block/Ignore/Archive/Hide channels [/h4]
 
 Channels in your address book can have statuses such as [i]blocked[/i], [i]ignored[/i], [i]archived[/i] and [i]hidden[/i]. From your connections page you can see tabs that display the channels with those statuses. From your edit connection pages you can change the statuses of a channel.
 

From af774a7269574e64611da4e91760b2716ffbdd57 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 15:39:02 -0700
Subject: [PATCH 236/299] more stuff about connecting for the member guide

---
 doc/member/member_guide.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index 5f5156762..754e99118 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -178,7 +178,9 @@ Connections in $Projectname can take on a great many different meanings. But let
 
 First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the &quot;Can send me their channel stream and posts&quot; permission to &quot;Anybody in this network&quot; will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels.
 
-The next thing you can do is look at the Directory. The directory is available on every $Projectname website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location and keyword. This is incomplete, so we'll improve this paragraph later.
+The next thing you can do is look at the Directory. The directory is available on every $Projectname website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location, and keyword.
+
+If you already know somebody's 'webbie' you can connect with them directly. A webbie looks just like an email address but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. See below for more information on connecting to channels on other networks.    
 
 To connect with other $Projectname channels:
 

From f1629930019ae57f00ddf6180de23c753e9a0d96 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 15:41:00 -0700
Subject: [PATCH 237/299] typo

---
 doc/member/member_guide.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index 754e99118..9cc07d385 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -289,7 +289,7 @@ We highly recommend that you use the "typical social network" settings when you
 [i]Note:[/i]
 Plugins/addons may provide special permission settings, so you may be offered additional permission settings beyond what is described here.
 
-If you have set any of these permissions to &quot;only those I specifically allow&quot;, you may specify indivudal permissions on the connnection edit screen.
+If you have set any of these permissions to &quot;only those I specifically allow&quot;, you may specify individual permissions on the connnection edit screen.
 
 [h4]Affinity[/h4]
 

From 38b4f6a391bbbc0d8f85b58bb23f6411591a6a77 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 18:40:29 -0700
Subject: [PATCH 238/299] remove some obsolete information from the member
 guide and expand on what a connection is at a basic level.

---
 doc/member/member_guide.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index 9cc07d385..3cc2c56ac 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -174,19 +174,19 @@ You can also delegate control of your channels' posts and connections, but not i
 
 [h3]Connecting To Channels[/h3]
 
-Connections in $Projectname can take on a great many different meanings. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
+Connections in $Projectname can take on a great many different meanings. A connection is more accurately defined as a set of permissions that you have granted to somebody else. In traditional social network applications, all connections are granted the same permissions; or at most there two levels (friends and 'followers'). In $Projectname, a range of separate permissions may be set/adjusted depending on the siutation and relationship you have with the other channel. You can allow somebody to view your posts but not your photos. You can also deny them permission to comment on your posts or send private mail to you. But let's keep it simple, you want to be friends with somebody like you are familiar with from social networking. How do you do it?
 
 First, you need to find some channels to connect to. There are two primary ways of doing this. Firstly, setting the &quot;Can send me their channel stream and posts&quot; permission to &quot;Anybody in this network&quot; will bring posts from complete strangers to your matrix. This will give you a lot of public content and should hopefully help you find interesting, entertaing people, forums, and channels.
 
 The next thing you can do is look at the Directory. The directory is available on every $Projectname website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location, and keyword.
 
-If you already know somebody's 'webbie' you can connect with them directly. A webbie looks just like an email address but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. See below for more information on connecting to channels on other networks.    
+If you already know somebody's 'webbie' you can connect with them directly. A webbie looks just like an email address (for instance bob@example.com) but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. See below for more information on connecting to channels on other networks.    
 
 To connect with other $Projectname channels:
 
-Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called &quot;connect&quot;. Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel. If you don't allow any permissions, communication will be very limited. There are some quick links which you can use to avoid setting individual permissions. To provide a social network environment, &quot;Full Sharing&quot; is recommended. You may review the settings that are applied with the quick links to ensure they are suitable for the channel you are connecting with and adjust if necessary. Then scroll to the bottom of the page and click &quot;Submit&quot;.
+Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called &quot;connect&quot;. Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel if you wish to make any changes. 
 
-You may also connect with any channel by visiting the &quot;Connections&quot; page of your site or the Directory and typing their &quot;webbie&quot; into the &quot;Add New Connection&quot; field. Use this method if somebody tells you their webbie and you wish to connect with them. A webbie looks like an email address; for example &quot;bob@example.com&quot;. The process is the same as connecting via the &quot;Connect&quot; button - you will then be taken to the connection editor to set permissions.
+You may also connect with any channel by visiting the &quot;Connections&quot; page of your site or the Directory and typing their &quot;webbie&quot; into the &quot;Add New Connection&quot; field. Use this method if somebody tells you their webbie and you wish to connect with them. The process is the same as connecting via the &quot;Connect&quot; button - you will then be taken to the connection editor to set permissions.
 
 To connect with channels on other networks:
 

From 69f6a5c08cbedb31a23a935bc6f27b3b7b0d19c4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 18:44:55 -0700
Subject: [PATCH 239/299] another typo

---
 doc/member/member_guide.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index 3cc2c56ac..e8cd913c1 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -358,7 +358,7 @@ Topical tags are indicated by preceding the tag name with the  # character. This
 Topical tags are also not linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as #2012-elections.
 
 [h4]Bookmarks[/h4]
-Bookmarks indicate a link which can be saved to your bookmark folder. They use the sequence #^ followed by the link. Often these are generatd automatically. If the 'bookmarker' addon is installed, this sequence will be converted to a bookmark icon when viewing the post or comment online and clicking the icon will save the bookmark. If the bookmarker addon is not installed, the post 'dropdown menu' contains a link for saving the bookmark or bookmarks. 
+Bookmarks indicate a link which can be saved to your bookmark folder. They use the sequence #^ followed by the link. Often these are generated automatically. If the 'bookmarker' addon is installed, this sequence will be converted to a bookmark icon when viewing the post or comment online and clicking the icon will save the bookmark. If the bookmarker addon is not installed, the post 'dropdown menu' contains a link for saving the bookmark or bookmarks. 
 
 [h4]Spaces in Tags and Mentions[/h4]
 Where possible please use the auto-complete window to select tag and mention recipients, because it will generate a coded tag which uniquely identifies one channel. Names are sometimes ambiguous. However, you can "manually" tag a channel by matching the channel name or address.

From 1d96544c9d31bf3b80dc2ec932938063ad2cdf15 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 18:48:21 -0700
Subject: [PATCH 240/299] more obsolete references in member guide

---
 doc/member/member_guide.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index e8cd913c1..0a2d11a88 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -999,7 +999,7 @@ The saved search widget will provide autocompletion of channels (the results are
 
 [h4]Remove Channel[/h4]
 
-Go to the bottom of your channel settings page or visit the URL:
+Select the 'Remove Channel' link on your channel settings page or visit the URL:
 
 	[baseurl]/removeme 
 
@@ -1011,7 +1011,7 @@ If you have identity clones on other hubs this only removes  by default the chan
 
 [h4]Remove Account[/h4]
 
-Go to the bottom of your account settings page or visit the URL:
+Select 'Remove Account' from your account settings page or visit the URL:
 
 	[baseurl]/removeaccount
 	
@@ -1020,3 +1020,4 @@ You will need to confirm your password and the account you are currently logged
 [hl][i][b]This is irreversible.[/b][/i][/hl]
 
 All your channels will be deleted. If you have identity clones on other hubs this only removes by default the channels instances which exists on this hub.
+

From 6f78183b74bbe50a6e96dca78f6724c882a668b1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 18:52:00 -0700
Subject: [PATCH 241/299] add numbers to the techlevel descriptions because
 that's what we will use to indicate a minimum level in documentation

---
 Zotlabs/Lib/Techlevels.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Lib/Techlevels.php b/Zotlabs/Lib/Techlevels.php
index 6a8c36fb3..380901678 100644
--- a/Zotlabs/Lib/Techlevels.php
+++ b/Zotlabs/Lib/Techlevels.php
@@ -7,12 +7,12 @@ class Techlevels {
 
 	static public function levels() {
 		$techlevels = [
-			'0' => t('Beginner/Basic'),
-			'1' => t('Novice - not skilled but willing to learn'),
-			'2' => t('Intermediate - somewhat comfortable'),
-			'3' => t('Advanced - very comfortable'),
-			'4' => t('Expert - I can write computer code'),			
-			'5' => t('Wizard - I probably know more than you do')
+			'0' => t('0. Beginner/Basic'),
+			'1' => t('1. Novice - not skilled but willing to learn'),
+			'2' => t('2. Intermediate - somewhat comfortable'),
+			'3' => t('3. Advanced - very comfortable'),
+			'4' => t('4. Expert - I can write computer code'),			
+			'5' => t('5. Wizard - I probably know more than you do')
 		];
 		return $techlevels;
 	}

From 6ce9eedb5fe746a70416fb66128d6b0ead6f949a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 11 Jun 2017 23:28:55 -0700
Subject: [PATCH 242/299] doco for the channel basic export api call

---
 doc/developer/api_zot.bb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/developer/api_zot.bb b/doc/developer/api_zot.bb
index a114c7c44..b2c19d7a1 100644
--- a/doc/developer/api_zot.bb
+++ b/doc/developer/api_zot.bb
@@ -4,7 +4,20 @@ The API endpoints detailed below are relative to [code]api/z/1.0[/code], meaning
 
 [h3]channel/export/basic[/h3]
 
-Export channel data
+Export basic channel data
+
+Options:
+	- sections
+		comma-separated list of data types to export
+
+	- posts
+		if true, return default sections plus 3 months of posts
+
+	If no sections are requested, the following sections are returned:
+		channel, connections, config, apps, chatrooms, events, webpages, mail, wikis
+
+	Files and large collections of posts may run into memory limits; these must generally be
+	requested separately.
 
 
 [h3]channel/stream[/h3]

From 5b3e863323a6b70651454c0972a586e677f55c3d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 12 Jun 2017 16:17:23 -0700
Subject: [PATCH 243/299] add 'can_comment_on_post' hook so we can better deal
 with the complications of Diaspora policy

---
 doc/hook/can_comment_on_post.bb | 13 +++++++++++++
 doc/hooklist.bb                 |  3 +++
 include/items.php               |  5 +++++
 3 files changed, 21 insertions(+)
 create mode 100644 doc/hook/can_comment_on_post.bb

diff --git a/doc/hook/can_comment_on_post.bb b/doc/hook/can_comment_on_post.bb
new file mode 100644
index 000000000..2cfd3b2da
--- /dev/null
+++ b/doc/hook/can_comment_on_post.bb
@@ -0,0 +1,13 @@
+[h3]can_comment_on_post[/h3]
+
+Called when deciding whether or not to display a comment box for a post.
+
+
+Hook data (array):
+	observer_hash => xchan_hash of current observer
+	item => posted item
+	allowed => 'unset'
+
+
+To over-ride the default behaviour, change allowed to true or false
+
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index ab9c0529d..da4d9596b 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -82,6 +82,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/build_pagehead]build_pagehead[/zrl]
 	Called when creating the HTML page header
 
+[zrl=[baseurl]/help/hook/can_comment_on_post]can_comment_on_post[/zrl]
+	Called when deciding whether or not to present a comment box for a post
+
 [zrl=[baseurl]/help/hook/change_channel]change_channel[/zrl]
 	Called when logging in to a channel (either during login or afterward through the channel manager)
 
diff --git a/include/items.php b/include/items.php
index 707f07f4a..e79707aeb 100755
--- a/include/items.php
+++ b/include/items.php
@@ -219,6 +219,11 @@ function can_comment_on_post($observer_xchan, $item) {
 
 //	logger('can_comment_on_post: comment_policy: ' . $item['comment_policy'], LOGGER_DEBUG);
 
+	$x = [ 'observer_hash' => $observer_xchan, 'item' => $item, 'allowed' => 'unset' ];
+	call_hooks('can_comment_on_post',$x);
+	if($x['allowed'] !== 'unset')
+		return $x['allowed'];
+
 	if(! $observer_xchan)
 		return false;
 

From 8bf9b1311d8728aec7bce93c7e59ffe022a31d49 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 12 Jun 2017 19:17:50 -0700
Subject: [PATCH 244/299] implement feed_get_reshare to extract shared post
 info from atom feed and convert to bbcode

---
 include/feedutils.php | 259 +++++++++++++++++++++++++++---------------
 1 file changed, 169 insertions(+), 90 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 1b7c22407..2e67208a7 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -278,6 +278,23 @@ function get_atom_elements($feed, $item, &$author) {
 		$base_url = '';
 
 
+	$rawcreated = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published');
+	if($rawcreated)
+		$res['created'] = unxmlify($rawcreated[0]['data']);
+
+	$rawedited = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated');
+	if($rawedited)
+		$res['edited'] = unxmlify($rawedited[0]['data']);
+
+	if((x($res,'edited')) && (! (x($res,'created'))))
+		$res['created'] = $res['edited'];
+
+	if(! $res['created'])
+		$res['created'] = $item->get_date('c');
+
+	if(! $res['edited'])
+		$res['edited'] = $item->get_date('c');
+
 	$rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
 
 	// select between supported verbs
@@ -288,112 +305,85 @@ function get_atom_elements($feed, $item, &$author) {
 
 	// translate OStatus unfollow to activity streams if it happened to get selected
 
-	if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
+	if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow')) {
 		$res['verb'] = ACTIVITY_UNFOLLOW;
+	}
 
-	if(array_key_exists('verb',$res) && $res['verb'] === ACTIVITY_SHARE) {
-		// For Mastodon shares ("boosts"), we need to parse the original author information
-		// from the activity:object -> author structure
-		$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
 
-		if($rawobj) {
-			$rawauthor = $rawobj->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+	// look for a photo. We should check media size and find the best one,
+	// but for now let's just find any author photo
 
-			if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']) {
-				$author['author_name'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']);
+	$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+
+	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+		foreach($base as $link) {
+			if(!x($author, 'author_photo') || ! $author['author_photo']) {
+				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+					$author['author_photo'] = unxmlify($link['attribs']['']['href']);
 			}
+		}
+	}
+	$rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'actor');
 
-			if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri']) {
-				$author['author_link'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri']);
-			}
-			if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-				$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-				foreach($base as $link) {
-					if(!x($author, 'author_photo') || ! $author['author_photo']) {
-						if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-							$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-					}
+	if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'], ACTIVITY_OBJ_PERSON)) {
+		$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+		if($base && count($base)) {
+			foreach($base as $link) {
+				if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
+					$author['author_link'] = unxmlify($link['attribs']['']['href']);
+				if(!x($author, 'author_photo') || ! $author['author_photo']) {
+					if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
+						$author['author_photo'] = unxmlify($link['attribs']['']['href']);
 				}
 			}
 		}
 	}
-	else {
-		// look for a photo. We should check media size and find the best one,
-		// but for now let's just find any author photo
 
-		$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+	// check for a yahoo media element (github etc.)
 
+	if(! $author['author_photo']) {
+		$rawmedia = $item->get_item_tags(NAMESPACE_YMEDIA,'thumbnail');
+		if($rawmedia && $rawmedia[0]['attribs']['']['url']) {
+			$author['author_photo'] = strip_tags(unxmlify($rawmedia[0]['attribs']['']['url']));
+		}
+	}
+
+
+	// No photo/profile-link on the item - look at the feed level
+
+	if((! (x($author,'author_link'))) || (! (x($author,'author_photo')))) {
+		$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
 		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
 			$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 			foreach($base as $link) {
-				if(!x($author, 'author_photo') || ! $author['author_photo']) {
+				if($link['attribs']['']['rel'] === 'alternate' && (! $author['author_link'])) {
+					$author['author_link'] = unxmlify($link['attribs']['']['href']);
+					$author['author_is_feed'] = true;
+				}
+				if(! $author['author_photo']) {
 					if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
 						$author['author_photo'] = unxmlify($link['attribs']['']['href']);
 				}
 			}
 		}
 
-		$rawactor = $item->get_item_tags(NAMESPACE_ACTIVITY, 'actor');
+		$rawactor = $feed->get_feed_tags(NAMESPACE_ACTIVITY, 'subject');
 
-		if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'], ACTIVITY_OBJ_PERSON)) {
+		if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
 			$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+
 			if($base && count($base)) {
 				foreach($base as $link) {
 					if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
 						$author['author_link'] = unxmlify($link['attribs']['']['href']);
-					if(!x($author, 'author_photo') || ! $author['author_photo']) {
+					if(! (x($author,'author_photo'))) {
 						if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
 							$author['author_photo'] = unxmlify($link['attribs']['']['href']);
 					}
 				}
 			}
 		}
-
-		// check for a yahoo media element (github etc.)
-
-		if(! $author['author_photo']) {
-			$rawmedia = $item->get_item_tags(NAMESPACE_YMEDIA,'thumbnail');
-			if($rawmedia && $rawmedia[0]['attribs']['']['url']) {
-				$author['author_photo'] = strip_tags(unxmlify($rawmedia[0]['attribs']['']['url']));
-			}
-		}
-
-
-		// No photo/profile-link on the item - look at the feed level
-
-		if((! (x($author,'author_link'))) || (! (x($author,'author_photo')))) {
-			$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
-			if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
-				$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-				foreach($base as $link) {
-					if($link['attribs']['']['rel'] === 'alternate' && (! $author['author_link'])) {
-						$author['author_link'] = unxmlify($link['attribs']['']['href']);
-						$author['author_is_feed'] = true;
-					}
-					if(! $author['author_photo']) {
-						if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
-							$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-					}
-				}
-			}
-
-			$rawactor = $feed->get_feed_tags(NAMESPACE_ACTIVITY, 'subject');
-
-			if($rawactor && activity_match($rawactor[0]['child'][NAMESPACE_ACTIVITY]['obj_type'][0]['data'],ACTIVITY_OBJ_PERSON)) {
-				$base = $rawactor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
-
-				if($base && count($base)) {
-					foreach($base as $link) {
-						if($link['attribs']['']['rel'] === 'alternate' && (! $res['author_link']))
-							$author['author_link'] = unxmlify($link['attribs']['']['href']);
-						if(! (x($author,'author_photo'))) {
-							if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
-								$author['author_photo'] = unxmlify($link['attribs']['']['href']);
-						}
-					}
-				}
-			}
-		}
 	}
 
 	$ostatus_protocol = (($item->get_item_tags(NAMESPACE_OSTATUS, 'conversation')) ? true : false);
@@ -499,23 +489,6 @@ function get_atom_elements($feed, $item, &$author) {
 	if($rawlocation)
 		$res['location'] = unxmlify($rawlocation[0]['data']);
 
-	$rawcreated = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published');
-	if($rawcreated)
-		$res['created'] = unxmlify($rawcreated[0]['data']);
-
-	$rawedited = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated');
-	if($rawedited)
-		$res['edited'] = unxmlify($rawedited[0]['data']);
-
-	if((x($res,'edited')) && (! (x($res,'created'))))
-		$res['created'] = $res['edited'];
-
-	if(! $res['created'])
-		$res['created'] = $item->get_date('c');
-
-	if(! $res['edited'])
-		$res['edited'] = $item->get_date('c');
-
 
 	// Disallow time travelling posts
 
@@ -597,6 +570,7 @@ function get_atom_elements($feed, $item, &$author) {
 
 	$attach = $item->get_enclosures();
 	if($attach) {
+
 		$res['attach'] = array();
 		foreach($attach as $att) {
 			$len   = intval($att->get_length());
@@ -620,6 +594,7 @@ function get_atom_elements($feed, $item, &$author) {
 			$res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title );
 		}
 	}
+	
 
 	$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
 
@@ -697,6 +672,10 @@ function get_atom_elements($feed, $item, &$author) {
 		$res['target'] = $obj;
 	}
 
+	if(array_key_exists('verb',$res) && $res['verb'] === ACTIVITY_SHARE) {
+		feed_get_reshare($res,$item);
+	}
+
 	// build array to pass to hook
 	$arr = [
 			'feed'   => $feed,
@@ -713,6 +692,106 @@ function get_atom_elements($feed, $item, &$author) {
 	return $arr['result'];
 }
 
+function feed_get_reshare(&$res,$item) {
+
+	$share = [];
+
+	// For Mastodon shares ("boosts"), we need to parse the original author information
+	// from the activity:object -> author structure
+	$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
+
+	if($rawobj) {
+
+		$rawauthor = $rawobj->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+
+		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']) {
+			$share['author'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']);
+		}
+
+		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri']) {
+			$share['profile'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri']);
+		}
+
+		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
+			$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
+			foreach($base as $link) {
+				if(! (array_key_exists('avatar',$share) && $share['avatar'])) {
+					if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
+						$share['avatar'] = unxmlify($link['attribs']['']['href']);
+				}
+			}
+		}
+
+		if(! $share['author'])
+			$share['author'] = t('unknown');
+		if(! $share['avatar'])
+			$share['avatar'] = z_root() . '/' . get_default_profile_photo(80);
+		if(! $share['profile'])
+			$share['profile'] = z_root();
+	
+		$child = $rawobj[0]['child'];
+
+
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$share['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
+
+		$rawcreated = $rawobj->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published');
+		if($rawcreated)
+			$share['created'] = unxmlify($rawcreated[0]['data']);
+		else
+			$share['created'] = $res['created'];
+
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$share['message_id'] = unxmlify($child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data']);
+
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = unxmlify($child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']);
+			if(! $body)
+				$body = unxmlify($child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data']);
+
+			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
+				$body = purify_html($body);
+				$body = html2bbcode($body);
+			}
+		}
+	
+		$attach = $rawobj->get_enclosures();
+		if($attach) {
+			foreach($attach as $att) {
+				$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;
+
+				if(! $title)
+					$title = ' ';
+				if(! $type)
+					$type = 'application/octet-stream';
+
+				if((strpos($type,'image') === 0) && (strpos($body,$link) === false) && (strpos($link,'http') === 0)) {
+					$body .= "\n\n" . '[img]' . $link . '[/img]';
+				}
+			}
+		}
+	
+		$res['body'] = "[share author='" . urlencode($share['author']) . 
+			"' profile='"    . $share['profile'] .
+			"' avatar='"     . $share['avatar']  .
+			"' link='"       . $share['link']    .
+			"' posted='"     . $share['created'] . 
+			"' message_id='" . $share['message_id'] . "']";
+			$o .= $body;
+			$o .= "[/share]";
+	}
+
+}
+
+
+
 /**
  * @brief Encodes SimplePie_Item link arrays.
  *

From f526b9fcfbca2cf7a23d21653da3c63ad4bc91fa Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 12 Jun 2017 21:12:14 -0700
Subject: [PATCH 245/299] ostatus is almost unrecognisable these days from its
 former self. In this case thr:in-reply-to has almost no meaning since it
 almost never refers to a top level post; which makes it quite difficult to
 preserve conversations

---
 include/feedutils.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 2e67208a7..5af6a01b0 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1000,11 +1000,23 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 					dbesc($parent_mid),
 					intval($importer['channel_id'])
 				);
-				if($x)
-					$parent_mid = $x[0]['mid'];
 
-				$datarray['parent_mid'] = $parent_mid;
+				if($x) {
+					$pmid = $x[0]['mid'];
+					$datarray['parent_mid'] = $pmid;
+				}
+				else {
 
+					// immediate parent wasn't found. Turn into a top-level post if permissions allow
+					// but save the thread_parent in case we need to refer to it later. We should probably
+					// also save the ostatus:conversation_id
+  
+					if(! post_is_importable($datarray, $contact))
+						continue;
+					$datarray['parent_mid'] = $datarray['mid'];
+					set_iconfig($datarray,'system','parent_mid',$parent_mid,true);
+				}
+				
 				$datarray['aid'] = $importer['channel_account_id'];
 				$datarray['uid'] = $importer['channel_id'];
 

From dd8feac54070f9aefb7da034f2d15e6dce872a3b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 12 Jun 2017 21:58:40 -0700
Subject: [PATCH 246/299] preserve the ostatus:conversation pointer also

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

diff --git a/include/feedutils.php b/include/feedutils.php
index 5af6a01b0..41c11bce1 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -386,7 +386,14 @@ function get_atom_elements($feed, $item, &$author) {
 		}
 	}
 
-	$ostatus_protocol = (($item->get_item_tags(NAMESPACE_OSTATUS, 'conversation')) ? true : false);
+	$rawcnv = $item->get_item_tags(NAMESPACE_OSTATUS, 'conversation');
+	if($rawcnv) {
+		$ostatus_conversation = unxmlify($rawcnv[0]['attribs']['']['ref']);
+		set_iconfig($res,'ostatus','conversation',$ostatus_conversation,true);
+	}
+
+	$ostatus_protocol = (($ostatus_conversation) ? true : false);
+	
 	$mastodon = (($item->get_item_tags('http://mastodon.social/schema/1.0','scope')) ? true : false);
 	if($mastodon)
 		$ostatus_protocol = true;

From 7f374fe69f46c041221736e4940b1cb0e8809fd1 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 13 Jun 2017 18:06:45 -0700
Subject: [PATCH 247/299] attempt to group gnu-social and mastodon
 conversations by ostatus:conversation in addition to falling back on
 thr:in_reply_to

---
 include/feedutils.php | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 41c11bce1..38ad102b4 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1003,20 +1003,35 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 					continue;
 				}
 
-				$x = q("select mid from item where mid = '%s' and uid = %d limit 1",
-					dbesc($parent_mid),
-					intval($importer['channel_id'])
-				);
+				$pmid = '';
+				$conv_id = get_iconfig($datarray,'ostatus','conversation');
 
-				if($x) {
-					$pmid = $x[0]['mid'];
-					$datarray['parent_mid'] = $pmid;
+				if($conv_id) {
+					$c = q("select parent_mid from item left join iconfig on item.id = iconfig.iid where iconfig.cat = 'ostatus' and iconfig.k = 'conversation' and iconfig.v = '%s' and item.uid = %d order by item.id limit 1",
+						dbesc($conv_id),
+						intval($importer['channel_id'])
+					);
+					if($c) {
+						$pmid = $x[0]['parent_mid'];
+						$datarray['parent_mid'] = $pmid;
+					}
 				}
 				else {
+					$x = q("select mid from item where mid = '%s' and uid = %d limit 1",
+						dbesc($parent_mid),
+						intval($importer['channel_id'])
+					);
+				
+					if($x) {
+						$pmid = $x[0]['mid'];
+						$datarray['parent_mid'] = $pmid;
+					}
+				}
+
+				if(! $pmid) {
 
 					// immediate parent wasn't found. Turn into a top-level post if permissions allow
-					// but save the thread_parent in case we need to refer to it later. We should probably
-					// also save the ostatus:conversation_id
+					// but save the thread_parent in case we need to refer to it later.
   
 					if(! post_is_importable($datarray, $contact))
 						continue;

From fce68f1a39c73246ad449aee1bf7a4b9aba9837f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 13 Jun 2017 18:29:08 -0700
Subject: [PATCH 248/299] add rel=noopener to all external target _blank links

---
 Zotlabs/Module/Oembed.php |  2 +-
 include/bbcode.php        | 32 ++++++++++++++++----------------
 include/text.php          |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Zotlabs/Module/Oembed.php b/Zotlabs/Module/Oembed.php
index 9394e5942..aee5ea079 100644
--- a/Zotlabs/Module/Oembed.php
+++ b/Zotlabs/Module/Oembed.php
@@ -22,7 +22,7 @@ class Oembed extends \Zotlabs\Web\Controller {
 			}
 		
 			else {
-				echo "<html><head><base target=\"_blank\" /></head><body>";
+				echo "<html><head><base target=\"_blank\" rel=\"nofollow noopener\" /></head><body>";
 				$src = base64url_decode(argv(1));
 				$j = oembed_fetch_url($src);
 				echo $j['html'];
diff --git a/include/bbcode.php b/include/bbcode.php
index 6805f008c..c408af35d 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -839,7 +839,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		if($tryoembed) {
 			$Text = preg_replace_callback("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/$urlchars+)/ism", 'tryoembed', $Text);
 		}
-		$Text = preg_replace("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" target="_blank" >$2</a>', $Text);
+		$Text = preg_replace("/([^\]\='".'"'."\/]|^|\#\^)(https?\:\/\/$urlchars+)/ism", '$1<a href="$2" target="_blank" rel="nofollow noopener">$2</a>', $Text);
 	}
 
 	if (strpos($Text,'[/share]') !== false) {
@@ -851,16 +851,16 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 		}
 	}
 	if (strpos($Text,'[/url]') !== false) {
-		$Text = preg_replace("/\#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" target="_blank" >$1</a>', $Text);
-		$Text = preg_replace("/\#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" target="_blank" >$2</a>', $Text);
-		$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank" >$1</a>', $Text);
-		$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank" >$2</a>', $Text);
+		$Text = preg_replace("/\#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
+		$Text = preg_replace("/\#\^\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<span class="bookmark-identifier">#^</span><a class="bookmark" href="$1" target="_blank" rel="nofollow noopener" >$2</a>', $Text);
+		$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
+		$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank" rel="nofollow noopener" >$2</a>', $Text);
 	}
 	if (strpos($Text,'[/zrl]') !== false) {
-		$Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" target="_blank" >$1</a>', $Text);
-		$Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" target="_blank" >$2</a>', $Text);
-		$Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<a class="zrl" href="$1" target="_blank" >$1</a>', $Text);
-		$Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a class="zrl" href="$1" target="_blank" >$2</a>', $Text);
+		$Text = preg_replace("/\#\^\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
+		$Text = preg_replace("/\#\^\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<span class="bookmark-identifier">#^</span><a class="zrl bookmark" href="$1" target="_blank" rel="nofollow noopener" >$2</a>', $Text);
+		$Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '<a class="zrl" href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
+		$Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '<a class="zrl" href="$1" target="_blank" rel="nofollow noopener" >$2</a>', $Text);
 	}
 
 	if (get_account_techlevel() < 2)
@@ -868,8 +868,8 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 
 	// Perform MAIL Search
 	if (strpos($Text,'[/mail]') !== false) {
-		$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1" target="_blank" >$1</a>', $Text);
-		$Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1" target="_blank" >$2</a>', $Text);
+		$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
+		$Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1" target="_blank" rel="nofollow noopener" >$2</a>', $Text);
 	}
 
 
@@ -1189,17 +1189,17 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 
 	// if video couldn't be embedded, link to it instead.
 	if (strpos($Text,'[/video]') !== false) {
-		$Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<a href="$1" target="_blank" >$1</a>', $Text);
+		$Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<a href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
 	}
 	if (strpos($Text,'[/audio]') !== false) {
-		$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<a href="$1" target="_blank" >$1</a>', $Text);
+		$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<a href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
 	}
 
 	if (strpos($Text,'[/zvideo]') !== false) {
-		$Text = preg_replace("/\[zvideo\](.*?)\[\/zvideo\]/", '<a class="zid" href="$1" target="_blank" >$1</a>', $Text);
+		$Text = preg_replace("/\[zvideo\](.*?)\[\/zvideo\]/", '<a class="zid" href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
 	}
 	if (strpos($Text,'[/zaudio]') !== false) {
-		$Text = preg_replace("/\[zaudio\](.*?)\[\/zaudio\]/", '<a class="zid" href="$1" target="_blank" >$1</a>', $Text);
+		$Text = preg_replace("/\[zaudio\](.*?)\[\/zaudio\]/", '<a class="zid" href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
 	}
 
 //	if ($tryoembed){
@@ -1208,7 +1208,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 //		}
 //	} else {
 //		if (strpos($Text,'[/iframe]') !== false) {
-//			$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1" target="_blank" >$1</a>', $Text);
+//			$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1" target="_blank" rel="nofollow noopener" >$1</a>', $Text);
 //		}
 //	}
 
diff --git a/include/text.php b/include/text.php
index c791b50ee..5af4f1b67 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1531,13 +1531,13 @@ function prepare_body(&$item,$attach = false) {
 
 		// if original photo width is <= 640px prepend it to item body
 		if($object['link'][0]['width'] && $object['link'][0]['width'] <= 640) {
-			$s .= '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '" target="_blank"><img class="inline-photo-item" style="max-width:' . $object['link'][0]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][0]['href'])) . '"></a></div>' . $s;
+			$s .= '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '" target="_blank" rel="nofollow noopener" ><img class="inline-photo-item" style="max-width:' . $object['link'][0]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][0]['href'])) . '"></a></div>' . $s;
 		}
 
 		// if original photo width is > 640px make it a cover photo
 		if($object['link'][0]['width'] && $object['link'][0]['width'] > 640) {
 			$scale = ((($object['link'][1]['width'] == 1024) || ($object['link'][1]['height'] == 1024)) ? 1 : 0);
-			$photo = '<a href="' . zid(rawurldecode($object['id'])) . '" target="_blank"><img style="max-width:' . $object['link'][$scale]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][$scale]['href'])) . '"></a>';
+			$photo = '<a href="' . zid(rawurldecode($object['id'])) . '" target="_blank" rel="nofollow noopener"><img style="max-width:' . $object['link'][$scale]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][$scale]['href'])) . '"></a>';
 		}
 	}
 

From 05eeb8432e3dcb6abfcca89351245da632aad39e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 13 Jun 2017 19:24:42 -0700
Subject: [PATCH 249/299] more doco improvements

---
 doc/about/about.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/about/about.bb b/doc/about/about.bb
index 2affe2cba..b927e80c0 100644
--- a/doc/about/about.bb
+++ b/doc/about/about.bb
@@ -110,7 +110,7 @@ Posts and messages may be created with an expiration date, at which time they wi
 
 [h4]Service Federation[/h4]
 
-In addition to addon "cross-post connectors" to a variety of alternate networks, there is native support for importation of content from RSS/Atom feeds and using this to create special channels. Also, an experimental but working implementation of the Diaspora protocol allows communication with people on the Friendica and Diaspora decentralised social networks. This is currently marked experimental because these networks do not have the same level of privacy and encryption features and abilities as $Projectname and may present privacy risks.
+In addition to addon "cross-post connectors" to a variety of alternate networks, there is native support for importation of content from RSS/Atom feeds and using this to create special channels. Plugins are also available to communicate with others using the Diaspora and GNU-Social (OStatus) protocols. These networks do not support nomadic identity or cross-domain access control; however basic communications are supported to/from Diaspora, Friendica, GNU-Social, Mastodon and other providers which use these protocols.   
 
 There is also experimental support for OpenID authentication which may be used in Access Control Lists. This is a work in progress. Your $Projectname hub may be used as an OpenID provider to authenticate you to external services which use this technology. 
 
@@ -190,7 +190,7 @@ Any content created in $Projectname remains under the control of the member (or
 Similar to any other modern blogging system, social network, or a micro-blogging service, $Projectname supports the uploading of files, embedding of videos, linking web pages.
 
 [h4]Previewing/Editing[/h4] 
-Post can be previewed prior to sending and edited after sending.
+Posts and comments can be previewed prior to sending and edited after sending.
 
 [h4]Voting/Consensus[/h4]
 Posts can be turned into "consensus" items which allows readers to offer feedback, which is collated into "agree", "disagree", and "abstain" counters. This lets you gauge interest for ideas and create informal surveys. 
@@ -201,4 +201,4 @@ $Projectname can be extended in a number of ways, through site customisation, pe
 
 [h4]API[/h4]
 
-An API is available for use by third-party services. This is based originally on the early Twitter API (for which hundreds of third-party tools exist). It is currently being extended to provide access to facilities and abilities which are specific to $Projectname. Access may be provided by login/password or OAuth and client registration of OAuth applications is provided.
+An API is available for use by third-party services. A plugin also provides a basic implementation of the Twitter API (for which hundreds of third-party tools exist). Access may be provided by login/password or OAuth, and client registration of OAuth applications is provided.

From 364da7a57e4fea5226c83d2ef9869a084c7c0013 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 13 Jun 2017 19:52:16 -0700
Subject: [PATCH 250/299] support mastodon content warnings by converting into
 n-s-f-w tag

---
 include/feedutils.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/feedutils.php b/include/feedutils.php
index 38ad102b4..96e5fdc6b 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -266,6 +266,8 @@ function get_atom_elements($feed, $item, &$author) {
 	$res['item_rss'] = 1;
 
 
+	$summary = unxmlify($item->get_description(true));
+
 	// removing the content of the title if its identically to the body
 	// This helps with auto generated titles e.g. from tumblr
 
@@ -486,6 +488,12 @@ function get_atom_elements($feed, $item, &$author) {
 		);
 	}
 
+	// turn Mastodon content warning into a #nsfw hashtag
+	if($mastodon && $summary) {
+		$res['body'] .= "\n\n#nsfw\n";
+	}
+
+
 	$private = $item->get_item_tags(NAMESPACE_DFRN, 'private');
 	if($private && intval($private[0]['data']) > 0)
 		$res['item_private'] = ((intval($private[0]['data'])) ? 1 : 0);

From 7b948bdd29e44920e4c1af9bcba26958220daca2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 14 Jun 2017 16:06:25 -0700
Subject: [PATCH 251/299] use parent_mid

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

diff --git a/include/feedutils.php b/include/feedutils.php
index 96e5fdc6b..68af88256 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1025,13 +1025,13 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 					}
 				}
 				else {
-					$x = q("select mid from item where mid = '%s' and uid = %d limit 1",
+					$x = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
 						dbesc($parent_mid),
 						intval($importer['channel_id'])
 					);
 				
 					if($x) {
-						$pmid = $x[0]['mid'];
+						$pmid = $x[0]['parent_mid'];
 						$datarray['parent_mid'] = $pmid;
 					}
 				}

From 8b3d2c02e1af80159d18bddb049e93b4fb28c249 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 14 Jun 2017 19:59:25 -0700
Subject: [PATCH 252/299] always transmit a valid uri

---
 include/feedutils.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/feedutils.php b/include/feedutils.php
index f5cb12cd9..4a563ade7 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1510,6 +1510,10 @@ function atom_entry($item, $type, $author, $owner, $comment = false, $cid = 0, $
 
 	if(($item['parent'] != $item['id']) || ($item['parent_mid'] !== $item['mid']) || (($item['thr_parent'] !== '') && ($item['thr_parent'] !== $item['mid']))) {
 		$parent_item = (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']);
+		// ensure it's a legal uri and not just a message-id
+		if(! strpos($parent_item,':'))
+			$parent_item = 'X-ZOT:' . $parent_item;
+
 		$o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($item['plink']) . '" />' . "\r\n";
 	}
 

From 327b22d24ef62ac4057728dfa31aec6f1f76b2d0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 14 Jun 2017 20:20:18 -0700
Subject: [PATCH 253/299] remove some duplicated code

---
 include/feedutils.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 4a563ade7..568c1e9ed 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -259,7 +259,7 @@ function get_atom_elements($feed, $item, &$author) {
 	if(substr($author['author_link'],-1,1) == '/')
 		$author['author_link'] = substr($author['author_link'],0,-1);
 
-	$res['mid'] = unxmlify($item->get_id());
+	$res['mid'] = normalise_id(unxmlify($item->get_id()));
 	$res['title'] = unxmlify($item->get_title());
 	$res['body'] = unxmlify($item->get_content());
 	$res['plink'] = unxmlify($item->get_link(0));
@@ -391,7 +391,7 @@ function get_atom_elements($feed, $item, &$author) {
 
 	$rawcnv = $item->get_item_tags(NAMESPACE_OSTATUS, 'conversation');
 	if($rawcnv) {
-		$ostatus_conversation = unxmlify($rawcnv[0]['attribs']['']['ref']);
+		$ostatus_conversation = normalise_id(unxmlify($rawcnv[0]['attribs']['']['ref']));
 		set_iconfig($res,'ostatus','conversation',$ostatus_conversation,true);
 	}
 
@@ -943,7 +943,6 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 		foreach($items as $item) {
 
 			$is_reply = false;
-			$item_id = normalise_id($item->get_id());
 
 			logger('processing ' . $item->get_id(), LOGGER_DEBUG);
 
@@ -960,12 +959,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 
 				// Have we seen it? If not, import it.
 
-				$item_id  = normalise_id($item->get_id());
 				$author = array();
 				$datarray = get_atom_elements($feed,$item,$author);
 
-				if($datarray['mid'])
-					$datarray['mid'] = normalise_id($item->get_id());
+				if(! $datarray['mid'])
+					continue;
 
 				if($contact['xchan_network'] === 'rss') {
 					$datarray['public_policy'] = 'specific';
@@ -992,7 +990,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 				$datarray['owner_xchan'] = $contact['xchan_hash'];
 
 				$r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
-					dbesc($item_id),
+					dbesc($datarray['mid']),
 					intval($importer['channel_id'])
 				);
 
@@ -1015,6 +1013,9 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 				$pmid = '';
 				$conv_id = get_iconfig($datarray,'ostatus','conversation');
 
+				// match conversations - first try ostatus:conversation
+				// next try thr:in_reply_to
+
 				if($conv_id) {
 					$c = q("select parent_mid from item left join iconfig on item.id = iconfig.iid where iconfig.cat = 'ostatus' and iconfig.k = 'conversation' and iconfig.v = '%s' and item.uid = %d order by item.id limit 1",
 						dbesc($conv_id),
@@ -1025,7 +1026,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 						$datarray['parent_mid'] = $pmid;
 					}
 				}
-				else {
+				if(! $pmid) {
 					$x = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
 						dbesc($parent_mid),
 						intval($importer['channel_id'])
@@ -1061,12 +1062,11 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 
 				// Head post of a conversation. Have we seen it? If not, import it.
 
-				$item_id  = normalise_id($item->get_id());
 				$author = array();
 				$datarray = get_atom_elements($feed,$item,$author);
 
-				if($datarray['mid'])
-					$datarray['mid'] = normalise_id($item->get_id());
+				if(! $datarray['mid'])
+					continue;
 
 				if($contact['xchan_network'] === 'rss') {
 					$datarray['public_policy'] = 'specific';
@@ -1121,7 +1121,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 
 
 				$r = q("SELECT edited FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
-					dbesc($item_id),
+					dbesc($datarray['mid']),
 					intval($importer['channel_id'])
 				);
 
@@ -1141,7 +1141,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 					continue;
 				}
 
-				$datarray['parent_mid'] = $item_id;
+				$datarray['parent_mid'] = $datarray['mid'];
 				$datarray['uid'] = $importer['channel_id'];
 				$datarray['aid'] = $importer['channel_account_id'];
 

From b429576349a9a1909f1605226a246507feab1350 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 16 Jun 2017 15:28:29 -0700
Subject: [PATCH 254/299] some logic cleanup in feed_get_reshare

---
 include/feedutils.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 568c1e9ed..459cfb5ff 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -718,7 +718,7 @@ function feed_get_reshare(&$res,$item) {
 
 	if($rawobj) {
 
-		$rawauthor = $rawobj->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+		$rawauthor = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['author'];
 
 		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']) {
 			$share['author'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']);
@@ -751,7 +751,8 @@ function feed_get_reshare(&$res,$item) {
 		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
 			$share['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
 
-		$rawcreated = $rawobj->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published');
+		$rawcreated = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['published'];
+
 		if($rawcreated)
 			$share['created'] = unxmlify($rawcreated[0]['data']);
 		else
@@ -771,13 +772,15 @@ function feed_get_reshare(&$res,$item) {
 			}
 		}
 	
-		$attach = $rawobj->get_enclosures();
+		$attach = $share['link'];
 		if($attach) {
 			foreach($attach as $att) {
-				$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($att['rel'] !== 'enclosure')
+					continue;
+				$len   = intval($att['length']);
+				$link  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att['href']))));
+				$title = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att['title']))));
+				$type  = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att['type']))));
 				if(strpos($type,';'))
 					$type = substr($type,0,strpos($type,';'));
 				if((! $link) || (strpos($link,'http') !== 0))
@@ -823,6 +826,10 @@ function encode_rel_links($links) {
 		$l = array();
 		if($link['attribs']['']['rel'])
 			$l['rel'] =  $link['attribs']['']['rel'];
+		if($link['attribs']['']['length'])
+			$l['length'] =  $link['attribs']['']['length'];
+		if($link['attribs']['']['title'])
+			$l['title'] =  $link['attribs']['']['title'];
 		if($link['attribs']['']['type'])
 			$l['type'] =  $link['attribs']['']['type'];
 		if($link['attribs']['']['href'])

From 1848a221180d20d7d904a828b8969653a0f319d0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 16 Jun 2017 19:30:02 -0700
Subject: [PATCH 255/299] testing mastodon boosts/reshares

---
 boot.php              |  1 +
 include/feedutils.php | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/boot.php b/boot.php
index b9700cdd6..9e1f00d32 100755
--- a/boot.php
+++ b/boot.php
@@ -490,6 +490,7 @@ define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
 define ( 'ACTIVITY_MOOD',        NAMESPACE_ZOT . '/activity/mood' );
 
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
+define ( 'ACTIVITY_OBJ_ACTIVITY',NAMESPACE_ACTIVITY_SCHEMA . 'activity' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );
 define ( 'ACTIVITY_OBJ_PERSON',  NAMESPACE_ACTIVITY_SCHEMA . 'person' );
 define ( 'ACTIVITY_OBJ_PHOTO',   NAMESPACE_ACTIVITY_SCHEMA . 'photo' );
diff --git a/include/feedutils.php b/include/feedutils.php
index 459cfb5ff..759c8a05c 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -688,7 +688,10 @@ function get_atom_elements($feed, $item, &$author) {
 		$res['target'] = $obj;
 	}
 
-	if(array_key_exists('verb',$res) && $res['verb'] === ACTIVITY_SHARE) {
+	
+
+	if(array_key_exists('verb',$res) && $res['verb'] === ACTIVITY_SHARE
+		&& array_key_exists('obj_type',$res) && $res['obj_type'] === ACTIVITY_OBJ_NOTE) {
 		feed_get_reshare($res,$item);
 	}
 
@@ -721,11 +724,11 @@ function feed_get_reshare(&$res,$item) {
 		$rawauthor = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['author'];
 
 		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']) {
-			$share['author'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name']);
+			$share['author'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']);
 		}
 
 		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri']) {
-			$share['profile'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri']);
+			$share['profile'] = unxmlify($rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']);
 		}
 
 		if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
@@ -749,7 +752,7 @@ function feed_get_reshare(&$res,$item) {
 
 
 		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$share['link'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
+			$share['links'] = encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']);
 
 		$rawcreated = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['published'];
 
@@ -772,9 +775,13 @@ function feed_get_reshare(&$res,$item) {
 			}
 		}
 	
-		$attach = $share['link'];
+		$attach = $share['links'];
 		if($attach) {
 			foreach($attach as $att) {
+				if($att['rel'] === 'alternate') {
+					$share['alternate'] = str_replace(array(',','"'),array('%2D','%22'),notags(trim(unxmlify($att['href']))));
+					continue;
+				}
 				if($att['rel'] !== 'enclosure')
 					continue;
 				$len   = intval($att['length']);
@@ -800,11 +807,12 @@ function feed_get_reshare(&$res,$item) {
 		$res['body'] = "[share author='" . urlencode($share['author']) . 
 			"' profile='"    . $share['profile'] .
 			"' avatar='"     . $share['avatar']  .
-			"' link='"       . $share['link']    .
+			"' link='"       . $share['alternate']    .
 			"' posted='"     . $share['created'] . 
 			"' message_id='" . $share['message_id'] . "']";
-			$o .= $body;
-			$o .= "[/share]";
+
+		$res['body'] .= $body;
+		$res['body'] .= "[/share]";
 	}
 
 }

From 4d5469f27ed2bea05dcfc4c286a9d14413a9e6b6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 17 Jun 2017 17:59:31 -0700
Subject: [PATCH 256/299] brainstorming a comment moderation system

---
 view/tpl/comment_item.tpl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index bd5176c83..92eeac056 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -10,6 +10,13 @@
 				<input type="hidden" name="return" value="{{$return_path}}" />
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				{{if $anoncomments && ! $observer}}
+				<div id="comment-edit-anon-{{$id}}">
+					{{include file="field_input.tpl" field=$authorname}}
+					{{include file="field_input.tpl" field=$authormail}}
+					{{$anon_extras}}
+				</div>
+				{{/if}}
 				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpenUI(this,{{$id}});" onBlur="commentCloseUI(this,{{$id}});" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >{{$comment}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >

From b917cf1eccc62f5f533c0a61ffd699764b39e404 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 18 Jun 2017 22:25:41 -0700
Subject: [PATCH 257/299] allow moderated comments like wordpress if
 permissions are compatible

---
 Zotlabs/Access/PermissionLimits.php |  2 +-
 Zotlabs/Lib/Enotify.php             | 11 ++++-
 Zotlabs/Lib/ThreadItem.php          |  8 ++-
 Zotlabs/Lib/ThreadStream.php        |  2 +-
 Zotlabs/Module/Item.php             | 31 ++++++++++--
 Zotlabs/Module/Moderate.php         | 77 +++++++++++++++++++++++++++++
 Zotlabs/Module/Settings/Channel.php |  2 +-
 include/channel.php                 | 66 +++++++++++++++++++++++++
 include/conversation.php            | 22 ++++++---
 include/items.php                   |  2 +-
 view/js/main.js                     |  2 +
 view/tpl/comment_item.tpl           |  7 +--
 view/tpl/search_item.tpl            | 11 +++++
 13 files changed, 221 insertions(+), 22 deletions(-)
 create mode 100644 Zotlabs/Module/Moderate.php

diff --git a/Zotlabs/Access/PermissionLimits.php b/Zotlabs/Access/PermissionLimits.php
index 909b654d5..8caeedb91 100644
--- a/Zotlabs/Access/PermissionLimits.php
+++ b/Zotlabs/Access/PermissionLimits.php
@@ -10,7 +10,7 @@ class PermissionLimits {
 		$perms = Permissions::Perms();
 		$limits = array();
 		foreach($perms as $k => $v) {
-			if(strstr($k,'view'))
+			if(strstr($k,'view') || $k === 'post_comments')
 				$limits[$k] = PERMS_PUBLIC;
 			else
 				$limits[$k] = PERMS_SPECIFIC;
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index a10675a87..114021568 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -170,6 +170,7 @@ class Enotify {
 
 		xchan_query($p);
 
+		$moderated = (($p[0]['item_blocked'] = ITEM_MODERATED) ? true : false);
 
 		$item_post_type = item_post_type($p[0]);
 //		$private = $p[0]['item_private'];
@@ -208,13 +209,21 @@ class Enotify {
 		// Before this we have the name of the replier on the subject rendering 
 		// differents subjects for messages on the same thread.
 
-		$subject = sprintf( t('[$Projectname:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
+		if($moderated)
+			$subject = sprintf( t('[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
+		else
+			$subject = sprintf( t('[$Projectname:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']);
 		$preamble = sprintf( t('%1$s, %2$s commented on an item/conversation you have been following.'), $recip['channel_name'], $sender['xchan_name']); 
 		$epreamble = $dest_str; 
 
 		$sitelink = t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf( $sitelink, $siteurl );
 		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
+		if($moderated) {
+			$tsitelink .= "\n\n" . sprintf( t('Please visit %s to approve or reject this comment.'), z_root() . '/moderate' );
+			$hsitelink .= "\n\n" . sprintf( t('Please visit %s to approve or reject this comment.'), z_root() . '/moderate' );
+		}
+		
 	}
 
 	if ($params['type'] == NOTIFY_LIKE) {
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index ff4e3205e..50c67c466 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -741,8 +741,12 @@ class ThreadItem {
 			'$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
 			'$encrypt' => t('Encrypt text'),
 			'$cipher' => $conv->get_cipher(),
-			'$sourceapp' => \App::$sourcename
-
+			'$sourceapp' => \App::$sourcename,
+			'$observer' => get_observer_hash(),
+			'$anoncomments' => perm_is_allowed($conv->get_profile_owner(),'','post_comments'),
+			'$anonname' => [ 'anonname', t('Your full name (required)'),'','' ],
+			'$anonmail' => [ 'anonmail', t('Your email address (required)'),'','' ],
+			'$anonurl'  => [ 'anonurl',  t('Your website URL (optional)'),'','' ]
 		));
 
 		return $comment_box;
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index beb626f31..1fd746c38 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -158,7 +158,7 @@ class ThreadStream {
 			if(intval($item->get_data_value('item_nocomment'))) {
 				$item->set_commentable(false);
 			}
-			elseif(($this->observer) && (! $item->is_commentable())) {
+			elseif(! $item->is_commentable()) {
 				if((array_key_exists('owner',$item->data)) && intval($item->data['owner']['abook_self']))
 					$item->set_commentable(perm_is_allowed($this->profile_owner,$ob_hash,'post_comments'));
 				else
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index ec36c22d8..952ecf487 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -33,7 +33,7 @@ class Item extends \Zotlabs\Web\Controller {
 		// This will change. Figure out who the observer is and whether or not
 		// they have permission to post here. Else ignore the post.
 	
-		if((! local_channel()) && (! remote_channel()) && (! x($_REQUEST,'commenter')))
+		if((! local_channel()) && (! remote_channel()) && (! x($_REQUEST,'anonname')))
 			return;
 
 		$uid = local_channel();
@@ -77,7 +77,7 @@ class Item extends \Zotlabs\Web\Controller {
 	
 		call_hooks('post_local_start', $_REQUEST);
 	
-	//	 logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+		// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 	
 		$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
 	
@@ -205,10 +205,29 @@ class Item extends \Zotlabs\Web\Controller {
 			$route = $parent_item['route'];
 	
 		}
+
+		$moderated = false;
 	
-		if(! $observer)
+		if(! $observer) {
 			$observer = \App::get_observer();
+			if(! $observer) {
+				$observer = anon_identity_init($_REQUEST);
+				if($observer) {
+					$moderated = true;
+					$remote_xchan = $remote_observer = $observer;
+				}
+			}
+		} 			
 	
+		if(! $observer) {
+			notice( t('Permission denied.') . EOL) ;
+			if($api_source)
+				return ( [ 'success' => false, 'message' => 'permission denied' ] );	
+			if(x($_REQUEST,'return')) 
+				goaway(z_root() . "/" . $return_path );
+			killme();
+		}
+
 		if($parent) {
 			logger('mod_item: item_post parent=' . $parent);
 			$can_comment = false;
@@ -312,7 +331,7 @@ class Item extends \Zotlabs\Web\Controller {
 		$walltowall = false;
 		$walltowall_comment = false;
 	
-		if($remote_xchan)
+		if($remote_xchan && ! $moderated)
 			$observer = $remote_observer;
 	
 		if($observer) {
@@ -996,6 +1015,10 @@ class Item extends \Zotlabs\Web\Controller {
 			\Zotlabs\Daemon\Master::Summon(array('Notifier', $notify_type, $post_id));
 	
 		logger('post_complete');
+
+		if($moderated) {
+			info(t('Your comment is awaiting approval.') . EOL);
+		}
 	
 		// figure out how to return, depending on from whence we came
 	
diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php
new file mode 100644
index 000000000..b7f05e4b2
--- /dev/null
+++ b/Zotlabs/Module/Moderate.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Zotlabs\Module;
+
+require_once('include/conversation.php');
+
+
+class Moderate extends \Zotlabs\Web\Controller {
+
+
+	function get() {
+		if(! local_channel()) {
+			notice( t('Permission denied.') . EOL);
+			return;
+		}
+
+
+		if(argc() > 2) {
+			$post_id = intval(argv(1));
+			if(! $post_id)
+				goaway(z_root() . '/moderate');
+
+			$action = argv(2);
+
+			$r = q("select * from item where uid = %d and id = %d and item_blocked = %d limit 1",
+				intval(local_channel()),
+				intval($post_id),
+				intval(ITEM_MODERATED)
+			);
+
+
+
+			if($r) {
+				if($action === 'approve') {
+					q("update item set item_blocked = 0 where uid = %d and id = %d",
+						intval(local_channel()),
+						intval($post_id)
+					);
+					notice( t('Comment approved') . EOL);
+				}
+				elseif($action === 'drop') {
+					drop_item($post_id,false);
+					notice( t('Comment deleted') . EOL);
+				} 
+			}
+
+			$r = q("select * from item where id = %d",
+				intval($post_id)
+			);
+			if($r) {
+				xchan_query($r);
+				$sync_item = fetch_post_tags($r);
+				build_sync_packet(local_channel(),array('item' => array(encode_item($sync_item[0],true))));
+			}
+			goaway(z_root() . '/moderate');
+		}
+
+		$r = q("select item.id as item_id, item.* from item where item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc limit 60",
+			intval(local_channel()),
+			intval(ITEM_MODERATED)
+		);
+
+		if($r) {
+			xchan_query($r);
+			$items = fetch_post_tags($r,true);
+		}
+		else {
+			$items = array();
+		}
+
+		$o = conversation($a,$items,'moderate',false,'traditional');
+
+		return $o;
+
+	}
+
+}
\ No newline at end of file
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php
index 7c30ef93e..3e6adcf8d 100644
--- a/Zotlabs/Module/Settings/Channel.php
+++ b/Zotlabs/Module/Settings/Channel.php
@@ -324,7 +324,7 @@ class Channel {
 		foreach($global_perms as $k => $perm) {
 			$options = array();
 			foreach($perm_opts as $opt) {
-				if((! strstr($k,'view')) && $opt[1] == PERMS_PUBLIC)
+				if(((! strstr($k,'view')) && $k !== 'post_comments') && $opt[1] == PERMS_PUBLIC)
 					continue;
 				$options[$opt[1]] = $opt[0];
 			}
diff --git a/include/channel.php b/include/channel.php
index b06c1994f..86fa2a63a 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2306,3 +2306,69 @@ function channel_codeallowed($channel_id) {
 
 }
 
+function anon_identity_init($reqvars) {
+
+	$x = [ 'request_vars' => $reqvars, 'xchan' => null, 'success' => 'unset' ];
+	call_hooks('anon_identity_init',$x);
+	if($x['success'] !== 'unset' && intval($x['success']) && $x['xchan'])
+		return $x['xchan'];
+
+	// allow a captcha handler to over-ride 
+	if($x['success'] !== 'unset' && (intval($x['success']) === 0))
+		return false;	
+	
+
+	$anon_name  = strip_tags(trim($reqvars['anonname']));
+	$anon_email = strip_tags(trim($reqvars['anonmail']));
+	$anon_url   = strip_tags(trim($reqvars['anonurl']));
+
+	if(! ($anon_name && $anon_email)) {
+		logger('anonymous commenter did not complete form');
+		return false;
+	}
+
+	if(! validate_email($anon_email)) {
+		logger('enonymous email not valid');
+		return false;
+	}
+
+	if(! $anon_url)
+		$anon_url = z_root();
+
+	$x = q("select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' limit 1",
+		dbesc($anon_email),
+		dbesc($anon_email)
+	);
+
+	if(! $x) {
+		xchan_store_lowlevel([ 
+			'xchan_guid'    => $anon_email,
+			'xchan_hash'    => $anon_email,
+			'xchan_name'    => $anon_name,
+			'xchan_url'     => $anon_url,
+			'xchan_network' => 'unknown',
+			'xchan_name_date' => datetime_convert()
+		]);
+			
+		$x = q("select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' limit 1",
+			dbesc($anon_email),
+			dbesc($anon_email)
+		);
+
+		$photo = z_root() . '/' . get_default_profile_photo(300);
+		$photos = import_xchan_photo($photo,$anon_email);
+		$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' ",
+			dbesc(datetime_convert()),
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
+			dbesc($photos[3]),
+			dbesc($anon_email),
+			dbesc($anon_email)
+		);
+
+	}
+
+	return $x[0];
+
+}
\ No newline at end of file
diff --git a/include/conversation.php b/include/conversation.php
index 3f9ee5cfa..2eac2adde 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -533,6 +533,10 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 		$live_update_div = '<div id="live-search"></div>' . "\r\n";
 	}
 
+	elseif ($mode === 'moderate') {
+		$profile_owner = local_channel();
+	}
+
 	elseif ($mode === 'photos') {
 		$profile_onwer = App::$profile['profile_uid'];
 		$page_writeable = ($profile_owner == local_channel());
@@ -577,7 +581,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 
 	if($items) {
 
-		if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
+		if(in_array($mode, [ 'network-new', 'search', 'community', 'moderate' ])) {
 
 			// "New Item View" on network page or search page results
 			// - just loop through the items and format them minimally for display
@@ -609,14 +613,14 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
 						&& ($item['id'] != $item['parent']))
 						continue;
-					$nickname = $item['nickname'];
+//					$nickname = $item['nickname'];
 				}
-				else
-					$nickname = App::$user['nickname'];
+//				else
+//					$nickname = App::$user['nickname'];
 
-				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
-				if($item['author-link'] && (! $item['author-name']))
-					$profile_name = $item['author-link'];
+//				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
+//				if($item['author-link'] && (! $item['author-name']))
+//					$profile_name = $item['author-link'];
 
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
@@ -625,7 +629,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 				else
 					$profile_link = zid($profile_link);
 
-				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+//				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
 
 				$profile_name = $item['author']['xchan_name'];
 				$profile_link = $item['author']['xchan_url'];
@@ -679,6 +683,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 					'template' => $tpl,
 					'toplevel' => 'toplevel_item',
 					'mode' => $mode,
+					'approve' => t('Approve'),
+					'delete' => t('Delete'),
 					'id' => (($preview) ? 'P0' : $item['item_id']),
 					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url),
 					'profile_url' => $profile_link,
diff --git a/include/items.php b/include/items.php
index e79707aeb..9e1d5c1ba 100755
--- a/include/items.php
+++ b/include/items.php
@@ -906,7 +906,7 @@ function import_author_unknown($x) {
 		$photos = import_xchan_photo($x['photo']['src'],$x['url']);
 
 		if($photos) {
-			$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_url = '%s' and xchan_network = 'unknown'",
+			$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' and xchan_network = 'unknown'",
 				dbesc(datetime_convert()),
 				dbesc($photos[0]),
 				dbesc($photos[1]),
diff --git a/view/js/main.js b/view/js/main.js
index 38b9754a1..6c42531ea 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -13,6 +13,7 @@ function commentOpenUI(obj, id) {
 			$("#comment-edit-text-" + id).attr('tabindex','9');
 			$("#comment-edit-submit-" + id).attr('tabindex','10');
 			$("#comment-tools-" + id).show();
+			$("#comment-edit-anon-" + id).show();
 		}
 	};
 
@@ -41,6 +42,7 @@ function commentOpen(obj, id) {
 		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
 		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 		$("#mod-cmnt-wrap-" + id).show();
+		$("#comment-edit-anon-" + id).show();
 		openMenu("comment-tools-" + id);
 		return true;
 	}
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index 92eeac056..02b0c527c 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -11,9 +11,10 @@
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				{{if $anoncomments && ! $observer}}
-				<div id="comment-edit-anon-{{$id}}">
-					{{include file="field_input.tpl" field=$authorname}}
-					{{include file="field_input.tpl" field=$authormail}}
+				<div id="comment-edit-anon-{{$id}}" style="display: none;" >
+					{{include file="field_input.tpl" field=$anonname}}
+					{{include file="field_input.tpl" field=$anonmail}}
+					{{include file="field_input.tpl" field=$anonurl}}
 					{{$anon_extras}}
 				</div>
 				{{/if}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 66618a216..4ca6378b8 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -101,6 +101,17 @@
 					<button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
 					<div class="dropdown-menu">{{$item.attachments}}</div>
 				</div>
+				{{/if}}
+				{{if $item.mode === 'moderate'}}
+
+				<div class="wall-item-tools-left btn-group">
+					<a href="moderate/{{$item.id}}/approve" class="btn btn-outline-secondary btn-small">{{$item.approve}}</a>
+					<a href="moderate/{{$item.id}}/drop" class="btn btn-outline-secondary btn-small">{{$item.delete}}</a>
+
+				</div>
+
+
+
 				{{/if}}
 			</div>
 		</div>

From b0a6a5a91e0180c0ed3de1af324e7b9567c5e108 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 18 Jun 2017 22:51:52 -0700
Subject: [PATCH 258/299] minor cleanup of moderated comment feature

---
 Zotlabs/Lib/Enotify.php |  2 +-
 include/channel.php     | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 114021568..90662ce84 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -221,7 +221,7 @@ class Enotify {
 		$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
 		if($moderated) {
 			$tsitelink .= "\n\n" . sprintf( t('Please visit %s to approve or reject this comment.'), z_root() . '/moderate' );
-			$hsitelink .= "\n\n" . sprintf( t('Please visit %s to approve or reject this comment.'), z_root() . '/moderate' );
+			$hsitelink .= "<br><br>" . sprintf( t('Please visit %s to approve or reject this comment.'), '<a href="' . z_root() . '/moderate">' . z_root() . '/moderate</a>' );
 		}
 		
 	}
diff --git a/include/channel.php b/include/channel.php
index 86fa2a63a..433c7c52c 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2335,28 +2335,31 @@ function anon_identity_init($reqvars) {
 	if(! $anon_url)
 		$anon_url = z_root();
 
+	$hash = hash('md5',$anon_email);
+
 	$x = q("select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' limit 1",
 		dbesc($anon_email),
-		dbesc($anon_email)
+		dbesc($hash)
 	);
 
 	if(! $x) {
 		xchan_store_lowlevel([ 
 			'xchan_guid'    => $anon_email,
-			'xchan_hash'    => $anon_email,
+			'xchan_hash'    => $hash,
 			'xchan_name'    => $anon_name,
 			'xchan_url'     => $anon_url,
 			'xchan_network' => 'unknown',
 			'xchan_name_date' => datetime_convert()
 		]);
 			
+
 		$x = q("select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' limit 1",
 			dbesc($anon_email),
-			dbesc($anon_email)
+			dbesc($hash)
 		);
 
 		$photo = z_root() . '/' . get_default_profile_photo(300);
-		$photos = import_xchan_photo($photo,$anon_email);
+		$photos = import_xchan_photo($photo,$hash);
 		$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' ",
 			dbesc(datetime_convert()),
 			dbesc($photos[0]),
@@ -2364,7 +2367,7 @@ function anon_identity_init($reqvars) {
 			dbesc($photos[2]),
 			dbesc($photos[3]),
 			dbesc($anon_email),
-			dbesc($anon_email)
+			dbesc($hash)
 		);
 
 	}

From 1b31c9f8a875db70154b8512b1e2f96f0a6731cd Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 20 Jun 2017 05:11:07 -0700
Subject: [PATCH 259/299] prevent likes/dislikes/etc. from anon commenters

---
 Zotlabs/Lib/ThreadItem.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 50c67c466..8ee35f988 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -153,7 +153,7 @@ class ThreadItem {
 			$response_verbs[] = 'attendyes';
 			$response_verbs[] = 'attendno';
 			$response_verbs[] = 'attendmaybe';
-			if($this->is_commentable()) {
+			if($this->is_commentable() && $observer) {
 				$isevent = true;
 				$attend = array( t('I will attend'), t('I will not attend'), t('I might attend'));
 			}
@@ -164,7 +164,7 @@ class ThreadItem {
 			$response_verbs[] = 'agree';
 			$response_verbs[] = 'disagree';
 			$response_verbs[] = 'abstain';
-			if($this->is_commentable()) {
+			if($this->is_commentable() && $observer) {
 				$conlabels = array( t('I agree'), t('I disagree'), t('I abstain'));
 				$canvote = true;
 			}
@@ -263,7 +263,7 @@ class ThreadItem {
 		if(($item['obj_type'] === ACTIVITY_OBJ_EVENT) && $conv->get_profile_owner() == local_channel())
 			$has_event = true;
 
-		if($this->is_commentable()) {
+		if($this->is_commentable() && $observer) {
 			$like = array( t("I like this \x28toggle\x29"), t("like"));
 			$dislike = array( t("I don't like this \x28toggle\x29"), t("dislike"));
 		}
@@ -369,7 +369,7 @@ class ThreadItem {
 			'has_tags' => $has_tags,
 			'reactions' => $this->reactions,
 // Item toolbar buttons
-			'emojis'   => (($this->is_toplevel() && $this->is_commentable() && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''),
+			'emojis'   => (($this->is_toplevel() && $this->is_commentable() && $observer && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''),
 			'like'      => $like,
 			'dislike'   => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
 			'share'     => $share,

From 07a8151ae66f1ccf00017f521219afdc2f5370ec Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 20 Jun 2017 12:45:05 -0700
Subject: [PATCH 260/299] more anon comment fixes

---
 Zotlabs/Daemon/Notifier.php |  3 ++-
 Zotlabs/Lib/ThreadItem.php  |  2 +-
 Zotlabs/Module/Moderate.php | 26 +++++++++++++-------------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 0e7284793..20dd96ddd 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -268,7 +268,8 @@ class Notifier {
 
 			// Check for non published items, but allow an exclusion for transmitting hidden file activities
 
-			if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) || 
+			if(intval($target_item['item_unpublished']) || intval($target_item['item_delayed']) ||
+				intval($target_item['item_blocked']) || 
 				( intval($target_item['item_hidden']) && ($target_item['obj_type'] !== ACTIVITY_OBJ_FILE))) {
 				logger('notifier: target item not published, so not forwardable', LOGGER_DEBUG);
 				return;
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 8ee35f988..72d8af4dd 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -743,7 +743,7 @@ class ThreadItem {
 			'$cipher' => $conv->get_cipher(),
 			'$sourceapp' => \App::$sourcename,
 			'$observer' => get_observer_hash(),
-			'$anoncomments' => perm_is_allowed($conv->get_profile_owner(),'','post_comments'),
+			'$anoncomments' => (($conv->get_mode() === 'channel' && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false),
 			'$anonname' => [ 'anonname', t('Your full name (required)'),'','' ],
 			'$anonmail' => [ 'anonmail', t('Your email address (required)'),'','' ],
 			'$anonurl'  => [ 'anonurl',  t('Your website URL (optional)'),'','' ]
diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php
index b7f05e4b2..92df58858 100644
--- a/Zotlabs/Module/Moderate.php
+++ b/Zotlabs/Module/Moderate.php
@@ -28,8 +28,6 @@ class Moderate extends \Zotlabs\Web\Controller {
 				intval(ITEM_MODERATED)
 			);
 
-
-
 			if($r) {
 				if($action === 'approve') {
 					q("update item set item_blocked = 0 where uid = %d and id = %d",
@@ -42,19 +40,21 @@ class Moderate extends \Zotlabs\Web\Controller {
 					drop_item($post_id,false);
 					notice( t('Comment deleted') . EOL);
 				} 
+			
+				$r = q("select * from item where id = %d",
+					intval($post_id)
+				);
+				if($r) {
+					xchan_query($r);
+					$sync_item = fetch_post_tags($r);
+					build_sync_packet(local_channel(),array('item' => array(encode_item($sync_item[0],true))));
+				}
+				if($action === 'approve') {
+					\Zotlabs\Daemon\Master::Summon(array('Notifier', 'comment-new', $post_id));
+				}
+				goaway(z_root() . '/moderate');
 			}
-
-			$r = q("select * from item where id = %d",
-				intval($post_id)
-			);
-			if($r) {
-				xchan_query($r);
-				$sync_item = fetch_post_tags($r);
-				build_sync_packet(local_channel(),array('item' => array(encode_item($sync_item[0],true))));
-			}
-			goaway(z_root() . '/moderate');
 		}
-
 		$r = q("select item.id as item_id, item.* from item where item.uid = %d and item_blocked = %d and item_deleted = 0 order by created desc limit 60",
 			intval(local_channel()),
 			intval(ITEM_MODERATED)

From 31e08127118b81ef223c13966e80f6d448d385d3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 20 Jun 2017 15:53:01 -0700
Subject: [PATCH 261/299] remove deprecated app parameter from conversation()

---
 Zotlabs/Module/Channel.php   | 4 ++--
 Zotlabs/Module/Display.php   | 4 ++--
 Zotlabs/Module/Item.php      | 2 +-
 Zotlabs/Module/Moderate.php  | 2 +-
 Zotlabs/Module/Network.php   | 2 +-
 Zotlabs/Module/Pubstream.php | 2 +-
 Zotlabs/Module/Search.php    | 2 +-
 include/conversation.php     | 3 +--
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 98a1e6c88..51c937270 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -365,10 +365,10 @@ class Channel extends \Zotlabs\Web\Controller {
 
 
 		if($checkjs->disabled()) {
-			$o .= conversation($a,$items,'channel',$update,'traditional');
+			$o .= conversation($items,'channel',$update,'traditional');
 		}
 		else {
-			$o .= conversation($a,$items,'channel',$update,$page_mode);
+			$o .= conversation($items,'channel',$update,$page_mode);
 		}
 
 		if((! $update) || ($checkjs->disabled())) {
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 815672091..df3cb1e2b 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -308,12 +308,12 @@ class Display extends \Zotlabs\Web\Controller {
 	
 	
 		if ($checkjs->disabled()) {
-			$o .= conversation($a, $items, 'display', $update, 'traditional');
+			$o .= conversation($items, 'display', $update, 'traditional');
 			if ($items[0]['title'])
 				\App::$page['title'] = $items[0]['title'] . " - " . \App::$page['title'];
 		} 
 		else {
-			$o .= conversation($a, $items, 'display', $update, 'client');
+			$o .= conversation($items, 'display', $update, 'client');
 		}
 	
 		if($updateable) {
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 952ecf487..e96d4c669 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -818,7 +818,7 @@ class Item extends \Zotlabs\Web\Controller {
 			$datarray['owner'] = $owner_xchan;
 			$datarray['author'] = $observer;
 			$datarray['attach'] = json_encode($datarray['attach']);
-			$o = conversation($a,array($datarray),'search',false,'preview');
+			$o = conversation(array($datarray),'search',false,'preview');
 	//		logger('preview: ' . $o, LOGGER_DEBUG);
 			echo json_encode(array('preview' => $o));
 			killme();
diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php
index 92df58858..47c373d28 100644
--- a/Zotlabs/Module/Moderate.php
+++ b/Zotlabs/Module/Moderate.php
@@ -68,7 +68,7 @@ class Moderate extends \Zotlabs\Web\Controller {
 			$items = array();
 		}
 
-		$o = conversation($a,$items,'moderate',false,'traditional');
+		$o = conversation($items,'moderate',false,'traditional');
 
 		return $o;
 
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 1c7c70019..f2ad77dd7 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -551,7 +551,7 @@ class Network extends \Zotlabs\Web\Controller {
 	
 		$mode = (($nouveau) ? 'network-new' : 'network');
 	
-		$o .= conversation($a,$items,$mode,$update,$page_mode);
+		$o .= conversation($items,$mode,$update,$page_mode);
 	
 		if(($items) && (! $update))
 			$o .= alt_pager($a,count($items));
diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php
index 46210abb1..28c34425c 100644
--- a/Zotlabs/Module/Pubstream.php
+++ b/Zotlabs/Module/Pubstream.php
@@ -167,7 +167,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
 		// fake it
 		$mode = ('network');
 	
-		$o .= conversation($a,$items,$mode,$update,$page_mode);
+		$o .= conversation($items,$mode,$update,$page_mode);
 	
 		if(($items) && (! $update))
 			$o .= alt_pager($a,count($items));
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index a78a023ff..2b949ebc7 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -225,7 +225,7 @@ class Search extends \Zotlabs\Web\Controller {
 		else
 			$o .= '<h2>' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
 	
-		$o .= conversation($a,$items,'search',$update,'client');
+		$o .= conversation($items,'search',$update,'client');
 	
 		$o .= '</div>';
 	
diff --git a/include/conversation.php b/include/conversation.php
index 2eac2adde..1c1a4479d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -442,7 +442,6 @@ function is_edit_activity($item) {
  * figures out how to determine page owner and other contextual items
  * that are based on unique features of the calling module.
  *
- * @param App &$a
  * @param array $items
  * @param string $mode
  * @param boolean $update
@@ -450,7 +449,7 @@ function is_edit_activity($item) {
  * @param string $prepared_item
  * @return string
  */
-function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $prepared_item = '') {
+function conversation($items, $mode, $update, $page_mode = 'traditional', $prepared_item = '') {
 
 	$content_html = '';
 	$o = '';

From 0233e9ad2a8c210f29c553a791b85d52cd6d5d85 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 20 Jun 2017 16:33:53 -0700
Subject: [PATCH 262/299] still an issue with caching import_author_zot

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

diff --git a/include/items.php b/include/items.php
index 9e1d5c1ba..126f0a174 100755
--- a/include/items.php
+++ b/include/items.php
@@ -803,6 +803,10 @@ function import_author_xchan($x) {
 		$y = import_author_zot($x);
 	}
 
+	// if we were told that it's a zot connection, don't probe/import anything else
+	if(array_key_exists('network',$x) && $x['network'] === 'zot')
+		return $y;
+
 	if($x['network'] === 'rss') {
 		$y = import_author_rss($x);
 	}

From 08d9316d763defc0fc2f408de6baff9e79853863 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 20 Jun 2017 17:03:11 -0700
Subject: [PATCH 263/299] more import_author_zot fixes

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

diff --git a/include/zot.php b/include/zot.php
index 9458b1f1e..9261b0ebb 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3584,6 +3584,11 @@ function import_author_zot($x) {
 
 	$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
 
+	if(array_key_exists('url',$x)) {
+		$m = parse_url($x['url']);
+		$desturl = $m['scheme'] . '://' . $m['host'];
+	}
+
 	$r1 = q("select hubloc_url, hubloc_updated, site_dead from hubloc left join site on
 		hubloc_url = site_url where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
 		dbesc($x['guid']),
@@ -3625,14 +3630,16 @@ function import_author_zot($x) {
 		);
 		if($r) {
 			logger('found another site that is not dead: ' . $r[0]['hubloc_url'], LOGGER_DEBUG,LOG_INFO);
-			$x['url'] = $r[0]['hubloc_url'];
+			$desturl = $r[0]['hubloc_url'];
 		}
 		else {
 			return $hash;
 		}
 	} 
 
-	$them = array('hubloc_url' => $x['url'], 'xchan_guid' => $x['guid'], 'xchan_guid_sig' => $x['guid_sig']);
+
+
+	$them = array('hubloc_url' => $desturl, 'xchan_guid' => $x['guid'], 'xchan_guid_sig' => $x['guid_sig']);
 	if(zot_refresh($them))
 		return $hash;
 

From 7e4e2f28dbc52316f4cef7c17a7c9e6ec7f607dc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 20 Jun 2017 17:13:04 -0700
Subject: [PATCH 264/299] explain what is happening here

---
 include/zot.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/zot.php b/include/zot.php
index 9261b0ebb..4c180ee59 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3584,6 +3584,9 @@ function import_author_zot($x) {
 
 	$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
 
+	// also - this function may get passed a profile url as 'url' and zot_refresh wants a hubloc_url (site baseurl),
+	// so deconstruct the url (if we have one) and rebuild it with just the baseurl components.
+
 	if(array_key_exists('url',$x)) {
 		$m = parse_url($x['url']);
 		$desturl = $m['scheme'] . '://' . $m['host'];

From 5f1a1db30fa4eae7c36d73b19e2e725a371138fb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 21 Jun 2017 17:46:28 -0700
Subject: [PATCH 265/299] oopsy

---
 Zotlabs/Lib/Enotify.php  | 2 +-
 Zotlabs/Module/Share.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 90662ce84..9f3347d19 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -170,7 +170,7 @@ class Enotify {
 
 		xchan_query($p);
 
-		$moderated = (($p[0]['item_blocked'] = ITEM_MODERATED) ? true : false);
+		$moderated = (($p[0]['item_blocked'] == ITEM_MODERATED) ? true : false);
 
 		$item_post_type = item_post_type($p[0]);
 //		$private = $p[0]['item_private'];
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index fcc2486ba..5c4811c59 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -76,7 +76,7 @@ class Share extends \Zotlabs\Web\Controller {
 		$observer = \App::get_observer();
 		$parsed = $observer['xchan_url'];
 		if($parsed) {
-			$post_url = $parsed['scheme'] . ':' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '')
+			$post_url = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '')
 				. '/rpost';
 	
 			/**

From 37b9a809a600e6bb28b210a2d4dfee986fb28fc9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 21 Jun 2017 22:11:21 -0700
Subject: [PATCH 266/299] start porting cdav proper to core

---
 Zotlabs/Module/Cdav.php | 1201 +++++++++++++++++++++++++++++++++++++++
 Zotlabs/Widget/Cdav.php |  176 ++++++
 2 files changed, 1377 insertions(+)
 create mode 100644 Zotlabs/Module/Cdav.php
 create mode 100644 Zotlabs/Widget/Cdav.php

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
new file mode 100644
index 000000000..856956b5b
--- /dev/null
+++ b/Zotlabs/Module/Cdav.php
@@ -0,0 +1,1201 @@
+<?php
+
+namespace Zotlabs\Module;
+
+class Cdav extends \Zotlabs\Web\Controller {
+
+	function init() {
+
+		if((argv(1) !== 'calendar') && (argv(1) !== 'addressbook')) {
+
+			// workaround for HTTP-auth in CGI mode
+			if (x($_SERVER, 'REDIRECT_REMOTE_USER')) {
+				$userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ;
+				if(strlen($userpass)) {
+					list($name, $password) = explode(':', $userpass);
+					$_SERVER['PHP_AUTH_USER'] = $name;
+					$_SERVER['PHP_AUTH_PW'] = $password;
+				}
+			}
+
+			if (x($_SERVER, 'HTTP_AUTHORIZATION')) {
+				$userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ;
+				if(strlen($userpass)) {
+					list($name, $password) = explode(':', $userpass);
+					$_SERVER['PHP_AUTH_USER'] = $name;
+					$_SERVER['PHP_AUTH_PW'] = $password;
+				}
+			}
+
+			/**
+			 * This server combines both CardDAV and CalDAV functionality into a single
+			 * server. It is assumed that the server runs at the root of a HTTP domain (be
+			 * that a domainname-based vhost or a specific TCP port.
+			 *
+			 * This example also assumes that you're using SQLite and the database has
+			 * already been setup (along with the database tables).
+			 *
+			 * You may choose to use MySQL instead, just change the PDO connection
+			 * statement.
+			 */
+
+			/**
+			 * UTC or GMT is easy to work with, and usually recommended for any
+			 * application.
+			 */
+			date_default_timezone_set('UTC');
+
+			/**
+			 * Make sure this setting is turned on and reflect the root url for your WebDAV
+			 * server.
+			 *
+			 * This can be for example the root / or a complete path to your server script.
+			 */
+
+			$baseUri = '/cdav/';
+
+			/**
+			 * Database
+			 *
+			 */
+
+			$pdo = \DBA::$dba->db;
+
+			// Autoloader
+			require_once 'vendor/autoload.php';
+
+			/**
+			 * The backends. Yes we do really need all of them.
+			 *
+			 * This allows any developer to subclass just any of them and hook into their
+			 * own backend systems.
+			 */
+
+			$auth = new \Zotlabs\Storage\BasicAuth();
+			$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'CalDAV/CardDAV');
+
+			if (local_channel()) {
+				logger('loggedin');
+				$channel = \App::get_channel();
+				$auth->setCurrentUser($channel['channel_address']);
+				$auth->channel_id = $channel['channel_id'];
+				$auth->channel_hash = $channel['channel_hash'];
+				$auth->channel_account_id = $channel['channel_account_id'];
+				if($channel['channel_timezone'])
+					$auth->setTimezone($channel['channel_timezone']);
+				$auth->observer = $channel['channel_hash'];
+			}
+
+
+			$principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($pdo);
+			$carddavBackend   = new \Sabre\CardDAV\Backend\PDO($pdo);
+			$caldavBackend    = new \Sabre\CalDAV\Backend\PDO($pdo);
+
+			/**
+			 * The directory tree
+			 *
+			 * Basically this is an array which contains the 'top-level' directories in the
+			 * WebDAV server.
+			 */
+
+			$nodes = [
+				// /principals
+				new \Sabre\CalDAV\Principal\Collection($principalBackend),
+				// /calendars
+				new \Sabre\CalDAV\CalendarRoot($principalBackend, $caldavBackend),
+				// /addressbook
+				new \Sabre\CardDAV\AddressBookRoot($principalBackend, $carddavBackend),
+			];
+
+			// The object tree needs in turn to be passed to the server class
+
+			$server = new \Sabre\DAV\Server($nodes);
+
+			if(isset($baseUri))
+				$server->setBaseUri($baseUri);
+
+			// Plugins
+			$server->addPlugin(new \Sabre\DAV\Auth\Plugin($auth));
+			//$server->addPlugin(new \Sabre\DAV\Browser\Plugin());
+			$server->addPlugin(new \Sabre\DAV\Sync\Plugin());
+			$server->addPlugin(new \Sabre\DAV\Sharing\Plugin());
+			$server->addPlugin(new \Sabre\DAVACL\Plugin());
+
+			// CalDAV plugins
+			$server->addPlugin(new \Sabre\CalDAV\Plugin());
+			$server->addPlugin(new \Sabre\CalDAV\SharingPlugin());
+			//$server->addPlugin(new \Sabre\CalDAV\Schedule\Plugin());
+			$server->addPlugin(new \Sabre\CalDAV\ICSExportPlugin());
+
+			// CardDAV plugins
+			$server->addPlugin(new \Sabre\CardDAV\Plugin());
+			$server->addPlugin(new \Sabre\CardDAV\VCFExportPlugin());
+
+			// And off we go!
+			$server->exec();
+
+			killme();
+
+		}
+
+	}
+
+	function post() {
+		if(! local_channel())
+			return;
+
+		$channel = \App::get_channel();
+		$principalUri = 'principals/' . $channel['channel_hash'];
+
+		if(!cdav_principal($principalUri))
+			return;
+
+		$pdo = \DBA::$dba->db;
+
+		require_once 'vendor/autoload.php';
+
+		if(argc() == 2 && argv(1) === 'calendar') {
+
+			$caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+			$calendars = $caldavBackend->getCalendarsForUser($principalUri);
+
+			//create new calendar
+			if($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) {
+				do {
+					$duplicate = false;
+					$calendarUri = random_string(40);
+
+					$r = q("SELECT uri FROM calendarinstances WHERE principaluri = '%s' AND uri = '%s' LIMIT 1",
+						dbesc($principalUri),
+						dbesc($calendarUri)
+					);
+
+					if (count($r))
+						$duplicate = true;
+				} while ($duplicate == true);
+
+				$properties = [
+					'{DAV:}displayname' => $_REQUEST['{DAV:}displayname'],
+					'{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color'],
+					'{urn:ietf:params:xml:ns:caldav}calendar-description' => $channel['channel_name']
+				];
+
+				$id = $caldavBackend->createCalendar($principalUri, $calendarUri, $properties);
+
+				// set new calendar to be visible
+				set_pconfig(local_channel(), 'cdav_calendar' , $id[0], 1);
+			}
+
+			//create new calendar object via ajax request
+			if($_REQUEST['submit'] === 'create_event' && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) {
+
+				$id = explode(':', $_REQUEST['target']);
+
+				if(!cdav_perms($id[0],$calendars,true))
+					return;
+
+				$title = $_REQUEST['title'];
+				$dtstart = new \DateTime($_REQUEST['dtstart']);
+				if($_REQUEST['dtend'])
+					$dtend = new \DateTime($_REQUEST['dtend']);
+				$description = $_REQUEST['description'];
+				$location = $_REQUEST['location'];
+
+				do {
+					$duplicate = false;
+					$objectUri = random_string(40) . '.ics';
+
+					$r = q("SELECT uri FROM calendarobjects WHERE calendarid = %s AND uri = '%s' LIMIT 1",
+						intval($id[0]),
+						dbesc($objectUri)
+					);
+
+					if (count($r))
+						$duplicate = true;
+				} while ($duplicate == true);
+
+
+				$vcalendar = new \Sabre\VObject\Component\VCalendar([
+				    'VEVENT' => [
+					'SUMMARY' => $title,
+					'DTSTART' => $dtstart
+				    ]
+				]);
+				if($dtend)
+					$vcalendar->VEVENT->add('DTEND', $dtend);
+				if($description)
+					$vcalendar->VEVENT->add('DESCRIPTION', $description);
+				if($location)
+					$vcalendar->VEVENT->add('LOCATION', $location);
+
+				$calendarData = $vcalendar->serialize();
+
+				$caldavBackend->createCalendarObject($id, $objectUri, $calendarData);
+
+				killme();
+			}
+
+			//edit calendar name and color
+			if($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && $_REQUEST['id']) {
+
+				$id = explode(':', $_REQUEST['id']);
+
+				if(! cdav_perms($id[0],$calendars))
+					return;
+
+				$mutations = [
+					'{DAV:}displayname' => $_REQUEST['{DAV:}displayname'],
+					'{http://apple.com/ns/ical/}calendar-color' => $_REQUEST['color']
+				];
+
+				$patch = new \Sabre\DAV\PropPatch($mutations);
+
+				$caldavBackend->updateCalendar($id, $patch);
+
+				$patch->commit();
+
+			}
+
+			//edit calendar object via ajax request
+			if($_REQUEST['submit'] === 'update_event' && $_REQUEST['uri'] && $_REQUEST['title'] && $_REQUEST['target'] && $_REQUEST['dtstart']) {
+
+				$id = explode(':', $_REQUEST['target']);
+
+				if(!cdav_perms($id[0],$calendars,true))
+					return;
+
+				$uri = $_REQUEST['uri'];
+				$title = $_REQUEST['title'];
+				$dtstart = new \DateTime($_REQUEST['dtstart']);
+				$dtend = $_REQUEST['dtend'] ? new \DateTime($_REQUEST['dtend']) : '';
+				$description = $_REQUEST['description'];
+				$location = $_REQUEST['location'];
+
+				$object = $caldavBackend->getCalendarObject($id, $uri);
+
+				$vcalendar = \Sabre\VObject\Reader::read($object['calendardata']);
+
+				if($title)
+					$vcalendar->VEVENT->SUMMARY = $title;
+				if($dtstart)
+					$vcalendar->VEVENT->DTSTART = $dtstart;
+				if($dtend)
+					$vcalendar->VEVENT->DTEND = $dtend;
+				else
+					unset($vcalendar->VEVENT->DTEND);
+				if($description)
+					$vcalendar->VEVENT->DESCRIPTION = $description;
+				if($location)
+					$vcalendar->VEVENT->LOCATION = $location;
+
+				$calendarData = $vcalendar->serialize();
+
+				$caldavBackend->updateCalendarObject($id, $uri, $calendarData);
+
+				killme();
+			}
+
+			//delete calendar object via ajax request
+			if($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) {
+
+				$id = explode(':', $_REQUEST['target']);
+
+				if(!cdav_perms($id[0],$calendars,true))
+					return;
+
+				$uri = $_REQUEST['uri'];
+
+				$caldavBackend->deleteCalendarObject($id, $uri);
+
+				killme();
+			}
+
+			//edit calendar object date/timeme via ajax request (drag and drop)
+			if($_REQUEST['update'] && $_REQUEST['id'] && $_REQUEST['uri']) {
+
+				$id = [$_REQUEST['id'][0], $_REQUEST['id'][1]];
+
+				if(!cdav_perms($id[0],$calendars,true))
+					return;
+
+				$uri = $_REQUEST['uri'];
+				$dtstart = new \DateTime($_REQUEST['dtstart']);
+				$dtend = $_REQUEST['dtend'] ? new \DateTime($_REQUEST['dtend']) : '';
+
+				$object = $caldavBackend->getCalendarObject($id, $uri);
+
+				$vcalendar = \Sabre\VObject\Reader::read($object['calendardata']);
+
+				if($dtstart) {
+					$vcalendar->VEVENT->DTSTART = $dtstart;
+				}
+				if($dtend) {
+					$vcalendar->VEVENT->DTEND = $dtend;
+				}
+				else {
+					unset($vcalendar->VEVENT->DTEND);
+				}
+
+				$calendarData = $vcalendar->serialize();
+
+				$caldavBackend->updateCalendarObject($id, $uri, $calendarData);
+
+				killme();
+			}
+
+			//share a calendar - this only works on local system (with channels on the same server)
+			if($_REQUEST['sharee'] && $_REQUEST['share']) {
+
+				$id = [intval($_REQUEST['calendarid']), intval($_REQUEST['instanceid'])];
+
+				if(! cdav_perms($id[0],$calendars))
+					return;
+
+				$hash = $_REQUEST['sharee'];
+
+				$sharee_arr = channelx_by_hash($hash);
+
+				$sharee = new \Sabre\DAV\Xml\Element\Sharee();
+
+				$sharee->href = 'mailto:' . $sharee_arr['channel_hash'];
+				$sharee->principal = 'principals/' . $sharee_arr['channel_address'];
+				$sharee->access = intval($_REQUEST['access']);
+				$sharee->properties = ['{DAV:}displayname' => $channel['channel_name']];
+
+				$caldavBackend->updateInvites($id, [$sharee]);
+			}
+		}
+
+		if(argc() >= 2 && argv(1) === 'addressbook') {
+
+			$carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo);
+			$addressbooks = $carddavBackend->getAddressBooksForUser($principalUri);
+
+			//create new addressbook
+			if($_REQUEST['{DAV:}displayname'] && $_REQUEST['create']) {
+				do {
+					$duplicate = false;
+					$addressbookUri = random_string(20);
+
+					$r = q("SELECT uri FROM addressbooks WHERE principaluri = '%s' AND uri = '%s' LIMIT 1",
+						dbesc($principalUri),
+						dbesc($addressbookUri)
+					);
+
+					if (count($r))
+						$duplicate = true;
+				} while ($duplicate == true);
+
+				$properties = ['{DAV:}displayname' => $_REQUEST['{DAV:}displayname']];
+
+				$carddavBackend->createAddressBook($principalUri, $addressbookUri, $properties);
+			}
+
+			//edit addressbook
+			if($_REQUEST['{DAV:}displayname'] && $_REQUEST['edit'] && intval($_REQUEST['id'])) {
+
+				$id = $_REQUEST['id'];
+
+				if(! cdav_perms($id,$addressbooks))
+					return;
+
+				$mutations = [
+					'{DAV:}displayname' => $_REQUEST['{DAV:}displayname']
+				];
+
+				$patch = new \Sabre\DAV\PropPatch($mutations);
+
+				$carddavBackend->updateAddressBook($id, $patch);
+
+				$patch->commit();
+			}
+
+			//create addressbook card
+			if($_REQUEST['create'] && $_REQUEST['target'] && $_REQUEST['fn']) {
+				$id = $_REQUEST['target'];
+
+				do {
+					$duplicate = false;
+					$uri = random_string(40) . '.vcf';
+
+					$r = q("SELECT uri FROM cards WHERE addressbookid = %s AND uri = '%s' LIMIT 1",
+						intval($id),
+						dbesc($uri)
+					);
+
+					if (count($r))
+						$duplicate = true;
+				} while ($duplicate == true);
+
+				//TODO: this mostly duplictes the procedure in update addressbook card. should move this part to a function to avoid duplication
+				$fn = $_REQUEST['fn'];
+
+				$vcard = new \Sabre\VObject\Component\VCard([
+					'FN' => $fn,
+					'N' => array_reverse(explode(' ', $fn))
+				]);
+
+				$org = $_REQUEST['org'];
+				if($org) {
+					$vcard->ORG = $org;
+				}
+
+				$title = $_REQUEST['title'];
+				if($title) {
+					$vcard->TITLE = $title;
+				}
+
+				$tel = $_REQUEST['tel'];
+				$tel_type = $_REQUEST['tel_type'];
+				if($tel) {
+					$i = 0;
+					foreach($tel as $item) {
+						if($item) {
+							$vcard->add('TEL', $item, ['type' => $tel_type[$i]]);
+						}
+						$i++;
+					}
+				}
+
+				$email = $_REQUEST['email'];
+				$email_type = $_REQUEST['email_type'];
+				if($email) {
+					$i = 0;
+					foreach($email as $item) {
+						if($item) {
+							$vcard->add('EMAIL', $item, ['type' => $email_type[$i]]);
+						}
+						$i++;
+					}
+				}
+
+				$impp = $_REQUEST['impp'];
+				$impp_type = $_REQUEST['impp_type'];
+				if($impp) {
+					$i = 0;
+					foreach($impp as $item) {
+						if($item) {
+							$vcard->add('IMPP', $item, ['type' => $impp_type[$i]]);
+						}
+						$i++;
+					}
+				}
+
+				$url = $_REQUEST['url'];
+				$url_type = $_REQUEST['url_type'];
+				if($url) {
+					$i = 0;
+					foreach($url as $item) {
+						if($item) {
+							$vcard->add('URL', $item, ['type' => $url_type[$i]]);
+						}
+						$i++;
+					}
+				}
+
+				$adr = $_REQUEST['adr'];
+				$adr_type = $_REQUEST['adr_type'];
+
+				if($adr) {
+					$i = 0;
+					foreach($adr as $item) {
+						if($item) {
+							$vcard->add('ADR', $item, ['type' => $adr_type[$i]]);
+						}
+						$i++;
+					}
+				}
+
+				$note = $_REQUEST['note'];
+				if($note) {
+					$vcard->NOTE = $note;
+				}
+
+				$cardData = $vcard->serialize();
+
+				$carddavBackend->createCard($id, $uri, $cardData);
+
+			}
+
+			//edit addressbook card
+			if($_REQUEST['update'] && $_REQUEST['uri'] && $_REQUEST['target']) {
+
+				$id = $_REQUEST['target'];
+
+				if(!cdav_perms($id,$addressbooks))
+					return;
+
+				$uri = $_REQUEST['uri'];
+
+				$object = $carddavBackend->getCard($id, $uri);
+				$vcard = \Sabre\VObject\Reader::read($object['carddata']);
+
+				$fn = $_REQUEST['fn'];
+				if($fn) {
+					$vcard->FN = $fn;
+					$vcard->N = array_reverse(explode(' ', $fn));
+				}
+
+				$org = $_REQUEST['org'];
+				if($org) {
+					$vcard->ORG = $org;
+				}
+				else {
+					unset($vcard->ORG);
+				}
+
+				$title = $_REQUEST['title'];
+				if($title) {
+					$vcard->TITLE = $title;
+				}
+				else {
+					unset($vcard->TITLE);
+				}
+
+				$tel = $_REQUEST['tel'];
+				$tel_type = $_REQUEST['tel_type'];
+				if($tel) {
+					$i = 0;
+					unset($vcard->TEL);
+					foreach($tel as $item) {
+						if($item) {
+							$vcard->add('TEL', $item, ['type' => $tel_type[$i]]);
+						}
+						$i++;
+					}
+				}
+				else {
+					unset($vcard->TEL);
+				}
+
+				$email = $_REQUEST['email'];
+				$email_type = $_REQUEST['email_type'];
+				if($email) {
+					$i = 0;
+					unset($vcard->EMAIL);
+					foreach($email as $item) {
+						if($item) {
+							$vcard->add('EMAIL', $item, ['type' => $email_type[$i]]);
+						}
+						$i++;
+					}
+				}
+				else {
+					unset($vcard->EMAIL);
+				}
+
+				$impp = $_REQUEST['impp'];
+				$impp_type = $_REQUEST['impp_type'];
+				if($impp) {
+					$i = 0;
+					unset($vcard->IMPP);
+					foreach($impp as $item) {
+						if($item) {
+							$vcard->add('IMPP', $item, ['type' => $impp_type[$i]]);
+						}
+						$i++;
+					}
+				}
+				else {
+					unset($vcard->IMPP);
+				}
+
+				$url = $_REQUEST['url'];
+				$url_type = $_REQUEST['url_type'];
+				if($url) {
+					$i = 0;
+					unset($vcard->URL);
+					foreach($url as $item) {
+						if($item) {
+							$vcard->add('URL', $item, ['type' => $url_type[$i]]);
+						}
+						$i++;
+					}
+				}
+				else {
+					unset($vcard->URL);
+				}
+
+				$adr = $_REQUEST['adr'];
+				$adr_type = $_REQUEST['adr_type'];
+				if($adr) {
+					$i = 0;
+					unset($vcard->ADR);
+					foreach($adr as $item) {
+						if($item) {
+							$vcard->add('ADR', $item, ['type' => $adr_type[$i]]);
+						}
+						$i++;
+					}
+				}
+				else {
+					unset($vcard->ADR);
+				}
+
+				$note = $_REQUEST['note'];
+				if($note) {
+					$vcard->NOTE = $note;
+				}
+				else {
+					unset($vcard->NOTE);
+				}
+
+				$cardData = $vcard->serialize();
+
+				$carddavBackend->updateCard($id, $uri, $cardData);
+			}
+
+			//delete addressbook card
+			if($_REQUEST['delete'] && $_REQUEST['uri'] && $_REQUEST['target']) {
+
+				$id = $_REQUEST['target'];
+
+				if(!cdav_perms($id,$addressbooks))
+					return;
+
+				$uri = $_REQUEST['uri'];
+
+				$carddavBackend->deleteCard($id, $uri);
+			}
+		}
+
+		//Import calendar or addressbook
+		if(($_FILES) && array_key_exists('userfile',$_FILES) && intval($_FILES['userfile']['size']) && $_REQUEST['target']) {
+
+			$src = @file_get_contents($_FILES['userfile']['tmp_name']);
+
+			if($src) {
+
+				if($_REQUEST['c_upload']) {
+					$id = explode(':', $_REQUEST['target']);
+					$ext = 'ics';
+					$table = 'calendarobjects';
+					$column = 'calendarid';
+					$objects = new \Sabre\VObject\Splitter\ICalendar($src);
+					$profile = \Sabre\VObject\Node::PROFILE_CALDAV;
+					$backend = new \Sabre\CalDAV\Backend\PDO($pdo);
+				}
+
+				if($_REQUEST['a_upload']) {
+					$id[] = intval($_REQUEST['target']);
+					$ext = 'vcf';
+					$table = 'cards';
+					$column = 'addressbookid';
+					$objects = new \Sabre\VObject\Splitter\VCard($src);
+					$profile = \Sabre\VObject\Node::PROFILE_CARDDAV;
+					$backend = new \Sabre\CardDAV\Backend\PDO($pdo);
+				}
+
+				while ($object = $objects->getNext()) {
+
+					if($_REQUEST['a_upload']) {
+						$object = $object->convert(\Sabre\VObject\Document::VCARD40);
+					}
+
+					$ret = $object->validate($profile & \Sabre\VObject\Node::REPAIR);
+
+					//level 3 Means that the document is invalid,
+					//level 2 means a warning. A warning means it's valid but it could cause interopability issues,
+					//level 1 means that there was a problem earlier, but the problem was automatically repaired.
+
+					if($ret[0]['level'] < 3) {
+						do {
+							$duplicate = false;
+							$objectUri = random_string(40) . '.' . $ext;
+
+							$r = q("SELECT uri FROM $table WHERE $column = %d AND uri = '%s' LIMIT 1",
+								dbesc($id[0]),
+								dbesc($objectUri)
+							);
+
+							if (count($r))
+								$duplicate = true;
+						} while ($duplicate == true);
+
+						if($_REQUEST['c_upload']) {
+							$backend->createCalendarObject($id, $objectUri, $object->serialize());
+						}
+
+						if($_REQUEST['a_upload']) {
+							$backend->createCard($id[0], $objectUri, $object->serialize());
+						}
+					}
+					else {
+						if($_REQUEST['c_upload']) {
+							notice( '<strong>' . t('INVALID EVENT DISMISSED!') . '</strong>' . EOL .
+								'<strong>' . t('Summary: ') . '</strong>' . (($object->VEVENT->SUMMARY) ? $object->VEVENT->SUMMARY : t('Unknown')) . EOL .
+								'<strong>' . t('Date: ') . '</strong>' . (($object->VEVENT->DTSTART) ? $object->VEVENT->DTSTART : t('Unknown')) . EOL .
+								'<strong>' . t('Reason: ') . '</strong>' . $ret[0]['message'] . EOL
+							);
+						}
+
+						if($_REQUEST['a_upload']) {
+							notice( '<strong>' . t('INVALID CARD DISMISSED!') . '</strong>' . EOL .
+								'<strong>' . t('Name: ') . '</strong>' . (($object->FN) ? $object->FN : t('Unknown')) . EOL .
+								'<strong>' . t('Reason: ') . '</strong>' . $ret[0]['message'] . EOL
+							);
+						}
+					}
+				}
+			}
+			@unlink($src);
+		}
+	}
+
+	function get() {
+
+		if(!local_channel())
+			return;
+
+		$channel = \App::get_channel();
+		$principalUri = 'principals/' . $channel['channel_hash'];
+
+
+		if(!cdav_principal($principalUri)) {
+			$this->activate($channel);
+			if(!cdav_principal($principalUri)) {
+				return;
+			}
+		}
+
+		$pdo = \DBA::$dba->db;
+
+		require_once 'vendor/autoload.php';
+
+		head_add_css('/addon/cdav/view/css/cdav.css');
+
+		if(argv(1) === 'calendar') {
+			$caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+			$calendars = $caldavBackend->getCalendarsForUser($principalUri);
+		}
+
+		//Display calendar(s) here
+		if(argc() == 2 && argv(1) === 'calendar') {
+
+			head_add_css('/library/fullcalendar/fullcalendar.css');
+			head_add_css('/addon/cdav/view/css/cdav_calendar.css');
+
+			head_add_js('/library/moment/moment.min.js', 1);
+			head_add_js('/library/fullcalendar/fullcalendar.min.js', 1);
+			head_add_js('/library/fullcalendar/locale-all.js', 1);
+
+			foreach($calendars as $calendar) {
+				$editable = (($calendar['share-access'] == 2) ? 'false' : 'true');  // false/true must be string since we're passing it to javascript
+				$color = (($calendar['{http://apple.com/ns/ical/}calendar-color']) ? $calendar['{http://apple.com/ns/ical/}calendar-color'] : '#3a87ad');
+				$sharer = (($calendar['share-access'] == 3) ? $calendar['{urn:ietf:params:xml:ns:caldav}calendar-description'] : '');
+				$switch = get_pconfig(local_channel(), 'cdav_calendar', $calendar['id'][0]);
+				if($switch) {
+					$sources .= '{
+						url: \'/cdav/calendar/json/' . $calendar['id'][0] . '/' . $calendar['id'][1] . '\',
+						color: \'' . $color . '\'
+					 }, ';
+				}
+
+				if($calendar['share-access'] != 2) {
+					$writable_calendars[] = [
+						'displayname' => $calendar['{DAV:}displayname'],
+						'sharer' => $sharer,
+						'id' => $calendar['id']
+					];
+				}
+			}
+
+			$sources = rtrim($sources, ', ');
+
+			$first_day = get_pconfig(local_channel(),'system','cal_first_day');
+			$first_day = (($first_day) ? $first_day : 0);
+
+			$title = ['title', t('Event title')];
+			$dtstart = ['dtstart', t('Start date and time'), '', t('Example: YYYY-MM-DD HH:mm')];
+			$dtend = ['dtend', t('End date and time'), '', t('Example: YYYY-MM-DD HH:mm')];
+			$description = ['description', t('Description')];
+			$location = ['location', t('Location')];
+
+			$o .= replace_macros(get_markup_template('cdav_calendar.tpl', 'addon/cdav'), [
+				'$sources' => $sources,
+				'$color' => $color,
+				'$lang' => \App::$language,
+				'$first_day' => $first_day,
+				'$prev'	=> t('Previous'),
+				'$next'	=> t('Next'),
+				'$today' => t('Today'),
+				'$month' => t('Month'),
+				'$week' => t('Week'),
+				'$day' => t('Day'),
+				'$list_month' => t('List month'),
+				'$list_week' => t('List week'),
+				'$list_day' => t('List day'),
+				'$title' => $title,
+				'$writable_calendars' => $writable_calendars,
+				'$dtstart' => $dtstart,
+				'$dtend' => $dtend,
+				'$description' => $description,
+				'$location' => $location,
+				'$more' => t('More'),
+				'$less' => t('Less'),
+				'$calendar_select_label' => t('Select calendar'),
+				'$delete' => t('Delete'),
+				'$delete_all' => t('Delete all'),
+				'$cancel' => t('Cancel'),
+				'$recurrence_warning' => t('Sorry! Editing of recurrent events is not yet implemented.')
+			]);
+
+			return $o;
+
+		}
+
+		//Provide json data for calendar
+		if(argc() == 5 && argv(1) === 'calendar' && argv(2) === 'json'  && intval(argv(3)) && intval(argv(4))) {
+
+			$id = [argv(3), argv(4)];
+
+			if(! cdav_perms($id[0],$calendars))
+				killme();
+
+			if (x($_GET,'start'))
+				$start = new \DateTime($_GET['start']);
+			if (x($_GET,'end'))
+				$end = new \DateTime($_GET['end']);
+
+			$filters['name'] = 'VCALENDAR';
+			$filters['prop-filters'][0]['name'] = 'VEVENT';
+			$filters['comp-filters'][0]['name'] = 'VEVENT';
+			$filters['comp-filters'][0]['time-range']['start'] = $start;
+			$filters['comp-filters'][0]['time-range']['end'] = $end;
+
+			$uris = $caldavBackend->calendarQuery($id, $filters);
+			if($uris) {
+
+				$objects = $caldavBackend->getMultipleCalendarObjects($id, $uris);
+
+				foreach($objects as $object) {
+
+					$vcalendar = \Sabre\VObject\Reader::read($object['calendardata']);
+
+					if(isset($vcalendar->VEVENT->RRULE))
+						$vcalendar = $vcalendar->expand($start, $end);
+
+					foreach($vcalendar->VEVENT as $vevent) {
+						$title = (string)$vevent->SUMMARY;
+						$dtstart = (string)$vevent->DTSTART;
+						$dtend = (string)$vevent->DTEND;
+						$description = (string)$vevent->DESCRIPTION;
+						$location = (string)$vevent->LOCATION;
+
+						$rw = ((cdav_perms($id[0],$calendars,true)) ? true : false);
+						$recurrent = ((isset($vevent->{'RECURRENCE-ID'})) ? true : false);
+
+						$editable = $rw ? true : false;
+
+						if($recurrent)
+							$editable = false;
+
+						$allDay = false;
+
+						// allDay event rules
+						if(!strpos($dtstart, 'T') && !strpos($dtend, 'T'))
+							$allDay = true;
+						if(strpos($dtstart, 'T000000') && strpos($dtend, 'T000000'))
+							$allDay = true;
+
+						$events[] = [
+							'calendar_id' => $id,
+							'uri' => $object['uri'],
+							'title' => $title,
+							'start' => $dtstart,
+							'end' => $dtend,
+							'description' => $description,
+							'location' => $location,
+							'allDay' => $allDay,
+							'editable' => $editable,
+							'recurrent' => $recurrent,
+							'rw' => $rw
+						];
+					}
+				}
+				json_return_and_die($events);
+			}
+			else {
+				killme();
+			}
+		}
+
+		//enable/disable calendars
+		if(argc() == 5 && argv(1) === 'calendar' && argv(2) === 'switch'  && intval(argv(3)) && (argv(4) == 1 || argv(4) == 0)) {
+			$id = argv(3);
+
+			if(! cdav_perms($id,$calendars))
+				killme();
+
+			set_pconfig(local_channel(), 'cdav_calendar' , argv(3), argv(4));
+			killme();
+		}
+
+		//drop calendar
+		if(argc() == 5 && argv(1) === 'calendar' && argv(2) === 'drop' && intval(argv(3)) && intval(argv(4))) {
+			$id = [argv(3), argv(4)];
+
+			if(! cdav_perms($id[0],$calendars))
+				killme();
+
+			$caldavBackend->deleteCalendar($id);
+			killme();
+		}
+
+		//drop sharee
+		if(argc() == 6 && argv(1) === 'calendar' && argv(2) === 'dropsharee'  && intval(argv(3)) && intval(argv(4))) {
+
+			$id = [argv(3), argv(4)];
+			$hash = argv(5);
+
+			if(! cdav_perms($id[0],$calendars))
+				killme();
+
+			$sharee_arr = channelx_by_hash($hash);
+
+			$sharee = new \Sabre\DAV\Xml\Element\Sharee();
+
+			$sharee->href = 'mailto:' . $sharee_arr['channel_hash'];
+			$sharee->principal = 'principals/' . $sharee_arr['channel_address'];
+			$sharee->access = 4;
+			$caldavBackend->updateInvites($id, [$sharee]);
+
+			killme();
+		}
+
+
+		if(argv(1) === 'addressbook') {
+			$carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo);
+			$addressbooks = $carddavBackend->getAddressBooksForUser($principalUri);
+		}
+
+		//Display Adressbook here
+		if(argc() == 3 && argv(1) === 'addressbook' && intval(argv(2))) {
+
+			$id = argv(2);
+
+			$displayname = cdav_perms($id,$addressbooks);
+
+			if(!$displayname)
+				return;
+
+			head_add_css('/addon/cdav/view/css/cdav_addressbook.css');
+
+			$o = '';
+
+			$sabrecards = $carddavBackend->getCards($id);
+			foreach($sabrecards as $sabrecard) {
+				$uris[] = $sabrecard['uri'];
+			}
+
+			if($uris) {
+				$objects = $carddavBackend->getMultipleCards($id, $uris);
+
+				foreach($objects as $object) {
+					$vcard = \Sabre\VObject\Reader::read($object['carddata']);
+
+					$photo = '';
+					if($vcard->PHOTO) {
+						$photo_value = strtolower($vcard->PHOTO->getValueType()); // binary or uri
+						if($photo_value === 'binary') {
+							$photo_type = strtolower($vcard->PHOTO['TYPE']); // mime jpeg, png or gif
+							$photo = 'data:image/' . $photo_type . ';base64,' . base64_encode((string)$vcard->PHOTO);
+						}
+						else {
+							$url = parse_url((string)$vcard->PHOTO);
+							$photo = 'data:' . $url['path'];
+						}
+					}
+
+					$fn = '';
+					if($vcard->FN) {
+						$fn = (string)$vcard->FN;
+					}
+
+					$org = '';
+					if($vcard->ORG) {
+						$org = (string)$vcard->ORG;
+					}
+
+					$title = '';
+					if($vcard->TITLE) {
+						$title = (string)$vcard->TITLE;
+					}
+
+					$tels = [];
+					if($vcard->TEL) {
+						foreach($vcard->TEL as $tel) {
+							$type = (($tel['TYPE']) ? translate_type((string)$tel['TYPE']) : '');
+							$tels[] = [
+								'type' => $type,
+								'nr' => (string)$tel
+							];
+						}
+					}
+
+					$emails = [];
+					if($vcard->EMAIL) {
+						foreach($vcard->EMAIL as $email) {
+							$type = (($email['TYPE']) ? translate_type((string)$email['TYPE']) : '');
+							$emails[] = [
+								'type' => $type,
+								'address' => (string)$email
+							];
+						}
+					}
+
+					$impps = [];
+					if($vcard->IMPP) {
+						foreach($vcard->IMPP as $impp) {
+							$type = (($impp['TYPE']) ? translate_type((string)$impp['TYPE']) : '');
+							$impps[] = [
+								'type' => $type,
+								'address' => (string)$impp
+							];
+						}
+					}
+
+					$urls = [];
+					if($vcard->URL) {
+						foreach($vcard->URL as $url) {
+							$type = (($url['TYPE']) ? translate_type((string)$url['TYPE']) : '');
+							$urls[] = [
+								'type' => $type,
+								'address' => (string)$url
+							];
+						}
+					}
+
+					$adrs = [];
+					if($vcard->ADR) {
+						foreach($vcard->ADR as $adr) {
+							$type = (($adr['TYPE']) ? translate_type((string)$adr['TYPE']) : '');
+							$adrs[] = [
+								'type' => $type,
+								'address' => $adr->getParts()
+							];
+						}
+					}
+
+					$note = '';
+					if($vcard->NOTE) {
+						$note = (string)$vcard->NOTE;
+					}
+
+					$cards[] = [
+						'id' => $object['id'],
+						'uri' => $object['uri'],
+
+						'photo' => $photo,
+						'fn' => $fn,
+						'org' => $org,
+						'title' => $title,
+						'tels' => $tels,
+						'emails' => $emails,
+						'impps' => $impps,
+						'urls' => $urls,
+						'adrs' => $adrs,
+						'note' => $note
+					];
+				}
+
+				usort($cards, function($a, $b) { return strcasecmp($a['fn'], $b['fn']); });
+			}
+
+			$o .= replace_macros(get_markup_template('cdav_addressbook.tpl', 'addon/cdav'), [
+				'$id' => $id,
+				'$cards' => $cards,
+				'$displayname' => $displayname,
+				'$name_label' => t('Name'),
+				'$org_label' => t('Organisation'),
+				'$title_label' => t('Title'),
+				'$tel_label' => t('Phone'),
+				'$email_label' => t('Email'),
+				'$impp_label' => t('Instant messenger'),
+				'$url_label' => t('Website'),
+				'$adr_label' => t('Address'),
+				'$note_label' => t('Note'),
+				'$mobile' => t('Mobile'),
+				'$home' => t('Home'),
+				'$work' => t('Work'),
+				'$other' => t('Other'),
+				'$add_card' => t('Add Contact'),
+				'$add_field' => t('Add Field'),
+				'$create' => t('Create'),
+				'$update' => t('Update'),
+				'$delete' => t('Delete'),
+				'$cancel' => t('Cancel'),
+				'$po_box' => t('P.O. Box'),
+				'$extra' => t('Additional'),
+				'$street' => t('Street'),
+				'$locality' => t('Locality'),
+				'$region' => t('Region'),
+				'$zip_code' => t('ZIP Code'),
+				'$country' => t('Country')
+			]);
+
+			return $o;
+		}
+
+		//delete addressbook
+		if(argc() > 3 && argv(1) === 'addressbook' && argv(2) === 'drop' && intval(argv(3))) {
+			$id = argv(3);
+
+			if(! cdav_perms($id,$addressbooks))
+				return;
+
+			$carddavBackend->deleteAddressBook($id);
+			killme();
+		}
+
+	}
+
+	function activate($channel) {
+
+		if(! $channel)
+			return;
+
+		$uri = 'principals/' . $channel['channel_hash'];
+		
+
+		$r = q("select * from principals where uri = '%s' limit 1",
+			dbesc($uri)
+		);
+		if($r) {
+			$r = q("update principals set email = '%s', displayname = '%s' where uri = '%s' ",
+				dbesc($channel['xchan_addr']),
+				dbesc($channel['channel_name']),
+				dbesc($uri)
+			);
+		}
+		else {
+			$r = q("insert into principals ( uri, email, displayname ) values('%s','%s','%s') ",
+				dbesc($uri),
+				dbesc($channel['xchan_addr']),
+				dbesc($channel['channel_name'])
+			);
+
+			//create default calendar
+			$r = q("insert into calendars (components) values('%s') ",
+				dbesc('VEVENT,VTODO')
+			);
+
+			$r = q("insert into calendarinstances (principaluri, displayname, uri, description, calendarcolor) values( '%s', '%s', '%s', '%s', '%s') ",
+				dbesc($uri),
+				dbesc(t('Default Calendar')),
+				dbesc('default'),
+				dbesc($channel['channel_name']),
+				dbesc('#3a87ad')
+			);
+
+			//create default addressbook
+			$r = q("insert into addressbooks (principaluri, displayname, uri) values('%s', '%s', '%s') ",
+				dbesc($uri),
+				dbesc(t('Default Addressbook')),
+				dbesc('default')
+			);
+		}
+	}
+
+
+}
diff --git a/Zotlabs/Widget/Cdav.php b/Zotlabs/Widget/Cdav.php
new file mode 100644
index 000000000..1b33668ad
--- /dev/null
+++ b/Zotlabs/Widget/Cdav.php
@@ -0,0 +1,176 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+
+class Cdav {
+
+	function widget() {
+		if(!local_channel())
+			return;
+
+		$channel = \App::get_channel();
+		$principalUri = 'principals/' . $channel['channel_hash'];
+
+		if(!cdav_principal($principalUri))
+			return;
+
+		$pdo = \DBA::$dba->db;
+
+		require_once 'vendor/autoload.php';
+
+		$o = '';
+
+		if(argc() == 2 && argv(1) === 'calendar') {
+
+			$caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+
+			$sabrecals = $caldavBackend->getCalendarsForUser($principalUri);
+
+			//TODO: we should probably also check for permission to send stream here
+			$local_channels = q("SELECT * FROM channel LEFT JOIN abook ON abook_xchan = channel_hash WHERE channel_system = 0 AND channel_removed = 0 AND channel_hash != '%s' AND abook_channel = %d",
+				dbesc($channel['channel_hash']),
+				intval($channel['channel_id'])
+			);
+
+			$sharee_options .= '<option value="">' . t('Select Channel') . '</option>' . "\r\n";
+			foreach($local_channels as $local_channel) {
+				$sharee_options .= '<option value="' . $local_channel['channel_hash'] . '">' . $local_channel['channel_name'] . '</option>' . "\r\n";
+			}
+
+			$access_options = '<option value="3">' . t('Read-write') . '</option>' . "\r\n";
+			$access_options .= '<option value="2">' . t('Read-only') . '</option>' . "\r\n";
+
+			//list calendars
+			foreach($sabrecals as $sabrecal) {
+				if($sabrecal['share-access'] == 1)
+					$access = '';
+				if($sabrecal['share-access'] == 2)
+					$access = 'read';
+				if($sabrecal['share-access'] == 3)
+					$access = 'read-write';
+
+				$invites = $caldavBackend->getInvites($sabrecal['id']);
+
+				$json_source = '/cdav/calendar/json/' . $sabrecal['id'][0] . '/' . $sabrecal['id'][1];
+
+				$switch = get_pconfig(local_channel(), 'cdav_calendar', $sabrecal['id'][0]);
+
+				$color = (($sabrecal['{http://apple.com/ns/ical/}calendar-color']) ? $sabrecal['{http://apple.com/ns/ical/}calendar-color'] : '#3a87ad');
+
+				$editable = (($sabrecal['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript
+
+				$sharees = [];
+				$share_displayname = [];
+				foreach($invites as $invite) {
+					if(strpos($invite->href, 'mailto:') !== false) {
+						$sharee = channelx_by_hash(substr($invite->href, 7));
+						$sharees[] = [
+							'name' => $sharee['channel_name'],
+							'access' => (($invite->access == 3) ? ' (RW)' : ' (R)'),
+							'hash' => $sharee['channel_hash']
+						];
+					}
+				}
+
+				if(!$access) {
+					$my_calendars[] = [
+						'ownernick' => $channel['channel_address'],
+						'uri' => $sabrecal['uri'],
+						'displayname' => $sabrecal['{DAV:}displayname'],
+						'calendarid' => $sabrecal['id'][0],
+						'instanceid' => $sabrecal['id'][1],
+						'json_source' => $json_source,
+						'color' => $color,
+						'editable' => $editable,
+						'switch' => $switch,
+						'sharees' => $sharees
+					];
+				}
+				else {
+					$shared_calendars[] = [
+						'ownernick' => $channel['channel_address'],
+						'uri' => $sabrecal['uri'],
+						'displayname' => $sabrecal['{DAV:}displayname'],
+						'calendarid' => $sabrecal['id'][0],
+						'instanceid' => $sabrecal['id'][1],
+						'json_source' => $json_source,
+						'color' => $color,
+						'editable' => $editable,
+						'switch' => $switch,
+						'sharer' => $sabrecal['{urn:ietf:params:xml:ns:caldav}calendar-description'],
+						'access' => $access
+					];
+				}
+
+				if(!$access || $access === 'read-write') {
+					$writable_calendars[] = [
+						'displayname' => ((!$access) ? $sabrecal['{DAV:}displayname'] : $share_displayname[0]),
+						'id' => $sabrecal['id']
+					];
+				}
+			}
+
+			$o .= replace_macros(get_markup_template('cdav_widget_calendar.tpl'), [
+				'$my_calendars_label' => t('My Calendars'),
+				'$my_calendars' => $my_calendars,
+				'$shared_calendars_label' => t('Shared Calendars'),
+				'$shared_calendars' => $shared_calendars,
+				'$sharee_options' => $sharee_options,
+				'$access_options' => $access_options,
+				'$share_label' => t('Share this calendar'),
+				'$share' => t('Share'),
+				'$edit_label' => t('Calendar name and color'),
+				'$edit' => t('Edit'),
+				'$create_label' => t('Create new calendar'),
+				'$create' => t('Create'),
+				'$create_placeholder' => t('Calendar Name'),
+				'$tools_label' => t('Calendar Tools'),
+				'$import_label' => t('Import calendar'),
+				'$import_placeholder' => t('Select a calendar to import to'),
+				'$upload' => t('Upload'),
+				'$writable_calendars' => $writable_calendars
+			]);
+
+			return $o;
+
+		}
+
+		if(argc() >= 2 && argv(1) === 'addressbook') {
+
+			$carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo);
+
+			$sabreabooks = $carddavBackend->getAddressBooksForUser($principalUri);
+
+			//list addressbooks
+			foreach($sabreabooks as $sabreabook) {
+				$addressbooks[] = [
+					'ownernick' => $channel['channel_address'],
+					'uri' => $sabreabook['uri'],
+					'displayname' => $sabreabook['{DAV:}displayname'],
+					'id' => $sabreabook['id']
+	
+				];
+			}
+
+			$o .= replace_macros(get_markup_template('cdav_widget_addressbook.tpl'), [
+				'$addressbooks_label' => t('Addressbooks'),
+				'$addressbooks' => $addressbooks,
+				'$edit_label' => t('Addressbook name'),
+				'$edit' => t('Edit'),
+				'$create_label' => t('Create new addressbook'),
+				'$create_placeholder' => t('Addressbook Name'),
+				'$create' => t('Create'),
+				'$tools_label' => t('Addressbook Tools'),
+				'$import_label' => t('Import addressbook'),
+				'$import_placeholder' => t('Select an addressbook to import to'),
+				'$upload' => t('Upload')
+			]);
+
+			return $o;
+
+		}
+
+	}
+}
\ No newline at end of file

From 3b4f70ae83e458720f7af2446c66dcf5e0d55ace Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 22 Jun 2017 17:31:08 -0700
Subject: [PATCH 267/299] Several things about mail storage weren't quite
 right.

---
 Zotlabs/Widget/Conversations.php |  4 --
 include/items.php                | 36 +++++++++++-
 include/message.php              | 99 ++++++++++++++++++++------------
 3 files changed, 98 insertions(+), 41 deletions(-)

diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php
index ee9c6d2b0..8bcc09e3c 100644
--- a/Zotlabs/Widget/Conversations.php
+++ b/Zotlabs/Widget/Conversations.php
@@ -12,10 +12,6 @@ class Conversations {
 		if(argc() > 1) {
 
 			switch(argv(1)) {
-				case 'combined':
-					$mailbox = 'combined';
-					$header = t('Conversations');
-					break;
 				case 'inbox':
 					$mailbox = 'inbox';
 					$header = t('Received Messages');
diff --git a/include/items.php b/include/items.php
index 126f0a174..b313193fb 100755
--- a/include/items.php
+++ b/include/items.php
@@ -8,6 +8,7 @@ use Zotlabs\Lib as Zlib;
 require_once('include/bbcode.php');
 require_once('include/oembed.php');
 require_once('include/crypto.php');
+require_once('include/message.php');
 require_once('include/feedutils.php');
 require_once('include/photo/photo_driver.php');
 require_once('include/permissions.php');
@@ -2932,6 +2933,8 @@ function mail_store($arr) {
 		return 0;
 	}
 
+	$channel = channelx_by_n($arr['channel_id']);
+
 	if(! $arr['mail_obscured']) {
 		if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
 			$arr['body'] = escape_tags($arr['body']);
@@ -2962,11 +2965,34 @@ function mail_store($arr) {
 	$arr['mail_flags']    = ((x($arr,'mail_flags'))    ? intval($arr['mail_flags'])          : 0 );
 	$arr['mail_raw']      = ((x($arr,'mail_raw'))      ? intval($arr['mail_raw'])            : 0 );
 
-	if(! $arr['parent_mid']) {
+	
+
+	if($arr['parent_mid']) {
+		$parent_item = q("select * from mail where mid = '%s' and channel_id = %d limit 1",
+			dbesc($arr['parent_mid']),
+			intval($arr['channel_id'])
+		);
+		if(($parent_item) && (! $arr['conv_guid'])) {
+			$arr['conv_guid'] = $parent_item[0]['conv_guid']; 
+		}
+	}
+	else {
 		logger('mail_store: missing parent');
 		$arr['parent_mid'] = $arr['mid'];
 	}
 
+	if($arr['from_xchan'] === $channel['channel_hash'])
+		$conversant = $arr['to_xchan'];
+	else
+		$conversant = $arr['from_xchan'];
+
+
+	if(! $arr['conv_guid']) {
+		$x = create_conversation($channel,$conversant,(($arr['title']) ? base64url_decode(str_rot47($arr['title'])) : ''));
+		$arr['conv_guid'] = (($x) ? $x['guid'] : '');
+	}
+
+
 	$r = q("SELECT id FROM mail WHERE mid = '%s' AND channel_id = %d LIMIT 1",
 		dbesc($arr['mid']),
 		intval($arr['channel_id'])
@@ -3031,6 +3057,14 @@ function mail_store($arr) {
 		Zlib\Enotify::submit($notif_params);
 	}
 
+	if($arr['conv_guid']) {
+		$c = q("update conv set updated = '%s' where guid = '%s' and uid = %d",
+			dbesc(datetime_convert()),
+			dbesc($arr['conv_guid']),
+			intval($arr['channel_id'])
+		);
+	}
+
 	call_hooks('post_mail_end',$arr);
 	return $current_post;
 }
diff --git a/include/message.php b/include/message.php
index 5458eeb0e..3f003e020 100644
--- a/include/message.php
+++ b/include/message.php
@@ -104,38 +104,9 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 
 		// create a new conversation
 
-		$conv_guid = random_string();
-
-		$recip = q("select * from xchan where xchan_hash = '%s' limit 1",
-			dbesc($recipient)
-		);
-		if($recip)
-			$recip_handle = $recip[0]['xchan_addr'];
-
-		$sender_handle = channel_reddress($channel);
-
-		$handles = $recip_handle . ';' . $sender_handle;
-
-		if($subject)
-			$nsubject = str_rot47(base64url_encode($subject));
-
-		$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
-			intval(local_channel()),
-			dbesc($conv_guid),
-			dbesc($sender_handle),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
-			dbesc($nsubject),
-			dbesc($handles)
-		);
-
-		$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
-			dbesc($conv_guid),
-			intval(local_channel())
-		);
-		if($r) {
-			$retconv = $r[0];
-			$retconv['subject'] = base64url_decode(str_rot47($retconv['subject']));
+		$retconv = create_conversation($channel,$recipient,$subject);	
+		if($retconv) {
+			$conv_guid = $retconv['guid'];
 		}
 	}
 
@@ -146,7 +117,6 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 		);
 		if($r) {
 			$retconv = $r[0];
-			$retconv['subject'] = base64url_decode(str_rot47($retconv['subject']));
 		}
 	}
 
@@ -155,6 +125,12 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 		return $ret;
 	}
 
+	$c = q("update conv set updated = '%s' where guid = '%s' and uid = %d",
+		dbesc(datetime_convert()),
+		dbesc($conv_guid),
+		intval(local_channel())
+	);
+
 	// generate a unique message_id
 
 	do {
@@ -284,6 +260,49 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
 
 }
 
+function create_conversation($channel,$recipient,$subject) {
+
+	// create a new conversation
+
+	$conv_guid = random_string();
+
+	$recip = q("select * from xchan where xchan_hash = '%s' limit 1",
+		dbesc($recipient)
+	);
+	if($recip)
+		$recip_handle = $recip[0]['xchan_addr'];
+
+	$sender_handle = channel_reddress($channel);
+
+	$handles = $recip_handle . ';' . $sender_handle;
+
+	if($subject)
+		$nsubject = str_rot47(base64url_encode($subject));
+
+	$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
+		intval($channel['channel_id']),
+		dbesc($conv_guid),
+		dbesc($sender_handle),
+		dbesc(datetime_convert()),
+		dbesc(datetime_convert()),
+		dbesc($nsubject),
+		dbesc($handles)
+	);
+
+	$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
+		dbesc($conv_guid),
+		intval($channel['channel_id'])
+	);
+	
+	return $r[0];
+
+}
+
+
+
+
+
+
 function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
 
 	$where = '';
@@ -315,6 +334,8 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
 				break;
 
 			case 'combined':
+			default:
+
 				$parents = q("SELECT parent_mid FROM mail WHERE mid = parent_mid AND channel_id = %d ORDER BY created DESC",
 					dbesc($local_channel)
 				);
@@ -326,15 +347,21 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
 
 	}
 
+	$r = null;
+
 	if($parents) {
 		foreach($parents as $parent) {
-			$all[] = q("SELECT * FROM mail WHERE parent_mid = '%s' AND channel_id = %d ORDER BY created DESC",
+			$all = q("SELECT * FROM mail WHERE parent_mid = '%s' AND channel_id = %d ORDER BY created DESC limit 1",
 				dbesc($parent['parent_mid']),
 				dbesc($local_channel)
 			);
+
+			if($all) {
+				foreach($all as $single) {
+					$r[] = $single;
+				}
+			}
 		}
-		foreach($all as $single)
-			$r[] = $single[0];
 	}
 	else {
 		$r = q($sql);

From 681d6ca1dd1e5c16dfb73ada131f2d6b7a24f942 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 22 Jun 2017 17:43:50 -0700
Subject: [PATCH 268/299] more mail issues

---
 Zotlabs/Widget/Conversations.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php
index 8bcc09e3c..4fd754f66 100644
--- a/Zotlabs/Widget/Conversations.php
+++ b/Zotlabs/Widget/Conversations.php
@@ -54,7 +54,7 @@ class Conversations {
 					'body'         => $rr['body'],
 					'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
 					'seen'         => $rr['seen'],
-					'selected'     => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
+					'selected'     => ((argc() == 2) ? (intval(argv(1)) == intval($rr['id'])) : ($r[0]['id'] == $rr['id']))
 				);
 			}
 

From 02b7bc08033b21ea5438aa667e8dbb1fd72022bb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 22 Jun 2017 20:16:54 -0700
Subject: [PATCH 269/299] cdav migration to core

---
 Zotlabs/Module/Cdav.php       |  13 +--
 include/event.php             |  68 ++++++++++++++
 install/schema_mysql.sql      | 171 ++++++++++++++++++++++++++++++++++
 view/css/cdav_addressbook.css | 103 ++++++++++++++++++++
 view/css/cdav_calendar.css    |  22 +++++
 5 files changed, 371 insertions(+), 6 deletions(-)
 create mode 100644 view/css/cdav_addressbook.css
 create mode 100644 view/css/cdav_calendar.css

diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index 856956b5b..f91dead04 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -1,7 +1,8 @@
 <?php
-
 namespace Zotlabs\Module;
 
+require_once('include/event.php');
+
 class Cdav extends \Zotlabs\Web\Controller {
 
 	function init() {
@@ -762,7 +763,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 
 		require_once 'vendor/autoload.php';
 
-		head_add_css('/addon/cdav/view/css/cdav.css');
+		head_add_css('cdav.css');
 
 		if(argv(1) === 'calendar') {
 			$caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
@@ -773,7 +774,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 		if(argc() == 2 && argv(1) === 'calendar') {
 
 			head_add_css('/library/fullcalendar/fullcalendar.css');
-			head_add_css('/addon/cdav/view/css/cdav_calendar.css');
+			head_add_css('cdav_calendar.css');
 
 			head_add_js('/library/moment/moment.min.js', 1);
 			head_add_js('/library/fullcalendar/fullcalendar.min.js', 1);
@@ -811,7 +812,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 			$description = ['description', t('Description')];
 			$location = ['location', t('Location')];
 
-			$o .= replace_macros(get_markup_template('cdav_calendar.tpl', 'addon/cdav'), [
+			$o .= replace_macros(get_markup_template('cdav_calendar.tpl'), [
 				'$sources' => $sources,
 				'$color' => $color,
 				'$lang' => \App::$language,
@@ -979,7 +980,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 			if(!$displayname)
 				return;
 
-			head_add_css('/addon/cdav/view/css/cdav_addressbook.css');
+			head_add_css('cdav_addressbook.css');
 
 			$o = '';
 
@@ -1102,7 +1103,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 				usort($cards, function($a, $b) { return strcasecmp($a['fn'], $b['fn']); });
 			}
 
-			$o .= replace_macros(get_markup_template('cdav_addressbook.tpl', 'addon/cdav'), [
+			$o .= replace_macros(get_markup_template('cdav_addressbook.tpl'), [
 				'$id' => $id,
 				'$cards' => $cards,
 				'$displayname' => $displayname,
diff --git a/include/event.php b/include/event.php
index 001bd7dd3..b56a5fb3e 100644
--- a/include/event.php
+++ b/include/event.php
@@ -1236,3 +1236,71 @@ function tasks_fetch($arr) {
 	return $ret;
 
 }
+
+function cdav_principal($uri) {
+	$r = q("SELECT uri FROM principals WHERE uri = '%s' LIMIT 1",
+		dbesc($uri)
+	);
+
+	if($r[0]['uri'] === $uri)
+		return true;
+	else
+		return false;
+}
+
+function cdav_perms($needle, $haystack, $check_rw = false) {
+	foreach ($haystack as $item) {
+		if($check_rw) {
+			if(is_array($item['id'])) {
+				if ($item['id'][0] == $needle && $item['share-access'] != 2) {
+					return $item['{DAV:}displayname'];
+				}
+			}
+			else {
+				if ($item['id'] == $needle && $item['share-access'] != 2) {
+					return $item['{DAV:}displayname'];
+				}
+			}
+		}
+		else {
+			if(is_array($item['id'])) {
+				if ($item['id'][0] == $needle) {
+					return $item['{DAV:}displayname'];
+				}
+			}
+			else {
+				if ($item['id'] == $needle) {
+					return $item['{DAV:}displayname'];
+				}
+			}
+		}
+	}
+	return false;
+}
+
+
+function translate_type($type) {
+
+	if(!$type)
+		return;
+
+	$type = strtoupper($type);
+
+	$map = [
+		'CELL' => t('Mobile'),
+		'HOME' => t('Home'),
+		'HOME,VOICE' => t('Home, Voice'),
+		'HOME,FAX' => t('Home, Fax'),
+		'WORK' => t('Work'),
+		'WORK,VOICE' => t('Work, Voice'),
+		'WORK,FAX' => t('Work, Fax'),
+		'OTHER' => t('Other')
+	];
+
+	if (array_key_exists($type, $map)) {
+		return [$type, $map[$type]];
+	}
+	else {
+		return [$type, t('Other') . ' (' . $type . ')'];
+	}
+}
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 37b8f1ac0..6938050cf 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -1404,3 +1404,174 @@ CREATE TABLE IF NOT EXISTS `xtag` (
   KEY `xtag_hash` (`xtag_hash`),
   KEY `xtag_flags` (`xtag_flags`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists addressbooks (
+    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    principaluri VARBINARY(255),
+    displayname VARCHAR(255),
+    uri VARBINARY(200),
+    description TEXT,
+    synctoken INT(11) UNSIGNED NOT NULL DEFAULT '1',
+    UNIQUE(principaluri(100), uri(100))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists cards (
+    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    addressbookid INT(11) UNSIGNED NOT NULL,
+    carddata MEDIUMBLOB,
+    uri VARBINARY(200),
+    lastmodified INT(11) UNSIGNED,
+    etag VARBINARY(32),
+    size INT(11) UNSIGNED NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists addressbookchanges (
+    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    uri VARBINARY(200) NOT NULL,
+    synctoken INT(11) UNSIGNED NOT NULL,
+    addressbookid INT(11) UNSIGNED NOT NULL,
+    operation TINYINT(1) NOT NULL,
+    INDEX addressbookid_synctoken (addressbookid, synctoken)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists calendarobjects (
+    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    calendardata MEDIUMBLOB,
+    uri VARBINARY(200),
+    calendarid INTEGER UNSIGNED NOT NULL,
+    lastmodified INT(11) UNSIGNED,
+    etag VARBINARY(32),
+    size INT(11) UNSIGNED NOT NULL,
+    componenttype VARBINARY(8),
+    firstoccurence INT(11) UNSIGNED,
+    lastoccurence INT(11) UNSIGNED,
+    uid VARBINARY(200),
+    UNIQUE(calendarid, uri),
+    INDEX calendarid_time (calendarid, firstoccurence)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists calendars (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    synctoken INTEGER UNSIGNED NOT NULL DEFAULT '1',
+    components VARBINARY(21)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists calendarinstances (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    calendarid INTEGER UNSIGNED NOT NULL,
+    principaluri VARBINARY(100),
+    access TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1 = owner, 2 = read, 3 = readwrite',
+    displayname VARCHAR(100),
+    uri VARBINARY(200),
+    description TEXT,
+    calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
+    calendarcolor VARBINARY(10),
+    timezone TEXT,
+    transparent TINYINT(1) NOT NULL DEFAULT '0',
+    share_href VARBINARY(100),
+    share_displayname VARCHAR(100),
+    share_invitestatus TINYINT(1) NOT NULL DEFAULT '2' COMMENT '1 = noresponse, 2 = accepted, 3 = declined, 4 = invalid',
+    UNIQUE(principaluri, uri),
+    UNIQUE(calendarid, principaluri),
+    UNIQUE(calendarid, share_href)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists calendarchanges (
+    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    uri VARBINARY(200) NOT NULL,
+    synctoken INT(11) UNSIGNED NOT NULL,
+    calendarid INT(11) UNSIGNED NOT NULL,
+    operation TINYINT(1) NOT NULL,
+    INDEX calendarid_synctoken (calendarid, synctoken)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists calendarsubscriptions (
+    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    uri VARBINARY(200) NOT NULL,
+    principaluri VARBINARY(100) NOT NULL,
+    source TEXT,
+    displayname VARCHAR(100),
+    refreshrate VARCHAR(10),
+    calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
+    calendarcolor VARBINARY(10),
+    striptodos TINYINT(1) NULL,
+    stripalarms TINYINT(1) NULL,
+    stripattachments TINYINT(1) NULL,
+    lastmodified INT(11) UNSIGNED,
+    UNIQUE(principaluri, uri)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists schedulingobjects (
+    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    principaluri VARBINARY(255),
+    calendardata MEDIUMBLOB,
+    uri VARBINARY(200),
+    lastmodified INT(11) UNSIGNED,
+    etag VARBINARY(32),
+    size INT(11) UNSIGNED NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists locks (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    owner VARCHAR(100),
+    timeout INTEGER UNSIGNED,
+    created INTEGER,
+    token VARBINARY(100),
+    scope TINYINT,
+    depth TINYINT,
+    uri VARBINARY(1000),
+    INDEX(token),
+    INDEX(uri(100))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists principals (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    uri VARBINARY(200) NOT NULL,
+    email VARBINARY(80),
+    displayname VARCHAR(80),
+    UNIQUE(uri)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists groupmembers (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    principal_id INTEGER UNSIGNED NOT NULL,
+    member_id INTEGER UNSIGNED NOT NULL,
+    UNIQUE(principal_id, member_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists propertystorage (
+    id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    path VARBINARY(1024) NOT NULL,
+    name VARBINARY(100) NOT NULL,
+    valuetype INT UNSIGNED,
+    value MEDIUMBLOB
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE UNIQUE INDEX path_property ON propertystorage (path(600), name(100));
+
+CREATE TABLE if not exists users (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    username VARBINARY(50),
+    digesta1 VARBINARY(32),
+    UNIQUE(username)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE if not exists calendarinstances (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    calendarid INTEGER UNSIGNED NOT NULL,
+    principaluri VARBINARY(100),
+    access TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1 = owner, 2 = read, 3 = readwrite',
+    displayname VARCHAR(100),
+    uri VARBINARY(200),
+    description TEXT,
+    calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
+    calendarcolor VARBINARY(10),
+    timezone TEXT,
+    transparent TINYINT(1) NOT NULL DEFAULT '0',
+    share_href VARBINARY(100),
+    share_displayname VARCHAR(100),
+    share_invitestatus TINYINT(1) NOT NULL DEFAULT '2' COMMENT '1 = noresponse, 2 = accepted, 3 = declined, 4 = invalid',
+    UNIQUE(principaluri, uri),
+    UNIQUE(calendarid, principaluri),
+    UNIQUE(calendarid, share_href)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/view/css/cdav_addressbook.css b/view/css/cdav_addressbook.css
new file mode 100644
index 000000000..038358e43
--- /dev/null
+++ b/view/css/cdav_addressbook.css
@@ -0,0 +1,103 @@
+.vcard-header {
+	cursor: pointer;
+	padding: 7px 10px;
+	margin-bottom: 3px;
+}
+
+.vcard-header:hover,
+.vcard-header.active {
+	background-color: rgb(238,238,238);
+	cursor: pointer;
+}
+
+.vcard-header.active:hover {
+	cursor: initial;
+}
+
+.vcard-add-field {
+	margin-top: 8px;
+	display: none;
+}
+
+.vcard-cancel {
+	margin: 6px 10px;
+	height: 32px;
+	line-height: 32px;
+	color: #777;
+	font-size: 16px;
+
+	cursor: pointer;
+	display: none;
+	float: right;
+}
+
+.vcard-info {
+	display: none;
+}
+
+.vcard-nophoto {
+	display: inline-block;
+	width: 32px;
+	height: 32px;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	text-align: center;
+	font-size: 20px;
+	color: #fff;
+	background-color: #ddd;
+}
+
+.vcard-photo {
+	width: 32px;
+	height: 32px;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	text-align: center;
+}
+
+.vcard-fn-preview,
+input.vcard-fn {
+	font-size: 16px !important;
+	margin-left: 5px;
+}
+
+.vcard-email-preview,
+.vcard-tel-preview {
+	color: #999;
+}
+
+
+.vcard-fn,
+#create_form,
+#more_block {
+	display: none;
+}
+
+input.vcard-fn,
+.vcard-fn-create input,
+.vcard-org input,
+.vcard-title input,
+.vcard-tel input,
+.vcard-email input,
+.vcard-impp input,
+.vcard-url input,
+.vcard-adr input,
+.vcard-note input {
+	padding: 0px;
+	margin-left: 5px;
+	border-width: 0px 0px 1px 0px;
+	border-radius: 0px;
+	background-color: transparent;
+	min-width: 160px;
+}
+
+#template-form-vcard-org,
+#template-form-vcard-title,
+#template-form-vcard-tel,
+#template-form-vcard-email,
+#template-form-vcard-impp,
+#template-form-vcard-url,
+#template-form-vcard-adr,
+#template-form-vcard-note {
+	display: none;
+}
diff --git a/view/css/cdav_calendar.css b/view/css/cdav_calendar.css
new file mode 100644
index 000000000..d68278a63
--- /dev/null
+++ b/view/css/cdav_calendar.css
@@ -0,0 +1,22 @@
+/* fix borders */
+
+.fc th:first-child,
+.fc td:first-child {
+    border-left-width: 0px;
+}
+
+.fc th:last-child,
+.fc td:last-child {
+    border-right-width: 0px;
+    border-bottom-width: 0px;
+}
+
+.fc-unthemed th,
+.fc-unthemed td,
+.fc-unthemed thead,
+.fc-unthemed tbody,
+.fc-unthemed .fc-divider,
+.fc-unthemed .fc-row,
+.fc-unthemed .fc-popover {
+	border-color: #ccc !important;
+}

From 6c771f84cedc71e7ffeecebe3e2fd7f912de3e7b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 22 Jun 2017 22:43:08 -0700
Subject: [PATCH 270/299] remove unused page_widgets.php include and provide a
 general function for loading sql from file to use in the cdav migration

---
 Zotlabs/Module/Block.php    |  2 --
 Zotlabs/Module/Page.php     |  1 -
 Zotlabs/Module/Webpages.php |  9 -------
 include/dba/dba_driver.php  | 14 ++++++++++
 include/page_widgets.php    | 52 -------------------------------------
 5 files changed, 14 insertions(+), 64 deletions(-)
 delete mode 100644 include/page_widgets.php

diff --git a/Zotlabs/Module/Block.php b/Zotlabs/Module/Block.php
index e671730f6..d0fed44fe 100644
--- a/Zotlabs/Module/Block.php
+++ b/Zotlabs/Module/Block.php
@@ -3,8 +3,6 @@ namespace Zotlabs\Module;
 
 require_once('include/items.php');
 require_once('include/conversation.php');
-require_once('include/page_widgets.php');
-
 
 class Block extends \Zotlabs\Web\Controller {
 
diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php
index 7bc90c091..c142afe77 100644
--- a/Zotlabs/Module/Page.php
+++ b/Zotlabs/Module/Page.php
@@ -3,7 +3,6 @@ namespace Zotlabs\Module;
 
 require_once('include/items.php');
 require_once('include/conversation.php');
-require_once('include/page_widgets.php');
 
 
 class Page extends \Zotlabs\Web\Controller {
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index 641e84b70..d59fcdb9f 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -179,11 +179,8 @@ class Webpages extends \Zotlabs\Web\Controller {
 		// so just list titles and an edit link.
 	
 	
-		/** @TODO - this should be replaced with pagelist_widget */
-	
 		$sql_extra = item_permissions_sql($owner);
 	
-
 		$r = q("select * from iconfig left join item on iconfig.iid = item.id 
 			where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d 
 			$sql_extra order by item.created desc",
@@ -191,12 +188,6 @@ class Webpages extends \Zotlabs\Web\Controller {
 			intval(ITEM_TYPE_WEBPAGE)
 		);
 
-//		$r = q("select * from item_id left join item on item_id.iid = item.id 
-//			where item_id.uid = %d and service = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc",
-//			intval($owner),
-//			intval(ITEM_TYPE_WEBPAGE)
-//		);
-	
 		if(! $r)
 			$x['pagetitle'] = 'home';
 
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index b0ad7936c..4079bcaba 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -442,6 +442,20 @@ function db_getfunc($f) {
 	return $f;
 }
 
+function db_load_file($f) {
+	// db errors should get logged to the logfile
+	$str = @file_get_contents($f);
+	$arr = explode(';', $str);
+	if($arr) {
+		foreach($arr as $a) {
+			if(strlen(trim($a))) {
+				$r = dbq(trim($a));
+			}
+		}
+	}
+}
+
+
 // The logger function may make DB calls internally to query the system logging parameters.
 // This can cause a recursion if database debugging is enabled.
 // So this function preserves the current database debugging state and then turns it off
diff --git a/include/page_widgets.php b/include/page_widgets.php
deleted file mode 100644
index 3270de4a3..000000000
--- a/include/page_widgets.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-// A basic toolbar for observers with write_pages permissions
-
-function writepages_widget ($who,$which) {
-	return replace_macros(get_markup_template('write_pages.tpl'), array(
-		'$new' => t('New Page'),
-		'$newurl' => "webpages/$who",
-		'$edit' => t('Edit'),
-		'$editurl' => "editwebpage/$who/$which"
-	));
-}
-
-
-
-// Chan is channel_id, $which is channel_address - we'll need to pass observer later too.
-
-function pagelist_widget ($owner,$which) {
-
-	$r = q("select * from iconfig left join item on iconfig.iid = item.id where item_id.uid = %d 
-		and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' order by item.created desc",
-		intval($owner)
-	);
-
-	$pages = null;
-
-	if($r) {
-		$pages = array();
-		foreach($r as $rr) {
-			$pages[$rr['iid']][] = array('url' => $rr['iid'],'pagetitle' => $rr['v'],'title' => $rr['title'],'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']));
-		}
-	}
-
-	//Build the base URL for edit links
-	$url = z_root() . "/editwebpage/" . $which;
-	// This isn't pretty, but it works.  Until I figure out what to do with the UI, it's Good Enough(TM).
-	return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
-		'$baseurl' => $url,
-		'$edit' => t('Edit'),
-		'$pages' => $pages,
-		'$channel' => $which,
-		'$view' => t('View'),
-		'$preview' => t('Preview'),
-		'$actions_txt' => t('Actions'),
-		'$pagelink_txt' => t('Page Link'),
-		'$title_txt' => t('Title'),
-		'$created_txt' => t('Created'),
-		'$edited_txt' => t('Edited')
-
-	));
-
-}

From 07d6472eea377a9be7e35cca823307382a43df46 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 25 Jun 2017 18:07:07 -0700
Subject: [PATCH 271/299] mastodon reshares can be either posts or comments;
 silence warning from guess_image_type when handed a URL to a non-existent
 resource.

---
 include/feedutils.php          |  2 +-
 include/photo/photo_driver.php | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 158ecb7a3..cc873876a 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -691,7 +691,7 @@ function get_atom_elements($feed, $item, &$author) {
 	
 
 	if(array_key_exists('verb',$res) && $res['verb'] === ACTIVITY_SHARE
-		&& array_key_exists('obj_type',$res) && $res['obj_type'] === ACTIVITY_OBJ_NOTE) {
+		&& array_key_exists('obj_type',$res) && in_array($res['obj_type'], [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT ] )) {
 		feed_get_reshare($res,$item);
 	}
 
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index eb61578e1..9d27ef96e 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -495,12 +495,22 @@ function guess_image_type($filename, $headers = '') {
 			}
 		}
 
-		if(is_null($type)) {
+		if(is_null($type) && (strpos($filename,'http:') === false)) {
 			$size = getimagesize($filename);
 			$ph = photo_factory('');
 			$types = $ph->supportedTypes();
 			$type = ((array_key_exists($size['mime'], $types)) ? $size['mime'] : 'image/jpeg');
 		}
+		if(is_null($type)) {
+			if(strpos(strtolower($filename),'jpg') !== false)
+				$type = 'image/jpeg';
+			elseif(strpos(strtolower($filename),'jpeg') !== false)
+				$type = 'image/jpeg';
+			elseif(strpos(strtolower($filename),'gif') !== false)
+				$type = 'image/gif';
+			elseif(strpos(strtolower($filename),'png') !== false)
+				$type = 'image/png';
+		}
 
 	}
 	logger('Photo: guess_image_type: type = ' . $type, LOGGER_DEBUG);

From 21542d1f9e66638ff9b4012a63a0070d1abe652a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 25 Jun 2017 18:09:34 -0700
Subject: [PATCH 272/299] guess_image_type - ignore scheme when checking for
 urls

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

diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 9d27ef96e..f47a9c878 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -495,7 +495,7 @@ function guess_image_type($filename, $headers = '') {
 			}
 		}
 
-		if(is_null($type) && (strpos($filename,'http:') === false)) {
+		if(is_null($type) && (strpos($filename,'http') === false)) {
 			$size = getimagesize($filename);
 			$ph = photo_factory('');
 			$types = $ph->supportedTypes();

From ef53db0b91c09c0446a706222dd4922520b008ef Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 25 Jun 2017 18:30:22 -0700
Subject: [PATCH 273/299] allow poke by xchan_hash

---
 Zotlabs/Module/Poke.php | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/Zotlabs/Module/Poke.php b/Zotlabs/Module/Poke.php
index cf8d83023..ea50e821a 100644
--- a/Zotlabs/Module/Poke.php
+++ b/Zotlabs/Module/Poke.php
@@ -41,7 +41,10 @@ class Poke extends \Zotlabs\Web\Controller {
 		$activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
 	
 		$contact_id = intval($_REQUEST['cid']);
-		if(! $contact_id)
+
+		$xchan = trim($_REQUEST['xchan']);
+
+		if(! ($contact_id || $xchan))
 			return;
 	
 		$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
@@ -49,13 +52,20 @@ class Poke extends \Zotlabs\Web\Controller {
 		logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
 	
 	
-		$r = q("SELECT * FROM abook left join xchan on xchan_hash = abook_xchan where abook_id = %d and abook_channel = %d LIMIT 1",
-			intval($contact_id),
-			intval($uid)
-		);
-	
+		if($contact_id) {
+			$r = q("SELECT * FROM abook left join xchan on xchan_hash = abook_xchan where abook_id = %d and abook_channel = %d LIMIT 1",
+				intval($contact_id),
+				intval($uid)
+			);
+		}
+		if($xchan) {
+			$r = q("SELECT * FROM xchan where xchan_hash like ( '%s' ) LIMIT 1",
+				dbesc($xchan . '%')
+			);
+		}
+			
 		if(! $r) {
-			logger('poke: no target ' . $contact_id);
+			logger('poke: no target.');
 			return;
 		}
 	
@@ -79,7 +89,7 @@ class Poke extends \Zotlabs\Web\Controller {
 				$deny_gid     = $r[0]['deny_gid'];
 			}
 		}
-		else {
+		elseif($contact_id) {
 	
 			$item_private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
 	
@@ -92,9 +102,11 @@ class Poke extends \Zotlabs\Web\Controller {
 	
 		$arr = array();
 	
+
+
 		$arr['item_wall']     = 1;
 		$arr['owner_xchan']   = (($parent_item) ? $parent_item['owner_xchan'] : $channel['channel_hash']);
-		$arr['parent_mid']    = (($parent_mid) ? $parent_mid : $mid);
+		$arr['parent_mid']    = (($parent_mid) ? $parent_mid : '');
 		$arr['title']         = '';
 		$arr['allow_cid']     = $allow_cid;
 		$arr['allow_gid']     = $allow_gid;

From c456e01219bf535582744d5210b2b096985aa05d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 25 Jun 2017 18:49:50 -0700
Subject: [PATCH 274/299] chanview - if already connected, bypass the chanview
 intermediary page and go straight to the remote profile. The chanview page is
 only there to present a connect link since the remote profile may not have
 one.

---
 Zotlabs/Module/Chanview.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php
index c3194184a..245e71bec 100644
--- a/Zotlabs/Module/Chanview.php
+++ b/Zotlabs/Module/Chanview.php
@@ -102,23 +102,32 @@ class Chanview extends \Zotlabs\Web\Controller {
 		}
 
 		$is_zot = false;
+		$connected = false;
 	
 		if (\App::$poi) {
 			$url = \App::$poi['xchan_url'];
 			if(\App::$poi['xchan_network'] === 'zot') {
 				$is_zot = true;
 			}			
-		}
+			if(local_channel()) {
+				$c = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' limit 1",
+					intval(local_channel()),
+					dbesc(\App::$poi['xchan_hash'])
+				);
+				if($c)
+					$connected = true;
 
+		}
+		
 		// We will load the chanview template if it's a foreign network, 
 		// just so that we can provide a connect button along with a profile
 		// photo. Chances are we can't load the remote profile into an iframe
 		// because of cross-domain security headers. So provide a link to
 		// the remote profile. 
-
+		// If we are already connected, just go to the profile.
 		// Zot channels will usually have a connect link.
 	
-		if($is_zot) {
+		if($is_zot || $connected) {
 			if($is_zot && $observer) {
 				$url = zid($url);
 			}

From 28a1be4d36bf0ec54d053bb9decbe619361682cb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 25 Jun 2017 19:17:05 -0700
Subject: [PATCH 275/299] typo in chanview, remove output buffering in
 mod_cloud which is preventing large files from being downloaded. IIRC this
 was put there to avoid a SAML warning in SabreDAV but I'm not seeing that
 currently.

---
 Zotlabs/Module/Chanview.php | 2 +-
 Zotlabs/Module/Cloud.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Module/Chanview.php b/Zotlabs/Module/Chanview.php
index 245e71bec..24ab9b022 100644
--- a/Zotlabs/Module/Chanview.php
+++ b/Zotlabs/Module/Chanview.php
@@ -116,7 +116,7 @@ class Chanview extends \Zotlabs\Web\Controller {
 				);
 				if($c)
 					$connected = true;
-
+			}
 		}
 		
 		// We will load the chanview template if it's a foreign network, 
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
index 7370eeda3..01f1061df 100644
--- a/Zotlabs/Module/Cloud.php
+++ b/Zotlabs/Module/Cloud.php
@@ -86,11 +86,11 @@ class Cloud extends \Zotlabs\Web\Controller {
 	//	require_once('\Zotlabs\Storage/QuotaPlugin.php');
 	//	$server->addPlugin(new \Zotlabs\Storage\\QuotaPlugin($auth));
 
-		ob_start();
+//		ob_start();
 		// All we need to do now, is to fire up the server
 		$server->exec();
 
-		ob_end_flush();
+//		ob_end_flush();
 
 		killme();
 	}

From 7f982a07781f09756d852f423bba37dc11abf2a5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 25 Jun 2017 20:03:26 -0700
Subject: [PATCH 276/299] minor usability enhancements with the connections
 list - label the edit icon so it's more obvious; the intuitive action is to
 click the photo or name which isn't what we usually want. Also move the
 Delete button over just a bit more so it's harder to accidentally click on
 small screens with big thumbs.

---
 Zotlabs/Module/Connections.php    | 1 +
 view/theme/redbasic/css/style.css | 4 ++++
 view/tpl/connection_template.tpl  | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index 60b798c13..b3c5e8ee9 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -258,6 +258,7 @@ class Connections extends \Zotlabs\Web\Controller {
 					$contacts[] = array(
 						'img_hover' => sprintf( t('%1$s [%2$s]'),$rr['xchan_name'],$rr['xchan_url']),
 						'edit_hover' => t('Edit connection'),
+						'edit' => t('Edit'),
 						'delete_hover' => t('Delete connection'),
 						'id' => $rr['abook_id'],
 						'thumb' => $rr['xchan_photo_m'], 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 07dfd938d..0dee7dead 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -427,6 +427,10 @@ footer {
 	right: 5px;
 }
 
+.contact-delete-btn {
+	margin-right: 32px;
+}
+
 #contact-block {
 	width: 100%;
 }
diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 16915abda..8e49c9e27 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -8,8 +8,8 @@
 			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
 
 			{{/if}}
-			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
+			<a href="#" class="btn btn-danger btn-sm contact-delete-btn" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
+			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i> {{$contact.edit}}</a>
 			{{if $contact.approve}}
 			</form>
 			{{/if}}

From 5dc638c5b38883934221b3575b7d21e32502512b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 26 Jun 2017 01:36:33 -0700
Subject: [PATCH 277/299] better fix for dav headers already sent issue

---
 Zotlabs/Module/Cloud.php    | 3 ++-
 Zotlabs/Storage/Browser.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
index 01f1061df..75191a279 100644
--- a/Zotlabs/Module/Cloud.php
+++ b/Zotlabs/Module/Cloud.php
@@ -91,7 +91,8 @@ class Cloud extends \Zotlabs\Web\Controller {
 		$server->exec();
 
 //		ob_end_flush();
-
+		if($browser->build_page)
+			construct_page();
 		killme();
 	}
 
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index 7162161ef..9dc393167 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -17,6 +17,7 @@ use Sabre\DAV;
  */
 class Browser extends DAV\Browser\Plugin {
 
+	public $build_page = false;
 	/**
 	 * @see set_writeable()
 	 * @see \\Sabre\\DAV\\Auth\\Backend\\BackendInterface
@@ -257,7 +258,7 @@ class Browser extends DAV\Browser\Plugin {
 			}
 		}
 		$this->server->httpResponse->setHeader('Content-Security-Policy', "script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'");
-		construct_page();
+		$this->build_page = true;
 	}
 
 	/**

From b0dd824dbc25e8ec12011cbc334471fc47a87735 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 26 Jun 2017 16:54:28 -0700
Subject: [PATCH 278/299] add ostatus attached photos (inline to the post body)
 even if there's a link to the photo in the post but it isn't wrapped in an
 img tag.

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

diff --git a/include/feedutils.php b/include/feedutils.php
index cc873876a..b785bd64a 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -603,7 +603,7 @@ function get_atom_elements($feed, $item, &$author) {
 			if(! $type)
 				$type = 'application/octet-stream';
 
-			if(($ostatus_protocol) && (strpos($type,'image') === 0) && (strpos($res['body'],$link) === false) && (strpos($link,'http') === 0)) {
+			if(($ostatus_protocol) && (strpos($type,'image') === 0) && (strpos($res['body'], ']' . $link . '[/img]') === false) && (strpos($link,'http') === 0)) {
 				$res['body'] .= "\n\n" . '[img]' . $link . '[/img]';
 			}
 

From 4d81c498e2f9a65eac7f71b077aa3e787d53325d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 26 Jun 2017 17:07:59 -0700
Subject: [PATCH 279/299] in gnu-social reshare objects are activities, not
 posts or comments

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

diff --git a/include/feedutils.php b/include/feedutils.php
index b785bd64a..7314f69a6 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -691,7 +691,7 @@ function get_atom_elements($feed, $item, &$author) {
 	
 
 	if(array_key_exists('verb',$res) && $res['verb'] === ACTIVITY_SHARE
-		&& array_key_exists('obj_type',$res) && in_array($res['obj_type'], [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT ] )) {
+		&& array_key_exists('obj_type',$res) && in_array($res['obj_type'], [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT, ACTIVITY_OBJ_ACTIVITY ] )) {
 		feed_get_reshare($res,$item);
 	}
 

From a8374b25f15c1c7545748bae26dda5e3c190573c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 26 Jun 2017 17:32:38 -0700
Subject: [PATCH 280/299] upgrade blueimp from 9.8 to 9.18

---
 library/blueimp_upload/.gitignore             |   3 -
 library/blueimp_upload/.jshintrc              |  81 -----
 library/blueimp_upload/CONTRIBUTING.md        |  47 +--
 library/blueimp_upload/Gruntfile.js           |  37 ---
 library/blueimp_upload/LICENSE                |  20 ++
 library/blueimp_upload/README.md              |  60 ++--
 library/blueimp_upload/angularjs.html         |  14 +-
 library/blueimp_upload/basic-plus.html        |  14 +-
 library/blueimp_upload/basic.html             |  14 +-
 .../blueimp-file-upload.jquery.json           |  50 ---
 .../blueimp_upload/bower-version-update.js    |  16 +
 library/blueimp_upload/bower.json             |  29 +-
 library/blueimp_upload/cors/postmessage.html  |   6 +-
 library/blueimp_upload/cors/result.html       |   4 +-
 library/blueimp_upload/css/demo-ie8.css       |   4 +-
 library/blueimp_upload/css/demo.css           |   4 +-
 .../css/jquery.fileupload-noscript.css        |   6 +-
 .../css/jquery.fileupload-ui-noscript.css     |   4 +-
 .../css/jquery.fileupload-ui.css              |   4 +-
 .../blueimp_upload/css/jquery.fileupload.css  |   7 +-
 library/blueimp_upload/css/style.css          |   4 +-
 library/blueimp_upload/index.html             |  12 +-
 library/blueimp_upload/jquery-ui.html         |  14 +-
 library/blueimp_upload/js/app.js              |   8 +-
 .../js/cors/jquery.postmessage-transport.js   |  17 +-
 .../js/cors/jquery.xdr-transport.js           |  11 +-
 .../js/jquery.fileupload-angular.js           |  50 +--
 .../js/jquery.fileupload-audio.js             |  15 +-
 .../js/jquery.fileupload-image.js             |  23 +-
 .../js/jquery.fileupload-jquery-ui.js         |  19 +-
 .../js/jquery.fileupload-process.js           |  18 +-
 .../blueimp_upload/js/jquery.fileupload-ui.js |  23 +-
 .../js/jquery.fileupload-validate.js          |  16 +-
 .../js/jquery.fileupload-video.js             |  15 +-
 .../blueimp_upload/js/jquery.fileupload.js    |  71 ++--
 .../js/jquery.iframe-transport.js             |  22 +-
 library/blueimp_upload/js/main.js             |   6 +-
 .../js/vendor/jquery.ui.widget.js             |  44 ++-
 library/blueimp_upload/package.json           |  39 +--
 .../blueimp_upload/server/gae-go/app/main.go  | 305 +++++++++++-------
 .../blueimp_upload/server/gae-python/app.yaml |   5 +-
 .../blueimp_upload/server/gae-python/main.py  | 208 +++++++-----
 library/blueimp_upload/server/node/.gitignore |   2 -
 .../blueimp_upload/server/node/package.json   |  41 ---
 .../server/node/public/files/.gitignore       |   2 -
 library/blueimp_upload/server/node/server.js  | 292 -----------------
 .../blueimp_upload/server/node/tmp/.gitignore |   0
 library/blueimp_upload/server/php/Dockerfile  |  38 +++
 .../server/php/UploadHandler.php              | 252 +++++++++------
 .../server/php/docker-compose.yml             |   6 +
 .../blueimp_upload/server/php/files/.htaccess |  14 +-
 library/blueimp_upload/server/php/index.php   |   4 +-
 library/blueimp_upload/test/index.html        |  16 +-
 library/blueimp_upload/test/test.js           |  10 +-
 54 files changed, 921 insertions(+), 1125 deletions(-)
 delete mode 100644 library/blueimp_upload/.gitignore
 delete mode 100644 library/blueimp_upload/.jshintrc
 delete mode 100644 library/blueimp_upload/Gruntfile.js
 create mode 100644 library/blueimp_upload/LICENSE
 delete mode 100644 library/blueimp_upload/blueimp-file-upload.jquery.json
 create mode 100755 library/blueimp_upload/bower-version-update.js
 mode change 100755 => 100644 library/blueimp_upload/js/jquery.fileupload-jquery-ui.js
 delete mode 100644 library/blueimp_upload/server/node/.gitignore
 delete mode 100644 library/blueimp_upload/server/node/package.json
 delete mode 100644 library/blueimp_upload/server/node/public/files/.gitignore
 delete mode 100755 library/blueimp_upload/server/node/server.js
 delete mode 100644 library/blueimp_upload/server/node/tmp/.gitignore
 create mode 100644 library/blueimp_upload/server/php/Dockerfile
 create mode 100644 library/blueimp_upload/server/php/docker-compose.yml

diff --git a/library/blueimp_upload/.gitignore b/library/blueimp_upload/.gitignore
deleted file mode 100644
index 29a41a8c4..000000000
--- a/library/blueimp_upload/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.DS_Store
-*.pyc
-node_modules
diff --git a/library/blueimp_upload/.jshintrc b/library/blueimp_upload/.jshintrc
deleted file mode 100644
index 4ad82e664..000000000
--- a/library/blueimp_upload/.jshintrc
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "bitwise"       : true,     // true: Prohibit bitwise operators (&, |, ^, etc.)
-  "camelcase"     : true,     // true: Identifiers must be in camelCase
-  "curly"         : true,     // true: Require {} for every new block or scope
-  "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
-  "forin"         : true,     // true: Require filtering for..in loops with obj.hasOwnProperty()
-  "immed"         : true,     // true: Require immediate invocations to be wrapped in parens
-                              // e.g. `(function () { } ());`
-  "indent"        : 4,        // {int} Number of spaces to use for indentation
-  "latedef"       : true,     // true: Require variables/functions to be defined before being used
-  "newcap"        : true,     // true: Require capitalization of all constructor functions e.g. `new F()`
-  "noarg"         : true,     // true: Prohibit use of `arguments.caller` and `arguments.callee`
-  "noempty"       : true,     // true: Prohibit use of empty blocks
-  "nonew"         : true,     // true: Prohibit use of constructors for side-effects (without assignment)
-  "plusplus"      : false,    // true: Prohibit use of `++` & `--`
-  "quotmark"      : "single", // Quotation mark consistency:
-                              //   false    : do nothing (default)
-                              //   true     : ensure whatever is used is consistent
-                              //   "single" : require single quotes
-                              //   "double" : require double quotes
-  "undef"         : true,     // true: Require all non-global variables to be declared (prevents global leaks)
-  "unused"        : true,     // true: Require all defined variables be used
-  "strict"        : true,     // true: Requires all functions run in ES5 Strict Mode
-  "trailing"      : true,     // true: Prohibit trailing whitespaces
-  "maxparams"     : false,    // {int} Max number of formal params allowed per function
-  "maxdepth"      : false,    // {int} Max depth of nested blocks (within functions)
-  "maxstatements" : false,    // {int} Max number statements per function
-  "maxcomplexity" : false,    // {int} Max cyclomatic complexity per function
-  "maxlen"        : false,    // {int} Max number of characters per line
-
-  // Relaxing
-  "asi"           : false,     // true: Tolerate Automatic Semicolon Insertion (no semicolons)
-  "boss"          : false,     // true: Tolerate assignments where comparisons would be expected
-  "debug"         : false,     // true: Allow debugger statements e.g. browser breakpoints.
-  "eqnull"        : false,     // true: Tolerate use of `== null`
-  "es5"           : false,     // true: Allow ES5 syntax (ex: getters and setters)
-  "esnext"        : false,     // true: Allow ES.next (ES6) syntax (ex: `const`)
-  "moz"           : false,     // true: Allow Mozilla specific syntax (extends and overrides esnext features)
-                               // (ex: `for each`, multiple try/catch, function expression…)
-  "evil"          : false,     // true: Tolerate use of `eval` and `new Function()`
-  "expr"          : false,     // true: Tolerate `ExpressionStatement` as Programs
-  "funcscope"     : false,     // true: Tolerate defining variables inside control statements"
-  "globalstrict"  : false,     // true: Allow global "use strict" (also enables 'strict')
-  "iterator"      : false,     // true: Tolerate using the `__iterator__` property
-  "lastsemic"     : false,     // true: Tolerate omitting a semicolon for the last statement of a 1-line block
-  "laxbreak"      : false,     // true: Tolerate possibly unsafe line breakings
-  "laxcomma"      : false,     // true: Tolerate comma-first style coding
-  "loopfunc"      : false,     // true: Tolerate functions being defined in loops
-  "multistr"      : false,     // true: Tolerate multi-line strings
-  "proto"         : false,     // true: Tolerate using the `__proto__` property
-  "scripturl"     : false,     // true: Tolerate script-targeted URLs
-  "smarttabs"     : false,     // true: Tolerate mixed tabs/spaces when used for alignment
-  "shadow"        : false,     // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
-  "sub"           : false,     // true: Tolerate using `[]` notation when it can still be expressed in dot notation
-  "supernew"      : false,     // true: Tolerate `new function () { ... };` and `new Object;`
-  "validthis"     : false,     // true: Tolerate using this in a non-constructor function
-
-  // Environments
-  "browser"       : false,    // Web Browser (window, document, etc)
-  "couch"         : false,    // CouchDB
-  "devel"         : false,    // Development/debugging (alert, confirm, etc)
-  "dojo"          : false,    // Dojo Toolkit
-  "jquery"        : false,    // jQuery
-  "mootools"      : false,    // MooTools
-  "node"          : false,    // Node.js
-  "nonstandard"   : false,    // Widely adopted globals (escape, unescape, etc)
-  "prototypejs"   : false,    // Prototype and Scriptaculous
-  "rhino"         : false,    // Rhino
-  "worker"        : false,    // Web Workers
-  "wsh"           : false,    // Windows Scripting Host
-  "yui"           : false,    // Yahoo User Interface
-
-  // Legacy
-  "nomen"         : true,     // true: Prohibit dangling `_` in variables
-  "onevar"        : true,     // true: Allow only one `var` statement per function
-  "passfail"      : false,    // true: Stop on first error
-  "white"         : true,     // true: Check against strict whitespace and indentation rules
-
-  // Custom Globals
-  "globals"       : {}        // additional predefined global variables
-}
diff --git a/library/blueimp_upload/CONTRIBUTING.md b/library/blueimp_upload/CONTRIBUTING.md
index b8708f8b6..e182f9b37 100644
--- a/library/blueimp_upload/CONTRIBUTING.md
+++ b/library/blueimp_upload/CONTRIBUTING.md
@@ -1,42 +1,15 @@
-# Issue Guidelines
-
-The issues tracker should only be used for **bugs** or **feature requests**.
-
-Please post **support requests** and **general discussions** about this project to the [support forum](https://groups.google.com/d/forum/jquery-fileupload).
-
-## Bugs
-
-Please follow these guidelines before reporting a bug:
-
-1. **Update to the latest version** &mdash; Check if you can reproduce the issue with the latest version from the `master` branch.
-
-2. **Use the GitHub issue search** &mdash; check if the issue has already been reported. If it has been, please comment on the existing issue.
-
-3. **Isolate the demonstrable problem** &mdash; Try to reproduce the problem with the [Demo](https://blueimp.github.io/jQuery-File-Upload/) or with a reduced test case that includes the least amount of code necessary to reproduce the problem.
-
-4. **Provide a means to reproduce the problem** &mdash; Please provide as much details as possible, e.g. server information, browser and operating system versions, steps to reproduce the problem. If possible, provide a link to your reduced test case, e.g. via [JSFiddle](http://jsfiddle.net/). 
-
-
-## Feature requests
-
-Please follow the bug guidelines above for feature requests, i.e. update to the latest version and search for exising issues before posting a new request.
-
-Generally, feature requests might be accepted if the implementation would benefit a broader use case or the project could be considered incomplete without that feature.
-
-If you need help integrating this project into another framework, please post your request to the [support forum](https://groups.google.com/d/forum/jquery-fileupload).
-
-## Pull requests
-
-[Pull requests](https://help.github.com/articles/using-pull-requests) are welcome and the preferred way of accepting code contributions.
-
-However, if you add a server-side upload handler implementation for another framework, please continue to maintain this version in your own fork without sending a pull request. You are welcome to add a link and possibly documentation about your implementation to the [Wiki](https://github.com/blueimp/jQuery-File-Upload/wiki).
-
-Please follow these guidelines before sending a pull request:
+Please follow these pull request guidelines:
 
 1. Update your fork to the latest upstream version.
 
-2. Follow the coding conventions of the original repository. Changes to one of the JavaScript source files are required to pass the [JSHint](http://www.jshint.com/) validation tool.
+2. Follow the coding conventions of the original source files (indentation, spaces, brackets layout).
 
-3. Keep your commits as atomar as possible, i.e. create a new commit for every single bug fix or feature added.
+3. Code changes must pass JSHint validation with the `.jshintrc` settings of this project.
 
-4. Always add meaningfull commit messages.
+4. Code changes must pass the QUnit tests defined in the `test` folder.
+
+5. New features should be covered by accompanying QUnit tests.
+
+6. Keep your commits as atomic as possible, i.e. create a new commit for every single bug fix or feature added.
+
+7. Always add meaningful commit messages.
diff --git a/library/blueimp_upload/Gruntfile.js b/library/blueimp_upload/Gruntfile.js
deleted file mode 100644
index dcdb5d57a..000000000
--- a/library/blueimp_upload/Gruntfile.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * jQuery File Upload Gruntfile
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*global module */
-
-module.exports = function (grunt) {
-    'use strict';
-
-    grunt.initConfig({
-        jshint: {
-            options: {
-                jshintrc: '.jshintrc'
-            },
-            all: [
-                'Gruntfile.js',
-                'js/cors/*.js',
-                'js/*.js',
-                'server/node/server.js',
-                'test/test.js'
-            ]
-        }
-    });
-
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-bump-build-git');
-    grunt.registerTask('test', ['jshint']);
-    grunt.registerTask('default', ['test']);
-
-};
diff --git a/library/blueimp_upload/LICENSE b/library/blueimp_upload/LICENSE
new file mode 100644
index 000000000..0ecca3e8c
--- /dev/null
+++ b/library/blueimp_upload/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 jQuery-File-Upload Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/library/blueimp_upload/README.md b/library/blueimp_upload/README.md
index 3aa33de42..56785b847 100644
--- a/library/blueimp_upload/README.md
+++ b/library/blueimp_upload/README.md
@@ -11,17 +11,6 @@ Supports cross-domain, chunked and resumable file uploads and client-side image
 * [How to setup the plugin on your website](https://github.com/blueimp/jQuery-File-Upload/wiki/Setup)
 * [How to use only the basic plugin (minimal setup guide).](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin)
 
-## Support
-
-* **[Support Forum](https://groups.google.com/d/forum/jquery-fileupload)**  
-**Support requests** and **general discussions** about the File Upload plugin can be posted to the official
-[Support Forum](https://groups.google.com/d/forum/jquery-fileupload).  
-If your question is not directly related to the File Upload plugin, you might have a better chance to get a reply by posting to [Stack Overflow](http://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload).
-
-* Bugs and Feature requests  
-**Bugs** and **Feature requests** can be reported using the [issues tracker](https://github.com/blueimp/jQuery-File-Upload/issues).  
-Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload/blob/master/CONTRIBUTING.md) before posting.
-
 ## Features
 * **Multiple file upload:**  
   Allows to select multiple files at once and upload them simultaneously.
@@ -60,28 +49,18 @@ Please read the [issue guidelines](https://github.com/blueimp/jQuery-File-Upload
 
 ### Mandatory requirements
 * [jQuery](https://jquery.com/) v. 1.6+
-* [jQuery UI widget factory](https://api.jqueryui.com/jQuery.widget/) v. 1.9+ (included)
-* [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) (included)
-
-The jQuery UI widget factory is a requirement for the basic File Upload plugin, but very lightweight without any other dependencies from the jQuery UI suite.
-
-The jQuery Iframe Transport is required for [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
+* [jQuery UI widget factory](https://api.jqueryui.com/jQuery.widget/) v. 1.9+ (included): Required for the basic File Upload plugin, but very lightweight without any other dependencies from the jQuery UI suite.
+* [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) (included): Required for [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
 
 ### Optional requirements
-* [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.5.4+
-* [JavaScript Load Image library](https://github.com/blueimp/JavaScript-Load-Image) v. 1.13.0+
-* [JavaScript Canvas to Blob polyfill](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.1.1+
-* [blueimp Gallery](https://github.com/blueimp/Gallery) v. 2.15.1+
-* [Bootstrap CSS framework](http://getbootstrap.com/) v. 3.2.0+
+* [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates) v. 2.5.4+: Used to render the selected and uploaded files for the Basic Plus UI and jQuery UI versions.
+* [JavaScript Load Image library](https://github.com/blueimp/JavaScript-Load-Image) v. 1.13.0+: Required for the image previews and resizing functionality.
+* [JavaScript Canvas to Blob polyfill](https://github.com/blueimp/JavaScript-Canvas-to-Blob) v. 2.1.1+:Required for the image previews and resizing functionality.
+* [blueimp Gallery](https://github.com/blueimp/Gallery) v. 2.15.1+: Used to display the uploaded images in a lightbox.
+* [Bootstrap](http://getbootstrap.com/) v. 3.2.0+
 * [Glyphicons](http://glyphicons.com/)
 
-The JavaScript Templates engine is used to render the selected and uploaded files for the Basic Plus UI and jQuery UI versions.
-
-The JavaScript Load Image library and JavaScript Canvas to Blob polyfill are required for the image previews and resizing functionality.
-
-The blueimp Gallery is used to display the uploaded images in a lightbox.
-
-The user interface of all versions except the jQuery UI version is built with Twitter's [Bootstrap](http://getbootstrap.com/) framework and icons from [Glyphicons](http://glyphicons.com/).
+The user interface of all versions except the jQuery UI version is built with [Bootstrap](http://getbootstrap.com/) and icons from [Glyphicons](http://glyphicons.com/).
 
 ### Cross-domain requirements
 [Cross-domain File Uploads](https://github.com/blueimp/jQuery-File-Upload/wiki/Cross-domain-uploads) using the [Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js) require a redirect back to the origin server to retrieve the upload results. The [example implementation](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/main.js) makes use of [result.html](https://github.com/blueimp/jQuery-File-Upload/blob/master/cors/result.html) as a static redirect page for the origin server.
@@ -89,6 +68,10 @@ The user interface of all versions except the jQuery UI version is built with Tw
 The repository also includes the [jQuery XDomainRequest Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/cors/jquery.xdr-transport.js), which enables limited cross-domain AJAX requests in Microsoft Internet Explorer 8 and 9 (IE 10 supports cross-domain XHR requests).  
 The XDomainRequest object allows GET and POST requests only and doesn't support file uploads. It is used on the [Demo](https://blueimp.github.io/jQuery-File-Upload/) to delete uploaded files from the cross-domain demo file upload service.
 
+### Custom Backends
+
+You can add support for various backends by adhering to the specification [outlined here](https://github.com/blueimp/jQuery-File-Upload/wiki/JSON-Response).
+
 ## Browsers
 
 ### Desktop browsers
@@ -110,14 +93,15 @@ The File Upload plugin has been tested with and supports the following mobile br
 * Opera Mobile 12.0+
 
 ### Supported features
-For a detailed overview of the features supported by each browser version please have a look at the [Extended browser support information](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
+For a detailed overview of the features supported by each browser version, please have a look at the [Extended browser support information](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
+
+## Contributing
+**Bug fixes** and **new features** can be proposed using [pull requests](https://github.com/blueimp/jQuery-File-Upload/pulls).
+Please read the [contribution guidelines](https://github.com/blueimp/jQuery-File-Upload/blob/master/CONTRIBUTING.md) before submitting a pull request.
+
+## Support
+This project is actively maintained, but there is no official support channel.  
+If you have a question that another developer might help you with, please post to [Stack Overflow](http://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload) and tag your question with `blueimp jquery file upload`.
 
 ## License
-Released under the [MIT license](http://www.opensource.org/licenses/MIT).
-
-## Donations
-jQuery File Upload is free software, but you can donate to support the developer, Sebastian Tschan:
-
-Flattr: [![Flattr](https://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/286433/jQuery-File-Upload-Plugin)
-
-PayPal: [![PayPal](https://www.paypalobjects.com/WEBSCR-640-20110429-1/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PYWYSYP77KL54)
+Released under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/library/blueimp_upload/angularjs.html b/library/blueimp_upload/angularjs.html
index 2a3ca2007..4858c8600 100644
--- a/library/blueimp_upload/angularjs.html
+++ b/library/blueimp_upload/angularjs.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin AngularJS Demo 2.2.0
+ * jQuery File Upload Plugin AngularJS Demo
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 -->
 <html lang="en">
@@ -157,9 +157,9 @@
         </div>
         <div class="panel-body">
             <ul>
-                <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
+                <li>The maximum file size for uploads in this demo is <strong>999 KB</strong> (default file size is unlimited).</li>
                 <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-                <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
+                <li>Uploaded files will be deleted automatically after <strong>5 minutes or less</strong> (demo files are stored in memory).</li>
                 <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
                 <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
                 <li>Built with the <a href="http://getbootstrap.com/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
@@ -177,8 +177,8 @@
     <a class="play-pause"></a>
     <ol class="indicator"></ol>
 </div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.23/angular.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
 <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
 <script src="js/vendor/jquery.ui.widget.js"></script>
 <!-- The Load Image plugin is included for the preview images and image resizing functionality -->
@@ -207,5 +207,5 @@
 <script src="js/jquery.fileupload-angular.js"></script>
 <!-- The main application script -->
 <script src="js/app.js"></script>
-</body> 
+</body>
 </html>
diff --git a/library/blueimp_upload/basic-plus.html b/library/blueimp_upload/basic-plus.html
index 59b73b60c..9e5c2321f 100644
--- a/library/blueimp_upload/basic-plus.html
+++ b/library/blueimp_upload/basic-plus.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin Basic Plus Demo 1.4.0
+ * jQuery File Upload Plugin Basic Plus Demo
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 -->
 <html lang="en">
@@ -86,9 +86,9 @@
         </div>
         <div class="panel-body">
             <ul>
-                <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
+                <li>The maximum file size for uploads in this demo is <strong>999 KB</strong> (default file size is unlimited).</li>
                 <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-                <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
+                <li>Uploaded files will be deleted automatically after <strong>5 minutes or less</strong> (demo files are stored in memory).</li>
                 <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
                 <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
                 <li>Built with the <a href="http://getbootstrap.com/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
@@ -96,7 +96,7 @@
         </div>
     </div>
 </div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
 <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
 <script src="js/vendor/jquery.ui.widget.js"></script>
 <!-- The Load Image plugin is included for the preview images and image resizing functionality -->
@@ -150,7 +150,7 @@ $(function () {
         dataType: 'json',
         autoUpload: false,
         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-        maxFileSize: 5000000, // 5 MB
+        maxFileSize: 999000,
         // Enable image resizing, except for Android and Opera,
         // which actually support image resizing, but fail to
         // send Blob objects via XHR requests:
@@ -222,5 +222,5 @@ $(function () {
         .parent().addClass($.support.fileInput ? undefined : 'disabled');
 });
 </script>
-</body> 
+</body>
 </html>
diff --git a/library/blueimp_upload/basic.html b/library/blueimp_upload/basic.html
index f248f4d80..c0df639b4 100644
--- a/library/blueimp_upload/basic.html
+++ b/library/blueimp_upload/basic.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin Basic Demo 1.3.0
+ * jQuery File Upload Plugin Basic Demo
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 -->
 <html lang="en">
@@ -86,17 +86,17 @@
         </div>
         <div class="panel-body">
             <ul>
-                <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
+                <li>The maximum file size for uploads in this demo is <strong>999 KB</strong> (default file size is unlimited).</li>
                 <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-                <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
+                <li>Uploaded files will be deleted automatically after <strong>5 minutes or less</strong> (demo files are stored in memory).</li>
                 <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
                 <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
-                <li>Built with Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
+                <li>Built with the <a href="http://getbootstrap.com/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
             </ul>
         </div>
     </div>
 </div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
 <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
 <script src="js/vendor/jquery.ui.widget.js"></script>
 <!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
@@ -132,5 +132,5 @@ $(function () {
         .parent().addClass($.support.fileInput ? undefined : 'disabled');
 });
 </script>
-</body> 
+</body>
 </html>
diff --git a/library/blueimp_upload/blueimp-file-upload.jquery.json b/library/blueimp_upload/blueimp-file-upload.jquery.json
deleted file mode 100644
index d6d8c911c..000000000
--- a/library/blueimp_upload/blueimp-file-upload.jquery.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "name": "blueimp-file-upload",
-  "version": "9.8.0",
-  "title": "jQuery File Upload",
-  "author": {
-    "name": "Sebastian Tschan",
-    "url": "https://blueimp.net"
-  },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
-  "dependencies": {
-    "jquery": ">=1.6"
-  },
-  "description": "File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
-  "keywords": [
-    "jquery",
-    "file",
-    "upload",
-    "widget",
-    "multiple",
-    "selection",
-    "drag",
-    "drop",
-    "progress",
-    "preview",
-    "cross-domain",
-    "cross-site",
-    "chunk",
-    "resume",
-    "gae",
-    "go",
-    "python",
-    "php",
-    "bootstrap"
-  ],
-  "homepage": "https://github.com/blueimp/jQuery-File-Upload",
-  "docs": "https://github.com/blueimp/jQuery-File-Upload/wiki",
-  "demo": "https://blueimp.github.io/jQuery-File-Upload/",
-  "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues",
-  "maintainers": [
-    {
-      "name": "Sebastian Tschan",
-      "url": "https://blueimp.net"
-    }
-  ]
-}
diff --git a/library/blueimp_upload/bower-version-update.js b/library/blueimp_upload/bower-version-update.js
new file mode 100755
index 000000000..09ce3927e
--- /dev/null
+++ b/library/blueimp_upload/bower-version-update.js
@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+
+'use strict';
+
+var path = require('path');
+var packageJSON = require(path.join(__dirname, 'package.json'));
+var bowerFile = path.join(__dirname, 'bower.json');
+var bowerJSON = require('bower-json').parse(
+  require(bowerFile),
+  {normalize: true}
+);
+bowerJSON.version = packageJSON.version;
+require('fs').writeFileSync(
+  bowerFile,
+  JSON.stringify(bowerJSON, null, 2) + '\n'
+);
diff --git a/library/blueimp_upload/bower.json b/library/blueimp_upload/bower.json
index c0d3d3259..90c74c792 100644
--- a/library/blueimp_upload/bower.json
+++ b/library/blueimp_upload/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.8.0",
+  "version": "9.18.0",
   "title": "jQuery File Upload",
-  "description": "File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
+  "description": "File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images.",
   "keywords": [
     "jquery",
     "file",
@@ -40,12 +40,7 @@
     "url": "git://github.com/blueimp/jQuery-File-Upload.git"
   },
   "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
+  "license": "MIT",
   "dependencies": {
     "jquery": ">=1.6",
     "blueimp-tmpl": ">=2.5.4",
@@ -53,23 +48,7 @@
     "blueimp-canvas-to-blob": ">=2.1.1"
   },
   "main": [
-    "css/jquery.fileupload.css",
-    "css/jquery.fileupload-ui.css",
-    "css/jquery.fileupload-noscript.css",
-    "css/jquery.fileupload-ui-noscript.css",
-    "js/cors/jquery.postmessage-transport.js",
-    "js/cors/jquery.xdr-transport.js",
-    "js/vendor/jquery.ui.widget.js",
-    "js/jquery.fileupload.js",
-    "js/jquery.fileupload-process.js",
-    "js/jquery.fileupload-validate.js",
-    "js/jquery.fileupload-image.js",
-    "js/jquery.fileupload-audio.js",
-    "js/jquery.fileupload-video.js",
-    "js/jquery.fileupload-ui.js",
-    "js/jquery.fileupload-jquery-ui.js",
-    "js/jquery.fileupload-angular.js",
-    "js/jquery.iframe-transport.js"
+    "js/jquery.fileupload.js"
   ],
   "ignore": [
     "/*.*",
diff --git a/library/blueimp_upload/cors/postmessage.html b/library/blueimp_upload/cors/postmessage.html
index 3d1448f08..6db288cf9 100644
--- a/library/blueimp_upload/cors/postmessage.html
+++ b/library/blueimp_upload/cors/postmessage.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin postMessage API 1.2.1
+ * jQuery File Upload Plugin postMessage API
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 -->
 <html lang="en">
@@ -72,4 +72,4 @@ $(window).on('message', function (e) {
 });
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/library/blueimp_upload/cors/result.html b/library/blueimp_upload/cors/result.html
index 225131495..e3d629814 100644
--- a/library/blueimp_upload/cors/result.html
+++ b/library/blueimp_upload/cors/result.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery Iframe Transport Plugin Redirect Page 2.0.1
+ * jQuery Iframe Transport Plugin Redirect Page
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 -->
 <html lang="en">
diff --git a/library/blueimp_upload/css/demo-ie8.css b/library/blueimp_upload/css/demo-ie8.css
index 262493d08..e0e8ea9b0 100644
--- a/library/blueimp_upload/css/demo-ie8.css
+++ b/library/blueimp_upload/css/demo-ie8.css
@@ -1,13 +1,13 @@
 @charset "UTF-8";
 /*
- * jQuery File Upload Demo CSS Fixes for IE<9 1.0.0
+ * jQuery File Upload Demo CSS Fixes for IE<9
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .navigation {
diff --git a/library/blueimp_upload/css/demo.css b/library/blueimp_upload/css/demo.css
index 2b4d43934..d7d524df5 100644
--- a/library/blueimp_upload/css/demo.css
+++ b/library/blueimp_upload/css/demo.css
@@ -1,13 +1,13 @@
 @charset "UTF-8";
 /*
- * jQuery File Upload Demo CSS 1.1.0
+ * jQuery File Upload Demo CSS
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 body {
diff --git a/library/blueimp_upload/css/jquery.fileupload-noscript.css b/library/blueimp_upload/css/jquery.fileupload-noscript.css
index 64d728fc3..2409bfb0a 100644
--- a/library/blueimp_upload/css/jquery.fileupload-noscript.css
+++ b/library/blueimp_upload/css/jquery.fileupload-noscript.css
@@ -1,20 +1,20 @@
 @charset "UTF-8";
 /*
- * jQuery File Upload Plugin NoScript CSS 1.2.0
+ * jQuery File Upload Plugin NoScript CSS
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .fileinput-button input {
   position: static;
   opacity: 1;
   filter: none;
-  font-size: inherit;
+  font-size: inherit !important;
   direction: inherit;
 }
 .fileinput-button span {
diff --git a/library/blueimp_upload/css/jquery.fileupload-ui-noscript.css b/library/blueimp_upload/css/jquery.fileupload-ui-noscript.css
index 87f110cdb..30651acf0 100644
--- a/library/blueimp_upload/css/jquery.fileupload-ui-noscript.css
+++ b/library/blueimp_upload/css/jquery.fileupload-ui-noscript.css
@@ -1,13 +1,13 @@
 @charset "UTF-8";
 /*
- * jQuery File Upload UI Plugin NoScript CSS 8.8.5
+ * jQuery File Upload UI Plugin NoScript CSS
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2012, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .fileinput-button i,
diff --git a/library/blueimp_upload/css/jquery.fileupload-ui.css b/library/blueimp_upload/css/jquery.fileupload-ui.css
index 76fb376de..9e36c42c5 100644
--- a/library/blueimp_upload/css/jquery.fileupload-ui.css
+++ b/library/blueimp_upload/css/jquery.fileupload-ui.css
@@ -1,13 +1,13 @@
 @charset "UTF-8";
 /*
- * jQuery File Upload UI Plugin CSS 9.0.0
+ * jQuery File Upload UI Plugin CSS
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .fileupload-buttonbar .btn,
diff --git a/library/blueimp_upload/css/jquery.fileupload.css b/library/blueimp_upload/css/jquery.fileupload.css
index fb6044d34..8ae3b09d4 100644
--- a/library/blueimp_upload/css/jquery.fileupload.css
+++ b/library/blueimp_upload/css/jquery.fileupload.css
@@ -1,18 +1,19 @@
 @charset "UTF-8";
 /*
- * jQuery File Upload Plugin CSS 1.3.0
+ * jQuery File Upload Plugin CSS
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 .fileinput-button {
   position: relative;
   overflow: hidden;
+  display: inline-block;
 }
 .fileinput-button input {
   position: absolute;
@@ -21,7 +22,7 @@
   margin: 0;
   opacity: 0;
   -ms-filter: 'alpha(opacity=0)';
-  font-size: 200px;
+  font-size: 200px !important;
   direction: ltr;
   cursor: pointer;
 }
diff --git a/library/blueimp_upload/css/style.css b/library/blueimp_upload/css/style.css
index b2c60a6f1..3aee25689 100644
--- a/library/blueimp_upload/css/style.css
+++ b/library/blueimp_upload/css/style.css
@@ -1,13 +1,13 @@
 @charset "UTF-8";
 /*
- * jQuery File Upload Plugin CSS Example 8.8.2
+ * jQuery File Upload Plugin CSS Example
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 body {
diff --git a/library/blueimp_upload/index.html b/library/blueimp_upload/index.html
index f92f04aab..2a8dc1521 100644
--- a/library/blueimp_upload/index.html
+++ b/library/blueimp_upload/index.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin Demo 9.1.0
+ * jQuery File Upload Plugin Demo
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 -->
 <html lang="en">
@@ -121,9 +121,9 @@
         </div>
         <div class="panel-body">
             <ul>
-                <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
+                <li>The maximum file size for uploads in this demo is <strong>999 KB</strong> (default file size is unlimited).</li>
                 <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-                <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
+                <li>Uploaded files will be deleted automatically after <strong>5 minutes or less</strong> (demo files are stored in memory).</li>
                 <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
                 <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
                 <li>Built with the <a href="http://getbootstrap.com/">Bootstrap</a> CSS framework and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
@@ -216,7 +216,7 @@
     </tr>
 {% } %}
 </script>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
 <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
 <script src="js/vendor/jquery.ui.widget.js"></script>
 <!-- The Templates plugin is included to render the upload/download listings -->
@@ -251,5 +251,5 @@
 <!--[if (gte IE 8)&(lt IE 10)]>
 <script src="js/cors/jquery.xdr-transport.js"></script>
 <![endif]-->
-</body> 
+</body>
 </html>
diff --git a/library/blueimp_upload/jquery-ui.html b/library/blueimp_upload/jquery-ui.html
index d61ee5233..83fe9acd1 100644
--- a/library/blueimp_upload/jquery-ui.html
+++ b/library/blueimp_upload/jquery-ui.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin jQuery UI Demo 9.1.0
+ * jQuery File Upload Plugin jQuery UI Demo
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 -->
 <html lang="en">
@@ -127,9 +127,9 @@
 <br>
 <h3>Demo Notes</h3>
 <ul>
-    <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
+    <li>The maximum file size for uploads in this demo is <strong>999 KB</strong> (default file size is unlimited).</li>
     <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
-    <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
+    <li>Uploaded files will be deleted automatically after <strong>5 minutes or less</strong> (demo files are stored in memory).</li>
     <li>You can <strong>drag &amp; drop</strong> files from your desktop on this webpage (see <a href="https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support">Browser support</a>).</li>
     <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
     <li>Built with <a href="https://jqueryui.com">jQuery UI</a>.</li>
@@ -199,8 +199,8 @@
     </tr>
 {% } %}
 </script>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 <!-- The Templates plugin is included to render the upload/download listings -->
 <script src="//blueimp.github.io/JavaScript-Templates/js/tmpl.min.js"></script>
 <!-- The Load Image plugin is included for the preview images and image resizing functionality -->
@@ -246,5 +246,5 @@ $('#theme-switcher').change(function () {
 <!--[if (gte IE 8)&(lt IE 10)]>
 <script src="js/cors/jquery.xdr-transport.js"></script>
 <![endif]-->
-</body> 
+</body>
 </html>
diff --git a/library/blueimp_upload/js/app.js b/library/blueimp_upload/js/app.js
index 47b4f923b..e6b7bce3e 100644
--- a/library/blueimp_upload/js/app.js
+++ b/library/blueimp_upload/js/app.js
@@ -1,18 +1,18 @@
 /*
- * jQuery File Upload Plugin Angular JS Example 1.2.1
+ * jQuery File Upload Plugin Angular JS Example
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
 /* global window, angular */
 
-(function () {
+;(function () {
     'use strict';
 
     var isOnGitHub = window.location.hostname === 'blueimp.github.io',
@@ -37,7 +37,7 @@
                         // send Blob objects via XHR requests:
                         disableImageResize: /Android(?!.*Chrome)|Opera/
                             .test(window.navigator.userAgent),
-                        maxFileSize: 5000000,
+                        maxFileSize: 999000,
                         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
                     });
                 }
diff --git a/library/blueimp_upload/js/cors/jquery.postmessage-transport.js b/library/blueimp_upload/js/cors/jquery.postmessage-transport.js
index 2b4851e67..2a0c38cb6 100644
--- a/library/blueimp_upload/js/cors/jquery.postmessage-transport.js
+++ b/library/blueimp_upload/js/cors/jquery.postmessage-transport.js
@@ -1,21 +1,24 @@
 /*
- * jQuery postMessage Transport Plugin 1.1.1
+ * jQuery postMessage Transport Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/* global define, window, document */
+/* global define, require, window, document */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
         define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(require('jquery'));
     } else {
         // Browser globals:
         factory(window.jQuery);
@@ -61,6 +64,12 @@
                 loc = $('<a>').prop('href', options.postMessage)[0],
                 target = loc.protocol + '//' + loc.host,
                 xhrUpload = options.xhr().upload;
+            // IE always includes the port for the host property of a link
+            // element, but not in the location.host or origin property for the
+            // default http port 80 and https port 443, so we strip it:
+            if (/^(http:\/\/.+:80)|(https:\/\/.+:443)$/.test(target)) {
+              target = target.replace(/:(80|443)$/, '');
+            }
             return {
                 send: function (_, completeCallback) {
                     counter += 1;
diff --git a/library/blueimp_upload/js/cors/jquery.xdr-transport.js b/library/blueimp_upload/js/cors/jquery.xdr-transport.js
index 0044cc2d5..a4e2699c6 100644
--- a/library/blueimp_upload/js/cors/jquery.xdr-transport.js
+++ b/library/blueimp_upload/js/cors/jquery.xdr-transport.js
@@ -1,24 +1,27 @@
 /*
- * jQuery XDomainRequest Transport Plugin 1.1.3
+ * jQuery XDomainRequest Transport Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  *
  * Based on Julian Aubourg's ajaxHooks xdr.js:
  * https://github.com/jaubourg/ajaxHooks/
  */
 
-/* global define, window, XDomainRequest */
+/* global define, require, window, XDomainRequest */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
         define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(require('jquery'));
     } else {
         // Browser globals:
         factory(window.jQuery);
diff --git a/library/blueimp_upload/js/jquery.fileupload-angular.js b/library/blueimp_upload/js/jquery.fileupload-angular.js
index e4ef3926b..1c2055276 100644
--- a/library/blueimp_upload/js/jquery.fileupload-angular.js
+++ b/library/blueimp_upload/js/jquery.fileupload-angular.js
@@ -1,18 +1,18 @@
 /*
- * jQuery File Upload AngularJS Plugin 2.2.0
+ * jQuery File Upload AngularJS Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
-/* global define, angular */
+/* global define, angular, require */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
@@ -24,6 +24,16 @@
             './jquery.fileupload-video',
             './jquery.fileupload-validate'
         ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('angular'),
+            require('./jquery.fileupload-image'),
+            require('./jquery.fileupload-audio'),
+            require('./jquery.fileupload-video'),
+            require('./jquery.fileupload-validate')
+        );
     } else {
         factory();
     }
@@ -91,7 +101,7 @@
                     angular.forEach(data.files, function (file) {
                         filesCopy.push(file);
                     });
-                    scope.$apply(function () {
+                    scope.$parent.$applyAsync(function () {
                         addFileMethods(scope, data);
                         var method = scope.option('prependFiles') ?
                                 'unshift' : 'push';
@@ -100,7 +110,7 @@
                     data.process(function () {
                         return scope.process(data);
                     }).always(function () {
-                        scope.$apply(function () {
+                        scope.$parent.$applyAsync(function () {
                             addFileMethods(scope, data);
                             scope.replace(filesCopy, data.files);
                         });
@@ -112,12 +122,6 @@
                         }
                     });
                 },
-                progress: function (e, data) {
-                    if (e.isDefaultPrevented()) {
-                        return false;
-                    }
-                    data.scope.$apply();
-                },
                 done: function (e, data) {
                     if (e.isDefaultPrevented()) {
                         return false;
@@ -197,8 +201,8 @@
         // The FileUploadController initializes the fileupload widget and
         // provides scope methods to control the File Upload functionality:
         .controller('FileUploadController', [
-            '$scope', '$element', '$attrs', '$window', 'fileUpload',
-            function ($scope, $element, $attrs, $window, fileUpload) {
+            '$scope', '$element', '$attrs', '$window', 'fileUpload','$q',
+            function ($scope, $element, $attrs, $window, fileUpload, $q) {
                 var uploadMethods = {
                     progress: function () {
                         return $element.fileupload('progress');
@@ -260,19 +264,21 @@
                 $scope.applyOnQueue = function (method) {
                     var list = this.queue.slice(0),
                         i,
-                        file;
+                        file,
+                        promises = [];
                     for (i = 0; i < list.length; i += 1) {
                         file = list[i];
                         if (file[method]) {
-                            file[method]();
+                            promises.push(file[method]());
                         }
                     }
+                    return $q.all(promises);
                 };
                 $scope.submit = function () {
-                    this.applyOnQueue('$submit');
+                    return this.applyOnQueue('$submit');
                 };
                 $scope.cancel = function () {
-                    this.applyOnQueue('$cancel');
+                    return this.applyOnQueue('$cancel');
                 };
                 // Add upload methods to the scope:
                 angular.extend($scope, uploadMethods);
@@ -320,9 +326,11 @@
                     'fileuploadprocessalways',
                     'fileuploadprocessstop'
                 ].join(' '), function (e, data) {
-                    if ($scope.$emit(e.type, data).defaultPrevented) {
-                        e.preventDefault();
-                    }
+                    $scope.$parent.$applyAsync(function () {
+                        if ($scope.$emit(e.type, data).defaultPrevented) {
+                            e.preventDefault();
+                        }
+                    });
                 }).on('remove', function () {
                     // Remove upload methods from the scope,
                     // when the widget is removed:
diff --git a/library/blueimp_upload/js/jquery.fileupload-audio.js b/library/blueimp_upload/js/jquery.fileupload-audio.js
index 575800e82..a25377619 100644
--- a/library/blueimp_upload/js/jquery.fileupload-audio.js
+++ b/library/blueimp_upload/js/jquery.fileupload-audio.js
@@ -1,18 +1,18 @@
 /*
- * jQuery File Upload Audio Preview Plugin 1.0.3
+ * jQuery File Upload Audio Preview Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
-/* global define, window, document */
+/* global define, require, window, document */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
@@ -21,6 +21,13 @@
             'load-image',
             './jquery.fileupload-process'
         ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('blueimp-load-image/js/load-image'),
+            require('./jquery.fileupload-process')
+        );
     } else {
         // Browser globals:
         factory(
diff --git a/library/blueimp_upload/js/jquery.fileupload-image.js b/library/blueimp_upload/js/jquery.fileupload-image.js
index 5bb7026ae..65fc6d7b8 100644
--- a/library/blueimp_upload/js/jquery.fileupload-image.js
+++ b/library/blueimp_upload/js/jquery.fileupload-image.js
@@ -1,18 +1,18 @@
 /*
- * jQuery File Upload Image Preview & Resize Plugin 1.7.2
+ * jQuery File Upload Image Preview & Resize Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
-/* global define, window, Blob */
+/* global define, require, window, Blob */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
@@ -20,11 +20,22 @@
             'jquery',
             'load-image',
             'load-image-meta',
+            'load-image-scale',
             'load-image-exif',
-            'load-image-ios',
             'canvas-to-blob',
             './jquery.fileupload-process'
         ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('blueimp-load-image/js/load-image'),
+            require('blueimp-load-image/js/load-image-meta'),
+            require('blueimp-load-image/js/load-image-scale'),
+            require('blueimp-load-image/js/load-image-exif'),
+            require('blueimp-canvas-to-blob'),
+            require('./jquery.fileupload-process')
+        );
     } else {
         // Browser globals:
         factory(
@@ -236,7 +247,7 @@
                                     blob.name = file.name;
                                 } else if (file.name) {
                                     blob.name = file.name.replace(
-                                        /\..+$/,
+                                        /\.\w+$/,
                                         '.' + blob.type.substr(6)
                                     );
                                 }
diff --git a/library/blueimp_upload/js/jquery.fileupload-jquery-ui.js b/library/blueimp_upload/js/jquery.fileupload-jquery-ui.js
old mode 100755
new mode 100644
index af0a00b1e..7b136b379
--- a/library/blueimp_upload/js/jquery.fileupload-jquery-ui.js
+++ b/library/blueimp_upload/js/jquery.fileupload-jquery-ui.js
@@ -1,22 +1,31 @@
 /*
- * jQuery File Upload jQuery UI Plugin 8.7.1
+ * jQuery File Upload jQuery UI Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
-/* global define, window */
+/* global define, require, window */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
-        define(['jquery', './jquery.fileupload-ui'], factory);
+        define([
+            'jquery',
+            './jquery.fileupload-ui'
+        ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('./jquery.fileupload-ui')
+        );
     } else {
         // Browser globals:
         factory(window.jQuery);
diff --git a/library/blueimp_upload/js/jquery.fileupload-process.js b/library/blueimp_upload/js/jquery.fileupload-process.js
index 8a6b929a6..638f0d26b 100644
--- a/library/blueimp_upload/js/jquery.fileupload-process.js
+++ b/library/blueimp_upload/js/jquery.fileupload-process.js
@@ -1,18 +1,18 @@
 /*
- * jQuery File Upload Processing Plugin 1.3.0
+ * jQuery File Upload Processing Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2012, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
-/* global define, window */
+/* global define, require, window */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
@@ -20,6 +20,12 @@
             'jquery',
             './jquery.fileupload'
         ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('./jquery.fileupload')
+        );
     } else {
         // Browser globals:
         factory(
@@ -81,7 +87,7 @@
                         settings
                     );
                 };
-                chain = chain.pipe(func, settings.always && func);
+                chain = chain.then(func, settings.always && func);
             });
             chain
                 .done(function () {
@@ -148,7 +154,7 @@
                         };
                     opts.index = index;
                     that._processing += 1;
-                    that._processingQueue = that._processingQueue.pipe(func, func)
+                    that._processingQueue = that._processingQueue.then(func, func)
                         .always(function () {
                             that._processing -= 1;
                             if (that._processing === 0) {
diff --git a/library/blueimp_upload/js/jquery.fileupload-ui.js b/library/blueimp_upload/js/jquery.fileupload-ui.js
index 62cf9aa38..83e7449e6 100644
--- a/library/blueimp_upload/js/jquery.fileupload-ui.js
+++ b/library/blueimp_upload/js/jquery.fileupload-ui.js
@@ -1,29 +1,38 @@
 /*
- * jQuery File Upload User Interface Plugin 9.6.0
+ * jQuery File Upload User Interface Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
-/* global define, window */
+/* global define, require, window */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
         define([
             'jquery',
-            'tmpl',
+            'blueimp-tmpl',
             './jquery.fileupload-image',
             './jquery.fileupload-audio',
             './jquery.fileupload-video',
             './jquery.fileupload-validate'
         ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('blueimp-tmpl'),
+            require('./jquery.fileupload-image'),
+            require('./jquery.fileupload-video'),
+            require('./jquery.fileupload-validate')
+        );
     } else {
         // Browser globals:
         factory(
@@ -62,10 +71,10 @@
             // The expected data type of the upload response, sets the dataType
             // option of the $.ajax upload requests:
             dataType: 'json',
-            
+
             // Error and info messages:
             messages: {
-                unknownError: 'Unknown error'  
+                unknownError: 'Unknown error'
             },
 
             // Function returning the current number of files,
diff --git a/library/blueimp_upload/js/jquery.fileupload-validate.js b/library/blueimp_upload/js/jquery.fileupload-validate.js
index f93a18fa2..eebeb3733 100644
--- a/library/blueimp_upload/js/jquery.fileupload-validate.js
+++ b/library/blueimp_upload/js/jquery.fileupload-validate.js
@@ -1,17 +1,17 @@
 /*
- * jQuery File Upload Validation Plugin 1.1.2
+ * jQuery File Upload Validation Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/* global define, window */
+/* global define, require, window */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
@@ -19,6 +19,12 @@
             'jquery',
             './jquery.fileupload-process'
         ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('./jquery.fileupload-process')
+        );
     } else {
         // Browser globals:
         factory(
@@ -33,7 +39,7 @@
         {
             action: 'validate',
             // Always trigger this action,
-            // even if the previous action was rejected: 
+            // even if the previous action was rejected:
             always: true,
             // Options taken from the global options map:
             acceptFileTypes: '@',
diff --git a/library/blueimp_upload/js/jquery.fileupload-video.js b/library/blueimp_upload/js/jquery.fileupload-video.js
index 3764b27a2..aedcec2ba 100644
--- a/library/blueimp_upload/js/jquery.fileupload-video.js
+++ b/library/blueimp_upload/js/jquery.fileupload-video.js
@@ -1,18 +1,18 @@
 /*
- * jQuery File Upload Video Preview Plugin 1.0.3
+ * jQuery File Upload Video Preview Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
-/* global define, window, document */
+/* global define, require, window, document */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
@@ -21,6 +21,13 @@
             'load-image',
             './jquery.fileupload-process'
         ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('blueimp-load-image/js/load-image'),
+            require('./jquery.fileupload-process')
+        );
     } else {
         // Browser globals:
         factory(
diff --git a/library/blueimp_upload/js/jquery.fileupload.js b/library/blueimp_upload/js/jquery.fileupload.js
index a4cfdc0ac..5ff151b53 100644
--- a/library/blueimp_upload/js/jquery.fileupload.js
+++ b/library/blueimp_upload/js/jquery.fileupload.js
@@ -1,25 +1,31 @@
 /*
- * jQuery File Upload Plugin 5.42.0
+ * jQuery File Upload Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* jshint nomen:false */
-/* global define, window, document, location, Blob, FormData */
+/* global define, require, window, document, location, Blob, FormData */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
         define([
             'jquery',
-            'jquery.ui.widget'
+            'jquery-ui/ui/widget'
         ], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(
+            require('jquery'),
+            require('./vendor/jquery.ui.widget')
+        );
     } else {
         // Browser globals:
         factory(window.jQuery);
@@ -271,7 +277,8 @@
             // The following are jQuery ajax settings required for the file uploads:
             processData: false,
             contentType: false,
-            cache: false
+            cache: false,
+            timeout: 0
         },
 
         // A list of options that require reinitializing event listeners and/or
@@ -645,7 +652,7 @@
             data.process = function (resolveFunc, rejectFunc) {
                 if (resolveFunc || rejectFunc) {
                     data._processQueue = this._processQueue =
-                        (this._processQueue || getPromise([this])).pipe(
+                        (this._processQueue || getPromise([this])).then(
                             function () {
                                 if (data.errorThrown) {
                                     return $.Deferred()
@@ -653,7 +660,7 @@
                                 }
                                 return getPromise(arguments);
                             }
-                        ).pipe(resolveFunc, rejectFunc);
+                        ).then(resolveFunc, rejectFunc);
                 }
                 return this._processQueue || getPromise([this]);
             };
@@ -938,9 +945,9 @@
                 if (this.options.limitConcurrentUploads > 1) {
                     slot = $.Deferred();
                     this._slots.push(slot);
-                    pipe = slot.pipe(send);
+                    pipe = slot.then(send);
                 } else {
-                    this._sequence = this._sequence.pipe(send, send);
+                    this._sequence = this._sequence.then(send, send);
                     pipe = this._sequence;
                 }
                 // Return the piped Promise object, enhanced with an abort method,
@@ -977,7 +984,10 @@
                 fileSet,
                 i,
                 j = 0;
-            if (limitSize && (!filesLength || files[0].size === undefined)) {
+            if (!filesLength) {
+                return false;
+            }
+            if (limitSize && files[0].size === undefined) {
                 limitSize = undefined;
             }
             if (!(options.singleFileUploads || limit || limitSize) ||
@@ -1036,13 +1046,19 @@
 
         _replaceFileInput: function (data) {
             var input = data.fileInput,
-                inputClone = input.clone(true);
+                inputClone = input.clone(true),
+                restoreFocus = input.is(document.activeElement);
             // Add a reference for the new cloned file input to the data argument:
             data.fileInputClone = inputClone;
             $('<form></form>').append(inputClone)[0].reset();
             // Detaching allows to insert the fileInput on another form
             // without loosing the file input value:
             input.after(inputClone).detach();
+            // If the fileInput had focus before it was detached,
+            // restore focus to the inputClone.
+            if (restoreFocus) {
+                inputClone.focus();
+            }
             // Avoid memory leaks with the detached file input:
             $.cleanData(input.unbind('remove'));
             // Replace the original file input element in the fileInput
@@ -1064,6 +1080,8 @@
         _handleFileTreeEntry: function (entry, path) {
             var that = this,
                 dfd = $.Deferred(),
+                entries = [],
+                dirReader,
                 errorHandler = function (e) {
                     if (e && !e.entry) {
                         e.entry = entry;
@@ -1091,8 +1109,7 @@
                             readEntries();
                         }
                     }, errorHandler);
-                },
-                dirReader, entries = [];
+                };
             path = path || '';
             if (entry.isFile) {
                 if (entry._file) {
@@ -1123,7 +1140,7 @@
                 $.map(entries, function (entry) {
                     return that._handleFileTreeEntry(entry, path);
                 })
-            ).pipe(function () {
+            ).then(function () {
                 return Array.prototype.concat.apply(
                     [],
                     arguments
@@ -1192,7 +1209,7 @@
             return $.when.apply(
                 $,
                 $.map(fileInput, this._getSingleFileInputFiles)
-            ).pipe(function () {
+            ).then(function () {
                 return Array.prototype.concat.apply(
                     [],
                     arguments
@@ -1295,6 +1312,10 @@
             this._off(this.options.fileInput, 'change');
         },
 
+        _destroy: function () {
+            this._destroyEventHandlers();
+        },
+
         _setOption: function (key, value) {
             var reinit = $.inArray(key, this._specialOptions) !== -1;
             if (reinit) {
@@ -1338,15 +1359,19 @@
         _initDataAttributes: function () {
             var that = this,
                 options = this.options,
-                clone = $(this.element[0].cloneNode(false));
+                data = this.element.data();
             // Initialize options set via HTML5 data-attributes:
             $.each(
-                clone.data(),
-                function (key, value) {
-                    var dataAttributeName = 'data-' +
-                        // Convert camelCase to hyphen-ated key:
-                        key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-                    if (clone.attr(dataAttributeName)) {
+                this.element[0].attributes,
+                function (index, attr) {
+                    var key = attr.name.toLowerCase(),
+                        value;
+                    if (/^data-/.test(key)) {
+                        // Convert hyphen-ated key to camelCase:
+                        key = key.slice(5).replace(/-[a-z]/g, function (str) {
+                            return str.charAt(1).toUpperCase();
+                        });
+                        value = data[key];
                         if (that._isRegExpOption(key, value)) {
                             value = that._getRegExp(value);
                         }
diff --git a/library/blueimp_upload/js/jquery.iframe-transport.js b/library/blueimp_upload/js/jquery.iframe-transport.js
index 8d64b591b..8d25c4641 100644
--- a/library/blueimp_upload/js/jquery.iframe-transport.js
+++ b/library/blueimp_upload/js/jquery.iframe-transport.js
@@ -1,21 +1,24 @@
 /*
- * jQuery Iframe Transport Plugin 1.8.2
+ * jQuery Iframe Transport Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/* global define, window, document */
+/* global define, require, window, document, JSON */
 
-(function (factory) {
+;(function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
         // Register as an anonymous AMD module:
         define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS:
+        factory(require('jquery'));
     } else {
         // Browser globals:
         factory(window.jQuery);
@@ -24,7 +27,14 @@
     'use strict';
 
     // Helper variable to create unique names for the transport iframes:
-    var counter = 0;
+    var counter = 0,
+        jsonAPI = $,
+        jsonParse = 'parseJSON';
+
+    if ('JSON' in window && 'parse' in JSON) {
+      jsonAPI = JSON;
+      jsonParse = 'parse';
+    }
 
     // The iframe transport accepts four additional options:
     // options.fileInput: a jQuery collection of file input fields
@@ -194,7 +204,7 @@
                 return iframe && $(iframe[0].body).text();
             },
             'iframe json': function (iframe) {
-                return iframe && $.parseJSON($(iframe[0].body).text());
+                return iframe && jsonAPI[jsonParse]($(iframe[0].body).text());
             },
             'iframe html': function (iframe) {
                 return iframe && $(iframe[0].body).html();
diff --git a/library/blueimp_upload/js/main.js b/library/blueimp_upload/js/main.js
index 8f57967a3..0403682e7 100644
--- a/library/blueimp_upload/js/main.js
+++ b/library/blueimp_upload/js/main.js
@@ -1,12 +1,12 @@
 /*
- * jQuery File Upload Plugin JS Example 8.9.1
+ * jQuery File Upload Plugin JS Example
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* global $, window */
@@ -40,7 +40,7 @@ $(function () {
             // send Blob objects via XHR requests:
             disableImageResize: /Android(?!.*Chrome)|Opera/
                 .test(window.navigator.userAgent),
-            maxFileSize: 5000000,
+            maxFileSize: 999000,
             acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i
         });
         // Upload server status check for browsers with CORS support:
diff --git a/library/blueimp_upload/js/vendor/jquery.ui.widget.js b/library/blueimp_upload/js/vendor/jquery.ui.widget.js
index 7899e6bb3..e08df3fd0 100644
--- a/library/blueimp_upload/js/vendor/jquery.ui.widget.js
+++ b/library/blueimp_upload/js/vendor/jquery.ui.widget.js
@@ -1,13 +1,19 @@
-/*! jQuery UI - v1.11.1 - 2014-09-17
+/*! jQuery UI - v1.11.4+CommonJS - 2015-08-28
 * http://jqueryui.com
 * Includes: widget.js
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */
 
 (function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
 		define([ "jquery" ], factory );
+
+	} else if ( typeof exports === "object" ) {
+
+		// Node/CommonJS
+		factory( require( "jquery" ) );
+
 	} else {
 
 		// Browser globals
@@ -15,10 +21,10 @@
 	}
 }(function( $ ) {
 /*!
- * jQuery UI Widget 1.11.1
+ * jQuery UI Widget 1.11.4
  * http://jqueryui.com
  *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -42,7 +48,7 @@ $.cleanData = (function( orig ) {
 				}
 
 			// http://bugs.jquery.com/ticket/8235
-			} catch( e ) {}
+			} catch ( e ) {}
 		}
 		orig( elems );
 	};
@@ -196,11 +202,6 @@ $.widget.bridge = function( name, object ) {
 			args = widget_slice.call( arguments, 1 ),
 			returnValue = this;
 
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.widget.extend.apply( null, [ options ].concat(args) ) :
-			options;
-
 		if ( isMethodCall ) {
 			this.each(function() {
 				var methodValue,
@@ -225,6 +226,12 @@ $.widget.bridge = function( name, object ) {
 				}
 			});
 		} else {
+
+			// Allow multiple hashes to be passed on init
+			if ( args.length ) {
+				options = $.widget.extend.apply( null, [ options ].concat(args) );
+			}
+
 			this.each(function() {
 				var instance = $.data( this, fullName );
 				if ( instance ) {
@@ -260,10 +267,6 @@ $.Widget.prototype = {
 		this.element = $( element );
 		this.uuid = widget_uuid++;
 		this.eventNamespace = "." + this.widgetName + this.uuid;
-		this.options = $.widget.extend( {},
-			this.options,
-			this._getCreateOptions(),
-			options );
 
 		this.bindings = $();
 		this.hoverable = $();
@@ -286,6 +289,11 @@ $.Widget.prototype = {
 			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
 		}
 
+		this.options = $.widget.extend( {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
 		this._create();
 		this._trigger( "create", null, this._getCreateEventData() );
 		this._init();
@@ -448,8 +456,14 @@ $.Widget.prototype = {
 	},
 
 	_off: function( element, eventName ) {
-		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) +
+			this.eventNamespace;
 		element.unbind( eventName ).undelegate( eventName );
+
+		// Clear the stack to avoid memory leaks (#10056)
+		this.bindings = $( this.bindings.not( element ).get() );
+		this.focusable = $( this.focusable.not( element ).get() );
+		this.hoverable = $( this.hoverable.not( element ).get() );
 	},
 
 	_delay: function( handler, delay ) {
diff --git a/library/blueimp_upload/package.json b/library/blueimp_upload/package.json
index 880574aa7..ed4d33681 100644
--- a/library/blueimp_upload/package.json
+++ b/library/blueimp_upload/package.json
@@ -1,8 +1,8 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.8.0",
+  "version": "9.18.0",
   "title": "jQuery File Upload",
-  "description": "File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
+  "description": "File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
   "keywords": [
     "jquery",
     "file",
@@ -29,26 +29,27 @@
     "name": "Sebastian Tschan",
     "url": "https://blueimp.net"
   },
-  "maintainers": [
-    {
-      "name": "Sebastian Tschan",
-      "url": "https://blueimp.net"
-    }
-  ],
   "repository": {
     "type": "git",
     "url": "git://github.com/blueimp/jQuery-File-Upload.git"
   },
-  "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues",
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
+  "license": "MIT",
+  "optionalDependencies": {
+    "blueimp-canvas-to-blob": "3.5.0",
+    "blueimp-load-image": "2.12.2",
+    "blueimp-tmpl": "3.6.0"
+  },
   "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-bump-build-git": "~1.1.1",
-    "grunt-contrib-jshint": "~0.10.0"
-  }
+    "bower-json": "0.8.1",
+    "jshint": "2.9.3"
+  },
+  "scripts": {
+    "bower-version-update": "./bower-version-update.js",
+    "lint": "jshint *.js js/*.js js/cors/*.js",
+    "test": "npm run lint",
+    "preversion": "npm test",
+    "version": "npm run bower-version-update && git add bower.json",
+    "postversion": "git push --tags origin master && npm publish"
+  },
+  "main": "js/jquery.fileupload.js"
 }
diff --git a/library/blueimp_upload/server/gae-go/app/main.go b/library/blueimp_upload/server/gae-go/app/main.go
index 03af0b1d2..a92d128c0 100644
--- a/library/blueimp_upload/server/gae-go/app/main.go
+++ b/library/blueimp_upload/server/gae-go/app/main.go
@@ -1,59 +1,90 @@
 /*
- * jQuery File Upload Plugin GAE Go Example 3.2.0
+ * jQuery File Upload Plugin GAE Go Example
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 package app
 
 import (
-	"appengine"
-	"appengine/blobstore"
-	"appengine/image"
-	"appengine/taskqueue"
+	"bufio"
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/disintegration/gift"
+	"golang.org/x/net/context"
+	"google.golang.org/appengine"
+	"google.golang.org/appengine/memcache"
+	"hash/crc32"
+	"image"
+	"image/gif"
+	"image/jpeg"
+	"image/png"
 	"io"
 	"log"
 	"mime/multipart"
 	"net/http"
 	"net/url"
+	"path/filepath"
 	"regexp"
 	"strings"
-	"time"
 )
 
 const (
-	WEBSITE           = "https://blueimp.github.io/jQuery-File-Upload/"
-	MIN_FILE_SIZE     = 1       // bytes
-	MAX_FILE_SIZE     = 5000000 // bytes
+	WEBSITE       = "https://blueimp.github.io/jQuery-File-Upload/"
+	MIN_FILE_SIZE = 1 // bytes
+	// Max file size is memcache limit (1MB) minus key size minus overhead:
+	MAX_FILE_SIZE     = 999000 // bytes
 	IMAGE_TYPES       = "image/(gif|p?jpeg|(x-)?png)"
 	ACCEPT_FILE_TYPES = IMAGE_TYPES
+	THUMB_MAX_WIDTH   = 80
+	THUMB_MAX_HEIGHT  = 80
 	EXPIRATION_TIME   = 300 // seconds
-	THUMBNAIL_PARAM   = "=s80"
+	// If empty, only allow redirects to the referer protocol+host.
+	// Set to a regexp string for custom pattern matching:
+	REDIRECT_ALLOW_TARGET = ""
 )
 
 var (
 	imageTypes      = regexp.MustCompile(IMAGE_TYPES)
 	acceptFileTypes = regexp.MustCompile(ACCEPT_FILE_TYPES)
+	thumbSuffix     = "." + fmt.Sprint(THUMB_MAX_WIDTH) + "x" +
+		fmt.Sprint(THUMB_MAX_HEIGHT)
 )
 
+func escape(s string) string {
+	return strings.Replace(url.QueryEscape(s), "+", "%20", -1)
+}
+
+func extractKey(r *http.Request) string {
+	// Use RequestURI instead of r.URL.Path, as we need the encoded form:
+	path := strings.Split(r.RequestURI, "?")[0]
+	// Also adjust double encoded slashes:
+	return strings.Replace(path[1:], "%252F", "%2F", -1)
+}
+
+func check(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
 type FileInfo struct {
-	Key          appengine.BlobKey `json:"-"`
-	Url          string            `json:"url,omitempty"`
-	ThumbnailUrl string            `json:"thumbnailUrl,omitempty"`
-	Name         string            `json:"name"`
-	Type         string            `json:"type"`
-	Size         int64             `json:"size"`
-	Error        string            `json:"error,omitempty"`
-	DeleteUrl    string            `json:"deleteUrl,omitempty"`
-	DeleteType   string            `json:"deleteType,omitempty"`
+	Key          string `json:"-"`
+	ThumbnailKey string `json:"-"`
+	Url          string `json:"url,omitempty"`
+	ThumbnailUrl string `json:"thumbnailUrl,omitempty"`
+	Name         string `json:"name"`
+	Type         string `json:"type"`
+	Size         int64  `json:"size"`
+	Error        string `json:"error,omitempty"`
+	DeleteUrl    string `json:"deleteUrl,omitempty"`
+	DeleteType   string `json:"deleteType,omitempty"`
 }
 
 func (fi *FileInfo) ValidateType() (valid bool) {
@@ -75,50 +106,58 @@ func (fi *FileInfo) ValidateSize() (valid bool) {
 	return false
 }
 
-func (fi *FileInfo) CreateUrls(r *http.Request, c appengine.Context) {
+func (fi *FileInfo) CreateUrls(r *http.Request, c context.Context) {
 	u := &url.URL{
 		Scheme: r.URL.Scheme,
 		Host:   appengine.DefaultVersionHostname(c),
 		Path:   "/",
 	}
 	uString := u.String()
-	fi.Url = uString + escape(string(fi.Key)) + "/" +
-		escape(string(fi.Name))
-	fi.DeleteUrl = fi.Url + "?delete=true"
+	fi.Url = uString + fi.Key
+	fi.DeleteUrl = fi.Url
 	fi.DeleteType = "DELETE"
+	if fi.ThumbnailKey != "" {
+		fi.ThumbnailUrl = uString + fi.ThumbnailKey
+	}
+}
+
+func (fi *FileInfo) SetKey(checksum uint32) {
+	fi.Key = escape(string(fi.Type)) + "/" +
+		escape(fmt.Sprint(checksum)) + "/" +
+		escape(string(fi.Name))
+}
+
+func (fi *FileInfo) createThumb(buffer *bytes.Buffer, c context.Context) {
 	if imageTypes.MatchString(fi.Type) {
-		servingUrl, err := image.ServingURL(
-			c,
-			fi.Key,
-			&image.ServingURLOptions{
-				Secure: strings.HasSuffix(u.Scheme, "s"),
-				Size:   0,
-				Crop:   false,
-			},
-		)
+		src, _, err := image.Decode(bytes.NewReader(buffer.Bytes()))
 		check(err)
-		fi.ThumbnailUrl = servingUrl.String() + THUMBNAIL_PARAM
-	}
-}
-
-func check(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
-
-func escape(s string) string {
-	return strings.Replace(url.QueryEscape(s), "+", "%20", -1)
-}
-
-func delayedDelete(c appengine.Context, fi *FileInfo) {
-	if key := string(fi.Key); key != "" {
-		task := &taskqueue.Task{
-			Path:   "/" + escape(key) + "/-",
-			Method: "DELETE",
-			Delay:  time.Duration(EXPIRATION_TIME) * time.Second,
+		filter := gift.New(gift.ResizeToFit(
+			THUMB_MAX_WIDTH,
+			THUMB_MAX_HEIGHT,
+			gift.LanczosResampling,
+		))
+		dst := image.NewNRGBA(filter.Bounds(src.Bounds()))
+		filter.Draw(dst, src)
+		buffer.Reset()
+		bWriter := bufio.NewWriter(buffer)
+		switch fi.Type {
+		case "image/jpeg", "image/pjpeg":
+			err = jpeg.Encode(bWriter, dst, nil)
+		case "image/gif":
+			err = gif.Encode(bWriter, dst, nil)
+		default:
+			err = png.Encode(bWriter, dst)
 		}
-		taskqueue.Add(c, task, "")
+		check(err)
+		bWriter.Flush()
+		thumbnailKey := fi.Key + thumbSuffix + filepath.Ext(fi.Name)
+		item := &memcache.Item{
+			Key:   thumbnailKey,
+			Value: buffer.Bytes(),
+		}
+		err = memcache.Set(c, item)
+		check(err)
+		fi.ThumbnailKey = thumbnailKey
 	}
 }
 
@@ -136,24 +175,26 @@ func handleUpload(r *http.Request, p *multipart.Part) (fi *FileInfo) {
 			fi.Error = rec.(error).Error()
 		}
 	}()
+	var buffer bytes.Buffer
+	hash := crc32.NewIEEE()
+	mw := io.MultiWriter(&buffer, hash)
 	lr := &io.LimitedReader{R: p, N: MAX_FILE_SIZE + 1}
-	context := appengine.NewContext(r)
-	w, err := blobstore.Create(context, fi.Type)
-	defer func() {
-		w.Close()
-		fi.Size = MAX_FILE_SIZE + 1 - lr.N
-		fi.Key, err = w.Key()
-		check(err)
-		if !fi.ValidateSize() {
-			err := blobstore.Delete(context, fi.Key)
-			check(err)
-			return
-		}
-		delayedDelete(context, fi)
-		fi.CreateUrls(r, context)
-	}()
+	_, err := io.Copy(mw, lr)
 	check(err)
-	_, err = io.Copy(w, lr)
+	fi.Size = MAX_FILE_SIZE + 1 - lr.N
+	if !fi.ValidateSize() {
+		return
+	}
+	fi.SetKey(hash.Sum32())
+	item := &memcache.Item{
+		Key:   fi.Key,
+		Value: buffer.Bytes(),
+	}
+	context := appengine.NewContext(r)
+	err = memcache.Set(context, item)
+	check(err)
+	fi.createThumb(&buffer, context)
+	fi.CreateUrls(r, context)
 	return
 }
 
@@ -183,49 +224,70 @@ func handleUploads(r *http.Request) (fileInfos []*FileInfo) {
 	return
 }
 
+func validateRedirect(r *http.Request, redirect string) bool {
+	if redirect != "" {
+		var redirectAllowTarget *regexp.Regexp
+		if REDIRECT_ALLOW_TARGET != "" {
+			redirectAllowTarget = regexp.MustCompile(REDIRECT_ALLOW_TARGET)
+		} else {
+			referer := r.Referer()
+			if referer == "" {
+				return false
+			}
+			refererUrl, err := url.Parse(referer)
+			if err != nil {
+				return false
+			}
+			redirectAllowTarget = regexp.MustCompile("^" + regexp.QuoteMeta(
+				refererUrl.Scheme+"://"+refererUrl.Host+"/",
+			))
+		}
+		return redirectAllowTarget.MatchString(redirect)
+	}
+	return false
+}
+
 func get(w http.ResponseWriter, r *http.Request) {
 	if r.URL.Path == "/" {
 		http.Redirect(w, r, WEBSITE, http.StatusFound)
 		return
 	}
-	parts := strings.Split(r.URL.Path, "/")
+	// Use RequestURI instead of r.URL.Path, as we need the encoded form:
+	key := extractKey(r)
+	parts := strings.Split(key, "/")
 	if len(parts) == 3 {
-		if key := parts[1]; key != "" {
-			blobKey := appengine.BlobKey(key)
-			bi, err := blobstore.Stat(appengine.NewContext(r), blobKey)
-			if err == nil {
-				w.Header().Add("X-Content-Type-Options", "nosniff")
-				if !imageTypes.MatchString(bi.ContentType) {
-					w.Header().Add("Content-Type", "application/octet-stream")
-					w.Header().Add(
-						"Content-Disposition",
-						fmt.Sprintf("attachment; filename=\"%s\"", parts[2]),
-					)
-				}
-				w.Header().Add(
-					"Cache-Control",
-					fmt.Sprintf("public,max-age=%d", EXPIRATION_TIME),
-				)
-				blobstore.Send(w, blobKey)
-				return
+		context := appengine.NewContext(r)
+		item, err := memcache.Get(context, key)
+		if err == nil {
+			w.Header().Add("X-Content-Type-Options", "nosniff")
+			contentType, _ := url.QueryUnescape(parts[0])
+			if !imageTypes.MatchString(contentType) {
+				contentType = "application/octet-stream"
 			}
+			w.Header().Add("Content-Type", contentType)
+			w.Header().Add(
+				"Cache-Control",
+				fmt.Sprintf("public,max-age=%d", EXPIRATION_TIME),
+			)
+			w.Write(item.Value)
+			return
 		}
 	}
 	http.Error(w, "404 Not Found", http.StatusNotFound)
 }
 
 func post(w http.ResponseWriter, r *http.Request) {
-    result := make(map[string][]*FileInfo, 1)
-    result["files"] = handleUploads(r)
+	result := make(map[string][]*FileInfo, 1)
+	result["files"] = handleUploads(r)
 	b, err := json.Marshal(result)
 	check(err)
-	if redirect := r.FormValue("redirect"); redirect != "" {
-	    if strings.Contains(redirect, "%s") {
-	        redirect = fmt.Sprintf(
-    			redirect,
-    			escape(string(b)),
-    		)
-	    }
+	if redirect := r.FormValue("redirect"); validateRedirect(r, redirect) {
+		if strings.Contains(redirect, "%s") {
+			redirect = fmt.Sprintf(
+				redirect,
+				escape(string(b)),
+			)
+		}
 		http.Redirect(w, r, redirect, http.StatusFound)
 		return
 	}
@@ -238,27 +300,30 @@ func post(w http.ResponseWriter, r *http.Request) {
 }
 
 func delete(w http.ResponseWriter, r *http.Request) {
-	parts := strings.Split(r.URL.Path, "/")
-	if len(parts) != 3 {
-		return
-	}
-	result := make(map[string]bool, 1)
-	if key := parts[1]; key != "" {
-		c := appengine.NewContext(r)
-		blobKey := appengine.BlobKey(key)
-		err := blobstore.Delete(c, blobKey)
+	key := extractKey(r)
+	parts := strings.Split(key, "/")
+	if len(parts) == 3 {
+		result := make(map[string]bool, 1)
+		context := appengine.NewContext(r)
+		err := memcache.Delete(context, key)
+		if err == nil {
+			result[key] = true
+			contentType, _ := url.QueryUnescape(parts[0])
+			if imageTypes.MatchString(contentType) {
+				thumbnailKey := key + thumbSuffix + filepath.Ext(parts[2])
+				err := memcache.Delete(context, thumbnailKey)
+				if err == nil {
+					result[thumbnailKey] = true
+				}
+			}
+		}
+		w.Header().Set("Content-Type", "application/json")
+		b, err := json.Marshal(result)
 		check(err)
-		err = image.DeleteServingURL(c, blobKey)
-		check(err)
-		result[key] = true
+		fmt.Fprintln(w, string(b))
+	} else {
+		http.Error(w, "405 Method not allowed", http.StatusMethodNotAllowed)
 	}
-	jsonType := "application/json"
-	if strings.Index(r.Header.Get("Accept"), jsonType) != -1 {
-		w.Header().Set("Content-Type", jsonType)
-	}
-	b, err := json.Marshal(result)
-	check(err)
-	fmt.Fprintln(w, string(b))
 }
 
 func handle(w http.ResponseWriter, r *http.Request) {
@@ -267,15 +332,15 @@ func handle(w http.ResponseWriter, r *http.Request) {
 	w.Header().Add("Access-Control-Allow-Origin", "*")
 	w.Header().Add(
 		"Access-Control-Allow-Methods",
-		"OPTIONS, HEAD, GET, POST, PUT, DELETE",
+		"OPTIONS, HEAD, GET, POST, DELETE",
 	)
 	w.Header().Add(
 		"Access-Control-Allow-Headers",
 		"Content-Type, Content-Range, Content-Disposition",
 	)
 	switch r.Method {
-	case "OPTIONS":
-	case "HEAD":
+	case "OPTIONS", "HEAD":
+		return
 	case "GET":
 		get(w, r)
 	case "POST":
diff --git a/library/blueimp_upload/server/gae-python/app.yaml b/library/blueimp_upload/server/gae-python/app.yaml
index 5fe123f59..764449b74 100644
--- a/library/blueimp_upload/server/gae-python/app.yaml
+++ b/library/blueimp_upload/server/gae-python/app.yaml
@@ -4,8 +4,9 @@ runtime: python27
 api_version: 1
 threadsafe: true
 
-builtins:
-- deferred: on
+libraries:
+- name: PIL
+  version: latest
 
 handlers:
 - url: /(favicon\.ico|robots\.txt)
diff --git a/library/blueimp_upload/server/gae-python/main.py b/library/blueimp_upload/server/gae-python/main.py
index 6276be6a0..1955ac00a 100644
--- a/library/blueimp_upload/server/gae-python/main.py
+++ b/library/blueimp_upload/server/gae-python/main.py
@@ -1,49 +1,57 @@
 # -*- coding: utf-8 -*-
 #
-# jQuery File Upload Plugin GAE Python Example 2.2.0
+# jQuery File Upload Plugin GAE Python Example
 # https://github.com/blueimp/jQuery-File-Upload
 #
 # Copyright 2011, Sebastian Tschan
 # https://blueimp.net
 #
 # Licensed under the MIT license:
-# http://www.opensource.org/licenses/MIT
+# https://opensource.org/licenses/MIT
 #
 
-from __future__ import with_statement
-from google.appengine.api import files, images
-from google.appengine.ext import blobstore, deferred
-from google.appengine.ext.webapp import blobstore_handlers
+from google.appengine.api import memcache, images
 import json
+import os
 import re
 import urllib
 import webapp2
 
+DEBUG=os.environ.get('SERVER_SOFTWARE', '').startswith('Dev')
 WEBSITE = 'https://blueimp.github.io/jQuery-File-Upload/'
 MIN_FILE_SIZE = 1  # bytes
-MAX_FILE_SIZE = 5000000  # bytes
+# Max file size is memcache limit (1MB) minus key size minus overhead:
+MAX_FILE_SIZE = 999000  # bytes
 IMAGE_TYPES = re.compile('image/(gif|p?jpeg|(x-)?png)')
 ACCEPT_FILE_TYPES = IMAGE_TYPES
-THUMBNAIL_MODIFICATOR = '=s80'  # max width / height
+THUMB_MAX_WIDTH = 80
+THUMB_MAX_HEIGHT = 80
+THUMB_SUFFIX = '.'+str(THUMB_MAX_WIDTH)+'x'+str(THUMB_MAX_HEIGHT)+'.png'
 EXPIRATION_TIME = 300  # seconds
+# If set to None, only allow redirects to the referer protocol+host.
+# Set to a regexp for custom pattern matching against the redirect value:
+REDIRECT_ALLOW_TARGET = None
 
-
-def cleanup(blob_keys):
-    blobstore.delete(blob_keys)
-
-
-class UploadHandler(webapp2.RequestHandler):
+class CORSHandler(webapp2.RequestHandler):
+    def cors(self):
+        headers = self.response.headers
+        headers['Access-Control-Allow-Origin'] = '*'
+        headers['Access-Control-Allow-Methods'] =\
+            'OPTIONS, HEAD, GET, POST, DELETE'
+        headers['Access-Control-Allow-Headers'] =\
+            'Content-Type, Content-Range, Content-Disposition'
 
     def initialize(self, request, response):
-        super(UploadHandler, self).initialize(request, response)
-        self.response.headers['Access-Control-Allow-Origin'] = '*'
-        self.response.headers[
-            'Access-Control-Allow-Methods'
-        ] = 'OPTIONS, HEAD, GET, POST, PUT, DELETE'
-        self.response.headers[
-            'Access-Control-Allow-Headers'
-        ] = 'Content-Type, Content-Range, Content-Disposition'
+        super(CORSHandler, self).initialize(request, response)
+        self.cors()
 
+    def json_stringify(self, obj):
+        return json.dumps(obj, separators=(',', ':'))
+
+    def options(self, *args, **kwargs):
+        pass
+
+class UploadHandler(CORSHandler):
     def validate(self, file):
         if file['size'] < MIN_FILE_SIZE:
             file['error'] = 'File is too small'
@@ -55,6 +63,20 @@ class UploadHandler(webapp2.RequestHandler):
             return True
         return False
 
+    def validate_redirect(self, redirect):
+        if redirect:
+            if REDIRECT_ALLOW_TARGET:
+                return REDIRECT_ALLOW_TARGET.match(redirect)
+            referer = self.request.headers['referer']
+            if referer:
+                from urlparse import urlparse
+                parts = urlparse(referer)
+                redirect_allow_target = '^' + re.escape(
+                    parts.scheme + '://' + parts.netloc + '/'
+                )
+            return re.match(redirect_allow_target, redirect)
+        return False
+
     def get_file_size(self, file):
         file.seek(0, 2)  # Seek to the end of the file
         size = file.tell()  # Get the position of EOF
@@ -62,64 +84,58 @@ class UploadHandler(webapp2.RequestHandler):
         return size
 
     def write_blob(self, data, info):
-        blob = files.blobstore.create(
-            mime_type=info['type'],
-            _blobinfo_uploaded_filename=info['name']
-        )
-        with files.open(blob, 'a') as f:
-            f.write(data)
-        files.finalize(blob)
-        return files.blobstore.get_blob_key(blob)
+        key = urllib.quote(info['type'].encode('utf-8'), '') +\
+            '/' + str(hash(data)) +\
+            '/' + urllib.quote(info['name'].encode('utf-8'), '')
+        try:
+            memcache.set(key, data, time=EXPIRATION_TIME)
+        except: #Failed to add to memcache
+            return (None, None)
+        thumbnail_key = None
+        if IMAGE_TYPES.match(info['type']):
+            try:
+                img = images.Image(image_data=data)
+                img.resize(
+                    width=THUMB_MAX_WIDTH,
+                    height=THUMB_MAX_HEIGHT
+                )
+                thumbnail_data = img.execute_transforms()
+                thumbnail_key = key + THUMB_SUFFIX
+                memcache.set(
+                    thumbnail_key,
+                    thumbnail_data,
+                    time=EXPIRATION_TIME
+                )
+            except: #Failed to resize Image or add to memcache
+                thumbnail_key = None
+        return (key, thumbnail_key)
 
     def handle_upload(self):
         results = []
-        blob_keys = []
         for name, fieldStorage in self.request.POST.items():
             if type(fieldStorage) is unicode:
                 continue
             result = {}
-            result['name'] = re.sub(
-                r'^.*\\',
-                '',
-                fieldStorage.filename
-            )
+            result['name'] = urllib.unquote(fieldStorage.filename)
             result['type'] = fieldStorage.type
             result['size'] = self.get_file_size(fieldStorage.file)
             if self.validate(result):
-                blob_key = str(
-                    self.write_blob(fieldStorage.value, result)
+                key, thumbnail_key = self.write_blob(
+                    fieldStorage.value,
+                    result
                 )
-                blob_keys.append(blob_key)
-                result['deleteType'] = 'DELETE'
-                result['deleteUrl'] = self.request.host_url +\
-                    '/?key=' + urllib.quote(blob_key, '')
-                if (IMAGE_TYPES.match(result['type'])):
-                    try:
-                        result['url'] = images.get_serving_url(
-                            blob_key,
-                            secure_url=self.request.host_url.startswith(
-                                'https'
-                            )
-                        )
-                        result['thumbnailUrl'] = result['url'] +\
-                            THUMBNAIL_MODIFICATOR
-                    except:  # Could not get an image serving url
-                        pass
-                if not 'url' in result:
-                    result['url'] = self.request.host_url +\
-                        '/' + blob_key + '/' + urllib.quote(
-                            result['name'].encode('utf-8'), '')
+                if key is not None:
+                    result['url'] = self.request.host_url + '/' + key
+                    result['deleteUrl'] = result['url']
+                    result['deleteType'] = 'DELETE'
+                    if thumbnail_key is not None:
+                        result['thumbnailUrl'] = self.request.host_url +\
+                             '/' + thumbnail_key
+                else:
+                    result['error'] = 'Failed to store uploaded file.'
             results.append(result)
-        deferred.defer(
-            cleanup,
-            blob_keys,
-            _countdown=EXPIRATION_TIME
-        )
         return results
 
-    def options(self):
-        pass
-
     def head(self):
         pass
 
@@ -130,9 +146,9 @@ class UploadHandler(webapp2.RequestHandler):
         if (self.request.get('_method') == 'DELETE'):
             return self.delete()
         result = {'files': self.handle_upload()}
-        s = json.dumps(result, separators=(',', ':'))
+        s = self.json_stringify(result)
         redirect = self.request.get('redirect')
-        if redirect:
+        if self.validate_redirect(redirect):
             return self.redirect(str(
                 redirect.replace('%s', urllib.quote(s, ''), 1)
             ))
@@ -140,31 +156,49 @@ class UploadHandler(webapp2.RequestHandler):
             self.response.headers['Content-Type'] = 'application/json'
         self.response.write(s)
 
-    def delete(self):
-        key = self.request.get('key') or ''
-        blobstore.delete(key)
-        s = json.dumps({key: True}, separators=(',', ':'))
+class FileHandler(CORSHandler):
+    def normalize(self, str):
+        return urllib.quote(urllib.unquote(str), '')
+
+    def get(self, content_type, data_hash, file_name):
+        content_type = self.normalize(content_type)
+        file_name = self.normalize(file_name)
+        key = content_type + '/' + data_hash + '/' + file_name
+        data = memcache.get(key)
+        if data is None:
+            return self.error(404)
+        # Prevent browsers from MIME-sniffing the content-type:
+        self.response.headers['X-Content-Type-Options'] = 'nosniff'
+        content_type = urllib.unquote(content_type)
+        if not IMAGE_TYPES.match(content_type):
+            # Force a download dialog for non-image types:
+            content_type = 'application/octet-stream'
+        elif file_name.endswith(THUMB_SUFFIX):
+            content_type = 'image/png'
+        self.response.headers['Content-Type'] = content_type
+        # Cache for the expiration time:
+        self.response.headers['Cache-Control'] = 'public,max-age=%d' \
+            % EXPIRATION_TIME
+        self.response.write(data)
+
+    def delete(self, content_type, data_hash, file_name):
+        content_type = self.normalize(content_type)
+        file_name = self.normalize(file_name)
+        key = content_type + '/' + data_hash + '/' + file_name
+        result = {key: memcache.delete(key)}
+        content_type = urllib.unquote(content_type)
+        if IMAGE_TYPES.match(content_type):
+            thumbnail_key = key + THUMB_SUFFIX
+            result[thumbnail_key] = memcache.delete(thumbnail_key)
         if 'application/json' in self.request.headers.get('Accept'):
             self.response.headers['Content-Type'] = 'application/json'
+        s = self.json_stringify(result)
         self.response.write(s)
 
-
-class DownloadHandler(blobstore_handlers.BlobstoreDownloadHandler):
-    def get(self, key, filename):
-        if not blobstore.get(key):
-            self.error(404)
-        else:
-            # Prevent browsers from MIME-sniffing the content-type:
-            self.response.headers['X-Content-Type-Options'] = 'nosniff'
-            # Cache for the expiration time:
-            self.response.headers['Cache-Control'] = 'public,max-age=%d' % EXPIRATION_TIME
-            # Send the file forcing a download dialog:
-            self.send_blob(key, save_as=filename, content_type='application/octet-stream')
-
 app = webapp2.WSGIApplication(
     [
         ('/', UploadHandler),
-        ('/([^/]+)/([^/]+)', DownloadHandler)
+        ('/(.+)/([^/]+)/([^/]+)', FileHandler)
     ],
-    debug=True
+    debug=DEBUG
 )
diff --git a/library/blueimp_upload/server/node/.gitignore b/library/blueimp_upload/server/node/.gitignore
deleted file mode 100644
index 9daa8247d..000000000
--- a/library/blueimp_upload/server/node/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.DS_Store
-node_modules
diff --git a/library/blueimp_upload/server/node/package.json b/library/blueimp_upload/server/node/package.json
deleted file mode 100644
index dd38c50ca..000000000
--- a/library/blueimp_upload/server/node/package.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "blueimp-file-upload-node",
-    "version": "2.1.0",
-    "title": "jQuery File Upload Node.js example",
-    "description": "Node.js implementation example of a file upload handler for jQuery File Upload.",
-    "keywords": [
-        "file",
-        "upload",
-        "cross-domain",
-        "cross-site",
-        "node"
-    ],
-    "homepage": "https://github.com/blueimp/jQuery-File-Upload",
-    "author": {
-        "name": "Sebastian Tschan",
-        "url": "https://blueimp.net"
-    },
-    "maintainers": [
-        {
-            "name": "Sebastian Tschan",
-            "url": "https://blueimp.net"
-        }
-    ],
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/blueimp/jQuery-File-Upload.git"
-    },
-    "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues",
-    "licenses": [
-        {
-            "type": "MIT",
-            "url": "http://www.opensource.org/licenses/MIT"
-        }
-    ],
-    "dependencies": {
-        "formidable": ">=1.0.11",
-        "node-static": ">=0.6.5",
-        "imagemagick": ">=0.1.3"
-    },
-    "main": "server.js"
-}
diff --git a/library/blueimp_upload/server/node/public/files/.gitignore b/library/blueimp_upload/server/node/public/files/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/library/blueimp_upload/server/node/public/files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/library/blueimp_upload/server/node/server.js b/library/blueimp_upload/server/node/server.js
deleted file mode 100755
index 808d6ffe1..000000000
--- a/library/blueimp_upload/server/node/server.js
+++ /dev/null
@@ -1,292 +0,0 @@
-#!/usr/bin/nodejs
-/*
- * jQuery File Upload Plugin Node.js Example 2.1.2
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global require, __dirname, unescape, console */
-
-(function (port) {
-    'use strict';
-    var path = require('path'),
-        fs = require('fs'),
-        // Since Node 0.8, .existsSync() moved from path to fs:
-        _existsSync = fs.existsSync || path.existsSync,
-        formidable = require('formidable'),
-        nodeStatic = require('node-static'),
-        imageMagick = require('imagemagick'),
-        options = {
-            tmpDir: __dirname + '/tmp',
-            publicDir: __dirname + '/public',
-            uploadDir: __dirname + '/public/files',
-            uploadUrl: '/files/',
-            maxPostSize: 11000000000, // 11 GB
-            minFileSize: 1,
-            maxFileSize: 10000000000, // 10 GB
-            acceptFileTypes: /.+/i,
-            // Files not matched by this regular expression force a download dialog,
-            // to prevent executing any scripts in the context of the service domain:
-            inlineFileTypes: /\.(gif|jpe?g|png)$/i,
-            imageTypes: /\.(gif|jpe?g|png)$/i,
-            imageVersions: {
-                'thumbnail': {
-                    width: 80,
-                    height: 80
-                }
-            },
-            accessControl: {
-                allowOrigin: '*',
-                allowMethods: 'OPTIONS, HEAD, GET, POST, PUT, DELETE',
-                allowHeaders: 'Content-Type, Content-Range, Content-Disposition'
-            },
-            /* Uncomment and edit this section to provide the service via HTTPS:
-            ssl: {
-                key: fs.readFileSync('/Applications/XAMPP/etc/ssl.key/server.key'),
-                cert: fs.readFileSync('/Applications/XAMPP/etc/ssl.crt/server.crt')
-            },
-            */
-            nodeStatic: {
-                cache: 3600 // seconds to cache served files
-            }
-        },
-        utf8encode = function (str) {
-            return unescape(encodeURIComponent(str));
-        },
-        fileServer = new nodeStatic.Server(options.publicDir, options.nodeStatic),
-        nameCountRegexp = /(?:(?: \(([\d]+)\))?(\.[^.]+))?$/,
-        nameCountFunc = function (s, index, ext) {
-            return ' (' + ((parseInt(index, 10) || 0) + 1) + ')' + (ext || '');
-        },
-        FileInfo = function (file) {
-            this.name = file.name;
-            this.size = file.size;
-            this.type = file.type;
-            this.deleteType = 'DELETE';
-        },
-        UploadHandler = function (req, res, callback) {
-            this.req = req;
-            this.res = res;
-            this.callback = callback;
-        },
-        serve = function (req, res) {
-            res.setHeader(
-                'Access-Control-Allow-Origin',
-                options.accessControl.allowOrigin
-            );
-            res.setHeader(
-                'Access-Control-Allow-Methods',
-                options.accessControl.allowMethods
-            );
-            res.setHeader(
-                'Access-Control-Allow-Headers',
-                options.accessControl.allowHeaders
-            );
-            var handleResult = function (result, redirect) {
-                    if (redirect) {
-                        res.writeHead(302, {
-                            'Location': redirect.replace(
-                                /%s/,
-                                encodeURIComponent(JSON.stringify(result))
-                            )
-                        });
-                        res.end();
-                    } else {
-                        res.writeHead(200, {
-                            'Content-Type': req.headers.accept
-                                .indexOf('application/json') !== -1 ?
-                                        'application/json' : 'text/plain'
-                        });
-                        res.end(JSON.stringify(result));
-                    }
-                },
-                setNoCacheHeaders = function () {
-                    res.setHeader('Pragma', 'no-cache');
-                    res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate');
-                    res.setHeader('Content-Disposition', 'inline; filename="files.json"');
-                },
-                handler = new UploadHandler(req, res, handleResult);
-            switch (req.method) {
-            case 'OPTIONS':
-                res.end();
-                break;
-            case 'HEAD':
-            case 'GET':
-                if (req.url === '/') {
-                    setNoCacheHeaders();
-                    if (req.method === 'GET') {
-                        handler.get();
-                    } else {
-                        res.end();
-                    }
-                } else {
-                    fileServer.serve(req, res);
-                }
-                break;
-            case 'POST':
-                setNoCacheHeaders();
-                handler.post();
-                break;
-            case 'DELETE':
-                handler.destroy();
-                break;
-            default:
-                res.statusCode = 405;
-                res.end();
-            }
-        };
-    fileServer.respond = function (pathname, status, _headers, files, stat, req, res, finish) {
-        // Prevent browsers from MIME-sniffing the content-type:
-        _headers['X-Content-Type-Options'] = 'nosniff';
-        if (!options.inlineFileTypes.test(files[0])) {
-            // Force a download dialog for unsafe file extensions:
-            _headers['Content-Type'] = 'application/octet-stream';
-            _headers['Content-Disposition'] = 'attachment; filename="' +
-                utf8encode(path.basename(files[0])) + '"';
-        }
-        nodeStatic.Server.prototype.respond
-            .call(this, pathname, status, _headers, files, stat, req, res, finish);
-    };
-    FileInfo.prototype.validate = function () {
-        if (options.minFileSize && options.minFileSize > this.size) {
-            this.error = 'File is too small';
-        } else if (options.maxFileSize && options.maxFileSize < this.size) {
-            this.error = 'File is too big';
-        } else if (!options.acceptFileTypes.test(this.name)) {
-            this.error = 'Filetype not allowed';
-        }
-        return !this.error;
-    };
-    FileInfo.prototype.safeName = function () {
-        // Prevent directory traversal and creating hidden system files:
-        this.name = path.basename(this.name).replace(/^\.+/, '');
-        // Prevent overwriting existing files:
-        while (_existsSync(options.uploadDir + '/' + this.name)) {
-            this.name = this.name.replace(nameCountRegexp, nameCountFunc);
-        }
-    };
-    FileInfo.prototype.initUrls = function (req) {
-        if (!this.error) {
-            var that = this,
-                baseUrl = (options.ssl ? 'https:' : 'http:') +
-                    '//' + req.headers.host + options.uploadUrl;
-            this.url = this.deleteUrl = baseUrl + encodeURIComponent(this.name);
-            Object.keys(options.imageVersions).forEach(function (version) {
-                if (_existsSync(
-                        options.uploadDir + '/' + version + '/' + that.name
-                    )) {
-                    that[version + 'Url'] = baseUrl + version + '/' +
-                        encodeURIComponent(that.name);
-                }
-            });
-        }
-    };
-    UploadHandler.prototype.get = function () {
-        var handler = this,
-            files = [];
-        fs.readdir(options.uploadDir, function (err, list) {
-            list.forEach(function (name) {
-                var stats = fs.statSync(options.uploadDir + '/' + name),
-                    fileInfo;
-                if (stats.isFile() && name[0] !== '.') {
-                    fileInfo = new FileInfo({
-                        name: name,
-                        size: stats.size
-                    });
-                    fileInfo.initUrls(handler.req);
-                    files.push(fileInfo);
-                }
-            });
-            handler.callback({files: files});
-        });
-    };
-    UploadHandler.prototype.post = function () {
-        var handler = this,
-            form = new formidable.IncomingForm(),
-            tmpFiles = [],
-            files = [],
-            map = {},
-            counter = 1,
-            redirect,
-            finish = function () {
-                counter -= 1;
-                if (!counter) {
-                    files.forEach(function (fileInfo) {
-                        fileInfo.initUrls(handler.req);
-                    });
-                    handler.callback({files: files}, redirect);
-                }
-            };
-        form.uploadDir = options.tmpDir;
-        form.on('fileBegin', function (name, file) {
-            tmpFiles.push(file.path);
-            var fileInfo = new FileInfo(file);
-            fileInfo.safeName();
-            map[path.basename(file.path)] = fileInfo;
-            files.push(fileInfo);
-        }).on('field', function (name, value) {
-            if (name === 'redirect') {
-                redirect = value;
-            }
-        }).on('file', function (name, file) {
-            var fileInfo = map[path.basename(file.path)];
-            fileInfo.size = file.size;
-            if (!fileInfo.validate()) {
-                fs.unlink(file.path);
-                return;
-            }
-            fs.renameSync(file.path, options.uploadDir + '/' + fileInfo.name);
-            if (options.imageTypes.test(fileInfo.name)) {
-                Object.keys(options.imageVersions).forEach(function (version) {
-                    counter += 1;
-                    var opts = options.imageVersions[version];
-                    imageMagick.resize({
-                        width: opts.width,
-                        height: opts.height,
-                        srcPath: options.uploadDir + '/' + fileInfo.name,
-                        dstPath: options.uploadDir + '/' + version + '/' +
-                            fileInfo.name
-                    }, finish);
-                });
-            }
-        }).on('aborted', function () {
-            tmpFiles.forEach(function (file) {
-                fs.unlink(file);
-            });
-        }).on('error', function (e) {
-            console.log(e);
-        }).on('progress', function (bytesReceived) {
-            if (bytesReceived > options.maxPostSize) {
-                handler.req.connection.destroy();
-            }
-        }).on('end', finish).parse(handler.req);
-    };
-    UploadHandler.prototype.destroy = function () {
-        var handler = this,
-            fileName;
-        if (handler.req.url.slice(0, options.uploadUrl.length) === options.uploadUrl) {
-            fileName = path.basename(decodeURIComponent(handler.req.url));
-            if (fileName[0] !== '.') {
-                fs.unlink(options.uploadDir + '/' + fileName, function (ex) {
-                    Object.keys(options.imageVersions).forEach(function (version) {
-                        fs.unlink(options.uploadDir + '/' + version + '/' + fileName);
-                    });
-                    handler.callback({success: !ex});
-                });
-                return;
-            }
-        }
-        handler.callback({success: false});
-    };
-    if (options.ssl) {
-        require('https').createServer(options.ssl, serve).listen(port);
-    } else {
-        require('http').createServer(serve).listen(port);
-    }
-}(8888));
diff --git a/library/blueimp_upload/server/node/tmp/.gitignore b/library/blueimp_upload/server/node/tmp/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/library/blueimp_upload/server/php/Dockerfile b/library/blueimp_upload/server/php/Dockerfile
new file mode 100644
index 000000000..ca88d3d0d
--- /dev/null
+++ b/library/blueimp_upload/server/php/Dockerfile
@@ -0,0 +1,38 @@
+FROM php:7.0-apache
+
+# Enable the Apache Headers module:
+RUN ln -s /etc/apache2/mods-available/headers.load \
+  /etc/apache2/mods-enabled/headers.load
+
+# Enable the Apache Rewrite module:
+RUN ln -s /etc/apache2/mods-available/rewrite.load \
+  /etc/apache2/mods-enabled/rewrite.load
+
+# Install GD, Imagick and ImageMagick as image conversion options:
+RUN DEBIAN_FRONTEND=noninteractive \
+  apt-get update && apt-get install -y --no-install-recommends \
+    libpng-dev \
+    libjpeg-dev \
+    libmagickwand-dev \
+    imagemagick \
+  && pecl install \
+    imagick \
+  && docker-php-ext-enable \
+    imagick \
+  && docker-php-ext-configure \
+    gd --with-jpeg-dir=/usr/include/ \
+  && docker-php-ext-install \
+    gd \
+  # Uninstall obsolete packages:
+  && apt-get autoremove -y \
+    libpng-dev \
+    libjpeg-dev \
+    libmagickwand-dev \
+  # Remove obsolete files:
+  && apt-get clean \
+  && rm -rf \
+    /tmp/* \
+    /usr/share/doc/* \
+    /var/cache/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
diff --git a/library/blueimp_upload/server/php/UploadHandler.php b/library/blueimp_upload/server/php/UploadHandler.php
index fb77be1d0..1380d4739 100755
--- a/library/blueimp_upload/server/php/UploadHandler.php
+++ b/library/blueimp_upload/server/php/UploadHandler.php
@@ -1,13 +1,13 @@
 <?php
 /*
- * jQuery File Upload Plugin PHP Class 8.1.0
+ * jQuery File Upload Plugin PHP Class
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 class UploadHandler
@@ -40,11 +40,13 @@ class UploadHandler
 
     protected $image_objects = array();
 
-    function __construct($options = null, $initialize = true, $error_messages = null) {
+    public function __construct($options = null, $initialize = true, $error_messages = null) {
+        $this->response = array();
         $this->options = array(
-            'script_url' => $this->get_full_url().'/',
+            'script_url' => $this->get_full_url().'/'.$this->basename($this->get_server_var('SCRIPT_NAME')),
             'upload_dir' => dirname($this->get_server_var('SCRIPT_FILENAME')).'/files/',
             'upload_url' => $this->get_full_url().'/files/',
+            'input_stream' => 'php://input',
             'user_dirs' => false,
             'mkdir_mode' => 0755,
             'param_name' => 'files',
@@ -67,6 +69,14 @@ class UploadHandler
                 'Content-Range',
                 'Content-Disposition'
             ),
+            // By default, allow redirects to the referer protocol+host:
+            'redirect_allow_target' => '/^'.preg_quote(
+              parse_url($this->get_server_var('HTTP_REFERER'), PHP_URL_SCHEME)
+                .'://'
+                .parse_url($this->get_server_var('HTTP_REFERER'), PHP_URL_HOST)
+                .'/', // Trailing slash to not match subdomains by mistake
+              '/' // preg_quote delimiter param
+            ).'/',
             // Enable to provide file downloads via GET requests to the PHP script:
             //     1. Set to 1 to download files via readfile method through PHP
             //     2. Set to 2 to send a X-Sendfile header for lighttpd/Apache
@@ -147,7 +157,8 @@ class UploadHandler
                     'max_width' => 80,
                     'max_height' => 80
                 )
-            )
+            ),
+            'print_response' => true
         );
         if ($options) {
             $this->options = $options + $this->options;
@@ -167,15 +178,15 @@ class UploadHandler
                 $this->head();
                 break;
             case 'GET':
-                $this->get();
+                $this->get($this->options['print_response']);
                 break;
             case 'PATCH':
             case 'PUT':
             case 'POST':
-                $this->post();
+                $this->post($this->options['print_response']);
                 break;
             case 'DELETE':
-                $this->delete();
+                $this->delete($this->options['print_response']);
                 break;
             default:
                 $this->header('HTTP/1.1 405 Method Not Allowed');
@@ -300,7 +311,7 @@ class UploadHandler
                 $this->get_upload_path($file_name)
             );
             $file->url = $this->get_download_url($file->name);
-            foreach($this->options['image_versions'] as $version => $options) {
+            foreach ($this->options['image_versions'] as $version => $options) {
                 if (!empty($version)) {
                     if (is_file($this->get_upload_path($file_name, $version))) {
                         $file->{$version.'Url'} = $this->get_download_url(
@@ -332,14 +343,15 @@ class UploadHandler
     }
 
     protected function get_error_message($error) {
-        return array_key_exists($error, $this->error_messages) ?
+        return isset($this->error_messages[$error]) ?
             $this->error_messages[$error] : $error;
     }
 
-    function get_config_bytes($val) {
+    public function get_config_bytes($val) {
         $val = trim($val);
         $last = strtolower($val[strlen($val)-1]);
-        switch($last) {
+        $val = (int)$val;
+        switch ($last) {
             case 'g':
                 $val *= 1024;
             case 'm':
@@ -355,9 +367,9 @@ class UploadHandler
             $file->error = $this->get_error_message($error);
             return false;
         }
-        $content_length = $this->fix_integer_overflow(intval(
-            $this->get_server_var('CONTENT_LENGTH')
-        ));
+        $content_length = $this->fix_integer_overflow(
+            (int)$this->get_server_var('CONTENT_LENGTH')
+        );
         $post_max_size = $this->get_config_bytes(ini_get('post_max_size'));
         if ($post_max_size && ($content_length > $post_max_size)) {
             $file->error = $this->get_error_message('post_max_size');
@@ -398,6 +410,21 @@ class UploadHandler
         if (($max_width || $max_height || $min_width || $min_height)
            && preg_match($this->options['image_file_types'], $file->name)) {
             list($img_width, $img_height) = $this->get_image_size($uploaded_file);
+
+            // If we are auto rotating the image by default, do the checks on
+            // the correct orientation
+            if (
+                @$this->options['image_versions']['']['auto_orient'] &&
+                function_exists('exif_read_data') &&
+                ($exif = @exif_read_data($uploaded_file)) &&
+                (((int) @$exif['Orientation']) >= 5)
+            ) {
+                $tmp = $img_width;
+                $img_width = $img_height;
+                $img_height = $tmp;
+                unset($tmp);
+            }
+
         }
         if (!empty($img_width)) {
             if ($max_width && $img_width > $max_width) {
@@ -421,7 +448,7 @@ class UploadHandler
     }
 
     protected function upcount_name_callback($matches) {
-        $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1;
+        $index = isset($matches[1]) ? ((int)$matches[1]) + 1 : 1;
         $ext = isset($matches[2]) ? $matches[2] : '';
         return ' ('.$index.')'.$ext;
     }
@@ -441,8 +468,8 @@ class UploadHandler
             $name = $this->upcount_name($name);
         }
         // Keep an existing filename if this is part of a chunked upload:
-        $uploaded_bytes = $this->fix_integer_overflow(intval($content_range[1]));
-        while(is_file($this->get_upload_path($name))) {
+        $uploaded_bytes = $this->fix_integer_overflow((int)$content_range[1]);
+        while (is_file($this->get_upload_path($name))) {
             if ($uploaded_bytes === $this->get_file_size(
                     $this->get_upload_path($name))) {
                 break;
@@ -461,7 +488,7 @@ class UploadHandler
         }
         if ($this->options['correct_image_extensions'] &&
                 function_exists('exif_imagetype')) {
-            switch(@exif_imagetype($file_path)){
+            switch (@exif_imagetype($file_path)){
                 case IMAGETYPE_JPEG:
                     $extensions = array('jpg', 'jpeg');
                     break;
@@ -491,7 +518,7 @@ class UploadHandler
         // Remove path information and dots around the filename, to prevent uploading
         // into different directories or replacing hidden system files.
         // Also remove control characters and spaces (\x00..\x20) around the filename:
-        $name = trim(basename(stripslashes($name)), ".\x00..\x20");
+        $name = trim($this->basename(stripslashes($name)), ".\x00..\x20");
         // Use a timestamp for empty filenames:
         if (!$name) {
             $name = str_replace('.', '-', microtime(true));
@@ -515,10 +542,6 @@ class UploadHandler
         );
     }
 
-    protected function handle_form_data($file, $index) {
-        // Handle form data, e.g. $_REQUEST['description'][$index]
-    }
-
     protected function get_scaled_image_file_paths($file_name, $version) {
         $file_path = $this->get_upload_path($file_name);
         if (!empty($version)) {
@@ -601,7 +624,7 @@ class UploadHandler
         if ($exif === false) {
             return false;
         }
-        $orientation = intval(@$exif['Orientation']);
+        $orientation = (int)@$exif['Orientation'];
         if ($orientation < 2 || $orientation > 8) {
             return false;
         }
@@ -825,7 +848,7 @@ class UploadHandler
             $this->get_scaled_image_file_paths($file_name, $version);
         $image = $this->imagick_get_image_object(
             $file_path,
-            !empty($options['no_cache'])
+            !empty($options['crop']) || !empty($options['no_cache'])
         );
         if ($image->getImageFormat() === 'GIF') {
             // Handle animated GIFs:
@@ -955,7 +978,7 @@ class UploadHandler
                         return $dimensions;
                     }
                     return false;
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     error_log($e->getMessage());
                 }
             }
@@ -965,7 +988,7 @@ class UploadHandler
                 exec($cmd, $output, $error);
                 if (!$error && !empty($output)) {
                     // image.jpg JPEG 1920x1080 1920x1080+0+0 8-bit sRGB 465KB 0.000u 0:00.000
-                    $infos = preg_split('/\s+/', $output[0]);
+                    $infos = preg_split('/\s+/', substr($output[0], strlen($file_path)));
                     $dimensions = preg_split('/x/', $infos[2]);
                     return $dimensions;
                 }
@@ -1008,7 +1031,7 @@ class UploadHandler
 
     protected function handle_image_file($file_path, $file) {
         $failed_versions = array();
-        foreach($this->options['image_versions'] as $version => $options) {
+        foreach ($this->options['image_versions'] as $version => $options) {
             if ($this->create_scaled_image($file->name, $version, $options)) {
                 if (!empty($version)) {
                     $file->{$version.'Url'} = $this->get_download_url(
@@ -1024,7 +1047,7 @@ class UploadHandler
         }
         if (count($failed_versions)) {
             $file->error = $this->get_error_message('image_resize')
-                    .' ('.implode($failed_versions,', ').')';
+                    .' ('.implode($failed_versions, ', ').')';
         }
         // Free memory:
         $this->destroy_image_object($file_path);
@@ -1035,7 +1058,7 @@ class UploadHandler
         $file = new \stdClass();
         $file->name = $this->get_file_name($uploaded_file, $name, $size, $type, $error,
             $index, $content_range);
-        $file->size = $this->fix_integer_overflow(intval($size));
+        $file->size = $this->fix_integer_overflow((int)$size);
         $file->type = $type;
         if ($this->validate($uploaded_file, $file, $error, $index)) {
             $this->handle_form_data($file, $index);
@@ -1061,7 +1084,7 @@ class UploadHandler
                 // Non-multipart uploads (PUT method support)
                 file_put_contents(
                     $file_path,
-                    fopen('php://input', 'r'),
+                    fopen($this->options['input_stream'], 'r'),
                     $append_file ? FILE_APPEND : 0
                 );
             }
@@ -1102,41 +1125,33 @@ class UploadHandler
     protected function body($str) {
         echo $str;
     }
-    
+
     protected function header($str) {
         header($str);
     }
 
-    protected function get_server_var($id) {
-        return isset($_SERVER[$id]) ? $_SERVER[$id] : '';
+    protected function get_upload_data($id) {
+        return @$_FILES[$id];
     }
 
-    protected function generate_response($content, $print_response = true) {
-        if ($print_response) {
-            $json = json_encode($content);
-            $redirect = isset($_REQUEST['redirect']) ?
-                stripslashes($_REQUEST['redirect']) : null;
-            if ($redirect) {
-                $this->header('Location: '.sprintf($redirect, rawurlencode($json)));
-                return;
-            }
-            $this->head();
-            if ($this->get_server_var('HTTP_CONTENT_RANGE')) {
-                $files = isset($content[$this->options['param_name']]) ?
-                    $content[$this->options['param_name']] : null;
-                if ($files && is_array($files) && is_object($files[0]) && $files[0]->size) {
-                    $this->header('Range: 0-'.(
-                        $this->fix_integer_overflow(intval($files[0]->size)) - 1
-                    ));
-                }
-            }
-            $this->body($json);
-        }
-        return $content;
+    protected function get_post_param($id) {
+        return @$_POST[$id];
+    }
+
+    protected function get_query_param($id) {
+        return @$_GET[$id];
+    }
+
+    protected function get_server_var($id) {
+        return @$_SERVER[$id];
+    }
+
+    protected function handle_form_data($file, $index) {
+        // Handle form data, e.g. $_POST['description'][$index]
     }
 
     protected function get_version_param() {
-        return isset($_GET['version']) ? basename(stripslashes($_GET['version'])) : null;
+        return $this->basename(stripslashes($this->get_query_param('version')));
     }
 
     protected function get_singular_param_name() {
@@ -1145,14 +1160,16 @@ class UploadHandler
 
     protected function get_file_name_param() {
         $name = $this->get_singular_param_name();
-        return isset($_REQUEST[$name]) ? basename(stripslashes($_REQUEST[$name])) : null;
+        return $this->basename(stripslashes($this->get_query_param($name)));
     }
 
     protected function get_file_names_params() {
-        $params = isset($_REQUEST[$this->options['param_name']]) ?
-            $_REQUEST[$this->options['param_name']] : array();
+        $params = $this->get_query_param($this->options['param_name']);
+        if (!$params) {
+            return null;
+        }
         foreach ($params as $key => $value) {
-            $params[$key] = basename(stripslashes($value));
+            $params[$key] = $this->basename(stripslashes($value));
         }
         return $params;
     }
@@ -1232,6 +1249,34 @@ class UploadHandler
             .implode(', ', $this->options['access_control_allow_headers']));
     }
 
+    public function generate_response($content, $print_response = true) {
+        $this->response = $content;
+        if ($print_response) {
+            $json = json_encode($content);
+            $redirect = stripslashes($this->get_post_param('redirect'));
+            if ($redirect && preg_match($this->options['redirect_allow_target'], $redirect)) {
+                $this->header('Location: '.sprintf($redirect, rawurlencode($json)));
+                return;
+            }
+            $this->head();
+            if ($this->get_server_var('HTTP_CONTENT_RANGE')) {
+                $files = isset($content[$this->options['param_name']]) ?
+                    $content[$this->options['param_name']] : null;
+                if ($files && is_array($files) && is_object($files[0]) && $files[0]->size) {
+                    $this->header('Range: 0-'.(
+                        $this->fix_integer_overflow((int)$files[0]->size) - 1
+                    ));
+                }
+            }
+            $this->body($json);
+        }
+        return $content;
+    }
+
+    public function get_response () {
+        return $this->response;
+    }
+
     public function head() {
         $this->header('Pragma: no-cache');
         $this->header('Cache-Control: no-store, no-cache, must-revalidate');
@@ -1245,7 +1290,7 @@ class UploadHandler
     }
 
     public function get($print_response = true) {
-        if ($print_response && isset($_GET['download'])) {
+        if ($print_response && $this->get_query_param('download')) {
             return $this->download();
         }
         $file_name = $this->get_file_name_param();
@@ -1262,58 +1307,59 @@ class UploadHandler
     }
 
     public function post($print_response = true) {
-        if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
+        if ($this->get_query_param('_method') === 'DELETE') {
             return $this->delete($print_response);
         }
-        $upload = isset($_FILES[$this->options['param_name']]) ?
-            $_FILES[$this->options['param_name']] : null;
+        $upload = $this->get_upload_data($this->options['param_name']);
         // Parse the Content-Disposition header, if available:
-        $file_name = $this->get_server_var('HTTP_CONTENT_DISPOSITION') ?
+        $content_disposition_header = $this->get_server_var('HTTP_CONTENT_DISPOSITION');
+        $file_name = $content_disposition_header ?
             rawurldecode(preg_replace(
                 '/(^[^"]+")|("$)/',
                 '',
-                $this->get_server_var('HTTP_CONTENT_DISPOSITION')
+                $content_disposition_header
             )) : null;
         // Parse the Content-Range header, which has the following form:
         // Content-Range: bytes 0-524287/2000000
-        $content_range = $this->get_server_var('HTTP_CONTENT_RANGE') ?
-            preg_split('/[^0-9]+/', $this->get_server_var('HTTP_CONTENT_RANGE')) : null;
+        $content_range_header = $this->get_server_var('HTTP_CONTENT_RANGE');
+        $content_range = $content_range_header ?
+            preg_split('/[^0-9]+/', $content_range_header) : null;
         $size =  $content_range ? $content_range[3] : null;
         $files = array();
-        if ($upload && is_array($upload['tmp_name'])) {
-            // param_name is an array identifier like "files[]",
-            // $_FILES is a multi-dimensional array:
-            foreach ($upload['tmp_name'] as $index => $value) {
+        if ($upload) {
+            if (is_array($upload['tmp_name'])) {
+                // param_name is an array identifier like "files[]",
+                // $upload is a multi-dimensional array:
+                foreach ($upload['tmp_name'] as $index => $value) {
+                    $files[] = $this->handle_file_upload(
+                        $upload['tmp_name'][$index],
+                        $file_name ? $file_name : $upload['name'][$index],
+                        $size ? $size : $upload['size'][$index],
+                        $upload['type'][$index],
+                        $upload['error'][$index],
+                        $index,
+                        $content_range
+                    );
+                }
+            } else {
+                // param_name is a single object identifier like "file",
+                // $upload is a one-dimensional array:
                 $files[] = $this->handle_file_upload(
-                    $upload['tmp_name'][$index],
-                    $file_name ? $file_name : $upload['name'][$index],
-                    $size ? $size : $upload['size'][$index],
-                    $upload['type'][$index],
-                    $upload['error'][$index],
-                    $index,
+                    isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
+                    $file_name ? $file_name : (isset($upload['name']) ?
+                            $upload['name'] : null),
+                    $size ? $size : (isset($upload['size']) ?
+                            $upload['size'] : $this->get_server_var('CONTENT_LENGTH')),
+                    isset($upload['type']) ?
+                            $upload['type'] : $this->get_server_var('CONTENT_TYPE'),
+                    isset($upload['error']) ? $upload['error'] : null,
+                    null,
                     $content_range
                 );
             }
-        } else {
-            // param_name is a single object identifier like "file",
-            // $_FILES is a one-dimensional array:
-            $files[] = $this->handle_file_upload(
-                isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
-                $file_name ? $file_name : (isset($upload['name']) ?
-                        $upload['name'] : null),
-                $size ? $size : (isset($upload['size']) ?
-                        $upload['size'] : $this->get_server_var('CONTENT_LENGTH')),
-                isset($upload['type']) ?
-                        $upload['type'] : $this->get_server_var('CONTENT_TYPE'),
-                isset($upload['error']) ? $upload['error'] : null,
-                null,
-                $content_range
-            );
         }
-        return $this->generate_response(
-            array($this->options['param_name'] => $files),
-            $print_response
-        );
+        $response = array($this->options['param_name'] => $files);
+        return $this->generate_response($response, $print_response);
     }
 
     public function delete($print_response = true) {
@@ -1322,11 +1368,11 @@ class UploadHandler
             $file_names = array($this->get_file_name_param());
         }
         $response = array();
-        foreach($file_names as $file_name) {
+        foreach ($file_names as $file_name) {
             $file_path = $this->get_upload_path($file_name);
             $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
             if ($success) {
-                foreach($this->options['image_versions'] as $version => $options) {
+                foreach ($this->options['image_versions'] as $version => $options) {
                     if (!empty($version)) {
                         $file = $this->get_upload_path($file_name, $version);
                         if (is_file($file)) {
@@ -1340,4 +1386,8 @@ class UploadHandler
         return $this->generate_response($response, $print_response);
     }
 
+    protected function basename($filepath, $suffix = null) {
+        $splited = preg_split('/\//', rtrim ($filepath, '/ '));
+        return substr(basename('X'.$splited[count($splited)-1], $suffix), 1);
+    }
 }
diff --git a/library/blueimp_upload/server/php/docker-compose.yml b/library/blueimp_upload/server/php/docker-compose.yml
new file mode 100644
index 000000000..691ea9caa
--- /dev/null
+++ b/library/blueimp_upload/server/php/docker-compose.yml
@@ -0,0 +1,6 @@
+apache:
+  build: ./
+  ports:
+    - "80:80"
+  volumes:
+    - "../../:/var/www/html"
diff --git a/library/blueimp_upload/server/php/files/.htaccess b/library/blueimp_upload/server/php/files/.htaccess
index 56689f0bb..6f454afb9 100644
--- a/library/blueimp_upload/server/php/files/.htaccess
+++ b/library/blueimp_upload/server/php/files/.htaccess
@@ -1,8 +1,16 @@
-# The following directives force the content-type application/octet-stream
-# and force browsers to display a download dialog for non-image files.
-# This prevents the execution of script files in the context of the website:
+# To enable the Headers module, execute the following command and reload Apache:
+# sudo a2enmod headers
+
+# The following directives prevent the execution of script files
+# in the context of the website.
+# They also force the content-type application/octet-stream and
+# force browsers to display a download dialog for non-image files.
+SetHandler default-handler
 ForceType application/octet-stream
 Header set Content-Disposition attachment
+
+# The following unsets the forced type and Content-Disposition headers
+# for known image files:
 <FilesMatch "(?i)\.(gif|jpe?g|png)$">
 	ForceType none
 	Header unset Content-Disposition
diff --git a/library/blueimp_upload/server/php/index.php b/library/blueimp_upload/server/php/index.php
index 3ae1295ef..6caabb710 100644
--- a/library/blueimp_upload/server/php/index.php
+++ b/library/blueimp_upload/server/php/index.php
@@ -1,13 +1,13 @@
 <?php
 /*
- * jQuery File Upload Plugin PHP Example 5.14
+ * jQuery File Upload Plugin PHP Example
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 error_reporting(E_ALL | E_STRICT);
diff --git a/library/blueimp_upload/test/index.html b/library/blueimp_upload/test/index.html
index a04e53433..4a9a6f328 100644
--- a/library/blueimp_upload/test/index.html
+++ b/library/blueimp_upload/test/index.html
@@ -1,14 +1,14 @@
 <!DOCTYPE HTML>
 <!--
 /*
- * jQuery File Upload Plugin Test 9.1.0
+ * jQuery File Upload Plugin Test
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 -->
 <html lang="en">
@@ -20,7 +20,7 @@
 <meta charset="utf-8">
 <title>jQuery File Upload Plugin Test</title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://codeorigin.jquery.com/qunit/qunit-1.14.0.css">
+<link rel="stylesheet" href="//codeorigin.jquery.com/qunit/qunit-1.14.0.css">
 </head>
 <body>
 <h1 id="qunit-header">jQuery File Upload Plugin Test</h1>
@@ -36,20 +36,20 @@
             <div class="col-lg-7">
                 <!-- The fileinput-button span is used to style the file input field as button -->
                 <span class="btn btn-success fileinput-button">
-                    <i class="fa-plus fa fa-inverse"></i>
+                    <i class="icon-plus icon-white"></i>
                     <span>Add files...</span>
                     <input type="file" name="files[]" multiple>
                 </span>
                 <button type="submit" class="btn btn-primary start">
-                    <i class="fa-arrow-circle-o-up fa fa-inverse"></i>
+                    <i class="icon-upload icon-white"></i>
                     <span>Start upload</span>
                 </button>
                 <button type="reset" class="btn btn-warning cancel">
-                    <i class="fa-ban fa fa-inverse"></i>
+                    <i class="icon-ban-circle icon-white"></i>
                     <span>Cancel upload</span>
                 </button>
                 <button type="button" class="btn btn-danger delete">
-                    <i class="fa-trash-o fa fa-inverse"></i>
+                    <i class="icon-trash icon-white"></i>
                     <span>Delete</span>
                 </button>
                 <input type="checkbox" class="toggle">
@@ -168,5 +168,5 @@ window.testUIWidget = $.blueimp.fileupload;
 </script>
 <script src="//code.jquery.com/qunit/qunit-1.15.0.js"></script>
 <script src="test.js"></script>
-</body> 
+</body>
 </html>
diff --git a/library/blueimp_upload/test/test.js b/library/blueimp_upload/test/test.js
index 72d08d99e..452127567 100644
--- a/library/blueimp_upload/test/test.js
+++ b/library/blueimp_upload/test/test.js
@@ -1,12 +1,12 @@
 /*
- * jQuery File Upload Plugin Test 9.4.0
+ * jQuery File Upload Plugin Test
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
 /* global $, QUnit, window, document, expect, module, test, asyncTest, start, ok, strictEqual, notStrictEqual */
@@ -83,7 +83,7 @@ $(function () {
     });
 
     test('Paste zone initialization', function () {
-        ok($('#fileupload').fileupload()
+        ok($('#fileupload').fileupload({pasteZone: document})
             .fileupload('option', 'pasteZone').length);
     });
 
@@ -98,6 +98,7 @@ $(function () {
                 }
             },
             fu = $('#fileupload').fileupload({
+                pasteZone: document,
                 dragover: function () {
                     ok(true, 'Triggers dragover callback');
                     return false;
@@ -135,6 +136,7 @@ $(function () {
                 }
             },
             options = {
+                pasteZone: document,
                 dragover: function () {
                     ok(true, 'Triggers dragover callback');
                     return false;
@@ -178,6 +180,7 @@ $(function () {
                 }
             },
             fu = $('#fileupload').fileupload({
+                pasteZone: document,
                 dragover: function () {
                     ok(true, 'Triggers dragover callback');
                     return false;
@@ -221,6 +224,7 @@ $(function () {
                 }
             },
             fu = $('#fileupload').fileupload({
+                pasteZone: document,
                 dragover: function () {
                     ok(true, 'Triggers dragover callback');
                     return false;

From 54c5e03b4f94e07fccf1d67078a534d2e7da99b4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 26 Jun 2017 22:42:01 -0700
Subject: [PATCH 281/299] provide more comprehensible information on the admin
 summary page

---
 Zotlabs/Module/Admin.php   | 17 ++++++++++-------
 view/tpl/admin_summary.tpl |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 65ce363c0..f2918dffc 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -91,10 +91,10 @@ class Admin extends \Zotlabs\Web\Controller {
 			intval(ACCOUNT_BLOCKED)
 		);
 		if ($r) {
-			$accounts['total']    = array('label' => t('# Accounts'), 'val' => $r[0]['total']);
-			$accounts['blocked']  = array('label' => t('# blocked accounts'), 'val' => $r[0]['blocked']);
-			$accounts['expired']  = array('label' => t('# expired accounts'), 'val' => $r[0]['expired']);
-			$accounts['expiring'] = array('label' => t('# expiring accounts'), 'val' => $r[0]['expiring']);
+			$accounts['total']    = array('label' => t('Accounts'), 'val' => $r[0]['total']);
+			$accounts['blocked']  = array('label' => t('Blocked accounts'), 'val' => $r[0]['blocked']);
+			$accounts['expired']  = array('label' => t('Expired accounts'), 'val' => $r[0]['expired']);
+			$accounts['expiring'] = array('label' => t('Expiring accounts'), 'val' => $r[0]['expiring']);
 		}
 
 		// pending registrations
@@ -105,9 +105,9 @@ class Admin extends \Zotlabs\Web\Controller {
 		$channels = array();
 		$r = q("SELECT COUNT(*) AS total, COUNT(CASE WHEN channel_primary = 1 THEN 1 ELSE NULL END) AS main, COUNT(CASE WHEN channel_primary = 0 THEN 1 ELSE NULL END) AS clones FROM channel WHERE channel_removed = 0");
 		if ($r) {
-			$channels['total']  = array('label' => t('# Channels'), 'val' => $r[0]['total']);
-			$channels['main']   = array('label' => t('# primary'), 'val' => $r[0]['main']);
-			$channels['clones'] = array('label' => t('# clones'), 'val' => $r[0]['clones']);
+			$channels['total']  = array('label' => t('Channels'), 'val' => $r[0]['total']);
+			$channels['main']   = array('label' => t('Primary'), 'val' => $r[0]['main']);
+			$channels['clones'] = array('label' => t('Clones'), 'val' => $r[0]['clones']);
 		}
 
 		// We can do better, but this is a quick queue status
@@ -118,6 +118,9 @@ class Admin extends \Zotlabs\Web\Controller {
 		// If no plugins active return 0, otherwise list of plugin names
 		$plugins = (count(\App::$plugins) == 0) ? count(\App::$plugins) : \App::$plugins;
 
+		if(is_array($plugins))
+			sort($plugins);
+
 		// Could be extended to provide also other alerts to the admin
 		$alertmsg = '';
 
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index ca94b0ef7..8125703d7 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -12,7 +12,7 @@
 	</dl>
 	<dl>
 		<dt>{{$accounts.0}}</dt>
-		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
+		<dd>{{foreach from=$accounts.1 item=acc name=account}}<span title="{{$acc.label}}">{{$acc.val}} {{$acc.label}}</span>{{if !$smarty.foreach.account.last}} / {{/if}}{{/foreach}}</dd>
 	</dl>
 	<dl>
 		<dt>{{$pending.0}}</dt>
@@ -20,7 +20,7 @@
 	</dl>
 	<dl>
 		<dt>{{$channels.0}}</dt>
-		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
+		<dd>{{foreach from=$channels.1 item=ch name=chan}}<span title="{{$ch.label}}">{{$ch.val}} {{$ch.label}}</span>{{if !$smarty.foreach.chan.last}} / {{/if}}{{/foreach}}</dd>
 	</dl>
 	<dl>
 		<dt>{{$plugins.0}}</dt>

From 676481de58d078c93789f696ac003936461575d7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 26 Jun 2017 23:06:15 -0700
Subject: [PATCH 282/299] support linked media (audio/video) elements in feeds
 as well as images

---
 include/feedutils.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 7314f69a6..2a0dba982 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -603,10 +603,17 @@ function get_atom_elements($feed, $item, &$author) {
 			if(! $type)
 				$type = 'application/octet-stream';
 
-			if(($ostatus_protocol) && (strpos($type,'image') === 0) && (strpos($res['body'], ']' . $link . '[/img]') === false) && (strpos($link,'http') === 0)) {
-				$res['body'] .= "\n\n" . '[img]' . $link . '[/img]';
+			if($ostatus_protocol)  {
+				if((strpos($type,'image') === 0) && (strpos($res['body'], ']' . $link . '[/img]') === false) && (strpos($link,'http') === 0)) {
+					$res['body'] .= "\n\n" . '[img]' . $link . '[/img]';
+				}
+				if((strpos($type,'video') === 0) && (strpos($res['body'], ']' . $link . '[/video]') === false) && (strpos($link,'http') === 0)) {
+					$res['body'] .= "\n\n" . '[video]' . $link . '[/video]';
+				}
+				if((strpos($type,'audio') === 0) && (strpos($res['body'], ']' . $link . '[/audio]') === false) && (strpos($link,'http') === 0)) {
+					$res['body'] .= "\n\n" . '[audio]' . $link . '[/audio]';
+				}
 			}
-
 			$res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title );
 		}
 	}
@@ -798,9 +805,15 @@ function feed_get_reshare(&$res,$item) {
 				if(! $type)
 					$type = 'application/octet-stream';
 
-				if((strpos($type,'image') === 0) && (strpos($body,$link) === false) && (strpos($link,'http') === 0)) {
+				if((strpos($type,'image') === 0) && (strpos($body, ']' . $link . '[/img]') === false) && (strpos($link,'http') === 0)) {
 					$body .= "\n\n" . '[img]' . $link . '[/img]';
 				}
+				if((strpos($type,'video') === 0) && (strpos($body, ']' . $link . '[/video]') === false) && (strpos($link,'http') === 0)) {
+					$body .= "\n\n" . '[video]' . $link . '[/video]';
+				}
+				if((strpos($type,'audio') === 0) && (strpos($body, ']' . $link . '[/audio]') === false) && (strpos($link,'http') === 0)) {
+					$body .= "\n\n" . '[audio]' . $link . '[/audio]';
+				}
 			}
 		}
 	

From 1273ac67f40c4c45807b178a9f679efc18bcc9c2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Jun 2017 19:20:13 -0700
Subject: [PATCH 283/299] (untested currently) fetch conversation for
 GNU-Social and Mastodon when provided a comment with no local copy of the
 parent.

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

diff --git a/include/feedutils.php b/include/feedutils.php
index 2a0dba982..8bd4673f5 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -971,6 +971,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 		foreach($items as $item) {
 
 			$is_reply = false;
+			$parent_link = '';
 
 			logger('processing ' . $item->get_id(), LOGGER_DEBUG);
 
@@ -979,6 +980,9 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 				$is_reply = true;
 				$parent_mid = normalise_id($rawthread[0]['attribs']['']['ref']);
 			}
+			if(isset($rawthread[0]['attribs']['']['href'])) {
+				$parent_link = $rawthread[0]['attribs']['']['href'];
+			}
 
 			if($is_reply) {
 
@@ -1050,7 +1054,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 						intval($importer['channel_id'])
 					);
 					if($c) {
-						$pmid = $x[0]['parent_mid'];
+						$pmid = $c[0]['parent_mid'];
 						$datarray['parent_mid'] = $pmid;
 					}
 				}
@@ -1065,6 +1069,20 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 						$datarray['parent_mid'] = $pmid;
 					}
 				}
+				if((! $pmid) && $parent_link !== '') {
+					$f = feed_conversation_fetch($importer,$contact,$parent_link);
+					if($f) {
+						$x = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
+							dbesc($parent_mid),
+							intval($importer['channel_id'])
+						);
+				
+						if($x) {
+							$pmid = $x[0]['parent_mid'];
+							$datarray['parent_mid'] = $pmid;
+						}
+					}
+				}
 
 				if(! $pmid) {
 
@@ -1195,6 +1213,34 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 	}
 }
 
+
+function feed_conversation_fetch($importer,$contact,$parent_link) {
+
+	$link = '';
+
+	// GNU-Social flavoured feeds
+	if(strpos($parent_link,'/notice/')) {
+		$link = str_replace('/notice/','/api/statuses/show',$link) . '.atom';
+	} 
+
+	// Mastodon flavoured feeds
+	if(strpos($parent_link,'/users/') && strpos($parent_link,'/updates/')) {
+		$link = $parent_link . '.xml';
+	} 
+
+	if(! $link)
+		return false;
+
+	$fetch = z_fetch_url($link);
+
+	if(! $fetch['success'])
+		return false;
+
+	consume_feed($fetch['body'],$importer,$contact,1);
+	consume_feed($fetch['body'],$importer,$contact,2);
+	
+}
+
 /**
  * @brief Normalise an id.
  *

From 2b2ea40bce41ad8d5688f42e71837a2caca8e9a8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Jun 2017 19:57:03 -0700
Subject: [PATCH 284/299] log conversation fetches (also a missed / char in the
 string replace)

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

diff --git a/include/feedutils.php b/include/feedutils.php
index 8bd4673f5..19b4e27ae 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1216,11 +1216,13 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 
 function feed_conversation_fetch($importer,$contact,$parent_link) {
 
+	logger('parent_link: ' . $parent_link, LOGGER_DEBUG, LOG_INFO);
+
 	$link = '';
 
 	// GNU-Social flavoured feeds
 	if(strpos($parent_link,'/notice/')) {
-		$link = str_replace('/notice/','/api/statuses/show',$link) . '.atom';
+		$link = str_replace('/notice/','/api/statuses/show/',$link) . '.atom';
 	} 
 
 	// Mastodon flavoured feeds

From dab00a98e0b450183ef5f6ad9d6f4708e2246695 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Jun 2017 20:07:48 -0700
Subject: [PATCH 285/299] translate 'favorite' verb to 'like' if it's an
 ostatus feed

---
 include/feedutils.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 19b4e27ae..de0cedcc0 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -305,12 +305,6 @@ function get_atom_elements($feed, $item, &$author) {
 		$res['verb'] = unxmlify($rawverb[0]['data']);
 	}
 
-	// translate OStatus unfollow to activity streams if it happened to get selected
-
-	if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow')) {
-		$res['verb'] = ACTIVITY_UNFOLLOW;
-	}
-
 
 	// look for a photo. We should check media size and find the best one,
 	// but for now let's just find any author photo
@@ -406,6 +400,21 @@ function get_atom_elements($feed, $item, &$author) {
 		$res['app'] = strip_tags(unxmlify($apps[0]['attribs']['']['source']));
 	}
 
+	if($ostatus_protocol) {
+
+		// translate OStatus unfollow to activity streams if it happened to get selected
+
+		if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow')) {
+			$res['verb'] = ACTIVITY_UNFOLLOW;
+		}
+
+		// And OStatus 'favorite' is pretty much what we call 'like' on other networks
+
+		if((x($res,'verb')) && ($res['verb'] === ACTIVITY_FAVORITE)) {
+			$res['verb'] = ACTIVITY_LIKE;
+		}
+	}
+
 	/*
 	 * If there's a copy of the body content which is guaranteed to have survived mangling in transit, use it.
 	 */

From 4c50bfebc293554d9c9a4a8c34b929b03c132d68 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Jun 2017 21:55:34 -0700
Subject: [PATCH 286/299] provide a gender icon on the profile sidebar within
 reason

---
 include/channel.php        | 25 +++++++++++++++++++++++++
 view/tpl/profile_vcard.tpl |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/include/channel.php b/include/channel.php
index 25e54003a..a6b510600 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1162,6 +1162,10 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 		$location = $reddress = $pdesc = $gender = $marital = $homepage = False;
 	}
 
+	if($profile['gender']) {
+		$profile['gender_icon'] = gender_icon($profile['gender']);
+	}
+
 	$firstname = ((strpos($profile['channel_name'],' '))
 		? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']);
 	$lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname))));
@@ -1214,6 +1218,27 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 
 }
 
+function gender_icon($gender) {
+
+	logger('gender: ' . $gender);
+
+	// This can easily get throw off if the observer language is different 
+	// than the channel owner language.
+
+	if(strpos(strtolower($gender),strtolower(t('Female'))) !== false)
+		return 'venus';
+	if(strpos(strtolower($gender),strtolower(t('Male'))) !== false)
+		return 'mars';
+	if(strpos(strtolower($gender),strtolower(t('Trans'))) !== false)
+		return 'transgender';
+	if(strpos(strtolower($gender),strtolower(t('Neuter'))) !== false)
+		return 'neuter';
+	if(strpos(strtolower($gender),strtolower(t('Non-specific'))) !== false)
+		return 'genderless';
+
+	return '';
+}
+
 
 function advanced_profile(&$a) {
 	require_once('include/text.php');
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index c17a7878c..13c22a2c7 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -43,7 +43,7 @@
 		</dl>
 	{{/if}}
 
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{if $profile.gender_icon}}<i class="fa fa-{{$profile.gender_icon}}"></i>&nbsp;{{/if}}{{$profile.gender}}</dd></dl>{{/if}}
 
 	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
 

From 118fed29b5671035d347d8f3aac50d4af39fc5f3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Jun 2017 22:05:06 -0700
Subject: [PATCH 287/299] remove logging statement

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

diff --git a/include/channel.php b/include/channel.php
index a6b510600..49da57fd6 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1220,7 +1220,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 
 function gender_icon($gender) {
 
-	logger('gender: ' . $gender);
+//	logger('gender: ' . $gender);
 
 	// This can easily get throw off if the observer language is different 
 	// than the channel owner language.

From c2af3702828fcfa3817f84d5ff8424740b516b35 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 15:58:14 -0700
Subject: [PATCH 288/299] refetch testing

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

diff --git a/include/feedutils.php b/include/feedutils.php
index de0cedcc0..a7c2b7ca8 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1231,7 +1231,7 @@ function feed_conversation_fetch($importer,$contact,$parent_link) {
 
 	// GNU-Social flavoured feeds
 	if(strpos($parent_link,'/notice/')) {
-		$link = str_replace('/notice/','/api/statuses/show/',$link) . '.atom';
+		$link = str_replace('/notice/','/api/statuses/show/',$parent_link) . '.atom';
 	} 
 
 	// Mastodon flavoured feeds

From c5cff7d6377bc193a07fb9476490f71f59c7e19a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 16:02:44 -0700
Subject: [PATCH 289/299] more refetch testing

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

diff --git a/include/feedutils.php b/include/feedutils.php
index a7c2b7ca8..8c2a7a8d7 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1236,7 +1236,7 @@ function feed_conversation_fetch($importer,$contact,$parent_link) {
 
 	// Mastodon flavoured feeds
 	if(strpos($parent_link,'/users/') && strpos($parent_link,'/updates/')) {
-		$link = $parent_link . '.xml';
+		$link = $parent_link . '.atom';
 	} 
 
 	if(! $link)

From 34c4775916f824755b4545f8d6f0ec2b8a653a88 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 16:45:48 -0700
Subject: [PATCH 290/299] missing space in nav tpl

---
 Zotlabs/Module/Hcard.php | 2 ++
 Zotlabs/Module/Xrd.php   | 2 ++
 view/tpl/nav.tpl         | 2 +-
 view/tpl/xrd_person.tpl  | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Hcard.php b/Zotlabs/Module/Hcard.php
index 13097939e..912c84fd2 100644
--- a/Zotlabs/Module/Hcard.php
+++ b/Zotlabs/Module/Hcard.php
@@ -14,6 +14,8 @@ class Hcard extends \Zotlabs\Web\Controller {
 	        return;
 	    }
 	
+		logger('hcard_request: ' . $which, LOGGER_DEBUG);
+
 	    $profile = '';
 	    $channel = \App::get_channel();
 	
diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 17c0faa78..9630e9ab4 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -9,6 +9,7 @@ class Xrd extends \Zotlabs\Web\Controller {
 	function init() {
 	
 		$uri = urldecode(notags(trim($_GET['uri'])));
+		$subject = $uri;
 		logger('xrd: ' . $uri,LOGGER_DEBUG);
 	
 		$resource = $uri;
@@ -47,6 +48,7 @@ class Xrd extends \Zotlabs\Web\Controller {
 		$o = replace_macros(get_markup_template('xrd_person.tpl'), array(
 			'$nick'        => $r[0]['channel_address'],
 			'$accturi'     => $resource,
+			'$subject'     => $subject,
 			'$aliases'     => $aliases,
 			'$profile_url' => z_root() . '/channel/'       . $r[0]['channel_address'],
 			'$hcard_url'   => z_root() . '/hcard/'         . $r[0]['channel_address'],
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 4719e1b17..e1ee07935 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -83,7 +83,7 @@
 			</a>
 			<div id="nav-network-menu" class="dropdown-menu" rel="network">
 				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
-				<a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
+				<a class="dropdown-item" id="nav-network-mark-all" href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
 				{{$emptynotifications}}
 			</div>
 		</li>
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 225892d70..52adb54e3 100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
  
-    <Subject>{{$accturi}}</Subject>
+    <Subject>{{$subject}}</Subject>
 	{{if $aliases}}{{foreach $aliases as $a}}
 	<Alias>{{$a}}</Alias>   
 	{{/foreach}}{{/if}}

From 798a03c2ab3d848fb7ba09027e968a99b67e7d95 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 17:03:17 -0700
Subject: [PATCH 291/299] diaspora hcard wasn't being rendered

---
 view/tpl/profile_vcard.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 13c22a2c7..f51f0719c 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -49,9 +49,9 @@
 
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
 
-
+<div class="hcard-addon"></div>
 </div>
-<div id="clear"></div>
+<div class="clear"></div>
 
 {{$rating}}
 

From 8ca5a65dcfd9dc5875f76cbec7b6a8601abc7128 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 18:28:02 -0700
Subject: [PATCH 292/299] minor weirdness in zot finger results after deleting
 a clone from a channel that was on a site which was previously migrated from
 http to https and still had the old hubloc

---
 include/zot.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/zot.php b/include/zot.php
index 4c180ee59..a8aecc6fa 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3929,6 +3929,7 @@ function zotinfo($arr) {
 	$ret['photo_updated']  = $e['xchan_photo_date'];
 	$ret['url']            = $e['xchan_url'];
 	$ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']);
+	$ret['follow_url']     = $e['xchan_follow'];
 	$ret['target']         = $ztarget;
 	$ret['target_sig']     = $zsig;
 	$ret['searchable']     = $searchable;
@@ -3936,19 +3937,22 @@ function zotinfo($arr) {
 	$ret['public_forum']   = $public_forum;
 	if($deleted)
 		$ret['deleted']        = $deleted;
+
 	if(intval($e['channel_removed']))
 		$ret['deleted_locally'] = true;
 
+
+
 	// premium or other channel desiring some contact with potential followers before connecting.
 	// This is a template - %s will be replaced with the follow_url we discover for the return channel.
 
-	if($special_channel)
-		$ret['connect_url'] = z_root() . '/connect/' . $e['channel_address'];
-
+	if($special_channel) {
+		$ret['connect_url'] = (($e['xchan_connpage']) ? $e['xchan_connpage'] : z_root() . '/connect/' . $e['channel_address']);
+	}
 	// This is a template for our follow url, %s will be replaced with a webbie
 
-	$ret['follow_url'] = z_root() . '/follow?f=&url=%s';
-
+	if(! $ret['follow_url'])
+		$ret['follow_url'] = z_root() . '/follow?f=&url=%s';
 
 	$permissions = get_all_perms($e['channel_id'],$ztarget_hash,false);
 

From b91d95d2418237f4344fa0906dd47815e20de2e9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 19:20:11 -0700
Subject: [PATCH 293/299] add logging

---
 include/feedutils.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/feedutils.php b/include/feedutils.php
index 8c2a7a8d7..937a2d28c 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1242,11 +1242,14 @@ function feed_conversation_fetch($importer,$contact,$parent_link) {
 	if(! $link)
 		return false;
 
+	logger('fetching: ' . $link, LOGGER_DEBUG, LOG_INFO);
+
 	$fetch = z_fetch_url($link);
 
 	if(! $fetch['success'])
 		return false;
 
+
 	consume_feed($fetch['body'],$importer,$contact,1);
 	consume_feed($fetch['body'],$importer,$contact,2);
 	

From 126af3a24a0dffc705235ed083a9192f97749829 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 19:34:49 -0700
Subject: [PATCH 294/299] pretend it's a real feed even though it isn't

---
 include/feedutils.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 937a2d28c..184f8ed09 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1249,9 +1249,19 @@ function feed_conversation_fetch($importer,$contact,$parent_link) {
 	if(! $fetch['success'])
 		return false;
 
+	$data = $fetch['body'];
 
-	consume_feed($fetch['body'],$importer,$contact,1);
-	consume_feed($fetch['body'],$importer,$contact,2);
+	// We will probably receive an atom 'entry' and not an atom 'feed'. Unfortunately
+	// our parser is a bit strict about compliance so we'll insert just enough of a feed 
+	// tag to trick it into believing it's a compliant feed. 
+
+	if(! strstr($data,'<feed')) {
+		$data = str_replace('<entry ','<feed xmlns="http://www.w3.org/2005/Atom"><entry ',$data); 
+		$data .= '</feed>';
+	} 
+ 
+	consume_feed($data,$importer,$contact,1);
+	consume_feed($data,$importer,$contact,2);
 	
 }
 

From 024809f970fc51af5e16931d4fc5b7db2303a285 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 20:07:53 -0700
Subject: [PATCH 295/299] conversation fetching is partially working - but it
 isn't always glueing the conversation pieces together.

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

diff --git a/include/feedutils.php b/include/feedutils.php
index 184f8ed09..a262b9562 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1081,14 +1081,27 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 				if((! $pmid) && $parent_link !== '') {
 					$f = feed_conversation_fetch($importer,$contact,$parent_link);
 					if($f) {
-						$x = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
-							dbesc($parent_mid),
-							intval($importer['channel_id'])
-						);
+						// check both potential conversation parents again
+						if($conv_id) {
+							$c = q("select parent_mid from item left join iconfig on item.id = iconfig.iid where iconfig.cat = 'ostatus' and iconfig.k = 'conversation' and iconfig.v = '%s' and item.uid = %d order by item.id limit 1",
+								dbesc($conv_id),
+								intval($importer['channel_id'])
+							);
+							if($c) {
+								$pmid = $c[0]['parent_mid'];
+								$datarray['parent_mid'] = $pmid;
+							}
+						}
+						if(! $pmid) {
+							$x = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
+								dbesc($parent_mid),
+								intval($importer['channel_id'])
+							);
 				
-						if($x) {
-							$pmid = $x[0]['parent_mid'];
-							$datarray['parent_mid'] = $pmid;
+							if($x) {
+								$pmid = $x[0]['parent_mid'];
+								$datarray['parent_mid'] = $pmid;
+							}
 						}
 					}
 				}

From c7b4a53af2d2d73b8c0bb59cf851813163f65987 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Jun 2017 20:11:03 -0700
Subject: [PATCH 296/299] log the conversation so we can debug this easier

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

diff --git a/include/feedutils.php b/include/feedutils.php
index a262b9562..835d739df 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -387,6 +387,7 @@ function get_atom_elements($feed, $item, &$author) {
 	if($rawcnv) {
 		$ostatus_conversation = normalise_id(unxmlify($rawcnv[0]['attribs']['']['ref']));
 		set_iconfig($res,'ostatus','conversation',$ostatus_conversation,true);
+		logger('ostatus_conversation: ' . $ostatus_conversation, LOGGER_DATA, LOG_INFO);
 	}
 
 	$ostatus_protocol = (($ostatus_conversation) ? true : false);

From da1b10b741ec7525b9d76b2bdfaa3b794a39dde3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 29 Jun 2017 21:09:08 -0700
Subject: [PATCH 297/299] forgot to return true from the conversation_fetch
 routine - which triggers the rescan for potential parent posts

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

diff --git a/include/feedutils.php b/include/feedutils.php
index 835d739df..2755a7e3f 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1276,6 +1276,8 @@ function feed_conversation_fetch($importer,$contact,$parent_link) {
  
 	consume_feed($data,$importer,$contact,1);
 	consume_feed($data,$importer,$contact,2);
+
+	return true;
 	
 }
 

From b73c844d1aec260c323715b55f2b290ce339615b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 29 Jun 2017 22:38:43 -0700
Subject: [PATCH 298/299] use "Full Name (username)" for ostatus commenter
 xchans

---
 include/feedutils.php | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/include/feedutils.php b/include/feedutils.php
index 2755a7e3f..27f189119 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -246,9 +246,17 @@ function get_atom_elements($feed, $item, &$author) {
 
 	$found_author = $item->get_author();
 	if($found_author) {
+		if($rawauthor) {
+			if($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data'])
+				$author['full_name'] = unxmlify($rawauthor[0]['child'][NAMESPACE_POCO]['displayName'][0]['data']);
+		}
 		$author['author_name'] = unxmlify($found_author->get_name());
 		$author['author_link'] = unxmlify($found_author->get_link());
 		$author['author_is_feed'] = false;
+
+		$rawauthor = $feed->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
+		logger('rawauthor: ' . print_r($rawauthor, true));
+
 	}
 	else {
 		$author['author_name'] = unxmlify($feed->get_title());
@@ -1022,7 +1030,16 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 				$datarray['author_xchan'] = '';
 
 				if($author['author_link'] != $contact['xchan_url']) {
-					$x = import_author_unknown(array('name' => $author['author_name'],'url' => $author['author_link'],'photo' => array('src' => $author['author_photo'])));
+					$name = '';
+					if($author['full_name']) {
+						$name = $author['full_name'];
+						if($author['author_name'])
+							$name .= ' (' . $author['author_name'] . ')';
+					}
+					else {
+						$name = $author['author_name'];
+					}
+					$x = import_author_unknown(array('name' => $name,'url' => $author['author_link'],'photo' => array('src' => $author['author_photo'])));
 					if($x)
 						$datarray['author_xchan'] = $x;
 				}
@@ -1170,7 +1187,16 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 				}
 
 				if($author['author_link'] != $contact['xchan_url']) {
-					$x = import_author_unknown(array('name' => $author['author_name'],'url' => $author['author_link'],'photo' => array('src' => $author['author_photo'])));
+					$name = '';
+					if($author['full_name']) {
+						$name = $author['full_name'];
+						if($author['author_name'])
+							$name .= ' (' . $author['author_name'] . ')';
+					}
+					else {
+						$name = $author['author_name'];
+					}
+					$x = import_author_unknown(array('name' => $name,'url' => $author['author_link'],'photo' => array('src' => $author['author_photo'])));
 					if($x)
 						$datarray['author_xchan'] = $x;
 				}

From 64cad0a041e44940f75bf351fc3755b3202f9029 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 30 Jun 2017 00:50:57 -0700
Subject: [PATCH 299/299] duplicated posts after conversation fetch

---
 include/feedutils.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/feedutils.php b/include/feedutils.php
index 27f189119..b64a98a7f 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1122,6 +1122,17 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
 							}
 						}
 					}
+
+					// the conversation parent might just be the post we are trying to import.
+					// check existence again in case it was just delivered.
+
+					$r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+						dbesc($datarray['mid']),
+						intval($importer['channel_id'])
+					);
+					if($r) {
+						continue;
+					}
 				}
 
 				if(! $pmid) {