Merge branch 'dev' into oauth2

Zotlabs/Module/Directory.php

@@ -17,7 +17,7 @@ class Directory extends \Zotlabs\Web\Controller {
 				intval(local_channel()),
 				dbesc($_GET['ignore'])
 			);
-			goaway(z_root() . '/directory?suggest=1');
+			goaway(z_root() . '/directory?f=&suggest=1');
 		}
 	
 		$observer = get_observer_hash();

Zotlabs/Module/Display.php

@@ -215,6 +215,7 @@ class Display extends \Zotlabs\Web\Controller {
 			$pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']),intval(\App::$pager['start']));
 
 			if($load || ($checkjs->disabled()) || ($module_format !== 'html')) {
+
 				$r = null;
 
 				require_once('include/channel.php');
@@ -235,7 +236,7 @@ class Display extends \Zotlabs\Web\Controller {
 					}
 				}
 
-				if($r === null) {
+				if(! $r) {
 
 					// in case somebody turned off public access to sys channel content using permissions
 					// make that content unsearchable by ensuring the owner uid can't match
@@ -281,7 +282,7 @@ class Display extends \Zotlabs\Web\Controller {
 				}
 			}
 
-			if($r === null) {
+			if(! $r) {
 				// in case somebody turned off public access to sys channel content using permissions
 				// make that content unsearchable by ensuring the owner_xchan can't match
 				if(! perm_is_allowed($sysid,$observer_hash,'view_stream'))

Zotlabs/Module/Email_validation.php

@@ -7,12 +7,11 @@ class Email_validation extends \Zotlabs\Web\Controller {
 
 	function post() {
 
+		$success = false;
 		if($_POST['token']) {
 			// This will redirect internally on success unless the channel is auto_created
-			if(! account_approve(trim(basename($_POST['token'])))) {
+			if(account_approve(trim(basename($_POST['token'])))) {
-				notice('Token verification failed.');
+				$success = true;
-			}
-			else {
 				if(get_config('system','auto_channel_create')) {
 					$next_page = get_config('system', 'workflow_channel_next', 'profiles');		
 				}
@@ -21,7 +20,9 @@ class Email_validation extends \Zotlabs\Web\Controller {
 				}
 			}
 		}
-
+		if(! $success) {
+			notice( t('Token verification failed.') . EOL);
+		}
 	}
 
 

Zotlabs/Module/Follow.php

@@ -17,18 +17,23 @@ class Follow extends \Zotlabs\Web\Controller {
 		$url = notags(trim($_REQUEST['url']));
 		$return_url = $_SESSION['return_url'];
 		$confirm = intval($_REQUEST['confirm']);
-	
+		$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);	
 		$channel = \App::get_channel();
 
-		$result = new_contact($uid,$url,$channel,true,$confirm);
+		$result = new_contact($uid,$url,$channel,$interactive,$confirm);
 		
 		if($result['success'] == false) {
 			if($result['message'])
 				notice($result['message']);
+			if($interactive) {
 				goaway($return_url);
 			}
+			else {
+				json_return_and_die($result);
+			}
+		}
 	
-		info( t('Channel added.') . EOL);
+		info( t('Connection added.') . EOL);
 	
 		$clone = array();
 		foreach($result['abook'] as $k => $v) {
@@ -53,7 +58,12 @@ class Follow extends \Zotlabs\Web\Controller {
 		if(($can_view_stream) || ($result['abook']['xchan_network'] === 'rss'))
 			\Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id']));
 	
+		if($interactive) {
 			goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
+		}
+		else {
+			json_return_and_die([ 'success' => true ]);
+		}
 	
 	}
 	

Zotlabs/Module/Go.php

@@ -36,7 +36,7 @@ class Go extends \Zotlabs\Web\Controller {
 			'cover_photo'   => t('Upload a cover photo'),
 			'profiles'      => t('Edit your default profile'),
 			'suggest'       => t('View friend suggestions'),
-			'directory'     => t('View the directory to find other interesting channels'),
+			'directory'     => t('View the channel directory'),
 			'settings'      => t('View/edit your channel settings'),
 			'help'          => t('View the site or project documentation'),
 			'channel/' . $channel['channel_address']       => t('Visit your channel homepage'),

Zotlabs/Module/Register.php

@@ -123,9 +123,6 @@ class Register extends \Zotlabs\Web\Controller {
 		if($policy == REGISTER_OPEN ) {
 			if($email_verify) {
 				$res = verify_email_address($result);
-				if($res) {
-					info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
-				}
 			}
 			else {
 				$res = send_register_success_email($result['email'],$result['password']);
@@ -133,7 +130,8 @@ class Register extends \Zotlabs\Web\Controller {
 			if($res) {
 				if($invite_code) {
 					info( t('Registration successful. Continue to create your first channel...') . EOL ) ;
-				} else {
+				} 
+				else {
 					info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ;
 				}
 			}

Zotlabs/Module/Settings/Featured.php

@@ -58,6 +58,9 @@ class Featured {
 
 		call_hooks('feature_settings', $settings_addons);
 		
+		$this->sortpanels($settings_addons);
+
+			
 		$tpl = get_markup_template("settings_addons.tpl");
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_featured"),
@@ -68,4 +71,14 @@ class Featured {
 		return $o;
 	}
 
+	function sortpanels(&$s) {
+		$a = explode('<div class="panel">',$s);
+		if($a) {
+			usort($a,'featured_sort');
+			$s = implode('<div class="panel">',$a);
 		}
+	}
+
+}
+
+

Zotlabs/Module/Thing.php

@@ -20,6 +20,11 @@ class Thing extends \Zotlabs\Web\Controller {
 
 		$channel    = \App::get_channel();
 
+		if($_SERVER['REQUEST_METHOD'] === 'GET' && argc() < 2) {
+			profile_load($channel['channel_address']);
+		}
+
+
 		$term_hash = (($_REQUEST['term_hash']) ? $_REQUEST['term_hash'] : '');
 
 		$name = escape_tags($_REQUEST['term']);

Zotlabs/Module/Wfinger.php

@@ -123,7 +123,8 @@ class Wfinger extends \Zotlabs\Web\Controller {
 			$result['properties'] = [
 					'http://webfinger.net/ns/name'   => $r[0]['channel_name'],
 					'http://xmlns.com/foaf/0.1/name' => $r[0]['channel_name'],
-					'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey']
+					'https://w3id.org/security/v1#publicKeyPem' => $r[0]['xchan_pubkey'],
+					'http://purl.org/zot/federation' => 'zot'
 			];
 	
 			foreach($aliases as $alias) 

Zotlabs/Update/_1205.php

@@ -7,6 +7,17 @@ class _1205 {
 	function run() {
 
 		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+
+			q("ALTER TABLE item DROP INDEX title");
+			q("ALTER TABLE item DROP INDEX body");
+			q("ALTER TABLE item DROP INDEX allow_cid");
+			q("ALTER TABLE item DROP INDEX allow_gid");
+			q("ALTER TABLE item DROP INDEX deny_cid");
+			q("ALTER TABLE item DROP INDEX deny_gid");
+			q("ALTER TABLE item DROP INDEX item_flags");
+			q("ALTER TABLE item DROP INDEX item_restrict");
+			q("ALTER TABLE item DROP INDEX aid");
+
 			$r = q("ALTER TABLE item 
 				DROP INDEX item_private,
 				ADD INDEX uid_item_private (uid, item_private),

Zotlabs/Update/_1207.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1207 {
+
+	function run() {
+
+		if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+			$r = q("ALTER TABLE item 
+				DROP INDEX resource_type
+			");
+
+			if($r)
+				return UPDATE_SUCCESS;
+			return UPDATE_FAILED;
+		}
+		else {
+			return UPDATE_SUCCESS;
+		}
+
+	}
+
+}

Zotlabs/Web/HTTPSig.php

@@ -3,14 +3,22 @@
 namespace Zotlabs\Web;
 
 /**
- * Implements HTTP Signatures per draft-cavage-http-signatures-07
+ * @brief Implements HTTP Signatures per draft-cavage-http-signatures-07.
+ *
+ * @see https://tools.ietf.org/html/draft-cavage-http-signatures-07
  */
-
-
 class HTTPSig {
 
-	// See RFC5843
+	/**
-
+	 * @brief RFC5843
+	 *
+	 * @see https://tools.ietf.org/html/rfc5843
+	 *
+	 * @param string $body The value to create the digest for
+	 * @param boolean $set (optional, default true)
+	 *   If set send a Digest HTTP header
+	 * @return string The generated digest of $body
+	 */
 	static function generate_digest($body, $set = true) {
 		$digest = base64_encode(hash('sha256', $body, true));
 
@@ -40,6 +48,7 @@ class HTTPSig {
 		if(is_array($data) && $data['header']) {
 			if(! $data['success'])
 				return $result;
+
 			$h = new \Zotlabs\Web\HTTPHeaders($data['header']);
 			$headers = $h->fetcharr();
 			$body = $data['body'];
@@ -155,9 +164,15 @@ class HTTPSig {
 		logger('Content_Valid: ' . (($result['content_valid']) ? 'true' : 'false'));
 
 		return $result;
-
 	}
 
+	/**
+	 * @brief
+	 *
+	 * @param string $id
+	 * @return boolean|string
+	 *   false if no pub key found, otherwise return the pub key
+	 */
 	function get_activitypub_key($id) {
 
 		if(strpos($id,'acct:') === 0) {
@@ -181,18 +196,32 @@ class HTTPSig {
 
 			if($j['id'] !== $id)
 				return false;
+
 			if(array_key_exists('publicKey',$j) && array_key_exists('publicKeyPem',$j['publicKey'])) {
 				return($j['publicKey']['publicKeyPem']);
 			}
 		}
+
 		return false;
 	}
 
-
+	/**
-
+	 * @brief
-
+	 *
-	static function create_sig($request,$head,$prvkey,$keyid = 'Key',$send_headers = false,$auth = false,$alg = 'sha256', 
+	 * @param string $request
-		$crypt_key = null, $crypt_algo = 'aes256ctr') {
+	 * @param array $head
+	 * @param string $prvkey
+	 * @param string $keyid (optional, default 'Key')
+	 * @param boolean $send_headers (optional, default false)
+	 *   If set send a HTTP header
+	 * @param boolean $auth (optional, default false)
+	 * @param string $alg (optional, default 'sha256')
+	 * @param string $crypt_key (optional, default null)
+	 * @param string $crypt_algo (optional, default 'aes256ctr')
+	 * @return array
+	 */
+	static function create_sig($request, $head, $prvkey, $keyid = 'Key', $send_headers = false, $auth = false,
+			$alg = 'sha256', $crypt_key = null, $crypt_algo = 'aes256ctr') {
 
 		$return_headers = [];
 
@@ -236,11 +265,19 @@ class HTTPSig {
 		else {
 			$return_headers[] = $sighead;
 		}
+
 		return $return_headers;
 	}
 
-
+	/**
-
+	 * @brief
+	 *
+	 * @param string $request
+	 * @param array  $head
+	 * @param string $prvkey
+	 * @param string $alg (optional) default 'sha256'
+	 * @return array
+	 */
 	static function sign($request, $head, $prvkey, $alg = 'sha256') {
 
 		$ret = [];
@@ -257,6 +294,7 @@ class HTTPSig {
 				$headers .= strtolower($k) . ': ' . trim($v) . "\n";
 				if($fields)
 					$fields .= ' ';
+
 				$fields .= strtolower($k);
 			}
 			// strip the trailing linefeed
@@ -271,6 +309,16 @@ class HTTPSig {
 		return $ret;
 	}
 
+	/**
+	 * @brief
+	 *
+	 * @param string $header
+	 * @return array associate array with
+	 *   - \e string \b keyID
+	 *   - \e string \b algorithm
+	 *   - \e array  \b headers
+	 *   - \e string \b signature
+	 */
 	static function parse_sigheader($header) {
 
 		$ret = [];
@@ -297,6 +345,17 @@ class HTTPSig {
 	}
 
 
+	/**
+	 * @brief
+	 *
+	 * @param string $header
+	 * @param string $prvkey (optional), if not set use site private key
+	 * @return array|string associative array, empty string if failue
+	 *   - \e string \b iv
+	 *   - \e string \b key
+	 *   - \e string \b alg
+	 *   - \e string \b data
+	 */
 	static function decrypt_sigheader($header, $prvkey = null) {
 
 		$iv = $key = $alg = $data = null;
@@ -319,10 +378,8 @@ class HTTPSig {
 		if($iv && $key && $alg && $data) {
 			return crypto_unencapsulate([ 'iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data ] , $prvkey);
 		}
+
 		return '';
-
 	}
 
 }
-
-

Zotlabs/Widget/Newmember.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+class Newmember {
+
+	function widget($arr) {
+
+		if(! local_channel())
+			return EMPTY_STR;
+
+		$c = \App::get_channel();
+		if(! $c)
+			return EMPTY_STR;
+
+
+		$a = \App::get_account();
+		if(! $a)
+			return EMPTY_STR;
+
+
+		if(datetime_convert('UTC','UTC',$a['account_created']) < datetime_convert('UTC','UTC', 'now - 60 days'))
+			return EMPTY_STR;
+
+		// This could be a new account that was used to clone a very old channel
+
+		$ob = \App::get_observer();
+		if($ob && array_key_exists('xchan_name_date',$ob) && $ob['xchan_name_date'] < datetime_convert('UTC','UTC','now - 60 days'))
+			return EMPTY_STR;
+
+
+		$options = [
+			t('Profile Creation'),
+			[ 
+				'profile_photo' => t('Upload profile photo'),
+				'cover_photo'   => t('Upload cover photo'),
+				'profiles'      => t('Edit your profile'),
+			],
+
+			t('Find and Connect with others'),
+			[
+				'directory'              => t('View the directory'),
+				'directory?f=&suggest=1' => t('View friend suggestions'),
+				'connections'            => t('Manage your connections'),
+			],
+
+			t('Communicate'),
+			[
+				'channel/' . $channel['channel_address']       => t('View your channel homepage'),
+				'network'       => t('View your network stream'),
+			],
+
+			t('Miscellaneous'),
+			[
+				'settings'      => t('Settings'),
+				'help'    	    => t('Documentation'),
+			]
+		];
+
+		$site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false);
+		$net_firehose  = ((get_config('system','disable_discover_tab',1)) ? false : true);
+
+
+		// hack to put this in the correct spot of the array
+
+		if($site_firehose || $net_firehose) {
+			$options[5]['pubstream'] = t('View public stream');
+		}
+
+		$o = replace_macros(get_markup_template('new_member.tpl'), [
+			'$title' => t('New Member Links'),
+			'$options' => $options
+
+		]);
+
+		return $o;
+
+	}
+
+}
+
+
+	

boot.php

@@ -50,10 +50,11 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.3' );
+define ( 'STD_VERSION',             '3.3.2' );
-define ( 'ZOT_REVISION',            '1.3' );
+define ( 'ZOT_REVISION',            '6.0a' );
 
-define ( 'DB_UPDATE_VERSION',       1206 );
+
+define ( 'DB_UPDATE_VERSION',       1207 );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 

include/account.php

@@ -530,7 +530,7 @@ function account_deny($hash) {
 
 function account_approve($hash) {
 
-	$ret = array('success' => false);
+	$ret = false;
 
 	// Note: when the password in the register table is 'verify', the uid actually contains the account_id
 

include/bbcode.php

@@ -668,6 +668,31 @@ function bb_fixtable_lf($match) {
 
 }
 
+function bbtopoll($s) {
+
+	$pl = [];
+
+	$match = '';
+	if(! preg_match("/\[poll=(.*?)\](.*?)\[\/poll\]/ism",$s,$match)) {
+		return null;
+	}
+	$pl['poll_id'] = $match[1];
+	$pl['poll_question'] = $match[2];
+
+	$match = '';
+	if(preg_match_all("/\[poll\-answer=(.*?)\](.*?)\[\/poll\-answer\]/is",$s,$match,PREG_SET_ORDER)) {
+		$pl['answer'] = [];
+		foreach($match as $m) {
+			$ans = [ 'answer_id' => $m[1], 'answer_text' => $m[2] ];
+			$pl['answer'][] = $ans;
+		}
+	}
+
+	return $pl;
+
+}
+
+
 function parseIdentityAwareHTML($Text) {
 
 	// Hide all [noparse] contained bbtags by spacefying them
@@ -766,6 +791,11 @@ function bbcode($Text, $options = []) {
 
 	$ev = bbtoevent($Text);
 
+	// and the same with polls
+
+	$pl = bbtopoll($Text);
+
+
 	// process [observer] tags before we do anything else because we might
 	// be stripping away stuff that then doesn't need to be worked on anymore
 

include/conversation.php

@@ -1005,7 +1005,7 @@ function thread_author_menu($item, $mode = '') {
 		$contact = App::$contacts[$item['author_xchan']];
 	else
 		if($local_channel && $item['author']['xchan_addr'])
-			$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']);
+			$follow_url = z_root() . '/follow/?f=&url=' . urlencode($item['author']['xchan_addr']) . '&interactive=0';
 
 	
 	if($item['uid'] > 0 && author_is_pmable($item['author'],$contact)) {
@@ -1051,8 +1051,8 @@ function thread_author_menu($item, $mode = '') {
 			'menu' => 'follow',
 			'title' => t('Connect'),
 			'icon' => 'fw',
-			'action' => '',
+			'action' => 'doFollowAuthor(\'' . $follow_url . '\'); return false;',
-			'href' => $follow_url
+			'href' => '#',
 		];
 	}
 

include/datetime.php

@@ -125,7 +125,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
  */
 function dob($dob) {
 
-	if ($dob === '0000-00-00')
+	if ($dob === '0000-00-00' || $dob === '')
 		$value = '';
 	else
 		$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));

include/event.php

@@ -1322,3 +1322,25 @@ function translate_type($type) {
 		return [$type, t('Other') . ' (' . $type . ')'];
 	}
 }
+
+
+function cal_store_lowlevel($arr) {
+
+	$store = [
+		'cal_aid'    => ((array_key_exists('cal_aid',$arr))   ? $arr['cal_aid']   : 0),
+		'cal_uid'    => ((array_key_exists('cal_uid',$arr))   ? $arr['cal_uid']   : 0),
+		'cal_hash'   => ((array_key_exists('cal_hash',$arr))  ? $arr['cal_hash']  : ''),
+		'cal_name'   => ((array_key_exists('cal_name',$arr))  ? $arr['cal_name']  : ''),
+		'uri'        => ((array_key_exists('uri',$arr))       ? $arr['uri']       : ''),
+		'logname'    => ((array_key_exists('logname',$arr))   ? $arr['logname']   : ''),
+		'pass'       => ((array_key_exists('pass',$arr))      ? $arr['pass']      : ''),
+		'ctag'       => ((array_key_exists('ctag',$arr))      ? $arr['ctag']      : ''),
+		'synctoken'  => ((array_key_exists('synctoken',$arr)) ? $arr['synctoken'] : ''),
+		'cal_types'  => ((array_key_exists('cal_types',$arr)) ? $arr['cal_types'] : ''),
+	];
+
+	return create_table_from_array('cal', $store);
+
+}
+
+

include/follow.php

@@ -88,8 +88,17 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 
 		// Premium channel, set confirm before callback to avoid recursion
 
-		if(array_key_exists('connect_url',$j) && ($interactive) && (! $confirm))
+		if(array_key_exists('connect_url',$j) && (! $confirm)) {
+			if($interactive) {
 				goaway(zid($j['connect_url']));
+			}
+			else {
+				$result['message'] = t('Premium channel - please visit:') . ' ' . zid($j['connect_url']);
+				logger('mod_follow: ' . $result['message']);
+				return $result;
+			}
+		}
+				
 				
 
 		// do we have an xchan and hubloc?

include/text.php

@@ -3311,4 +3311,10 @@ function purify_filename($s) {
 	return $s;
 }
 
+// callback for sorting the settings/featured entries.
 
+function featured_sort($a,$b) {
+	$s1 = substr($a,strpos($a,'id='),20);
+	$s2 = substr($b,strpos($b,'id='),20);
+	return(strcmp($s1,$s2));
+}

include/zot.php

@@ -171,6 +171,8 @@ function zot_build_packet($channel, $type = 'notify', $recipients = null, $remot
  *   packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'keychange', 'force_refresh', 'notify', 'auth_check'
  * @param array $recipients
  *   envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts
+ * @param string msg
+ *   optional message
  * @param string $remote_key
  *   optional public site key of target hub used to encrypt entire packet
  *   NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others

tests/unit/Web/HttpSigTest.php

@@ -0,0 +1,125 @@
+<?php
+/*
+ * Copyright (c) 2018 Hubzilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Zotlabs\Tests\Unit\Web;
+
+use phpmock\phpunit\PHPMock;
+use Zotlabs\Tests\Unit\UnitTestCase;
+
+use Zotlabs\Web\HTTPSig;
+
+/**
+ * @brief Unit Test case for HTTPSig class.
+ *
+ * @covers Zotlabs\Web\HTTPSig
+ */
+class PermissionDescriptionTest extends UnitTestCase {
+
+	use PHPMock;
+
+	/**
+	 * @dataProvider generate_digestProvider
+	 */
+	function testGenerate_digest($text, $digest) {
+		$this->assertSame(
+				$digest,
+				HTTPSig::generate_digest($text, false)
+		);
+	}
+	public function generate_digestProvider() {
+		return [
+				'empty body text' => [
+						'',
+						'47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='
+				],
+				'sample body text' => [
+						'body text',
+						'2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI='
+				],
+				'NULL body text' => [
+						null,
+						'47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='
+				],
+		];
+	}
+
+	function testGeneratedDigestsOfDifferentTextShouldNotBeEqual() {
+		$this->assertNotSame(
+				HTTPSig::generate_digest('text1', false),
+				HTTPSig::generate_digest('text2', false)
+		);
+	}
+
+	/**
+	 * Process separation needed for header() check.
+	 * @runInSeparateProcess
+	 */
+	function testGenerate_digestSendsHttpHeader() {
+		$ret = HTTPSig::generate_digest('body text', true);
+
+		$this->assertSame('2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=', $ret);
+		$this->assertContains(
+				'Digest: SHA-256=2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=',
+				xdebug_get_headers(),
+				'HTTP header Digest does not match'
+		);
+	}
+
+	/**
+	 * @uses ::crypto_unencapsulate
+	 */
+	function testDecrypt_sigheader() {
+		$header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"';
+		$result = [
+				'iv' => 'value_iv',
+				'key' => 'value_key',
+				'alg' => 'value_alg',
+				'data' => 'value_data'
+		];
+
+		$this->assertSame($result, HTTPSig::decrypt_sigheader($header, 'site private key'));
+	}
+	/**
+	 * @uses ::crypto_unencapsulate
+	 */
+	function testDecrypt_sigheaderUseSitePrivateKey() {
+		// Create a stub for global function get_config() with expectation
+		$t = $this->getFunctionMock('Zotlabs\Web', 'get_config');
+		$t->expects($this->once())->willReturn('system.prvkey');
+
+		$header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"';
+		$result = [
+				'iv' => 'value_iv',
+				'key' => 'value_key',
+				'alg' => 'value_alg',
+				'data' => 'value_data'
+		];
+
+		$this->assertSame($result, HTTPSig::decrypt_sigheader($header));
+	}
+	function testDecrypt_sigheaderIncompleteHeaderShouldReturnEmptyString() {
+		$header = 'Header: iv="value_iv" key="value_key"';
+
+		$this->assertEmpty(HTTPSig::decrypt_sigheader($header, 'site private key'));
+	}
+}

util/hmessages.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.3\n"
+"Project-Id-Version: 3.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-28 08:31+0100\n"
+"POT-Creation-Date: 2018-03-01 08:51+0100\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"
@@ -149,7 +149,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:130
 #: ../../Zotlabs/Module/Settings/Channel.php:473
 #: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:798
-#: ../../Zotlabs/Module/Register.php:226 ../../include/selectors.php:49
+#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49
 #: ../../include/selectors.php:66 ../../include/selectors.php:104
 #: ../../include/selectors.php:140 ../../include/event.php:1315
 #: ../../include/event.php:1322 ../../include/connections.php:689
@@ -216,7 +216,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Cover_photo.php:281
 #: ../../Zotlabs/Module/Cover_photo.php:294
-#: ../../Zotlabs/Module/Display.php:405 ../../Zotlabs/Module/Network.php:15
+#: ../../Zotlabs/Module/Display.php:406 ../../Zotlabs/Module/Network.php:15
 #: ../../Zotlabs/Module/Filestorage.php:15
 #: ../../Zotlabs/Module/Filestorage.php:70
 #: ../../Zotlabs/Module/Filestorage.php:85
@@ -426,7 +426,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98
 #: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887
 #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242
-#: ../../Zotlabs/Module/Email_validation.php:39
+#: ../../Zotlabs/Module/Email_validation.php:40
 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249
 #: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726
 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
@@ -454,7 +454,7 @@ msgstr ""
 #: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371
 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80
 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35
-#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1054
+#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053
 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85
 #: ../../addon/flattrwidget/flattrwidget.php:124
 #: ../../addon/statusnet/statusnet.php:322
@@ -471,7 +471,7 @@ msgid "Submit"
 msgstr ""
 
 #: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:179
-#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:132
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:124
 #: ../../include/nav.php:469
 msgid "Articles"
 msgstr ""
@@ -1523,24 +1523,24 @@ msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
 #: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Zotlabs/Module/Register.php:254
 msgid "Name or caption"
 msgstr ""
 
 #: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:256
+#: ../../Zotlabs/Module/Register.php:254
 msgid ""
 "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
 "Group\""
 msgstr ""
 
 #: ../../Zotlabs/Module/New_channel.php:134
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Zotlabs/Module/Register.php:256
 msgid "Choose a short nickname"
 msgstr ""
 
 #: ../../Zotlabs/Module/New_channel.php:134
-#: ../../Zotlabs/Module/Register.php:258
+#: ../../Zotlabs/Module/Register.php:256
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address e."
@@ -1548,17 +1548,17 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/New_channel.php:135
-#: ../../Zotlabs/Module/Register.php:259
+#: ../../Zotlabs/Module/Register.php:257
 msgid "Channel role and privacy"
 msgstr ""
 
 #: ../../Zotlabs/Module/New_channel.php:135
-#: ../../Zotlabs/Module/Register.php:259
+#: ../../Zotlabs/Module/Register.php:257
 msgid "Select a channel role with your privacy requirements."
 msgstr ""
 
 #: ../../Zotlabs/Module/New_channel.php:135
-#: ../../Zotlabs/Module/Register.php:259
+#: ../../Zotlabs/Module/Register.php:257
 msgid "Read more about roles"
 msgstr ""
 
@@ -2228,7 +2228,7 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Plugins.php:259
 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89
 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46
-#: ../../Zotlabs/Module/Display.php:409 ../../Zotlabs/Module/Filestorage.php:24
+#: ../../Zotlabs/Module/Display.php:410 ../../Zotlabs/Module/Filestorage.php:24
 #: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3569
 msgid "Item not found."
 msgstr ""
@@ -2278,6 +2278,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Plugins.php:344
 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242
+#: ../../Zotlabs/Widget/Newmember.php:55
 #: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:105
 #: ../../include/nav.php:192
 msgid "Settings"
@@ -2704,7 +2705,7 @@ msgid "Site"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Site.php:290
-#: ../../Zotlabs/Module/Register.php:271
+#: ../../Zotlabs/Module/Register.php:269
 msgid "Registration"
 msgstr ""
 
@@ -3964,7 +3965,11 @@ msgid "Affinity Slider Settings"
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Featured.php:64
-msgid "Feature/Addon Settings"
+msgid "Addon Settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings/Featured.php:65
+msgid "Please save/submit changes to any panel before opening another."
 msgstr ""
 
 #: ../../Zotlabs/Module/Settings/Display.php:139
@@ -5844,11 +5849,16 @@ msgstr ""
 msgid "Unknown error"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_validation.php:35
+#: ../../Zotlabs/Module/Email_validation.php:24
-msgid "Email Verification Required"
+#: ../../Zotlabs/Module/Email_resend.php:12
+msgid "Token verification failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Email_validation.php:36
+msgid "Email Verification Required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Email_validation.php:37
 #, php-format
 msgid ""
 "A verification token was sent to your email address [%s]. Enter that token "
@@ -5856,11 +5866,11 @@ msgid ""
 "for delivery, and check your spam folder if you do not see the message."
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_validation.php:37
+#: ../../Zotlabs/Module/Email_validation.php:38
 msgid "Resend Email"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_validation.php:40
+#: ../../Zotlabs/Module/Email_validation.php:41
 msgid "Validation token"
 msgstr ""
 
@@ -6097,7 +6107,8 @@ msgstr ""
 msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:58
+#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53
+#: ../../include/datetime.php:58
 msgid "Miscellaneous"
 msgstr ""
 
@@ -6272,12 +6283,12 @@ msgstr ""
 msgid "Edit your default profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:38
+#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:43
 msgid "View friend suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Go.php:39
+#: ../../Zotlabs/Module/Go.php:39 ../../Zotlabs/Widget/Newmember.php:42
-msgid "View the directory to find other interesting channels"
+msgid "View the channel directory"
 msgstr ""
 
 #: ../../Zotlabs/Module/Go.php:40
@@ -6355,7 +6366,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:181
 #: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1890
-#: ../../include/features.php:122 ../../include/nav.php:458
+#: ../../include/features.php:114 ../../include/nav.php:458
 msgid "Cards"
 msgstr ""
 
@@ -6379,7 +6390,7 @@ msgstr ""
 msgid "Administrator"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:234
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232
 msgid "Terms of Service"
 msgstr ""
 
@@ -6607,7 +6618,7 @@ msgid "*"
 msgstr ""
 
 #: ../../Zotlabs/Module/Sources.php:96
-#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:238
+#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:274
 msgid "Channel Sources"
 msgstr ""
 
@@ -7096,85 +7107,85 @@ msgstr ""
 msgid "Passwords do not match."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:127 ../../Zotlabs/Module/Register.php:137
+#: ../../Zotlabs/Module/Register.php:132
+msgid "Registration successful. Continue to create your first channel..."
+msgstr ""
+
+#: ../../Zotlabs/Module/Register.php:135
 msgid ""
 "Registration successful. Please check your email for validation instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:135
+#: ../../Zotlabs/Module/Register.php:142
-msgid "Registration successful. Continue to create your first channel..."
-msgstr ""
-
-#: ../../Zotlabs/Module/Register.php:144
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:147
+#: ../../Zotlabs/Module/Register.php:145
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:194
+#: ../../Zotlabs/Module/Register.php:192
 msgid "Registration on this hub is disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:203
+#: ../../Zotlabs/Module/Register.php:201
 msgid "Registration on this hub is by approval only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:204
+#: ../../Zotlabs/Module/Register.php:202
 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:214
+#: ../../Zotlabs/Module/Register.php:212
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:240
+#: ../../Zotlabs/Module/Register.php:238
 #, php-format
 msgid "I accept the %s for this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:247
+#: ../../Zotlabs/Module/Register.php:245
 #, php-format
 msgid "I am over %s years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:252
+#: ../../Zotlabs/Module/Register.php:250
 msgid "Your email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:253
+#: ../../Zotlabs/Module/Register.php:251
 msgid "Choose a password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:254
+#: ../../Zotlabs/Module/Register.php:252
 msgid "Please re-enter your password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:255
+#: ../../Zotlabs/Module/Register.php:253
 msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:260
+#: ../../Zotlabs/Module/Register.php:258
 msgid "no"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:260
+#: ../../Zotlabs/Module/Register.php:258
 msgid "yes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:276
+#: ../../Zotlabs/Module/Register.php:274
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:288 ../../boot.php:1563
+#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1563
 #: ../../include/nav.php:164
 msgid "Register"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:289
+#: ../../Zotlabs/Module/Register.php:287
 msgid ""
 "This site requires email verification. After completing this form, please "
 "check your email for further instructions."
@@ -7245,11 +7256,11 @@ msgstr ""
 msgid "Contents"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:350
+#: ../../Zotlabs/Module/Display.php:351
 msgid "Article"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:402
+#: ../../Zotlabs/Module/Display.php:403
 msgid "Item has been removed."
 msgstr ""
 
@@ -7368,10 +7379,6 @@ msgstr ""
 msgid "View Common Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Email_resend.php:12
-msgid "Token verification failed."
-msgstr ""
-
 #: ../../Zotlabs/Module/Email_resend.php:30
 msgid "Email verification resent"
 msgstr ""
@@ -7596,7 +7603,7 @@ msgstr ""
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:362
+#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:390
 msgid "Suggest Channels"
 msgstr ""
 
@@ -7610,7 +7617,7 @@ msgid "Activity"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1928
-#: ../../include/features.php:95 ../../include/nav.php:497
+#: ../../include/features.php:87 ../../include/nav.php:497
 msgid "Wiki"
 msgstr ""
 
@@ -8654,7 +8661,7 @@ msgstr ""
 msgid "Remove term"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:326
+#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354
 msgid "Saved Searches"
 msgstr ""
 
@@ -8696,7 +8703,7 @@ msgid "See more..."
 msgstr ""
 
 #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53
-#: ../../include/features.php:415
+#: ../../include/features.php:443
 msgid "Saved Folders"
 msgstr ""
 
@@ -8704,6 +8711,54 @@ msgstr ""
 msgid "Click to show more"
 msgstr ""
 
+#: ../../Zotlabs/Widget/Newmember.php:33
+msgid "Profile Creation"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:35
+msgid "Upload profile photo"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:36
+msgid "Upload cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119
+msgid "Edit your profile"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:40
+msgid "Find and Connect with others"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:44
+msgid "Manage your connections"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:47
+msgid "Communicate"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:49
+msgid "View your channel homepage"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:50
+msgid "View your network stream"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:56
+msgid "Documentation"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:67
+msgid "View public stream. Warning: not moderated"
+msgstr ""
+
+#: ../../Zotlabs/Widget/Newmember.php:71
+msgid "New Member Links"
+msgstr ""
+
 #: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60
 msgid "Member registrations waiting for confirmation"
 msgstr ""
@@ -8737,7 +8792,7 @@ msgid "Additional features"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Settings_menu.php:57
-msgid "Feature/Addon settings"
+msgid "Addon settings"
 msgstr ""
 
 #: ../../Zotlabs/Widget/Settings_menu.php:63
@@ -8756,7 +8811,7 @@ msgstr ""
 msgid "Connected apps"
 msgstr ""
 
-#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:168
+#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231
 msgid "Permission Groups"
 msgstr ""
 
@@ -10457,7 +10512,7 @@ msgstr ""
 msgid "Not supported by some microblog services such as Mastodon"
 msgstr ""
 
-#: ../../addon/pubcrawl/pubcrawl.php:1054
+#: ../../addon/pubcrawl/pubcrawl.php:1053
 msgid "ActivityPub Protocol Settings"
 msgstr ""
 
@@ -13281,312 +13336,332 @@ msgstr ""
 msgid "General Features"
 msgstr ""
 
-#: ../../include/features.php:59
-msgid "Multiple Profiles"
-msgstr ""
-
 #: ../../include/features.php:60
-msgid "Ability to create multiple profiles"
-msgstr ""
-
-#: ../../include/features.php:68
 msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../include/features.php:69
+#: ../../include/features.php:61
 msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../include/features.php:77
+#: ../../include/features.php:69
 msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../include/features.php:78
+#: ../../include/features.php:70
 msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../include/features.php:86
+#: ../../include/features.php:78
 msgid "Web Pages"
 msgstr ""
 
-#: ../../include/features.php:87
+#: ../../include/features.php:79
 msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/features.php:96
+#: ../../include/features.php:88
 msgid "Provide a wiki for your channel"
 msgstr ""
 
-#: ../../include/features.php:113
+#: ../../include/features.php:105
 msgid "Private Notes"
 msgstr ""
 
-#: ../../include/features.php:114
+#: ../../include/features.php:106
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr ""
 
-#: ../../include/features.php:123
+#: ../../include/features.php:115
 msgid "Create personal planning cards"
 msgstr ""
 
-#: ../../include/features.php:133
+#: ../../include/features.php:125
 msgid "Create interactive articles"
 msgstr ""
 
-#: ../../include/features.php:141
+#: ../../include/features.php:133
 msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../include/features.php:142
+#: ../../include/features.php:134
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/features.php:150
+#: ../../include/features.php:142
 msgid "Photo Location"
 msgstr ""
 
-#: ../../include/features.php:151
+#: ../../include/features.php:143
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/features.php:159
+#: ../../include/features.php:151
 msgid "Access Controlled Chatrooms"
 msgstr ""
 
-#: ../../include/features.php:160
+#: ../../include/features.php:152
 msgid "Provide chatrooms and chat services with access control."
 msgstr ""
 
-#: ../../include/features.php:169
+#: ../../include/features.php:161
-msgid "Provide alternate connection permission roles."
-msgstr ""
-
-#: ../../include/features.php:177
 msgid "Smart Birthdays"
 msgstr ""
 
-#: ../../include/features.php:178
+#: ../../include/features.php:162
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr ""
 
-#: ../../include/features.php:186
+#: ../../include/features.php:170
 msgid "Event Timezone Selection"
 msgstr ""
 
-#: ../../include/features.php:187
+#: ../../include/features.php:171
 msgid "Allow event creation in timezones other than your own."
 msgstr ""
 
-#: ../../include/features.php:196
+#: ../../include/features.php:180
 msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/features.php:197
+#: ../../include/features.php:181
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr ""
 
-#: ../../include/features.php:205
+#: ../../include/features.php:189
 msgid "Advanced Directory Search"
 msgstr ""
 
-#: ../../include/features.php:206
+#: ../../include/features.php:190
 msgid "Allows creation of complex directory search queries"
 msgstr ""
 
-#: ../../include/features.php:214
+#: ../../include/features.php:198
 msgid "Advanced Theme and Layout Settings"
 msgstr ""
 
-#: ../../include/features.php:215
+#: ../../include/features.php:199
 msgid "Allows fine tuning of themes and page layouts"
 msgstr ""
 
-#: ../../include/features.php:225
+#: ../../include/features.php:208
+msgid "Access Control and Permissions"
+msgstr ""
+
+#: ../../include/features.php:212 ../../include/group.php:328
+msgid "Privacy Groups"
+msgstr ""
+
+#: ../../include/features.php:213
+msgid "Enable management and selection of privacy groups"
+msgstr ""
+
+#: ../../include/features.php:221
+msgid "Multiple Profiles"
+msgstr ""
+
+#: ../../include/features.php:222
+msgid "Ability to create multiple profiles"
+msgstr ""
+
+#: ../../include/features.php:232
+msgid "Provide alternate connection permission roles."
+msgstr ""
+
+#: ../../include/features.php:240
+msgid "OAuth Clients"
+msgstr ""
+
+#: ../../include/features.php:241
+msgid "Manage authenticatication tokens for mobile and remote apps."
+msgstr ""
+
+#: ../../include/features.php:249
+msgid "Access Tokens"
+msgstr ""
+
+#: ../../include/features.php:250
+msgid "Create access tokens so that non-members can access private content."
+msgstr ""
+
+#: ../../include/features.php:261
 msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/features.php:229
+#: ../../include/features.php:265
 msgid "Large Photos"
 msgstr ""
 
-#: ../../include/features.php:230
+#: ../../include/features.php:266
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/features.php:239
+#: ../../include/features.php:275
 msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/features.php:247
+#: ../../include/features.php:283
 msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/features.php:248
+#: ../../include/features.php:284
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/features.php:256
+#: ../../include/features.php:292
 msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/features.php:257
+#: ../../include/features.php:293
 msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/features.php:265
+#: ../../include/features.php:301
 msgid "Disable Comments"
 msgstr ""
 
-#: ../../include/features.php:266
+#: ../../include/features.php:302
 msgid "Provide the option to disable comments for a post"
 msgstr ""
 
-#: ../../include/features.php:274
+#: ../../include/features.php:310
 msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/features.php:275
+#: ../../include/features.php:311
 msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/features.php:283
+#: ../../include/features.php:319
 msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/features.php:284
+#: ../../include/features.php:320
 msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/features.php:292
+#: ../../include/features.php:328
 msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../include/features.php:293
+#: ../../include/features.php:329
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr ""
 
-#: ../../include/features.php:304
+#: ../../include/features.php:340
 msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/features.php:308
+#: ../../include/features.php:344
 msgid "Search by Date"
 msgstr ""
 
-#: ../../include/features.php:309
+#: ../../include/features.php:345
 msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/features.php:317 ../../include/group.php:328
+#: ../../include/features.php:355
-msgid "Privacy Groups"
-msgstr ""
-
-#: ../../include/features.php:318
-msgid "Enable management and selection of privacy groups"
-msgstr ""
-
-#: ../../include/features.php:327
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/features.php:335
+#: ../../include/features.php:363
 msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/features.php:336
+#: ../../include/features.php:364
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/features.php:344
+#: ../../include/features.php:372
 msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/features.php:345
+#: ../../include/features.php:373
 msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/features.php:353
+#: ../../include/features.php:381
 msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/features.php:354
+#: ../../include/features.php:382
 msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/features.php:363
+#: ../../include/features.php:391
 msgid "Show friend and connection suggestions"
 msgstr ""
 
-#: ../../include/features.php:371
+#: ../../include/features.php:399
 msgid "Connection Filtering"
 msgstr ""
 
-#: ../../include/features.php:372
+#: ../../include/features.php:400
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../include/features.php:384
+#: ../../include/features.php:412
 msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/features.php:388
+#: ../../include/features.php:416
 msgid "Community Tagging"
 msgstr ""
 
-#: ../../include/features.php:389
+#: ../../include/features.php:417
 msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/features.php:397
+#: ../../include/features.php:425
 msgid "Post Categories"
 msgstr ""
 
-#: ../../include/features.php:398
+#: ../../include/features.php:426
 msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/features.php:406
+#: ../../include/features.php:434
 msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../include/features.php:407
+#: ../../include/features.php:435
 msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: ../../include/features.php:416
+#: ../../include/features.php:444
 msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/features.php:424
+#: ../../include/features.php:452
 msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/features.php:425
+#: ../../include/features.php:453
 msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/features.php:433
+#: ../../include/features.php:461
 msgid "Star Posts"
 msgstr ""
 
-#: ../../include/features.php:434
+#: ../../include/features.php:462
 msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/features.php:442
+#: ../../include/features.php:470
 msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/features.php:443
+#: ../../include/features.php:471
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
@@ -13799,10 +13874,6 @@ msgstr ""
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:119
-msgid "Edit your profile"
-msgstr ""
-
 #: ../../include/nav.php:126 ../../include/nav.php:130
 msgid "Sign in"
 msgstr ""

vendor/composer/ClassLoader.php

@@ -43,8 +43,7 @@ namespace Composer\Autoload;
 class ClassLoader
 {
     // PSR-4
-    private $firstCharsPsr4 = array();
+    private $prefixLengthsPsr4 = array();
-    private $prefixLengthsPsr4 = array(); // For BC with legacy static maps
     private $prefixDirsPsr4 = array();
     private $fallbackDirsPsr4 = array();
 
@@ -171,10 +170,11 @@ class ClassLoader
             }
         } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
             // Register directories for a new namespace.
-            if ('\\' !== substr($prefix, -1)) {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
-            $this->firstCharsPsr4[$prefix[0]] = true;
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
             $this->prefixDirsPsr4[$prefix] = (array) $paths;
         } elseif ($prepend) {
             // Prepend directories for an already registered namespace.
@@ -221,10 +221,11 @@ class ClassLoader
         if (!$prefix) {
             $this->fallbackDirsPsr4 = (array) $paths;
         } else {
-            if ('\\' !== substr($prefix, -1)) {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
                 throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
             }
-            $this->firstCharsPsr4[$prefix[0]] = true;
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
             $this->prefixDirsPsr4[$prefix] = (array) $paths;
         }
     }
@@ -372,7 +373,7 @@ class ClassLoader
         $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
 
         $first = $class[0];
-        if (isset($this->firstCharsPsr4[$first]) || isset($this->prefixLengthsPsr4[$first])) {
+        if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);

vendor/composer/autoload_classmap.php

@@ -270,7 +270,6 @@ return array(
     'HTMLPurifier_VarParser_Flexible' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php',
     'HTMLPurifier_VarParser_Native' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php',
     'HTMLPurifier_Zipper' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php',
-    'Hubzilla\\Import\\Import' => $baseDir . '/include/Import/Importer.php',
     'ID3Parser\\ID3Parser' => $vendorDir . '/lukasreschke/id3parser/src/ID3Parser.php',
     'ID3Parser\\getID3\\Tags\\getid3_id3v1' => $vendorDir . '/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v1.php',
     'ID3Parser\\getID3\\Tags\\getid3_id3v2' => $vendorDir . '/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v2.php',
@@ -788,6 +787,8 @@ return array(
     'Zotlabs\\Daemon\\Thumbnail' => $baseDir . '/Zotlabs/Daemon/Thumbnail.php',
     'Zotlabs\\Extend\\Hook' => $baseDir . '/Zotlabs/Extend/Hook.php',
     'Zotlabs\\Identity\\BasicId\\BasicId' => $baseDir . '/Zotlabs/Identity/BasicId.php',
+    'Zotlabs\\Identity\\OAuth2Server' => $baseDir . '/Zotlabs/Identity/OAuth2Server.php',
+    'Zotlabs\\Identity\\OAuth2Storage' => $baseDir . '/Zotlabs/Identity/OAuth2Storage.php',
     'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => $baseDir . '/Zotlabs/Identity/ProfilePhoto.php',
     'Zotlabs\\Lib\\AConfig' => $baseDir . '/Zotlabs/Lib/AConfig.php',
     'Zotlabs\\Lib\\AbConfig' => $baseDir . '/Zotlabs/Lib/AbConfig.php',
@@ -798,6 +799,7 @@ return array(
     'Zotlabs\\Lib\\Chatroom' => $baseDir . '/Zotlabs/Lib/Chatroom.php',
     'Zotlabs\\Lib\\Config' => $baseDir . '/Zotlabs/Lib/Config.php',
     'Zotlabs\\Lib\\DB_Upgrade' => $baseDir . '/Zotlabs/Lib/DB_Upgrade.php',
+    'Zotlabs\\Lib\\DReport' => $baseDir . '/Zotlabs/Lib/DReport.php',
     'Zotlabs\\Lib\\Enotify' => $baseDir . '/Zotlabs/Lib/Enotify.php',
     'Zotlabs\\Lib\\ExtendedZip' => $baseDir . '/Zotlabs/Lib/ExtendedZip.php',
     'Zotlabs\\Lib\\IConfig' => $baseDir . '/Zotlabs/Lib/IConfig.php',
@@ -810,15 +812,15 @@ return array(
     'Zotlabs\\Lib\\PConfig' => $baseDir . '/Zotlabs/Lib/PConfig.php',
     'Zotlabs\\Lib\\Permcat' => $baseDir . '/Zotlabs/Lib/Permcat.php',
     'Zotlabs\\Lib\\PermissionDescription' => $baseDir . '/Zotlabs/Lib/PermissionDescription.php',
-    'Zotlabs\\Lib\\ProtoDriver' => $baseDir . '/Zotlabs/Lib/ProtoDriver.php',
     'Zotlabs\\Lib\\SConfig' => $baseDir . '/Zotlabs/Lib/SConfig.php',
+    'Zotlabs\\Lib\\Share' => $baseDir . '/Zotlabs/Lib/Share.php',
     'Zotlabs\\Lib\\SuperCurl' => $baseDir . '/Zotlabs/Lib/SuperCurl.php',
     'Zotlabs\\Lib\\System' => $baseDir . '/Zotlabs/Lib/System.php',
     'Zotlabs\\Lib\\Techlevels' => $baseDir . '/Zotlabs/Lib/Techlevels.php',
     'Zotlabs\\Lib\\ThreadItem' => $baseDir . '/Zotlabs/Lib/ThreadItem.php',
     'Zotlabs\\Lib\\ThreadStream' => $baseDir . '/Zotlabs/Lib/ThreadStream.php',
+    'Zotlabs\\Lib\\Verify' => $baseDir . '/Zotlabs/Lib/Verify.php',
     'Zotlabs\\Lib\\XConfig' => $baseDir . '/Zotlabs/Lib/XConfig.php',
-    'Zotlabs\\Lib\\ZotDriver' => $baseDir . '/Zotlabs/Lib/ZotDriver.php',
     'Zotlabs\\Module\\Achievements' => $baseDir . '/Zotlabs/Module/Achievements.php',
     'Zotlabs\\Module\\Acl' => $baseDir . '/Zotlabs/Module/Acl.php',
     'Zotlabs\\Module\\Admin' => $baseDir . '/Zotlabs/Module/Admin.php',
@@ -874,6 +876,8 @@ return array(
     'Zotlabs\\Module\\Editlayout' => $baseDir . '/Zotlabs/Module/Editlayout.php',
     'Zotlabs\\Module\\Editpost' => $baseDir . '/Zotlabs/Module/Editpost.php',
     'Zotlabs\\Module\\Editwebpage' => $baseDir . '/Zotlabs/Module/Editwebpage.php',
+    'Zotlabs\\Module\\Email_resend' => $baseDir . '/Zotlabs/Module/Email_resend.php',
+    'Zotlabs\\Module\\Email_validation' => $baseDir . '/Zotlabs/Module/Email_validation.php',
     'Zotlabs\\Module\\Embedphotos' => $baseDir . '/Zotlabs/Module/Embedphotos.php',
     'Zotlabs\\Module\\Events' => $baseDir . '/Zotlabs/Module/Events.php',
     'Zotlabs\\Module\\Fbrowser' => $baseDir . '/Zotlabs/Module/Fbrowser.php',
@@ -885,6 +889,7 @@ return array(
     'Zotlabs\\Module\\Filestorage' => $baseDir . '/Zotlabs/Module/Filestorage.php',
     'Zotlabs\\Module\\Follow' => $baseDir . '/Zotlabs/Module/Follow.php',
     'Zotlabs\\Module\\Getfile' => $baseDir . '/Zotlabs/Module/Getfile.php',
+    'Zotlabs\\Module\\Go' => $baseDir . '/Zotlabs/Module/Go.php',
     'Zotlabs\\Module\\Group' => $baseDir . '/Zotlabs/Module/Group.php',
     'Zotlabs\\Module\\Hcard' => $baseDir . '/Zotlabs/Module/Hcard.php',
     'Zotlabs\\Module\\Help' => $baseDir . '/Zotlabs/Module/Help.php',
@@ -1027,6 +1032,213 @@ return array(
     'Zotlabs\\Thumbs\\Pdf' => $baseDir . '/Zotlabs/Thumbs/Pdf.php',
     'Zotlabs\\Thumbs\\Text' => $baseDir . '/Zotlabs/Thumbs/Text.php',
     'Zotlabs\\Thumbs\\Video' => $baseDir . '/Zotlabs/Thumbs/Video.php',
+    'Zotlabs\\Update\\_1000' => $baseDir . '/Zotlabs/Update/_1000.php',
+    'Zotlabs\\Update\\_1001' => $baseDir . '/Zotlabs/Update/_1001.php',
+    'Zotlabs\\Update\\_1002' => $baseDir . '/Zotlabs/Update/_1002.php',
+    'Zotlabs\\Update\\_1003' => $baseDir . '/Zotlabs/Update/_1003.php',
+    'Zotlabs\\Update\\_1004' => $baseDir . '/Zotlabs/Update/_1004.php',
+    'Zotlabs\\Update\\_1005' => $baseDir . '/Zotlabs/Update/_1005.php',
+    'Zotlabs\\Update\\_1006' => $baseDir . '/Zotlabs/Update/_1006.php',
+    'Zotlabs\\Update\\_1007' => $baseDir . '/Zotlabs/Update/_1007.php',
+    'Zotlabs\\Update\\_1008' => $baseDir . '/Zotlabs/Update/_1008.php',
+    'Zotlabs\\Update\\_1009' => $baseDir . '/Zotlabs/Update/_1009.php',
+    'Zotlabs\\Update\\_1010' => $baseDir . '/Zotlabs/Update/_1010.php',
+    'Zotlabs\\Update\\_1011' => $baseDir . '/Zotlabs/Update/_1011.php',
+    'Zotlabs\\Update\\_1012' => $baseDir . '/Zotlabs/Update/_1012.php',
+    'Zotlabs\\Update\\_1013' => $baseDir . '/Zotlabs/Update/_1013.php',
+    'Zotlabs\\Update\\_1014' => $baseDir . '/Zotlabs/Update/_1014.php',
+    'Zotlabs\\Update\\_1015' => $baseDir . '/Zotlabs/Update/_1015.php',
+    'Zotlabs\\Update\\_1016' => $baseDir . '/Zotlabs/Update/_1016.php',
+    'Zotlabs\\Update\\_1017' => $baseDir . '/Zotlabs/Update/_1017.php',
+    'Zotlabs\\Update\\_1018' => $baseDir . '/Zotlabs/Update/_1018.php',
+    'Zotlabs\\Update\\_1019' => $baseDir . '/Zotlabs/Update/_1019.php',
+    'Zotlabs\\Update\\_1020' => $baseDir . '/Zotlabs/Update/_1020.php',
+    'Zotlabs\\Update\\_1021' => $baseDir . '/Zotlabs/Update/_1021.php',
+    'Zotlabs\\Update\\_1022' => $baseDir . '/Zotlabs/Update/_1022.php',
+    'Zotlabs\\Update\\_1023' => $baseDir . '/Zotlabs/Update/_1023.php',
+    'Zotlabs\\Update\\_1024' => $baseDir . '/Zotlabs/Update/_1024.php',
+    'Zotlabs\\Update\\_1025' => $baseDir . '/Zotlabs/Update/_1025.php',
+    'Zotlabs\\Update\\_1026' => $baseDir . '/Zotlabs/Update/_1026.php',
+    'Zotlabs\\Update\\_1027' => $baseDir . '/Zotlabs/Update/_1027.php',
+    'Zotlabs\\Update\\_1028' => $baseDir . '/Zotlabs/Update/_1028.php',
+    'Zotlabs\\Update\\_1029' => $baseDir . '/Zotlabs/Update/_1029.php',
+    'Zotlabs\\Update\\_1030' => $baseDir . '/Zotlabs/Update/_1030.php',
+    'Zotlabs\\Update\\_1031' => $baseDir . '/Zotlabs/Update/_1031.php',
+    'Zotlabs\\Update\\_1032' => $baseDir . '/Zotlabs/Update/_1032.php',
+    'Zotlabs\\Update\\_1033' => $baseDir . '/Zotlabs/Update/_1033.php',
+    'Zotlabs\\Update\\_1034' => $baseDir . '/Zotlabs/Update/_1034.php',
+    'Zotlabs\\Update\\_1035' => $baseDir . '/Zotlabs/Update/_1035.php',
+    'Zotlabs\\Update\\_1036' => $baseDir . '/Zotlabs/Update/_1036.php',
+    'Zotlabs\\Update\\_1037' => $baseDir . '/Zotlabs/Update/_1037.php',
+    'Zotlabs\\Update\\_1038' => $baseDir . '/Zotlabs/Update/_1038.php',
+    'Zotlabs\\Update\\_1039' => $baseDir . '/Zotlabs/Update/_1039.php',
+    'Zotlabs\\Update\\_1040' => $baseDir . '/Zotlabs/Update/_1040.php',
+    'Zotlabs\\Update\\_1041' => $baseDir . '/Zotlabs/Update/_1041.php',
+    'Zotlabs\\Update\\_1042' => $baseDir . '/Zotlabs/Update/_1042.php',
+    'Zotlabs\\Update\\_1043' => $baseDir . '/Zotlabs/Update/_1043.php',
+    'Zotlabs\\Update\\_1044' => $baseDir . '/Zotlabs/Update/_1044.php',
+    'Zotlabs\\Update\\_1045' => $baseDir . '/Zotlabs/Update/_1045.php',
+    'Zotlabs\\Update\\_1046' => $baseDir . '/Zotlabs/Update/_1046.php',
+    'Zotlabs\\Update\\_1047' => $baseDir . '/Zotlabs/Update/_1047.php',
+    'Zotlabs\\Update\\_1048' => $baseDir . '/Zotlabs/Update/_1048.php',
+    'Zotlabs\\Update\\_1049' => $baseDir . '/Zotlabs/Update/_1049.php',
+    'Zotlabs\\Update\\_1050' => $baseDir . '/Zotlabs/Update/_1050.php',
+    'Zotlabs\\Update\\_1051' => $baseDir . '/Zotlabs/Update/_1051.php',
+    'Zotlabs\\Update\\_1052' => $baseDir . '/Zotlabs/Update/_1052.php',
+    'Zotlabs\\Update\\_1053' => $baseDir . '/Zotlabs/Update/_1053.php',
+    'Zotlabs\\Update\\_1054' => $baseDir . '/Zotlabs/Update/_1054.php',
+    'Zotlabs\\Update\\_1055' => $baseDir . '/Zotlabs/Update/_1055.php',
+    'Zotlabs\\Update\\_1056' => $baseDir . '/Zotlabs/Update/_1056.php',
+    'Zotlabs\\Update\\_1057' => $baseDir . '/Zotlabs/Update/_1057.php',
+    'Zotlabs\\Update\\_1058' => $baseDir . '/Zotlabs/Update/_1058.php',
+    'Zotlabs\\Update\\_1059' => $baseDir . '/Zotlabs/Update/_1059.php',
+    'Zotlabs\\Update\\_1060' => $baseDir . '/Zotlabs/Update/_1060.php',
+    'Zotlabs\\Update\\_1061' => $baseDir . '/Zotlabs/Update/_1061.php',
+    'Zotlabs\\Update\\_1062' => $baseDir . '/Zotlabs/Update/_1062.php',
+    'Zotlabs\\Update\\_1063' => $baseDir . '/Zotlabs/Update/_1063.php',
+    'Zotlabs\\Update\\_1064' => $baseDir . '/Zotlabs/Update/_1064.php',
+    'Zotlabs\\Update\\_1065' => $baseDir . '/Zotlabs/Update/_1065.php',
+    'Zotlabs\\Update\\_1066' => $baseDir . '/Zotlabs/Update/_1066.php',
+    'Zotlabs\\Update\\_1067' => $baseDir . '/Zotlabs/Update/_1067.php',
+    'Zotlabs\\Update\\_1068' => $baseDir . '/Zotlabs/Update/_1068.php',
+    'Zotlabs\\Update\\_1069' => $baseDir . '/Zotlabs/Update/_1069.php',
+    'Zotlabs\\Update\\_1070' => $baseDir . '/Zotlabs/Update/_1070.php',
+    'Zotlabs\\Update\\_1071' => $baseDir . '/Zotlabs/Update/_1071.php',
+    'Zotlabs\\Update\\_1072' => $baseDir . '/Zotlabs/Update/_1072.php',
+    'Zotlabs\\Update\\_1073' => $baseDir . '/Zotlabs/Update/_1073.php',
+    'Zotlabs\\Update\\_1074' => $baseDir . '/Zotlabs/Update/_1074.php',
+    'Zotlabs\\Update\\_1075' => $baseDir . '/Zotlabs/Update/_1075.php',
+    'Zotlabs\\Update\\_1076' => $baseDir . '/Zotlabs/Update/_1076.php',
+    'Zotlabs\\Update\\_1077' => $baseDir . '/Zotlabs/Update/_1077.php',
+    'Zotlabs\\Update\\_1078' => $baseDir . '/Zotlabs/Update/_1078.php',
+    'Zotlabs\\Update\\_1079' => $baseDir . '/Zotlabs/Update/_1079.php',
+    'Zotlabs\\Update\\_1080' => $baseDir . '/Zotlabs/Update/_1080.php',
+    'Zotlabs\\Update\\_1081' => $baseDir . '/Zotlabs/Update/_1081.php',
+    'Zotlabs\\Update\\_1082' => $baseDir . '/Zotlabs/Update/_1082.php',
+    'Zotlabs\\Update\\_1083' => $baseDir . '/Zotlabs/Update/_1083.php',
+    'Zotlabs\\Update\\_1084' => $baseDir . '/Zotlabs/Update/_1084.php',
+    'Zotlabs\\Update\\_1085' => $baseDir . '/Zotlabs/Update/_1085.php',
+    'Zotlabs\\Update\\_1086' => $baseDir . '/Zotlabs/Update/_1086.php',
+    'Zotlabs\\Update\\_1087' => $baseDir . '/Zotlabs/Update/_1087.php',
+    'Zotlabs\\Update\\_1088' => $baseDir . '/Zotlabs/Update/_1088.php',
+    'Zotlabs\\Update\\_1089' => $baseDir . '/Zotlabs/Update/_1089.php',
+    'Zotlabs\\Update\\_1090' => $baseDir . '/Zotlabs/Update/_1090.php',
+    'Zotlabs\\Update\\_1091' => $baseDir . '/Zotlabs/Update/_1091.php',
+    'Zotlabs\\Update\\_1092' => $baseDir . '/Zotlabs/Update/_1092.php',
+    'Zotlabs\\Update\\_1093' => $baseDir . '/Zotlabs/Update/_1093.php',
+    'Zotlabs\\Update\\_1094' => $baseDir . '/Zotlabs/Update/_1094.php',
+    'Zotlabs\\Update\\_1095' => $baseDir . '/Zotlabs/Update/_1095.php',
+    'Zotlabs\\Update\\_1096' => $baseDir . '/Zotlabs/Update/_1096.php',
+    'Zotlabs\\Update\\_1097' => $baseDir . '/Zotlabs/Update/_1097.php',
+    'Zotlabs\\Update\\_1098' => $baseDir . '/Zotlabs/Update/_1098.php',
+    'Zotlabs\\Update\\_1099' => $baseDir . '/Zotlabs/Update/_1099.php',
+    'Zotlabs\\Update\\_1100' => $baseDir . '/Zotlabs/Update/_1100.php',
+    'Zotlabs\\Update\\_1101' => $baseDir . '/Zotlabs/Update/_1101.php',
+    'Zotlabs\\Update\\_1102' => $baseDir . '/Zotlabs/Update/_1102.php',
+    'Zotlabs\\Update\\_1103' => $baseDir . '/Zotlabs/Update/_1103.php',
+    'Zotlabs\\Update\\_1104' => $baseDir . '/Zotlabs/Update/_1104.php',
+    'Zotlabs\\Update\\_1105' => $baseDir . '/Zotlabs/Update/_1105.php',
+    'Zotlabs\\Update\\_1106' => $baseDir . '/Zotlabs/Update/_1106.php',
+    'Zotlabs\\Update\\_1107' => $baseDir . '/Zotlabs/Update/_1107.php',
+    'Zotlabs\\Update\\_1108' => $baseDir . '/Zotlabs/Update/_1108.php',
+    'Zotlabs\\Update\\_1109' => $baseDir . '/Zotlabs/Update/_1109.php',
+    'Zotlabs\\Update\\_1110' => $baseDir . '/Zotlabs/Update/_1110.php',
+    'Zotlabs\\Update\\_1111' => $baseDir . '/Zotlabs/Update/_1111.php',
+    'Zotlabs\\Update\\_1112' => $baseDir . '/Zotlabs/Update/_1112.php',
+    'Zotlabs\\Update\\_1113' => $baseDir . '/Zotlabs/Update/_1113.php',
+    'Zotlabs\\Update\\_1114' => $baseDir . '/Zotlabs/Update/_1114.php',
+    'Zotlabs\\Update\\_1115' => $baseDir . '/Zotlabs/Update/_1115.php',
+    'Zotlabs\\Update\\_1116' => $baseDir . '/Zotlabs/Update/_1116.php',
+    'Zotlabs\\Update\\_1117' => $baseDir . '/Zotlabs/Update/_1117.php',
+    'Zotlabs\\Update\\_1118' => $baseDir . '/Zotlabs/Update/_1118.php',
+    'Zotlabs\\Update\\_1119' => $baseDir . '/Zotlabs/Update/_1119.php',
+    'Zotlabs\\Update\\_1120' => $baseDir . '/Zotlabs/Update/_1120.php',
+    'Zotlabs\\Update\\_1121' => $baseDir . '/Zotlabs/Update/_1121.php',
+    'Zotlabs\\Update\\_1122' => $baseDir . '/Zotlabs/Update/_1122.php',
+    'Zotlabs\\Update\\_1123' => $baseDir . '/Zotlabs/Update/_1123.php',
+    'Zotlabs\\Update\\_1124' => $baseDir . '/Zotlabs/Update/_1124.php',
+    'Zotlabs\\Update\\_1125' => $baseDir . '/Zotlabs/Update/_1125.php',
+    'Zotlabs\\Update\\_1126' => $baseDir . '/Zotlabs/Update/_1126.php',
+    'Zotlabs\\Update\\_1127' => $baseDir . '/Zotlabs/Update/_1127.php',
+    'Zotlabs\\Update\\_1128' => $baseDir . '/Zotlabs/Update/_1128.php',
+    'Zotlabs\\Update\\_1129' => $baseDir . '/Zotlabs/Update/_1129.php',
+    'Zotlabs\\Update\\_1130' => $baseDir . '/Zotlabs/Update/_1130.php',
+    'Zotlabs\\Update\\_1131' => $baseDir . '/Zotlabs/Update/_1131.php',
+    'Zotlabs\\Update\\_1132' => $baseDir . '/Zotlabs/Update/_1132.php',
+    'Zotlabs\\Update\\_1133' => $baseDir . '/Zotlabs/Update/_1133.php',
+    'Zotlabs\\Update\\_1134' => $baseDir . '/Zotlabs/Update/_1134.php',
+    'Zotlabs\\Update\\_1135' => $baseDir . '/Zotlabs/Update/_1135.php',
+    'Zotlabs\\Update\\_1136' => $baseDir . '/Zotlabs/Update/_1136.php',
+    'Zotlabs\\Update\\_1137' => $baseDir . '/Zotlabs/Update/_1137.php',
+    'Zotlabs\\Update\\_1138' => $baseDir . '/Zotlabs/Update/_1138.php',
+    'Zotlabs\\Update\\_1139' => $baseDir . '/Zotlabs/Update/_1139.php',
+    'Zotlabs\\Update\\_1140' => $baseDir . '/Zotlabs/Update/_1140.php',
+    'Zotlabs\\Update\\_1141' => $baseDir . '/Zotlabs/Update/_1141.php',
+    'Zotlabs\\Update\\_1142' => $baseDir . '/Zotlabs/Update/_1142.php',
+    'Zotlabs\\Update\\_1143' => $baseDir . '/Zotlabs/Update/_1143.php',
+    'Zotlabs\\Update\\_1144' => $baseDir . '/Zotlabs/Update/_1144.php',
+    'Zotlabs\\Update\\_1145' => $baseDir . '/Zotlabs/Update/_1145.php',
+    'Zotlabs\\Update\\_1146' => $baseDir . '/Zotlabs/Update/_1146.php',
+    'Zotlabs\\Update\\_1147' => $baseDir . '/Zotlabs/Update/_1147.php',
+    'Zotlabs\\Update\\_1148' => $baseDir . '/Zotlabs/Update/_1148.php',
+    'Zotlabs\\Update\\_1149' => $baseDir . '/Zotlabs/Update/_1149.php',
+    'Zotlabs\\Update\\_1150' => $baseDir . '/Zotlabs/Update/_1150.php',
+    'Zotlabs\\Update\\_1151' => $baseDir . '/Zotlabs/Update/_1151.php',
+    'Zotlabs\\Update\\_1152' => $baseDir . '/Zotlabs/Update/_1152.php',
+    'Zotlabs\\Update\\_1153' => $baseDir . '/Zotlabs/Update/_1153.php',
+    'Zotlabs\\Update\\_1154' => $baseDir . '/Zotlabs/Update/_1154.php',
+    'Zotlabs\\Update\\_1155' => $baseDir . '/Zotlabs/Update/_1155.php',
+    'Zotlabs\\Update\\_1156' => $baseDir . '/Zotlabs/Update/_1156.php',
+    'Zotlabs\\Update\\_1157' => $baseDir . '/Zotlabs/Update/_1157.php',
+    'Zotlabs\\Update\\_1158' => $baseDir . '/Zotlabs/Update/_1158.php',
+    'Zotlabs\\Update\\_1159' => $baseDir . '/Zotlabs/Update/_1159.php',
+    'Zotlabs\\Update\\_1160' => $baseDir . '/Zotlabs/Update/_1160.php',
+    'Zotlabs\\Update\\_1161' => $baseDir . '/Zotlabs/Update/_1161.php',
+    'Zotlabs\\Update\\_1162' => $baseDir . '/Zotlabs/Update/_1162.php',
+    'Zotlabs\\Update\\_1163' => $baseDir . '/Zotlabs/Update/_1163.php',
+    'Zotlabs\\Update\\_1164' => $baseDir . '/Zotlabs/Update/_1164.php',
+    'Zotlabs\\Update\\_1165' => $baseDir . '/Zotlabs/Update/_1165.php',
+    'Zotlabs\\Update\\_1166' => $baseDir . '/Zotlabs/Update/_1166.php',
+    'Zotlabs\\Update\\_1167' => $baseDir . '/Zotlabs/Update/_1167.php',
+    'Zotlabs\\Update\\_1168' => $baseDir . '/Zotlabs/Update/_1168.php',
+    'Zotlabs\\Update\\_1169' => $baseDir . '/Zotlabs/Update/_1169.php',
+    'Zotlabs\\Update\\_1170' => $baseDir . '/Zotlabs/Update/_1170.php',
+    'Zotlabs\\Update\\_1171' => $baseDir . '/Zotlabs/Update/_1171.php',
+    'Zotlabs\\Update\\_1172' => $baseDir . '/Zotlabs/Update/_1172.php',
+    'Zotlabs\\Update\\_1173' => $baseDir . '/Zotlabs/Update/_1173.php',
+    'Zotlabs\\Update\\_1174' => $baseDir . '/Zotlabs/Update/_1174.php',
+    'Zotlabs\\Update\\_1175' => $baseDir . '/Zotlabs/Update/_1175.php',
+    'Zotlabs\\Update\\_1176' => $baseDir . '/Zotlabs/Update/_1176.php',
+    'Zotlabs\\Update\\_1177' => $baseDir . '/Zotlabs/Update/_1177.php',
+    'Zotlabs\\Update\\_1178' => $baseDir . '/Zotlabs/Update/_1178.php',
+    'Zotlabs\\Update\\_1179' => $baseDir . '/Zotlabs/Update/_1179.php',
+    'Zotlabs\\Update\\_1180' => $baseDir . '/Zotlabs/Update/_1180.php',
+    'Zotlabs\\Update\\_1181' => $baseDir . '/Zotlabs/Update/_1181.php',
+    'Zotlabs\\Update\\_1182' => $baseDir . '/Zotlabs/Update/_1182.php',
+    'Zotlabs\\Update\\_1183' => $baseDir . '/Zotlabs/Update/_1183.php',
+    'Zotlabs\\Update\\_1184' => $baseDir . '/Zotlabs/Update/_1184.php',
+    'Zotlabs\\Update\\_1185' => $baseDir . '/Zotlabs/Update/_1185.php',
+    'Zotlabs\\Update\\_1186' => $baseDir . '/Zotlabs/Update/_1186.php',
+    'Zotlabs\\Update\\_1187' => $baseDir . '/Zotlabs/Update/_1187.php',
+    'Zotlabs\\Update\\_1188' => $baseDir . '/Zotlabs/Update/_1188.php',
+    'Zotlabs\\Update\\_1189' => $baseDir . '/Zotlabs/Update/_1189.php',
+    'Zotlabs\\Update\\_1190' => $baseDir . '/Zotlabs/Update/_1190.php',
+    'Zotlabs\\Update\\_1191' => $baseDir . '/Zotlabs/Update/_1191.php',
+    'Zotlabs\\Update\\_1192' => $baseDir . '/Zotlabs/Update/_1192.php',
+    'Zotlabs\\Update\\_1193' => $baseDir . '/Zotlabs/Update/_1193.php',
+    'Zotlabs\\Update\\_1194' => $baseDir . '/Zotlabs/Update/_1194.php',
+    'Zotlabs\\Update\\_1195' => $baseDir . '/Zotlabs/Update/_1195.php',
+    'Zotlabs\\Update\\_1196' => $baseDir . '/Zotlabs/Update/_1196.php',
+    'Zotlabs\\Update\\_1197' => $baseDir . '/Zotlabs/Update/_1197.php',
+    'Zotlabs\\Update\\_1198' => $baseDir . '/Zotlabs/Update/_1198.php',
+    'Zotlabs\\Update\\_1199' => $baseDir . '/Zotlabs/Update/_1199.php',
+    'Zotlabs\\Update\\_1200' => $baseDir . '/Zotlabs/Update/_1200.php',
+    'Zotlabs\\Update\\_1201' => $baseDir . '/Zotlabs/Update/_1201.php',
+    'Zotlabs\\Update\\_1202' => $baseDir . '/Zotlabs/Update/_1202.php',
+    'Zotlabs\\Update\\_1203' => $baseDir . '/Zotlabs/Update/_1203.php',
+    'Zotlabs\\Update\\_1204' => $baseDir . '/Zotlabs/Update/_1204.php',
+    'Zotlabs\\Update\\_1205' => $baseDir . '/Zotlabs/Update/_1205.php',
+    'Zotlabs\\Update\\_1206' => $baseDir . '/Zotlabs/Update/_1206.php',
     'Zotlabs\\Web\\CheckJS' => $baseDir . '/Zotlabs/Web/CheckJS.php',
     'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php',
     'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php',
@@ -1069,6 +1281,7 @@ return array(
     'Zotlabs\\Widget\\Item' => $baseDir . '/Zotlabs/Widget/Item.php',
     'Zotlabs\\Widget\\Mailmenu' => $baseDir . '/Zotlabs/Widget/Mailmenu.php',
     'Zotlabs\\Widget\\Menu_preview' => $baseDir . '/Zotlabs/Widget/Menu_preview.php',
+    'Zotlabs\\Widget\\Newmember' => $baseDir . '/Zotlabs/Widget/Newmember.php',
     'Zotlabs\\Widget\\Notes' => $baseDir . '/Zotlabs/Widget/Notes.php',
     'Zotlabs\\Widget\\Notifications' => $baseDir . '/Zotlabs/Widget/Notifications.php',
     'Zotlabs\\Widget\\Photo' => $baseDir . '/Zotlabs/Widget/Photo.php',
@@ -1095,10 +1308,8 @@ return array(
     'Zotlabs\\Widget\\Wiki_pages' => $baseDir . '/Zotlabs/Widget/Wiki_pages.php',
     'Zotlabs\\Widget\\Zcard' => $baseDir . '/Zotlabs/Widget/Zcard.php',
     'Zotlabs\\Zot\\Auth' => $baseDir . '/Zotlabs/Zot/Auth.php',
-    'Zotlabs\\Zot\\DReport' => $baseDir . '/Zotlabs/Zot/DReport.php',
     'Zotlabs\\Zot\\Finger' => $baseDir . '/Zotlabs/Zot/Finger.php',
     'Zotlabs\\Zot\\IHandler' => $baseDir . '/Zotlabs/Zot/IHandler.php',
     'Zotlabs\\Zot\\Receiver' => $baseDir . '/Zotlabs/Zot/Receiver.php',
-    'Zotlabs\\Zot\\Verify' => $baseDir . '/Zotlabs/Zot/Verify.php',
     'Zotlabs\\Zot\\ZotHandler' => $baseDir . '/Zotlabs/Zot/ZotHandler.php',
 );

vendor/composer/autoload_static.php

@@ -18,14 +18,43 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'f084d01b0a599f67676cffef638aa95b' => __DIR__ . '/..' . '/smarty/smarty/libs/bootstrap.php',
     );
 
-    public static $firstCharsPsr4 = array (
+    public static $prefixLengthsPsr4 = array (
-        'Z' => true,
+        'Z' => 
-        'S' => true,
+        array (
-        'P' => true,
+            'Zotlabs\\' => 8,
-        'L' => true,
+        ),
-        'I' => true,
+        'S' => 
-        'H' => true,
+        array (
-        'C' => true,
+            'Sabre\\Xml\\' => 10,
+            'Sabre\\VObject\\' => 14,
+            'Sabre\\Uri\\' => 10,
+            'Sabre\\HTTP\\' => 11,
+            'Sabre\\Event\\' => 12,
+            'Sabre\\DAV\\' => 10,
+            'Sabre\\DAVACL\\' => 13,
+            'Sabre\\CardDAV\\' => 14,
+            'Sabre\\CalDAV\\' => 13,
+        ),
+        'P' => 
+        array (
+            'Psr\\Log\\' => 8,
+        ),
+        'L' => 
+        array (
+            'League\\HTMLToMarkdown\\' => 22,
+        ),
+        'I' => 
+        array (
+            'ID3Parser\\' => 10,
+        ),
+        'H' => 
+        array (
+            'Hubzilla\\' => 9,
+        ),
+        'C' => 
+        array (
+            'CommerceGuys\\Intl\\' => 18,
+        ),
     );
 
     public static $prefixDirsPsr4 = array (
@@ -394,7 +423,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'HTMLPurifier_VarParser_Flexible' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Flexible.php',
         'HTMLPurifier_VarParser_Native' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/VarParser/Native.php',
         'HTMLPurifier_Zipper' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier/Zipper.php',
-        'Hubzilla\\Import\\Import' => __DIR__ . '/../..' . '/include/Import/Importer.php',
         'ID3Parser\\ID3Parser' => __DIR__ . '/..' . '/lukasreschke/id3parser/src/ID3Parser.php',
         'ID3Parser\\getID3\\Tags\\getid3_id3v1' => __DIR__ . '/..' . '/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v1.php',
         'ID3Parser\\getID3\\Tags\\getid3_id3v2' => __DIR__ . '/..' . '/lukasreschke/id3parser/src/getID3/Tags/getid3_id3v2.php',
@@ -912,6 +940,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Daemon\\Thumbnail' => __DIR__ . '/../..' . '/Zotlabs/Daemon/Thumbnail.php',
         'Zotlabs\\Extend\\Hook' => __DIR__ . '/../..' . '/Zotlabs/Extend/Hook.php',
         'Zotlabs\\Identity\\BasicId\\BasicId' => __DIR__ . '/../..' . '/Zotlabs/Identity/BasicId.php',
+        'Zotlabs\\Identity\\OAuth2Server' => __DIR__ . '/../..' . '/Zotlabs/Identity/OAuth2Server.php',
+        'Zotlabs\\Identity\\OAuth2Storage' => __DIR__ . '/../..' . '/Zotlabs/Identity/OAuth2Storage.php',
         'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => __DIR__ . '/../..' . '/Zotlabs/Identity/ProfilePhoto.php',
         'Zotlabs\\Lib\\AConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/AConfig.php',
         'Zotlabs\\Lib\\AbConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/AbConfig.php',
@@ -922,6 +952,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Lib\\Chatroom' => __DIR__ . '/../..' . '/Zotlabs/Lib/Chatroom.php',
         'Zotlabs\\Lib\\Config' => __DIR__ . '/../..' . '/Zotlabs/Lib/Config.php',
         'Zotlabs\\Lib\\DB_Upgrade' => __DIR__ . '/../..' . '/Zotlabs/Lib/DB_Upgrade.php',
+        'Zotlabs\\Lib\\DReport' => __DIR__ . '/../..' . '/Zotlabs/Lib/DReport.php',
         'Zotlabs\\Lib\\Enotify' => __DIR__ . '/../..' . '/Zotlabs/Lib/Enotify.php',
         'Zotlabs\\Lib\\ExtendedZip' => __DIR__ . '/../..' . '/Zotlabs/Lib/ExtendedZip.php',
         'Zotlabs\\Lib\\IConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/IConfig.php',
@@ -934,15 +965,15 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Lib\\PConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/PConfig.php',
         'Zotlabs\\Lib\\Permcat' => __DIR__ . '/../..' . '/Zotlabs/Lib/Permcat.php',
         'Zotlabs\\Lib\\PermissionDescription' => __DIR__ . '/../..' . '/Zotlabs/Lib/PermissionDescription.php',
-        'Zotlabs\\Lib\\ProtoDriver' => __DIR__ . '/../..' . '/Zotlabs/Lib/ProtoDriver.php',
         'Zotlabs\\Lib\\SConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/SConfig.php',
+        'Zotlabs\\Lib\\Share' => __DIR__ . '/../..' . '/Zotlabs/Lib/Share.php',
         'Zotlabs\\Lib\\SuperCurl' => __DIR__ . '/../..' . '/Zotlabs/Lib/SuperCurl.php',
         'Zotlabs\\Lib\\System' => __DIR__ . '/../..' . '/Zotlabs/Lib/System.php',
         'Zotlabs\\Lib\\Techlevels' => __DIR__ . '/../..' . '/Zotlabs/Lib/Techlevels.php',
         'Zotlabs\\Lib\\ThreadItem' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadItem.php',
         'Zotlabs\\Lib\\ThreadStream' => __DIR__ . '/../..' . '/Zotlabs/Lib/ThreadStream.php',
+        'Zotlabs\\Lib\\Verify' => __DIR__ . '/../..' . '/Zotlabs/Lib/Verify.php',
         'Zotlabs\\Lib\\XConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/XConfig.php',
-        'Zotlabs\\Lib\\ZotDriver' => __DIR__ . '/../..' . '/Zotlabs/Lib/ZotDriver.php',
         'Zotlabs\\Module\\Achievements' => __DIR__ . '/../..' . '/Zotlabs/Module/Achievements.php',
         'Zotlabs\\Module\\Acl' => __DIR__ . '/../..' . '/Zotlabs/Module/Acl.php',
         'Zotlabs\\Module\\Admin' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin.php',
@@ -998,6 +1029,8 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Editlayout' => __DIR__ . '/../..' . '/Zotlabs/Module/Editlayout.php',
         'Zotlabs\\Module\\Editpost' => __DIR__ . '/../..' . '/Zotlabs/Module/Editpost.php',
         'Zotlabs\\Module\\Editwebpage' => __DIR__ . '/../..' . '/Zotlabs/Module/Editwebpage.php',
+        'Zotlabs\\Module\\Email_resend' => __DIR__ . '/../..' . '/Zotlabs/Module/Email_resend.php',
+        'Zotlabs\\Module\\Email_validation' => __DIR__ . '/../..' . '/Zotlabs/Module/Email_validation.php',
         'Zotlabs\\Module\\Embedphotos' => __DIR__ . '/../..' . '/Zotlabs/Module/Embedphotos.php',
         'Zotlabs\\Module\\Events' => __DIR__ . '/../..' . '/Zotlabs/Module/Events.php',
         'Zotlabs\\Module\\Fbrowser' => __DIR__ . '/../..' . '/Zotlabs/Module/Fbrowser.php',
@@ -1009,6 +1042,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Module\\Filestorage' => __DIR__ . '/../..' . '/Zotlabs/Module/Filestorage.php',
         'Zotlabs\\Module\\Follow' => __DIR__ . '/../..' . '/Zotlabs/Module/Follow.php',
         'Zotlabs\\Module\\Getfile' => __DIR__ . '/../..' . '/Zotlabs/Module/Getfile.php',
+        'Zotlabs\\Module\\Go' => __DIR__ . '/../..' . '/Zotlabs/Module/Go.php',
         'Zotlabs\\Module\\Group' => __DIR__ . '/../..' . '/Zotlabs/Module/Group.php',
         'Zotlabs\\Module\\Hcard' => __DIR__ . '/../..' . '/Zotlabs/Module/Hcard.php',
         'Zotlabs\\Module\\Help' => __DIR__ . '/../..' . '/Zotlabs/Module/Help.php',
@@ -1151,6 +1185,213 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Thumbs\\Pdf' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Pdf.php',
         'Zotlabs\\Thumbs\\Text' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Text.php',
         'Zotlabs\\Thumbs\\Video' => __DIR__ . '/../..' . '/Zotlabs/Thumbs/Video.php',
+        'Zotlabs\\Update\\_1000' => __DIR__ . '/../..' . '/Zotlabs/Update/_1000.php',
+        'Zotlabs\\Update\\_1001' => __DIR__ . '/../..' . '/Zotlabs/Update/_1001.php',
+        'Zotlabs\\Update\\_1002' => __DIR__ . '/../..' . '/Zotlabs/Update/_1002.php',
+        'Zotlabs\\Update\\_1003' => __DIR__ . '/../..' . '/Zotlabs/Update/_1003.php',
+        'Zotlabs\\Update\\_1004' => __DIR__ . '/../..' . '/Zotlabs/Update/_1004.php',
+        'Zotlabs\\Update\\_1005' => __DIR__ . '/../..' . '/Zotlabs/Update/_1005.php',
+        'Zotlabs\\Update\\_1006' => __DIR__ . '/../..' . '/Zotlabs/Update/_1006.php',
+        'Zotlabs\\Update\\_1007' => __DIR__ . '/../..' . '/Zotlabs/Update/_1007.php',
+        'Zotlabs\\Update\\_1008' => __DIR__ . '/../..' . '/Zotlabs/Update/_1008.php',
+        'Zotlabs\\Update\\_1009' => __DIR__ . '/../..' . '/Zotlabs/Update/_1009.php',
+        'Zotlabs\\Update\\_1010' => __DIR__ . '/../..' . '/Zotlabs/Update/_1010.php',
+        'Zotlabs\\Update\\_1011' => __DIR__ . '/../..' . '/Zotlabs/Update/_1011.php',
+        'Zotlabs\\Update\\_1012' => __DIR__ . '/../..' . '/Zotlabs/Update/_1012.php',
+        'Zotlabs\\Update\\_1013' => __DIR__ . '/../..' . '/Zotlabs/Update/_1013.php',
+        'Zotlabs\\Update\\_1014' => __DIR__ . '/../..' . '/Zotlabs/Update/_1014.php',
+        'Zotlabs\\Update\\_1015' => __DIR__ . '/../..' . '/Zotlabs/Update/_1015.php',
+        'Zotlabs\\Update\\_1016' => __DIR__ . '/../..' . '/Zotlabs/Update/_1016.php',
+        'Zotlabs\\Update\\_1017' => __DIR__ . '/../..' . '/Zotlabs/Update/_1017.php',
+        'Zotlabs\\Update\\_1018' => __DIR__ . '/../..' . '/Zotlabs/Update/_1018.php',
+        'Zotlabs\\Update\\_1019' => __DIR__ . '/../..' . '/Zotlabs/Update/_1019.php',
+        'Zotlabs\\Update\\_1020' => __DIR__ . '/../..' . '/Zotlabs/Update/_1020.php',
+        'Zotlabs\\Update\\_1021' => __DIR__ . '/../..' . '/Zotlabs/Update/_1021.php',
+        'Zotlabs\\Update\\_1022' => __DIR__ . '/../..' . '/Zotlabs/Update/_1022.php',
+        'Zotlabs\\Update\\_1023' => __DIR__ . '/../..' . '/Zotlabs/Update/_1023.php',
+        'Zotlabs\\Update\\_1024' => __DIR__ . '/../..' . '/Zotlabs/Update/_1024.php',
+        'Zotlabs\\Update\\_1025' => __DIR__ . '/../..' . '/Zotlabs/Update/_1025.php',
+        'Zotlabs\\Update\\_1026' => __DIR__ . '/../..' . '/Zotlabs/Update/_1026.php',
+        'Zotlabs\\Update\\_1027' => __DIR__ . '/../..' . '/Zotlabs/Update/_1027.php',
+        'Zotlabs\\Update\\_1028' => __DIR__ . '/../..' . '/Zotlabs/Update/_1028.php',
+        'Zotlabs\\Update\\_1029' => __DIR__ . '/../..' . '/Zotlabs/Update/_1029.php',
+        'Zotlabs\\Update\\_1030' => __DIR__ . '/../..' . '/Zotlabs/Update/_1030.php',
+        'Zotlabs\\Update\\_1031' => __DIR__ . '/../..' . '/Zotlabs/Update/_1031.php',
+        'Zotlabs\\Update\\_1032' => __DIR__ . '/../..' . '/Zotlabs/Update/_1032.php',
+        'Zotlabs\\Update\\_1033' => __DIR__ . '/../..' . '/Zotlabs/Update/_1033.php',
+        'Zotlabs\\Update\\_1034' => __DIR__ . '/../..' . '/Zotlabs/Update/_1034.php',
+        'Zotlabs\\Update\\_1035' => __DIR__ . '/../..' . '/Zotlabs/Update/_1035.php',
+        'Zotlabs\\Update\\_1036' => __DIR__ . '/../..' . '/Zotlabs/Update/_1036.php',
+        'Zotlabs\\Update\\_1037' => __DIR__ . '/../..' . '/Zotlabs/Update/_1037.php',
+        'Zotlabs\\Update\\_1038' => __DIR__ . '/../..' . '/Zotlabs/Update/_1038.php',
+        'Zotlabs\\Update\\_1039' => __DIR__ . '/../..' . '/Zotlabs/Update/_1039.php',
+        'Zotlabs\\Update\\_1040' => __DIR__ . '/../..' . '/Zotlabs/Update/_1040.php',
+        'Zotlabs\\Update\\_1041' => __DIR__ . '/../..' . '/Zotlabs/Update/_1041.php',
+        'Zotlabs\\Update\\_1042' => __DIR__ . '/../..' . '/Zotlabs/Update/_1042.php',
+        'Zotlabs\\Update\\_1043' => __DIR__ . '/../..' . '/Zotlabs/Update/_1043.php',
+        'Zotlabs\\Update\\_1044' => __DIR__ . '/../..' . '/Zotlabs/Update/_1044.php',
+        'Zotlabs\\Update\\_1045' => __DIR__ . '/../..' . '/Zotlabs/Update/_1045.php',
+        'Zotlabs\\Update\\_1046' => __DIR__ . '/../..' . '/Zotlabs/Update/_1046.php',
+        'Zotlabs\\Update\\_1047' => __DIR__ . '/../..' . '/Zotlabs/Update/_1047.php',
+        'Zotlabs\\Update\\_1048' => __DIR__ . '/../..' . '/Zotlabs/Update/_1048.php',
+        'Zotlabs\\Update\\_1049' => __DIR__ . '/../..' . '/Zotlabs/Update/_1049.php',
+        'Zotlabs\\Update\\_1050' => __DIR__ . '/../..' . '/Zotlabs/Update/_1050.php',
+        'Zotlabs\\Update\\_1051' => __DIR__ . '/../..' . '/Zotlabs/Update/_1051.php',
+        'Zotlabs\\Update\\_1052' => __DIR__ . '/../..' . '/Zotlabs/Update/_1052.php',
+        'Zotlabs\\Update\\_1053' => __DIR__ . '/../..' . '/Zotlabs/Update/_1053.php',
+        'Zotlabs\\Update\\_1054' => __DIR__ . '/../..' . '/Zotlabs/Update/_1054.php',
+        'Zotlabs\\Update\\_1055' => __DIR__ . '/../..' . '/Zotlabs/Update/_1055.php',
+        'Zotlabs\\Update\\_1056' => __DIR__ . '/../..' . '/Zotlabs/Update/_1056.php',
+        'Zotlabs\\Update\\_1057' => __DIR__ . '/../..' . '/Zotlabs/Update/_1057.php',
+        'Zotlabs\\Update\\_1058' => __DIR__ . '/../..' . '/Zotlabs/Update/_1058.php',
+        'Zotlabs\\Update\\_1059' => __DIR__ . '/../..' . '/Zotlabs/Update/_1059.php',
+        'Zotlabs\\Update\\_1060' => __DIR__ . '/../..' . '/Zotlabs/Update/_1060.php',
+        'Zotlabs\\Update\\_1061' => __DIR__ . '/../..' . '/Zotlabs/Update/_1061.php',
+        'Zotlabs\\Update\\_1062' => __DIR__ . '/../..' . '/Zotlabs/Update/_1062.php',
+        'Zotlabs\\Update\\_1063' => __DIR__ . '/../..' . '/Zotlabs/Update/_1063.php',
+        'Zotlabs\\Update\\_1064' => __DIR__ . '/../..' . '/Zotlabs/Update/_1064.php',
+        'Zotlabs\\Update\\_1065' => __DIR__ . '/../..' . '/Zotlabs/Update/_1065.php',
+        'Zotlabs\\Update\\_1066' => __DIR__ . '/../..' . '/Zotlabs/Update/_1066.php',
+        'Zotlabs\\Update\\_1067' => __DIR__ . '/../..' . '/Zotlabs/Update/_1067.php',
+        'Zotlabs\\Update\\_1068' => __DIR__ . '/../..' . '/Zotlabs/Update/_1068.php',
+        'Zotlabs\\Update\\_1069' => __DIR__ . '/../..' . '/Zotlabs/Update/_1069.php',
+        'Zotlabs\\Update\\_1070' => __DIR__ . '/../..' . '/Zotlabs/Update/_1070.php',
+        'Zotlabs\\Update\\_1071' => __DIR__ . '/../..' . '/Zotlabs/Update/_1071.php',
+        'Zotlabs\\Update\\_1072' => __DIR__ . '/../..' . '/Zotlabs/Update/_1072.php',
+        'Zotlabs\\Update\\_1073' => __DIR__ . '/../..' . '/Zotlabs/Update/_1073.php',
+        'Zotlabs\\Update\\_1074' => __DIR__ . '/../..' . '/Zotlabs/Update/_1074.php',
+        'Zotlabs\\Update\\_1075' => __DIR__ . '/../..' . '/Zotlabs/Update/_1075.php',
+        'Zotlabs\\Update\\_1076' => __DIR__ . '/../..' . '/Zotlabs/Update/_1076.php',
+        'Zotlabs\\Update\\_1077' => __DIR__ . '/../..' . '/Zotlabs/Update/_1077.php',
+        'Zotlabs\\Update\\_1078' => __DIR__ . '/../..' . '/Zotlabs/Update/_1078.php',
+        'Zotlabs\\Update\\_1079' => __DIR__ . '/../..' . '/Zotlabs/Update/_1079.php',
+        'Zotlabs\\Update\\_1080' => __DIR__ . '/../..' . '/Zotlabs/Update/_1080.php',
+        'Zotlabs\\Update\\_1081' => __DIR__ . '/../..' . '/Zotlabs/Update/_1081.php',
+        'Zotlabs\\Update\\_1082' => __DIR__ . '/../..' . '/Zotlabs/Update/_1082.php',
+        'Zotlabs\\Update\\_1083' => __DIR__ . '/../..' . '/Zotlabs/Update/_1083.php',
+        'Zotlabs\\Update\\_1084' => __DIR__ . '/../..' . '/Zotlabs/Update/_1084.php',
+        'Zotlabs\\Update\\_1085' => __DIR__ . '/../..' . '/Zotlabs/Update/_1085.php',
+        'Zotlabs\\Update\\_1086' => __DIR__ . '/../..' . '/Zotlabs/Update/_1086.php',
+        'Zotlabs\\Update\\_1087' => __DIR__ . '/../..' . '/Zotlabs/Update/_1087.php',
+        'Zotlabs\\Update\\_1088' => __DIR__ . '/../..' . '/Zotlabs/Update/_1088.php',
+        'Zotlabs\\Update\\_1089' => __DIR__ . '/../..' . '/Zotlabs/Update/_1089.php',
+        'Zotlabs\\Update\\_1090' => __DIR__ . '/../..' . '/Zotlabs/Update/_1090.php',
+        'Zotlabs\\Update\\_1091' => __DIR__ . '/../..' . '/Zotlabs/Update/_1091.php',
+        'Zotlabs\\Update\\_1092' => __DIR__ . '/../..' . '/Zotlabs/Update/_1092.php',
+        'Zotlabs\\Update\\_1093' => __DIR__ . '/../..' . '/Zotlabs/Update/_1093.php',
+        'Zotlabs\\Update\\_1094' => __DIR__ . '/../..' . '/Zotlabs/Update/_1094.php',
+        'Zotlabs\\Update\\_1095' => __DIR__ . '/../..' . '/Zotlabs/Update/_1095.php',
+        'Zotlabs\\Update\\_1096' => __DIR__ . '/../..' . '/Zotlabs/Update/_1096.php',
+        'Zotlabs\\Update\\_1097' => __DIR__ . '/../..' . '/Zotlabs/Update/_1097.php',
+        'Zotlabs\\Update\\_1098' => __DIR__ . '/../..' . '/Zotlabs/Update/_1098.php',
+        'Zotlabs\\Update\\_1099' => __DIR__ . '/../..' . '/Zotlabs/Update/_1099.php',
+        'Zotlabs\\Update\\_1100' => __DIR__ . '/../..' . '/Zotlabs/Update/_1100.php',
+        'Zotlabs\\Update\\_1101' => __DIR__ . '/../..' . '/Zotlabs/Update/_1101.php',
+        'Zotlabs\\Update\\_1102' => __DIR__ . '/../..' . '/Zotlabs/Update/_1102.php',
+        'Zotlabs\\Update\\_1103' => __DIR__ . '/../..' . '/Zotlabs/Update/_1103.php',
+        'Zotlabs\\Update\\_1104' => __DIR__ . '/../..' . '/Zotlabs/Update/_1104.php',
+        'Zotlabs\\Update\\_1105' => __DIR__ . '/../..' . '/Zotlabs/Update/_1105.php',
+        'Zotlabs\\Update\\_1106' => __DIR__ . '/../..' . '/Zotlabs/Update/_1106.php',
+        'Zotlabs\\Update\\_1107' => __DIR__ . '/../..' . '/Zotlabs/Update/_1107.php',
+        'Zotlabs\\Update\\_1108' => __DIR__ . '/../..' . '/Zotlabs/Update/_1108.php',
+        'Zotlabs\\Update\\_1109' => __DIR__ . '/../..' . '/Zotlabs/Update/_1109.php',
+        'Zotlabs\\Update\\_1110' => __DIR__ . '/../..' . '/Zotlabs/Update/_1110.php',
+        'Zotlabs\\Update\\_1111' => __DIR__ . '/../..' . '/Zotlabs/Update/_1111.php',
+        'Zotlabs\\Update\\_1112' => __DIR__ . '/../..' . '/Zotlabs/Update/_1112.php',
+        'Zotlabs\\Update\\_1113' => __DIR__ . '/../..' . '/Zotlabs/Update/_1113.php',
+        'Zotlabs\\Update\\_1114' => __DIR__ . '/../..' . '/Zotlabs/Update/_1114.php',
+        'Zotlabs\\Update\\_1115' => __DIR__ . '/../..' . '/Zotlabs/Update/_1115.php',
+        'Zotlabs\\Update\\_1116' => __DIR__ . '/../..' . '/Zotlabs/Update/_1116.php',
+        'Zotlabs\\Update\\_1117' => __DIR__ . '/../..' . '/Zotlabs/Update/_1117.php',
+        'Zotlabs\\Update\\_1118' => __DIR__ . '/../..' . '/Zotlabs/Update/_1118.php',
+        'Zotlabs\\Update\\_1119' => __DIR__ . '/../..' . '/Zotlabs/Update/_1119.php',
+        'Zotlabs\\Update\\_1120' => __DIR__ . '/../..' . '/Zotlabs/Update/_1120.php',
+        'Zotlabs\\Update\\_1121' => __DIR__ . '/../..' . '/Zotlabs/Update/_1121.php',
+        'Zotlabs\\Update\\_1122' => __DIR__ . '/../..' . '/Zotlabs/Update/_1122.php',
+        'Zotlabs\\Update\\_1123' => __DIR__ . '/../..' . '/Zotlabs/Update/_1123.php',
+        'Zotlabs\\Update\\_1124' => __DIR__ . '/../..' . '/Zotlabs/Update/_1124.php',
+        'Zotlabs\\Update\\_1125' => __DIR__ . '/../..' . '/Zotlabs/Update/_1125.php',
+        'Zotlabs\\Update\\_1126' => __DIR__ . '/../..' . '/Zotlabs/Update/_1126.php',
+        'Zotlabs\\Update\\_1127' => __DIR__ . '/../..' . '/Zotlabs/Update/_1127.php',
+        'Zotlabs\\Update\\_1128' => __DIR__ . '/../..' . '/Zotlabs/Update/_1128.php',
+        'Zotlabs\\Update\\_1129' => __DIR__ . '/../..' . '/Zotlabs/Update/_1129.php',
+        'Zotlabs\\Update\\_1130' => __DIR__ . '/../..' . '/Zotlabs/Update/_1130.php',
+        'Zotlabs\\Update\\_1131' => __DIR__ . '/../..' . '/Zotlabs/Update/_1131.php',
+        'Zotlabs\\Update\\_1132' => __DIR__ . '/../..' . '/Zotlabs/Update/_1132.php',
+        'Zotlabs\\Update\\_1133' => __DIR__ . '/../..' . '/Zotlabs/Update/_1133.php',
+        'Zotlabs\\Update\\_1134' => __DIR__ . '/../..' . '/Zotlabs/Update/_1134.php',
+        'Zotlabs\\Update\\_1135' => __DIR__ . '/../..' . '/Zotlabs/Update/_1135.php',
+        'Zotlabs\\Update\\_1136' => __DIR__ . '/../..' . '/Zotlabs/Update/_1136.php',
+        'Zotlabs\\Update\\_1137' => __DIR__ . '/../..' . '/Zotlabs/Update/_1137.php',
+        'Zotlabs\\Update\\_1138' => __DIR__ . '/../..' . '/Zotlabs/Update/_1138.php',
+        'Zotlabs\\Update\\_1139' => __DIR__ . '/../..' . '/Zotlabs/Update/_1139.php',
+        'Zotlabs\\Update\\_1140' => __DIR__ . '/../..' . '/Zotlabs/Update/_1140.php',
+        'Zotlabs\\Update\\_1141' => __DIR__ . '/../..' . '/Zotlabs/Update/_1141.php',
+        'Zotlabs\\Update\\_1142' => __DIR__ . '/../..' . '/Zotlabs/Update/_1142.php',
+        'Zotlabs\\Update\\_1143' => __DIR__ . '/../..' . '/Zotlabs/Update/_1143.php',
+        'Zotlabs\\Update\\_1144' => __DIR__ . '/../..' . '/Zotlabs/Update/_1144.php',
+        'Zotlabs\\Update\\_1145' => __DIR__ . '/../..' . '/Zotlabs/Update/_1145.php',
+        'Zotlabs\\Update\\_1146' => __DIR__ . '/../..' . '/Zotlabs/Update/_1146.php',
+        'Zotlabs\\Update\\_1147' => __DIR__ . '/../..' . '/Zotlabs/Update/_1147.php',
+        'Zotlabs\\Update\\_1148' => __DIR__ . '/../..' . '/Zotlabs/Update/_1148.php',
+        'Zotlabs\\Update\\_1149' => __DIR__ . '/../..' . '/Zotlabs/Update/_1149.php',
+        'Zotlabs\\Update\\_1150' => __DIR__ . '/../..' . '/Zotlabs/Update/_1150.php',
+        'Zotlabs\\Update\\_1151' => __DIR__ . '/../..' . '/Zotlabs/Update/_1151.php',
+        'Zotlabs\\Update\\_1152' => __DIR__ . '/../..' . '/Zotlabs/Update/_1152.php',
+        'Zotlabs\\Update\\_1153' => __DIR__ . '/../..' . '/Zotlabs/Update/_1153.php',
+        'Zotlabs\\Update\\_1154' => __DIR__ . '/../..' . '/Zotlabs/Update/_1154.php',
+        'Zotlabs\\Update\\_1155' => __DIR__ . '/../..' . '/Zotlabs/Update/_1155.php',
+        'Zotlabs\\Update\\_1156' => __DIR__ . '/../..' . '/Zotlabs/Update/_1156.php',
+        'Zotlabs\\Update\\_1157' => __DIR__ . '/../..' . '/Zotlabs/Update/_1157.php',
+        'Zotlabs\\Update\\_1158' => __DIR__ . '/../..' . '/Zotlabs/Update/_1158.php',
+        'Zotlabs\\Update\\_1159' => __DIR__ . '/../..' . '/Zotlabs/Update/_1159.php',
+        'Zotlabs\\Update\\_1160' => __DIR__ . '/../..' . '/Zotlabs/Update/_1160.php',
+        'Zotlabs\\Update\\_1161' => __DIR__ . '/../..' . '/Zotlabs/Update/_1161.php',
+        'Zotlabs\\Update\\_1162' => __DIR__ . '/../..' . '/Zotlabs/Update/_1162.php',
+        'Zotlabs\\Update\\_1163' => __DIR__ . '/../..' . '/Zotlabs/Update/_1163.php',
+        'Zotlabs\\Update\\_1164' => __DIR__ . '/../..' . '/Zotlabs/Update/_1164.php',
+        'Zotlabs\\Update\\_1165' => __DIR__ . '/../..' . '/Zotlabs/Update/_1165.php',
+        'Zotlabs\\Update\\_1166' => __DIR__ . '/../..' . '/Zotlabs/Update/_1166.php',
+        'Zotlabs\\Update\\_1167' => __DIR__ . '/../..' . '/Zotlabs/Update/_1167.php',
+        'Zotlabs\\Update\\_1168' => __DIR__ . '/../..' . '/Zotlabs/Update/_1168.php',
+        'Zotlabs\\Update\\_1169' => __DIR__ . '/../..' . '/Zotlabs/Update/_1169.php',
+        'Zotlabs\\Update\\_1170' => __DIR__ . '/../..' . '/Zotlabs/Update/_1170.php',
+        'Zotlabs\\Update\\_1171' => __DIR__ . '/../..' . '/Zotlabs/Update/_1171.php',
+        'Zotlabs\\Update\\_1172' => __DIR__ . '/../..' . '/Zotlabs/Update/_1172.php',
+        'Zotlabs\\Update\\_1173' => __DIR__ . '/../..' . '/Zotlabs/Update/_1173.php',
+        'Zotlabs\\Update\\_1174' => __DIR__ . '/../..' . '/Zotlabs/Update/_1174.php',
+        'Zotlabs\\Update\\_1175' => __DIR__ . '/../..' . '/Zotlabs/Update/_1175.php',
+        'Zotlabs\\Update\\_1176' => __DIR__ . '/../..' . '/Zotlabs/Update/_1176.php',
+        'Zotlabs\\Update\\_1177' => __DIR__ . '/../..' . '/Zotlabs/Update/_1177.php',
+        'Zotlabs\\Update\\_1178' => __DIR__ . '/../..' . '/Zotlabs/Update/_1178.php',
+        'Zotlabs\\Update\\_1179' => __DIR__ . '/../..' . '/Zotlabs/Update/_1179.php',
+        'Zotlabs\\Update\\_1180' => __DIR__ . '/../..' . '/Zotlabs/Update/_1180.php',
+        'Zotlabs\\Update\\_1181' => __DIR__ . '/../..' . '/Zotlabs/Update/_1181.php',
+        'Zotlabs\\Update\\_1182' => __DIR__ . '/../..' . '/Zotlabs/Update/_1182.php',
+        'Zotlabs\\Update\\_1183' => __DIR__ . '/../..' . '/Zotlabs/Update/_1183.php',
+        'Zotlabs\\Update\\_1184' => __DIR__ . '/../..' . '/Zotlabs/Update/_1184.php',
+        'Zotlabs\\Update\\_1185' => __DIR__ . '/../..' . '/Zotlabs/Update/_1185.php',
+        'Zotlabs\\Update\\_1186' => __DIR__ . '/../..' . '/Zotlabs/Update/_1186.php',
+        'Zotlabs\\Update\\_1187' => __DIR__ . '/../..' . '/Zotlabs/Update/_1187.php',
+        'Zotlabs\\Update\\_1188' => __DIR__ . '/../..' . '/Zotlabs/Update/_1188.php',
+        'Zotlabs\\Update\\_1189' => __DIR__ . '/../..' . '/Zotlabs/Update/_1189.php',
+        'Zotlabs\\Update\\_1190' => __DIR__ . '/../..' . '/Zotlabs/Update/_1190.php',
+        'Zotlabs\\Update\\_1191' => __DIR__ . '/../..' . '/Zotlabs/Update/_1191.php',
+        'Zotlabs\\Update\\_1192' => __DIR__ . '/../..' . '/Zotlabs/Update/_1192.php',
+        'Zotlabs\\Update\\_1193' => __DIR__ . '/../..' . '/Zotlabs/Update/_1193.php',
+        'Zotlabs\\Update\\_1194' => __DIR__ . '/../..' . '/Zotlabs/Update/_1194.php',
+        'Zotlabs\\Update\\_1195' => __DIR__ . '/../..' . '/Zotlabs/Update/_1195.php',
+        'Zotlabs\\Update\\_1196' => __DIR__ . '/../..' . '/Zotlabs/Update/_1196.php',
+        'Zotlabs\\Update\\_1197' => __DIR__ . '/../..' . '/Zotlabs/Update/_1197.php',
+        'Zotlabs\\Update\\_1198' => __DIR__ . '/../..' . '/Zotlabs/Update/_1198.php',
+        'Zotlabs\\Update\\_1199' => __DIR__ . '/../..' . '/Zotlabs/Update/_1199.php',
+        'Zotlabs\\Update\\_1200' => __DIR__ . '/../..' . '/Zotlabs/Update/_1200.php',
+        'Zotlabs\\Update\\_1201' => __DIR__ . '/../..' . '/Zotlabs/Update/_1201.php',
+        'Zotlabs\\Update\\_1202' => __DIR__ . '/../..' . '/Zotlabs/Update/_1202.php',
+        'Zotlabs\\Update\\_1203' => __DIR__ . '/../..' . '/Zotlabs/Update/_1203.php',
+        'Zotlabs\\Update\\_1204' => __DIR__ . '/../..' . '/Zotlabs/Update/_1204.php',
+        'Zotlabs\\Update\\_1205' => __DIR__ . '/../..' . '/Zotlabs/Update/_1205.php',
+        'Zotlabs\\Update\\_1206' => __DIR__ . '/../..' . '/Zotlabs/Update/_1206.php',
         'Zotlabs\\Web\\CheckJS' => __DIR__ . '/../..' . '/Zotlabs/Web/CheckJS.php',
         'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php',
         'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php',
@@ -1193,6 +1434,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Widget\\Item' => __DIR__ . '/../..' . '/Zotlabs/Widget/Item.php',
         'Zotlabs\\Widget\\Mailmenu' => __DIR__ . '/../..' . '/Zotlabs/Widget/Mailmenu.php',
         'Zotlabs\\Widget\\Menu_preview' => __DIR__ . '/../..' . '/Zotlabs/Widget/Menu_preview.php',
+        'Zotlabs\\Widget\\Newmember' => __DIR__ . '/../..' . '/Zotlabs/Widget/Newmember.php',
         'Zotlabs\\Widget\\Notes' => __DIR__ . '/../..' . '/Zotlabs/Widget/Notes.php',
         'Zotlabs\\Widget\\Notifications' => __DIR__ . '/../..' . '/Zotlabs/Widget/Notifications.php',
         'Zotlabs\\Widget\\Photo' => __DIR__ . '/../..' . '/Zotlabs/Widget/Photo.php',
@@ -1219,18 +1461,16 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
         'Zotlabs\\Widget\\Wiki_pages' => __DIR__ . '/../..' . '/Zotlabs/Widget/Wiki_pages.php',
         'Zotlabs\\Widget\\Zcard' => __DIR__ . '/../..' . '/Zotlabs/Widget/Zcard.php',
         'Zotlabs\\Zot\\Auth' => __DIR__ . '/../..' . '/Zotlabs/Zot/Auth.php',
-        'Zotlabs\\Zot\\DReport' => __DIR__ . '/../..' . '/Zotlabs/Zot/DReport.php',
         'Zotlabs\\Zot\\Finger' => __DIR__ . '/../..' . '/Zotlabs/Zot/Finger.php',
         'Zotlabs\\Zot\\IHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot/IHandler.php',
         'Zotlabs\\Zot\\Receiver' => __DIR__ . '/../..' . '/Zotlabs/Zot/Receiver.php',
-        'Zotlabs\\Zot\\Verify' => __DIR__ . '/../..' . '/Zotlabs/Zot/Verify.php',
         'Zotlabs\\Zot\\ZotHandler' => __DIR__ . '/../..' . '/Zotlabs/Zot/ZotHandler.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->firstCharsPsr4 = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$firstCharsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$prefixesPsr0;
             $loader->classMap = ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d::$classMap;

view/es-es/hstrings.php

@@ -71,9 +71,8 @@ App::$strings["2. Enter my \$Projectname network address into the site searchbar
 App::$strings["or visit"] = "o visitar";
 App::$strings["3. Click [Connect]"] = "3. Pulse [conectar]";
 App::$strings["Submit"] = "Enviar";
-App::$strings["Cards"] = "Fichas";
-App::$strings["Add Article"] = "Añadir un artículo";
 App::$strings["Articles"] = "Artículos";
+App::$strings["Add Article"] = "Añadir un artículo";
 App::$strings["Item not found"] = "Elemento no encontrado";
 App::$strings["Layout Name"] = "Nombre de la plantilla";
 App::$strings["Layout Description (Optional)"] = "Descripción de la plantilla (opcional)";
@@ -151,7 +150,8 @@ App::$strings["You may also export your posts and conversations for a particular
 App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1\$s\">%2\$s</a>";
 App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1\$s\">%2\$s</a>";
 App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1\$s\">%2\$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero).";
-App::$strings["Welcome to hubzilla!"] = "¡Bienvenido o bienvenida a Hubzilla!";
+App::$strings["Welcome to Hubzilla!"] = "¡Bienvenido a Hubzilla!";
+App::$strings["You have got no unseen posts..."] = "No tiene ningún mensaje sin leer...";
 App::$strings["Public access denied."] = "Acceso público denegado.";
 App::$strings["Search"] = "Buscar";
 App::$strings["Items tagged with: %s"] = "elementos etiquetados con: %s";
@@ -282,6 +282,7 @@ App::$strings["Read more about roles"] = "Leer más sobre los roles";
 App::$strings["Create Channel"] = "Crear un canal";
 App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada.";
 App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "O <a href=\"import\">importar un canal existente</a> desde otro lugar.";
+App::$strings["Validate"] = "Validar";
 App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña.";
 App::$strings["Remove This Channel"] = "Eliminar este canal";
 App::$strings["WARNING: "] = "ATENCIÓN:";
@@ -412,10 +413,10 @@ App::$strings["Executing %s failed. Check system logs."] = "La ejecución de %s
 App::$strings["Update %s was successfully applied."] = "La actualización de %s se ha realizado exitosamente.";
 App::$strings["Update %s did not return a status. Unknown if it succeeded."] = "La actualización de %s no ha devuelto ningún estado. No se sabe si ha tenido éxito.";
 App::$strings["Update function %s could not be found."] = "No se encuentra la función de actualización de %s.";
-App::$strings["No failed updates."] = "No ha fallado ninguna actualización.";
 App::$strings["Failed Updates"] = "Han fallado las actualizaciones";
 App::$strings["Mark success (if update was manually applied)"] = "Marcar como exitosa (si la actualización se ha hecho manualmente)";
 App::$strings["Attempt to execute this update step automatically"] = "Intentar ejecutar este paso de actualización automáticamente";
+App::$strings["No failed updates."] = "No ha fallado ninguna actualización.";
 App::$strings["Item not found."] = "Elemento no encontrado.";
 App::$strings["Plugin %s disabled."] = "Extensión %s desactivada.";
 App::$strings["Plugin %s enabled."] = "Extensión %s activada.";
@@ -542,6 +543,7 @@ App::$strings["Used to provide a member experience matched to technical comfort
 App::$strings["Lock the technical skill level setting"] = "Bloquear el ajuste del nivel de habilidad técnica";
 App::$strings["Members can set their own technical comfort level by default"] = "Los miembros pueden configurar su nivel de comodidad técnica por defecto";
 App::$strings["Banner/Logo"] = "Banner/Logo";
+App::$strings["Unfiltered HTML/CSS/JS is allowed"] = "Se permite HTML/CSS/JS sin filtrar";
 App::$strings["Administrator Information"] = "Información del Administrador";
 App::$strings["Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here"] = "Información de contacto de los administradores del sitio. Visible en la página \"siteinfo\". Se puede usar BBCode";
 App::$strings["Site Information"] = "Información sobre el sitio";
@@ -558,6 +560,8 @@ App::$strings["Maximum size in bytes of uploaded images. Default is 0, which mea
 App::$strings["Does this site allow new member registration?"] = "¿Debe este sitio permitir el registro de nuevos miembros?";
 App::$strings["Invitation only"] = "Solo con una invitación";
 App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Solo se permiten inscripciones de nuevos miembros con un código de invitación. Además, deben aceptarse los términos del registro marcando \"Sí\".";
+App::$strings["Minimum age"] = "Edad mínima";
+App::$strings["Minimum age (in years) for who may register on this site."] = "Edad mínima (en años) para poder registrarse en este sitio.";
 App::$strings["Which best describes the types of account offered by this hub?"] = "¿Cómo describiría el tipo de servicio ofrecido por este servidor?";
 App::$strings["Register text"] = "Texto del registro";
 App::$strings["Will be displayed prominently on the registration page."] = "Se mostrará de forma destacada en la página de registro.";
@@ -575,6 +579,10 @@ App::$strings["Force publish"] = "Forzar la publicación";
 App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Intentar forzar todos los perfiles para que sean listados en el directorio de este sitio.";
 App::$strings["Import Public Streams"] = "Importar contenido público";
 App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Importar y permitir acceso al contenido público sacado de otros sitios. Advertencia: este contenido no está moderado, por lo que podría encontrar cosas inapropiadas u ofensivas.";
+App::$strings["Site only Public Streams"] = "Solo contenido público en este sitio";
+App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = "Permitir el acceso al contenido público originado sólo desde este sitio si los \"streams\" públicos Importados están deshabilitados.";
+App::$strings["Allow anybody on the internet to access the Public streams"] = "Permitir que cualquiera en Internet pueda acceder a los \"streams\" públicos";
+App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = "Desactivar para requerir autenticación antes de la visualización. Advertencia: este contenido no está moderado.";
 App::$strings["Login on Homepage"] = "Iniciar sesión en la página personal";
 App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presentar a los visitantes una casilla de identificación en la página de inicio, si no se ha configurado otro tipo de contenido.";
 App::$strings["Enable context help"] = "Habilitar la ayuda contextual";
@@ -604,6 +612,12 @@ App::$strings["Maximum Load Average"] = "Carga media máxima";
 App::$strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de entrega y envío se hayan retardado - por defecto, 50.";
 App::$strings["Expiration period in days for imported (grid/network) content"] = "Caducidad del contenido importado de otros sitios (en días)";
 App::$strings["0 for no expiration of imported content"] = "0 para que no caduque el contenido importado";
+App::$strings["Public servers: Optional landing (marketing) webpage for new registrants"] = "Servidores públicos: Página web de acogida (marketing) opcional para nuevos registros";
+App::$strings["Create this page first. Default is %s/register"] = "Crear esta página primero. Por defecto es %s/register";
+App::$strings["Page to display after creating a new channel"] = "Página a mostrar después de la creación de un nuevo canal";
+App::$strings["Recommend: profiles, go, or settings"] = "Recomendar: perfiles, ir, o ajustes";
+App::$strings["Optional: site location"] = "Opcional: ubicación del sitio";
+App::$strings["Region or country"] = "Región o país";
 App::$strings["New Profile Field"] = "Nuevo campo en el perfil";
 App::$strings["Field nickname"] = "Alias del campo";
 App::$strings["System name of field"] = "Nombre del campo en el sistema";
@@ -790,16 +804,18 @@ App::$strings["Enter New Password"] = "Escribir una nueva contraseña";
 App::$strings["Confirm New Password"] = "Confirmar la nueva contraseña";
 App::$strings["Leave password fields blank unless changing"] = "Dejar en blanco la contraseña a menos que desee cambiarla.";
 App::$strings["Your technical skill level"] = "Su nivel de habilidad técnica";
-App::$strings["Used to provide a member experience matched to your comfort level"] = "Se utiliza para proporcionar la experiencia de los miembros adaptada a su nivel de comodidad";
+App::$strings["Used to provide a member experience and additional features consistent with your comfort level"] = "Utilizado para proporcionar un nivel de experiencia como miembro y características adicionales consistentes con su nivel de comodidad";
 App::$strings["Remove Account"] = "Eliminar cuenta";
 App::$strings["Remove this account including all its channels"] = "Eliminar esta cuenta incluyendo todos sus canales";
 App::$strings["Affinity Slider settings updated."] = "Se han actualizado los ajustes del controlador de afinidad.";
 App::$strings["No feature settings configured"] = "No se ha establecido la configuración de los complementos";
 App::$strings["Default maximum affinity level"] = "Nivel máximo de afinidad por defecto";
+App::$strings["0-99 default 99"] = "0-99 por defecto 99";
 App::$strings["Default minimum affinity level"] = "Nivel mínimo de afinidad por defecto";
+App::$strings["0-99 - default 0"] = "0-99 - por defecto 0";
 App::$strings["Affinity Slider Settings"] = "Ajustes del controlador de afinidad";
-App::$strings["Feature/Addon Settings"] = "Ajustes de los complementos";
+App::$strings["Addon Settings"] = "Ajustes de los complementos";
-App::$strings["No special theme for mobile devices"] = "Sin tema especial para dispositivos móviles";
+App::$strings["Please save/submit changes to any panel before opening another."] = "Guarde o envíe los cambios a cualquier panel antes de abrir otro.";
 App::$strings["%s - (Experimental)"] = "%s - (Experimental)";
 App::$strings["Display Settings"] = "Ajustes de visualización";
 App::$strings["Theme Settings"] = "Ajustes del tema";
@@ -807,7 +823,6 @@ App::$strings["Custom Theme Settings"] = "Ajustes personalizados del tema";
 App::$strings["Content Settings"] = "Ajustes del contenido";
 App::$strings["Display Theme:"] = "Tema gráfico del perfil:";
 App::$strings["Select scheme"] = "Elegir un esquema";
-App::$strings["Mobile Theme:"] = "Tema para el móvil:";
 App::$strings["Preload images before rendering the page"] = "Carga previa de las imágenes antes de generar la página";
 App::$strings["The subjective page load time will be longer but the page will be ready when displayed"] = "El tiempo subjetivo de carga de la página será más largo, pero la página estará lista cuando se muestre.";
 App::$strings["Enable user zoom on mobile devices"] = "Habilitar zoom de usuario en dispositivos móviles";
@@ -1082,10 +1097,10 @@ App::$strings["Photo not available."] = "Foto no disponible.";
 App::$strings["Upload File:"] = "Subir fichero:";
 App::$strings["Select a profile:"] = "Seleccionar un perfil:";
 App::$strings["Use Photo for Profile"] = "Usar la fotografía para el perfil";
-App::$strings["Upload Profile Photo"] = "Subir foto de perfil";
+App::$strings["Change Profile Photo"] = "Cambiar la foto del perfil";
 App::$strings["Use"] = "Usar";
-App::$strings["skip this step"] = "Omitir este paso";
+App::$strings["Use a photo from your albums"] = "Usar una foto de sus álbumes";
-App::$strings["select a photo from your photo albums"] = "Seleccione una foto de sus álbumes de fotos";
+App::$strings["Select existing photo"] = "Seleccionar una foto existente";
 App::$strings["Crop Image"] = "Recortar imagen";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Por favor ajuste el recorte de la imagen para una visión óptima.";
 App::$strings["Done Editing"] = "Edición completada";
@@ -1164,6 +1179,7 @@ App::$strings["Connection: %s"] = "Conexión: %s";
 App::$strings["Apply these permissions automatically"] = "Aplicar estos permisos automaticamente";
 App::$strings["Connection requests will be approved without your interaction"] = "Las solicitudes de conexión serán aprobadas sin su intervención";
 App::$strings["Permission role"] = "Rol de acceso";
+App::$strings["Loading"] = "Cargando";
 App::$strings["Add permission role"] = "Añadir un rol de acceso";
 App::$strings["This connection's primary address is"] = "La dirección primaria de esta conexión es";
 App::$strings["Available locations:"] = "Ubicaciones disponibles:";
@@ -1227,7 +1243,13 @@ App::$strings["Help"] = "Ayuda";
 App::$strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche";
 App::$strings["Layout Description"] = "Descripción de la plantilla";
 App::$strings["Download PDL file"] = "Descargar el fichero PDL";
+App::$strings["Please refresh page"] = "Por favor, recargue la página";
 App::$strings["Unknown error"] = "Error desconocido";
+App::$strings["Token verification failed."] = "Ha fallado el token de verificación.";
+App::$strings["Email Verification Required"] = "Verificación obligatoria del correo electrónico";
+App::$strings["A verification token was sent to your email address [%s]. Enter that token here to complete the account verification step. Please allow a few minutes for delivery, and check your spam folder if you do not see the message."] = "Se ha enviado un token de verificación a su dirección de correo electrónico [%s]. Ingrese ese símbolo aquí para completar el paso de verificación de cuenta. Por favor, espere unos minutos para el envío, y revise su carpeta de spam si no ve el mensaje.";
+App::$strings["Resend Email"] = "Reenvío de correo electrónico";
+App::$strings["Validation token"] = "Token de validación";
 App::$strings["Post not found."] = "Mensaje no encontrado.";
 App::$strings["post"] = "la entrada";
 App::$strings["comment"] = "el comentario";
@@ -1319,6 +1341,21 @@ App::$strings["My other channels"] = "Mis otros canales";
 App::$strings["Communications"] = "Comunicaciones";
 App::$strings["Profile Image"] = "Imagen del perfil";
 App::$strings["Edit Profiles"] = "Editar perfiles";
+App::$strings["This page is available only to site members"] = "Esta página está disponible sólo para los miembros del sitio";
+App::$strings["Welcome"] = "Bienvenido/a";
+App::$strings["What would you like to do?"] = "¿Qué le gustaría hacer?";
+App::$strings["Please bookmark this page if you would like to return to it in the future"] = "Por favor añada esta página a sus marcadores si desea volver a ella en el futuro.";
+App::$strings["Upload a profile photo"] = "Subir una foto de perfil";
+App::$strings["Upload a cover photo"] = "Subir una foto de portada del perfil";
+App::$strings["Edit your default profile"] = "Editar su perfil por defecto";
+App::$strings["View friend suggestions"] = "Ver sugerencias de amistad";
+App::$strings["View the channel directory"] = "Ver el directorio de canales";
+App::$strings["View/edit your channel settings"] = "Ver o modificar los ajustes de su canal";
+App::$strings["View the site or project documentation"] = "Ver el sitio o la documentación del proyecto";
+App::$strings["Visit your channel homepage"] = "Visitar la página principal de su canal";
+App::$strings["View your connections and/or add somebody whose address you already know"] = "Vea sus conexiones y/o agregue a alguien cuya dirección ya conozca";
+App::$strings["View your personal stream (this may be empty until you add some connections)"] = "Ver su \"stream\" personal (puede que esté vacío hasta que agregue algunas conexiones)";
+App::$strings["View the public stream. Warning: this content is not moderated"] = "Ver el \"stream\" público. Advertencia: este contenido no está moderado";
 App::$strings["Page link"] = "Enlace de la página";
 App::$strings["Edit Webpage"] = "Editar la página web";
 App::$strings["Create a new channel"] = "Crear un nuevo canal";
@@ -1330,6 +1367,7 @@ App::$strings["Make Default"] = "Convertir en predeterminado";
 App::$strings["%d new messages"] = "%d mensajes nuevos";
 App::$strings["%d new introductions"] = "%d nuevas solicitudes de conexión";
 App::$strings["Delegated Channel"] = "Canal delegado";
+App::$strings["Cards"] = "Fichas";
 App::$strings["Add Card"] = "Añadir una ficha";
 App::$strings["This directory server requires an access token"] = "El servidor de este directorio necesita un \"token\" de acceso";
 App::$strings["About this site"] = "Acerca de este sitio";
@@ -1504,8 +1542,8 @@ App::$strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dir
 App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Se ha superado el límite máximo de inscripciones diarias de este sitio. Por favor, pruebe de nuevo mañana.";
 App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "Por favor, confirme que acepta los Términos del servicio. El registro ha fallado.";
 App::$strings["Passwords do not match."] = "Las contraseñas no coinciden.";
-App::$strings["Registration successful. Please check your email for validation instructions."] = "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo.";
 App::$strings["Registration successful. Continue to create your first channel..."] = "Registro exitoso. Continúe creando tu primer canal...";
+App::$strings["Registration successful. Please check your email for validation instructions."] = "Registro realizado con éxito. Por favor, compruebe su correo electrónico para ver las instrucciones para validarlo.";
 App::$strings["Your registration is pending approval by the site owner."] = "Su registro está pendiente de aprobación por el propietario del sitio.";
 App::$strings["Your registration can not be processed."] = "Su registro no puede ser procesado.";
 App::$strings["Registration on this hub is disabled."] = "El registro está deshabilitado en este sitio.";
@@ -1522,7 +1560,7 @@ App::$strings["no"] = "no";
 App::$strings["yes"] = "sí";
 App::$strings["Membership on this site is by invitation only."] = "Para registrarse en este sitio es necesaria una invitación.";
 App::$strings["Register"] = "Registrarse";
-App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Este sitio puede requerir una verificación de correo electrónico después de enviar este formulario. Si es devuelto a una página de inicio de sesión, compruebe su email para recibir y leer las instrucciones.";
+App::$strings["This site requires email verification. After completing this form, please check your email for further instructions."] = "Este sitio requiere verificación por correo electrónico. Después de completar este formulario, por favor revise su correo electrónico para más instrucciones.";
 App::$strings["Cover Photos"] = "Imágenes de portada del perfil";
 App::$strings["female"] = "mujer";
 App::$strings["%1\$s updated her %2\$s"] = "%1\$s ha actualizado su %2\$s";
@@ -1530,7 +1568,7 @@ App::$strings["male"] = "hombre";
 App::$strings["%1\$s updated his %2\$s"] = "%1\$s ha actualizado su %2\$s";
 App::$strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado su %2\$s";
 App::$strings["cover photo"] = "Imagen de portada del perfil";
-App::$strings["Upload Cover Photo"] = "Subir imagen de portada del perfil";
+App::$strings["Change Cover Photo"] = "Cambiar la foto de portada del perfil";
 App::$strings["Documentation Search"] = "Búsqueda de Documentación";
 App::$strings["About"] = "Mi perfil";
 App::$strings["Administrators"] = "Administradores";
@@ -1568,6 +1606,8 @@ App::$strings["Show in your contacts shared folder"] = "Mostrar en la carpeta co
 App::$strings["No channel."] = "Ningún canal.";
 App::$strings["No connections in common."] = "Ninguna  conexión en común.";
 App::$strings["View Common Connections"] = "Ver las conexiones comunes";
+App::$strings["Email verification resent"] = "Reenvío del email de verificación";
+App::$strings["Unable to resend email verification message."] = "No se puede reenviar el mensaje de verificación por correo electrónico.";
 App::$strings["No connections."] = "Sin conexiones.";
 App::$strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
 App::$strings["View Connections"] = "Ver conexiones";
@@ -1684,15 +1724,21 @@ App::$strings["\$Projectname Notification"] = "Notificación de \$Projectname";
 App::$strings["\$projectname"] = "\$projectname";
 App::$strings["Thank You,"] = "Gracias,";
 App::$strings["%s Administrator"] = "%s Administrador";
+App::$strings["This email was sent by %1\$s at %2\$s."] = "Este email ha sido enviado por %1\$s a %2\$s.";
+App::$strings["To stop receiving these messages, please adjust your Notification Settings at %s"] = "Para dejar de recibir estos mensajes, por favor ajuste la configuración de notificación en %s";
+App::$strings["To stop receiving these messages, please adjust your %s."] = "Para dejar de recibir estos mensajes, por favor, ajuste su %s";
 App::$strings["%s <!item_type!>"] = "%s <!item_type!>";
 App::$strings["[\$Projectname:Notify] New mail received at %s"] = "[\$Projectname:Aviso] Nuevo correo recibido en %s";
 App::$strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
 App::$strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
 App::$strings["a private message"] = "un mensaje privado";
 App::$strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
+App::$strings["commented on"] = "ha comentado sobre";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%5\$s de %4\$s[/zrl] ";
+App::$strings["liked"] = "ha gustado de ";
-App::$strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s creado por usted[/zrl]";
+App::$strings["disliked"] = "no ha gustado de ";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]a %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s[zrl=%4\$s]un %5\$s[/zrl]";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]%5\$s's %6\$s[/zrl]"] = "%1\$s, %2\$s %3\$s [zrl=%4\$s] %6\$sde %5\$s[/zrl]";
+App::$strings["%1\$s, %2\$s %3\$s [zrl=%4\$s]your %5\$s[/zrl]"] = "%1\$s, %2\$s %3\$s  [zrl=%4\$s] ]su %5\$s [/zrl]";
 App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Comentario moderado en la conversación #%1\$d por %2\$s";
 App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = "[\$Projectname:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d";
 App::$strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s ha comentado un elemento/conversación que ha estado siguiendo.";
@@ -1727,6 +1773,8 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Por fav
 App::$strings["[\$Projectname:Notify]"] = "[\$Projectname:Aviso]";
 App::$strings["created a new post"] = "ha creado una nueva entrada";
 App::$strings["commented on %s's post"] = "ha comentado la entrada de %s";
+App::$strings["edited a post dated %s"] = "ha editado una entrada fechada el%s";
+App::$strings["edited a comment dated %s"] = "ha editado un comentario fechado el %s";
 App::$strings["Wiki updated successfully"] = "El wiki se ha actualizado con éxito";
 App::$strings["Wiki files deleted successfully"] = "Se han borrado con éxito los ficheros del wiki";
 App::$strings["Update Error at %s"] = "Error de actualización en %s";
@@ -1865,6 +1913,18 @@ App::$strings["Suggestions"] = "Sugerencias";
 App::$strings["See more..."] = "Ver más...";
 App::$strings["Saved Folders"] = "Carpetas guardadas";
 App::$strings["Click to show more"] = "Hacer clic para ver más";
+App::$strings["Profile Creation"] = "Creación de perfiles";
+App::$strings["Upload profile photo"] = "Cargar la foto del perfil";
+App::$strings["Upload cover photo"] = "Cargar la foto de portada del perfil";
+App::$strings["Edit your profile"] = "Editar su perfil";
+App::$strings["Find and Connect with others"] = "Encontrar y conectarse con otros";
+App::$strings["Manage your connections"] = "Gestionar sus conexiones";
+App::$strings["Communicate"] = "Comunicarse";
+App::$strings["View your channel homepage"] = "Ver la página principal de su canal";
+App::$strings["View your network stream"] = "Ver el \"stream\" de su red";
+App::$strings["Documentation"] = "Documentación";
+App::$strings["View public stream. Warning: not moderated"] = "Ver el \"stream\" público. Advertencia: no está moderado";
+App::$strings["New Member Links"] = "Enlaces para nuevos miembros";
 App::$strings["Member registrations waiting for confirmation"] = "Inscripciones de nuevos miembros pendientes de aprobación";
 App::$strings["Inspect queue"] = "Examinar la cola";
 App::$strings["DB updates"] = "Actualizaciones de la base de datos";
@@ -1873,7 +1933,7 @@ App::$strings["Plugin Features"] = "Extensiones";
 App::$strings["Account settings"] = "Configuración de la cuenta";
 App::$strings["Channel settings"] = "Configuración del canal";
 App::$strings["Additional features"] = "Funcionalidades";
-App::$strings["Feature/Addon settings"] = "Complementos";
+App::$strings["Addon settings"] = "Ajustes de los complementos";
 App::$strings["Display settings"] = "Ajustes de visualización";
 App::$strings["Manage locations"] = "Gestión de ubicaciones (clones) del canal";
 App::$strings["Export channel"] = "Exportar canal";
@@ -1886,6 +1946,7 @@ App::$strings["New Network Activity Notifications"] = "Avisos de nueva actividad
 App::$strings["View your network activity"] = "Ver su actividad en la red";
 App::$strings["Mark all notifications read"] = "Marcar todas las notificaciones como leídas";
 App::$strings["Show new posts only"] = "Mostrar solo las entradas nuevas";
+App::$strings["Filter by name"] = "Filtrar por nombre";
 App::$strings["New Home Activity"] = "Nueva actividad en su página principal";
 App::$strings["New Home Activity Notifications"] = "Avisos de nueva actividad en su página principal";
 App::$strings["View your home activity"] = "Ver su actividad en su página principal";
@@ -1909,7 +1970,7 @@ App::$strings["New Registrations"] = "Registros nuevos";
 App::$strings["New Registrations Notifications"] = "Notificaciones de nuevos registros";
 App::$strings["Public Stream Notifications"] = "Avisos del \"stream\" público";
 App::$strings["View the public stream"] = "Ver el \"stream\" público";
-App::$strings["Loading"] = "Cargando";
+App::$strings["Sorry, you have got no notifications at the moment"] = "Lo sentimos, por el momento no ha recibido ninguna notificación";
 App::$strings["Source channel not found."] = "No se ha encontrado el canal de origen.";
 App::$strings["Create an account to access services and applications"] = "Crear una cuenta para acceder a los servicios y aplicaciones";
 App::$strings["Logout"] = "Finalizar sesión";
@@ -1917,7 +1978,6 @@ App::$strings["Login/Email"] = "Inicio de sesión / Correo electrónico";
 App::$strings["Password"] = "Contraseña";
 App::$strings["Remember me"] = "Recordarme";
 App::$strings["Forgot your password?"] = "¿Olvidó su contraseña?";
-App::$strings["toggle mobile"] = "cambiar a modo móvil";
 App::$strings["[\$Projectname] Website SSL error for %s"] = "[\$Projectname] Error SSL del sitio web en %s";
 App::$strings["Website SSL certificate is not valid. Please correct."] = "El certificado SSL del sitio web no es válido. Por favor, solucione el problema.";
 App::$strings["[\$Projectname] Cron tasks not running on %s"] = "[\$Projectname] Las tareas de Cron no están funcionando en %s";
@@ -2005,11 +2065,11 @@ App::$strings["Preferred IDs Message"] = "Mensaje de IDs preferido";
 App::$strings["Message to display above preferred results."] = "Mensaje para mostrar sobre los resultados preferidos.";
 App::$strings["Uploaded by: "] = "Subida por: ";
 App::$strings["Drawn by: "] = "Creada por: ";
+App::$strings["Use this image"] = "Usar esta imagen";
 App::$strings["Or select from a free OpenClipart.org image:"] = "O seleccionar una imagen gratuita de OpenClipart.org: ";
 App::$strings["Search Term"] = "Término de búsqueda";
 App::$strings["Unknown error. Please try again later."] = "Error desconocido. Por favor, inténtelo otra vez.";
 App::$strings["Profile photo updated successfully."] = "Se ha actualizado con éxito la foto de perfil.";
-App::$strings["invalid target signature"] = "La firma recibida no es válida";
 App::$strings["Flag Adult Photos"] = "Indicador (\"flag\") de fotos de adultos";
 App::$strings["Provide photo edit option to hide inappropriate photos from default album view"] = "Proporcionar una opción de edición de fotos para ocultar las fotos inapropiadas de la vista de álbum predeterminada";
 App::$strings["Post to WordPress"] = "Publicar en WordPress";
@@ -2046,6 +2106,8 @@ App::$strings["Dreamwidth username"] = "Nombre de usuario en Dreamwidth";
 App::$strings["Dreamwidth password"] = "Contraseña en Dreamwidth";
 App::$strings["Post to Dreamwidth by default"] = "Publicar en Dreamwidth de forma predeterminada";
 App::$strings["Dreamwidth Post Settings"] = "Ajustes de publicación en Dreamwidth";
+App::$strings["New registration"] = "Nuevo registro";
+App::$strings["Message sent to %s. New account registration: %s"] = "Mensaje enviado a %s. Registro de una nueva cuenta: %s";
 App::$strings["Hubzilla Directory Stats"] = "Estadísticas de directorio de Hubzilla";
 App::$strings["Total Hubs"] = "Número total de servidores";
 App::$strings["Hubzilla Hubs"] = "Servidores (hubs) de Hubzilla";
@@ -2208,6 +2270,7 @@ App::$strings["Mail sent."] = "El correo electrónico ha sido enviado.";
 App::$strings["Sending of mail failed."] = "No se pudo enviar el correo.";
 App::$strings["Mail Test"] = "Prueba de correo";
 App::$strings["Message subject"] = "Asunto del mensaje";
+App::$strings["Use markdown for editing posts"] = "Usar markdown para editar las entradas";
 App::$strings["View Larger"] = "Ver más grande";
 App::$strings["Tile Server URL"] = "URL del servidor de mosaicos de imágenes ";
 App::$strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\"  target=\"_blank\">servidores públicos de mosaicos de imágenes</a>";
@@ -2357,7 +2420,7 @@ App::$strings["Invalid game."] = "Juego no válido.";
 App::$strings["You are not a player in this game."] = "Usted no participa en este juego.";
 App::$strings["You must be a local channel to create a game."] = "Debe ser un canal local para crear un juego";
 App::$strings["You must select one opponent that is not yourself."] = "Debe seleccionar un oponente que no sea usted mismo.";
-App::$strings["You must select white or black."] = "Debe elegir blancas o negras.";
+App::$strings["Random color chosen."] = "Elegido un color aleatorio.";
 App::$strings["Error creating new game."] = "Error al crear un nuevo juego.";
 App::$strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
 App::$strings["You must select a local channel /chess/channelname"] = "Debe seleccionar un canal local /chess/nombredelcanal";
@@ -2371,6 +2434,8 @@ App::$strings["Copy the PIN from Twitter here"] = "Copiar aquí el PIN de Twitte
 App::$strings["<strong>Note:</strong> Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Aviso:</strong> Debido a su configuración de privacidad (<em>Ocultar los detalles de su perfil a los visitantes desconocidos?</em>), el enlace potencialmente incluido en las entradas públicas retransmitidas a Twitter llevará al visitante a una página en blanco informándolo de que el acceso a su perfil ha sido restringido.";
 App::$strings["Allow posting to Twitter"] = "Permitir la publicación en Twitter";
 App::$strings["If enabled your public postings can be posted to the associated Twitter account"] = "Si está activado, sus entradas públicas se pueden publicar en la cuenta de Twitter asociada";
+App::$strings["Twitter post length"] = "Longitud del mensaje en Twitter";
+App::$strings["Maximum tweet length"] = "Longitud máxima del tweet";
 App::$strings["Send public postings to Twitter by default"] = "Enviar mensajes públicos a Twitter de forma predeterminada";
 App::$strings["If enabled your public postings will be posted to the associated Twitter account by default"] = "Si está activado, sus entradas públicas se publicarán en la cuenta de Twitter asociada de forma predeterminada.";
 App::$strings["Twitter Post Settings"] = "Ajustes de publicación en Twitter";
@@ -2422,7 +2487,7 @@ App::$strings["If you see this icon you can be sure that the sender is who it sa
 App::$strings["Danger! It seems someone tried to forge a message! This message is not necessarily from who it says it is from!"] = "¡Peligro! ¡Parece que alguien intentó falsificar un mensaje! ¡Este mensaje no es necesariamente de quien dice que es!";
 App::$strings["Welcome to Hubzilla! Would you like to see a tour of the UI?</p> <p>You can pause it at any time and continue where you left off by reloading the page, or navigting to another page.</p><p>You can also advance by pressing the return key"] = "¡Bienvenido/a a Hubzilla! ¿Quiere hacer un recorrido por la interfaz de usuario?</p> <p> Puede detenerlo en cualquier momento y continuar donde lo dejó recargando la página o navegando a otra.</p> <p> También puede avanzar pulsando la tecla de retorno";
 App::$strings["Extended Identity Sharing"] = "Compartir identidad extendida";
-App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = "Compartir su identidad con todos los sitios web en Internet. Cuando se inhabilita, la identidad sólo se comparte con los sitios de la matriz.";
+App::$strings["Share your identity with all websites on the internet. When disabled, identity is only shared with \$Projectname sites."] = "Compartir su identidad con todos los sitios web en Internet. Cuando está deshabilitado, la identidad sólo se comparte con sitios de \$Projectname.";
 App::$strings["Three Dimensional Tic-Tac-Toe"] = "Juego en 3D Tic-Tac-Toe";
 App::$strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
 App::$strings["New game"] = "Nuevo juego";
@@ -2792,8 +2857,8 @@ App::$strings["Please enter a link URL"] = "Por favor, introduzca una dirección
 App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Cambios no guardados. ¿Está seguro de que desea abandonar la página?";
 App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
 App::$strings["timeago.prefixFromNow"] = "timeago.prefixFromNow";
-App::$strings["ago"] = "antes";
+App::$strings["timeago.suffixAgo"] = "timeago.suffixAgo";
-App::$strings["from now"] = "desde ahora";
+App::$strings["timeago.suffixFromNow"] = "timeago.suffixFromNow";
 App::$strings["less than a minute"] = "menos de un minuto";
 App::$strings["about a minute"] = "alrededor de un minuto";
 App::$strings["%d minutes"] = "%d minutos";
@@ -2886,6 +2951,7 @@ App::$strings["Visible to everybody"] = "Visible para todos";
 App::$strings["Gender:"] = "Género:";
 App::$strings["Homepage:"] = "Página personal:";
 App::$strings["Online Now"] = "Ahora en línea";
+App::$strings["Change your profile photo"] = "Cambiar su foto del perfil";
 App::$strings["Trans"] = "Trans";
 App::$strings["Like this channel"] = "Me gusta este canal";
 App::$strings["j F, Y"] = "j F Y";
@@ -2949,6 +3015,8 @@ App::$strings["card"] = "ficha";
 App::$strings["article"] = "artículo";
 App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
 App::$strings["spoiler"] = "spoiler";
+App::$strings["View article"] = "Ver artículo";
+App::$strings["View summary"] = "Ver sumario";
 App::$strings["$1 wrote:"] = "$1 escribió:";
 App::$strings[" by "] = "por";
 App::$strings[" on "] = "en";
@@ -2956,8 +3024,6 @@ App::$strings["Embedded content"] = "Contenido incorporado";
 App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
 App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth:  %1\$s da la bienvenida a %2\$s";
 App::$strings["General Features"] = "Funcionalidades básicas";
-App::$strings["Multiple Profiles"] = "Múltiples perfiles";
-App::$strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles";
 App::$strings["Advanced Profiles"] = "Perfiles avanzados";
 App::$strings["Additional profile sections and selections"] = "Secciones y selecciones de perfil adicionales";
 App::$strings["Profile Import/Export"] = "Importar/Exportar perfil";
@@ -2968,21 +3034,33 @@ App::$strings["Provide a wiki for your channel"] = "Proporcionar un wiki para su
 App::$strings["Private Notes"] = "Notas privadas";
 App::$strings["Enables a tool to store notes and reminders (note: not encrypted)"] = "Habilita una herramienta para guardar notas y recordatorios (advertencia: las notas no estarán cifradas)";
 App::$strings["Create personal planning cards"] = "Crear fichas de planificación personal";
+App::$strings["Create interactive articles"] = "Crear artículos interactivos";
 App::$strings["Navigation Channel Select"] = "Navegación por el selector de canales";
 App::$strings["Change channels directly from within the navigation dropdown menu"] = "Cambiar de canales directamente desde el menú de navegación desplegable";
 App::$strings["Photo Location"] = "Ubicación de las fotos";
 App::$strings["If location data is available on uploaded photos, link this to a map."] = "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa.";
 App::$strings["Access Controlled Chatrooms"] = "Salas de chat moderadas";
 App::$strings["Provide chatrooms and chat services with access control."] = "Proporcionar salas y servicios de chat moderados.";
-App::$strings["Provide alternate connection permission roles."] = "Proporcionar roles de acceso alternativos para esta conexión.";
 App::$strings["Smart Birthdays"] = "Cumpleaños inteligentes";
 App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo.";
 App::$strings["Event Timezone Selection"] = "Selección del huso horario del evento";
 App::$strings["Allow event creation in timezones other than your own."] = "Permitir la creación de eventos en husos horarios distintos del suyo.";
+App::$strings["Premium Channel"] = "Canal premium";
+App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
 App::$strings["Advanced Directory Search"] = "Búsqueda avanzada en el directorio";
 App::$strings["Allows creation of complex directory search queries"] = "Permitir la creación de consultas complejas en las búsquedas en el directorio";
 App::$strings["Advanced Theme and Layout Settings"] = "Ajustes avanzados de temas y esquemas";
 App::$strings["Allows fine tuning of themes and page layouts"] = "Permitir el ajuste fino de temas y esquemas de páginas";
+App::$strings["Access Control and Permissions"] = "Control de acceso y permisos";
+App::$strings["Privacy Groups"] = "Grupos de canales";
+App::$strings["Enable management and selection of privacy groups"] = "Activar la gestión y selección de grupos de canales";
+App::$strings["Multiple Profiles"] = "Múltiples perfiles";
+App::$strings["Ability to create multiple profiles"] = "Capacidad de crear múltiples perfiles";
+App::$strings["Provide alternate connection permission roles."] = "Proporcionar roles de acceso alternativos para esta conexión.";
+App::$strings["OAuth Clients"] = "Clientes OAuth";
+App::$strings["Manage authenticatication tokens for mobile and remote apps."] = "Administrar tokens de autenticación para aplicaciones móviles y remotas.";
+App::$strings["Access Tokens"] = "Tokens de acceso";
+App::$strings["Create access tokens so that non-members can access private content."] = "Crear tokens de acceso para que los no miembros puedan acceder a contenido privado.";
 App::$strings["Post Composition Features"] = "Opciones para la redacción de entradas";
 App::$strings["Large Photos"] = "Fotos de gran tamaño";
 App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
@@ -3002,8 +3080,6 @@ App::$strings["Prevent posts with identical content to be published with less th
 App::$strings["Network and Stream Filtering"] = "Filtrado del contenido";
 App::$strings["Search by Date"] = "Buscar por fecha";
 App::$strings["Ability to select posts by date ranges"] = "Capacidad de seleccionar entradas por rango de fechas";
-App::$strings["Privacy Groups"] = "Grupos de canales";
-App::$strings["Enable management and selection of privacy groups"] = "Activar la gestión y selección de grupos de canales";
 App::$strings["Save search terms for re-use"] = "Guardar términos de búsqueda para su reutilización";
 App::$strings["Network Personal Tab"] = "Actividad personal";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado.";
@@ -3015,7 +3091,6 @@ App::$strings["Show friend and connection suggestions"] = "Mostrar sugerencias d
 App::$strings["Connection Filtering"] = "Filtrado de conexiones";
 App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtrar publicaciones entrantes de conexiones por palabras clave o contenido";
 App::$strings["Post/Comment Tools"] = "Gestión de entradas y comentarios";
-App::$strings["Use markdown for editing posts"] = "Usar markdown para editar las entradas";
 App::$strings["Community Tagging"] = "Etiquetas de la comunidad";
 App::$strings["Ability to tag existing posts"] = "Capacidad de etiquetar entradas existentes";
 App::$strings["Post Categories"] = "Temas de las entradas";
@@ -3029,8 +3104,6 @@ App::$strings["Star Posts"] = "Entradas destacadas";
 App::$strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
 App::$strings["Tag Cloud"] = "Nube de etiquetas";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
-App::$strings["Premium Channel"] = "Canal premium";
-App::$strings["Allows you to set restrictions and terms on those that connect with your channel"] = "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal";
 App::$strings["Tags"] = "Etiquetas";
 App::$strings["Keywords"] = "Palabras clave";
 App::$strings["have"] = "tener";
@@ -3092,25 +3165,11 @@ App::$strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
 App::$strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
 App::$strings["Remote authentication"] = "Acceder desde su servidor";
 App::$strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor de inicio";
-App::$strings["Network Activity"] = "Actividad de la red";
-App::$strings["Mark all activity notifications seen"] = "Marcar como vistas todas las notificaciones de actividad";
-App::$strings["Channel home"] = "Mi canal";
-App::$strings["View your channel home"] = "Ver su página principal del canal";
-App::$strings["Mark all channel notifications seen"] = "Marcar todas las notificaciones del canal como leídas";
-App::$strings["Registrations"] = "Registros";
-App::$strings["Notifications"] = "Notificaciones";
-App::$strings["View all notifications"] = "Ver todas las notificaciones";
-App::$strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas";
-App::$strings["Private mail"] = "Correo privado";
-App::$strings["View your private messages"] = "Ver sus mensajes privados";
-App::$strings["Mark all private messages seen"] = "Marcar todos los mensajes privados como leídos";
-App::$strings["Event Calendar"] = "Calendario de eventos";
 App::$strings["Manage Your Channels"] = "Gestionar sus canales";
 App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
 App::$strings["End this session"] = "Finalizar esta sesión";
 App::$strings["Your profile page"] = "Su página del perfil";
 App::$strings["Manage/Edit profiles"] = "Administrar/editar perfiles";
-App::$strings["Edit your profile"] = "Editar su perfil";
 App::$strings["Sign in"] = "Acceder";
 App::$strings["Take me home"] = "Volver a la página principal";
 App::$strings["Log me out of this site"] = "Salir de este sitio";
@@ -3132,6 +3191,7 @@ App::$strings["Upload New Photos"] = "Subir nuevas fotos";
 App::$strings["Invalid data packet"] = "Paquete de datos no válido";
 App::$strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
 App::$strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+App::$strings["invalid target signature"] = "La firma recibida no es válida";
 App::$strings["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."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
 App::$strings["Add new connections to this privacy group"] = "Añadir conexiones nuevas a este grupo de canales";
 App::$strings["edit"] = "editar";

view/js/main.js

@@ -304,6 +304,12 @@ function insertCommentURL(comment, id) {
 	return true;
 }
 
+function doFollowAuthor(url) {
+	$.get(url, function(data) { notificationsUpdate(); });
+	return true;
+}
+
+
 function viewsrc(id) {
 	$.colorbox({href: 'viewsrc/' + id, maxWidth: '80%', maxHeight: '80%' });
 }

view/pdl/mod_admin.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_appman.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_apps.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_articles.pdl

@@ -5,4 +5,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_blocks.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_cal.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_cards.pdl

@@ -5,4 +5,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_cdav.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_channel.pdl

@@ -10,4 +10,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_chanview.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_chat.pdl

@@ -7,4 +7,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_cloud.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_common.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_connect.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_connections.pdl

@@ -6,4 +6,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_connedit.pdl

@@ -6,4 +6,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_defperms.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_directory.pdl

@@ -6,4 +6,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_display.pdl

@@ -1,3 +1,4 @@
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_editblock.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_editlayout.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_editwebpage.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_events.pdl

@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_go.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_group.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_help.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_hq.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_id.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_layouts.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_locs.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_mail.pdl

@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_menu.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_message.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_mitem.pdl

@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_network.pdl

@@ -14,4 +14,5 @@ $content
 
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_photos.pdl

@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_profile.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_profile_photo.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_profiles.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_profperm.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_pubstream.pdl

@@ -1,3 +1,4 @@
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_rate.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_ratings.pdl

@@ -7,4 +7,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_search.pdl

@@ -2,4 +2,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_settings.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_sharedwithme.pdl

@@ -1,3 +1,4 @@
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_sources.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_suggest.pdl

@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_thing.pdl

@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]

view/pdl/mod_uexport.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_viewconnections.pdl

@@ -3,4 +3,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_webpages.pdl

@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/pdl/mod_wiki.pdl

@@ -4,4 +4,5 @@
 [/region]
 [region=right_aside]
 [widget=notifications][/widget]
+[widget=newmember][/widget]
 [/region]

view/php/theme_init.php

@@ -15,7 +15,7 @@ head_add_js('jquery.js');
 head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js');
 head_add_js('/library/sprintf.js/dist/sprintf.min.js');
 
-head_add_js('jquery.textinputs.js');
+//head_add_js('jquery.textinputs.js');
 head_add_js('autocomplete.js');
 head_add_js('/library/jquery-textcomplete/jquery.textcomplete.js');
 

view/tpl/email_validation.tpl

@@ -2,15 +2,15 @@
 
 <div class="descriptive-paragraph" style="font-size: 1.2em;"><p>{{$desc}}</p></div>
 
-<form action="email_validation" method="post">
+<form action="email_validation/{{$email}}" method="post">
 {{include file="field_input.tpl" field=$token}}
 
-<div class="pull-right">
+<div class="pull-right submit-wrapper">
-	<a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a>
-</div>
-<div class="submit-wrapper" >
 	<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 </div>
+<div class="resend-email" >
+	<a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a>
+</div>
 </form>
 <div class="clear"></div>
 

view/tpl/generic_addon_settings.tpl

@@ -1,12 +1,16 @@
 <div class="panel">
 	<div class="section-subtitle-wrapper" role="tab" id="{{$addon.0}}-settings">
 		<h3>
-			<a title="{{$addon.2}}" data-toggle="collapse" data-parent="#settings" href="#{{$addon.0}}-settings-content" aria-controls="{{$addon.0}}-settings-content">
+			<a title="{{$addon.2}}" data-toggle="collapse" data-target="#{{$addon.0}}-settings-content" href="#" aria-controls="{{$addon.0}}-settings-content">
+				{{if $addon.1|substr:0:1 === '<'}}
 				{{$addon.1}}
+				{{else}}
+				<i class="fa fa-gear"></i> {{$addon.1}}
+				{{/if}}
 			</a>
 		</h3>
 	</div>
-	<div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings">
+	<div id="{{$addon.0}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$addon.0}}-settings" data-parent="#settings">
 		<div class="section-content-tools-wrapper">
 			{{$content}}
 			{{if $addon.0}}

view/tpl/new_member.tpl

@@ -0,0 +1,17 @@
+<div class="widget">
+<h3>{{$title}}</h3>
+{{if $options}}
+<ul class="nav nav-pills flex-column">
+{{foreach $options as $x}}
+	{{if is_array($x) }}
+		{{foreach $x as $y => $z}}
+		<li class="nav-item"><a href="{{$y}}" class="nav-link">{{$z}}</a></li>
+		{{/foreach}}
+	{{else}}
+		<div><strong>{{$x}}</strong></div>
+	{{/if}}
+{{/foreach}}
+</ul>
+{{/if}}
+</div>
+

view/tpl/peoplefind.tpl

@@ -10,7 +10,7 @@
 	</form>
 	<ul class="nav nav-pills flex-column">
 		{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
-		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
+		{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?f=&suggest=1" >{{$suggest}}</a></li>{{/if}}
 		<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
 		{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
 	</ul>

view/tpl/settings.tpl

@@ -11,12 +11,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse">
+						<a data-toggle="collapse" data-target="#basic-settings-collapse" href="#">
 							{{$h_basic}}
 						</a>
 					</h3>
 				</div>
-				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings">
+				<div id="basic-settings-collapse" class="collapse show" role="tabpanel" aria-labelledby="basic-settings" data-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						{{include file="field_input.tpl" field=$username}}
 						{{include file="field_select_grouped.tpl" field=$timezone}}
@@ -37,12 +37,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse">
+						<a data-toggle="collapse" data-target="#privacy-settings-collapse" href="#">
 							{{$h_prv}}
 						</a>
 					</h3>
 				</div>
-				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings">
+				<div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						{{include file="field_select_grouped.tpl" field=$role}}
 						<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
@@ -96,12 +96,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse">
+						<a data-toggle="collapse" data-target="#notification-settings-collapse" href="#">
 							{{$h_not}}
 						</a>
 					</h3>
 				</div>
-				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings">
+				<div id="notification-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="notification-settings" data-parent="#settings">
 					<div class="section-content-tools-wrapper">
 						<div id="settings-notifications">
 
@@ -160,12 +160,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
+						<a data-toggle="collapse" data-target="#miscellaneous-settings-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
 							{{$lbl_misc}}
 						</a>
 					</h3>
 				</div>
-				<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
+				<div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" >
 					<div class="section-content-tools-wrapper">
 						{{if $profselect}}
 						<label for="contact-profile-selector">{{$profseltxt}}</label>

view/tpl/settings_addons.tpl

@@ -1,8 +1,8 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<div class="descriptive-text pull-right">{{$descrip}}</div>
 		<h2>{{$title}}</h2>
 	</div>
+	<div class="section-content-info-wrapper">{{$descrip}}</div>
 	<form action="settings/featured" method="post" autocomplete="off">
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 		<div class="panel-group" id="settings" role="tablist">

view/tpl/settings_display.tpl

@@ -10,12 +10,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="theme-settings-title">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#theme-settings-content" aria-expanded="true" aria-controls="theme-settings-content">
+						<a data-toggle="collapse" data-target="#theme-settings-content" href="#" aria-expanded="true" aria-controls="theme-settings-content">
 							{{$d_tset}}
 						</a>
 					</h3>
 				</div>
-				<div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings">
+				<div id="theme-settings-content" class="collapse show" role="tabpanel" aria-labelledby="theme-settings" data-parent="#settings" >
 					<div class="section-content-tools-wrapper">
 						{{if $theme}}
 							{{include file="field_themeselect.tpl" field=$theme}}
@@ -33,12 +33,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
+						<a data-toggle="collapse" data-target="#custom-settings-content" href="" aria-expanded="true" aria-controls="custom-settings-content">
 							{{$d_ctset}}
 						</a>
 					</h3>
 				</div>
-				<div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
+				<div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings" data-parent="#settings" >
 					<div class="section-content-tools-wrapper">
 						{{if $theme_config}}
 							{{$theme_config}}
@@ -49,12 +49,12 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
 					<h3>
-						<a data-toggle="collapse" data-parent="#settings" href="#content-settings-content" aria-expanded="true" aria-controls="content-settings-content">
+						<a data-toggle="collapse" data-target="#content-settings-content" href="" aria-expanded="true" aria-controls="content-settings-content">
 							{{$d_cset}}
 						</a>
 					</h3>
 				</div>
-				<div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
+				<div id="content-settings-content" class="collapse{{if !$theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings" data-parent="#settings">
 					<div class="section-content-wrapper">
 						{{include file="field_input.tpl" field=$ajaxint}}
 						{{include file="field_input.tpl" field=$itemspage}}

view/tpl/settings_features.tpl

@@ -9,12 +9,12 @@
 		<div class="panel">
 			<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
 				<h3>
-					<a data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+					<a data-toggle="collapse" data-target="#{{$g}}-settings-content" href="#" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
 						{{$f.0}}
 					</a>
 				</h3>
 			</div>
-			<div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+			<div id="{{$g}}-settings-content" class="collapse{{if $g == 'general'}} show{{/if}}" role="tabpanel" aria-labelledby="{{$g}}-settings-title" data-parent="#settings">
 				<div class="section-content-tools-wrapper">
 					{{foreach $f.1 as $fcat}}
 						{{include file="field_checkbox.tpl" field=$fcat}}