From 755b75161494ea9810ab0e38242cb1a318793ed3 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 16:55:47 -0700
Subject: 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 c88c03f7e..54390ede4 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) {
-- 
cgit v1.2.3


From 242ef70a775a86050152c0aea9096ec1cd6d0312 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 17:05:16 -0700
Subject: 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'))
-- 
cgit v1.2.3


From 477ed97c2fbfff903f9ebf0ffa7fba078eeac10f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 18:31:34 -0700
Subject: 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 54390ede4..3559f8a82 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -10,141 +10,8 @@ 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) {
-- 
cgit v1.2.3


From 17977effe775ef05a48a84da40da4b1f049b00d9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 18:48:27 -0700
Subject: 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 3559f8a82..20b4a312c 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);
 	}
-- 
cgit v1.2.3


From 74f58818d628a30297f48720b73c094b215f593b Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 19:13:16 -0700
Subject: filename issue

---
 Zotlabs/Widget/Profile     | 13 -------------
 Zotlabs/Widget/Profile.php | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 Zotlabs/Widget/Profile
 create mode 100644 Zotlabs/Widget/Profile.php

diff --git a/Zotlabs/Widget/Profile b/Zotlabs/Widget/Profile
deleted file mode 100644
index bffd910b6..000000000
--- a/Zotlabs/Widget/Profile
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/Profile.php b/Zotlabs/Widget/Profile.php
new file mode 100644
index 000000000..bffd910b6
--- /dev/null
+++ b/Zotlabs/Widget/Profile.php
@@ -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
-- 
cgit v1.2.3


From 47f4007951ce3311ee267a863a2cc46085c4892a Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 19:30:57 -0700
Subject: 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 20b4a312c..3ede4df70 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) {
 
-- 
cgit v1.2.3


From f60309efa12be3b8d4f5b2c565ebdf7f051a987d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 20:11:28 -0700
Subject: 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 3ede4df70..86657fba6 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) {
-- 
cgit v1.2.3


From 6e101e458268c0f9b7bf461cea3c31c37b5e3791 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 20:56:12 -0700
Subject: 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 86657fba6..af23134c9 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -18,347 +18,16 @@ 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) {
 
@@ -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());
-- 
cgit v1.2.3


From 0908da95298bdd7dd96dcb45ac490f8e7aa73a8e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 21:26:28 -0700
Subject: 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                  | 207 -----------------------------------
 10 files changed, 274 insertions(+), 207 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 af23134c9..8ccaad23b 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,27 +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 class="form-control" id="tasklist-new-summary" type="text" name="summary" value="" /></form>';
-	$o .= '</div>';
-	return $o;
-
-}
 
 
 function widget_helpindex($arr) {
@@ -814,68 +669,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) {
-- 
cgit v1.2.3


From cd57483ed9069a26b52ae8d7d74fdc537da89946 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 11:59:20 +0200
Subject: namespace error

---
 Zotlabs/Widget/Conversations.php | 4 ++--
 view/css/bootstrap-red.css       | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php
index fa59ce20c..31fcb6c58 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);
@@ -71,4 +71,4 @@ class Conversations {
 		}
 		return $o;
 	}
-}
\ No newline at end of file
+}
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 69886b141..4c4de22f9 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -33,7 +33,6 @@ nav .badge {
 	padding: 0.2rem 0;
 }
 
-
 #navbar-collapse-1 i {
 	font-size: 1rem;
 }
-- 
cgit v1.2.3


From 0bad26e116499d9b656c28f64c81275df4bbecb6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 16 Mar 2017 17:11:48 -0700
Subject: 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 8ccaad23b..8497d1848 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -2,768 +2,7 @@
 /**
  * @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 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_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_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;
-}
 
-- 
cgit v1.2.3


From 6c92a240cca673b4cdac25a2e64503a0d50c0124 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 16 Mar 2017 18:36:58 -0700
Subject: 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            | 8 --------
 7 files changed, 2 insertions(+), 27 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 b838f8393..7cf78cb8b 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 8497d1848..000000000
--- a/include/widgets.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * @file include/widgets.php
- *
- * @brief This file may contain some widgets.
- */
-
-
-- 
cgit v1.2.3


From ecfbb10326f6523cc521fa2290549181e706dbb2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 25 Mar 2017 14:42:40 -0700
Subject: 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);
 			}
 		}
 
-- 
cgit v1.2.3


From d7a9d22a158126889a07ba2158603aef7932be77 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 12:09:45 +0200
Subject: namespace error

---
 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 31fcb6c58..27e517c02 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);
-- 
cgit v1.2.3


From 107083e3e49ddb91de7df5133fc6771721e31e10 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 12:43:27 +0200
Subject: fix widgets for bs4 again

---
 Zotlabs/Widget/Activity.php | 4 ++--
 Zotlabs/Widget/Forums.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Zotlabs/Widget/Activity.php b/Zotlabs/Widget/Activity.php
index 72a27bdf1..7264a3360 100644
--- a/Zotlabs/Widget/Activity.php
+++ b/Zotlabs/Widget/Activity.php
@@ -47,10 +47,10 @@ class Activity {
 
 		if($arr) {
 			$o .= '<div class="widget">';
-			$o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav nav-pills nav-stacked">';
+			$o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav nav-pills flex-column">';
 
 			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 .= '<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>';
 		}
diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php
index 5f04a9fcc..67e498b24 100644
--- a/Zotlabs/Widget/Forums.php
+++ b/Zotlabs/Widget/Forums.php
@@ -82,12 +82,12 @@ class Forums {
 
 		if($r1) {
 			$o .= '<div class="widget">';
-			$o .= '<h3>' . t('Forums') . '</h3><ul class="nav nav-pills nav-stacked">';
+			$o .= '<h3>' . t('Forums') . '</h3><ul class="nav nav-pills flex-column">';
 
 			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 .= '<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>';
 		}
-- 
cgit v1.2.3


From 0f7832dc30fb4d8aedd24b6ad8a9e48876a77dd0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 16:19:47 -0700
Subject: 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    | 13 ++-----------
 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(+), 78 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 6f54d3bb1..43cf535a4 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -478,17 +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 && (get_account_id() == $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 edd483e82..6c6078173 100755
--- a/boot.php
+++ b/boot.php
@@ -549,7 +549,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 7cf78cb8b..f88a2f8aa 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2247,3 +2247,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 ac634639e..d0e15c89d 100644
--- a/include/import.php
+++ b/include/import.php
@@ -528,16 +528,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
 
@@ -1352,28 +1344,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 911334a15..14ca19cef 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')
@@ -1812,23 +1808,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" ' : '');
-- 
cgit v1.2.3


From 3ee4dd0d52f4df47c894b7899b296e45aaf1489f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 13 Mar 2017 18:40:07 -0700
Subject: 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}}
-- 
cgit v1.2.3


From 8d72cea2d1008dd73ff5f4c7442a4cc0c718eb5c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 00:22:57 -0700
Subject: 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 6c6078173..131699153 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
  */
@@ -191,15 +186,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
  */
@@ -526,14 +512,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
  */
@@ -558,16 +536,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
@@ -726,6 +704,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());
 
@@ -1822,18 +1801,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.
@@ -1855,18 +1822,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.
@@ -2356,7 +2311,7 @@ function construct_page(&$a) {
 }
 
 /**
- * @brief Returns Hubzilla's root directory.
+ * @brief Returns appplication root directory.
  *
  * @return string
  */
@@ -2372,7 +2327,7 @@ function appdirpath() {
 function head_set_icon($icon) {
 
 	App::$data['pageicon'] = $icon;
-//	logger('head_set_icon: ' . $icon);
+
 }
 
 /**
@@ -2448,10 +2403,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();
 		}
@@ -2462,9 +2417,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");
@@ -2474,7 +2429,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"
-- 
cgit v1.2.3


From 6ea32a8ba31a9c459cda1b6c9694621958a7bd38 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 00:23:44 -0700
Subject: 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);
+	}
+}
-- 
cgit v1.2.3


From 155b57c2de6e07147733f67605560c5ec00dc5e5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 16:14:05 -0700
Subject: 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 36445a46b..64e8f375e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3773,7 +3773,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' ) ";
@@ -3785,15 +3785,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();
 
@@ -3802,7 +3794,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)
 		);
 	}
@@ -3810,19 +3802,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();
 
-- 
cgit v1.2.3


From fa629841bd2fd150531a5494504a24b13a0c4503 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 17:07:29 -0700
Subject: 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              | 87 ++++++++++++++++++------------------------
 include/text.php               | 18 +++++----
 6 files changed, 57 insertions(+), 103 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 948c67c09..ef0cb11f1 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -244,6 +244,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 64e8f375e..382be2497 100755
--- a/include/items.php
+++ b/include/items.php
@@ -336,18 +336,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']);
@@ -1533,35 +1521,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'])) {
@@ -1957,33 +1946,31 @@ 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;
-            }
-        }
+	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');
+	$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((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'])) {
diff --git a/include/text.php b/include/text.php
index 14ca19cef..c02499625 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);
 
@@ -1653,6 +1656,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;
 
-- 
cgit v1.2.3


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

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

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d5edc6902..156df07ff 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -802,7 +802,7 @@ div.jGrowl div.jGrowl-notification {
 .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 087ce6d3c..452e0eeec 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -34,9 +34,9 @@
 						<td class='channel_address'>{{$c.channel_address}}</td>
 						<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-outline-secondary btn-sm" 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-outline-secondary btn-sm" 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-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
+							<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/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>
 				{{/foreach}}
-- 
cgit v1.2.3


From ec5e1067bc0a949ceea7e28dbf11873e693b2586 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 21:40:11 -0700
Subject: 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));
-- 
cgit v1.2.3


From fa5115b3ed017f6aa22c99cad563de3934b171c2 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 14 Mar 2017 22:02:28 -0700
Subject: 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 c0f7dc8c4..22b3e0c88 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -67,8 +67,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
@@ -153,7 +153,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);
 
@@ -180,7 +180,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'];
@@ -205,7 +206,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);
-- 
cgit v1.2.3


From d7aaca69475fed4c161b46821946227b4b826deb Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 01:20:21 -0700
Subject: 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;
-- 
cgit v1.2.3


From 4387fb715b59be1ead2db8b12fa008160cd14ce7 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 15 Mar 2017 15:53:03 -0700
Subject: 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  | 68 ++++++++++++++++++++++++++++++++++++------------------
 include/photos.php |  9 ++++++++
 2 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/include/items.php b/include/items.php
index 382be2497..6e9c1c3d9 100755
--- a/include/items.php
+++ b/include/items.php
@@ -530,11 +530,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();
@@ -647,7 +642,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'])
 		);
@@ -657,6 +662,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
@@ -1525,14 +1538,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;
+				}
 			}
 		}
 	}
@@ -1946,17 +1965,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(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(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;
+				}
+			}
 		}
 	}
 
diff --git a/include/photos.php b/include/photos.php
index 22b3e0c88..dff45a0bc 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -337,12 +337,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;
@@ -350,6 +353,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;
 
 			}
-- 
cgit v1.2.3


From fd6b32758edb67c7e711eddd4c468a6ef459c478 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 16 Mar 2017 01:16:29 -0700
Subject: namespace error

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

diff --git a/include/items.php b/include/items.php
index 6e9c1c3d9..8ae7ca818 100755
--- a/include/items.php
+++ b/include/items.php
@@ -530,7 +530,7 @@ function get_item_elements($x,$allow_code = false) {
 
 	$arr = array();
 
-	$key = get_config('system','pubkey');
+	$arr['body'] = $x['body'];
 
 	$maxlen = get_max_import_size();
 
-- 
cgit v1.2.3


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

---
 include/items.php  | 61 ++++++++++++++++++++++++++----------------------------
 include/photos.php | 15 --------------
 2 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/include/items.php b/include/items.php
index 8ae7ca818..304a7acfc 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1457,6 +1457,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
  *
@@ -1537,24 +1557,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));
-
-		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);
 
 	if(! array_key_exists('sig',$arr))
 		$arr['sig'] = '';
@@ -1967,22 +1975,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));
-
-		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;
-				}
-			}
-		}
-	}
+	// apply the input filter here
+
+	$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 dff45a0bc..62c7f1c12 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -344,21 +344,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;
 
 			}
-- 
cgit v1.2.3


From d5525a38f185e37fe0101bc7ef6e67abf59f98f8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 18 Mar 2017 16:41:43 -0700
Subject: 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/Wiki.php        |   22 +-
 Zotlabs/Widget/Wiki_pages.php  |    7 +
 include/event.php              |    6 +-
 util/hmessages.po              | 6689 +++++++++++++++++++---------------------
 view/tpl/wiki.tpl              |    3 +-
 12 files changed, 3239 insertions(+), 3558 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/Wiki.php b/Zotlabs/Module/Wiki.php
index ef0cb11f1..4234ba3fd 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -238,6 +238,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') {
@@ -245,7 +247,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;
@@ -329,8 +331,12 @@ class Wiki extends \Zotlabs\Web\Controller {
 				$html = Zlib\NativeWikiPage::convert_links(zidify_links(smilies(bbcode($content))),$wikiURL);
 			}
 			else {
-				$content = Zlib\NativeWikiPage::bbcode($content);
-				$html = Zlib\NativeWikiPage::generate_toc(zidify_text(purify_html(MarkdownExtra::defaultTransform($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 +461,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 +523,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 +531,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 a9634d7a5..c57e52bc0 100644
--- a/include/event.php
+++ b/include/event.php
@@ -610,7 +610,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));
@@ -751,7 +751,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));
 
@@ -854,7 +854,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,2901 +795,2930 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 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:743
-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: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"
+#: ../../Zotlabs/Module/Item.php:184
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:288
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
+#: ../../Zotlabs/Module/Item.php:450
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:289
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../Zotlabs/Module/Item.php:824
+msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:290
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../Zotlabs/Module/Item.php:954
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Database Server Name"
+#: ../../Zotlabs/Module/Item.php:1084
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:294
-msgid "Default is 127.0.0.1"
+#: ../../Zotlabs/Module/Item.php:1091
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Database Port"
+#: ../../Zotlabs/Module/Item.php:1098
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:295
-msgid "Communication port number - use 0 for default"
+#: ../../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/Setup.php:296
-msgid "Database Login Name"
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:297
-msgid "Database Login Password"
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:105
+msgid "Profile-"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:298
-msgid "Database Name"
+#: ../../Zotlabs/Module/Profiles.php:90 ../../Zotlabs/Module/Profiles.php:127
+msgid "New profile created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:299
-msgid "Database Type"
+#: ../../Zotlabs/Module/Profiles.php:111
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
-msgid "Site administrator email address"
+#: ../../Zotlabs/Module/Profiles.php:146
+msgid "Profile unavailable to export."
 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."
+#: ../../Zotlabs/Module/Profiles.php:252
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
-msgid "Website URL"
+#: ../../Zotlabs/Module/Profiles.php:459
+msgid "Marital Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
-msgid "Please use SSL (https) URL if available."
+#: ../../Zotlabs/Module/Profiles.php:463
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346
-msgid "Please select a default timezone for your website"
+#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:775
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:331
-msgid "Site settings"
+#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:776
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:385
-msgid "PHP version 5.5 or greater is required."
+#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:783
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:386
-msgid "PHP version"
+#: ../../Zotlabs/Module/Profiles.php:478
+msgid "Religion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:402
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../Zotlabs/Module/Profiles.php:482
+msgid "Political Views"
 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."
+#: ../../Zotlabs/Module/Profiles.php:486
+#: ../../extend/addon/addon/openid/MysqlProvider.php:74
+msgid "Gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:407
-msgid "PHP executable path"
+#: ../../Zotlabs/Module/Profiles.php:490
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:407
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: ../../Zotlabs/Module/Profiles.php:494
+msgid "Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:412
-msgid "Command line PHP"
+#: ../../Zotlabs/Module/Profiles.php:498
+msgid "Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:422
-msgid ""
-"Unable to check command line PHP, as shell_exec() is disabled. This is "
-"required."
+#: ../../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/Setup.php:425
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../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/Setup.php:426
-msgid "This is required for message delivery to work."
+#: ../../Zotlabs/Module/Profiles.php:594
+msgid "Profile updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:429
-msgid "PHP register_argc_argv"
+#: ../../Zotlabs/Module/Profiles.php:678
+msgid "Hide your connections list from viewers of this profile"
 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."
+#: ../../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/Setup.php:452
-msgid "You can adjust these settings in the server php.ini file."
+#: ../../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/Setup.php:454
-msgid "PHP upload limits"
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:477
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "View this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:478
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
+#: ../../include/channel.php:1066
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:481
-msgid "Generate encryption keys"
+#: ../../Zotlabs/Module/Profiles.php:729
+msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:498
-msgid "libCurl PHP module"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:499
-msgid "GD graphics PHP module"
+#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:500
-msgid "OpenSSL PHP module"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:501
-msgid "PDO database PHP module"
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:502
-msgid "mb_string PHP module"
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:503
-msgid "xml PHP module"
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
-msgid "Apache mod_rewrite module"
+#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1715
+msgid "Personal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:507
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
-msgid "exec"
+#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:513
-msgid ""
-"Error: exec is required but is either not installed or has been disabled in "
-"php.ini"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Import profile from file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
-msgid "shell_exec"
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Export profile to file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:519
-msgid ""
-"Error: shell_exec is required but is either not installed or has been "
-"disabled in php.ini"
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Your gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:527
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:531
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: openssl PHP module required but not installed."
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:539
-msgid "Error: PDO database PHP module required but not installed."
+#: ../../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/Setup.php:543
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../Zotlabs/Module/Profiles.php:750
+msgid "This is your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:547
-msgid "Error: xml PHP module required for DAV but not installed."
+#: ../../Zotlabs/Module/Profiles.php:752
+msgid "Your full name"
 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."
+#: ../../Zotlabs/Module/Profiles.php:753
+msgid "Title/Description"
 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."
+#: ../../Zotlabs/Module/Profiles.php:756
+msgid "Street address"
 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."
+#: ../../Zotlabs/Module/Profiles.php:757
+msgid "Locality/City"
 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."
+#: ../../Zotlabs/Module/Profiles.php:758
+msgid "Region/State"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:571
-msgid ".htconfig.php is writable"
+#: ../../Zotlabs/Module/Profiles.php:759
+msgid "Postal/Zip code"
 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."
+#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:935
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
+msgid "Country"
 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."
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Who (if applicable)"
 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."
+#: ../../Zotlabs/Module/Profiles.php:765
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 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."
+#: ../../Zotlabs/Module/Profiles.php:766
+msgid "Since (date)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:591
-#, php-format
-msgid "%s is writable"
+#: ../../Zotlabs/Module/Profiles.php:769
+msgid "Tell us about yourself"
 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"
+#: ../../Zotlabs/Module/Profiles.php:770
+#: ../../extend/addon/addon/openid/MysqlProvider.php:68
+msgid "Homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:611
-msgid "store is writable"
+#: ../../Zotlabs/Module/Profiles.php:771
+msgid "Hometown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:644
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
+#: ../../Zotlabs/Module/Profiles.php:772
+msgid "Political views"
 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!"
+#: ../../Zotlabs/Module/Profiles.php:773
+msgid "Religious views"
 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."
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Keywords used in directory listings"
 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."
+#: ../../Zotlabs/Module/Profiles.php:774
+msgid "Example: fishing photography software"
 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."
+#: ../../Zotlabs/Module/Profiles.php:777
+msgid "Musical interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:649
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
+#: ../../Zotlabs/Module/Profiles.php:778
+msgid "Books, literature"
 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."
+#: ../../Zotlabs/Module/Profiles.php:779
+msgid "Television"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:653
-msgid "SSL certificate validation"
+#: ../../Zotlabs/Module/Profiles.php:780
+msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:659
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
+#: ../../Zotlabs/Module/Profiles.php:781
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:662
-msgid "Url rewrite is working"
+#: ../../Zotlabs/Module/Profiles.php:782
+msgid "Love/Romance"
 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."
+#: ../../Zotlabs/Module/Profiles.php:784
+msgid "School/Education"
 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."
+#: ../../Zotlabs/Module/Profiles.php:785
+msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:741
-msgid "<h1>What next</h1>"
+#: ../../Zotlabs/Module/Profiles.php:786
+msgid "My other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:742
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../Zotlabs/Module/Profiles.php:788
+msgid "Communications"
 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/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:913
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
+msgid "Phone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
+#: ../../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:68 ../../Zotlabs/Module/Profiles.php:105
-msgid "Profile-"
+#: ../../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:90 ../../Zotlabs/Module/Profiles.php:127
-msgid "New profile created."
+#: ../../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:111
-msgid "Profile unavailable to clone."
+#: ../../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:146
-msgid "Profile unavailable to export."
+#: ../../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:252
-msgid "Profile Name is required."
+#: ../../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:459
-msgid "Marital Status"
+#: ../../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:463
-msgid "Romantic Partner"
+#: ../../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:467 ../../Zotlabs/Module/Profiles.php:775
-msgid "Likes"
+#: ../../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:471 ../../Zotlabs/Module/Profiles.php:776
-msgid "Dislikes"
+#: ../../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:475 ../../Zotlabs/Module/Profiles.php:783
-msgid "Work/Employment"
+#: ../../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:478
-msgid "Religion"
+#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
+msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:482
-msgid "Political Views"
+#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105
+#: ../../include/channel.php:1044
+msgid "Edit Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:486
-#: ../../extend/addon/addon/openid/MysqlProvider.php:74
-msgid "Gender"
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:490
-msgid "Sexual Preference"
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827
+msgid "About"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:494
-msgid "Homepage"
+#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
+msgid "Members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:498
-msgid "Interests"
+#: ../../Zotlabs/Module/Help.php:82
+msgid "Administrators"
 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"
+#: ../../Zotlabs/Module/Help.php:83
+msgid "Developers"
 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"
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Tutorials"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:594
-msgid "Profile updated."
+#: ../../Zotlabs/Module/Help.php:93
+msgid "$Projectname Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:678
-msgid "Hide your connections list from viewers of this profile"
+#: ../../Zotlabs/Module/Help.php:94
+msgid "Contents"
 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"
+#: ../../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/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"
+#: ../../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/Profiles.php:725
-msgid "Edit Profile Details"
+#: ../../Zotlabs/Module/Admin.php:94
+msgid "# Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "View this profile"
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "# blocked accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827
-#: ../../include/channel.php:1066
-msgid "Edit visibility"
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "# expired accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Profile Tools"
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "# expiring accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:730
-msgid "Change cover photo"
+#: ../../Zotlabs/Module/Admin.php:108
+msgid "# Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037
-msgid "Change profile photo"
+#: ../../Zotlabs/Module/Admin.php:109
+msgid "# primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Create a new profile using these settings"
+#: ../../Zotlabs/Module/Admin.php:110
+msgid "# clones"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Clone this profile"
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Message queues"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Delete this profile"
+#: ../../Zotlabs/Module/Admin.php:133
+msgid "Your software should be updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Add profile things"
+#: ../../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/Profiles.php:736 ../../include/conversation.php:1715
-msgid "Personal"
+#: ../../Zotlabs/Module/Admin.php:138
+msgid "Summary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Relation"
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Registered accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:55
-msgid "Miscellaneous"
+#: ../../Zotlabs/Module/Admin.php:142
+msgid "Pending registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Import profile from file"
+#: ../../Zotlabs/Module/Admin.php:143
+msgid "Registered channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Export profile to file"
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Active plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Your gender"
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:744
-msgid "Marital status"
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Repository version (master)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:745
-msgid "Sexual preference"
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Repository version (dev)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:748
-msgid "Profile name"
+#: ../../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/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"
+#: ../../Zotlabs/Module/Editblock.php:113 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:750
-msgid "This is your default profile."
+#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1406
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:752
-msgid "Your full name"
+#: ../../Zotlabs/Module/Editblock.php:138
+msgid "Edit Block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:753
-msgid "Title/Description"
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:756
-msgid "Street address"
+#: ../../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/Profiles.php:757
-msgid "Locality/City"
+#: ../../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/Profiles.php:758
-msgid "Region/State"
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:759
-msgid "Postal/Zip code"
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:938
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
-msgid "Country"
+#: ../../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/Profiles.php:765
-msgid "Who (if applicable)"
+#: ../../Zotlabs/Module/Ping.php:254
+msgid "sent you a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:765
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../Zotlabs/Module/Ping.php:302
+msgid "added your channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:766
-msgid "Since (date)"
+#: ../../Zotlabs/Module/Ping.php:312
+msgid "g A l F d"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:769
-msgid "Tell us about yourself"
+#: ../../Zotlabs/Module/Ping.php:330
+msgid "[today]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:770
-#: ../../extend/addon/addon/openid/MysqlProvider.php:68
-msgid "Homepage URL"
+#: ../../Zotlabs/Module/Ping.php:339
+msgid "posted an event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:771
-msgid "Hometown"
+#: ../../Zotlabs/Module/Connections.php:52
+#: ../../Zotlabs/Module/Connections.php:157
+#: ../../Zotlabs/Module/Connections.php:246
+msgid "Blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:772
-msgid "Political views"
+#: ../../Zotlabs/Module/Connections.php:57
+#: ../../Zotlabs/Module/Connections.php:164
+#: ../../Zotlabs/Module/Connections.php:245
+msgid "Ignored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:773
-msgid "Religious views"
+#: ../../Zotlabs/Module/Connections.php:62
+#: ../../Zotlabs/Module/Connections.php:178
+#: ../../Zotlabs/Module/Connections.php:244
+msgid "Hidden"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Keywords used in directory listings"
+#: ../../Zotlabs/Module/Connections.php:67
+#: ../../Zotlabs/Module/Connections.php:171
+#: ../../Zotlabs/Module/Connections.php:243
+msgid "Archived"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:774
-msgid "Example: fishing photography software"
+#: ../../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/Profiles.php:777
-msgid "Musical interests"
+#: ../../Zotlabs/Module/Connections.php:144
+msgid "Show all connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Books, literature"
+#: ../../Zotlabs/Module/Connections.php:160
+msgid "Only show blocked connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:779
-msgid "Television"
+#: ../../Zotlabs/Module/Connections.php:167
+msgid "Only show ignored connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:780
-msgid "Film/Dance/Culture/Entertainment"
+#: ../../Zotlabs/Module/Connections.php:174
+msgid "Only show archived connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:781
-msgid "Hobbies/Interests"
+#: ../../Zotlabs/Module/Connections.php:181
+msgid "Only show hidden connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:782
-msgid "Love/Romance"
+#: ../../Zotlabs/Module/Connections.php:242
+msgid "Pending approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:784
-msgid "School/Education"
+#: ../../Zotlabs/Module/Connections.php:258
+#, php-format
+msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:785
-msgid "Contact information and social networks"
+#: ../../Zotlabs/Module/Connections.php:259
+msgid "Edit connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:786
-msgid "My other channels"
+#: ../../Zotlabs/Module/Connections.php:260
+msgid "Delete connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:788
-msgid "Communications"
+#: ../../Zotlabs/Module/Connections.php:269
+msgid "Channel address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:916
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139
-msgid "Phone"
+#: ../../Zotlabs/Module/Connections.php:271
+msgid "Network"
 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"
+#: ../../Zotlabs/Module/Connections.php:274
+msgid "Call"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:918
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141
-msgid "Instant messenger"
+#: ../../Zotlabs/Module/Connections.php:276
+msgid "Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:919
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142
-msgid "Website"
+#: ../../Zotlabs/Module/Connections.php:278
+msgid "Connected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:921
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144
-msgid "Note"
+#: ../../Zotlabs/Module/Connections.php:280
+msgid "Approve connection"
 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"
+#: ../../Zotlabs/Module/Connections.php:281
+#: ../../Zotlabs/Module/Admin/Accounts.php:171
+msgid "Approve"
 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"
+#: ../../Zotlabs/Module/Connections.php:282
+msgid "Ignore connection"
 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"
+#: ../../Zotlabs/Module/Connections.php:283
+#: ../../Zotlabs/Module/Connedit.php:634
+msgid "Ignore"
 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"
+#: ../../Zotlabs/Module/Connections.php:284
+msgid "Recent activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:927
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150
-msgid "Add Field"
+#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216
+#: ../../include/nav.php:203 ../../include/text.php:939
+msgid "Connections"
 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"
+#: ../../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/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"
+#: ../../Zotlabs/Module/Connections.php:313
+msgid "Search your connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062
-msgid "Profile Image"
+#: ../../Zotlabs/Module/Connections.php:314
+msgid "Connections search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044
-#: ../../include/nav.php:105
-msgid "Edit Profiles"
+#: ../../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/Help.php:23
-msgid "Documentation Search"
+#: ../../Zotlabs/Module/Cover_photo.php:56
+#: ../../Zotlabs/Module/Profile_photo.php:61
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827
-msgid "About"
+#: ../../Zotlabs/Module/Cover_photo.php:136
+#: ../../Zotlabs/Module/Cover_photo.php:186
+msgid "Cover Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
-msgid "Members"
+#: ../../Zotlabs/Module/Cover_photo.php:159
+#: ../../Zotlabs/Module/Profile_photo.php:137
+msgid "Image resize failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:82
-msgid "Administrators"
+#: ../../Zotlabs/Module/Cover_photo.php:173
+#: ../../Zotlabs/Module/Profile_photo.php:203 ../../include/photos.php:145
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:83
-msgid "Developers"
+#: ../../Zotlabs/Module/Cover_photo.php:197
+#: ../../Zotlabs/Module/Profile_photo.php:238
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:84
-msgid "Tutorials"
+#: ../../Zotlabs/Module/Cover_photo.php:214
+#: ../../Zotlabs/Module/Profile_photo.php:257
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:93
-msgid "$Projectname Documentation"
+#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4189
+msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:94
-msgid "Contents"
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4190
+#, php-format
+msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
+#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4191
+msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4192
+#, php-format
+msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
+#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4194
+#, php-format
+msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
+#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759
+msgid "cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
+#: ../../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/Connect.php:92
-msgid "Enable premium channel connection restrictions"
+#: ../../Zotlabs/Module/Cover_photo.php:358
+#: ../../Zotlabs/Module/Profile_photo.php:420
+msgid "Upload File:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../Zotlabs/Module/Cover_photo.php:359
+#: ../../Zotlabs/Module/Profile_photo.php:421
+msgid "Select a profile:"
 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:"
+#: ../../Zotlabs/Module/Cover_photo.php:360
+msgid "Upload Cover Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+#: ../../Zotlabs/Module/Settings/Channel.php:404
+msgid "or"
 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."
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+msgid "skip this step"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../Zotlabs/Module/Cover_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:429
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
+#: ../../Zotlabs/Module/Cover_photo.php:381
+#: ../../Zotlabs/Module/Profile_photo.php:448
+msgid "Crop Image"
 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."
+#: ../../Zotlabs/Module/Cover_photo.php:382
+#: ../../Zotlabs/Module/Profile_photo.php:449
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
+#: ../../Zotlabs/Module/Cover_photo.php:384
+#: ../../Zotlabs/Module/Profile_photo.php:451
+msgid "Done Editing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "Off"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
+#: ../../Zotlabs/Module/Admin/Features.php:55
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#: ../../Zotlabs/Module/Settings/Features.php:38
+msgid "On"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
+#: ../../Zotlabs/Module/Admin/Features.php:56
+#, php-format
+msgid "Lock feature %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
+#: ../../Zotlabs/Module/Admin/Features.php:64
+msgid "Manage Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
+#: ../../Zotlabs/Module/Admin/Logs.php:28
+msgid "Log settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
+#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48
+#: ../../Zotlabs/Widget/Admin.php:58
+msgid "Logs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:116
-msgid "Message queues"
+#: ../../Zotlabs/Module/Admin/Logs.php:85
+msgid "Clear"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:133
-msgid "Your software should be updated"
+#: ../../Zotlabs/Module/Admin/Logs.php:91
+msgid "Debugging"
 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"
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid "Log file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:138
-msgid "Summary"
+#: ../../Zotlabs/Module/Admin/Logs.php:92
+msgid ""
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:141
-msgid "Registered accounts"
+#: ../../Zotlabs/Module/Admin/Logs.php:93
+msgid "Log level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Pending registrations"
+#: ../../Zotlabs/Module/Admin/Profs.php:69
+msgid "New Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:143
-msgid "Registered channels"
+#: ../../Zotlabs/Module/Admin/Profs.php:70
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+msgid "Field nickname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Active plugins"
+#: ../../Zotlabs/Module/Admin/Profs.php:70
+#: ../../Zotlabs/Module/Admin/Profs.php:90
+msgid "System name of field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Version"
+#: ../../Zotlabs/Module/Admin/Profs.php:71
+#: ../../Zotlabs/Module/Admin/Profs.php:91
+msgid "Input type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Repository version (master)"
+#: ../../Zotlabs/Module/Admin/Profs.php:72
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+msgid "Field Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Repository version (dev)"
+#: ../../Zotlabs/Module/Admin/Profs.php:72
+#: ../../Zotlabs/Module/Admin/Profs.php:92
+msgid "Label on profile pages"
 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/Admin/Profs.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+msgid "Help text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Name"
+#: ../../Zotlabs/Module/Admin/Profs.php:73
+#: ../../Zotlabs/Module/Admin/Profs.php:93
+msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Admin/Profs.php:83
+msgid "Field definition not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Admin/Profs.php:89
+msgid "Edit Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
-msgid "Invalid item."
+#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30
+msgid "Profile Fields"
 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."
+#: ../../Zotlabs/Module/Admin/Profs.php:148
+msgid "Basic Profile Fields"
 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."
+#: ../../Zotlabs/Module/Admin/Profs.php:149
+msgid "Advanced Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
+#: ../../Zotlabs/Module/Admin/Profs.php:149
+msgid "(In addition to basic fields)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
+#: ../../Zotlabs/Module/Admin/Profs.php:151
+msgid "All available fields"
 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"
+#: ../../Zotlabs/Module/Admin/Profs.php:152
+msgid "Custom Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:254
-msgid "sent you a private message"
+#: ../../Zotlabs/Module/Admin/Profs.php:156
+msgid "Create Custom Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:302
-msgid "added your channel"
+#: ../../Zotlabs/Module/Admin/Security.php:77
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:312
-msgid "g A l F d"
+#: ../../Zotlabs/Module/Admin/Security.php:80
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:330
-msgid "[today]"
+#: ../../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/Ping.php:339
-msgid "posted an event"
+#: ../../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/Connections.php:56
-#: ../../Zotlabs/Module/Connections.php:161
-#: ../../Zotlabs/Module/Connections.php:250
-msgid "Blocked"
+#: ../../Zotlabs/Module/Admin/Security.php:87
+#: ../../Zotlabs/Widget/Admin.php:25
+msgid "Security"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:61
-#: ../../Zotlabs/Module/Connections.php:168
-#: ../../Zotlabs/Module/Connections.php:249
-msgid "Ignored"
+#: ../../Zotlabs/Module/Admin/Security.php:89
+msgid "Block public"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:66
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:248
-msgid "Hidden"
+#: ../../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/Connections.php:71
-#: ../../Zotlabs/Module/Connections.php:175
-#: ../../Zotlabs/Module/Connections.php:247
-msgid "Archived"
+#: ../../Zotlabs/Module/Admin/Security.php:90
+msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:76
-#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1724
-msgid "New"
+#: ../../Zotlabs/Module/Admin/Security.php:91
+msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:720 ../../include/widgets.php:530
-msgid "All"
+#: ../../Zotlabs/Module/Admin/Security.php:92
+msgid "Allowed email domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:138
-msgid "New Connections"
+#: ../../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/Connections.php:141
-msgid "Show pending (new) connections"
+#: ../../Zotlabs/Module/Admin/Security.php:93
+msgid "Not allowed email domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:145
-#: ../../Zotlabs/Module/Profperm.php:140
-msgid "All Connections"
+#: ../../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/Connections.php:148
-msgid "Show all connections"
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid "Allow communications only from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:164
-msgid "Only show blocked connections"
+#: ../../Zotlabs/Module/Admin/Security.php:94
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:171
-msgid "Only show ignored connections"
+#: ../../Zotlabs/Module/Admin/Security.php:95
+msgid "Block communications from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:178
-msgid "Only show archived connections"
+#: ../../Zotlabs/Module/Admin/Security.php:96
+msgid "Allow communications only from these channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:185
-msgid "Only show hidden connections"
+#: ../../Zotlabs/Module/Admin/Security.php:96
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:246
-msgid "Pending approval"
+#: ../../Zotlabs/Module/Admin/Security.php:97
+msgid "Block communications from these channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:262
-#, php-format
-msgid "%1$s [%2$s]"
+#: ../../Zotlabs/Module/Admin/Security.php:98
+msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:263
-msgid "Edit connection"
+#: ../../Zotlabs/Module/Admin/Security.php:99
+msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:264
-msgid "Delete connection"
+#: ../../Zotlabs/Module/Admin/Security.php:99
+msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:273
-msgid "Channel address"
+#: ../../Zotlabs/Module/Admin/Security.php:100
+msgid "Block embedded HTML from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:275
-msgid "Network"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:29
+#, php-format
+msgid "Password changed for account %d."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:278
-msgid "Call"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:46
+msgid "Account settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:280
-msgid "Status"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:61
+msgid "Account not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:282
-msgid "Connected"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:68
+msgid "Account Edit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:284
-msgid "Approve connection"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:69
+msgid "New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:285
-#: ../../Zotlabs/Module/Admin/Accounts.php:171
-msgid "Approve"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:70
+msgid "New Password again"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:286
-msgid "Ignore connection"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:71
+msgid "Technical skill level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:287
-#: ../../Zotlabs/Module/Connedit.php:637
-msgid "Ignore"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:72
+msgid "Account language (for emails)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:288
-msgid "Recent activity"
+#: ../../Zotlabs/Module/Admin/Account_edit.php:73
+msgid "Service class"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/text.php:940 ../../include/nav.php:203
-msgid "Connections"
+#: ../../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/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"
+#: ../../Zotlabs/Module/Admin/Accounts.php:90
+#, php-format
+msgid "Account '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:317
-msgid "Search your connections"
+#: ../../Zotlabs/Module/Admin/Accounts.php:98
+#, php-format
+msgid "Account '%s' blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:318
-msgid "Connections search"
+#: ../../Zotlabs/Module/Admin/Accounts.php:106
+#, php-format
+msgid "Account '%s' unblocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Directory.php:392
-#: ../../Zotlabs/Module/Directory.php:397 ../../include/contact_widgets.php:23
-msgid "Find"
+#: ../../Zotlabs/Module/Admin/Accounts.php:165
+#: ../../Zotlabs/Module/Admin/Accounts.php:178
+#: ../../Zotlabs/Widget/Admin.php:23
+msgid "Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:61
-msgid "Image uploaded but image cropping failed."
+#: ../../Zotlabs/Module/Admin/Accounts.php:167
+#: ../../Zotlabs/Module/Admin/Channels.php:148
+msgid "select all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:134
-#: ../../Zotlabs/Module/Cover_photo.php:181
-msgid "Cover Photos"
+#: ../../Zotlabs/Module/Admin/Accounts.php:168
+msgid "Registrations waiting for confirm"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:135
-msgid "Image resize failed."
+#: ../../Zotlabs/Module/Admin/Accounts.php:169
+msgid "Request date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:201 ../../include/photos.php:149
-msgid "Unable to process image"
+#: ../../Zotlabs/Module/Admin/Accounts.php:170
+msgid "No registrations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:236
-msgid "Image upload failed."
+#: ../../Zotlabs/Module/Admin/Accounts.php:172
+msgid "Deny"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:255
-msgid "Unable to process image."
+#: ../../Zotlabs/Module/Admin/Accounts.php:174
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4181
-msgid "female"
+#: ../../Zotlabs/Module/Admin/Accounts.php:175
+#: ../../Zotlabs/Module/Connedit.php:626
+msgid "Unblock"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4182
-#, php-format
-msgid "%1$s updated her %2$s"
+#: ../../Zotlabs/Module/Admin/Accounts.php:180
+msgid "ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4183
-msgid "male"
+#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
+msgid "All Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4184
-#, php-format
-msgid "%1$s updated his %2$s"
+#: ../../Zotlabs/Module/Admin/Accounts.php:183
+msgid "Register date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4186
-#, php-format
-msgid "%1$s updated their %2$s"
+#: ../../Zotlabs/Module/Admin/Accounts.php:184
+msgid "Last login"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1764
-msgid "cover photo"
+#: ../../Zotlabs/Module/Admin/Accounts.php:185
+msgid "Expires"
 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."
+#: ../../Zotlabs/Module/Admin/Accounts.php:186
+msgid "Service Class"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:418
-msgid "Upload File:"
+#: ../../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/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:419
-msgid "Select a profile:"
+#: ../../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/Cover_photo.php:356
-msgid "Upload Cover Photo"
+#: ../../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/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:427
-#: ../../Zotlabs/Module/Settings/Channel.php:404
-msgid "or"
+#: ../../Zotlabs/Module/Admin/Channels.php:75
+#, php-format
+msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:427
-msgid "skip this step"
+#: ../../Zotlabs/Module/Admin/Channels.php:87
+#, php-format
+msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:427
-msgid "select a photo from your photo albums"
+#: ../../Zotlabs/Module/Admin/Channels.php:87
+#, php-format
+msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:446
-msgid "Crop Image"
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:447
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../Zotlabs/Module/Admin/Channels.php:98
+#, php-format
+msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:449
-msgid "Done Editing"
+#: ../../Zotlabs/Module/Admin/Channels.php:146
+#: ../../Zotlabs/Widget/Admin.php:24
+msgid "Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "Off"
+#: ../../Zotlabs/Module/Admin/Channels.php:150
+msgid "Censor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Features.php:55
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#: ../../Zotlabs/Module/Settings/Features.php:38
-msgid "On"
+#: ../../Zotlabs/Module/Admin/Channels.php:151
+msgid "Uncensor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Features.php:56
-#, php-format
-msgid "Lock feature %s"
+#: ../../Zotlabs/Module/Admin/Channels.php:152
+msgid "Allow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Features.php:64
-msgid "Manage Additional Features"
+#: ../../Zotlabs/Module/Admin/Channels.php:153
+msgid "Disallow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:28
-msgid "Log settings updated."
+#: ../../Zotlabs/Module/Admin/Channels.php:154
+#: ../../include/conversation.php:1815
+msgid "Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1661
-#: ../../include/widgets.php:1671
-msgid "Logs"
+#: ../../Zotlabs/Module/Admin/Channels.php:158
+msgid "UID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:85
-msgid "Clear"
+#: ../../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/Logs.php:91
-msgid "Debugging"
+#: ../../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/Logs.php:92
-msgid "Log file"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:19
+msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:92
-msgid ""
-"Must be writable by web server. Relative to your top-level webserver "
-"directory."
+#: ../../Zotlabs/Module/Admin/Dbsync.php:29
+#, php-format
+msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:93
-msgid "Log level"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:32
+#, php-format
+msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:69
-msgid "New Profile Field"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:36
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:70
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-msgid "Field nickname"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:39
+#, php-format
+msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:70
-#: ../../Zotlabs/Module/Admin/Profs.php:90
-msgid "System name of field"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:55
+msgid "No failed updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:71
-#: ../../Zotlabs/Module/Admin/Profs.php:91
-msgid "Input type"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:59
+msgid "Failed Updates"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:72
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-msgid "Field Name"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:61
+msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:72
-#: ../../Zotlabs/Module/Admin/Profs.php:92
-msgid "Label on profile pages"
+#: ../../Zotlabs/Module/Admin/Dbsync.php:62
+msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-msgid "Help text"
+#: ../../Zotlabs/Module/Admin/Queue.php:35
+msgid "Queue Statistics"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:73
-#: ../../Zotlabs/Module/Admin/Profs.php:93
-msgid "Additional info (optional)"
+#: ../../Zotlabs/Module/Admin/Queue.php:36
+msgid "Total Entries"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:83
-msgid "Field definition not found"
+#: ../../Zotlabs/Module/Admin/Queue.php:37
+msgid "Priority"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:89
-msgid "Edit Profile Field"
+#: ../../Zotlabs/Module/Admin/Queue.php:38
+msgid "Destination URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1642
-msgid "Profile Fields"
+#: ../../Zotlabs/Module/Admin/Queue.php:39
+msgid "Mark hub permanently offline"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:148
-msgid "Basic Profile Fields"
+#: ../../Zotlabs/Module/Admin/Queue.php:40
+msgid "Empty queue for this hub"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:149
-msgid "Advanced Profile Fields"
+#: ../../Zotlabs/Module/Admin/Queue.php:41
+msgid "Last known contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:149
-msgid "(In addition to basic fields)"
+#: ../../Zotlabs/Module/Admin/Site.php:133
+msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:151
-msgid "All available fields"
+#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2906
+msgid "Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:152
-msgid "Custom Fields"
+#: ../../Zotlabs/Module/Admin/Site.php:170
+#: ../../Zotlabs/Module/Settings/Display.php:137
+#, php-format
+msgid "%s - (Incompatible)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Profs.php:156
-msgid "Create Custom Field"
+#: ../../Zotlabs/Module/Admin/Site.php:177
+#: ../../Zotlabs/Module/Settings/Display.php:151
+msgid "mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:77
-msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently "
-"insecure."
+#: ../../Zotlabs/Module/Admin/Site.php:179
+msgid "experimental"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:80
-msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
+#: ../../Zotlabs/Module/Admin/Site.php:181
+msgid "unsupported"
 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 />"
+#: ../../Zotlabs/Module/Admin/Site.php:227
+msgid "Yes - with approval"
 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."
+#: ../../Zotlabs/Module/Admin/Site.php:233
+msgid "My site is not a public server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1637
-msgid "Security"
+#: ../../Zotlabs/Module/Admin/Site.php:234
+msgid "My site has paid access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:89
-msgid "Block public"
+#: ../../Zotlabs/Module/Admin/Site.php:235
+msgid "My site has free access only"
 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."
+#: ../../Zotlabs/Module/Admin/Site.php:236
+msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:90
-msgid "Set \"Transport Security\" HTTP header"
+#: ../../Zotlabs/Module/Admin/Site.php:247
+msgid "Basic/Minimal Social Networking"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:91
-msgid "Set \"Content Security Policy\" HTTP header"
+#: ../../Zotlabs/Module/Admin/Site.php:248
+msgid "Standard Configuration (default)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:92
-msgid "Allowed email domains"
+#: ../../Zotlabs/Module/Admin/Site.php:249
+msgid "Professional"
 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"
+#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Lib/Techlevels.php:10
+msgid "Beginner/Basic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:93
-msgid "Not allowed email domains"
+#: ../../Zotlabs/Module/Admin/Site.php:254 ../../Zotlabs/Lib/Techlevels.php:11
+msgid "Novice - not skilled but willing to learn"
 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."
+#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Lib/Techlevels.php:12
+msgid "Intermediate - somewhat comfortable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid "Allow communications only from these sites"
+#: ../../Zotlabs/Module/Admin/Site.php:256 ../../Zotlabs/Lib/Techlevels.php:13
+msgid "Advanced - very comfortable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:94
-msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
+#: ../../Zotlabs/Module/Admin/Site.php:257 ../../Zotlabs/Lib/Techlevels.php:14
+msgid "Expert - I can write computer code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:95
-msgid "Block communications from these sites"
+#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Lib/Techlevels.php:15
+msgid "Wizard - I probably know more than you do"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
-msgid "Allow communications only from these channels"
+#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Widget/Admin.php:22
+msgid "Site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:96
-msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by default"
+#: ../../Zotlabs/Module/Admin/Site.php:270
+msgid "File upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:97
-msgid "Block communications from these channels"
+#: ../../Zotlabs/Module/Admin/Site.php:271
+msgid "Policies"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:98
-msgid "Only allow embeds from secure (SSL) websites and links."
+#: ../../Zotlabs/Module/Admin/Site.php:272
+#: ../../include/contact_widgets.php:16
+msgid "Advanced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
-msgid "Allow unfiltered embedded HTML content only from these domains"
+#: ../../Zotlabs/Module/Admin/Site.php:276
+#: ../../extend/addon/addon/statusnet/statusnet.php:890
+msgid "Site name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:99
-msgid "One site per line. By default embedded content is filtered."
+#: ../../Zotlabs/Module/Admin/Site.php:278
+msgid "Server Configuration/Role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Security.php:100
-msgid "Block embedded HTML from these domains"
+#: ../../Zotlabs/Module/Admin/Site.php:280
+msgid "Site default technical skill level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:29
-#, php-format
-msgid "Password changed for account %d."
+#: ../../Zotlabs/Module/Admin/Site.php:280
+msgid "Used to provide a member experience matched to technical comfort level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:46
-msgid "Account settings updated."
+#: ../../Zotlabs/Module/Admin/Site.php:282
+msgid "Lock the technical skill level setting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:61
-msgid "Account not found."
+#: ../../Zotlabs/Module/Admin/Site.php:282
+msgid "Members can set their own technical comfort level by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:68
-msgid "Account Edit"
+#: ../../Zotlabs/Module/Admin/Site.php:284
+msgid "Banner/Logo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:69
-msgid "New Password"
+#: ../../Zotlabs/Module/Admin/Site.php:285
+msgid "Administrator Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:70
-msgid "New Password again"
+#: ../../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/Account_edit.php:71
-msgid "Technical skill level"
+#: ../../Zotlabs/Module/Admin/Site.php:286
+#: ../../Zotlabs/Module/Siteinfo.php:23
+msgid "Site Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Account_edit.php:72
-msgid "Account language (for emails)"
+#: ../../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/Account_edit.php:73
-msgid "Service class"
+#: ../../Zotlabs/Module/Admin/Site.php:287
+msgid "System language"
 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"
+#: ../../Zotlabs/Module/Admin/Site.php:288
+msgid "System theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:90
-#, php-format
-msgid "Account '%s' deleted"
+#: ../../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/Accounts.php:98
-#, php-format
-msgid "Account '%s' blocked"
+#: ../../Zotlabs/Module/Admin/Site.php:289
+msgid "Mobile system theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:106
-#, php-format
-msgid "Account '%s' unblocked"
+#: ../../Zotlabs/Module/Admin/Site.php:289
+msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:165
-#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1635
-msgid "Accounts"
+#: ../../Zotlabs/Module/Admin/Site.php:291
+msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:167
-#: ../../Zotlabs/Module/Admin/Channels.php:148
-msgid "select all"
+#: ../../Zotlabs/Module/Admin/Site.php:291
+msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:168
-msgid "Registrations waiting for confirm"
+#: ../../Zotlabs/Module/Admin/Site.php:292
+msgid "Maximum image size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:169
-msgid "Request date"
+#: ../../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/Accounts.php:170
-msgid "No registrations."
+#: ../../Zotlabs/Module/Admin/Site.php:293
+msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:172
-msgid "Deny"
+#: ../../Zotlabs/Module/Admin/Site.php:294
+msgid "Invitation only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:174
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Block"
+#: ../../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/Accounts.php:175
-#: ../../Zotlabs/Module/Connedit.php:629
-msgid "Unblock"
+#: ../../Zotlabs/Module/Admin/Site.php:295
+msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:180
-msgid "ID"
+#: ../../Zotlabs/Module/Admin/Site.php:296
+msgid "Register text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:182 ../../include/group.php:287
-msgid "All Channels"
+#: ../../Zotlabs/Module/Admin/Site.php:296
+msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:183
-msgid "Register date"
+#: ../../Zotlabs/Module/Admin/Site.php:297
+msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:184
-msgid "Last login"
+#: ../../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/Accounts.php:185
-msgid "Expires"
+#: ../../Zotlabs/Module/Admin/Site.php:298
+msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:186
-msgid "Service Class"
+#: ../../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/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?"
+#: ../../Zotlabs/Module/Admin/Site.php:299
+msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Accounts.php:189
+#: ../../Zotlabs/Module/Admin/Site.php:299
 msgid ""
-"The account {0} will be deleted!\\n\\nEverything this account has posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 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/Site.php:300
+msgid "Allowed friend domains"
+msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:46
-#, php-format
-msgid "%s channel deleted"
-msgid_plural "%s channels deleted"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../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/Channels.php:65
-msgid "Channel not found"
+#: ../../Zotlabs/Module/Admin/Site.php:301
+msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:75
-#, php-format
-msgid "Channel '%s' deleted"
+#: ../../Zotlabs/Module/Admin/Site.php:301
+msgid ""
+"Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' censored"
+#: ../../Zotlabs/Module/Admin/Site.php:302
+msgid "Force publish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:87
-#, php-format
-msgid "Channel '%s' uncensored"
+#: ../../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/Channels.php:98
-#, php-format
-msgid "Channel '%s' code allowed"
+#: ../../Zotlabs/Module/Admin/Site.php:303
+msgid "Import Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:98
-#, php-format
-msgid "Channel '%s' code disallowed"
+#: ../../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/Channels.php:146 ../../include/widgets.php:1636
-msgid "Channels"
+#: ../../Zotlabs/Module/Admin/Site.php:304
+msgid "Login on Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:150
-msgid "Censor"
+#: ../../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/Channels.php:151
-msgid "Uncensor"
+#: ../../Zotlabs/Module/Admin/Site.php:305
+msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:152
-msgid "Allow Code"
+#: ../../Zotlabs/Module/Admin/Site.php:305
+msgid ""
+"Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:153
-msgid "Disallow Code"
+#: ../../Zotlabs/Module/Admin/Site.php:307
+msgid "Directory Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1815
-msgid "Channel"
+#: ../../Zotlabs/Module/Admin/Site.php:307
+msgid "Default directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Channels.php:158
-msgid "UID"
+#: ../../Zotlabs/Module/Admin/Site.php:309
+msgid "Proxy user"
 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?"
+#: ../../Zotlabs/Module/Admin/Site.php:310
+msgid "Proxy URL"
 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?"
+#: ../../Zotlabs/Module/Admin/Site.php:311
+msgid "Network timeout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:19
-msgid "Update has been marked successful"
+#: ../../Zotlabs/Module/Admin/Site.php:311
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:29
-#, php-format
-msgid "Executing %s failed. Check system logs."
+#: ../../Zotlabs/Module/Admin/Site.php:312
+msgid "Delivery interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:32
-#, php-format
-msgid "Update %s was successfully applied."
+#: ../../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/Dbsync.php:36
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+#: ../../Zotlabs/Module/Admin/Site.php:313
+msgid "Deliveries per process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:39
-#, php-format
-msgid "Update function %s could not be found."
+#: ../../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/Dbsync.php:55
-msgid "No failed updates."
+#: ../../Zotlabs/Module/Admin/Site.php:314
+msgid "Poll interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:59
-msgid "Failed Updates"
+#: ../../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/Dbsync.php:61
-msgid "Mark success (if update was manually applied)"
+#: ../../Zotlabs/Module/Admin/Site.php:315
+msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Dbsync.php:62
-msgid "Attempt to execute this update step automatically"
+#: ../../Zotlabs/Module/Admin/Site.php:315
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:35
-msgid "Queue Statistics"
+#: ../../Zotlabs/Module/Admin/Site.php:316
+msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:36
-msgid "Total Entries"
+#: ../../Zotlabs/Module/Admin/Site.php:316
+msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:37
-msgid "Priority"
+#: ../../Zotlabs/Module/Admin/Plugins.php:289
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:38
-msgid "Destination URL"
+#: ../../Zotlabs/Module/Admin/Plugins.php:294
+#, php-format
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:39
-msgid "Mark hub permanently offline"
+#: ../../Zotlabs/Module/Admin/Plugins.php:310
+#: ../../Zotlabs/Module/Admin/Themes.php:95
+msgid "Disable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:40
-msgid "Empty queue for this hub"
+#: ../../Zotlabs/Module/Admin/Plugins.php:313
+#: ../../Zotlabs/Module/Admin/Themes.php:97
+msgid "Enable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Queue.php:41
-msgid "Last known contact"
+#: ../../Zotlabs/Module/Admin/Plugins.php:342
+#: ../../Zotlabs/Module/Admin/Plugins.php:437
+#: ../../Zotlabs/Widget/Admin.php:27
+msgid "Plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:133
-msgid "Site settings updated."
+#: ../../Zotlabs/Module/Admin/Plugins.php:343
+#: ../../Zotlabs/Module/Admin/Themes.php:124
+msgid "Toggle"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:159 ../../include/text.php:2920
-msgid "Default"
+#: ../../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/Site.php:170
-#: ../../Zotlabs/Module/Settings/Display.php:137
-#, php-format
-msgid "%s - (Incompatible)"
+#: ../../Zotlabs/Module/Admin/Plugins.php:351
+#: ../../Zotlabs/Module/Admin/Themes.php:134
+msgid "Author: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:177
-#: ../../Zotlabs/Module/Settings/Display.php:151
-msgid "mobile"
+#: ../../Zotlabs/Module/Admin/Plugins.php:352
+#: ../../Zotlabs/Module/Admin/Themes.php:135
+msgid "Maintainer: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:179
-msgid "experimental"
+#: ../../Zotlabs/Module/Admin/Plugins.php:353
+msgid "Minimum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:181
-msgid "unsupported"
+#: ../../Zotlabs/Module/Admin/Plugins.php:354
+msgid "Maximum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:227
-msgid "Yes - with approval"
+#: ../../Zotlabs/Module/Admin/Plugins.php:355
+msgid "Minimum PHP version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:233
-msgid "My site is not a public server"
+#: ../../Zotlabs/Module/Admin/Plugins.php:356
+msgid "Compatible Server Roles: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:234
-msgid "My site has paid access only"
+#: ../../Zotlabs/Module/Admin/Plugins.php:357
+msgid "Requires: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:235
-msgid "My site has free access only"
+#: ../../Zotlabs/Module/Admin/Plugins.php:358
+#: ../../Zotlabs/Module/Admin/Plugins.php:442
+msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:236
-msgid "My site offers free accounts with optional paid upgrades"
+#: ../../Zotlabs/Module/Admin/Plugins.php:411
+msgid "Enter the public git repository URL of the plugin repo."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:247
-msgid "Basic/Minimal Social Networking"
+#: ../../Zotlabs/Module/Admin/Plugins.php:412
+msgid "Plugin repo git URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:248
-msgid "Standard Configuration (default)"
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
+msgid "Custom repo name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:249
-msgid "Professional"
+#: ../../Zotlabs/Module/Admin/Plugins.php:413
+msgid "(optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:253 ../../Zotlabs/Lib/Techlevels.php:10
-msgid "Beginner/Basic"
+#: ../../Zotlabs/Module/Admin/Plugins.php:414
+msgid "Download Plugin Repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:254 ../../Zotlabs/Lib/Techlevels.php:11
-msgid "Novice - not skilled but willing to learn"
+#: ../../Zotlabs/Module/Admin/Plugins.php:421
+msgid "Install new repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:255 ../../Zotlabs/Lib/Techlevels.php:12
-msgid "Intermediate - somewhat comfortable"
+#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348
+msgid "Install"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:256 ../../Zotlabs/Lib/Techlevels.php:13
-msgid "Advanced - very comfortable"
+#: ../../Zotlabs/Module/Admin/Plugins.php:445
+msgid "Manage Repos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:257 ../../Zotlabs/Lib/Techlevels.php:14
-msgid "Expert - I can write computer code"
+#: ../../Zotlabs/Module/Admin/Plugins.php:446
+msgid "Installed Plugin Repositories"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Lib/Techlevels.php:15
-msgid "Wizard - I probably know more than you do"
+#: ../../Zotlabs/Module/Admin/Plugins.php:447
+msgid "Install a New Plugin Repository"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:267 ../../include/widgets.php:1634
-msgid "Site"
+#: ../../Zotlabs/Module/Admin/Plugins.php:454
+msgid "Switch branch"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:270
-msgid "File upload"
+#: ../../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/Site.php:271
-msgid "Policies"
+#: ../../Zotlabs/Module/Admin/Themes.php:26
+msgid "Theme settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:272
-#: ../../include/contact_widgets.php:16
-msgid "Advanced"
+#: ../../Zotlabs/Module/Admin/Themes.php:61
+msgid "No themes found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:276
-#: ../../extend/addon/addon/statusnet/statusnet.php:890
-msgid "Site name"
+#: ../../Zotlabs/Module/Admin/Themes.php:116
+msgid "Screenshot"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:278
-msgid "Server Configuration/Role"
+#: ../../Zotlabs/Module/Admin/Themes.php:123
+#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../Zotlabs/Widget/Admin.php:28
+msgid "Themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:280
-msgid "Site default technical skill level"
+#: ../../Zotlabs/Module/Admin/Themes.php:162
+msgid "[Experimental]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:280
-msgid "Used to provide a member experience matched to technical comfort level"
+#: ../../Zotlabs/Module/Admin/Themes.php:163
+msgid "[Unsupported]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
-msgid "Lock the technical skill level setting"
+#: ../../Zotlabs/Module/Webpages.php:52
+msgid "Import Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:282
-msgid "Members can set their own technical comfort level by default"
+#: ../../Zotlabs/Module/Webpages.php:53
+msgid "Import selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:284
-msgid "Banner/Logo"
+#: ../../Zotlabs/Module/Webpages.php:76
+msgid "Export Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:285
-msgid "Administrator Information"
+#: ../../Zotlabs/Module/Webpages.php:77
+msgid "Export selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:285
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
+#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/conversation.php:1889
+msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:286
-#: ../../Zotlabs/Module/Siteinfo.php:23
-msgid "Site Information"
+#: ../../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/Admin/Site.php:286
-msgid ""
-"Publicly visible description of this site.  Displayed on siteinfo page.  "
-"BBCode can be used here"
+#: ../../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/Admin/Site.php:287
-msgid "System language"
+#: ../../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/Admin/Site.php:288
-msgid "System theme"
+#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
+msgid "Actions"
 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>"
+#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
+msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Mobile system theme"
+#: ../../Zotlabs/Module/Webpages.php:254
+msgid "Page Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:289
-msgid "Theme for mobile devices"
+#: ../../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/Admin/Site.php:291
-msgid "Allow Feeds as Connections"
+#: ../../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/Admin/Site.php:291
-msgid "(Heavy system resource usage)"
+#: ../../Zotlabs/Module/Webpages.php:284
+msgid "Invalid file type."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
-msgid "Maximum image size"
+#: ../../Zotlabs/Module/Webpages.php:296
+msgid "Error opening zip file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:292
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+#: ../../Zotlabs/Module/Webpages.php:307
+msgid "Invalid folder path."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:293
-msgid "Does this site allow new member registration?"
+#: ../../Zotlabs/Module/Webpages.php:334
+msgid "No webpage elements detected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:294
-msgid "Invitation only"
+#: ../../Zotlabs/Module/Webpages.php:409
+msgid "Import complete."
 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."
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189
+msgid "Layout Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:295
-msgid "Which best describes the types of account offered by this hub?"
+#: ../../Zotlabs/Module/Editlayout.php:129
+#: ../../Zotlabs/Module/Layouts.php:132
+msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
-msgid "Register text"
+#: ../../Zotlabs/Module/Editlayout.php:137
+msgid "Edit Layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:296
-msgid "Will be displayed prominently on the registration page."
+#: ../../Zotlabs/Module/Editwebpage.php:144
+msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:297
-msgid "Site homepage to show visitors (default: login box)"
+#: ../../Zotlabs/Module/Editwebpage.php:171
+msgid "Edit Webpage"
 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."
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
-msgid "Preserve site homepage URL"
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:298
-msgid ""
-"Present the site homepage in a frame at the original location instead of "
-"redirecting"
+#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:299
-msgid "Accounts abandoned after x days"
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
 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."
+#: ../../Zotlabs/Module/Network.php:96
+msgid "No such group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:300
-msgid "Allowed friend domains"
+#: ../../Zotlabs/Module/Network.php:136
+msgid "No such channel"
 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"
+#: ../../Zotlabs/Module/Network.php:141
+msgid "forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:301
-msgid "Verify Email Addresses"
+#: ../../Zotlabs/Module/Network.php:153
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:301
-msgid ""
-"Check to verify email addresses used in account registration (recommended)."
+#: ../../Zotlabs/Module/Network.php:221
+msgid "Privacy group is empty"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
-msgid "Force publish"
+#: ../../Zotlabs/Module/Network.php:230
+msgid "Privacy group: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:302
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
+#: ../../Zotlabs/Module/Network.php:256
+msgid "Invalid connection."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
-msgid "Import Public Streams"
+#: ../../Zotlabs/Module/Network.php:275
+#: ../../extend/addon/addon/redred/redred.php:65
+msgid "Invalid channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:303
-msgid ""
-"Import and allow access to public content pulled from other sites. Warning: "
-"this content is unmoderated."
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:304
-msgid "Login on Homepage"
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
 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."
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
-msgid "Enable context help"
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:305
-msgid ""
-"Display contextual help for the current page when the help button is pressed."
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
-msgid "Directory Server URL"
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:307
-msgid "Default directory server"
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:309
-msgid "Proxy user"
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:310
-msgid "Proxy URL"
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
-msgid "Network timeout"
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2259
+msgid "Menus"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:311
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
+msgid "Drop"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:312
-msgid "Delivery interval"
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
 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."
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:313
-msgid "Deliveries per process"
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
 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."
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:314
-msgid "Poll interval"
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
 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."
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
-msgid "Maximum Load Average"
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:315
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
-msgid "Expiration period in days for imported (grid/network) content"
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Site.php:316
-msgid "0 for no expiration of imported content"
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:289
-#, php-format
-msgid "Plugin %s disabled."
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:294
-#, php-format
-msgid "Plugin %s enabled."
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:310
-#: ../../Zotlabs/Module/Admin/Themes.php:95
-msgid "Disable"
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:313
-#: ../../Zotlabs/Module/Admin/Themes.php:97
-msgid "Enable"
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:342
-#: ../../Zotlabs/Module/Admin/Plugins.php:437 ../../include/widgets.php:1639
-msgid "Plugins"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:343
-#: ../../Zotlabs/Module/Admin/Themes.php:124
-msgid "Toggle"
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
+msgid "Edit post"
 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"
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:351
-#: ../../Zotlabs/Module/Admin/Themes.php:134
-msgid "Author: "
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:352
-#: ../../Zotlabs/Module/Admin/Themes.php:135
-msgid "Maintainer: "
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary "
+"location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:353
-msgid "Minimum project version: "
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:354
-msgid "Maximum project version: "
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:355
-msgid "Minimum PHP version: "
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:356
-msgid "Compatible Server Roles: "
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:357
-msgid "Requires: "
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:358
-#: ../../Zotlabs/Module/Admin/Plugins.php:442
-msgid "Disabled - version incompatibility"
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:411
-msgid "Enter the public git repository URL of the plugin repo."
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:412
-msgid "Plugin repo git URL"
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
-msgid "Custom repo name"
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../Zotlabs/Widget/Pubsites.php:12
+msgid "Public Hubs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:413
-msgid "(optional)"
+#: ../../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/Admin/Plugins.php:414
-msgid "Download Plugin Repo"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:421
-msgid "Install new repo"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:348
-msgid "Install"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:445
-msgid "Manage Repos"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:446
-msgid "Installed Plugin Repositories"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:447
-msgid "Install a New Plugin Repository"
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
+#: ../../include/conversation.php:941 ../../include/conversation.php:1099
+msgid "Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Plugins.php:454
-msgid "Switch branch"
+#: ../../Zotlabs/Module/Pubsites.php:48
+msgid "Rate"
 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"
+#: ../../Zotlabs/Module/Setup.php:176
+msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:26
-msgid "Theme settings updated."
+#: ../../Zotlabs/Module/Setup.php:180
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:61
-msgid "No themes found."
+#: ../../Zotlabs/Module/Setup.php:184
+msgid ""
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:116
-msgid "Screenshot"
+#: ../../Zotlabs/Module/Setup.php:191
+msgid "Could not create table."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:123
-#: ../../Zotlabs/Module/Admin/Themes.php:157 ../../include/widgets.php:1640
-msgid "Themes"
+#: ../../Zotlabs/Module/Setup.php:196
+msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Themes.php:162
-msgid "[Experimental]"
+#: ../../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/Admin/Themes.php:163
-msgid "[Unsupported]"
+#: ../../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/Webpages.php:52
-msgid "Import Webpage Elements"
+#: ../../Zotlabs/Module/Setup.php:260
+msgid "System check"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:53
-msgid "Import selected"
+#: ../../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/Webpages.php:76
-msgid "Export Webpage Elements"
+#: ../../Zotlabs/Module/Setup.php:265
+msgid "Check again"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:77
-msgid "Export selected"
+#: ../../Zotlabs/Module/Setup.php:287
+msgid "Database connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:225
-#: ../../include/conversation.php:1889
-msgid "Webpages"
+#: ../../Zotlabs/Module/Setup.php:288
+msgid ""
+"In order to install $Projectname we need to know how to connect to your "
+"database."
 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"
+#: ../../Zotlabs/Module/Setup.php:289
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 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"
+#: ../../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/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"
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
-msgid "Actions"
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Default is 127.0.0.1"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
-msgid "Page Link"
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Database Port"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:254
-msgid "Page Title"
+#: ../../Zotlabs/Module/Setup.php:295
+msgid "Communication port number - use 0 for default"
 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"
+#: ../../Zotlabs/Module/Setup.php:296
+msgid "Database Login Name"
 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"
+#: ../../Zotlabs/Module/Setup.php:297
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:284
-msgid "Invalid file type."
+#: ../../Zotlabs/Module/Setup.php:298
+msgid "Database Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:296
-msgid "Error opening zip file"
+#: ../../Zotlabs/Module/Setup.php:299
+msgid "Database Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:307
-msgid "Invalid folder path."
+#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:334
-msgid "No webpage elements detected."
+#: ../../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/Webpages.php:409
-msgid "Import complete."
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Website URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
-msgid "Layout Name"
+#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344
+msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:131
-msgid "Layout Description (Optional)"
+#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:136
-msgid "Edit Layout"
+#: ../../Zotlabs/Module/Setup.php:331
+msgid "Site settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:142
-msgid "Page link"
+#: ../../Zotlabs/Module/Setup.php:385
+msgid "PHP version 5.5 or greater is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
-msgid "Edit Webpage"
+#: ../../Zotlabs/Module/Setup.php:386
+msgid "PHP version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:131
-msgid "Away"
+#: ../../Zotlabs/Module/Setup.php:402
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:136
-msgid "Online"
+#: ../../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/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
-msgid "This site is not a directory server"
+#: ../../Zotlabs/Module/Setup.php:407
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
+#: ../../Zotlabs/Module/Setup.php:407
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
+#: ../../Zotlabs/Module/Setup.php:412
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
+#: ../../Zotlabs/Module/Setup.php:422
+msgid ""
+"Unable to check command line PHP, as shell_exec() is disabled. This is "
+"required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
+#: ../../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/Network.php:153
-msgid "Search Results For:"
+#: ../../Zotlabs/Module/Setup.php:426
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:221
-msgid "Privacy group is empty"
+#: ../../Zotlabs/Module/Setup.php:429
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:230
-msgid "Privacy group: "
+#: ../../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/Network.php:256
-msgid "Invalid connection."
+#: ../../Zotlabs/Module/Setup.php:452
+msgid "You can adjust these settings in the server php.ini file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:275
-#: ../../extend/addon/addon/redred/redred.php:65
-msgid "Invalid channel."
+#: ../../Zotlabs/Module/Setup.php:454
+msgid "PHP upload limits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
+#: ../../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/Menu.php:60
-msgid "Unable to create menu."
+#: ../../Zotlabs/Module/Setup.php:478
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
+#: ../../Zotlabs/Module/Setup.php:481
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
+#: ../../Zotlabs/Module/Setup.php:498
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
+#: ../../Zotlabs/Module/Setup.php:499
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
+#: ../../Zotlabs/Module/Setup.php:500
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
+#: ../../Zotlabs/Module/Setup.php:501
+msgid "PDO database PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
+#: ../../Zotlabs/Module/Setup.php:502
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "xml PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2273
-msgid "Menus"
+#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
-msgid "Drop"
+#: ../../Zotlabs/Module/Setup.php:507
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
+#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516
+msgid "exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
+#: ../../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/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
+#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522
+msgid "shell_exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
+#: ../../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/Menu.php:136
-msgid "Menu could not be deleted."
+#: ../../Zotlabs/Module/Setup.php:527
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
+#: ../../Zotlabs/Module/Setup.php:531
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
+#: ../../Zotlabs/Module/Setup.php:535
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
+#: ../../Zotlabs/Module/Setup.php:539
+msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
+#: ../../Zotlabs/Module/Setup.php:543
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
+#: ../../Zotlabs/Module/Setup.php:547
+msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
+#: ../../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/Menu.php:156
-msgid "Menu title as seen by others"
+#: ../../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/Menu.php:157
-msgid "Allow bookmarks"
+#: ../../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/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
+#: ../../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/Editpost.php:35
-msgid "Item is not editable"
+#: ../../Zotlabs/Module/Setup.php:571
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
-msgid "Edit post"
+#: ../../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/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
+#: ../../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/Locs.php:62
-msgid "Location lookup failed."
+#: ../../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/Locs.php:66
+#: ../../Zotlabs/Module/Setup.php:588
+#, php-format
 msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
+"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/Locs.php:95
-msgid "Syncing locations"
+#: ../../Zotlabs/Module/Setup.php:591
+#, php-format
+msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
+#: ../../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/Locs.php:116
-msgid "Manage Channel Locations"
+#: ../../Zotlabs/Module/Setup.php:611
+msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
+#: ../../Zotlabs/Module/Setup.php:644
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
+#: ../../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/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
+#: ../../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/Locs.php:124
+#: ../../Zotlabs/Module/Setup.php:647
 msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
+"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/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
+#: ../../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/Pubsites.php:24 ../../include/widgets.php:1401
-msgid "Public Hubs"
+#: ../../Zotlabs/Module/Setup.php:649
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:27
+#: ../../Zotlabs/Module/Setup.php:651
 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."
+"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/Pubsites.php:33
-msgid "Hub URL"
+#: ../../Zotlabs/Module/Setup.php:653
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Access Type"
+#: ../../Zotlabs/Module/Setup.php:659
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Registration Policy"
+#: ../../Zotlabs/Module/Setup.php:662
+msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Stats"
+#: ../../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/Pubsites.php:33
-msgid "Software"
+#: ../../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/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
-#: ../../include/conversation.php:941 ../../include/conversation.php:1099
-msgid "Ratings"
+#: ../../Zotlabs/Module/Setup.php:741
+msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:48
-msgid "Rate"
+#: ../../Zotlabs/Module/Setup.php:742
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
 #: ../../Zotlabs/Module/Apps.php:45 ../../include/nav.php:178
@@ -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/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/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
+#: ../../Zotlabs/Module/Wiki.php:619
+msgid "Current Revision"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:191
-#, php-format
-msgid "%s element installed"
+#: ../../Zotlabs/Module/Wiki.php:619
+msgid "Selected Revision"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:194
-#, php-format
-msgid "%s element installation failed"
+#: ../../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."
-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."
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:842
-msgid "Duplicate post suppressed."
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:984
-msgid "System error. Post not saved."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1114
-msgid "Unable to obtain post information from database."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
 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 ""
 
@@ -7548,388 +7532,645 @@ msgstr ""
 msgid "Save to Folder"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I will attend"
+#: ../../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:670
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:671
+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:350 ../../include/conversation.php:717
+#, php-format
+msgid "from %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:720
+#, php-format
+msgid "last edited: %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:721
+#, 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:383
+#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
+msgid "Save Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:384
+msgid "Add to Calendar"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:393
+msgid "Mark all seen"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:442 ../../include/js_strings.php:7
+#, php-format
+msgid "%s show all"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1385
+msgid "Bold"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1386
+msgid "Italic"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1387
+msgid "Underline"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1388
+msgid "Quote"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1389
+msgid "Code"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:737
+msgid "Image"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:738
+msgid "Insert Link"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:739
+msgid "Video"
+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:130
+#: ../../boot.php:1690
+msgid "Login"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:194
+msgid "Grid"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1903
+#: ../../include/features.php:99
+msgid "Wiki"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:198
+msgid "Channel Home"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1853
+#: ../../include/conversation.php:1856 ../../include/nav.php:218
+msgid "Events"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:182
+msgid "Directory"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:210
+msgid "Mail"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I will not attend"
+#: ../../Zotlabs/Lib/Apps.php:236
+msgid "Chat"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:157
-msgid "I might attend"
+#: ../../Zotlabs/Lib/Apps.php:238
+msgid "Probe"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I agree"
+#: ../../Zotlabs/Lib/Apps.php:239
+msgid "Suggest"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I disagree"
+#: ../../Zotlabs/Lib/Apps.php:240
+msgid "Random Channel"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:167
-msgid "I abstain"
+#: ../../Zotlabs/Lib/Apps.php:241
+msgid "Invite"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:223
-msgid "Add Star"
+#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26
+msgid "Features"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:224
-msgid "Remove Star"
+#: ../../Zotlabs/Lib/Apps.php:243
+#: ../../extend/addon/addon/openid/MysqlProvider.php:69
+msgid "Language"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:225
-msgid "Toggle Star Status"
+#: ../../Zotlabs/Lib/Apps.php:244
+msgid "Post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:229
-msgid "starred"
+#: ../../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/ThreadItem.php:239 ../../include/conversation.php:670
-msgid "Message signature validated"
+#: ../../Zotlabs/Lib/Apps.php:355
+msgid "Purchase"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:671
-msgid "Message signature incorrect"
+#: ../../Zotlabs/Lib/Apps.php:359
+msgid "Undelete"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:248
-msgid "Add Tag"
+#: ../../Zotlabs/Lib/Apps.php:364
+msgid "Add to app-tray"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:316
-msgid "like"
+#: ../../Zotlabs/Lib/Apps.php:365
+msgid "Remove from app-tray"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:317
-msgid "dislike"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:31
+#: ../../Zotlabs/Lib/NativeWikiPage.php:72
+msgid "(No Title)"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:273
-msgid "Share This"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:86
+msgid "Wiki page create failed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:273
-msgid "share"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:99
+msgid "Wiki not found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:282
-msgid "Delivery Report"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:110
+msgid "Destination name already exists"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:300
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Lib/NativeWikiPage.php:136
+#: ../../Zotlabs/Lib/NativeWikiPage.php:331
+msgid "Page not found"
+msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:329 ../../Zotlabs/Lib/ThreadItem.php:330
-#, php-format
-msgid "View %s's profile - %s"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:166
+msgid "Error reading page content"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:333
-msgid "to"
+#: ../../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/ThreadItem.php:334
-msgid "via"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:358
+msgid "Page update failed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:335
-msgid "Wall-to-Wall"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:392
+msgid "Nothing deleted"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:336
-msgid "via Wall-To-Wall:"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:458
+msgid "Compare: object not found."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:717
-#, php-format
-msgid "from %s"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:464
+msgid "Page updated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:720
-#, php-format
-msgid "last edited: %s"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:467
+msgid "Untitled"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:721
-#, php-format
-msgid "Expires: %s"
+#: ../../Zotlabs/Lib/NativeWikiPage.php:473
+msgid "Wiki resource_id required for git commit"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:360
-msgid "Attend"
+#: ../../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/ThreadItem.php:361
-msgid "Attendance Options"
+#: ../../Zotlabs/Lib/NativeWiki.php:128
+msgid "Wiki files deleted successfully"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:362
-msgid "Vote"
+#: ../../Zotlabs/Widget/Notes.php:16
+msgid "Notes"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:363
-msgid "Voting Options"
+#: ../../Zotlabs/Widget/Cover_photo.php:54
+msgid "Click to show more"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:383
-#: ../../extend/addon/addon/bookmarker/bookmarker.php:38
-msgid "Save Bookmarks"
+#: ../../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/Lib/ThreadItem.php:384
-msgid "Add to Calendar"
+#: ../../Zotlabs/Widget/Photo_rand.php:58 ../../Zotlabs/Widget/Photo.php:48
+msgid "photo/image"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:393
-msgid "Mark all seen"
+#: ../../Zotlabs/Widget/Suggestions.php:51
+msgid "Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:442 ../../include/js_strings.php:7
-#, php-format
-msgid "%s show all"
+#: ../../Zotlabs/Widget/Suggestions.php:52
+msgid "See more..."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1385
-msgid "Bold"
+#: ../../Zotlabs/Widget/Follow.php:22
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1386
-msgid "Italic"
+#: ../../Zotlabs/Widget/Follow.php:29
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1387
-msgid "Underline"
+#: ../../Zotlabs/Widget/Follow.php:30
+msgid "Enter channel address"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1388
-msgid "Quote"
+#: ../../Zotlabs/Widget/Follow.php:31
+msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1389
-msgid "Code"
+#: ../../Zotlabs/Widget/Savedsearch.php:75
+msgid "Remove term"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:737
-msgid "Image"
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:738
-msgid "Insert Link"
+#: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336
+msgid "add"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:739
-msgid "Video"
+#: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
+#: ../../include/features.php:390
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:31
-#: ../../Zotlabs/Lib/NativeWikiPage.php:72
-msgid "(No Title)"
+#: ../../Zotlabs/Widget/Filer.php:31 ../../Zotlabs/Widget/Appcategories.php:42
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:86
-msgid "Wiki page create failed."
+#: ../../Zotlabs/Widget/Archive.php:43
+msgid "Archives"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:99
-msgid "Wiki not found."
+#: ../../Zotlabs/Widget/Rating.php:51
+msgid "Rating Tools"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:110
-msgid "Destination name already exists"
+#: ../../Zotlabs/Widget/Rating.php:55 ../../Zotlabs/Widget/Rating.php:57
+msgid "Rate Me"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:136
-#: ../../Zotlabs/Lib/NativeWikiPage.php:365
-msgid "Page not found"
+#: ../../Zotlabs/Widget/Rating.php:60
+msgid "View Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:166
-msgid "Error reading page content"
+#: ../../Zotlabs/Widget/Bookmarkedchats.php:24
+msgid "Bookmarked Chatrooms"
 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"
+#: ../../Zotlabs/Widget/Suggestedchats.php:32
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:391
-msgid "Page update failed."
+#: ../../Zotlabs/Widget/Affinity.php:49
+msgid "Refresh"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:425
-msgid "Nothing deleted"
+#: ../../Zotlabs/Widget/Settings_menu.php:35
+msgid "Account settings"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:491
-msgid "Compare: object not found."
+#: ../../Zotlabs/Widget/Settings_menu.php:41
+msgid "Channel settings"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:497
-msgid "Page updated"
+#: ../../Zotlabs/Widget/Settings_menu.php:50
+msgid "Additional features"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:500
-msgid "Untitled"
+#: ../../Zotlabs/Widget/Settings_menu.php:57
+msgid "Feature/Addon settings"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWikiPage.php:506
-msgid "Wiki resource_id required for git commit"
+#: ../../Zotlabs/Widget/Settings_menu.php:63
+msgid "Display settings"
 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"
+#: ../../Zotlabs/Widget/Settings_menu.php:70
+msgid "Manage locations"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:58
-msgctxt "permcat"
-msgid "default"
+#: ../../Zotlabs/Widget/Settings_menu.php:77
+msgid "Export channel"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:96
-msgctxt "permcat"
-msgid "follower"
+#: ../../Zotlabs/Widget/Settings_menu.php:83
+msgid "Connected apps"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:100
-msgctxt "permcat"
-msgid "contributor"
+#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153
+msgid "Permission Groups"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Permcat.php:104
-msgctxt "permcat"
-msgid "publisher"
+#: ../../Zotlabs/Widget/Settings_menu.php:115
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:212
-msgid "Site Admin"
+#: ../../Zotlabs/Widget/Mailmenu.php:13
+msgid "Private Mail Menu"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:213
-#: ../../extend/addon/addon/buglink/buglink.php:16
-msgid "Report Bug"
+#: ../../Zotlabs/Widget/Mailmenu.php:15
+msgid "Combined View"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:214
-msgid "View Bookmarks"
+#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:213
+msgid "Inbox"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:215
-msgid "My Chatrooms"
+#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:214
+msgid "Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:217
-msgid "Firefox Share"
+#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:215
+msgid "New Message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:218
-msgid "Remote Diagnostics"
+#: ../../Zotlabs/Widget/Conversations.php:17
+#: ../../Zotlabs/Widget/Conversations.php:29
+msgid "Conversations"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337
-msgid "Suggest Channels"
+#: ../../Zotlabs/Widget/Conversations.php:21
+msgid "Received Messages"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:130
-#: ../../boot.php:1706
-msgid "Login"
+#: ../../Zotlabs/Widget/Conversations.php:25
+msgid "Sent Messages"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:194
-msgid "Grid"
+#: ../../Zotlabs/Widget/Conversations.php:39
+msgid "No messages."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1903
-#: ../../include/features.php:99
-msgid "Wiki"
+#: ../../Zotlabs/Widget/Conversations.php:57
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:198
-msgid "Channel Home"
+#: ../../Zotlabs/Widget/Eventstools.php:13
+msgid "Events Tools"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1853
-#: ../../include/conversation.php:1856 ../../include/nav.php:218
-msgid "Events"
+#: ../../Zotlabs/Widget/Eventstools.php:14
+msgid "Export Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:182
-msgid "Directory"
+#: ../../Zotlabs/Widget/Eventstools.php:15
+msgid "Import Calendar"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:210
-msgid "Mail"
+#: ../../Zotlabs/Widget/Chatroom_list.php:16
+#: ../../include/conversation.php:1866 ../../include/conversation.php:1869
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:236
-msgid "Chat"
+#: ../../Zotlabs/Widget/Chatroom_list.php:20
+msgid "Overview"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:238
-msgid "Probe"
+#: ../../Zotlabs/Widget/Chatroom_members.php:11
+msgid "Chat Members"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:239
-msgid "Suggest"
+#: ../../Zotlabs/Widget/Wiki_list.php:15
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:95
+msgid "Wiki List"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:240
-msgid "Random Channel"
+#: ../../Zotlabs/Widget/Wiki_pages.php:55
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:76
+msgid "Wiki Pages"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:241
-msgid "Invite"
+#: ../../Zotlabs/Widget/Wiki_pages.php:61
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:81
+msgid "Add new page"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:242 ../../include/widgets.php:1638
-msgid "Features"
+#: ../../Zotlabs/Widget/Wiki_pages.php:62
+#: ../../extend/addon/addon/gitwiki/gitwiki.php:82
+msgid "Page name"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:243
-#: ../../extend/addon/addon/openid/MysqlProvider.php:69
-msgid "Language"
+#: ../../Zotlabs/Widget/Activity.php:50
+msgctxt "widget"
+msgid "Activity"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:244
-msgid "Post"
+#: ../../Zotlabs/Widget/Wiki_page_history.php:23
+msgctxt "wiki_history"
+msgid "Message"
 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"
+#: ../../Zotlabs/Widget/Tasklist.php:23
+msgid "Tasks"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:355
-msgid "Purchase"
+#: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
+msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:359
-msgid "Undelete"
+#: ../../Zotlabs/Widget/Admin.php:29
+msgid "Inspect queue"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:364
-msgid "Add to app-tray"
+#: ../../Zotlabs/Widget/Admin.php:31
+msgid "DB updates"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:365
-msgid "Remove from app-tray"
+#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:233
+msgid "Admin"
 msgstr ""
 
-#: ../../Zotlabs/Lib/NativeWiki.php:128
-msgid "Wiki files deleted successfully"
+#: ../../Zotlabs/Widget/Admin.php:56
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Forums.php:85
+msgid "Forums"
 msgstr ""
 
 #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24
@@ -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 ""
@@ -8214,341 +8422,31 @@ msgid "Static or dynamic flattr button"
 msgstr ""
 
 #: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
-msgid "static"
-msgstr ""
-
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
-msgid "dynamic"
-msgstr ""
-
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
-msgid "Alignment of the widget"
-msgstr ""
-
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
-msgid "left"
-msgstr ""
-
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
-msgid "right"
-msgstr ""
-
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
-msgid "Enable Flattr widget"
-msgstr ""
-
-#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
-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:"
+msgid "static"
 msgstr ""
 
-#: ../../extend/addon/addon/friendica/dfrn_request.php:878
-msgid "Submit Request"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:112
+msgid "dynamic"
 msgstr ""
 
-#: ../../extend/addon/addon/friendica/friendica.php:113
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:118
-msgid "GNU-Social Protocol Settings updated."
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
+msgid "Alignment of the widget"
 msgstr ""
 
-#: ../../extend/addon/addon/friendica/friendica.php:124
-msgid "Enable the (experimental) GNU-Social protocol for this channel"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
+msgid "left"
 msgstr ""
 
-#: ../../extend/addon/addon/friendica/friendica.php:128
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:133
-msgid "GNU-Social Protocol Settings"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:116
+msgid "right"
 msgstr ""
 
-#: ../../extend/addon/addon/friendica/friendica.php:185
-#: ../../extend/addon/addon/gnusoc/gnusoc.php:323
-msgid "Follow"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:120
+msgid "Enable Flattr widget"
 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"
+#: ../../extend/addon/addon/flattrwidget/flattrwidget.php:124
+msgid "Flattr Widget Settings"
 msgstr ""
 
 #: ../../extend/addon/addon/frphotos/frphotos.php:91
@@ -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)"
-msgstr ""
-
-#: ../../include/items.php:1045
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1047
-msgid "Visible to you only."
-msgstr ""
-
-#: ../../include/items.php:1049
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: ../../include/items.php:1051
-msgid "Visible to anybody authenticated."
-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"
+#: ../../include/help.php:33
+msgid "Help:"
 msgstr ""
 
-#: ../../include/items.php:3839
-msgid "Connection not found."
+#: ../../include/help.php:65
+msgid "Not Found"
 msgstr ""
 
-#: ../../include/items.php:4188
-msgid "profile photo"
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/items.php:4384
-#, php-format
-msgid "[Edited %s]"
+#: ../../include/import.php:51
+msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/items.php:4384
-msgctxt "edit_activity"
-msgid "Post"
+#: ../../include/import.php:90
+msgid "Channel clone failed. Import failed."
 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"
-msgstr ""
-
-#: ../../include/widgets.php:142
-msgid "See more..."
-msgstr ""
-
-#: ../../include/widgets.php:162
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr ""
-
-#: ../../include/widgets.php:168
-msgid "Add New Connection"
-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: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"
+#: ../../include/nav.php:88
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/widgets.php:631
-msgid "Export channel"
+#: ../../include/nav.php:88
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/widgets.php:637
-msgid "Connected apps"
+#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1689
+msgid "Logout"
 msgstr ""
 
-#: ../../include/widgets.php:652 ../../include/features.php:153
-msgid "Permission Groups"
+#: ../../include/nav.php:99 ../../include/nav.php:140
+msgid "End this session"
 msgstr ""
 
-#: ../../include/widgets.php:669
-msgid "Premium Channel Settings"
+#: ../../include/nav.php:103
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/widgets.php:698
-msgid "Private Mail Menu"
+#: ../../include/nav.php:105
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/widgets.php:700
-msgid "Combined View"
+#: ../../include/nav.php:107
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/widgets.php:705 ../../include/nav.php:213
-msgid "Inbox"
+#: ../../include/nav.php:130
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/widgets.php:710 ../../include/nav.php:214
-msgid "Outbox"
+#: ../../include/nav.php:155
+msgid "Take me home"
 msgstr ""
 
-#: ../../include/widgets.php:715 ../../include/nav.php:215
-msgid "New Message"
+#: ../../include/nav.php:157
+msgid "Log me out of this site"
 msgstr ""
 
-#: ../../include/widgets.php:732 ../../include/widgets.php:744
-msgid "Conversations"
+#: ../../include/nav.php:162
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/widgets.php:736
-msgid "Received Messages"
+#: ../../include/nav.php:174
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/widgets.php:740
-msgid "Sent Messages"
+#: ../../include/nav.php:178
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/widgets.php:754
-msgid "No messages."
+#: ../../include/nav.php:180
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/widgets.php:772
-msgid "Delete conversation"
+#: ../../include/nav.php:182
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/widgets.php:798
-msgid "Events Tools"
+#: ../../include/nav.php:194
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/widgets.php:799
-msgid "Export Calendar"
+#: ../../include/nav.php:195
+msgid "View your network/grid"
 msgstr ""
 
-#: ../../include/widgets.php:800
-msgid "Import Calendar"
+#: ../../include/nav.php:196
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/widgets.php:892
-msgid "Overview"
+#: ../../include/nav.php:198
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/widgets.php:899
-msgid "Chat Members"
+#: ../../include/nav.php:199
+msgid "View your channel home"
 msgstr ""
 
-#: ../../include/widgets.php:977
-msgctxt "wiki_history"
-msgid "Message"
+#: ../../include/nav.php:200
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/widgets.php:999
-msgid "Bookmarked Chatrooms"
+#: ../../include/nav.php:206
+msgid "Notices"
 msgstr ""
 
-#: ../../include/widgets.php:1030
-msgid "Suggested Chatrooms"
+#: ../../include/nav.php:206
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/widgets.php:1175 ../../include/widgets.php:1287
-msgid "photo/image"
+#: ../../include/nav.php:207
+msgid "View all notifications"
 msgstr ""
 
-#: ../../include/widgets.php:1230
-msgid "Click to show more"
+#: ../../include/nav.php:210
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/widgets.php:1381
-msgid "Rating Tools"
+#: ../../include/nav.php:211
+msgid "View your private messages"
 msgstr ""
 
-#: ../../include/widgets.php:1385 ../../include/widgets.php:1387
-msgid "Rate Me"
+#: ../../include/nav.php:212
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/widgets.php:1390
-msgid "View Ratings"
+#: ../../include/nav.php:218
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:1483
-msgid "Forums"
+#: ../../include/nav.php:219
+msgid "View events"
 msgstr ""
 
-#: ../../include/widgets.php:1540
-msgctxt "widget"
-msgid "Activity"
+#: ../../include/nav.php:220
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/widgets.php:1569
-msgid "Tasks"
+#: ../../include/nav.php:223
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/widgets.php:1635 ../../include/widgets.php:1673
-msgid "Member registrations waiting for confirmation"
+#: ../../include/nav.php:225
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/widgets.php:1641
-msgid "Inspect queue"
+#: ../../include/nav.php:233
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/widgets.php:1643
-msgid "DB updates"
+#: ../../include/nav.php:297
+msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/widgets.php:1668 ../../include/nav.php:233
-msgid "Admin"
+#: ../../include/nav.php:298
+msgid "Please wait..."
 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,767 +12024,664 @@ msgstr ""
 msgid "This Website Only"
 msgstr ""
 
-#: ../../include/text.php:461
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:463
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:492
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:495
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:506
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:508
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:928
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:953
-#, php-format
-msgid "View all %s connections"
-msgstr ""
-
-#: ../../include/text.php:1098 ../../include/text.php:1103
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:1104
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:1104
-msgid "pinged"
-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"
+#: ../../include/network.php:756
+msgid "view full size"
 msgstr ""
 
-#: ../../include/text.php:1131
-msgid "alive"
+#: ../../include/network.php:1490
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/text.php:1132
-msgid "annoyed"
+#: ../../include/network.php:1744 ../../include/network.php:1745
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/text.php:1133
-msgid "anxious"
+#: ../../include/network.php:1746
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/text.php:1134
-msgid "cranky"
+#: ../../include/network.php:1747
+msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "disturbed"
+#: ../../include/network.php:1748
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/text.php:1136
-msgid "frustrated"
+#: ../../include/network.php:1750
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/text.php:1137
-msgid "depressed"
+#: ../../include/network.php:1751
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/text.php:1138
-msgid "motivated"
+#: ../../include/network.php:1752
+msgid "Zot"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "relaxed"
+#: ../../include/network.php:1753
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/text.php:1140
-msgid "surprised"
+#: ../../include/network.php:1754
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/text.php:1315
-msgid "May"
+#: ../../include/network.php:1755
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/text.php:1392 ../../include/text.php:1396
-msgid "Unknown Attachment"
+#: ../../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/text.php:1398
-msgid "unknown"
+#: ../../include/group.php:268
+msgid "Add new connections to this privacy group"
 msgstr ""
 
-#: ../../include/text.php:1434
-msgid "remove category"
+#: ../../include/group.php:309
+msgid "edit"
 msgstr ""
 
-#: ../../include/text.php:1511
-msgid "remove from file"
+#: ../../include/group.php:331 ../../include/features.php:292
+msgid "Privacy Groups"
 msgstr ""
 
-#: ../../include/text.php:1780
-msgid "Page layout"
+#: ../../include/group.php:332
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/text.php:1780
-msgid "You can create your own with the layouts tool"
+#: ../../include/group.php:333
+msgid "Add privacy group"
 msgstr ""
 
-#: ../../include/text.php:1822
-msgid "Page content type"
+#: ../../include/group.php:334
+msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../include/text.php:1955
-msgid "activity"
+#: ../../include/text.php:460
+msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:2269
-msgid "Design Tools"
+#: ../../include/text.php:462
+msgid "first"
 msgstr ""
 
-#: ../../include/text.php:2275
-msgid "Pages"
+#: ../../include/text.php:491
+msgid "last"
 msgstr ""
 
-#: ../../include/text.php:2297
-msgid "Import website..."
+#: ../../include/text.php:494
+msgid "next"
 msgstr ""
 
-#: ../../include/text.php:2298
-msgid "Select folder to import"
+#: ../../include/text.php:505
+msgid "older"
 msgstr ""
 
-#: ../../include/text.php:2299
-msgid "Import from a zipped folder:"
+#: ../../include/text.php:507
+msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:2300
-msgid "Import from cloud files:"
+#: ../../include/text.php:927
+msgid "No connections"
 msgstr ""
 
-#: ../../include/text.php:2301
-msgid "/cloud/channel/path/to/folder"
+#: ../../include/text.php:952
+#, php-format
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/text.php:2302
-msgid "Enter path to website files"
+#: ../../include/text.php:1097 ../../include/text.php:1102
+msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:2303
-msgid "Select folder"
+#: ../../include/text.php:1103
+msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:2304
-msgid "Export website..."
+#: ../../include/text.php:1103
+msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:2305
-msgid "Export to a zip file"
+#: ../../include/text.php:1104
+msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:2306
-msgid "website.zip"
+#: ../../include/text.php:1104
+msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:2307
-msgid "Enter a name for the zip file."
+#: ../../include/text.php:1105
+msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:2308
-msgid "Export to cloud files"
+#: ../../include/text.php:1105
+msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:2309
-msgid "/path/to/export/folder"
+#: ../../include/text.php:1106
+msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:2310
-msgid "Enter a path to a cloud files destination."
+#: ../../include/text.php:1106
+msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:2311
-msgid "Specify folder"
+#: ../../include/text.php:1107
+msgid "rebuff"
 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."
+#: ../../include/text.php:1107
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/group.php:268
-msgid "Add new connections to this privacy group"
+#: ../../include/text.php:1119
+msgid "happy"
 msgstr ""
 
-#: ../../include/group.php:309
-msgid "edit"
+#: ../../include/text.php:1120
+msgid "sad"
 msgstr ""
 
-#: ../../include/group.php:331 ../../include/features.php:292
-msgid "Privacy Groups"
+#: ../../include/text.php:1121
+msgid "mellow"
 msgstr ""
 
-#: ../../include/group.php:332
-msgid "Edit group"
+#: ../../include/text.php:1122
+msgid "tired"
 msgstr ""
 
-#: ../../include/group.php:333
-msgid "Add privacy group"
+#: ../../include/text.php:1123
+msgid "perky"
 msgstr ""
 
-#: ../../include/group.php:334
-msgid "Channels not in any privacy group"
+#: ../../include/text.php:1124
+msgid "angry"
 msgstr ""
 
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
+#: ../../include/text.php:1125
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/channel.php:67
-msgid "Empty name"
+#: ../../include/text.php:1126
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/channel.php:70
-msgid "Name too long"
+#: ../../include/text.php:1127
+msgid "interested"
 msgstr ""
 
-#: ../../include/channel.php:181
-msgid "No account identifier"
+#: ../../include/text.php:1128
+msgid "bitter"
 msgstr ""
 
-#: ../../include/channel.php:193
-msgid "Nickname is required."
+#: ../../include/text.php:1129
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/channel.php:207
-msgid "Reserved nickname. Please choose another."
+#: ../../include/text.php:1130
+msgid "alive"
 msgstr ""
 
-#: ../../include/channel.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/text.php:1131
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/channel.php:272
-msgid "Unable to retrieve created identity"
+#: ../../include/text.php:1132
+msgid "anxious"
 msgstr ""
 
-#: ../../include/channel.php:344
-msgid "Default Profile"
+#: ../../include/text.php:1133
+msgid "cranky"
 msgstr ""
 
-#: ../../include/channel.php:1045
-msgid "Create New Profile"
+#: ../../include/text.php:1134
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/channel.php:1065
-msgid "Visible to everybody"
+#: ../../include/text.php:1135
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/channel.php:1138 ../../include/channel.php:1257
-msgid "Gender:"
+#: ../../include/text.php:1136
+msgid "depressed"
 msgstr ""
 
-#: ../../include/channel.php:1140 ../../include/channel.php:1312
-msgid "Homepage:"
+#: ../../include/text.php:1137
+msgid "motivated"
 msgstr ""
 
-#: ../../include/channel.php:1141
-msgid "Online Now"
+#: ../../include/text.php:1138
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/channel.php:1262
-msgid "Like this channel"
+#: ../../include/text.php:1139
+msgid "surprised"
 msgstr ""
 
-#: ../../include/channel.php:1286
-msgid "j F, Y"
+#: ../../include/text.php:1314
+msgid "May"
 msgstr ""
 
-#: ../../include/channel.php:1287
-msgid "j F"
+#: ../../include/text.php:1391 ../../include/text.php:1395
+msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/channel.php:1294
-msgid "Birthday:"
+#: ../../include/text.php:1397
+msgid "unknown"
 msgstr ""
 
-#: ../../include/channel.php:1307
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../include/text.php:1433
+msgid "remove category"
 msgstr ""
 
-#: ../../include/channel.php:1310
-msgid "Sexual Preference:"
+#: ../../include/text.php:1510
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/channel.php:1316
-msgid "Tags:"
+#: ../../include/text.php:1780
+msgid "Page layout"
 msgstr ""
 
-#: ../../include/channel.php:1318
-msgid "Political Views:"
+#: ../../include/text.php:1780
+msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/channel.php:1320
-msgid "Religion:"
+#: ../../include/text.php:1808
+msgid "Page content type"
 msgstr ""
 
-#: ../../include/channel.php:1324
-msgid "Hobbies/Interests:"
+#: ../../include/text.php:1941
+msgid "activity"
 msgstr ""
 
-#: ../../include/channel.php:1326
-msgid "Likes:"
+#: ../../include/text.php:2255
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/channel.php:1328
-msgid "Dislikes:"
+#: ../../include/text.php:2261
+msgid "Pages"
 msgstr ""
 
-#: ../../include/channel.php:1330
-msgid "Contact information and Social Networks:"
+#: ../../include/text.php:2283
+msgid "Import website..."
 msgstr ""
 
-#: ../../include/channel.php:1332
-msgid "My other channels:"
+#: ../../include/text.php:2284
+msgid "Select folder to import"
 msgstr ""
 
-#: ../../include/channel.php:1334
-msgid "Musical interests:"
+#: ../../include/text.php:2285
+msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../include/channel.php:1336
-msgid "Books, literature:"
+#: ../../include/text.php:2286
+msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../include/channel.php:1338
-msgid "Television:"
+#: ../../include/text.php:2287
+msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../include/channel.php:1340
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/text.php:2288
+msgid "Enter path to website files"
 msgstr ""
 
-#: ../../include/channel.php:1342
-msgid "Love/Romance:"
+#: ../../include/text.php:2289
+msgid "Select folder"
 msgstr ""
 
-#: ../../include/channel.php:1344
-msgid "Work/employment:"
+#: ../../include/text.php:2290
+msgid "Export website..."
 msgstr ""
 
-#: ../../include/channel.php:1346
-msgid "School/education:"
+#: ../../include/text.php:2291
+msgid "Export to a zip file"
 msgstr ""
 
-#: ../../include/channel.php:1369
-msgid "Like this thing"
+#: ../../include/text.php:2292
+msgid "website.zip"
 msgstr ""
 
-#: ../../include/channel.php:2103
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/text.php:2293
+msgid "Enter a name for the zip file."
 msgstr ""
 
-#: ../../include/network.php:756
-msgid "view full size"
+#: ../../include/text.php:2294
+msgid "Export to cloud files"
 msgstr ""
 
-#: ../../include/network.php:1490
-msgid "No Subject"
+#: ../../include/text.php:2295
+msgid "/path/to/export/folder"
 msgstr ""
 
-#: ../../include/network.php:1746
-msgid "OStatus"
+#: ../../include/text.php:2296
+msgid "Enter a path to a cloud files destination."
 msgstr ""
 
-#: ../../include/network.php:1747
-msgid "GNU-Social"
+#: ../../include/text.php:2297
+msgid "Specify folder"
 msgstr ""
 
-#: ../../include/network.php:1748
-msgid "RSS/Atom"
+#: ../../include/photos.php:111
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/network.php:1751
-msgid "Facebook"
+#: ../../include/photos.php:118
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/network.php:1752
-msgid "Zot"
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/network.php:1753
-msgid "LinkedIn"
+#: ../../include/photos.php:297
+msgid "a new photo"
 msgstr ""
 
-#: ../../include/network.php:1754
-msgid "XMPP/IM"
+#: ../../include/photos.php:301
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/network.php:1755
-msgid "MySpace"
+#: ../../include/photos.php:511
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/attach.php:250 ../../include/attach.php:338
-msgid "Item was not found."
+#: ../../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/attach.php:499
-msgid "No source file."
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/attach.php:521
-msgid "Cannot locate file to replace"
+#: ../../include/bbcode.php:189
+#, php-format
+msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/attach.php:539
-msgid "Cannot locate file to revise/update"
+#: ../../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/attach.php:670
+#: ../../include/bbcode.php:272
 #, php-format
-msgid "File exceeds size limit of %d"
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/attach.php:684
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/attach.php:854
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/bbcode.php:357
+msgid "spoiler"
 msgstr ""
 
-#: ../../include/attach.php:867
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/bbcode.php:1028
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/attach.php:922 ../../include/attach.php:938
-msgid "Path not available."
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/attach.php:984 ../../include/attach.php:1142
-msgid "Empty pathname"
+#: ../../include/channel.php:67
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/attach.php:1010
-msgid "duplicate filename or path"
+#: ../../include/channel.php:70
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/attach.php:1032
-msgid "Path not found."
+#: ../../include/channel.php:181
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/attach.php:1096
-msgid "mkdir failed."
+#: ../../include/channel.php:193
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/attach.php:1100
-msgid "database storage failed."
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/attach.php:1148
-msgid "Empty path"
+#: ../../include/channel.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/message.php:32
-msgid "Unable to determine sender."
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/message.php:69
-msgid "No recipient provided."
+#: ../../include/channel.php:344
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/message.php:74
-msgid "[no subject]"
+#: ../../include/channel.php:1045
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/message.php:225
-msgid "Stored post could not be verified."
+#: ../../include/channel.php:1065
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Remote authentication"
+#: ../../include/channel.php:1138 ../../include/channel.php:1252
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Click to authenticate to your home hub"
+#: ../../include/channel.php:1140 ../../include/channel.php:1307
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/nav.php:140 ../../boot.php:1705
-msgid "Logout"
+#: ../../include/channel.php:1141
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/nav.php:140
-msgid "End this session"
+#: ../../include/channel.php:1257
+msgid "Like this channel"
 msgstr ""
 
-#: ../../include/nav.php:103
-msgid "Your profile page"
+#: ../../include/channel.php:1281
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/nav.php:105
-msgid "Manage/Edit profiles"
+#: ../../include/channel.php:1282
+msgid "j F"
 msgstr ""
 
-#: ../../include/nav.php:107
-msgid "Edit your profile"
+#: ../../include/channel.php:1289
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/nav.php:130
-msgid "Sign in"
+#: ../../include/channel.php:1302
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/nav.php:155
-msgid "Get me home"
+#: ../../include/channel.php:1305
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/nav.php:157
-msgid "Log me out of this site"
+#: ../../include/channel.php:1311
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/nav.php:162
-msgid "Create an account"
+#: ../../include/channel.php:1313
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/nav.php:174
-msgid "Help and documentation"
+#: ../../include/channel.php:1315
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/nav.php:178
-msgid "Applications, utilities, links, games"
+#: ../../include/channel.php:1319
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/nav.php:180
-msgid "Search site @name, #tag, ?docs, content"
+#: ../../include/channel.php:1321
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/nav.php:182
-msgid "Channel Directory"
+#: ../../include/channel.php:1323
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/nav.php:194
-msgid "Your grid"
+#: ../../include/channel.php:1325
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/nav.php:195
-msgid "View your network/grid"
+#: ../../include/channel.php:1327
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/nav.php:196
-msgid "Mark all grid notifications seen"
+#: ../../include/channel.php:1329
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/nav.php:198
-msgid "Channel home"
+#: ../../include/channel.php:1331
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/nav.php:199
-msgid "View your channel home"
+#: ../../include/channel.php:1333
+msgid "Television:"
 msgstr ""
 
-#: ../../include/nav.php:200
-msgid "Mark all channel notifications seen"
+#: ../../include/channel.php:1335
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Notices"
+#: ../../include/channel.php:1337
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Notifications"
+#: ../../include/channel.php:1339
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/nav.php:207
-msgid "View all notifications"
+#: ../../include/channel.php:1341
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/nav.php:210
-msgid "Private mail"
+#: ../../include/channel.php:1364
+msgid "Like this thing"
 msgstr ""
 
-#: ../../include/nav.php:211
-msgid "View your private messages"
+#: ../../include/channel.php:2098
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../include/nav.php:212
-msgid "Mark all private messages seen"
+#: ../../include/message.php:32
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/nav.php:218
-msgid "Event Calendar"
+#: ../../include/message.php:69
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/nav.php:219
-msgid "View events"
+#: ../../include/message.php:74
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/nav.php:220
-msgid "Mark all events seen"
+#: ../../include/message.php:225
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/nav.php:223
-msgid "Manage Your Channels"
+#: ../../include/security.php:117
+msgid "guest:"
 msgstr ""
 
-#: ../../include/nav.php:225
-msgid "Account/Channel Settings"
+#: ../../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/nav.php:233
-msgid "Site Setup and Configuration"
+#: ../../include/items.php:808 ../../include/items.php:855
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/nav.php:297
-msgid "@name, #tag, ?doc, content"
+#: ../../include/items.php:1046
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/nav.php:298
-msgid "Please wait..."
+#: ../../include/items.php:1048
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/nav.php:300
-msgid "Add Apps"
+#: ../../include/items.php:1050
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/photos.php:115
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/items.php:1052
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/photos.php:122
-msgid "Image file is empty."
+#: ../../include/items.php:1054
+#, php-format
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/photos.php:260
-msgid "Photo storage failed."
+#: ../../include/items.php:1056
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/photos.php:300
-msgid "a new photo"
+#: ../../include/items.php:1058
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/photos.php:304
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+#: ../../include/items.php:1060
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/photos.php:519
-msgid "Upload New Photos"
+#: ../../include/items.php:3828
+msgid "Privacy group is empty."
 msgstr ""
 
-#: ../../include/security.php:117
-msgid "guest:"
+#: ../../include/items.php:3835
+#, php-format
+msgid "Privacy group: %s"
 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/items.php:3847
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/items.php:4196
+msgid "profile photo"
 msgstr ""
 
-#: ../../include/import.php:90
-msgid "Channel clone failed. Import failed."
+#: ../../include/items.php:4392
+#, php-format
+msgid "[Edited %s]"
 msgstr ""
 
-#: ../../include/import.php:100
-msgid "Cloned channel not found. Import failed."
+#: ../../include/items.php:4392
+msgctxt "edit_activity"
+msgid "Post"
 msgstr ""
 
-#: ../../include/import.php:1373
-msgid "Unable to import element \""
+#: ../../include/items.php:4392
+msgctxt "edit_activity"
+msgid "Comment"
 msgstr ""
 
 #: ../../include/acl_selectors.php:208
@@ -13128,6 +12736,68 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 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/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 e54ab9680..87c649581 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -103,7 +103,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');
-- 
cgit v1.2.3


From 8caa4d9e37497645e3bd02aff2975f7851ee9837 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 19 Mar 2017 19:43:00 -0700
Subject: 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;
-- 
cgit v1.2.3


From 5915f31950a7b2314a6718854b7808475d394b44 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 19 Mar 2017 21:39:28 -0700
Subject: 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 ];
+
+
+}
+
+
-- 
cgit v1.2.3


From e97dd48b4c046bac86322d91a13fd55d0cf3a99f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 19:41:03 -0700
Subject: 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 4234ba3fd..9adef1795 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -256,6 +256,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 87c649581..452fd429d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -104,7 +104,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');
-- 
cgit v1.2.3


From d95f7efea704069a49fc2d63a88dcba5fd80381f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 19:50:09 -0700
Subject: 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;
 	}
 
-- 
cgit v1.2.3


From 515f1e76b05c5b4544b7ee624d73cc3b7878d5ea Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 20 Mar 2017 21:53:39 -0700
Subject: 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
-- 
cgit v1.2.3


From 542fa4a08c3f58d60c729ee166a2c4dc92f7524e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 00:40:19 -0700
Subject: 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 452fd429d..564db3324 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -103,8 +103,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');
-- 
cgit v1.2.3


From b03cd330e5fe4ede362d77aa2269a3d0dccde62d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 20:11:48 -0700
Subject: 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 34fedb14e..a9e7c883e 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 62c7f1c12..de947fd4b 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -446,7 +446,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') {
+function photos_albums_list($channel, $observer, $sort_key = 'display_path', $direction = 'asc') {
 
 	$channel_id     = $channel['channel_id'];
 	$observer_xchan = (($observer) ? $observer['xchan_hash'] : '');
@@ -459,16 +459,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
 
@@ -480,11 +495,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;
 		}
@@ -495,7 +511,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 = '';
 
@@ -508,6 +524,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'))
@@ -566,12 +583,15 @@ function photos_list_photos($channel, $observer, $album = '') {
  * @return boolean
  */
 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 c02499625..0a2073272 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3130,3 +3130,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 4c0bd5a1b..c565ccaf1 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 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_photos}}</a></li>
 		{{if $albums}}
 		{{foreach $albums as $al}}
-		{{if $al.text}}
-		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.text}}</a></li>
+		{{if $al.shorttext}}
+		<li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge badge-default float-right">{{$al.total}}</span>{{$al.shorttext}}</a></li>
 		{{/if}}
 		{{/foreach}}
 		{{/if}}
-- 
cgit v1.2.3


From e49c59959b328d28b05b484bd7dbe49198fc5710 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 21:00:48 -0700
Subject: 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)
-- 
cgit v1.2.3


From 032b6f193df3e9de1e0af1a742f047b4b3e29023 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 21:13:14 -0700
Subject: photos_album_exists() requires an observer to work correctly; provide
 it.

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

diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index a9e7c883e..f7786c3fa 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 de947fd4b..49c2d66f5 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -582,9 +582,8 @@ function photos_list_photos($channel, $observer, $album = '') {
  * @param string $album name of the album
  * @return boolean
  */
-function photos_album_exists($channel_id, $album) {
-
-	$sql_extra = permissions_sql($channel_id);
+function photos_album_exists($channel_id, $observer_hash, $album) {
+	$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),
-- 
cgit v1.2.3


From 9d0e2cbd89d69609b9173511eed53b6033008911 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 21 Mar 2017 22:05:36 -0700
Subject: 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 f7786c3fa..2ad58eb07 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 49c2d66f5..e73428478 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -623,14 +623,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)
 		);
@@ -638,7 +639,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;
-- 
cgit v1.2.3


From ea5a7180c7a6ae992a661c43db9503f085d41d6d Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 12:41:16 -0700
Subject: 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 2ad58eb07..dca58c15a 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' : '');
 	 		}
 	
 	
-- 
cgit v1.2.3


From f1da00302091c6b9005083d41686934385e97cf8 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 16:11:38 -0700
Subject: 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 dca58c15a..d993c481e 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 e73428478..a3869a72e 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -459,23 +459,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;
-- 
cgit v1.2.3


From fe5f109af5f49811639779cf77dc25809be1b2a9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 19:31:43 -0700
Subject: 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($os_basepath))
+		os_mkdir($os_basepath,STORAGE_DEFAULT_PERMISSIONS, true);
 
-	if(! is_dir($basepath))
-		os_mkdir($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.');
 		}
 	}
-- 
cgit v1.2.3


From a8a6d807ff0530555434e45d0ceb5951db5fa7a5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 22 Mar 2017 21:40:43 -0700
Subject: 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}}
-- 
cgit v1.2.3


From 954176cfc3e5c49e9ed74749bd52d2c8ff3c3852 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 14:22:37 +0200
Subject: bump version

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

diff --git a/boot.php b/boot.php
index 131699153..07d21fd06 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ require_once('include/hubloc.php');
 
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '2.3.1' );
+define ( 'STD_VERSION',             '2.3.2' );
 define ( 'ZOT_REVISION',            '1.2' );
 
 define ( 'DB_UPDATE_VERSION',       1188  );
-- 
cgit v1.2.3


From e90e4e4a5957a8902532358ac22bffed009bb245 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 14:45:50 +0200
Subject: css fixes

---
 view/theme/redbasic/css/style.css | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 156df07ff..601124227 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -878,14 +878,22 @@ margin-right: 50px;
 	list-style-type: none;
 }
 
-.generic-icons {
+.generic-icons,
+a .generic-icons {
 	font-size: 1rem;
 	margin-right: 0.5rem;
+	color: $font_colour;
+}
+
+.generic-icons:hover,
+a .generic-icons:hover {
+	color: $font_colour;
 }
 
 .generic-icons-right {
 	font-size: 1rem;
 	margin-left: 0.5rem;
+	color: $font_colour;
 }
 
 
@@ -901,7 +909,8 @@ margin-right: 50px;
 
 .drop-icons,
 a .drop-icons {
-	font-size: 1.2em;
+	font-size: 1rem;
+	color: $font_colour;
 	text-decoration: none;
 	cursor: pointer;
 }
-- 
cgit v1.2.3


From 7033966bb860ce21220e21d8feefc574fa9f88a7 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 15:16:41 +0200
Subject: create channel_store_lowlevel()

---
 include/channel.php | 76 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/include/channel.php b/include/channel.php
index f88a2f8aa..7ad4c6a4c 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -242,25 +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
 		and channel_guid = '%s' limit 1",
@@ -1990,6 +1987,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) {
 
@@ -2263,4 +2299,4 @@ function channel_codeallowed($channel_id) {
 	if(($x) && ($x['channel_pageflags'] & PAGE_ALLOWCODE))
 		return true;
 	return false;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 29c9972b868468e3d37c8ed79a458288d3e35de0 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 15:19:54 +0200
Subject: missing closing bracket and semicolon

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

diff --git a/include/channel.php b/include/channel.php
index 7ad4c6a4c..1bdd5a478 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -258,6 +258,7 @@ function create_identity($arr) {
 			'channel_expire_days' => intval($expire),
 			'channel_timezone'    => App::$timezone
 		]
+	);
 
 	$r = q("select * from channel where channel_account_id = %d
 		and channel_guid = '%s' limit 1",
-- 
cgit v1.2.3


From 3b6a0d8e5cb787bace27aee67f7ae0f4130e3132 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 29 Mar 2017 15:55:21 +0200
Subject: remove hubzilla.site from directory fallback servers until further
 notice

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

diff --git a/boot.php b/boot.php
index 07d21fd06..b9c5bfd89 100755
--- a/boot.php
+++ b/boot.php
@@ -81,7 +81,7 @@ define ( 'DIRECTORY_REALM',            'RED_GLOBAL');
 define ( 'DIRECTORY_FALLBACK_MASTER',  'https://gravizot.de');
 
 $DIRECTORY_FALLBACK_SERVERS = array( 
-	'https://hubzilla.site',
+	//'https://hubzilla.site',
 	'https://hubzilla.zottel.net',
 	'https://my.federated.social',
 	'https://hubzilla.nl',
-- 
cgit v1.2.3